Date: Mon, 27 Oct 2014 18:27:47 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371598 - in head/emulators/i386-wine-devel: . files Message-ID: <201410271827.s9RIRlBJ013269@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Mon Oct 27 18:27:47 2014 New Revision: 371598 URL: https://svnweb.freebsd.org/changeset/ports/371598 QAT: https://qat.redports.org/buildarchive/r371598/ Log: Update emulators/i386-wine-devel to 1.7.28. Changes: * Improve the pkg-plist handling for differences between -devel and -compholio packages. * Stop emitting @dirrm and @dirrmtry in pkg-plist Modified: head/emulators/i386-wine-devel/Makefile.inc head/emulators/i386-wine-devel/distinfo head/emulators/i386-wine-devel/files/mergeplist.py head/emulators/i386-wine-devel/pkg-plist Modified: head/emulators/i386-wine-devel/Makefile.inc ============================================================================== --- head/emulators/i386-wine-devel/Makefile.inc Mon Oct 27 17:36:54 2014 (r371597) +++ head/emulators/i386-wine-devel/Makefile.inc Mon Oct 27 18:27:47 2014 (r371598) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wine -PORTVERSION= 1.7.27 +PORTVERSION= 1.7.28 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION} @@ -49,8 +49,17 @@ MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-m .for osrel in 8 9 10 11 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" +.if ${PKGNAMESUFFIX} == -devel +PLIST_SUB+= OSREL${osrel}-DEVEL="" +PLIST_SUB+= OSREL${osrel}-COMPHOLIO="@comment " +.else +PLIST_SUB+= OSREL${osrel}-DEVEL="@comment " +PLIST_SUB+= OSREL${osrel}-COMPHOLIO="" +.endif .else PLIST_SUB+= OSREL${osrel}="@comment " +PLIST_SUB+= OSREL${osrel}-DEVEL="@comment " +PLIST_SUB+= OSREL${osrel}-COMPHOLIO="@comment " .endif .endfor @@ -69,7 +78,6 @@ 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 ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* @@ -79,7 +87,7 @@ port-update: ${MAKE} makesum OSREL=${osrel} PKGNAMESUFFIX=${suffix} ${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~ ${RM} ${SLAVEDIR}/distinfo - [ "${suffix}" != "-devel" ] || ${MAKE} pkg-plist.${osrel} PLIST=pkg-plist.${osrel} OSREL=${osrel} + ${MAKE} pkg-plist.${osrel}${suffix:U} PLIST=pkg-plist.${osrel}${suffix:U} OSREL=${osrel} PKGNAMESUFFIX=${suffix} .endfor .endfor ${MV} ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/distinfo Modified: head/emulators/i386-wine-devel/distinfo ============================================================================== --- head/emulators/i386-wine-devel/distinfo Mon Oct 27 17:36:54 2014 (r371597) +++ head/emulators/i386-wine-devel/distinfo Mon Oct 27 18:27:47 2014 (r371598) @@ -1,16 +1,16 @@ -SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.27,1.txz) = 8b5dd7144c482ad7aea344f227feaa52df2d26b05f6b09a279e4b0b1206a4ea4 -SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.27,1.txz) = 27296452 -SHA256 (freebsd:8:x86:64/i386-wine-compholio-1.7.27,1.txz) = b087855849a6c4596e38856ff0dfcc4f7be2aa757613e6468f79816ec909e841 -SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.27,1.txz) = 27211504 -SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.27,1.txz) = 7d9e28d216ac36141086bd8de8513e70be126a590b2e1f7dadd1887b596ab15b -SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.27,1.txz) = 27538316 -SHA256 (freebsd:9:x86:64/i386-wine-compholio-1.7.27,1.txz) = fb5e2bf5a3ad511401dfb0b45854a5e00bb08b2c37fd89721eecd0068d07f029 -SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.27,1.txz) = 27460276 -SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.27,1.txz) = cc1f4ddef2369fa96e60c81c314e5c36d8f4eb0c5831826ac8f961053625c5a8 -SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.27,1.txz) = 27307432 -SHA256 (freebsd:10:x86:64/i386-wine-compholio-1.7.27,1.txz) = 808c879507bcea154c7f5f88157c86511f5262399692b5cb6831538dd3e709c3 -SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.27,1.txz) = 27396852 -SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.27,1.txz) = 1ccdda3aba003a3c1d2da93348a8f5487df1a15272b66b37b0fb6f4d64e64d4c -SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.27,1.txz) = 47592452 -SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.27,1.txz) = c9c76cdbeede5ae3552a00b054dd5a14797ca0f250027f223f0e6f294905f54a -SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.27,1.txz) = 47675160 +SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.28,1.txz) = ad04c1ec9de4050e35e386fa81fb13202e59c85e7c98f1280885d3d481eef5d2 +SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.28,1.txz) = 52616000 +SHA256 (freebsd:8:x86:64/i386-wine-compholio-1.7.28,1.txz) = 39f2182d70395e03e87c823324af3eca707fe50561326582aed22806403dc0f9 +SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.28,1.txz) = 52733652 +SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.28,1.txz) = bbd65e7fc6968f880b5548d5a33ff1109aced8d0db45645d223098e1c7b662df +SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.28,1.txz) = 52873688 +SHA256 (freebsd:9:x86:64/i386-wine-compholio-1.7.28,1.txz) = 1ad14169b9e786881f63449f1dd9bcf5c81ee172d432da2837ba81bfa1f2de50 +SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.28,1.txz) = 52983960 +SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.28,1.txz) = c85b5e5e2ba4304d9fcb547106cd2b86a505eb64a03c849f0de6d1836fa5bf37 +SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.28,1.txz) = 44265356 +SHA256 (freebsd:10:x86:64/i386-wine-compholio-1.7.28,1.txz) = 532abda74a127cfd442fcb1bc20dcbaeaab87d2e6195ec10a6b3c5238309e9ec +SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.28,1.txz) = 44345220 +SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.28,1.txz) = eadd67fdca6c572b2b7f353730457ba3782b878f897842efcb37f66ec778820a +SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.28,1.txz) = 36000028 +SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.28,1.txz) = fd17a979659e6de24a249e1f9fe740b7e6f1ef5243067d8736e0608bab80ce96 +SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.28,1.txz) = 35885284 Modified: head/emulators/i386-wine-devel/files/mergeplist.py ============================================================================== --- head/emulators/i386-wine-devel/files/mergeplist.py Mon Oct 27 17:36:54 2014 (r371597) +++ head/emulators/i386-wine-devel/files/mergeplist.py Mon Oct 27 18:27:47 2014 (r371598) @@ -73,8 +73,28 @@ class OrderedSet(collections.MutableSet) #</recipe> 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-devel/pkg-plist ============================================================================== --- head/emulators/i386-wine-devel/pkg-plist Mon Oct 27 17:36:54 2014 (r371597) +++ head/emulators/i386-wine-devel/pkg-plist Mon Oct 27 18:27:47 2014 (r371598) @@ -810,41 +810,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 @@ -859,17 +837,21 @@ 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 lib32/libexpat.so.6 lib32/libffi.so.6 lib32/libfontconfig.so.1 lib32/libfreetype.so.6 -%%OSREL11%%lib32/libgcc_s.so.1 +%%OSREL8%%lib32/libgcc_s.so.1 +%%OSREL9%%lib32/libgcc_s.so.1 lib32/libgettextpo.so.5 -%%OSREL11%%lib32/libglapi.so.0 +lib32/libglapi.so.0 lib32/libgmp.so.10 lib32/libgnutls.so.28 lib32/libhogweed.so.2 @@ -878,16 +860,28 @@ lib32/libhogweed.so.2 lib32/libintl.so.9 lib32/libjpeg.so.11 lib32/liblcms2.so.2 -%%OSREL11%%lib32/libllvmradeon9.1.7.so -lib32/libltdl.so.7 -lib32/libmpg123.so.0 +%%OSREL8%%lib32/libllvmradeon9.1.7.so +%%OSREL9%%lib32/libllvmradeon9.1.7.so +%%OSREL10%%lib32/libllvmradeon9.1.7.so +%%OSREL8%%lib32/libltdl.so.7 +%%OSREL9%%lib32/libltdl.so.7 +%%OSREL10%%lib32/libltdl.so.7 +%%OSREL11-DEVEL%%lib32/libltdl.so.7 +%%OSREL8%%lib32/libmpg123.so.0 +%%OSREL9%%lib32/libmpg123.so.0 +%%OSREL10%%lib32/libmpg123.so.0 +%%OSREL11-DEVEL%%lib32/libmpg123.so.0 lib32/libnettle.so.4 -lib32/libopenal.so.1 +%%OSREL8%%lib32/libopenal.so.1 +%%OSREL9%%lib32/libopenal.so.1 +%%OSREL10%%lib32/libopenal.so.1 +%%OSREL11-DEVEL%%lib32/libopenal.so.1 lib32/libp11-kit.so.0 -%%OSREL11%%lib32/libpciaccess.so.0 +lib32/libpciaccess.so.0 lib32/libpng15.so.15 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/libv4l1.so.0 @@ -895,7 +889,7 @@ lib32/libv4l2.so.0 lib32/libv4lconvert.so.0 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 @@ -1494,7 +1488,10 @@ lib32/wine/fakedlls/olesvr.dll16 lib32/wine/fakedlls/olesvr32.dll lib32/wine/fakedlls/olethk32.dll lib32/wine/fakedlls/oleview.exe -lib32/wine/fakedlls/openal32.dll +%%OSREL8%%lib32/wine/fakedlls/openal32.dll +%%OSREL9%%lib32/wine/fakedlls/openal32.dll +%%OSREL10%%lib32/wine/fakedlls/openal32.dll +%%OSREL11-DEVEL%%lib32/wine/fakedlls/openal32.dll lib32/wine/fakedlls/opengl32.dll lib32/wine/fakedlls/packager.dll lib32/wine/fakedlls/pdh.dll @@ -1644,7 +1641,10 @@ 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 +%%OSREL8%%lib32/wine/fakedlls/winemp3.acm +%%OSREL9%%lib32/wine/fakedlls/winemp3.acm +%%OSREL10%%lib32/wine/fakedlls/winemp3.acm +%%OSREL11-DEVEL%%lib32/wine/fakedlls/winemp3.acm lib32/wine/fakedlls/winemsibuilder.exe lib32/wine/fakedlls/wineoss.drv lib32/wine/fakedlls/winepath.exe @@ -2056,7 +2056,10 @@ lib32/wine/olesvr.dll16.so lib32/wine/olesvr32.dll.so lib32/wine/olethk32.dll.so lib32/wine/oleview.exe.so -lib32/wine/openal32.dll.so +%%OSREL8%%lib32/wine/openal32.dll.so +%%OSREL9%%lib32/wine/openal32.dll.so +%%OSREL10%%lib32/wine/openal32.dll.so +%%OSREL11-DEVEL%%lib32/wine/openal32.dll.so lib32/wine/opengl32.dll.so lib32/wine/packager.dll.so lib32/wine/pdh.dll.so @@ -2206,7 +2209,10 @@ 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 +%%OSREL8%%lib32/wine/winemp3.acm.so +%%OSREL9%%lib32/wine/winemp3.acm.so +%%OSREL10%%lib32/wine/winemp3.acm.so +%%OSREL11-DEVEL%%lib32/wine/winemp3.acm.so lib32/wine/winemsibuilder.exe.so lib32/wine/wineoss.drv.so lib32/wine/winepath.exe.so @@ -2299,6 +2305,10 @@ share/doc/wine/AUTHORS share/doc/wine/README share/doc/wine/README.winedbg share/doc/wine/README.winedump +%%OSREL8-COMPHOLIO%%share/wine/fonts/arial.ttf +%%OSREL9-COMPHOLIO%%share/wine/fonts/arial.ttf +%%OSREL10-COMPHOLIO%%share/wine/fonts/arial.ttf +%%OSREL11-COMPHOLIO%%share/wine/fonts/arial.ttf share/wine/fonts/coue1255.fon share/wine/fonts/coue1256.fon share/wine/fonts/coue1257.fon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410271827.s9RIRlBJ013269>