tication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dg7Nj2mh0zVVN for ; Mon, 29 Dec 2025 20:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42cad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Dec 2025 20:39:01 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 0535ec49192a - main - emulators/wine: Streamline things a bit List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0535ec49192a2cc6f5e700659a5c6cebf1f37577 Auto-Submitted: auto-generated Date: Mon, 29 Dec 2025 20:39:01 +0000 Message-Id: <6952e6e5.42cad.51aa5c95@gitrepo.freebsd.org> The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=0535ec49192a2cc6f5e700659a5c6cebf1f37577 commit 0535ec49192a2cc6f5e700659a5c6cebf1f37577 Author: Gerald Pfeifer AuthorDate: 2025-12-29 20:36:16 +0000 Commit: Gerald Pfeifer CommitDate: 2025-12-29 20:36:16 +0000 emulators/wine: Streamline things a bit Set CONFIGURE_ARGS, BINARY_ALIAS, and EXTRA_PATCHES using plain assignment (=) instead of := since we do not have child ports any longer. On the way tweak white spaces around OPTIONS to be consistent with the wine-devel port. --- emulators/wine/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index c72baa365efb..66378745258b 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -29,7 +29,7 @@ USE_SDL= sdl2 SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ tools/winedump/function_grep.pl GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--verbose \ +CONFIGURE_ARGS= --verbose \ --disable-kerberos \ --disable-tests \ --without-capi \ @@ -59,7 +59,7 @@ PIE_UNSAFE= yes CONFLICTS_INSTALL= wine-devel -BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${LLVM_VERSION} \ +BINARY_ALIAS= clang=${LOCALBASE}/bin/clang${LLVM_VERSION} \ lld-link=${LOCALBASE}/bin/lld-link${LLVM_VERSION} PORTSCOUT= limit:^10\.0 @@ -67,11 +67,11 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX FFMPEG GNUTLS V4L WAYLAND X11 GECKO MONO -OPTIONS_DEFAULT=ALSA GNUTLS WAYLAND X11 -OPTIONS_RADIO= AUDIO +OPTIONS_DEFINE= CUPS DOCS DOSBOX FFMPEG GNUTLS V4L WAYLAND X11 GECKO MONO +OPTIONS_DEFAULT= ALSA GNUTLS WAYLAND X11 +OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSA OSS -OPTIONS_SUB= yes +OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs GECKO_DESC= Bundle Gecko MSI package for Wine @@ -149,7 +149,7 @@ post-patch: ${MV} ${WRKSRC}/loader/*.man.in ${WRKSRC}/tools/wine/ .else -EXTRA_PATCHES+= files/extra-patch-tools-winebuild-res32 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tools-winebuild-res32 PLIST_SUB+= WINE32="" WINE64="@comment " WINEARCH="i386" post-patch: