Index: www/nspluginwrapper/Makefile =================================================================== RCS file: /home/pcvs/ports/www/nspluginwrapper/Makefile,v retrieving revision 1.21 diff -p -u -r1.21 Makefile --- www/nspluginwrapper/Makefile 25 Feb 2011 08:52:30 -0000 1.21 +++ www/nspluginwrapper/Makefile 20 May 2011 18:25:57 -0000 @@ -6,26 +6,24 @@ # PORTNAME= nspluginwrapper -PORTVERSION= 1.2.2 -PORTREVISION= 8 +PORTVERSION= 1.4.0 CATEGORIES= www linux emulators -MASTER_SITES= LOCAL/ehaupt -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RPMFILE} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= http://web.mit.edu/davidben/Public/nspluginwrapper/ \ + LOCAL/jkim:binfile +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${BINFILE}:binfile -MAINTAINER= malus.x@gmail.com -COMMENT= A compatibility plugin for Netscape 4 (NPAPI) plugins +MAINTAINER= jkim@FreeBSD.org +COMMENT= A compatibility plugin for Mozilla NPAPI plugins -EXTRACT_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl CONFLICTS= nspluginwrapper-1.3.* -RPMFILE= ${PORTNAME}-i386-${PORTVERSION}-1.x86_64.rpm +BINBUILD= 1 +BINFILE= ${PORTNAME}-i386-${PORTVERSION}-${BINBUILD}${EXTRACT_SUFX} ONLY_FOR_ARCHS= i386 amd64 -USE_BZIP2= yes USE_LINUX= yes USE_LINUX_APPS= gtk2 USE_XORG= x11 xext xt @@ -37,30 +35,35 @@ 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} \ +CONFIGURE_ARGS= --enable-generic --enable-strip --prefix=${PREFIX} \ + --target-os=linux --target-cpu=i386 \ --with-cc=${CC} --with-cxx=${CXX} LIBDIR= ${PREFIX}/lib/${PORTNAME} -PLIST_SUB= LIBDIR="${LIBDIR:C/^${PREFIX}\///}" ARCH="${ARCH}" +PLIST_SUB= LIBDIR="${LIBDIR:C/^${PREFIX}\///}" HOST_ARCH="${HOST_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 +SUB_FILES= npviewer +SUB_LIST+= NSPLUGINWRAPPER="${LIBDIR}" + +.include + +.if ${ARCH} == "amd64" +HOST_ARCH= x86_64 +.else +HOST_ARCH= ${ARCH} +.endif post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ - ${WRKSRC}/src/npw-config.c - ${RM} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/npviewer.orig + ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ + ${WRKSRC}/src/npw-config.c post-install: ${MKDIR} ${LIBDIR}/i386/linux - ${INSTALL_SCRIPT} ${WRKSRC}/usr/lib/nspluginwrapper/i386/linux/* \ - ${LIBDIR}/i386/linux/ + ${INSTALL_PROGRAM} ${WRKDIR}/usr/lib/nspluginwrapper/i386/linux/*.bin \ + ${WRKDIR}/usr/lib/nspluginwrapper/i386/linux/*.so \ + ${LIBDIR}/i386/linux/ + ${INSTALL_SCRIPT} ${WRKDIR}/npviewer ${LIBDIR}/i386/linux/ @${CAT} ${PKGMESSAGE} -.include +.include Index: www/nspluginwrapper/distinfo =================================================================== RCS file: /home/pcvs/ports/www/nspluginwrapper/distinfo,v retrieving revision 1.6 diff -p -u -r1.6 distinfo --- www/nspluginwrapper/distinfo 19 Mar 2011 12:34:52 -0000 1.6 +++ www/nspluginwrapper/distinfo 20 May 2011 18:25:57 -0000 @@ -1,4 +1,4 @@ -SHA256 (nspluginwrapper-1.2.2.tar.bz2) = 4e6cbb7aeda1c9f0d6e5a17e729160b5d3f3e7048f90353238806289752175c3 -SIZE (nspluginwrapper-1.2.2.tar.bz2) = 327947 -SHA256 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = c9572430351b716ca1c63170150981cfc8546f0cb7e03c7a75f1d0687db99e6f -SIZE (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 69425 +SHA256 (nspluginwrapper-1.4.0.tar.gz) = 39b9034dc840ac6a21701406d96449e578b787aad7f6a09d97113776cf8251b3 +SIZE (nspluginwrapper-1.4.0.tar.gz) = 412189 +SHA256 (nspluginwrapper-i386-1.4.0-1.tar.gz) = 4cd133497e5fb632203a526fd02cf19dcf17333afe95fc47a9f6b0f9d1c06b99 +SIZE (nspluginwrapper-i386-1.4.0-1.tar.gz) = 66189 Index: www/nspluginwrapper/pkg-descr =================================================================== RCS file: /home/pcvs/ports/www/nspluginwrapper/pkg-descr,v retrieving revision 1.2 diff -p -u -r1.2 pkg-descr --- www/nspluginwrapper/pkg-descr 18 Jun 2010 09:19:51 -0000 1.2 +++ www/nspluginwrapper/pkg-descr 20 May 2011 18:25:57 -0000 @@ -3,4 +3,4 @@ The nspluginwrapper is an Open Source co not built for. For example, you can use the Adobe Flash plugin on Linux/x86_64, NetBSD and FreeBSD platforms. -WWW: http://freshmeat.net/projects/nspluginwrapper/ +WWW: http://nspluginwrapper.davidben.net Index: www/nspluginwrapper/pkg-plist =================================================================== RCS file: /home/pcvs/ports/www/nspluginwrapper/pkg-plist,v retrieving revision 1.2 diff -p -u -r1.2 pkg-plist --- www/nspluginwrapper/pkg-plist 8 Jan 2009 19:19:24 -0000 1.2 +++ www/nspluginwrapper/pkg-plist 20 May 2011 18:25:57 -0000 @@ -1,16 +1,15 @@ bin/nspluginplayer bin/nspluginwrapper -%%LIBDIR%%/%%ARCH%%/freebsd/npconfig -%%LIBDIR%%/%%ARCH%%/freebsd/npplayer -%%LIBDIR%%/%%ARCH%%/freebsd/npwrapper.so +%%LIBDIR%%/%%HOST_ARCH%%/freebsd/npconfig +%%LIBDIR%%/%%HOST_ARCH%%/freebsd/npplayer +%%LIBDIR%%/%%HOST_ARCH%%/freebsd/npwrapper.so %%LIBDIR%%/i386/linux/libnoxshm.so -%%LIBDIR%%/i386/linux/libxpcom.so %%LIBDIR%%/i386/linux/npviewer %%LIBDIR%%/i386/linux/npviewer.bin -%%LIBDIR%%/noarch/npviewer +%%LIBDIR%%/noarch/npviewer.sh @dirrm %%LIBDIR%%/noarch @dirrm %%LIBDIR%%/i386/linux -@dirrm %%LIBDIR%%/%%ARCH%%/freebsd +@dirrm %%LIBDIR%%/%%HOST_ARCH%%/freebsd @dirrm %%LIBDIR%%/i386 -@dirrmtry %%LIBDIR%%/%%ARCH%% +@dirrmtry %%LIBDIR%%/%%HOST_ARCH%% @dirrm %%LIBDIR%% Index: www/nspluginwrapper/files/npviewer.in =================================================================== RCS file: www/nspluginwrapper/files/npviewer.in diff -N www/nspluginwrapper/files/npviewer.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/nspluginwrapper/files/npviewer.in 20 May 2011 18:25:57 -0000 @@ -0,0 +1,5 @@ +#!/bin/sh +TARGET_OS=linux +TARGET_ARCH=i386 +ulimit -s 32768 2>/dev/null +. %%NSPLUGINWRAPPER%%/noarch/npviewer.sh Index: www/nspluginwrapper/files/patch-configure =================================================================== RCS file: /home/pcvs/ports/www/nspluginwrapper/files/patch-configure,v retrieving revision 1.3 diff -p -u -r1.3 patch-configure --- www/nspluginwrapper/files/patch-configure 9 Jan 2009 08:31:01 -0000 1.3 +++ www/nspluginwrapper/files/patch-configure 20 May 2011 18:25:57 -0000 @@ -16,12 +16,3 @@ TMPC="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.c" TMPO="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.o" -@@ -728,7 +723,7 @@ - elif test "$host_cpu" = "x86_64" ; then - echo "ARCH=x86_64" >> $config_mak - echo "#define HOST_X86_64 1" >> $config_h -- echo "#define HOST_ARCH \"x86_64\"" >> $config_h -+ echo "#define HOST_ARCH \"amd64\"" >> $config_h - elif test "$host_cpu" = "ppc" ; then - echo "ARCH=ppc" >> $config_mak - echo "#define HOST_PPC 1" >> $config_h Index: www/nspluginwrapper/files/patch-src-npw-config.c =================================================================== RCS file: /home/pcvs/ports/www/nspluginwrapper/files/patch-src-npw-config.c,v retrieving revision 1.1 diff -p -u -r1.1 patch-src-npw-config.c --- www/nspluginwrapper/files/patch-src-npw-config.c 4 Apr 2007 17:05:46 -0000 1.1 +++ www/nspluginwrapper/files/patch-src-npw-config.c 20 May 2011 18:25:57 -0000 @@ -1,13 +1,33 @@ ---- ./src/npw-config.c.orig Sun Mar 4 23:01:22 2007 -+++ ./src/npw-config.c Wed Apr 4 20:20:59 2007 -@@ -119,8 +119,8 @@ +--- src/npw-config.c.orig 2011-04-23 14:47:21.000000000 -0400 ++++ src/npw-config.c 2011-04-25 17:46:44.000000000 -0400 +@@ -186,8 +186,9 @@ #if defined(__FreeBSD__) { static const char *freebsd_dirs[] = { - "/usr/X11R6/" LIB "/browser_plugins", - "/usr/X11R6/" LIB "/firefox/plugins", -+ "/usr/local/" LIB "/browser_plugins", -+ "/usr/local/" LIB "/firefox/plugins", ++ "%%LOCALBASE%%/" LIB "/browser_plugins", ++ "%%LOCALBASE%%/" LIB "/firefox/plugins", ++ "%%LOCALBASE%%/" LIB "/seamonkey/plugins", }; dirs = freebsd_dirs; } +@@ -283,11 +284,13 @@ + "/usr/lib32/nsbrowser/plugins", // XXX how unfortunate + "/usr/lib64/nsbrowser/plugins", + #if defined(__FreeBSD__) +- "/usr/X11R6/lib/browser_plugins", +- "/usr/X11R6/lib/firefox/plugins", +- "/usr/X11R6/lib/linux-mozilla/plugins", +- "/usr/local/lib/npapi/linux-flashplugin", +- "/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux", ++ "%%LOCALBASE%%/lib/browser_plugins", ++ "%%LOCALBASE%%/lib/firefox/plugins", ++ "%%LOCALBASE%%/lib/seamonkey/plugins", ++ "%%LOCALBASE%%/lib/npapi/linux-flashplugin", ++ "%%LOCALBASE%%/lib/npapi/linux-f10-flashplugin", ++ "%%LOCALBASE%%/Adobe/Acrobat7.0/ENU/Browser/intellinux", ++ "%%LOCALBASE%%/Adobe/Reader8/ENU/Adobe/Reader8/Browser/intellinux", + #endif + #if defined(__DragonFly__) + "/usr/pkg/lib/netscape/plugins", Index: www/nspluginwrapper/files/patch-src-npw-wrapper.c =================================================================== RCS file: www/nspluginwrapper/files/patch-src-npw-wrapper.c diff -N www/nspluginwrapper/files/patch-src-npw-wrapper.c --- www/nspluginwrapper/files/patch-src-npw-wrapper.c 4 Apr 2007 17:05:46 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- ./src/npw-wrapper.c.orig Sun Mar 4 23:01:22 2007 -+++ ./src/npw-wrapper.c Wed Apr 4 20:20:59 2007 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - #include Index: www/nspluginwrapper/files/patch-ulimit =================================================================== RCS file: www/nspluginwrapper/files/patch-ulimit diff -N www/nspluginwrapper/files/patch-ulimit --- www/nspluginwrapper/files/patch-ulimit 6 Aug 2009 15:59:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -Index: usr/lib/nspluginwrapper/i386/linux/npviewer -@@ -1,4 +1,5 @@ - #!/bin/sh - TARGET_OS=linux - TARGET_ARCH=i386 -+ulimit -s 32768 2>/dev/null - . /usr/local/lib/nspluginwrapper/noarch/npviewer Index: www/nspluginwrapper-devel/Makefile =================================================================== RCS file: /home/pcvs/ports/www/nspluginwrapper-devel/Makefile,v retrieving revision 1.28 diff -p -u -r1.28 Makefile --- www/nspluginwrapper-devel/Makefile 26 Apr 2011 18:56:14 -0000 1.28 +++ www/nspluginwrapper-devel/Makefile 20 May 2011 18:25:57 -0000 @@ -15,11 +15,13 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ MAINTAINER= jkim@FreeBSD.org COMMENT= A compatibility plugin for Mozilla NPAPI (development version) +IGNORE= is now older than www/nspluginwrapper + LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl LATEST_LINK= ${PORTNAME}-devel -CONFLICTS= nspluginwrapper-1.2.* +CONFLICTS= nspluginwrapper-1.[24].* BINBUILD= 1 BINFILE= ${PORTNAME}-i386-${PORTVERSION}-${BINBUILD}${EXTRACT_SUFX} Index: www/nspluginwrapper-devel/pkg-descr =================================================================== RCS file: /home/pcvs/ports/www/nspluginwrapper-devel/pkg-descr,v retrieving revision 1.2 diff -p -u -r1.2 pkg-descr --- www/nspluginwrapper-devel/pkg-descr 26 Apr 2011 18:56:14 -0000 1.2 +++ www/nspluginwrapper-devel/pkg-descr 20 May 2011 18:25:57 -0000 @@ -3,4 +3,4 @@ The nspluginwrapper is an Open Source co not built for. For example, you can use the Adobe Flash plugin on Linux/x86_64, NetBSD and FreeBSD platforms. -WWW: https://github.com/davidben/nspluginwrapper +WWW: http://nspluginwrapper.davidben.net