From owner-svn-ports-head@FreeBSD.ORG Mon Dec 29 16:22:25 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9D81240; Mon, 29 Dec 2014 16:22:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B429B64E85; Mon, 29 Dec 2014 16:22:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBTGMPud021684; Mon, 29 Dec 2014 16:22:25 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBTGMO5J021674; Mon, 29 Dec 2014 16:22:24 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201412291622.sBTGMO5J021674@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Mon, 29 Dec 2014 16:22:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375796 - in head/emulators/i386-wine: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Dec 2014 16:22:26 -0000 Author: dbn Date: Mon Dec 29 16:22:23 2014 New Revision: 375796 URL: https://svnweb.freebsd.org/changeset/ports/375796 QAT: https://qat.redports.org/buildarchive/r375796/ Log: Update emulators/i386-wine to 1.6.2_9. Changes: - Fix install conflicts [1] (for the "newly" added compholio port) - Reduce diff between i386-wine and i386-wine-devel: - Add support for sub-ports (unused by this port) - Update OSVERSION constraints Modified: head/emulators/i386-wine/Makefile.inc head/emulators/i386-wine/distinfo head/emulators/i386-wine/files/mergeplist.py head/emulators/i386-wine/pkg-plist Modified: head/emulators/i386-wine/Makefile.inc ============================================================================== --- head/emulators/i386-wine/Makefile.inc Mon Dec 29 16:08:52 2014 (r375795) +++ head/emulators/i386-wine/Makefile.inc Mon Dec 29 16:22:23 2014 (r375796) @@ -3,7 +3,7 @@ PORTNAME= wine PORTVERSION= 1.6.2 -PORTREVISION= 5 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION} @@ -13,7 +13,7 @@ EXTRACT_SUFX= .txz DIST_SUBDIR= freebsd:${OSREL:C/\..*//}:x86:64 MAINTAINER= dbn@FreeBSD.org -COMMENT= 32bit Microsoft Windows compatibility environment for 64bit FreeBSD +COMMENT?= 32bit Microsoft Windows compatibility environment for 64bit FreeBSD LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual @@ -23,7 +23,8 @@ OPTIONS_DEFINE= GECKO MONO GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine -CONFLICTS_INSTALL= i386-wine-devel-[0-9]* wine-[0-9]* wine-devel-[0-9]* +CONFLICTS_INSTALL?= wine-[0-9]* wine-compholio-[0-9]* wine-devel-[0-9]* \ + i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]* EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ @@ -32,7 +33,8 @@ EXTRACT_AFTER_ARGS= -C / --exclude +COMP NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= wine only runs on x86 architecture -PKGINSTALL= ${.CURDIR}/files/pkg-install +SLAVEDIR?= ${.CURDIR} +PKGINSTALL= ${SLAVEDIR}/files/pkg-install PKGDEINSTALL= ${PKGINSTALL} PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message @@ -55,8 +57,8 @@ PLIST_SUB+= OSREL${osrel}="@comment " .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 803000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100007 && ${OSVERSION} < 1200000)) -IGNORE= binaries compiled for FreeBSD 8.3+, 9.1+, 10.0+ and -current only +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 804000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100048 && ${OSVERSION} < 1200000)) +IGNORE= binaries compiled for FreeBSD 8.4+, 9.1+, 10.0+ and -current only DISTFILES= .endif @@ -70,19 +72,18 @@ do-install: ${PLIST}: fetch ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$' | ${SED} 's|/usr/local/||g' | sort > ${PLIST} - ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} '/$$' | ${SED} -e 's|/usr/local/\(.*\)/$$|@dirrm \1|g' -e 's|/$$||g' -e 's|@dirrm man|@dirrmtry man|g' | sort -r >> ${PLIST} port-update: - ${RM} -f ${.CURDIR}/distinfo ${.CURDIR}/distinfo~ ${.CURDIR}/pkg-plist.* + ${RM} -f ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* .for osrel in 8 9 10 11 ${MAKE} fetch OSREL=${osrel} ${MAKE} makesum OSREL=${osrel} - ${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~ - ${RM} ${.CURDIR}/distinfo + ${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~ + ${RM} ${SLAVEDIR}/distinfo ${MAKE} pkg-plist.${osrel} PLIST=pkg-plist.${osrel} OSREL=${osrel} .endfor - ${MV} ${.CURDIR}/distinfo~ ${.CURDIR}/distinfo - python ${FILESDIR}/mergeplist.py ${.CURDIR}/pkg-plist.* > ${PLIST} - ${RM} ${.CURDIR}/pkg-plist.* + ${MV} ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/distinfo + python ${FILESDIR}/mergeplist.py ${SLAVEDIR}/pkg-plist.* > ${PLIST} + ${RM} ${SLAVEDIR}/pkg-plist.* .include Modified: head/emulators/i386-wine/distinfo ============================================================================== --- head/emulators/i386-wine/distinfo Mon Dec 29 16:08:52 2014 (r375795) +++ head/emulators/i386-wine/distinfo Mon Dec 29 16:22:23 2014 (r375796) @@ -1,8 +1,8 @@ -SHA256 (freebsd:8:x86:64/i386-wine-1.6.2_5,1.txz) = f1e4e7a2d9c41ee2125338e1ec256a30ca26b1542b9b05e045b53c12aacaa04a -SIZE (freebsd:8:x86:64/i386-wine-1.6.2_5,1.txz) = 22927612 -SHA256 (freebsd:9:x86:64/i386-wine-1.6.2_5,1.txz) = 19b429fa44267889d217024d50a781653cb0874460a7901641676d09e79fc279 -SIZE (freebsd:9:x86:64/i386-wine-1.6.2_5,1.txz) = 23059852 -SHA256 (freebsd:10:x86:64/i386-wine-1.6.2_5,1.txz) = 40ac9222df285d5bebaa70e99512adcea37c93f1da2d6b4f4d0ccacc295d1147 -SIZE (freebsd:10:x86:64/i386-wine-1.6.2_5,1.txz) = 23061740 -SHA256 (freebsd:11:x86:64/i386-wine-1.6.2_5,1.txz) = 4544a4e9495de7e30d252d96c5c6dbdd8721af1433dc6bb47264d77aff3757c8 -SIZE (freebsd:11:x86:64/i386-wine-1.6.2_5,1.txz) = 43375936 +SHA256 (freebsd:8:x86:64/i386-wine-1.6.2_9,1.txz) = 34016c7a65dcd0ce9ef20df2f1d828513b807e37d9979a0942405a6a2655a6cd +SIZE (freebsd:8:x86:64/i386-wine-1.6.2_9,1.txz) = 47351600 +SHA256 (freebsd:9:x86:64/i386-wine-1.6.2_9,1.txz) = 31754ce8b55702aaca59ef0df08400d3c99046553e0d000883645b3609be49bb +SIZE (freebsd:9:x86:64/i386-wine-1.6.2_9,1.txz) = 45333800 +SHA256 (freebsd:10:x86:64/i386-wine-1.6.2_9,1.txz) = 04942d52ba4ae920661b028c77d85e5d87259d4662509a7ba353a42ca5215ede +SIZE (freebsd:10:x86:64/i386-wine-1.6.2_9,1.txz) = 38402124 +SHA256 (freebsd:11:x86:64/i386-wine-1.6.2_9,1.txz) = f27d9cf932d92bdad74d625c981fb3e2ddc2a1c9ee068c8eb08e26b794f49bfc +SIZE (freebsd:11:x86:64/i386-wine-1.6.2_9,1.txz) = 30242820 Modified: head/emulators/i386-wine/files/mergeplist.py ============================================================================== --- head/emulators/i386-wine/files/mergeplist.py Mon Dec 29 16:08:52 2014 (r375795) +++ head/emulators/i386-wine/files/mergeplist.py Mon Dec 29 16:22:23 2014 (r375796) @@ -73,8 +73,28 @@ class OrderedSet(collections.MutableSet) # def main(plists): + prev = prev_short = None + for line in gen_list(plists): + if line.startswith("%%"): + line_short = line.split("%%", 3)[1:] + line_short = "%%%%%s%%%%%s" % (line_short[0].split("-", 2)[0], line_short[1]) + if prev_short == line_short: + print(line_short) + line = line_short = None + elif prev is not None: + print(prev) + prev, prev_short = line, line_short + else: + if prev is not None: + print(prev) + prev = prev_short = None + print line + if prev is not None: + print(prev) + +def gen_list(plists): plists_len = len(plists) - plists.sort(key=lambda x: int(x.rsplit('.', 2)[-1])) + plists.sort(key=lambda x: int(x.rsplit('.', 2)[-1].split('-', 2)[0])) names = ["OSREL" + i.rsplit('.', 2)[-1] for i in plists] for i in range(plists_len): with open(plists[i], 'r') as file: @@ -83,7 +103,7 @@ def main(plists): while empty < plists_len: if not empty and all(plists[1].peek() == i.peek() for i in plists[1:]): # Test if the top of the queues are all common - print(plists[1].peek()) + yield plists[1].peek() for i in plists: i.pop() else: @@ -96,7 +116,7 @@ def main(plists): keys.sort() for k in keys: for i in lines[k]: - print("%%" + names[i] + "%%" + k) + yield "%%" + names[i] + "%%" + k empty = sum(len(i) == 0 for i in plists) if __name__ == '__main__': Modified: head/emulators/i386-wine/pkg-plist ============================================================================== --- head/emulators/i386-wine/pkg-plist Mon Dec 29 16:08:52 2014 (r375795) +++ head/emulators/i386-wine/pkg-plist Mon Dec 29 16:22:23 2014 (r375796) @@ -763,41 +763,19 @@ include/wine/windows/xmldsodid.h include/wine/windows/xmllite.h include/wine/windows/xmllite.idl include/wine/windows/zmouse.h -%%OSREL8%%lib32/.libGL/dri/i810_dri.so -%%OSREL9%%lib32/.libGL/dri/i810_dri.so -%%OSREL10%%lib32/.libGL/dri/i810_dri.so lib32/.libGL/dri/i915_dri.so lib32/.libGL/dri/i965_dri.so -%%OSREL8%%lib32/.libGL/dri/mach64_dri.so -%%OSREL9%%lib32/.libGL/dri/mach64_dri.so -%%OSREL10%%lib32/.libGL/dri/mach64_dri.so -%%OSREL8%%lib32/.libGL/dri/mga_dri.so -%%OSREL9%%lib32/.libGL/dri/mga_dri.so -%%OSREL10%%lib32/.libGL/dri/mga_dri.so -%%OSREL8%%lib32/.libGL/dri/r128_dri.so -%%OSREL9%%lib32/.libGL/dri/r128_dri.so -%%OSREL10%%lib32/.libGL/dri/r128_dri.so +%%OSREL11%%lib32/.libGL/dri/kms_swrast_dri.so lib32/.libGL/dri/r200_dri.so lib32/.libGL/dri/r300_dri.so lib32/.libGL/dri/r600_dri.so lib32/.libGL/dri/radeon_dri.so -%%OSREL11%%lib32/.libGL/dri/radeonsi_dri.so -%%OSREL8%%lib32/.libGL/dri/savage_dri.so -%%OSREL9%%lib32/.libGL/dri/savage_dri.so -%%OSREL10%%lib32/.libGL/dri/savage_dri.so -%%OSREL8%%lib32/.libGL/dri/sis_dri.so -%%OSREL9%%lib32/.libGL/dri/sis_dri.so -%%OSREL10%%lib32/.libGL/dri/sis_dri.so +lib32/.libGL/dri/radeonsi_dri.so lib32/.libGL/dri/swrast_dri.so -%%OSREL8%%lib32/.libGL/dri/tdfx_dri.so -%%OSREL9%%lib32/.libGL/dri/tdfx_dri.so -%%OSREL10%%lib32/.libGL/dri/tdfx_dri.so -%%OSREL8%%lib32/.libGL/dri/unichrome_dri.so -%%OSREL9%%lib32/.libGL/dri/unichrome_dri.so -%%OSREL10%%lib32/.libGL/dri/unichrome_dri.so -%%OSREL11%%lib32/.libGL/dri/vmwgfx_dri.so +lib32/.libGL/dri/vmwgfx_dri.so lib32/.libGL/libGL.so.1 lib32/libGLU.so.1 +%%OSREL11%%lib32/libLLVM-3.4.so lib32/libX11-xcb.so.1 lib32/libX11.so.6 lib32/libXau.so.6 @@ -812,35 +790,52 @@ lib32/libXrandr.so.2 lib32/libXrender.so.1 lib32/libXxf86vm.so.1 lib32/libcups.so.2 -%%OSREL11%%lib32/libdricore9.1.7.so.1 +%%OSREL11%%lib32/libdevq.so.0 +%%OSREL8%%lib32/libdricore9.1.7.so.1 +%%OSREL9%%lib32/libdricore9.1.7.so.1 +%%OSREL10%%lib32/libdricore9.1.7.so.1 lib32/libdrm.so.2 lib32/libdrm_intel.so.1 -%%OSREL11%%lib32/libdrm_radeon.so.1 +lib32/libdrm_radeon.so.1 +%%OSREL11%%lib32/libexpat.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 +%%OSREL8%%lib32/libgcc_s.so.1 +%%OSREL9%%lib32/libgcc_s.so.1 +lib32/libglapi.so.0 +lib32/libgmp.so.10 lib32/libgnutls.so.28 +lib32/libhogweed.so.2 +%%OSREL8%%lib32/libiconv.so.2 +%%OSREL9%%lib32/libiconv.so.2 %%OSREL8%%lib32/libiconv.so.3 -%%OSREL9%%lib32/libiconv.so.3 -lib32/libintl.so.9 -lib32/libjpeg.so.11 +lib32/libintl.so.8 +lib32/libjpeg.so.8 lib32/liblcms2.so.2 -%%OSREL11%%lib32/libllvmradeon9.1.7.so +%%OSREL8%%lib32/libllvmradeon9.1.7.so +%%OSREL9%%lib32/libllvmradeon9.1.7.so +%%OSREL10%%lib32/libllvmradeon9.1.7.so +lib32/libltdl.so.7 +lib32/libmpg123.so.0 +lib32/libnettle.so.4 lib32/libopenal.so.1 -%%OSREL11%%lib32/libpciaccess.so.0 -lib32/libpng15.so.15 +lib32/libp11-kit.so.0 +lib32/libpciaccess.so.0 +lib32/libpng16.so.16 lib32/libpthread-stubs.so.0 -%%OSREL11%%lib32/libstdc++.so.6 +%%OSREL8%%lib32/libstdc++.so.6 +%%OSREL9%%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 +lib32/libxcb-dri2.so.0 lib32/libxcb-glx.so.0 lib32/libxcb.so.1 lib32/libxml2.so.2 -lib32/libxslt.so.2 +lib32/libxslt.so.1 lib32/wine/acledit.dll.so lib32/wine/aclui.dll.so lib32/wine/activeds.dll.so @@ -1473,6 +1468,7 @@ lib32/wine/fakedlls/winefile.exe lib32/wine/fakedlls/winemapi.dll lib32/wine/fakedlls/winemenubuilder.exe lib32/wine/fakedlls/winemine.exe +lib32/wine/fakedlls/winemp3.acm lib32/wine/fakedlls/winemsibuilder.exe lib32/wine/fakedlls/wineoss.drv lib32/wine/fakedlls/winepath.exe @@ -2006,6 +2002,7 @@ lib32/wine/winefile.exe.so lib32/wine/winemapi.dll.so lib32/wine/winemenubuilder.exe.so lib32/wine/winemine.exe.so +lib32/wine/winemp3.acm.so lib32/wine/winemsibuilder.exe.so lib32/wine/wineoss.drv.so lib32/wine/winepath.exe.so