Thu Jan 20 13:06:16 2011 UTC ()
Unset any predefined LD_PRELOAD before executing npviewer.bin (emul
conflict).  This makes flash work in firefox run with a rumphijack
tcp/ip stack.

ok abs (maintainer)


(pooka)
diff -r1.23 -r1.24 pkgsrc/www/nspluginwrapper/Makefile
diff -r1.8 -r1.9 pkgsrc/www/nspluginwrapper/distinfo
diff -r0 -r1.3 pkgsrc/www/nspluginwrapper/patches/patch-ac
cvs diff -r1.23 -r1.24 pkgsrc/www/nspluginwrapper/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nspluginwrapper/Makefile 2011/01/13 13:39:40 1.23
+++ pkgsrc/www/nspluginwrapper/Makefile 2011/01/20 13:06:15 1.24
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.23 2011/01/13 13:39:40 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2011/01/20 13:06:15 pooka Exp $
2# 2#
3 3
4DISTNAME= nspluginwrapper-1.2.2 4DISTNAME= nspluginwrapper-1.2.2
5PKGREVISION= 7 5PKGREVISION= 8
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
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16EMUL_PLATFORMS= linux-i386 16EMUL_PLATFORMS= linux-i386
17EMUL_MODULES.linux= base gtk2 x11 17EMUL_MODULES.linux= base gtk2 x11
18NOT_FOR_PLATFORM= Linux-*-* 18NOT_FOR_PLATFORM= Linux-*-*
cvs diff -r1.8 -r1.9 pkgsrc/www/nspluginwrapper/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nspluginwrapper/distinfo 2009/09/16 10:16:58 1.8
+++ pkgsrc/www/nspluginwrapper/distinfo 2011/01/20 13:06:15 1.9
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.8 2009/09/16 10:16:58 abs Exp $ 1$NetBSD: distinfo,v 1.9 2011/01/20 13:06:15 pooka 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) = 28f9e18e519337852cb47d04ed0c1cea76b3416d 9SHA1 (patch-aa) = 28f9e18e519337852cb47d04ed0c1cea76b3416d
10SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a 10SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a
 11SHA1 (patch-ac) = b42a1241abcbfc9344c810797785222cd79681ac
File Added: pkgsrc/www/nspluginwrapper/patches/patch-ac
	$NetBSD: patch-ac,v 1.3 2011/01/20 13:06:15 pooka Exp $

--- src/npw-viewer.sh.orig	2008-12-14 12:24:19.000000000 +0100
+++ src/npw-viewer.sh	2011-01-19 12:20:26.000000000 +0100
@@ -40,6 +40,13 @@
     ;;
 esac
 
+case $OS in
+FreeBSD|NetBSD)
+    # preset LD_PRELOAD is most likely for the native emul
+    unset LD_PRELOAD
+    ;;
+esac
+
 if test "$ARCH" != "$TARGET_ARCH"; then
     case $TARGET_ARCH in
     i386)