From nobody Wed Nov 03 07:26:12 2021 X-Original-To: dev-commits-ports-main@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 826191835542; Wed, 3 Nov 2021 07:26:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hkdc43GBsz4jhB; Wed, 3 Nov 2021 07:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4FD6714A6D; Wed, 3 Nov 2021 07:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A37QCiB089072; Wed, 3 Nov 2021 07:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A37QCYc089071; Wed, 3 Nov 2021 07:26:12 GMT (envelope-from git) Date: Wed, 3 Nov 2021 07:26:12 GMT Message-Id: <202111030726.1A37QCYc089071@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: 09fcd562eb42 - main - emulators/wine-devel: Account for further bundled libs List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 09fcd562eb42a945ea4ada79d1ae3b3460b0d5b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=09fcd562eb42a945ea4ada79d1ae3b3460b0d5b0 commit 09fcd562eb42a945ea4ada79d1ae3b3460b0d5b0 Author: Gerald Pfeifer AuthorDate: 2021-11-03 07:25:05 +0000 Commit: Gerald Pfeifer CommitDate: 2021-11-03 07:25:05 +0000 emulators/wine-devel: Account for further bundled libs Since version 6.20 Wine bundles and unconditionally uses copies of the gsm, jxr, tiff and xslt libraries. Accordingly, the --without-gsm, --without-jxrlib, and --without-tiff configure options we have been using became no-ops, so remove those. Also remove the LIBXSLT option, which was off by default before that bundling, and associated logic. (None of these simplifications should change generated packages.) Approved by: maintainer (pre-approval) --- emulators/wine-devel/Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index fa39752a0ace..0a017bb39fd7 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -41,10 +41,8 @@ CONFIGURE_ARGS+=--verbose \ --without-dbus \ --without-gettext --without-gettextpo \ --without-gphoto \ - --without-gsm \ --without-gstreamer \ --without-inotify \ - --without-jxrlib \ --without-krb5 \ --without-mingw \ --without-opencl \ @@ -53,7 +51,6 @@ CONFIGURE_ARGS+=--verbose \ --without-pulse \ --without-sane \ --with-sdl \ - --without-tiff \ --without-udev \ --without-unwind \ --without-usb @@ -69,12 +66,11 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT OPENAL STAGING V4L WINEMAKER X11 GECKO MONO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP OPENAL STAGING V4L WINEMAKER X11 GECKO MONO OPTIONS_DEFAULT=GNUTLS OPENAL X11 OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs -LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) STAGING_DESC= Include Wine Staging patchset (experimental&unsupported) WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine @@ -93,9 +89,6 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes -LIBXSLT_CONFIGURE_WITH= xslt -LIBXSLT_LIB_DEPENDS= libxslt.so:textproc/libxslt - MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel OPENAL_CONFIGURE_WITH= openal