svn commit: r491148 - head/emulators/wine
Gerald Pfeifer
gerald at FreeBSD.org
Fri Jan 25 14:04:41 UTC 2019
Author: gerald
Date: Fri Jan 25 14:04:40 2019
New Revision: 491148
URL: https://svnweb.freebsd.org/changeset/ports/491148
Log:
Restore a simpler and more elegant version of r490816 which was reverted
in r490825. (r490827 addresses the breakage of INDEX which happened in
some scenarios that led to that revert.)
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
upstrea and in other distributions GCC is being used all along.
PR: 231010
Reviewed by: mat
Tested by: sbruno
Modified:
head/emulators/wine/Makefile
Modified: head/emulators/wine/Makefile
==============================================================================
--- head/emulators/wine/Makefile Fri Jan 25 13:19:37 2019 (r491147)
+++ head/emulators/wine/Makefile Fri Jan 25 14:04:40 2019 (r491148)
@@ -3,7 +3,7 @@
PORTNAME= wine
DISTVERSION= 3.0.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
@@ -21,6 +21,8 @@ ONLY_FOR_ARCHS= amd64 i386
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex
LIB_DEPENDS= libxml2.so:textproc/libxml2
+USES= bison desktop-file-utils gmake localbase shebangfix tar:xz
+
CONFLICTS_INSTALL= wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \
i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
@@ -41,7 +43,6 @@ CONFIGURE_ARGS+=--verbose \
--without-udev
CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
WINELIBDIR?= ${PREFIX}/lib
-USES= bison compiler:c11 desktop-file-utils gmake localbase shebangfix tar:xz
.if !defined(USE_LDCONFIG32)
USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine
.endif
@@ -52,8 +53,8 @@ SUB_FILES= pkg-message
PORTDATA= l_intl.nls wine.inf
-OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
-OPTIONS_DEFAULT=GNUTLS X11
+OPTIONS_DEFINE= CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
+OPTIONS_DEFAULT=GCC GNUTLS X11
OPTIONS_SUB= yes
DOSBOX_DESC= Use DOSBox to run MS-DOS programs
@@ -68,6 +69,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
More information about the svn-ports-all
mailing list