- Update to 0.9.91.4

PR:		ports/111291
Submitted by:	rafan
Approved by:	Dave Grochowski <malus.x at gmail.com> (maintainer)

6 files changed, 16 insertions, 86 deletions

diff --git a/www/nspluginwrapper-devel/Makefile b/www/nspluginwrapper-devel/Makefile
index 5d5fdf636f3f..f4cc0902d05f 100644
--- a/www/nspluginwrapper-devel/Makefile
+++ b/www/nspluginwrapper-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nspluginwrapper
-PORTVERSION=	0.9.91.3
+PORTVERSION=	0.9.91.4
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RPMFILE}
@@ -33,7 +33,7 @@ USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --target-os=linux --target-cpu=i386 \
-		--x11=${X11BASE} --with-cc=${CC} --with-cxx=${CXX}
+		--with-x11-prefix=${X11BASE} --with-cc=${CC} --with-cxx=${CXX}
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
diff --git a/www/nspluginwrapper-devel/distinfo b/www/nspluginwrapper-devel/distinfo
index e7a60b7d69a2..ca9854a41153 100644
--- a/www/nspluginwrapper-devel/distinfo
+++ b/www/nspluginwrapper-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (nspluginwrapper-0.9.91.3.tar.bz2) = 0e047db84a979237fb28a9e8360890b0
-SHA256 (nspluginwrapper-0.9.91.3.tar.bz2) = 3672dcf615f0a0c4a4bafc6e97cd134ad84ea402f916d0c3accff8e9a0aa6c8e
-SIZE (nspluginwrapper-0.9.91.3.tar.bz2) = 257648
-MD5 (nspluginwrapper-i386-0.9.91.3-1.x86_64.rpm) = 881bc1315d55c7e4879d8b9cd3e1077a
-SHA256 (nspluginwrapper-i386-0.9.91.3-1.x86_64.rpm) = 47d8baf6dca9cb371758962671547dcd82086741f1fe8fbb64f34d002306cbe3
-SIZE (nspluginwrapper-i386-0.9.91.3-1.x86_64.rpm) = 50757
+MD5 (nspluginwrapper-0.9.91.4.tar.bz2) = 76df5586c229844d28b5db40368e8912
+SHA256 (nspluginwrapper-0.9.91.4.tar.bz2) = 18e8626ff72ecead57c744f6177b0d22754e3328ba673f9aec642706f4ccd679
+SIZE (nspluginwrapper-0.9.91.4.tar.bz2) = 259969
+MD5 (nspluginwrapper-i386-0.9.91.4-1.x86_64.rpm) = 16ee999c1dab0bdcdad52c1fb83af01f
+SHA256 (nspluginwrapper-i386-0.9.91.4-1.x86_64.rpm) = a8b6796c47b34b2f52adc65bff34210009fcc63cdf343c22a992b316a82629f1
+SIZE (nspluginwrapper-i386-0.9.91.4-1.x86_64.rpm) = 51010
diff --git a/www/nspluginwrapper-devel/files/patch-configure b/www/nspluginwrapper-devel/files/patch-configure
index 80b7d9612393..6007dc2bcd6f 100644
--- a/www/nspluginwrapper-devel/files/patch-configure
+++ b/www/nspluginwrapper-devel/files/patch-configure
@@ -16,38 +16,3 @@
  
  TMPC="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.c"
  TMPO="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.o"
-@@ -75,6 +70,9 @@
- --prefix=*)
-     prefix=`echo $opt | cut -d '=' -f 2`
-     ;;
-+--x11=*)
-+    x_base_dirs=`echo $opt | cut -d '=' -f 2`
-+    ;;
- --pkglibdir=*)
-     pkglibdir=`echo $opt | cut -d '=' -f 2`
-     ;;
-@@ -279,10 +277,12 @@
- fi
- 
- # check for X11 base dir
--x_base_dirs='
--/usr
--/usr/X11R6
--/usr/local/X11R6'
-+if test -z "$x_base_dirs"; then
-+	x_base_dirs='
-+	/usr
-+	/usr/X11R6
-+	/usr/local'
-+fi
- for dir in $x_base_dirs; do
-     x_include_dir="$dir/include"
-     if test -f $x_include_dir/X11/Intrinsic.h; then
-@@ -407,6 +407,7 @@
- echo "  --target-os=OS              build plugin support for target OS [$target_os]"
- echo "  --target-cpu=CPU            build plugin support for target CPU [$target_cpu]"
- echo "  --with-viewer               build viewer [$build_viewer]"
-+echo "  --x11=PREFIX                path to X11 base"
- echo ""
- echo "Advanced options (experts only):"
- echo "  --source-path=PATH          path of source code [$source_path]"
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index 5d5fdf636f3f..f4cc0902d05f 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nspluginwrapper
-PORTVERSION=	0.9.91.3
+PORTVERSION=	0.9.91.4
 CATEGORIES=	www linux emulators
 MASTER_SITES=	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RPMFILE}
@@ -33,7 +33,7 @@ USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --target-os=linux --target-cpu=i386 \
-		--x11=${X11BASE} --with-cc=${CC} --with-cxx=${CXX}
+		--with-x11-prefix=${X11BASE} --with-cc=${CC} --with-cxx=${CXX}
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
diff --git a/www/nspluginwrapper/distinfo b/www/nspluginwrapper/distinfo
index e7a60b7d69a2..ca9854a41153 100644
--- a/www/nspluginwrapper/distinfo
+++ b/www/nspluginwrapper/distinfo
@@ -1,6 +1,6 @@
-MD5 (nspluginwrapper-0.9.91.3.tar.bz2) = 0e047db84a979237fb28a9e8360890b0
-SHA256 (nspluginwrapper-0.9.91.3.tar.bz2) = 3672dcf615f0a0c4a4bafc6e97cd134ad84ea402f916d0c3accff8e9a0aa6c8e
-SIZE (nspluginwrapper-0.9.91.3.tar.bz2) = 257648
-MD5 (nspluginwrapper-i386-0.9.91.3-1.x86_64.rpm) = 881bc1315d55c7e4879d8b9cd3e1077a
-SHA256 (nspluginwrapper-i386-0.9.91.3-1.x86_64.rpm) = 47d8baf6dca9cb371758962671547dcd82086741f1fe8fbb64f34d002306cbe3
-SIZE (nspluginwrapper-i386-0.9.91.3-1.x86_64.rpm) = 50757
+MD5 (nspluginwrapper-0.9.91.4.tar.bz2) = 76df5586c229844d28b5db40368e8912
+SHA256 (nspluginwrapper-0.9.91.4.tar.bz2) = 18e8626ff72ecead57c744f6177b0d22754e3328ba673f9aec642706f4ccd679
+SIZE (nspluginwrapper-0.9.91.4.tar.bz2) = 259969
+MD5 (nspluginwrapper-i386-0.9.91.4-1.x86_64.rpm) = 16ee999c1dab0bdcdad52c1fb83af01f
+SHA256 (nspluginwrapper-i386-0.9.91.4-1.x86_64.rpm) = a8b6796c47b34b2f52adc65bff34210009fcc63cdf343c22a992b316a82629f1
+SIZE (nspluginwrapper-i386-0.9.91.4-1.x86_64.rpm) = 51010
diff --git a/www/nspluginwrapper/files/patch-configure b/www/nspluginwrapper/files/patch-configure
index 80b7d9612393..6007dc2bcd6f 100644
--- a/www/nspluginwrapper/files/patch-configure
+++ b/www/nspluginwrapper/files/patch-configure
@@ -16,38 +16,3 @@
  
  TMPC="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.c"
  TMPO="${TMPDIR1}/npw-conf-${RANDOM}-$$-${RANDOM}.o"
-@@ -75,6 +70,9 @@
- --prefix=*)
-     prefix=`echo $opt | cut -d '=' -f 2`
-     ;;
-+--x11=*)
-+    x_base_dirs=`echo $opt | cut -d '=' -f 2`
-+    ;;
- --pkglibdir=*)
-     pkglibdir=`echo $opt | cut -d '=' -f 2`
-     ;;
-@@ -279,10 +277,12 @@
- fi
- 
- # check for X11 base dir
--x_base_dirs='
--/usr
--/usr/X11R6
--/usr/local/X11R6'
-+if test -z "$x_base_dirs"; then
-+	x_base_dirs='
-+	/usr
-+	/usr/X11R6
-+	/usr/local'
-+fi
- for dir in $x_base_dirs; do
-     x_include_dir="$dir/include"
-     if test -f $x_include_dir/X11/Intrinsic.h; then
-@@ -407,6 +407,7 @@
- echo "  --target-os=OS              build plugin support for target OS [$target_os]"
- echo "  --target-cpu=CPU            build plugin support for target CPU [$target_cpu]"
- echo "  --with-viewer               build viewer [$build_viewer]"
-+echo "  --x11=PREFIX                path to X11 base"
- echo ""
- echo "Advanced options (experts only):"
- echo "  --source-path=PATH          path of source code [$source_path]"