From nobody Tue Oct 21 21:54:35 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4crmKl3rYjz6D56g; Tue, 21 Oct 2025 21:54:35 +0000 (UTC) (envelope-from git@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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4crmKl3L6kz3CQ9; Tue, 21 Oct 2025 21:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761083675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fIa2D63crK66D04MpDHhudct4EGF9rlUFM8DuJe52Wg=; b=xIMdQV0qgjYKg65wGf2Wz3NKDBf7BBdm5hNdJRCd5L5z7OvUJGcP+qwL576dithgQGMz5H JZ1pDYG5Edq1Xii0PBwVQpMXNf8awmmxYvZOHM4qLcnaQYvnuxAW1XzKjYW1uLgcJE10rG bt+psdCwb8ef5thBmYZl7yMhBX+tU++/Fz7lKuDGelO7mXAHCIpfs5c3kh5UZ1H2sdydea /dczRxv9k9oHz3DZXFz9fJ3lDVkSbC05Txppd2XOXyGN0bHL5tmrF+FD33Gd+dFC8cjU+9 1JpO8X0hQjNJQRciFNDEYBl8F9EHJIh6D61oW2QIPjA4I2wokMyoM72Y2izC5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761083675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fIa2D63crK66D04MpDHhudct4EGF9rlUFM8DuJe52Wg=; b=m/PzxgXqKdOG1nGkUW09F6v4WSYySKDWK5g/nOVCc3io16bqdM09d05NcbwSxSbRUnRaxR n8N4WfuxvtZEdCpHVgSVoFHZlYQ3CxYRFndw4Ai4gVvjcOkpmEzGfxmyto1/IiUOxDqGQW ZvFHdYAVu2D3rCcWQFPK+awPmT3cMW/kHVIEfuUAY/oPD/7m0aZGsETqAsqjclmIBaurlL +7/c1prsdYgMSXNJARU9Y8o/ILkgAYZquQAr3Xd4BWcr3BIOZ0GLKLxpEE7nsPyAiQhVX4 g9gF1bdlBbIhH0N4xI0omz8PLhU/t/Hxz2Y3J1zauZlb0NuPDC4khbQHn7coIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761083675; a=rsa-sha256; cv=none; b=c9QnU7RPOwK1xRR8c+jg6C6aT9Wd1fghW8aRu0d6g0veAOppTlIjojC1ECICqMkQFCgVNp ZN5fIckQprsAs2G5UeFT+2uQxJVUpqaMeIjoejpU9Qr3xh/arjgCjZq5P++gQJ4JgjiqB7 bsDE+qiuI3sc0uhyT90XjQ+++jLiI1YtZKeq5Zr+/2Ktn0hXP5Q6ufMFGQkaD3LbRSUf3B J9nRVAT4Gh1El9susyV+J2XbRBMf6JHO9pHOtbnLlDlPucJGhoSleCBSbMZIxRk+rTRw4+ CGMk7BERisAbzA1OiqQloGgijnVIcUlaEvRfmfK8I7hWp7c7xQh5pL3OYUtMvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4crmKl2h3Mz1GCR; Tue, 21 Oct 2025 21:54:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59LLsZ8C098942; Tue, 21 Oct 2025 21:54:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59LLsZET098939; Tue, 21 Oct 2025 21:54:35 GMT (envelope-from git) Date: Tue, 21 Oct 2025 21:54:35 GMT Message-Id: <202510212154.59LLsZET098939@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 996b93ceb4a6 - main - emulators/wine: Sort option helpers (and some others) 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: 996b93ceb4a67d62e4d3c22966960eccad12ac27 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=996b93ceb4a67d62e4d3c22966960eccad12ac27 commit 996b93ceb4a67d62e4d3c22966960eccad12ac27 Author: Gerald Pfeifer AuthorDate: 2025-10-21 06:29:38 +0000 Commit: Gerald Pfeifer CommitDate: 2025-10-21 21:54:19 +0000 emulators/wine: Sort option helpers (and some others) This sorts option helpers and a few other entries and brings this port into closer alignment with emulators/wine-devel again after commit e86886e38b. --- emulators/wine/Makefile | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index febca4eb8b88..8de3d4f3ba01 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -21,14 +21,13 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex USES= bison cpe desktop-file-utils gmake \ llvm:min=17,build,noexport localbase \ pkgconfig sdl shebangfix tar:xz +CPE_VENDOR= winehq USE_GCC= yes USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/wine USE_SDL= sdl2 -CPE_VENDOR= winehq - -CONFLICTS_INSTALL= wine-devel - +SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ + tools/winedump/function_grep.pl GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose \ --disable-kerberos \ @@ -56,16 +55,17 @@ CONFIGURE_ARGS+=--verbose \ --without-unwind \ --without-usb CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" -SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ - tools/winedump/function_grep.pl + +PIE_UNSAFE= yes + +CONFLICTS_INSTALL= wine-devel BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${LLVM_VERSION} \ lld-link=${LOCALBASE}/bin/lld-link${LLVM_VERSION} +PORTSCOUT= limit:^10\.0 SUB_FILES= pkg-message -PIE_UNSAFE= yes - PORTDATA= wine.inf OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS V4L WAYLAND X11 GECKO MONO @@ -79,45 +79,43 @@ GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine WAYLAND_DESC= Wayland Support -PORTSCOUT= limit:^10\.0 - -ALSA_CONFIGURE_WITH= alsa -ALSA_USES= gnome gstreamer -ALSA_USE= GNOME=glib20 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>0:audio/alsa-plugins +ALSA_USES= gnome gstreamer +ALSA_USE= GNOME=glib20 +ALSA_CONFIGURE_WITH= alsa -CUPS_CONFIGURE_WITH= cups CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_CONFIGURE_WITH= cups DOSBOX_RUN_DEPENDS= dosbox:emulators/dosbox GECKO_RUN_DEPENDS= wine-gecko>0:emulators/wine-gecko -GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls MONO_RUN_DEPENDS= wine-mono>0:emulators/wine-mono -OSS_CONFIGURE_WITH= oss OSS_USES= gnome gstreamer OSS_USE= GNOME=glib20 +OSS_CONFIGURE_WITH= oss -V4L_CONFIGURE_WITH= v4l2 V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l +V4L_CONFIGURE_WITH= v4l2 -WAYLAND_CONFIGURE_WITH= wayland WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon +WAYLAND_CONFIGURE_WITH= wayland -X11_CONFIGURE_WITH= x fontconfig freetype opengl xinerama xinput2 xrandr xrender -X11_USES= gl xorg -X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libvulkan.so:graphics/vulkan-loader +X11_USES= gl xorg +X11_USE= GL=glu XORG=x11,xcomposite,xcursor,xext,xi,xinerama,xrandr,xrender +X11_CONFIGURE_WITH= fontconfig freetype opengl x xinerama xinput2 xrandr xrender .include