From nobody Thu Dec 12 22:19:13 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 4Y8Rhs1tsBz5gq7G; Thu, 12 Dec 2024 22:19:25 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8Rhs1dvFz4S53; Thu, 12 Dec 2024 22:19:25 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734041965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fjEDhUU9GY81yllQJZEvAU3CMrpmUZzcDjtMXWvXmQ8=; b=poli1iwfj0Em2uuf2HbM0sflWC5XmU5/5PyAO/5kMAUKXfNDkCVIXgN9yrcpflBHr01t+j VOMdnnoyA03dz/9IUeAZJpu7jvLzAZDtr8CFdD/NI4CgnOjH0xf5unMUQAL/uK+tzoS/X0 CXBc91Qs1zCP3aiQd9RBYwQ3tuey44G37Mo2SQv9yVIKUFJ0H60jHYTQAy4RXjbESarqxI +ubMAq+Uoq+SBKJB+jm083O4NnJxhKEOc/Sy2erd9QpFSWGOarLrYYBStYl/vUYxj0FwHy HCiSEYBdl/qI9RTbtWcHA1bsCp+Jd8znkceLwc7dUvzBnuYx7fUZBIRmkvyzHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734041965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fjEDhUU9GY81yllQJZEvAU3CMrpmUZzcDjtMXWvXmQ8=; b=aeZZXqwZduUv3w5Zk2sd/ivkt8j5BPo0+jLtyPTuvIK5Qpc+xHg3n+QOX3AdkGtHYXm06r z5EEqOSiin69JbyT24Yr7a7hLQ+2DBJAocgyVhbazvqKP9N4mcXGu79FgZUiH5OLFSoTjW lkEVrvX/tbtMAq8zOOqLtOepRSNOop4CixqVF7AgjIpm9fz34D/DkIE2ZMitwRzPpU8ZDb uHX+ysquMKtX1pO3jBVYWN1LzBZyod1FkdfqY+6hCx5fmHPHLmj2GkPtRB5H2Ci7VDz4U/ OIOL6S9GO0O1ilH6p+5Piooj2zPvNEVRcgx699skZ69zYhR4OXbq0LoZ6LbFnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734041965; a=rsa-sha256; cv=none; b=OFw/6ajSElo3ifg0oyoJjXSkULDm8EFK9I3j7HExwL+6VPVqj8KwydCxnCtjBzRyyNAv9n 7Swt3LTXIVIwP4Kf9wuGxBkD7LANd/4UPaha5cA27O4tbUHnmXAthwcgECuDPXHT/ZJuMx /M+itG+aotH4ZhwJqf4liNs4LxYrq5bJMRhHyKoe+GgdPpLpuZQLXGbgQ6K38b0GIdJmle dyGF57Ltx6/3Bt8gZXfzJUgnqZXO5IyfoqewcXE7XkxgCy5PeKayskjuF65w7JAIh1iLaZ wnZ0ENp5AiQQdHtjqcHLprH6e1u0uSKRsTxK9yNqKwbv/3jq3mA+Z6lj490G5A== Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Y8Rhs15x4z1Rct; Thu, 12 Dec 2024 22:19:25 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-6d8de4407f3so2140106d6.0; Thu, 12 Dec 2024 14:19:25 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUbUPMMMVjBd3B+oqNUwj0Pk46yqmoy70TrvAy0OMXmwgrafDjL11FAngxriZQKqRsS89OPgKFQNZ837k7654j1ew45zlrhjQ==@freebsd.org, AJvYcCXWuNvczebL83OzFASQwt2X+mxcGUTCSDFwSZmEOS2kPsA47XxtxuIaod3ITcOgmYvd687kQk+YQZpKoBA5I4ak1EfJYI0=@freebsd.org X-Gm-Message-State: AOJu0Yx2KnoNbL78Au+6ih1czTjgpwwXjKdc4GeQwhe7gEKhZ+o4T6pf PLDT9m79z5Z2WpBVdzJB+3w9TiF2DXfX9hiMOdZC8Z9b06V2nAt4rhUXtv0v6b/1yIQP59zaM5Z sCNk4lL2VYOWApjzg8OJkZFFeiY4= X-Google-Smtp-Source: AGHT+IFkvDGPCzk4n8IyrmOF8CUOlMXuXRMSEIMj88AMDwHMJ7x8GIQkCw/tBVPINUzUxK8v1LuHBvIfeU3cRTCN46s= X-Received: by 2002:a05:620a:172b:b0:7b6:cb9a:e0d4 with SMTP id af79cd13be357-7b6fbf402f6mr8456885a.15.1734041964698; Thu, 12 Dec 2024 14:19:24 -0800 (PST) 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 References: <202412122057.4BCKvP3Z094444@gitrepo.freebsd.org> In-Reply-To: From: Nuno Teixeira Date: Thu, 12 Dec 2024 22:19:13 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: f735bc3d93c4 - main - Mk/Uses/meson.mk: pass --localstatedir like GNU_CONFIGURE after 9f4546a03cc0 To: Jan Beich Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000054e4fd06291a1bda" --00000000000054e4fd06291a1bda Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable (...) Nevermind, it seams that MESON_ARGS accepts -Dlocalstatedir or --localstatedir as valid options. Sorry for the noise. Nuno Teixeira escreveu (quinta, 12/12/2024 =C3=A0(s) 22:15): > Hello, > > Could pacman be checked? > > --- a/sysutils/pacman/Makefile > > +++ b/sysutils/pacman/Makefile > > @@ -28,7 +28,7 @@ SHEBANG_FILES=3D ${WRKSRC}/scripts/makepkg-template.pl.= in > \ > ${WRKSRC}/scripts/libmakepkg/lint_config.sh.in > BINARY_ALIAS=3D python3=3D${PYTHON_CMD} > MESON_ARGS=3D -Droot-dir=3D${PACMAN_ROOT} \ > *- -Dlocalstatedir=3D${PACMAN_ROOT}/var \* > *+ --localstatedir=3D${PACMAN_ROOT}/var \* > -Dsysconfdir=3D${PREFIX}/etc \ > -Dcrypto=3Dopenssl > USE_LDCONFIG=3D yes > > Cheers, > > Jan Beich escreveu (quinta, 12/12/2024 =C3=A0(s) 20:= 57): > >> The branch main has been updated by jbeich: >> >> URL: >> https://cgit.FreeBSD.org/ports/commit/?id=3Df735bc3d93c4559aef3b2c9924d3= c408ff3a3191 >> >> 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=3D/var/local if --prefix=3D/usr/lo= cal >> 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+=3D meson:devel/meson >> USE_LOCALE?=3D en_US.UTF-8 >> >> CONFIGURE_ARGS+=3D --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=3D -Db_lundef=3Dfalse \ >> -Dinstalled_tests=3Dfalse \ >> -Dintrospection=3Ddisabled \ >> -Dlibmount=3Ddisabled \ >> - -Dlocalstatedir=3D/var \ >> -Druntime_dir=3D/var/run \ >> -Dselinux=3Ddisabled \ >> -Dxattr=3Dfalse >> 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=3D libssh2.so:security/libssh2 >> >> ZFS_MESON_ENABLED=3D storage_zfs >> >> -VARDIR=3D /var >> - >> MESON_ARGS+=3D \ >> -Dapparmor=3Ddisabled \ >> -Dapparmor_profiles=3Ddisabled \ >> @@ -122,8 +120,7 @@ MESON_ARGS+=3D \ >> -Dwireshark_dissector=3Ddisabled \ >> -Dinit_script=3Dnone \ >> -Dbash_completion=3Ddisabled \ >> - -Duserfaultfd_sysctl=3Ddisabled \ >> - -Dlocalstatedir=3D${VARDIR} >> + -Duserfaultfd_sysctl=3Ddisabled >> >> # random_data fix can be removed when 8.x is eol >> CONFIGURE_ENV=3D ac_cv_type_struct_random_data=3D"" >> @@ -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=3D yes >> MAKE_ENV=3D PYTHONDONTWRITEBYTECODE=3D1 >> MESON_ARGS=3D -Dsystemd=3Dfalse -Dudev_rules=3Dfalse \ >> -Ddaemon_user=3Dcolord -Dlibcolordcompat=3Dtrue \ >> - -Dpnp_ids=3D${LOCALBASE}/share/hwdata/pnp.ids \ >> - --localstatedir=3D/var \ >> + -Dpnp_ids=3D${LOCALBASE}/share/hwdata/pnp.ids >> >> INSTALL_TARGET=3D 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=3D >> -Dwith-libgcrypt-path=3D${LOCALBASE} \ >> -Dwith-shadow=3Dfalse \ >> -Dwith-pgp-uam=3Dfalse \ >> -Ddefault_library=3Dboth \ >> - --localstatedir=3D/var \ >> --infodir=3D${PREFIX}/share/info >> >> OPTIONS_DEFINE=3DPAM 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=3D yes >> CPE_VENDOR=3D packagekit_project >> SHEBANG_FILES=3D contrib/cron/packagekit-background.cron >> >> -MESON_ARGS=3D -Dlocalstatedir=3D/var -Dsysconfdir=3D${PREFIX}/etc \ >> +MESON_ARGS=3D -Dsysconfdir=3D${PREFIX}/etc \ >> -Dpackaging_backend=3Dfreebsd -Dsystemd=3Dfalse >> -Doffline_update=3Dfalse \ >> -Dbash_completion=3Dfalse -Dbash_command_not_found=3Dfal= se \ >> -Dgstreamer_plugin=3Dfalse >> 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=3D yes >> MESON_ARGS=3D -Dconsolekit=3Dtrue \ >> -Dgdmconffile=3D${LOCALBASE}/etc/gdm/custom.conf \ >> -Dlightdmconffile=3D${LOCALBASE}/etc/lightdm/lightdm.con= f \ >> - -Dlocalstatedir=3D/var \ >> -Dsystemdsystemunitdir=3Dno \ >> -Dvapi=3Dfalse \ >> -Dtests=3Dfalse >> 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=3D ${WRKSRC}/scripts/ >> makepkg-template.pl.in \ >> ${WRKSRC}/scripts/libmakepkg/lint_config.sh.in >> BINARY_ALIAS=3D python3=3D${PYTHON_CMD} >> MESON_ARGS=3D -Droot-dir=3D${PACMAN_ROOT} \ >> - -Dlocalstatedir=3D${PACMAN_ROOT}/var \ >> + --localstatedir=3D${PACMAN_ROOT}/var \ >> -Dsysconfdir=3D${PREFIX}/etc \ >> -Dcrypto=3Dopenssl >> USE_LDCONFIG=3D 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=3D -Dpam_include=3Dsystem \ >> -Dsession_tracking=3DConsoleKit \ >> -Dtests=3Dfalse \ >> -Dintrospection=3Dtrue \ >> - -Dlocalstatedir=3D/var \ >> -Dgtk_doc=3Dfalse >> >> OPTIONS_DEFINE=3D 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=3D glib20 introspection:build >> USE_LDCONFIG=3D yes >> MESON_ARGS=3D -Dgtk-doc=3Dfalse \ >> -Dos_backend=3Dfreebsd \ >> - -Dlocalstatedir=3D/var \ >> -Dudevrulesdir=3Dno \ >> -Dudevhwdbdir=3Dno \ >> -Dsystemdsystemunitdir=3Dno \ >> diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefi= le >> index 1418e8e48fe5..6d2d51eaa975 100644 >> --- a/x11-fonts/fontconfig/Makefile >> +++ b/x11-fonts/fontconfig/Makefile >> @@ -35,7 +35,6 @@ SUB_LIST=3D LOCALBASE=3D${LOCALBASE} >> MESON_ARGS=3D -Ddefault_library=3Dboth -Ddoc=3Ddisabled >> -Dcache-build=3Ddisabled \ >> -Ddefault-fonts-dirs=3D${PREFIX}/share/fonts \ >> -Dadditional-fonts-dirs=3D${LOCALBASE}/lib/X11/fonts \ >> - -Dlocalstatedir=3D/var \ >> -Dcache-dir=3D/var/db/fontconfig \ >> -Dtemplate-dir=3D${LOCALBASE}/etc/fonts/conf.avail \ >> -Dxml-dir=3D${LOCALBASE}/etc/fonts >> > > > -- > Nuno Teixeira > FreeBSD UNIX: Web: https://FreeBSD.org > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --00000000000054e4fd06291a1bda Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
(...)

Nevermind, it seams th= at MESON_ARGS accepts=C2=A0-Dlocalstatedir or --localstatedir as valid opti= ons.

Sorry for the noise.

Nuno Teixeira <eduardo@freebsd.= org> escreveu (quinta, 12/12/2024 =C3=A0(s) 22:15):
Hello,

Could pacman be checked?

@@ -28,7 +28,7 @= @ SHEBANG_FILES=3D ${WRKSRC}/scripts/makepkg-template.pl.in \
${WRKSRC}/s= cripts/libmakepkg/li= nt_config.sh.in
BINARY_ALIAS=3D python3=3D${PYTHON_CMD}
MESON_ARGS=3D -Droot-dir=3D${PACMAN_ROOT} \
- -Dlocals= tatedir=3D${PACMAN_ROOT}/var \
+ --localstatedir=3D${PACM= AN_ROOT}/var \
-Dsysconfdir=3D${PREFIX}/etc \
= -Dcrypto=3Dopenssl
USE_LDCONFIG=3D yes

Cheers,

Jan Beich <jbeich@freebsd.org> escreveu (quinta, 12/12/2024 = =C3=A0(s) 20:57):
https://cgi= t.FreeBSD.org/ports/commit/?id=3Df735bc3d93c4559aef3b2c9924d3c408ff3a3191

commit f735bc3d93c4559aef3b2c9924d3c408ff3a3191
Author:=C2=A0 =C2=A0 =C2=A0Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-12-08 08:38:09 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-12-12 20:56:40 +0000

=C2=A0 =C2=A0 Mk/Uses/meson.mk: pass --localstatedir like GNU_CONFIGURE after 9f4= 546a03cc0

=C2=A0 =C2=A0 Meson defaults to --localstatedir=3D/var/local if --prefix=3D= /usr/local
=C2=A0 =C2=A0 but this is not valid for ports/ or FreeBSD hier(7).

=C2=A0 =C2=A0 See also 68edbeeaae96 and
=C2=A0 =C2=A0 https://github.com/mesonbuild/m= eson/commit/24549dbed5fe

=C2=A0 =C2=A0 PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0273605
=C2=A0 =C2=A0 Analyzed by:=C2=A0 =C2=A0 Tatsuki Makino
=C2=A0 =C2=A0 Exp-run by:=C2=A0 =C2=A0 =C2=A0antoine
---
=C2=A0Mk/Uses/meson.mk=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 | 1 +
=C2=A0devel/glib20/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= | 1 -
=C2=A0devel/libvirt/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 7 += +-----
=C2=A0graphics/colord/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 3 +-- =C2=A0net/netatalk3/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 1 -=
=C2=A0ports-mgmt/packagekit/Makefile=C2=A0 =C2=A0 | 2 +-
=C2=A0sysutils/accountsservice/Makefile | 1 -
=C2=A0sysutils/pacman/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 +-
=C2=A0sysutils/polkit/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 1 -
=C2=A0sysutils/upower/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 1 -
=C2=A0x11-fonts/fontconfig/Makefile=C2=A0 =C2=A0 =C2=A0| 1 -
=C2=A011 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+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0meson:devel/meson
=C2=A0USE_LOCALE?=3D=C2=A0 =C2=A0en_US.UTF-8

=C2=A0CONFIGURE_ARGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0--prefix ${PREFIX} \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0--localstatedir /var \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 --infodir ${INFO_PATH}

=C2=A0# Enable all optional features to make builds deterministic. Consumer= s 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=3D=C2=A0 =C2=A0-Db_lundef=3Dfalse \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dinstalled_tests= =3Dfalse \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dintrospection=3Dd= isabled \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dlibmount=3Ddisabl= ed \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Druntime_dir=3D/va= r/run \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dselinux=3Ddisable= d \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dxattr=3Dfalse
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=3D=C2=A0 libssh2.so:security/libssh2<= br>
=C2=A0ZFS_MESON_ENABLED=3D=C2=A0 =C2=A0 =C2=A0storage_zfs

-VARDIR=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /var
-
=C2=A0MESON_ARGS+=3D=C2=A0 =C2=A0\
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dapparmor=3Ddisabl= ed \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dapparmor_profiles= =3Ddisabled \
@@ -122,8 +120,7 @@ MESON_ARGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dwireshark_dissect= or=3Ddisabled \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dinit_script=3Dnon= e \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dbash_completion= =3Ddisabled \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Duserfaultfd_sysct= l=3Ddisabled \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D$= {VARDIR}
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Duserfaultfd_sysct= l=3Ddisabled

=C2=A0# random_data fix can be removed when 8.x is eol
=C2=A0CONFIGURE_ENV=3D ac_cv_type_struct_random_data=3D""
@@ -203,7 +200,7 @@ post-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libvirt/network \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libvirt/qemu/channel/target \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 cache/libvirt/qemu
-=C2=A0 =C2=A0 =C2=A0 =C2=A0@${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}&qu= ot;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0@${MKDIR} "${STAGEDIR}/var/${dir}" =C2=A0.endfor

=C2=A0.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=3D=C2=A0 =C2=A0 =C2=A0yes
=C2=A0MAKE_ENV=3D=C2=A0 =C2=A0 =C2=A0 PYTHONDONTWRITEBYTECODE=3D1
=C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Dsystemd=3Dfalse -Dudev_rules=3Dfalse \ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Ddaemon_user=3Dcol= ord -Dlibcolordcompat=3Dtrue \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dpnp_ids=3D${LOCAL= BASE}/share/hwdata/pnp.ids \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--localstatedir=3D/= var \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dpnp_ids=3D${LOCAL= BASE}/share/hwdata/pnp.ids

=C2=A0INSTALL_TARGET=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 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=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dw= ith-libgcrypt-path=3D${LOCALBASE} \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 -Dwith-shadow=3Dfalse \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 -Dwith-pgp-uam=3Dfalse \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 -Ddefault_library=3Dboth \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0--localstatedir=3D/var \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 --infodir=3D${PREFIX}/share/info

=C2=A0OPTIONS_DEFINE=3DPAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL = LIBWRAP SPOTLIGHT
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefil= e
index 405978bfc380..bf0290e2eb9f 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -27,7 +27,7 @@ USE_LDCONFIG=3D yes
=C2=A0CPE_VENDOR=3D=C2=A0 =C2=A0 packagekit_project
=C2=A0SHEBANG_FILES=3D contrib/cron/packagekit-background.cron

-MESON_ARGS=3D=C2=A0 =C2=A0 -Dlocalstatedir=3D/var -Dsysconfdir=3D${PREFIX}= /etc \
+MESON_ARGS=3D=C2=A0 =C2=A0 -Dsysconfdir=3D${PREFIX}/etc \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dpackaging_backend= =3Dfreebsd -Dsystemd=3Dfalse -Doffline_update=3Dfalse \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dbash_completion= =3Dfalse -Dbash_command_not_found=3Dfalse \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dgstreamer_plugin= =3Dfalse
diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/M= akefile
index 95c78eed1ac9..d7b57124c667 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -22,7 +22,6 @@ USE_LDCONFIG=3D yes
=C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Dconsolekit=3Dtrue \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dgdmconffile=3D${L= OCALBASE}/etc/gdm/custom.conf \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dlightdmconffile= =3D${LOCALBASE}/etc/lightdm/lightdm.conf \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dsystemdsystemunit= dir=3Dno \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dvapi=3Dfalse \ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dtests=3Dfalse
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=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKSRC}/scr= ipts/makepkg-template.pl.in \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKSRC}/scripts/l= ibmakepkg/lint_config.sh.in
=C2=A0BINARY_ALIAS=3D=C2=A0 python3=3D${PYTHON_CMD}
=C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Droot-dir=3D${PACMAN_ROOT} \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D$= {PACMAN_ROOT}/var \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--localstatedir=3D$= {PACMAN_ROOT}/var \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dsysconfdir=3D${PR= EFIX}/etc \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dcrypto=3Dopenssl<= br> =C2=A0USE_LDCONFIG=3D=C2=A0 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=3D=C2=A0 =C2=A0-Dpam_include=3Dsystem \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dsession_tracking= =3DConsoleKit \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dtests=3Dfalse \ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dintrospection=3Dt= rue \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dgtk_doc=3Dfalse
=C2=A0OPTIONS_DEFINE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 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=3D=C2=A0 =C2=A0 glib20 introspection:build
=C2=A0USE_LDCONFIG=3D=C2=A0 yes
=C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Dgtk-doc=3Dfalse \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dos_backend=3Dfree= bsd \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dudevrulesdir=3Dno= \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dudevhwdbdir=3Dno = \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dsystemdsystemunit= dir=3Dno \
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile<= br> index 1418e8e48fe5..6d2d51eaa975 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -35,7 +35,6 @@ SUB_LIST=3D=C2=A0 =C2=A0 =C2=A0LOCALBASE=3D${LOCALBASE} =C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Ddefault_library=3Dboth -Ddoc=3Ddisabled = -Dcache-build=3Ddisabled \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Ddefault-fonts-dir= s=3D${PREFIX}/share/fonts \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dadditional-fonts-= dirs=3D${LOCALBASE}/lib/X11/fonts \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dcache-dir=3D/var/= db/fontconfig \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dtemplate-dir=3D${= LOCALBASE}/etc/fonts/conf.avail \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dxml-dir=3D${LOCAL= BASE}/etc/fonts


--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org


--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--00000000000054e4fd06291a1bda--