Update emulators/i386-wine-devel (and -compholio) to 1.7.25.

Also, fix build of i386-wine-* on 32-bit environments (move $MKDIR to prior
the $INSTALL).

4 files changed, 25 insertions, 18 deletions

diff --git a/emulators/i386-wine-devel/Makefile.i386 b/emulators/i386-wine-devel/Makefile.i386
index a53aa4303cc3..6d5be147f031 100644
--- a/emulators/i386-wine-devel/Makefile.i386
+++ b/emulators/i386-wine-devel/Makefile.i386
@@ -38,10 +38,10 @@ post-install-script:
 		echo bin32/$${i} >> ${TMPPLIST} ; \
 	done
 	# Install libGL
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri
 	${INSTALL_DATA} ${LOCALBASE}/lib/libGL.so.1 ${STAGEDIR}${PREFIX}/lib32/.libGL/	
 	echo lib32/.libGL/libGL.so.1 >> ${TMPPLIST}
 	# Install dri libraries (internal libGL requirements)
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri
 	for i in ${LOCALBASE}/lib/dri/*.so; do \
 		${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri/ ; \
 		echo lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \
diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index 9bcd6ef951fa..da7722ad046a 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.24
+PORTVERSION=	1.7.25
 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 fd4c689fca0d..3084caac22e5 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,16 +1,16 @@
-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:8:x86:64/i386-wine-compholio-1.7.24,1.txz) = c87a6eb40c7cac391a43bd991dc2d6ff12a81d329d57a585b70e6950b6877cb0
-SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.24,1.txz) = 26292924
-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:9:x86:64/i386-wine-compholio-1.7.24,1.txz) = 9385a4a859838d8c79a0e40e4b47fed94bd475ca159ec6191c1fdb05f66e119d
-SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.24,1.txz) = 26542932
-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:10:x86:64/i386-wine-compholio-1.7.24,1.txz) = 63cf622d3065921201919b33c296b393b84a3107a91a6700fbc387609d3b8adf
-SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.24,1.txz) = 26524940
-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
-SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.24,1.txz) = 0bdb7085d886876d03bdf76cc5ae7fe844c8a5e9907761591c9556c1e91f20a7
-SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.24,1.txz) = 46926196
+SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.25,1.txz) = 06ba602879fb66d4a174b2749143fbd32147785b180eab374074cf478b82076b
+SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.25,1.txz) = 26908524
+SHA256 (freebsd:8:x86:64/i386-wine-compholio-1.7.25,1.txz) = e93427d42397a4d5c36849ab16489b55db19b757f67027f2c61013edc4cef7e2
+SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.25,1.txz) = 27001720
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.25,1.txz) = 2675d78629f3f7f772e561b6bc1f8383b9d149b642897c4993d5ec21f3188d9b
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.25,1.txz) = 27165572
+SHA256 (freebsd:9:x86:64/i386-wine-compholio-1.7.25,1.txz) = 6768d687a6d976985bb5f7bc198c7681e7ea14a982f0054f515034cfaeb27c02
+SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.25,1.txz) = 27259736
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.25,1.txz) = 21cc76a06f1c25a5e09f2cb6c601ff54307d58b1a950860febafa5e691c6de70
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.25,1.txz) = 27118848
+SHA256 (freebsd:10:x86:64/i386-wine-compholio-1.7.25,1.txz) = 5755c7c13bd2c32afcc85f7d216569c86d66b783611b384db0cd456dec792bf0
+SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.25,1.txz) = 27207692
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.25,1.txz) = cd8834c405f7e4168e42c5bcec016427c7ba88f1c4a6550d13e84eec1b5be888
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.25,1.txz) = 47414568
+SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.25,1.txz) = 5f0e87363667285f94f8b270bca0697e3a3c727fe34a23f9081f712dc99b3601
+SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.25,1.txz) = 47516720
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index 3606c13a1783..b54460623974 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -863,23 +863,30 @@ lib32/libdrm.so.2
 lib32/libdrm_intel.so.1
 %%OSREL11%%lib32/libdrm_radeon.so.1
 lib32/libexpat.so.6
+lib32/libffi.so.6
 lib32/libfontconfig.so.1
 lib32/libfreetype.so.6
 %%OSREL11%%lib32/libgcc_s.so.1
 lib32/libgettextpo.so.5
 %%OSREL11%%lib32/libglapi.so.0
+lib32/libgmp.so.10
 lib32/libgnutls.so.28
+lib32/libhogweed.so.2
 %%OSREL8%%lib32/libiconv.so.3
 %%OSREL9%%lib32/libiconv.so.3
 lib32/libintl.so.9
 lib32/libjpeg.so.11
 lib32/liblcms2.so.2
 %%OSREL11%%lib32/libllvmradeon9.1.7.so
+lib32/libnettle.so.4
 lib32/libopenal.so.1
+lib32/libp11-kit.so.0
 %%OSREL11%%lib32/libpciaccess.so.0
 lib32/libpng15.so.15
 lib32/libpthread-stubs.so.0
 %%OSREL11%%lib32/libstdc++.so.6
+lib32/libtasn1.so.6
+lib32/libtspi.so.1
 lib32/libwine.so
 lib32/libwine.so.1
 %%OSREL11%%lib32/libxcb-dri2.so.0