Index: branches/2017Q1/www/nspluginwrapper/Makefile
===================================================================
--- branches/2017Q1/www/nspluginwrapper/Makefile	(revision 434270)
+++ branches/2017Q1/www/nspluginwrapper/Makefile	(revision 434271)
@@ -1,69 +1,62 @@
 # Created by: Dave Grochowski
 # $FreeBSD$
 
 PORTNAME=	nspluginwrapper
 PORTVERSION=	1.4.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://nspluginwrapper.org/download/ \
 		LOCAL/jkim \
 		LOCAL/jkim:binfile
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${BINFILE}:binfile
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Compatibility plugin for Mozilla NPAPI plugins
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
 CONFLICTS=	nspluginwrapper-1.3.*
 
 BINBUILD=	1
 BINFILE=	${PORTNAME}-i386-${PORTVERSION}-${BINBUILD}${EXTRACT_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 HAS_CONFIGURE=	yes
 USES=		gmake gnome linux pkgconfig
 USE_GNOME=	glib20 gtk20
 USE_LDCONFIG=	yes
 USE_LINUX=	gtk2
 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}"
+SUB_LIST=	NSPLUGINWRAPPER="${LIBDIR}"
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-HOST_ARCH=	x86_64
-.else
-HOST_ARCH=	${ARCH}
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 	    ${WRKSRC}/src/npw-config.c
 	${REINPLACE_CMD} -e 's,A-Z,:upper:,g; s,a-z,:lower:,g' \
 	    ${WRKSRC}/configure ${WRKSRC}/src/npw-viewer.sh
 
 post-install:
 	${MKDIR} ${STAGEDIR}${LIBDIR}/i386/linux
 	${INSTALL_PROGRAM} ${WRKDIR}/${LINUX_BINDIR}/*.bin \
 	    ${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>
Index: branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c
===================================================================
--- branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c	(revision 434270)
+++ branches/2017Q1/www/nspluginwrapper/files/patch-src__npw-config.c	(revision 434271)
@@ -1,34 +1,33 @@
---- ./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[] = {
 -		"/usr/X11R6/" LIB "/browser_plugins",
 -		"/usr/X11R6/" LIB "/firefox/plugins",
 +		"%%LOCALBASE%%/" LIB "/browser_plugins",
 +		"%%LOCALBASE%%/" LIB "/firefox/plugins",
 +		"%%LOCALBASE%%/" LIB "/seamonkey/plugins",
  	  };
  	  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__)
 -	"/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/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",
  #endif
  #if defined(__DragonFly__)
  	"/usr/pkg/lib/netscape/plugins",
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 434270)
+++ branches/2017Q1	(revision 434271)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r434240