svn commit: r352407 - head/emulators/i386-wine

[David Naylor]

Author: dbn
Date: Sun Apr 27 09:34:34 2014
New Revision: 352407
URL: http://svnweb.freebsd.org/changeset/ports/352407
QAT: https://qat.redports.org/buildarchive/r352407/

Log:
  Update emulators/i386-wine to 1.6.2_1.
  
  While here reduce difference between this port and i386-wine-devel.

Modified:
  head/emulators/i386-wine/Makefile.inc
  head/emulators/i386-wine/distinfo
  head/emulators/i386-wine/pkg-plist

Modified: head/emulators/i386-wine/Makefile.inc
==============================================================================
--- head/emulators/i386-wine/Makefile.inc	Sun Apr 27 09:23:32 2014	(r352406)
+++ head/emulators/i386-wine/Makefile.inc	Sun Apr 27 09:34:34 2014	(r352407)
@@ -3,6 +3,7 @@
 
 PORTNAME=	wine
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION}
@@ -38,8 +39,12 @@ SUB_FILES=	pkg-message
 USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
 USES=		tar:xz
 
+GECKO_RUN_DEPENDS=   ${DATADIR}/gecko/wine_gecko-2.21-x86.msi:${PORTSDIR}/emulators/wine-gecko
+MONO_RUN_DEPENDS=   ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono
+
 PORTSCOUT=	limitw:1,even
 
+# Included for OPSYS and OSVERSION
 .include <bsd.port.pre.mk>
 
 .for osrel in 8 9 10 11
@@ -55,14 +60,6 @@ IGNORE=		binaries compiled for FreeBSD 8
 DISTFILES=
 .endif
 
-.if ${PORT_OPTIONS:MGECKO}
-RUN_DEPENDS+=   ${DATADIR}/gecko/wine_gecko-2.21-x86.msi:${PORTSDIR}/emulators/wine-gecko
-.endif
-
-.if ${PORT_OPTIONS:MMONO}
-RUN_DEPENDS+=   ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono
-.endif
-
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
@@ -85,7 +82,6 @@ port-update:
 	${MAKE} pkg-plist.${osrel} PLIST=pkg-plist.${osrel} OSREL=${osrel}
 .endfor
 	${MV} ${.CURDIR}/distinfo~ ${.CURDIR}/distinfo
-	${MAKE} pkg-plist
 	python ${FILESDIR}/mergeplist.py ${.CURDIR}/pkg-plist.* > ${PLIST}
 	${RM} ${.CURDIR}/pkg-plist.*
 

Modified: head/emulators/i386-wine/distinfo
==============================================================================
--- head/emulators/i386-wine/distinfo	Sun Apr 27 09:23:32 2014	(r352406)
+++ head/emulators/i386-wine/distinfo	Sun Apr 27 09:34:34 2014	(r352407)
@@ -1,8 +1,8 @@
-SHA256 (freebsd:8:x86:64/i386-wine-1.6.2,1.txz) = 6a9c661366c313cdf80db10ef23716b8db103cc7997ef6c791c702ac88551c66
-SIZE (freebsd:8:x86:64/i386-wine-1.6.2,1.txz) = 22846200
-SHA256 (freebsd:9:x86:64/i386-wine-1.6.2,1.txz) = b641d634c4fbec71950f08c13974c3eaf50a07ef1d560e8d00d94dea1341f3c1
-SIZE (freebsd:9:x86:64/i386-wine-1.6.2,1.txz) = 22996328
-SHA256 (freebsd:10:x86:64/i386-wine-1.6.2,1.txz) = 911b0aec1977edd30d9d04dc24d00b66227bcbd9b4176dd540622b9eda2afcdf
-SIZE (freebsd:10:x86:64/i386-wine-1.6.2,1.txz) = 23027432
-SHA256 (freebsd:11:x86:64/i386-wine-1.6.2,1.txz) = 94513a552ef635cac347582c7a61551a7f9fbde0443d87aea3d35e01d1d1713b
-SIZE (freebsd:11:x86:64/i386-wine-1.6.2,1.txz) = 20583776
+SHA256 (freebsd:8:x86:64/i386-wine-1.6.2_1,1.txz) = 6b4ec33b325bb2118188ae726662d8b51e12ce284d8fe42a2e021e50af2a1ef1
+SIZE (freebsd:8:x86:64/i386-wine-1.6.2_1,1.txz) = 22848280
+SHA256 (freebsd:9:x86:64/i386-wine-1.6.2_1,1.txz) = 5c9b60e66ffca618495d09970aead234353019e7680154b512bf35e0f3caaa98
+SIZE (freebsd:9:x86:64/i386-wine-1.6.2_1,1.txz) = 22999284
+SHA256 (freebsd:10:x86:64/i386-wine-1.6.2_1,1.txz) = 68aac8d74f4cebf088f72bdbc149374461927b362576016000453a5c170c9894
+SIZE (freebsd:10:x86:64/i386-wine-1.6.2_1,1.txz) = 23000068
+SHA256 (freebsd:11:x86:64/i386-wine-1.6.2_1,1.txz) = 6b533e9181d5da5f1951733c00d0a674de4579f063da9755b2cacc76e4ce3a5a
+SIZE (freebsd:11:x86:64/i386-wine-1.6.2_1,1.txz) = 20875960

Modified: head/emulators/i386-wine/pkg-plist
==============================================================================
--- head/emulators/i386-wine/pkg-plist	Sun Apr 27 09:23:32 2014	(r352406)
+++ head/emulators/i386-wine/pkg-plist	Sun Apr 27 09:34:34 2014	(r352407)
@@ -819,7 +819,7 @@ lib32/libdrm_intel.so.1
 %%OSREL11%%lib32/libdrm_radeon.so.1
 lib32/libexpat.so.6
 lib32/libfontconfig.so.1
-lib32/libfreetype.so.9
+lib32/libfreetype.so.6
 lib32/libgettextpo.so.5
 lib32/libgnutls.so.26
 %%OSREL8%%lib32/libiconv.so.3
@@ -835,8 +835,8 @@ lib32/libwine.so
 lib32/libwine.so.1
 %%OSREL11%%lib32/libxcb-dri2.so.0
 lib32/libxcb-glx.so.0
-lib32/libxcb.so.2
-lib32/libxml2.so.5
+lib32/libxcb.so.1
+lib32/libxml2.so.2
 lib32/libxslt.so.2
 lib32/wine/acledit.dll.so
 lib32/wine/aclui.dll.so