svn commit: r491699 - head/emulators/wine-devel

[Gerald Pfeifer]

Author: gerald
Date: Thu Jan 31 09:51:27 2019
New Revision: 491699
URL: https://svnweb.freebsd.org/changeset/ports/491699

Log:
  Update to Wine 4.0, the actual release, with essentially no real changes
  from the last RC.  This will shortly move to the main emulators/wine port,
  but let's give it a bit of time and wider exposure first.
  
  Forward port r491148 | gerald | 2019-01-25:
  
  Add a new option, GCC, that controls the use of GCC instead of the
  system compiler (usually clang these days) as we have been doing since
  r334935 in 2013-11-26.  And make that the default, both since there've
  been user reports about Wine not working properly with the toolchain
  in FreeBSD 12 and since there may be other challenges given that both
  upstream and in other distributions GCC is being used all along. [1]
  
  PR:		231010 [1]
  Reviewed by:	mat [1]
  Tested by:	sbruno [1]

Modified:
  head/emulators/wine-devel/Makefile
  head/emulators/wine-devel/distinfo

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Thu Jan 31 09:30:37 2019	(r491698)
+++ head/emulators/wine-devel/Makefile	Thu Jan 31 09:51:27 2019	(r491699)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	4.0-rc7
+DISTVERSION=	4.0
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		prelink:sysutils/prelink
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
-USES=		bison compiler:c11 desktop-file-utils gmake localbase shebangfix tar:xz
+USES=		bison desktop-file-utils gmake localbase shebangfix tar:xz
 
 CONFLICTS_INSTALL=	wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \
 			i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
@@ -56,8 +56,8 @@ SUB_FILES=	pkg-message
 
 PORTDATA=	l_intl.nls wine.inf
 
-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
-OPTIONS_DEFAULT=GNUTLS X11
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
+OPTIONS_DEFAULT=GCC GNUTLS X11
 OPTIONS_SUB=	yes
 
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
@@ -72,6 +72,9 @@ CUPS_CONFIGURE_WITH=	cups
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
+
+GCC_USE=		gcc=yes
+GCC_USES_OFF=		compiler:c11
 
 GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.47-x86.msi:emulators/wine-gecko-devel
 

Modified: head/emulators/wine-devel/distinfo
==============================================================================
--- head/emulators/wine-devel/distinfo	Thu Jan 31 09:30:37 2019	(r491698)
+++ head/emulators/wine-devel/distinfo	Thu Jan 31 09:51:27 2019	(r491699)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1547900384
-SHA256 (wine-4.0-rc7.tar.xz) = d2a7048fee0485b74cb2630f7fc388ede679b341d3647ce01ab7a875c031d8d7
-SIZE (wine-4.0-rc7.tar.xz) = 21642184
-SHA256 (v4.0-rc7.tar.gz) = 8f35cbefa288894d8047fa2785e53b7adaf67ea77b6f461ce40b4bbbc6dc9521
-SIZE (v4.0-rc7.tar.gz) = 9945718
+TIMESTAMP = 1548869599
+SHA256 (wine-4.0.tar.xz) = 6736cdee95b2b8bb021ec0c19497ed8cad5ae2c8bfdb7ab5dc687ff92a480d4d
+SIZE (wine-4.0.tar.xz) = 21644692
+SHA256 (v4.0.tar.gz) = 12f7d1e46f06ed56b4b409b7f40e47622d84262e7e78cfc02f19c0cdd8b03788
+SIZE (v4.0.tar.gz) = 9945756