From nobody Thu Dec 12 20:57:25 2024 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 4Y8PtF3S4tz5gkNQ; Thu, 12 Dec 2024 20:57:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8PtF2w4Jz4J0y; Thu, 12 Dec 2024 20:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734037045; 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=MzDo98MtX+tarB1Wprg2I2bNQDHYAexJDngV7JYAzUs=; b=R8c+BRFjDV7prVJSkOtWhpSkB0Zri9adGJEEFKopqkmP1ynPAk9c6XR6HZbpu7+MLgzX8e UpW3mjZ/V/jx7hybnNuHEClgHCbhJ9HfKJsM4CI3vk1kN7YLGDAJelPmsK2uyuP0lBidPc c4paAQqL+roV0/63ASSeqmidHL8LbMwhyFUE3jDDry08pPBTwvcFegf7cCgzhWqcALGNBO /gFfYe0TRb89mt+44JIomewrNr5UbQmJO1LyRA9JMw8U0SkRQDrVMPgkgRzIG950/T/Urs iiXW1EPycJfCUeTjVjLw2SY1LoFbDvfQ4HKJnnMVsMOTJp0/1lVt0XMQAA8rTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734037045; 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=MzDo98MtX+tarB1Wprg2I2bNQDHYAexJDngV7JYAzUs=; b=WKe6g1bl527frw450cC0SuzXZ76sKxqX3NAdHkEe4IzDkNIplRpXNZkI/9yV4RRw0qyy/R JXZuUjytRitpe1sUxkzsVreOSpOZUv7w0xc+KXnG8FP08LuI+vqIbrgx5DfiV+aEwaBYws ZgWu+ZHWriyaKpRCdMzZiNMmGcVC2rHC8txqc3UZ+8S+wrejuzoeyWYvN3MCkrmgOhxRh0 85sNNzpwuitfFRM+TsBwv4HsIz3Y+hULtGzYJFi+1D/JXGQmUfMqzKpPR0oE6meVx6wOjc PkLtEFiRYtd8V5jQiatGXfHv4OjA6lpAkF7eZ7XmXwYRFsnxe0zwmiG2/QERiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734037045; a=rsa-sha256; cv=none; b=xtatot/edtzVYU6KeojwJf9nMMID7m7So3llCDfucOlANBsHuzGWTBVoY18/cjt9hneHE8 JEQoH/AVdVtBHty2bQsgEgkQOTbCSBH5qOMVJRd1/gP5uN0HytwsUL1uoykbiic/n6GUla xaqaQSU3RZzIXxyQ6KLeA1n7poduWuDfc6dyAaPZVhC3VOTqUsKJ/repgc4jkV2uCUJa+3 2sZ5HPwhoYUV/KhD4Ud4i8p8NUWWZA9gpgMDSIal4Eo67/6vPx2GYz/Ta9rxvA31RSpVTW uSUHQkRnliZ/tos5VQIhsgypcZnq+FqXQG7CqcmYOzpqcp7DaMzwZxW8p4G5AQ== 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 4Y8PtF2WBwz17C4; Thu, 12 Dec 2024 20:57:25 +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 4BCKvPHT094447; Thu, 12 Dec 2024 20:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCKvP3Z094444; Thu, 12 Dec 2024 20:57:25 GMT (envelope-from git) Date: Thu, 12 Dec 2024 20:57:25 GMT Message-Id: <202412122057.4BCKvP3Z094444@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f735bc3d93c4 - main - Mk/Uses/meson.mk: pass --localstatedir like GNU_CONFIGURE after 9f4546a03cc0 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f735bc3d93c4559aef3b2c9924d3c408ff3a3191 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f735bc3d93c4559aef3b2c9924d3c408ff3a3191 commit f735bc3d93c4559aef3b2c9924d3c408ff3a3191 Author: Jan Beich AuthorDate: 2024-12-08 08:38:09 +0000 Commit: Jan Beich CommitDate: 2024-12-12 20:56:40 +0000 Mk/Uses/meson.mk: pass --localstatedir like GNU_CONFIGURE after 9f4546a03cc0 Meson defaults to --localstatedir=/var/local if --prefix=/usr/local but this is not valid for ports/ or FreeBSD hier(7). See also 68edbeeaae96 and https://github.com/mesonbuild/meson/commit/24549dbed5fe PR: 273605 Analyzed by: Tatsuki Makino Exp-run by: antoine --- Mk/Uses/meson.mk | 1 + devel/glib20/Makefile | 1 - devel/libvirt/Makefile | 7 ++----- graphics/colord/Makefile | 3 +-- net/netatalk3/Makefile | 1 - ports-mgmt/packagekit/Makefile | 2 +- sysutils/accountsservice/Makefile | 1 - sysutils/pacman/Makefile | 2 +- sysutils/polkit/Makefile | 1 - sysutils/upower/Makefile | 1 - x11-fonts/fontconfig/Makefile | 1 - 11 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk index 571e8a990be0..eded01a885bf 100644 --- a/Mk/Uses/meson.mk +++ b/Mk/Uses/meson.mk @@ -33,6 +33,7 @@ BUILD_DEPENDS+= meson:devel/meson USE_LOCALE?= en_US.UTF-8 CONFIGURE_ARGS+= --prefix ${PREFIX} \ + --localstatedir /var \ --infodir ${INFO_PATH} # Enable all optional features to make builds deterministic. Consumers can diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index fbeed640d9ae..4d5b1133aa50 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -33,7 +33,6 @@ MESON_ARGS= -Db_lundef=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ -Dlibmount=disabled \ - -Dlocalstatedir=/var \ -Druntime_dir=/var/run \ -Dselinux=disabled \ -Dxattr=false diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile index b73b94317ebb..96500977e6fe 100644 --- a/devel/libvirt/Makefile +++ b/devel/libvirt/Makefile @@ -71,8 +71,6 @@ LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 ZFS_MESON_ENABLED= storage_zfs -VARDIR= /var - MESON_ARGS+= \ -Dapparmor=disabled \ -Dapparmor_profiles=disabled \ @@ -122,8 +120,7 @@ MESON_ARGS+= \ -Dwireshark_dissector=disabled \ -Dinit_script=none \ -Dbash_completion=disabled \ - -Duserfaultfd_sysctl=disabled \ - -Dlocalstatedir=${VARDIR} + -Duserfaultfd_sysctl=disabled # random_data fix can be removed when 8.x is eol CONFIGURE_ENV= ac_cv_type_struct_random_data="" @@ -203,7 +200,7 @@ post-install: lib/libvirt/network \ lib/libvirt/qemu/channel/target \ cache/libvirt/qemu - @${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}" + @${MKDIR} "${STAGEDIR}/var/${dir}" .endfor .for file in ${CONF_FILES} diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile index c3a369abcd8e..34a8ec0f0596 100644 --- a/graphics/colord/Makefile +++ b/graphics/colord/Makefile @@ -28,8 +28,7 @@ MAKE_JOBS_UNSAFE= yes MAKE_ENV= PYTHONDONTWRITEBYTECODE=1 MESON_ARGS= -Dsystemd=false -Dudev_rules=false \ -Ddaemon_user=colord -Dlibcolordcompat=true \ - -Dpnp_ids=${LOCALBASE}/share/hwdata/pnp.ids \ - --localstatedir=/var \ + -Dpnp_ids=${LOCALBASE}/share/hwdata/pnp.ids INSTALL_TARGET= install-strip diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 847aedfefe42..495828d87590 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -30,7 +30,6 @@ MESON_ARGS= -Dwith-libgcrypt-path=${LOCALBASE} \ -Dwith-shadow=false \ -Dwith-pgp-uam=false \ -Ddefault_library=both \ - --localstatedir=/var \ --infodir=${PREFIX}/share/info OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP SPOTLIGHT diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index 405978bfc380..bf0290e2eb9f 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -27,7 +27,7 @@ USE_LDCONFIG= yes CPE_VENDOR= packagekit_project SHEBANG_FILES= contrib/cron/packagekit-background.cron -MESON_ARGS= -Dlocalstatedir=/var -Dsysconfdir=${PREFIX}/etc \ +MESON_ARGS= -Dsysconfdir=${PREFIX}/etc \ -Dpackaging_backend=freebsd -Dsystemd=false -Doffline_update=false \ -Dbash_completion=false -Dbash_command_not_found=false \ -Dgstreamer_plugin=false diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index 95c78eed1ac9..d7b57124c667 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -22,7 +22,6 @@ USE_LDCONFIG= yes MESON_ARGS= -Dconsolekit=true \ -Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \ -Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \ - -Dlocalstatedir=/var \ -Dsystemdsystemunitdir=no \ -Dvapi=false \ -Dtests=false diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile index 54515cca4732..1ac37bce8b2f 100644 --- a/sysutils/pacman/Makefile +++ b/sysutils/pacman/Makefile @@ -28,7 +28,7 @@ SHEBANG_FILES= ${WRKSRC}/scripts/makepkg-template.pl.in \ ${WRKSRC}/scripts/libmakepkg/lint_config.sh.in BINARY_ALIAS= python3=${PYTHON_CMD} MESON_ARGS= -Droot-dir=${PACMAN_ROOT} \ - -Dlocalstatedir=${PACMAN_ROOT}/var \ + --localstatedir=${PACMAN_ROOT}/var \ -Dsysconfdir=${PREFIX}/etc \ -Dcrypto=openssl USE_LDCONFIG= yes diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index 432a074478a4..2a5b51483b3e 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -32,7 +32,6 @@ MESON_ARGS= -Dpam_include=system \ -Dsession_tracking=ConsoleKit \ -Dtests=false \ -Dintrospection=true \ - -Dlocalstatedir=/var \ -Dgtk_doc=false OPTIONS_DEFINE= MANPAGES diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile index 6c05643139fe..e32dbca3355a 100644 --- a/sysutils/upower/Makefile +++ b/sysutils/upower/Makefile @@ -20,7 +20,6 @@ USE_GNOME= glib20 introspection:build USE_LDCONFIG= yes MESON_ARGS= -Dgtk-doc=false \ -Dos_backend=freebsd \ - -Dlocalstatedir=/var \ -Dudevrulesdir=no \ -Dudevhwdbdir=no \ -Dsystemdsystemunitdir=no \ diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 1418e8e48fe5..6d2d51eaa975 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -35,7 +35,6 @@ SUB_LIST= LOCALBASE=${LOCALBASE} MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled \ -Ddefault-fonts-dirs=${PREFIX}/share/fonts \ -Dadditional-fonts-dirs=${LOCALBASE}/lib/X11/fonts \ - -Dlocalstatedir=/var \ -Dcache-dir=/var/db/fontconfig \ -Dtemplate-dir=${LOCALBASE}/etc/fonts/conf.avail \ -Dxml-dir=${LOCALBASE}/etc/fonts