3 files changed, 192 insertions, 18 deletions

diff --git a/www/nspluginwrapper-devel/Makefile b/www/nspluginwrapper-devel/Makefile
index 87c3cac68163..b13c4f3a62f3 100644
--- a/www/nspluginwrapper-devel/Makefile
+++ b/www/nspluginwrapper-devel/Makefile
@@ -7,26 +7,21 @@
 
 PORTNAME=	nspluginwrapper
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www linux emulators
-MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/:hostsrc \
-		LOCAL/jkim:hostsrc \
-		LOCAL/jkim:targetbin
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:hostsrc \
-		${RPMFILE}:targetbin
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	LOCAL/jkim
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${BINFILE}${EXTRACT_SUFX}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	A compatibility plugin for Mozilla NPAPI (development version)
 
-EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
 LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
 
 LATEST_LINK=	${PORTNAME}-devel
 
 CONFLICTS=	nspluginwrapper-1.2.*
 
-RPMFILE=	${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm
+BINFILE=	${PORTNAME}-i386-${PORTVERSION}-2
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -42,9 +37,10 @@ USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--enable-generic --prefix=${PREFIX} --target-os=linux \
-		--target-cpu=i386 --with-x11-prefix=${LOCALBASE} \
-		--with-cc=${CC} --with-cxx=${CXX}
+CONFIGURE_ARGS=	--enable-generic --enable-strip --prefix=${PREFIX} \
+		--target-os=linux --target-cpu=i386 \
+		--with-cc=${CC} --with-cxx=${CXX} \
+		--with-x11-prefix=${LOCALBASE}
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
@@ -60,10 +56,10 @@ HOST_ARCH=	${ARCH}
 
 # We must manually extract, modify, and install the Linux version of npviewer.
 post-extract:
-	cd ${WRKSRC} &&	rpm2cpio ${DISTDIR}/${RPMFILE} | ${CPIO} -id
 	${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
-	    ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer
-	@${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.bak
+	    ${WRKDIR}/usr/lib/nspluginwrapper/i386/linux/npviewer
+	@${RM} ${WRKDIR}/usr/lib/nspluginwrapper/i386/linux/npviewer.bak
+	@${MV} ${WRKDIR}/usr ${WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
diff --git a/www/nspluginwrapper-devel/distinfo b/www/nspluginwrapper-devel/distinfo
index cafebb0aa712..e5a5d80b645c 100644
--- a/www/nspluginwrapper-devel/distinfo
+++ b/www/nspluginwrapper-devel/distinfo
@@ -1,6 +1,6 @@
 MD5 (nspluginwrapper-1.3.0.tar.bz2) = 188f77bd3427c131ccba4bfdb25892a9
 SHA256 (nspluginwrapper-1.3.0.tar.bz2) = b8900bd5f0bd950f95b963e5c8f5e20d7d15cc70e777b6058289687ad968b21c
 SIZE (nspluginwrapper-1.3.0.tar.bz2) = 336049
-MD5 (nspluginwrapper-i386-1.3.0-1.x86_64.rpm) = 5363d7c27bbd967f2609c3bcbe70bc61
-SHA256 (nspluginwrapper-i386-1.3.0-1.x86_64.rpm) = d8868156e9906badc83aeb0971768d3bbc13807e2deefc4c10da3b231c3fab5c
-SIZE (nspluginwrapper-i386-1.3.0-1.x86_64.rpm) = 73324
+MD5 (nspluginwrapper-i386-1.3.0-2.tar.bz2) = b36157756e1d51010a27b3667be8999b
+SHA256 (nspluginwrapper-i386-1.3.0-2.tar.bz2) = d807c161ffe64689d50f49dc1212c6aadf556b928c26884d7f444fddb4e8eb73
+SIZE (nspluginwrapper-i386-1.3.0-2.tar.bz2) = 63613
diff --git a/www/nspluginwrapper-devel/files/patch-fix-npident-array-sending b/www/nspluginwrapper-devel/files/patch-fix-npident-array-sending
new file mode 100644
index 000000000000..568a4ea1f79a
--- /dev/null
+++ b/www/nspluginwrapper-devel/files/patch-fix-npident-array-sending
@@ -0,0 +1,178 @@
+Index: src/npw-viewer.c
+===================================================================
+--- src/npw-viewer.c	(revision 942)
++++ src/npw-viewer.c	(working copy)
+@@ -2059,7 +2059,7 @@
+ 								RPC_METHOD_NPN_INVOKE,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, methodName,
++								RPC_TYPE_NP_IDENTIFIER, &methodName,
+ 								RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args,
+ 								RPC_TYPE_INVALID);
+ 
+@@ -2249,7 +2249,7 @@
+ 								RPC_METHOD_NPN_GET_PROPERTY,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, propertyName,
++								RPC_TYPE_NP_IDENTIFIER, &propertyName,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2311,7 +2311,7 @@
+ 								RPC_METHOD_NPN_SET_PROPERTY,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, propertyName,
++								RPC_TYPE_NP_IDENTIFIER, &propertyName,
+ 								RPC_TYPE_NP_VARIANT, value,
+ 								RPC_TYPE_INVALID);
+ 
+@@ -2370,7 +2370,7 @@
+ 								RPC_METHOD_NPN_REMOVE_PROPERTY,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, propertyName,
++								RPC_TYPE_NP_IDENTIFIER, &propertyName,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2427,7 +2427,7 @@
+ 								RPC_METHOD_NPN_HAS_PROPERTY,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, propertyName,
++								RPC_TYPE_NP_IDENTIFIER, &propertyName,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2484,7 +2484,7 @@
+ 								RPC_METHOD_NPN_HAS_METHOD,
+ 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, methodName,
++								RPC_TYPE_NP_IDENTIFIER, &methodName,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2780,7 +2780,7 @@
+ 
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPN_IDENTIFIER_IS_STRING,
+-								RPC_TYPE_NP_IDENTIFIER, identifier,
++								RPC_TYPE_NP_IDENTIFIER, &identifier,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2838,7 +2838,7 @@
+ 
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPN_UTF8_FROM_IDENTIFIER,
+-								RPC_TYPE_NP_IDENTIFIER, identifier,
++								RPC_TYPE_NP_IDENTIFIER, &identifier,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -2902,7 +2902,7 @@
+ 
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPN_INT_FROM_IDENTIFIER,
+-								RPC_TYPE_NP_IDENTIFIER, identifier,
++								RPC_TYPE_NP_IDENTIFIER, &identifier,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+Index: src/npw-wrapper.c
+===================================================================
+--- src/npw-wrapper.c	(revision 942)
++++ src/npw-wrapper.c	(working copy)
+@@ -1528,7 +1528,7 @@
+ 	free(name);
+ 
+   return rpc_method_send_reply(connection,
+-							   RPC_TYPE_NP_IDENTIFIER, ident,
++							   RPC_TYPE_NP_IDENTIFIER, &ident,
+ 							   RPC_TYPE_INVALID);
+ }
+ 
+@@ -1601,7 +1601,7 @@
+   NPIdentifier ident = g_NPN_GetIntIdentifier(intid);
+ 
+   return rpc_method_send_reply(connection,
+-							   RPC_TYPE_NP_IDENTIFIER, ident,
++							   RPC_TYPE_NP_IDENTIFIER, &ident,
+ 							   RPC_TYPE_INVALID);
+ }
+ 
+Index: src/npruntime.c
+===================================================================
+--- src/npruntime.c	(revision 942)
++++ src/npruntime.c	(working copy)
+@@ -221,7 +221,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_HAS_METHOD,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -327,7 +327,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_INVOKE,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args,
+ 								RPC_TYPE_INVALID);
+ 
+@@ -509,7 +509,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_HAS_PROPERTY,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -599,7 +599,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_GET_PROPERTY,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+@@ -684,7 +684,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_SET_PROPERTY,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_NP_VARIANT, value,
+ 								RPC_TYPE_INVALID);
+ 
+@@ -763,7 +763,7 @@
+   int error = rpc_method_invoke(g_rpc_connection,
+ 								RPC_METHOD_NPCLASS_REMOVE_PROPERTY,
+ 								RPC_TYPE_NP_OBJECT, npobj,
+-								RPC_TYPE_NP_IDENTIFIER, name,
++								RPC_TYPE_NP_IDENTIFIER, &name,
+ 								RPC_TYPE_INVALID);
+ 
+   if (error != RPC_ERROR_NO_ERROR) {
+Index: src/npw-rpc.c
+===================================================================
+--- src/npw-rpc.c	(revision 942)
++++ src/npw-rpc.c	(working copy)
+@@ -1252,7 +1252,7 @@
+ // the browser side
+ static int do_send_NPIdentifier(rpc_message_t *message, void *p_value)
+ {
+-  NPIdentifier ident = (NPIdentifier)p_value;
++  NPIdentifier ident = *(NPIdentifier *)p_value;
+   int id = 0;
+   if (ident) {
+ #ifdef BUILD_WRAPPER