Wed Sep 16 10:16:58 2009 UTC ()
LOCALBASE/lib/netscape/plugins is the default plugin dir in pkgsrc, adjust so we can automatically find plugins. Bump pkgrevision


(abs)
diff -r1.16 -r1.17 pkgsrc/www/nspluginwrapper/Makefile
diff -r1.7 -r1.8 pkgsrc/www/nspluginwrapper/distinfo
diff -r1.5 -r1.6 pkgsrc/www/nspluginwrapper/patches/patch-aa
cvs diff -r1.16 -r1.17 pkgsrc/www/nspluginwrapper/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nspluginwrapper/Makefile 2009/08/26 19:58:27 1.16
+++ pkgsrc/www/nspluginwrapper/Makefile 2009/09/16 10:16:58 1.17
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.16 2009/08/26 19:58:27 sno Exp $ 1# $NetBSD: Makefile,v 1.17 2009/09/16 10:16:58 abs Exp $
2# 2#
3 3
4DISTNAME= nspluginwrapper-1.2.2 4DISTNAME= nspluginwrapper-1.2.2
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://gwenole.beauchesne.info/projects/nspluginwrapper/files/ 7MASTER_SITES= http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/-/-i386-/}-1.x86_64.rpm 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/-/-i386-/}-1.x86_64.rpm
10 10
11MAINTAINER= abs@NetBSD.org 11MAINTAINER= abs@NetBSD.org
12HOMEPAGE= http://gwenole.beauchesne.info/projects/nspluginwrapper/ 12HOMEPAGE= http://gwenole.beauchesne.info/projects/nspluginwrapper/
13COMMENT= Use Netscape compatible plugins from other platforms 13COMMENT= Use Netscape compatible plugins from other platforms
14 14
15EMUL_PLATFORMS= linux-i386 15EMUL_PLATFORMS= linux-i386
16EMUL_MODULES.linux= base gtk2 x11 16EMUL_MODULES.linux= base gtk2 x11
17NOT_FOR_PLATFORM= Linux-*-* 17NOT_FOR_PLATFORM= Linux-*-*
18 18
cvs diff -r1.7 -r1.8 pkgsrc/www/nspluginwrapper/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nspluginwrapper/distinfo 2009/01/05 19:11:24 1.7
+++ pkgsrc/www/nspluginwrapper/distinfo 2009/09/16 10:16:58 1.8
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.7 2009/01/05 19:11:24 jmcneill Exp $ 1$NetBSD: distinfo,v 1.8 2009/09/16 10:16:58 abs Exp $
2 2
3SHA1 (nspluginwrapper-1.2.2.tar.bz2) = be581c39dcc1a8d9a5b3f81e4650f553a30cf249 3SHA1 (nspluginwrapper-1.2.2.tar.bz2) = be581c39dcc1a8d9a5b3f81e4650f553a30cf249
4RMD160 (nspluginwrapper-1.2.2.tar.bz2) = d5aa265966f87c51bb9ea4f2a079a87b74fdcbf3 4RMD160 (nspluginwrapper-1.2.2.tar.bz2) = d5aa265966f87c51bb9ea4f2a079a87b74fdcbf3
5Size (nspluginwrapper-1.2.2.tar.bz2) = 327947 bytes 5Size (nspluginwrapper-1.2.2.tar.bz2) = 327947 bytes
6SHA1 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 0d49757623c62da52292e48a0173024c14aa12cd 6SHA1 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 0d49757623c62da52292e48a0173024c14aa12cd
7RMD160 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 9cf3e6ac3e5171c2bbda71c082b6b9fc30d69a84 7RMD160 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 9cf3e6ac3e5171c2bbda71c082b6b9fc30d69a84
8Size (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 69425 bytes 8Size (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 69425 bytes
9SHA1 (patch-aa) = 5310798b88142b00141e7bef9978a1b29a7b965d 9SHA1 (patch-aa) = 28f9e18e519337852cb47d04ed0c1cea76b3416d
10SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a 10SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a
cvs diff -r1.5 -r1.6 pkgsrc/www/nspluginwrapper/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/nspluginwrapper/patches/patch-aa 2008/12/18 19:59:31 1.5
+++ pkgsrc/www/nspluginwrapper/patches/patch-aa 2009/09/16 10:16:58 1.6
@@ -1,49 +1,50 @@ @@ -1,49 +1,50 @@
1$NetBSD: patch-aa,v 1.5 2008/12/18 19:59:31 jmcneill Exp $ 1$NetBSD: patch-aa,v 1.6 2009/09/16 10:16:58 abs Exp $
2 2
3--- src/npw-config.c.orig 2008-10-12 15:02:08.000000000 -0400 3--- src/npw-config.c.orig 2009-09-16 11:05:23.000000000 +0100
4+++ src/npw-config.c 4+++ src/npw-config.c
5@@ -128,16 +128,18 @@ static const char *get_system_mozilla_pl 5@@ -125,22 +125,15 @@ static const char *get_system_mozilla_pl
6 #elif defined(__DragonFly__) 6 };
 7 dirs = freebsd_dirs;
 8 }
 9-#elif defined(__DragonFly__)
 10+#elif defined(__NetBSD__) || defined(__DragonFly__)
7 { 11 {
8 static const char *dragonfly_dirs[] = { 12 static const char *dragonfly_dirs[] = {
9- "/usr/pkg/" LIB "/mozilla/plugins", 13- "/usr/pkg/" LIB "/mozilla/plugins",
10- "/usr/pkg/" LIB "/firefox/plugins", 14- "/usr/pkg/" LIB "/firefox/plugins",
11+ LIBDIR "/firefox3/plugins", 15+ LIBDIR "/netscape/plugins",
12+ LIBDIR "/firefox/plugins", 16+ LIBDIR "/firefox/plugins",
13+ LIBDIR "/seamonkey/plugins", 17+ LIBDIR "/seamonkey/plugins",
14 }; 18 };
15 dirs = dragonfly_dirs; 19 dirs = dragonfly_dirs;
16 } 20 }
17 #elif defined(__NetBSD__) 21-#elif defined(__NetBSD__)
18 { 22- {
19 static const char *netbsd_dirs[] = { 23- static const char *netbsd_dirs[] = {
20- "/usr/pkg/" LIB "/mozilla/plugins", 24- "/usr/pkg/" LIB "/mozilla/plugins",
21- "/usr/pkg/" LIB "/firefox/plugins", 25- "/usr/pkg/" LIB "/firefox/plugins",
22+ LIBDIR "/firefox3/plugins", 26- };
23+ LIBDIR "/firefox/plugins", 27- dirs = netbsd_dirs;
24+ LIBDIR "/seamonkey/plugins", 28- }
25 }; 29 #elif defined(__sun__)
26 dirs = netbsd_dirs; 30 {
27 } 31 static const char *solaris_dirs[] = {
28@@ -224,15 +226,19 @@ static const char **get_mozilla_plugin_d 32@@ -223,16 +216,11 @@ static const char **get_mozilla_plugin_d
 33 "/usr/local/lib/npapi/linux-flashplugin",
29 "/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux", 34 "/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux",
30 #endif 35 #endif
31 #if defined(__DragonFly__) 36-#if defined(__DragonFly__)
32- "/usr/pkg/lib/netscape/plugins", 37+#if defined(__NetBSD__) || defined(__DragonFly__)
33+ "/usr/pkg/lib/firefox3/plugins", 38 "/usr/pkg/lib/netscape/plugins",
34 "/usr/pkg/lib/firefox/plugins", 
35+ "/usr/pkg/lib/netscape/plugins", 
36+ "/usr/pkg/lib/seamonkey/plugins", 
37 "/usr/pkg/lib/RealPlayer/mozilla", 
38 "/usr/pkg/Acrobat5/Browsers/intellinux", 
39 "/usr/pkg/Acrobat7/Browser/intellinux", 
40 #endif 
41 #if defined(__NetBSD__) 
42- "/usr/pkg/lib/netscape/plugins", 
43+ "/usr/pkg/lib/firefox3/plugins", 
44 "/usr/pkg/lib/firefox/plugins", 39 "/usr/pkg/lib/firefox/plugins",
45+ "/usr/pkg/lib/netscape/plugins", 40- "/usr/pkg/lib/RealPlayer/mozilla",
 41- "/usr/pkg/Acrobat5/Browsers/intellinux",
 42- "/usr/pkg/Acrobat7/Browser/intellinux",
 43-#endif
 44-#if defined(__NetBSD__)
 45 "/usr/pkg/lib/netscape/plugins",
 46- "/usr/pkg/lib/firefox/plugins",
46+ "/usr/pkg/lib/seamonkey/plugins", 47+ "/usr/pkg/lib/seamonkey/plugins",
47 "/usr/pkg/lib/RealPlayer/mozilla", 48 "/usr/pkg/lib/RealPlayer/mozilla",
48 "/usr/pkg/Acrobat5/Browsers/intellinux", 49 "/usr/pkg/Acrobat5/Browsers/intellinux",
49 "/usr/pkg/Acrobat7/Browser/intellinux", 50 "/usr/pkg/Acrobat7/Browser/intellinux",