Update emulators/i386-wine-devel to 1.7.24.

Also, fix the binbounce script to properly invoke LD_32_LIBRARY_PATH_RPATH.

Reported by:	Nils Beyer <nbe@renzel.net>

4 files changed, 13 insertions, 11 deletions

diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index 045e73bb4f19..f308613745db 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.7.23
+PORTVERSION=	1.7.24
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION}
diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo
index 9b29d73db7e9..f730ef9ba729 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,8 +1,8 @@
-SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.23,1.txz) = 2921b3a723868ac903fa377ca281abd8162b3ac7ab54f55a9593a2e9865cb678
-SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.23,1.txz) = 26192500
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.23,1.txz) = 7457d14519433a95190dbe59361a801453713f32158a87be35aa28d48f2ad594
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.23,1.txz) = 26417196
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.23,1.txz) = 7f8988235b2cbd1355002254ab00d9ca362baaaa5068b193edb7e9c57ce32d6d
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.23,1.txz) = 26422152
-SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.23,1.txz) = 9a9e25d13f3bff0c514cf8c93c06c5b633b0280d447c8471ca8894b3775ef57b
-SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.23,1.txz) = 46827548
+SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.24,1.txz) = 220b3758dfb27ce356bfad8afb393ce05d440b73b9c58da79a94943fefc94b79
+SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.24,1.txz) = 26209408
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.24,1.txz) = 83f13a78e6a7d0d276b09ddc26a82a2f98c8ddcd007019283d8d31c87a5c40d7
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.24,1.txz) = 26446048
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.24,1.txz) = 97241082e1f2bb491047705c12c46a3cc1a1dbba8bc6bcbd3258e26bb25f1d10
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.24,1.txz) = 26440916
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.24,1.txz) = d3217fd4b8321ed9204c30a23530a598253d290bba28cd3660acbf272fb723da
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.24,1.txz) = 46843344
diff --git a/emulators/i386-wine-devel/files/binbounce b/emulators/i386-wine-devel/files/binbounce
index 34ca7c05d06b..6f950fa41556 100644
--- a/emulators/i386-wine-devel/files/binbounce
+++ b/emulators/i386-wine-devel/files/binbounce
@@ -11,10 +11,10 @@ then
   if [ `uname -p` = i386 ]
   then
     export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH"
-    export LD_LIBRARY_PATH_RPATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH_RPATH"
+    export LD_LIBRARY_PATH_RPATH=y
   else
     export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":/usr/lib32
-    export LD_32_LIBRARY_PATH_RPATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH_RPATH":/usr/lib32
+    export LD_32_LIBRARY_PATH_RPATH=y
   fi
   export PATH="$LOCALBASE/bin32":"$PATH"
   export __BINBOUNCE_BOOTSTRAP="1"
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index 2681e0ab192b..3606c13a1783 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -1663,6 +1663,7 @@ lib32/wine/fakedlls/wmvcore.dll
 lib32/wine/fakedlls/wnaspi32.dll
 lib32/wine/fakedlls/wordpad.exe
 lib32/wine/fakedlls/wow32.dll
+lib32/wine/fakedlls/wpcap.dll
 lib32/wine/fakedlls/write.exe
 lib32/wine/fakedlls/ws2_32.dll
 lib32/wine/fakedlls/wscript.exe
@@ -2222,6 +2223,7 @@ lib32/wine/wmvcore.dll.so
 lib32/wine/wnaspi32.dll.so
 lib32/wine/wordpad.exe.so
 lib32/wine/wow32.dll.so
+lib32/wine/wpcap.dll.so
 lib32/wine/write.exe.so
 lib32/wine/ws2_32.dll.so
 lib32/wine/wscript.exe.so