Date: Fri, 17 Feb 2017 06:49:42 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r434271 - in branches/2017Q1/www/nspluginwrapper: . files Message-ID: <201702170649.v1H6ngBl060861@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri Feb 17 06:49:42 2017 New Revision: 434271 URL: https://svnweb.freebsd.org/changeset/ports/434271 Log: MFH: r434240 Catch up with r428854 to fix automatic plugin discovery of Flash Player. Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/www/nspluginwrapper/Makefile branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/www/nspluginwrapper/Makefile ============================================================================== --- branches/2017Q1/www/nspluginwrapper/Makefile Fri Feb 17 06:18:55 2017 (r434270) +++ branches/2017Q1/www/nspluginwrapper/Makefile Fri Feb 17 06:49:42 2017 (r434271) @@ -3,7 +3,7 @@ PORTNAME= nspluginwrapper PORTVERSION= 1.4.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www linux emulators MASTER_SITES= http://nspluginwrapper.org/download/ \ LOCAL/jkim \ @@ -35,24 +35,17 @@ USE_XORG= x11 xext xt CFLAGS+= -std=c99 CONFIGURE_ARGS= --enable-generic --enable-strip --prefix=${PREFIX} \ - --target-os=linux --target-cpu=i386 \ + --target-cpu=i386 --target-os=linux \ --with-cc=${CC} --with-cxx=${CXX} LIBDIR= ${PREFIX}/lib/${PORTNAME} LINUX_BINDIR= usr/lib/nspluginwrapper/i386/linux -PLIST_SUB= LIBDIR="${LIBDIR:C/^${PREFIX}\///}" HOST_ARCH="${HOST_ARCH}" +PLIST_SUB= HOST_ARCH="${ARCH:S/amd64/x86_64/}" \ + LIBDIR="${LIBDIR:C/^${PREFIX}\///}" SUB_FILES= npviewer -SUB_LIST+= NSPLUGINWRAPPER="${LIBDIR}" - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "amd64" -HOST_ARCH= x86_64 -.else -HOST_ARCH= ${ARCH} -.endif +SUB_LIST= NSPLUGINWRAPPER="${LIBDIR}" post-patch: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ @@ -66,4 +59,4 @@ post-install: ${WRKDIR}/${LINUX_BINDIR}/*.so ${STAGEDIR}${LIBDIR}/i386/linux/ ${INSTALL_SCRIPT} ${WRKDIR}/npviewer ${STAGEDIR}${LIBDIR}/i386/linux/ -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c ============================================================================== --- branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c Fri Feb 17 06:18:55 2017 (r434270) +++ branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c Fri Feb 17 06:49:42 2017 (r434271) @@ -1,6 +1,6 @@ ---- ./src/npw-config.c.orig 2011-07-01 06:18:57.000000000 +0300 -+++ ./src/npw-config.c 2014-03-28 07:33:35.829791175 +0200 -@@ -133,8 +133,9 @@ +--- src/npw-config.c.orig 2011-07-01 03:18:57 UTC ++++ src/npw-config.c +@@ -133,8 +133,9 @@ static const char *get_system_mozilla_pl #if defined(__FreeBSD__) { static const char *freebsd_dirs[] = { @@ -12,7 +12,7 @@ }; dirs = freebsd_dirs; } -@@ -232,11 +233,14 @@ +@@ -232,11 +233,13 @@ static const char **get_mozilla_plugin_d "/usr/lib32/nsbrowser/plugins", // XXX how unfortunate "/usr/lib64/nsbrowser/plugins", #if defined(__FreeBSD__) @@ -24,8 +24,7 @@ + "%%LOCALBASE%%/lib/browser_plugins", + "%%LOCALBASE%%/lib/firefox/plugins", + "%%LOCALBASE%%/lib/seamonkey/plugins", -+ "%%LOCALBASE%%/lib/browser_plugins/linux-f10-flashplugin", -+ "%%LOCALBASE%%/lib/browser_plugins/linux-c6-flashplugin", ++ "%%LOCALBASE%%/lib/browser_plugins/linux-flashplayer", + "%%LOCALBASE%%/lib/browser_plugins/symlinks/linux-firefox", + "%%LOCALBASE%%/Adobe/Reader8/ENU/Adobe/Reader8/Browser/intellinux", + "%%LOCALBASE%%/Adobe/Reader9/ENU/Adobe/Reader9/Browser/intellinux",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702170649.v1H6ngBl060861>