Update nspluginwrapper-1.4.4.

pkgsrc changes:
- use private Linux npviewer.bin binaries built by me (tsutsui@) on
  openSUSE 12.1 on 32 bit (i386) and 64 bit (x86_64) on VirtualBox
- enable EMUL_PLATFORMS=linux-x86_64 using the native 64 bit Linux
  npviewer.bin binary, which allows using 64 bit native adobe-flash-plugin
  on NetBSD/amd64 hosts
- also explicitly set EMUL_REQD= suse>=12.1 (NetBSD 6.x can use it anyway)
- tweak some pkgsrc ${PREFIX}
- update HOMEPAGE
- take maintainership

Note:
- major Linux distributions provided nspluginwrapper binaries to use
  the 32 bit plugin binaries without sources on their 64 bit systems,
  so there is no 64 bit wrapper binary (npviewer.bin) to use native 64 bit
  plugin binaries on other systems (like NetBSD) via binary emulation
- nowadays adobe provides 64 bit native adobe-flash-plugin11 binaries
  and NPAPI plugins are being deprecated by vendors, so I guess there is
  very few motivation to update nspluginwrapper project for Linux people
   http://nspluginwrapper.org/why.html
- Linux binaries in distfiles are built with following changes to
  make npviewer.bin works on non-Linux hosts:
 - configure with the following options, to enable "generic" RPC calls
   (The default Linux native binaries use their specific "anonymous socket")
  -  for i386:
     % ./configure --enable-generic
  - for x86_64:
     % ./configure --target-cpu=x86_64 --disable-biarch --enable-generic --enable-viewer --enable-player
 - disable USE_NPIDENTIFIER_CACHE in npviewer (as patch-src_npw-viewer.c),
   which doesn't seems tested with the "generic" RPC interfaces

OK from abs@, and no particular objection to PR pkg/49705 and pkgsrc-users@.
Also thanks to Onno van der Linden for his first analysis about
newer nspluginwrapper APIs in PR pkg/47208.

Upstream changes (in NEWS file):

Version 1.4.4 - 30.Jun.2011
* Fix crash in some cases when the number of watched file descriptors decreases

Version 1.4.2 - 04.Jun.2011
* Fix crash in WebKit/GTK when npwrapper.so is incorrectly treated as a plugin
* Fix symbol versioning issues with _Unwind_GetIPInfo on some systems
* Fix install process with parallel make

Version 1.4.0 - 15.May.2011
* Report capabilities over RPC to fix logic based on NULL plugin/browser hooks
* Fix initialization bug that causes Flash 10.3 to report a version of 0
* Implement ClearSiteData NPAPI extension for managing Flash LSOs
* Work around bug in Konqueror that prevents plug-ins from functioning properly

Version 1.3.2 (BETA) - 23.Apr.2011
* Work around lack of client-side windows in Flash
* Fix race condition when NPP_Destroy was called while viewer is busy
* Fix build on modern Linux platforms
* Support NPAPI 0.24, in particular, Flash can now query for private browsing
* Don't export any symbols but those necessary
* Support XEmbeding npplayer into another application
* Remove NPClass::HasMethod cache; it was incorrect
* Fix initializing two wrapped plugins with the same name in the same process
* Work around Qt bug that breaks npplayer when Kopete is installed
* Release implicit grabs before forwarding events to fix Flash context menu hang
* Work around Firefox quirk that broke windowless Flash in Firefox 4
* Bind wrapper and viewer event loops together to avoid many many race conditions
* Redesign NPRuntime bridge to avoid leaking proxy objects
* Incorportate release number into ident string so update works on distro patches

Version 1.3.0 (BETA) - 02.Jan.2009
* Don't poll for Xt events in Gtk (XEMBED) plug-ins
* Use 40 Hz timer for Xt events only when necessary (Xt input sources)
* Add NPIdentifier and NPClass::HasMethod caches, i.e. lower RPC traffic
* Add support for multiple viewer paths, see --viewer-paths=PATH-EXPR
* Add basic checks for malloc()'ed buffer underflow/overflow
* Add checks for single-threaded calls into the browser (NPN_*() functions)

7 files changed, 68 insertions, 64 deletions

diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index 7b43fa6a7ba..fb8366e95f0 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -1,34 +1,46 @@
-# $NetBSD: Makefile,v 1.46 2015/04/25 14:25:02 tnn Exp $
+# $NetBSD: Makefile,v 1.47 2015/10/24 06:30:40 tsutsui Exp $
 #
 
-DISTNAME=	nspluginwrapper-1.2.2
-PKGREVISION=	27
+DISTNAME=	nspluginwrapper-1.4.4
 CATEGORIES=	www
-MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
-EXTRACT_SUFX=	.tar.bz2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:S/-/-i386-/}-1.x86_64.rpm
+MASTER_SITES=	http://nspluginwrapper.org/download/ \
+		http://teokurebsd.org/netbsd/packages/distfiles/nspluginwrapper/
+DISTFILES=	${DISTNAME}.tar.gz ${DISTNAME}-suse121-generic.${WRAPPER_ARCH}.tar.gz
 
-MAINTAINER=	abs@NetBSD.org
-HOMEPAGE=	http://gwenole.beauchesne.info/projects/nspluginwrapper/
+MAINTAINER=	tsutsui@NetBSD.org
+HOMEPAGE=	http://nspluginwrapper.org/
 COMMENT=	Use Netscape compatible plugins from other platforms
 LICENSE=	gnu-gpl-v2
 
-EMUL_PLATFORMS=		linux-i386
+EMUL_PLATFORMS=		linux-i386 linux-x86_64
 EMUL_MODULES.linux=	base gtk2 x11
+EMUL_REQD=		suse>=12.1
 NOT_FOR_PLATFORM=	Linux-*-*
 
 HAS_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake pkg-config
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--with-x11-prefix=${X11BASE}
 
-PLUGIN_SUBDIR=		lib/nspluginwrapper/i386/linux
+.include "../../mk/bsd.prefs.mk"
+
+.if ${EMUL_PLATFORM} == "linux-i386"
+WRAPPER_ARCH=		i386
+.elif ${EMUL_PLATFORM} == "linux-x86_64"
+WRAPPER_ARCH=		x86_64
+.endif
+
+PLUGIN_SUBDIR=		lib/nspluginwrapper/${WRAPPER_ARCH}/linux
 PLUGIN_INSTDIR=		${PREFIX}/${PLUGIN_SUBDIR}
 PLUGIN_SRCDIR=		${WRKDIR}/usr/${PLUGIN_SUBDIR}
 
 LDFLAGS.DragonFly=	-lgmodule-2.0
 
+SUBST_CLASSES+=		npw-config
+SUBST_STAGE.npw-config=	post-patch
+SUBST_FILES.npw-config=	src/npw-config.c
+SUBST_SED.npw-config=	-e "s|/usr/pkg/|${PREFIX}/|g"
+
 SUBST_CLASSES+=		npviewer
 SUBST_STAGE.npviewer=	post-build
 SUBST_FILES.npviewer=	${PLUGIN_SRCDIR}/npviewer
@@ -37,7 +49,7 @@ SUBST_SED.npviewer=	-e "s|/usr/|${PREFIX}/|g"
 INSTALLATION_DIRS=	${PLUGIN_INSTDIR}
 
 post-install:
-	${INSTALL_LIB} ${PLUGIN_SRCDIR}/libxpcom.so ${DESTDIR}${PLUGIN_INSTDIR}
+	${INSTALL_LIB} ${PLUGIN_SRCDIR}/libnoxshm.so ${DESTDIR}${PLUGIN_INSTDIR}
 	${INSTALL_SCRIPT} ${PLUGIN_SRCDIR}/npviewer ${DESTDIR}${PLUGIN_INSTDIR}
 	${INSTALL_LIB} ${PLUGIN_SRCDIR}/npviewer.bin ${DESTDIR}${PLUGIN_INSTDIR}
 
diff --git a/www/nspluginwrapper/PLIST b/www/nspluginwrapper/PLIST
index 11bf143a404..85d200f3fbe 100644
--- a/www/nspluginwrapper/PLIST
+++ b/www/nspluginwrapper/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/10/24 06:30:40 tsutsui 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
-lib/nspluginwrapper/i386/linux/npviewer.bin
-lib/nspluginwrapper/noarch/npviewer
+lib/nspluginwrapper/${MACHINE_ARCH}/linux/libnoxshm.so
+lib/nspluginwrapper/${MACHINE_ARCH}/linux/npviewer
+lib/nspluginwrapper/${MACHINE_ARCH}/linux/npviewer.bin
+lib/nspluginwrapper/noarch/npviewer.sh
diff --git a/www/nspluginwrapper/distinfo b/www/nspluginwrapper/distinfo
index 89a8779d010..dfe351d96d2 100644
--- a/www/nspluginwrapper/distinfo
+++ b/www/nspluginwrapper/distinfo
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.11 2013/10/12 12:39:15 wiz Exp $
+$NetBSD: distinfo,v 1.12 2015/10/24 06:30:40 tsutsui Exp $
 
-SHA1 (nspluginwrapper-1.2.2.tar.bz2) = be581c39dcc1a8d9a5b3f81e4650f553a30cf249
-RMD160 (nspluginwrapper-1.2.2.tar.bz2) = d5aa265966f87c51bb9ea4f2a079a87b74fdcbf3
-Size (nspluginwrapper-1.2.2.tar.bz2) = 327947 bytes
-SHA1 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 0d49757623c62da52292e48a0173024c14aa12cd
-RMD160 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 9cf3e6ac3e5171c2bbda71c082b6b9fc30d69a84
-Size (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 69425 bytes
-SHA1 (patch-Makefile) = 1bdcc3e90713b5aa08eda0efca4929a5903f1fbb
+SHA1 (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = cc093d1c6d6729434ec90e216afeae1601e0b3b4
+RMD160 (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = a9d79dcd31efc4b1a9b71e29694eff9c8555b10d
+SHA512 (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = 5b514f3a8dd2aad5f395181984995bdaa2cbe9f357d2767c88f2ac5f4c28f513b3023144ea9135ad2e7d0f854efa209dafe3fe00314bb7f0742174d7fc3769c1
+Size (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = 179439 bytes
+SHA1 (nspluginwrapper-1.4.4-suse121-generic.x86_64.tar.gz) = a8286f351979746b8887421ad04e32759c60331a
+RMD160 (nspluginwrapper-1.4.4-suse121-generic.x86_64.tar.gz) = a5fc4473a462f91f838f8b34faa2bb7bdcab9494
+SHA512 (nspluginwrapper-1.4.4-suse121-generic.x86_64.tar.gz) = a95295cf3a63cf982e8b04794c5010554d5ea1ab741ae5b3e89acc7c014d3deafe152ffca1abed966052b1c424a94e8440c9371529dd870a9efb1fd1caad9735
+Size (nspluginwrapper-1.4.4-suse121-generic.x86_64.tar.gz) = 161846 bytes
+SHA1 (nspluginwrapper-1.4.4.tar.gz) = ffb271a741215874808d4a77d0a0dd65588a8440
+RMD160 (nspluginwrapper-1.4.4.tar.gz) = 6acd93653aa8466e1e3703c2b794f32691c10d12
+SHA512 (nspluginwrapper-1.4.4.tar.gz) = 41126d98284cae6d25d23233b08ccca0dea841d457d4e41210282c6ab4c0fbf020f2ab4173ce39db8a47a1db20840bcc856f9c7309aa2e6ef2a777e3f2ebf503
+Size (nspluginwrapper-1.4.4.tar.gz) = 412513 bytes
 SHA1 (patch-aa) = 28f9e18e519337852cb47d04ed0c1cea76b3416d
 SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a
-SHA1 (patch-ac) = b42a1241abcbfc9344c810797785222cd79681ac
-SHA1 (patch-src_npw-player.c) = 14828d0644ce3823b89b373b36afdf29f9a563a1
+SHA1 (patch-ac) = 87cb838f6b203947d9efc4350313e410d06d486e
+SHA1 (patch-src_npw-viewer.c) = eb8855ae6d1015eb7627ada5c39af5e0d80f0e75
diff --git a/www/nspluginwrapper/patches/patch-Makefile b/www/nspluginwrapper/patches/patch-Makefile
deleted file mode 100644
index 25f91ca011c..00000000000
--- a/www/nspluginwrapper/patches/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2013/10/12 12:39:15 wiz Exp $
-
-Link against libraries whose functions are used, don't depend on
-them being pulled in by the linker.
-
---- Makefile.orig	2009-01-02 08:54:10.000000000 +0000
-+++ Makefile
-@@ -148,7 +148,7 @@ npplayer_SOURCES  = npw-player.c debug.c
- npplayer_OBJECTS  = $(npplayer_SOURCES:%.c=npplayer-%.o)
- npplayer_CFLAGS   = $(GTK_CFLAGS) $(MOZILLA_CFLAGS) $(CURL_CFLAGS) $(X_CFLAGS)
- npplayer_LDFLAGS  = $(GTK_LDFLAGS) $(CURL_LDFLAGS) $(X_LDFLAGS)
--npplayer_LDFLAGS += -lgthread-2.0 $(libpthread_LDFLAGS) $(libsocket_LDFLAGS)
-+npplayer_LDFLAGS += -lgthread-2.0 -lgmodule-2.0 $(libpthread_LDFLAGS) $(libsocket_LDFLAGS)
- 
- libxpcom_LIBRARY = libxpcom.so
- libxpcom_RAWSRCS = libxpcom.c debug.c
diff --git a/www/nspluginwrapper/patches/patch-ac b/www/nspluginwrapper/patches/patch-ac
index 53f554fd4f9..6fa164b5cc1 100644
--- a/www/nspluginwrapper/patches/patch-ac
+++ b/www/nspluginwrapper/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2012/05/03 06:09:55 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2015/10/24 06:30:40 tsutsui 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
++++ src/npw-viewer.sh
+@@ -83,6 +83,13 @@
+ NPW_USE_VALGRIND=${NPW_USE_VALGRIND:-no}
+ can_use_valgrind="no"
  
 +case $OS in
-+FreeBSD|NetBSD)
++freebsd|netbsd)
 +    # preset LD_PRELOAD is most likely for the native emul
 +    unset LD_PRELOAD
 +    ;;
diff --git a/www/nspluginwrapper/patches/patch-src_npw-player.c b/www/nspluginwrapper/patches/patch-src_npw-player.c
deleted file mode 100644
index 64a2aaa434d..00000000000
--- a/www/nspluginwrapper/patches/patch-src_npw-player.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_npw-player.c,v 1.1 2012/05/03 06:09:55 wiz Exp $
-
-Adapt for glib-2.32.
-
---- src/npw-player.c.orig	2009-01-02 08:54:10.000000000 +0000
-+++ src/npw-player.c
-@@ -21,8 +21,6 @@
- #include "sysdeps.h"
- #include <unistd.h>
- #include <glib.h>
--#include <glib/gstdio.h>
--#include <glib/gthread.h>
- #include <gtk/gtk.h>
- #include <gdk/gdkx.h>
- #include <gdk/gdkkeysyms.h>
diff --git a/www/nspluginwrapper/patches/patch-src_npw-viewer.c b/www/nspluginwrapper/patches/patch-src_npw-viewer.c
new file mode 100644
index 00000000000..6940c1395b3
--- /dev/null
+++ b/www/nspluginwrapper/patches/patch-src_npw-viewer.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_npw-viewer.c,v 1.1 2015/10/24 06:30:40 tsutsui Exp $
+
+Disable use_cache which seems to cause weird behavior.
+
+--- src/npw-viewer.c.orig	2011-07-01 03:18:57.000000000 +0000
++++ src/npw-viewer.c
+@@ -56,7 +56,11 @@
+ #define USE_XEMBED_HACK 1
+ 
+ // Define to use NPIdentifier cache
++#if defined(BUILD_GENERIC)
++#define USE_NPIDENTIFIER_CACHE 0
++#else
+ #define USE_NPIDENTIFIER_CACHE 1
++#endif
+ #define NPIDENTIFIER_CACHE_SIZE 256
+ 
+ // RPC global connections