Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jun 2015 17:40:54 +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: r389232 - head/emulators/i386-wine-devel
Message-ID:  <201506111740.t5BHes2i094524@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbn
Date: Thu Jun 11 17:40:54 2015
New Revision: 389232
URL: https://svnweb.freebsd.org/changeset/ports/389232

Log:
  emulators/i386-wine-devel: update to 1.7.44.
  
  Changes:
   * Remove band-aid for compholio->staging move.

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

Modified: head/emulators/i386-wine-devel/Makefile.inc
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.inc	Thu Jun 11 17:12:08 2015	(r389231)
+++ head/emulators/i386-wine-devel/Makefile.inc	Thu Jun 11 17:40:54 2015	(r389232)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.7.43
+PORTVERSION=	1.7.44
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION}
@@ -29,8 +29,7 @@ CONFLICTS_INSTALL?=     wine-[0-9]* wine
 EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \
 				--exclude +MTREE_DIRS --exclude share/licenses/'*' \
 				--exclude libdata/ldconfig32/${UNIQUENAME} \
-				-s '|/usr/local|${STAGEDIR}${PREFIX}|gs' \
-				-s '|compholio|staging|gs'
+				-s '|/usr/local|${STAGEDIR}${PREFIX}|gs'
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	wine only runs on x86 architecture
@@ -46,13 +45,6 @@ BUNDLE_LIBS=	yes
 GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.36-x86.msi:${PORTSDIR}/emulators/wine-gecko-devel
 MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.6.msi:${PORTSDIR}/emulators/wine-mono-devel
 
-.if ${PKGNAMESUFFIX} == -staging
-DISTNAME=	i386-wine-compholio-1.7.43,1
-.if ${PORTVERSION} != 1.7.43
-BROKEN=		Temporary fix for compholio->staging rename.  Needs to be undone for 1.7.44 update cycle
-.endif
-.endif
-
 # Included for OPSYS and OSVERSION
 .include <bsd.port.pre.mk>
 
@@ -81,7 +73,7 @@ DISTFILES=
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g' -s '|compholio|staging|gs'
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g'
 
 do-install:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS}

Modified: head/emulators/i386-wine-devel/distinfo
==============================================================================
--- head/emulators/i386-wine-devel/distinfo	Thu Jun 11 17:12:08 2015	(r389231)
+++ head/emulators/i386-wine-devel/distinfo	Thu Jun 11 17:40:54 2015	(r389232)
@@ -1,16 +1,16 @@
-SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.43,1.txz) = c4c36dc84f79192f2f239d0e2798302194822184a44c0ef2d1da67c2b690b711
-SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.43,1.txz) = 49287884
-SHA256 (freebsd:8:x86:64/i386-wine-compholio-1.7.43,1.txz) = 0d05d9ff66520f813f286c58d7964178c107267a54ad671409a918c45966921d
-SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.43,1.txz) = 52338780
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.43,1.txz) = ac805cfe57a46aae05e449de8d109c9875f5e209b71e475f64664a9b1f0543cb
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.43,1.txz) = 47841108
-SHA256 (freebsd:9:x86:64/i386-wine-compholio-1.7.43,1.txz) = e634c181933f05bb1843f24742ad85bcbbf42a1c13696d6cf16459a6292d04ef
-SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.43,1.txz) = 50893428
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.43,1.txz) = e27669b32af14e13aca11f1ab5dbced20ba4bc02294e666e33c5e05f9f9aadb7
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.43,1.txz) = 33713260
-SHA256 (freebsd:10:x86:64/i386-wine-compholio-1.7.43,1.txz) = 6b621d18f0ccfdb51dac40370ed07c0fd29da544cb814acd9cd56e01c1dc5c6c
-SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.43,1.txz) = 36725608
-SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.43,1.txz) = fe8cd99679bcd9dd1611f1a552b33002c2994e12fc3859344c4698dcc237ba14
-SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.43,1.txz) = 39073684
-SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.43,1.txz) = 078fc6741ac29dbb8c7add8b3d4c16213360e6b3b1a95592fbb6f260d0d21fe1
-SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.43,1.txz) = 40841224
+SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.44,1.txz) = 72ec945278bf78cdf30983d5f11b1148062cb908344d1ac9ddc7158afba74fd5
+SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.44,1.txz) = 49410808
+SHA256 (freebsd:8:x86:64/i386-wine-staging-1.7.44,1.txz) = e022208d4b20733edc43577af625a9ba43beafbab39db27a75e99c33c788e3f2
+SIZE (freebsd:8:x86:64/i386-wine-staging-1.7.44,1.txz) = 52448132
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.44,1.txz) = 059eaeef7d0cb376a1eac79e6528e2633d062b153fcbcba0a54fe43eca616f63
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.44,1.txz) = 47933408
+SHA256 (freebsd:9:x86:64/i386-wine-staging-1.7.44,1.txz) = 11eeb46b053ba98ac3ad209a38e6bd355632603a0db19d21df1dfd281f0feed2
+SIZE (freebsd:9:x86:64/i386-wine-staging-1.7.44,1.txz) = 51000108
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.44,1.txz) = 032c85e6fa17b43670837c23a782e1c25457d3ded3b2669ca36111724afb9adc
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.44,1.txz) = 33805972
+SHA256 (freebsd:10:x86:64/i386-wine-staging-1.7.44,1.txz) = 49976e88a48edb067e64da55f16d6b0262a5562bdcc37ed0ce781481b767c1e2
+SIZE (freebsd:10:x86:64/i386-wine-staging-1.7.44,1.txz) = 36833608
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.44,1.txz) = 629540127ce3838d8e37f4b90ae92c831d19e577ac098d5c35659263d35b6317
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.44,1.txz) = 39492616
+SHA256 (freebsd:11:x86:64/i386-wine-staging-1.7.44,1.txz) = f32b50a961bba023d4269f82f7eacadc5fea3ab8bc56b6d2f5da51d0dda74206
+SIZE (freebsd:11:x86:64/i386-wine-staging-1.7.44,1.txz) = 40112648

Modified: head/emulators/i386-wine-devel/pkg-plist
==============================================================================
--- head/emulators/i386-wine-devel/pkg-plist	Thu Jun 11 17:12:08 2015	(r389231)
+++ head/emulators/i386-wine-devel/pkg-plist	Thu Jun 11 17:40:54 2015	(r389232)
@@ -991,6 +991,7 @@ lib32/wine/api-ms-win-core-localization-
 lib32/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-memory-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-memory-l1-1-1.dll.so
+lib32/wine/api-ms-win-core-misc-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-namedpipe-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-namedpipe-l1-2-0.dll.so
 lib32/wine/api-ms-win-core-processenvironment-l1-1-0.dll.so
@@ -1229,6 +1230,7 @@ lib32/wine/fakedlls/api-ms-win-core-loca
 lib32/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-memory-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-memory-l1-1-1.dll
+lib32/wine/fakedlls/api-ms-win-core-misc-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-namedpipe-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-namedpipe-l1-2-0.dll
 lib32/wine/fakedlls/api-ms-win-core-processenvironment-l1-1-0.dll
@@ -1522,6 +1524,7 @@ lib32/wine/fakedlls/mscat32.dll
 lib32/wine/fakedlls/mscms.dll
 lib32/wine/fakedlls/mscoree.dll
 lib32/wine/fakedlls/msctf.dll
+lib32/wine/fakedlls/msctfp.dll
 lib32/wine/fakedlls/msdaps.dll
 lib32/wine/fakedlls/msdmo.dll
 lib32/wine/fakedlls/msftedit.dll
@@ -1596,10 +1599,6 @@ lib32/wine/fakedlls/ntdll.dll
 lib32/wine/fakedlls/ntdsapi.dll
 lib32/wine/fakedlls/ntoskrnl.exe
 lib32/wine/fakedlls/ntprint.dll
-%%OSREL8-STAGING%%lib32/wine/fakedlls/null.sys
-%%OSREL9-STAGING%%lib32/wine/fakedlls/null.sys
-%%OSREL10-STAGING%%lib32/wine/fakedlls/null.sys
-%%OSREL11-STAGING%%lib32/wine/fakedlls/null.sys
 %%OSREL8-STAGING%%lib32/wine/fakedlls/nvapi.dll
 %%OSREL9-STAGING%%lib32/wine/fakedlls/nvapi.dll
 %%OSREL10-STAGING%%lib32/wine/fakedlls/nvapi.dll
@@ -2143,6 +2142,7 @@ lib32/wine/mscat32.dll.so
 lib32/wine/mscms.dll.so
 lib32/wine/mscoree.dll.so
 lib32/wine/msctf.dll.so
+lib32/wine/msctfp.dll.so
 lib32/wine/msdaps.dll.so
 lib32/wine/msdmo.dll.so
 lib32/wine/msftedit.dll.so
@@ -2217,10 +2217,6 @@ lib32/wine/ntdll.dll.so
 lib32/wine/ntdsapi.dll.so
 lib32/wine/ntoskrnl.exe.so
 lib32/wine/ntprint.dll.so
-%%OSREL8-STAGING%%lib32/wine/null.sys.so
-%%OSREL9-STAGING%%lib32/wine/null.sys.so
-%%OSREL10-STAGING%%lib32/wine/null.sys.so
-%%OSREL11-STAGING%%lib32/wine/null.sys.so
 %%OSREL8-STAGING%%lib32/wine/nvapi.dll.so
 %%OSREL9-STAGING%%lib32/wine/nvapi.dll.so
 %%OSREL10-STAGING%%lib32/wine/nvapi.dll.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506111740.t5BHes2i094524>