summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/nspluginwrapper/Makefile7
-rw-r--r--www/nspluginwrapper/PLIST4
-rw-r--r--www/nspluginwrapper/distinfo17
-rw-r--r--www/nspluginwrapper/patches/patch-aa12
-rw-r--r--www/nspluginwrapper/patches/patch-ab12
5 files changed, 36 insertions, 16 deletions
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index f9687af9bdc..c704697b27e 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2008/11/18 08:33:51 abs Exp $
+# $NetBSD: Makefile,v 1.11 2008/12/18 19:59:31 jmcneill Exp $
#
-DISTNAME= nspluginwrapper-1.0.0
-PKGREVISION= 1
+DISTNAME= nspluginwrapper-1.1.10
CATEGORIES= www
MASTER_SITES= http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
EXTRACT_SUFX= .tar.bz2
@@ -38,6 +37,8 @@ post-install:
${INSTALL_LIB} ${PLUGIN_SRCDIR}/npviewer.bin ${PLUGIN_INSTDIR}
.include "../../devel/glib2/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/nspluginwrapper/PLIST b/www/nspluginwrapper/PLIST
index 0a0b4e43302..76be32e6521 100644
--- a/www/nspluginwrapper/PLIST
+++ b/www/nspluginwrapper/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/22 22:33:45 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/12/18 19:59:31 jmcneill Exp $
+bin/nspluginplayer
bin/nspluginwrapper
lib/nspluginwrapper/${MACHINE_ARCH}/${LOWER_OPSYS}/npconfig
+lib/nspluginwrapper/${MACHINE_ARCH}/${LOWER_OPSYS}/npplayer
lib/nspluginwrapper/${MACHINE_ARCH}/${LOWER_OPSYS}/npwrapper.so
lib/nspluginwrapper/i386/linux/libxpcom.so
lib/nspluginwrapper/i386/linux/npviewer
diff --git a/www/nspluginwrapper/distinfo b/www/nspluginwrapper/distinfo
index d4271060dcb..9ecee6db239 100644
--- a/www/nspluginwrapper/distinfo
+++ b/www/nspluginwrapper/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.5 2008/11/18 08:33:51 abs Exp $
+$NetBSD: distinfo,v 1.6 2008/12/18 19:59:31 jmcneill Exp $
-SHA1 (nspluginwrapper-1.0.0.tar.bz2) = ef551fb508835b3358355477be794a34e9f64135
-RMD160 (nspluginwrapper-1.0.0.tar.bz2) = d3b5a5d1dd314e5331ffc877fb9621d6566087c6
-Size (nspluginwrapper-1.0.0.tar.bz2) = 271028 bytes
-SHA1 (nspluginwrapper-i386-1.0.0-1.x86_64.rpm) = 9980fd73369996b8b1ee31b5550be838e407a8d5
-RMD160 (nspluginwrapper-i386-1.0.0-1.x86_64.rpm) = 850d025d3e53f69c559170b747b4a820b508eb96
-Size (nspluginwrapper-i386-1.0.0-1.x86_64.rpm) = 53496 bytes
-SHA1 (patch-aa) = 01116b045d6da50551d44246a56024c71b6a5444
+SHA1 (nspluginwrapper-1.1.10.tar.bz2) = e4cb6780c85626813a76d7e06f3493245f0310c8
+RMD160 (nspluginwrapper-1.1.10.tar.bz2) = dd399cb82301dffec9c289183fc51610514fda13
+Size (nspluginwrapper-1.1.10.tar.bz2) = 330810 bytes
+SHA1 (nspluginwrapper-i386-1.1.10-1.x86_64.rpm) = 2b79e9646a6afe2ea97a5aa7262574b3766e165b
+RMD160 (nspluginwrapper-i386-1.1.10-1.x86_64.rpm) = e2b1ac8da1b1e352882064e8ddc32eaef6b74f56
+Size (nspluginwrapper-i386-1.1.10-1.x86_64.rpm) = 68516 bytes
+SHA1 (patch-aa) = 5310798b88142b00141e7bef9978a1b29a7b965d
+SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a
diff --git a/www/nspluginwrapper/patches/patch-aa b/www/nspluginwrapper/patches/patch-aa
index 7a07f64d6c5..5b882f243a0 100644
--- a/www/nspluginwrapper/patches/patch-aa
+++ b/www/nspluginwrapper/patches/patch-aa
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2008/11/18 08:33:51 abs Exp $
+$NetBSD: patch-aa,v 1.5 2008/12/18 19:59:31 jmcneill Exp $
---- src/npw-config.c.orig 2008-06-26 21:50:28.000000000 +0100
+--- src/npw-config.c.orig 2008-10-12 15:02:08.000000000 -0400
+++ src/npw-config.c
-@@ -127,16 +127,16 @@ static const char *get_system_mozilla_pl
+@@ -128,16 +128,18 @@ static const char *get_system_mozilla_pl
#elif defined(__DragonFly__)
{
static const char *dragonfly_dirs[] = {
- "/usr/pkg/" LIB "/mozilla/plugins",
- "/usr/pkg/" LIB "/firefox/plugins",
++ LIBDIR "/firefox3/plugins",
+ LIBDIR "/firefox/plugins",
+ LIBDIR "/seamonkey/plugins",
};
@@ -18,16 +19,18 @@ $NetBSD: patch-aa,v 1.4 2008/11/18 08:33:51 abs Exp $
static const char *netbsd_dirs[] = {
- "/usr/pkg/" LIB "/mozilla/plugins",
- "/usr/pkg/" LIB "/firefox/plugins",
++ LIBDIR "/firefox3/plugins",
+ LIBDIR "/firefox/plugins",
+ LIBDIR "/seamonkey/plugins",
};
dirs = netbsd_dirs;
}
-@@ -215,15 +215,17 @@ static const char **get_mozilla_plugin_d
+@@ -224,15 +226,19 @@ static const char **get_mozilla_plugin_d
"/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux",
#endif
#if defined(__DragonFly__)
- "/usr/pkg/lib/netscape/plugins",
++ "/usr/pkg/lib/firefox3/plugins",
"/usr/pkg/lib/firefox/plugins",
+ "/usr/pkg/lib/netscape/plugins",
+ "/usr/pkg/lib/seamonkey/plugins",
@@ -37,6 +40,7 @@ $NetBSD: patch-aa,v 1.4 2008/11/18 08:33:51 abs Exp $
#endif
#if defined(__NetBSD__)
- "/usr/pkg/lib/netscape/plugins",
++ "/usr/pkg/lib/firefox3/plugins",
"/usr/pkg/lib/firefox/plugins",
+ "/usr/pkg/lib/netscape/plugins",
+ "/usr/pkg/lib/seamonkey/plugins",
diff --git a/www/nspluginwrapper/patches/patch-ab b/www/nspluginwrapper/patches/patch-ab
new file mode 100644
index 00000000000..b74d80700a9
--- /dev/null
+++ b/www/nspluginwrapper/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2008/12/18 19:59:31 jmcneill Exp $
+
+--- src/utils.c.orig 2008-12-06 15:16:38.000000000 -0500
++++ src/utils.c
+@@ -19,6 +19,7 @@
+ */
+
+ #define _GNU_SOURCE 1
++#define _NETBSD_SOURCE 1
+ #include "sysdeps.h"
+
+ #include <stdio.h>