2016-10-14 07:49:11 +02:00

51 lines
1.5 KiB
Plaintext

$NetBSD: patch-aa,v 1.7 2016/09/17 19:02:52 tsutsui Exp $
--- src/npw-config.c.orig 2011-07-01 03:18:57.000000000 +0000
+++ src/npw-config.c
@@ -138,22 +138,15 @@ static const char *get_system_mozilla_pl
};
dirs = freebsd_dirs;
}
-#elif defined(__DragonFly__)
+#elif defined(__NetBSD__) || defined(__DragonFly__)
{
static const char *dragonfly_dirs[] = {
- "/usr/pkg/" LIB "/mozilla/plugins",
- "/usr/pkg/" LIB "/firefox/plugins",
+ LIBDIR "/netscape/plugins",
+ LIBDIR "/firefox/plugins",
+ LIBDIR "/seamonkey/plugins",
};
dirs = dragonfly_dirs;
}
-#elif defined(__NetBSD__)
- {
- static const char *netbsd_dirs[] = {
- "/usr/pkg/" LIB "/mozilla/plugins",
- "/usr/pkg/" LIB "/firefox/plugins",
- };
- dirs = netbsd_dirs;
- }
#elif defined(__sun__)
{
static const char *solaris_dirs[] = {
@@ -238,16 +231,10 @@ static const char **get_mozilla_plugin_d
"/usr/local/lib/npapi/linux-flashplugin",
"/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux",
#endif
-#if defined(__DragonFly__)
- "/usr/pkg/lib/netscape/plugins",
- "/usr/pkg/lib/firefox/plugins",
- "/usr/pkg/lib/RealPlayer/mozilla",
- "/usr/pkg/Acrobat5/Browsers/intellinux",
- "/usr/pkg/Acrobat7/Browser/intellinux",
-#endif
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) || defined(__DragonFly__)
"/usr/pkg/lib/netscape/plugins",
"/usr/pkg/lib/firefox/plugins",
+ "/usr/pkg/lib/seamonkey/plugins",
"/usr/pkg/lib/RealPlayer/mozilla",
"/usr/pkg/Acrobat5/Browsers/intellinux",
"/usr/pkg/Acrobat7/Browser/intellinux",