4 files changed, 24 insertions, 38 deletions

diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index ecb7ab18d24b..a4a2bc3086b9 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nspluginwrapper
-PORTVERSION=	1.0.0
+PORTVERSION=	1.2.2
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RPMFILE}
@@ -16,6 +16,7 @@ MAINTAINER=	malus.x@gmail.com
 COMMENT=	A compatibility plugin for Netscape 4 (NPAPI) plugins
 
 EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
+LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2
 
 RPMFILE=	${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm
@@ -24,8 +25,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 USE_BZIP2=	yes
 USE_LINUX=	yes
-USE_XLIB=	yes
-USE_GNOME=	glib20 pkgconfig
+USE_XORG=	x11 xext xt
+USE_GNOME=	glib20 gtk20 pkgconfig
 
 CFLAGS+=	-std=c99
 
@@ -33,8 +34,9 @@ USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--prefix=${PREFIX} --target-os=linux --target-cpu=i386 \
-		--with-x11-prefix=${LOCALBASE} --with-cc=${CC} --with-cxx=${CXX}
+CONFIGURE_ARGS=	--enable-generic --prefix=${PREFIX} --target-os=linux \
+		--target-cpu=i386 --with-x11-prefix=${LOCALBASE} \
+		--with-cc=${CC} --with-cxx=${CXX}
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
@@ -48,19 +50,12 @@ post-extract:
 	${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.bak
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,x86_64,amd64,g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/configure
-
+	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
+		${WRKSRC}/src/npw-config.c
 post-install:
 	${MKDIR} ${LIBDIR}/i386/linux
 	${INSTALL_SCRIPT} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/* \
 	     ${LIBDIR}/i386/linux/
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-# XXX switch to USE_XORG once XFree86-4 is removed
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
-RUN_DEPENDS+=	${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/nspluginwrapper/distinfo b/www/nspluginwrapper/distinfo
index e917288778f2..07ce5a70e165 100644
--- a/www/nspluginwrapper/distinfo
+++ b/www/nspluginwrapper/distinfo
@@ -1,6 +1,6 @@
-MD5 (nspluginwrapper-1.0.0.tar.bz2) = 054e6023c1080b850d72f6c76485003f
-SHA256 (nspluginwrapper-1.0.0.tar.bz2) = e5c4661eb91d05fc3da2f4ccf6e0769e8cd097ac232ffc6afe16e645729a02d5
-SIZE (nspluginwrapper-1.0.0.tar.bz2) = 271028
-MD5 (nspluginwrapper-i386-1.0.0-1.x86_64.rpm) = aede6a34555e78328019014cacfb64d3
-SHA256 (nspluginwrapper-i386-1.0.0-1.x86_64.rpm) = fd39e7b6f07298c0ccb925f9f2e1e9a39241537d8552d2640ee26e4dd24a5f72
-SIZE (nspluginwrapper-i386-1.0.0-1.x86_64.rpm) = 53496
+MD5 (nspluginwrapper-1.2.2.tar.bz2) = 197e3439aa7136addb88972e48c2fe4a
+SHA256 (nspluginwrapper-1.2.2.tar.bz2) = 4e6cbb7aeda1c9f0d6e5a17e729160b5d3f3e7048f90353238806289752175c3
+SIZE (nspluginwrapper-1.2.2.tar.bz2) = 327947
+MD5 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = a7c7d46d0ae887a0fab6cd14348c36aa
+SHA256 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = c9572430351b716ca1c63170150981cfc8546f0cb7e03c7a75f1d0687db99e6f
+SIZE (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 69425
diff --git a/www/nspluginwrapper/files/patch-npapi_nspr_prcpucfg.h b/www/nspluginwrapper/files/patch-npapi_nspr_prcpucfg.h
deleted file mode 100644
index 3bec95c9b353..000000000000
--- a/www/nspluginwrapper/files/patch-npapi_nspr_prcpucfg.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./npapi/nspr/prcpucfg.h.orig	Wed Apr  4 20:26:11 2007
-+++ ./npapi/nspr/prcpucfg.h	Wed Apr  4 20:27:40 2007
-@@ -229,7 +229,7 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
--#elif defined(__x86_64__)
-+#elif defined(__x86_64__) || defined(__amd64__)
- 
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
diff --git a/www/nspluginwrapper/pkg-plist b/www/nspluginwrapper/pkg-plist
index 98f8ea352a63..51cac4bf80d9 100644
--- a/www/nspluginwrapper/pkg-plist
+++ b/www/nspluginwrapper/pkg-plist
@@ -1,14 +1,16 @@
+bin/nspluginplayer
 bin/nspluginwrapper
 %%LIBDIR%%/%%ARCH%%/freebsd/npconfig
+%%LIBDIR%%/%%ARCH%%/freebsd/npplayer
 %%LIBDIR%%/%%ARCH%%/freebsd/npwrapper.so
-%%LIBDIR%%/i386/linux/npviewer.bin
-%%LIBDIR%%/i386/linux/npviewer
+%%LIBDIR%%/i386/linux/libnoxshm.so
 %%LIBDIR%%/i386/linux/libxpcom.so
-%%LIBDIR%%/noarch/mkruntime
+%%LIBDIR%%/i386/linux/npviewer
+%%LIBDIR%%/i386/linux/npviewer.bin
 %%LIBDIR%%/noarch/npviewer
+@dirrm %%LIBDIR%%/noarch
+@dirrm %%LIBDIR%%/i386/linux
 @dirrm %%LIBDIR%%/%%ARCH%%/freebsd
+@dirrm %%LIBDIR%%/i386
 @dirrmtry %%LIBDIR%%/%%ARCH%%
-@dirrm %%LIBDIR%%/i386/linux
-@dirrmtry %%LIBDIR%%/i386
-@dirrm %%LIBDIR%%/noarch
 @dirrm %%LIBDIR%%