From owner-svn-ports-all@freebsd.org Thu Jan 14 22:58:35 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1C7B14D1882; Thu, 14 Jan 2021 22:58:35 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DH0970J9Fz3N9F; Thu, 14 Jan 2021 22:58:35 +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 F138A11E77; Thu, 14 Jan 2021 22:58:34 +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 10EMwYx4047173; Thu, 14 Jan 2021 22:58:34 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10EMwY40047172; Thu, 14 Jan 2021 22:58:34 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202101142258.10EMwY40047172@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Thu, 14 Jan 2021 22:58:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561610 - head/emulators/wine-devel X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/emulators/wine-devel X-SVN-Commit-Revision: 561610 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 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: Thu, 14 Jan 2021 22:58:35 -0000 Author: gerald Date: Thu Jan 14 22:58:34 2021 New Revision: 561610 URL: https://svnweb.freebsd.org/changeset/ports/561610 Log: Forward port r560399 | gerald | 2021-01-05 from emulators/wine: Remove the GCC option. which has been the default all along, and simply use GCC. This avoids troubles for users disabling the option and then encountering failures without knowing how to go about that. (And there is not much one can even do given upstream focuses on GCC.) PR: 242202 Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Thu Jan 14 22:55:27 2021 (r561609) +++ head/emulators/wine-devel/Makefile Thu Jan 14 22:58:34 2021 (r561610) @@ -24,6 +24,7 @@ LIB_DEPENDS= libFAudio.so:audio/faudio \ libxml2.so:textproc/libxml2 USES= bison desktop-file-utils gmake localbase pkgconfig shebangfix tar:xz +USE_GCC= yes CONFLICTS_INSTALL= wine-[0-9]* i386-wine-[0-9]* i386-wine-devel-[0-9]* @@ -58,8 +59,8 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL SDL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO -OPTIONS_DEFAULT=GCC GNUTLS X11 +OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL SDL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO +OPTIONS_DEFAULT=GNUTLS X11 OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs @@ -76,9 +77,6 @@ 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.2-x86.msi:emulators/wine-gecko-devel