From owner-svn-ports-all@freebsd.org Mon Jan 21 01:12:28 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9091E14B0920; Mon, 21 Jan 2019 01:12:28 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 37C618D9CE; Mon, 21 Jan 2019 01:12:28 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CB24A6A6; Mon, 21 Jan 2019 01:12:28 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0L1CR2d068422; Mon, 21 Jan 2019 01:12:27 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0L1CRpS068421; Mon, 21 Jan 2019 01:12:27 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201901210112.x0L1CRpS068421@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Mon, 21 Jan 2019 01:12:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490816 - head/emulators/wine X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/emulators/wine X-SVN-Commit-Revision: 490816 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 37C618D9CE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2019 01:12:28 -0000 Author: gerald Date: Mon Jan 21 01:12:27 2019 New Revision: 490816 URL: https://svnweb.freebsd.org/changeset/ports/490816 Log: 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 there may be other challenges given that upstream and in other distributions GCC is being used all along. [1] Also backport part of r488645 | gerald | 2018-12-29 01:53:56 from emulators/wine-devel: Create a proper USES block in Makefile, moving the existing USES statement there. PR: 231010 [1] Modified: head/emulators/wine/Makefile Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Sun Jan 20 23:47:35 2019 (r490815) +++ head/emulators/wine/Makefile Mon Jan 21 01:12:27 2019 (r490816) @@ -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 @@ -106,6 +107,12 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig libpng.so:graphics/png .include + +.if empty(PORT_OPTIONS:MGCC) +USES+= compiler:c11 +.else +USE_GCC= yes +.endif .if ${ARCH} == amd64 # Wine is composed of three parts: