Date: Thu, 12 Dec 2024 22:15:19 +0000 From: Nuno Teixeira <eduardo@freebsd.org> To: Jan Beich <jbeich@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: f735bc3d93c4 - main - Mk/Uses/meson.mk: pass --localstatedir like GNU_CONFIGURE after 9f4546a03cc0 Message-ID: <CAFDf7U%2BCiD8LXD%2BRkkFHdkNgEmFNVxFjFukbBA9zeVr4NvV9aA@mail.gmail.com> In-Reply-To: <202412122057.4BCKvP3Z094444@gitrepo.freebsd.org> References: <202412122057.4BCKvP3Z094444@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000006c599406291a0d96 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, Could pacman be checked? --- a/sysutils/pacman/Makefile <https://cgit.freebsd.org/ports/tree/sysutils/pacman/Makefile?id=3D7b20f877= 90b64c5e3c068c4ab055f5f9758db0b7> +++ b/sysutils/pacman/Makefile <https://cgit.freebsd.org/ports/tree/sysutils/pacman/Makefile?id=3Df735bc3d= 93c4559aef3b2c9924d3c408ff3a3191> @@ -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 <jbeich@freebsd.org> 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=3Df735bc3d93c4559aef3b2c9924d3c= 408ff3a3191 > > commit f735bc3d93c4559aef3b2c9924d3c408ff3a3191 > Author: Jan Beich <jbeich@FreeBSD.org> > AuthorDate: 2024-12-08 08:38:09 +0000 > Commit: Jan Beich <jbeich@FreeBSD.org> > 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/loc= al > 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 c= an > 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${LOCAL= BASE} > \ > -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=3Dfals= e \ > -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.conf= \ > - -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/Makefil= e > 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 > --=20 Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org --0000000000006c599406291a0d96 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hello,</div><div><br></div><div>Could pacman be check= ed?</div><div><br></div><div><div class=3D"gmail-head">--- a/<a href=3D"htt= ps://cgit.freebsd.org/ports/tree/sysutils/pacman/Makefile?id=3D7b20f87790b6= 4c5e3c068c4ab055f5f9758db0b7">sysutils/pacman/Makefile</a><br>+++ b/<a href= =3D"https://cgit.freebsd.org/ports/tree/sysutils/pacman/Makefile?id=3Df735b= c3d93c4559aef3b2c9924d3c408ff3a3191">sysutils/pacman/Makefile</a></div><div= class=3D"gmail-hunk">@@ -28,7 +28,7 @@ SHEBANG_FILES=3D ${WRKSRC}/scripts/= <a href=3D"http://makepkg-template.pl.in">makepkg-template.pl.in</a>; \</div= ><div class=3D"gmail-ctx"> ${WRKSRC}/scripts/libmakepkg/<a href=3D"http:/= /lint_config.sh.in">lint_config.sh.in</a></div><div class=3D"gmail-ctx"> BI= NARY_ALIAS=3D python3=3D${PYTHON_CMD}</div><div class=3D"gmail-ctx"> MESON_= ARGS=3D -Droot-dir=3D${PACMAN_ROOT} \</div><div class=3D"gmail-del"><b>- -= Dlocalstatedir=3D${PACMAN_ROOT}/var \</b></div><div class=3D"gmail-add"><b>= + --localstatedir=3D${PACMAN_ROOT}/var \</b></div><div class=3D"gmail-ctx"= > -Dsysconfdir=3D${PREFIX}/etc \</div><div class=3D"gmail-ctx"> -Dcrypt= o=3Dopenssl</div><div class=3D"gmail-ctx"> USE_LDCONFIG=3D yes</div><div cl= ass=3D"gmail-ctx"><br></div><div class=3D"gmail-ctx">Cheers,<br></div></div= ></div><br><div class=3D"gmail_quote gmail_quote_container"><div dir=3D"ltr= " class=3D"gmail_attr">Jan Beich <<a href=3D"mailto:jbeich@freebsd.org">= jbeich@freebsd.org</a>> escreveu (quinta, 12/12/2024 =C3=A0(s) 20:57):<b= r></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex= ;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main h= as been updated by jbeich:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3Df735bc3d93c4559= aef3b2c9924d3c408ff3a3191" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3Df735bc3d93c4559aef3b2c9924d3c408ff3a3191</= a><br> <br> commit f735bc3d93c4559aef3b2c9924d3c408ff3a3191<br> Author:=C2=A0 =C2=A0 =C2=A0Jan Beich <jbeich@FreeBSD.org><br> AuthorDate: 2024-12-08 08:38:09 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Jan Beich <jbeich@FreeBSD.org><br> CommitDate: 2024-12-12 20:56:40 +0000<br> <br> =C2=A0 =C2=A0 Mk/Uses/<a href=3D"http://meson.mk" rel=3D"noreferrer" target= =3D"_blank">meson.mk</a>: pass --localstatedir like GNU_CONFIGURE after 9f4= 546a03cc0<br> <br> =C2=A0 =C2=A0 Meson defaults to --localstatedir=3D/var/local if --prefix=3D= /usr/local<br> =C2=A0 =C2=A0 but this is not valid for ports/ or FreeBSD hier(7).<br> <br> =C2=A0 =C2=A0 See also 68edbeeaae96 and<br> =C2=A0 =C2=A0 <a href=3D"https://github.com/mesonbuild/meson/commit/24549db= ed5fe" rel=3D"noreferrer" target=3D"_blank">https://github.com/mesonbuild/m= eson/commit/24549dbed5fe</a><br> <br> =C2=A0 =C2=A0 PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0273605<br> =C2=A0 =C2=A0 Analyzed by:=C2=A0 =C2=A0 Tatsuki Makino<br> =C2=A0 =C2=A0 Exp-run by:=C2=A0 =C2=A0 =C2=A0antoine<br> ---<br> =C2=A0Mk/Uses/<a href=3D"http://meson.mk" rel=3D"noreferrer" target=3D"_bla= nk">meson.mk</a>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 | 1 +<br> =C2=A0devel/glib20/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= | 1 -<br> =C2=A0devel/libvirt/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 7 += +-----<br> =C2=A0graphics/colord/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 3 +--<br= > =C2=A0net/netatalk3/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 1 -= <br> =C2=A0ports-mgmt/packagekit/Makefile=C2=A0 =C2=A0 | 2 +-<br> =C2=A0sysutils/accountsservice/Makefile | 1 -<br> =C2=A0sysutils/pacman/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 +-<br> =C2=A0sysutils/polkit/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 1 -<br> =C2=A0sysutils/upower/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 1 -<br> =C2=A0x11-fonts/fontconfig/Makefile=C2=A0 =C2=A0 =C2=A0| 1 -<br> =C2=A011 files changed, 6 insertions(+), 15 deletions(-)<br> <br> diff --git a/Mk/Uses/<a href=3D"http://meson.mk" rel=3D"noreferrer" target= =3D"_blank">meson.mk</a> b/Mk/Uses/<a href=3D"http://meson.mk" rel=3D"noref= errer" target=3D"_blank">meson.mk</a><br> index 571e8a990be0..eded01a885bf 100644<br> --- a/Mk/Uses/<a href=3D"http://meson.mk" rel=3D"noreferrer" target=3D"_bla= nk">meson.mk</a><br> +++ b/Mk/Uses/<a href=3D"http://meson.mk" rel=3D"noreferrer" target=3D"_bla= nk">meson.mk</a><br> @@ -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<br> =C2=A0USE_LOCALE?=3D=C2=A0 =C2=A0en_US.UTF-8<br> <br> =C2=A0CONFIGURE_ARGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0--prefix ${PREFIX} \<br> +=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 \<br> =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}<br> <br> =C2=A0# Enable all optional features to make builds deterministic. Consumer= s can<br> diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile<br> index fbeed640d9ae..4d5b1133aa50 100644<br> --- a/devel/glib20/Makefile<br> +++ b/devel/glib20/Makefile<br> @@ -33,7 +33,6 @@ MESON_ARGS=3D=C2=A0 =C2=A0-Db_lundef=3Dfalse \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dinstalled_tests= =3Dfalse \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dintrospection=3Dd= isabled \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dlibmount=3Ddisabl= ed \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Druntime_dir=3D/va= r/run \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dselinux=3Ddisable= d \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dxattr=3Dfalse<br> diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile<br> index b73b94317ebb..96500977e6fe 100644<br> --- a/devel/libvirt/Makefile<br> +++ b/devel/libvirt/Makefile<br> @@ -71,8 +71,6 @@ LIBSSH2_LIB_DEPENDS=3D=C2=A0 libssh2.so:security/libssh2<= br> <br> =C2=A0ZFS_MESON_ENABLED=3D=C2=A0 =C2=A0 =C2=A0storage_zfs<br> <br> -VARDIR=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /var<br> -<br> =C2=A0MESON_ARGS+=3D=C2=A0 =C2=A0\<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dapparmor=3Ddisabl= ed \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dapparmor_profiles= =3Ddisabled \<br> @@ -122,8 +120,7 @@ MESON_ARGS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dwireshark_dissect= or=3Ddisabled \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dinit_script=3Dnon= e \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dbash_completion= =3Ddisabled \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Duserfaultfd_sysct= l=3Ddisabled \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D$= {VARDIR}<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Duserfaultfd_sysct= l=3Ddisabled<br> <br> =C2=A0# random_data fix can be removed when 8.x is eol<br> =C2=A0CONFIGURE_ENV=3D ac_cv_type_struct_random_data=3D""<br> @@ -203,7 +200,7 @@ post-install:<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libvirt/network \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 lib/libvirt/qemu/channel/target \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 cache/libvirt/qemu<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0@${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}&qu= ot;<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0@${MKDIR} "${STAGEDIR}/var/${dir}"<br= > =C2=A0.endfor<br> <br> =C2=A0.for file in ${CONF_FILES}<br> diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile<br> index c3a369abcd8e..34a8ec0f0596 100644<br> --- a/graphics/colord/Makefile<br> +++ b/graphics/colord/Makefile<br> @@ -28,8 +28,7 @@ MAKE_JOBS_UNSAFE=3D=C2=A0 =C2=A0 =C2=A0yes<br> =C2=A0MAKE_ENV=3D=C2=A0 =C2=A0 =C2=A0 PYTHONDONTWRITEBYTECODE=3D1<br> =C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Dsystemd=3Dfalse -Dudev_rules=3Dfalse \<b= r> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Ddaemon_user=3Dcol= ord -Dlibcolordcompat=3Dtrue \<br> -=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 \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--localstatedir=3D/= var \<br> +=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<br> <br> =C2=A0INSTALL_TARGET=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 install-strip<br> <br> diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile<br> index 847aedfefe42..495828d87590 100644<br> --- a/net/netatalk3/Makefile<br> +++ b/net/netatalk3/Makefile<br> @@ -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} \<br> =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 \<br> =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 \<br> =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 \<br> -=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 \<br> =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<br> <br> =C2=A0OPTIONS_DEFINE=3DPAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL = LIBWRAP SPOTLIGHT<br> diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefil= e<br> index 405978bfc380..bf0290e2eb9f 100644<br> --- a/ports-mgmt/packagekit/Makefile<br> +++ b/ports-mgmt/packagekit/Makefile<br> @@ -27,7 +27,7 @@ USE_LDCONFIG=3D yes<br> =C2=A0CPE_VENDOR=3D=C2=A0 =C2=A0 packagekit_project<br> =C2=A0SHEBANG_FILES=3D contrib/cron/packagekit-background.cron<br> <br> -MESON_ARGS=3D=C2=A0 =C2=A0 -Dlocalstatedir=3D/var -Dsysconfdir=3D${PREFIX}= /etc \<br> +MESON_ARGS=3D=C2=A0 =C2=A0 -Dsysconfdir=3D${PREFIX}/etc \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dpackaging_backend= =3Dfreebsd -Dsystemd=3Dfalse -Doffline_update=3Dfalse \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dbash_completion= =3Dfalse -Dbash_command_not_found=3Dfalse \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dgstreamer_plugin= =3Dfalse<br> diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/M= akefile<br> index 95c78eed1ac9..d7b57124c667 100644<br> --- a/sysutils/accountsservice/Makefile<br> +++ b/sysutils/accountsservice/Makefile<br> @@ -22,7 +22,6 @@ USE_LDCONFIG=3D yes<br> =C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Dconsolekit=3Dtrue \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dgdmconffile=3D${L= OCALBASE}/etc/gdm/custom.conf \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dlightdmconffile= =3D${LOCALBASE}/etc/lightdm/lightdm.conf \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dsystemdsystemunit= dir=3Dno \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dvapi=3Dfalse \<br= > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dtests=3Dfalse<br> diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile<br> index 54515cca4732..1ac37bce8b2f 100644<br> --- a/sysutils/pacman/Makefile<br> +++ b/sysutils/pacman/Makefile<br> @@ -28,7 +28,7 @@ SHEBANG_FILES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKSRC}/scr= ipts/<a href=3D"http://makepkg-template.pl.in" rel=3D"noreferrer" target=3D= "_blank">makepkg-template.pl.in</a> \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${WRKSRC}/scripts/l= ibmakepkg/<a href=3D"http://lint_config.sh.in" rel=3D"noreferrer" target=3D= "_blank">lint_config.sh.in</a><br> =C2=A0BINARY_ALIAS=3D=C2=A0 python3=3D${PYTHON_CMD}<br> =C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Droot-dir=3D${PACMAN_ROOT} \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D$= {PACMAN_ROOT}/var \<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--localstatedir=3D$= {PACMAN_ROOT}/var \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dsysconfdir=3D${PR= EFIX}/etc \<br> =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<br> diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile<br> index 432a074478a4..2a5b51483b3e 100644<br> --- a/sysutils/polkit/Makefile<br> +++ b/sysutils/polkit/Makefile<br> @@ -32,7 +32,6 @@ MESON_ARGS=3D=C2=A0 =C2=A0-Dpam_include=3Dsystem \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dsession_tracking= =3DConsoleKit \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dtests=3Dfalse \<b= r> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dintrospection=3Dt= rue \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dgtk_doc=3Dfalse<b= r> <br> =C2=A0OPTIONS_DEFINE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 MANPAGES<br> diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile<br> index 6c05643139fe..e32dbca3355a 100644<br> --- a/sysutils/upower/Makefile<br> +++ b/sysutils/upower/Makefile<br> @@ -20,7 +20,6 @@ USE_GNOME=3D=C2=A0 =C2=A0 glib20 introspection:build<br> =C2=A0USE_LDCONFIG=3D=C2=A0 yes<br> =C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Dgtk-doc=3Dfalse \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dos_backend=3Dfree= bsd \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dudevrulesdir=3Dno= \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dudevhwdbdir=3Dno = \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dsystemdsystemunit= dir=3Dno \<br> diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile<= br> index 1418e8e48fe5..6d2d51eaa975 100644<br> --- a/x11-fonts/fontconfig/Makefile<br> +++ b/x11-fonts/fontconfig/Makefile<br> @@ -35,7 +35,6 @@ SUB_LIST=3D=C2=A0 =C2=A0 =C2=A0LOCALBASE=3D${LOCALBASE}<b= r> =C2=A0MESON_ARGS=3D=C2=A0 =C2=A0 -Ddefault_library=3Dboth -Ddoc=3Ddisabled = -Dcache-build=3Ddisabled \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Ddefault-fonts-dir= s=3D${PREFIX}/share/fonts \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dadditional-fonts-= dirs=3D${LOCALBASE}/lib/X11/fonts \<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dlocalstatedir=3D/= var \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dcache-dir=3D/var/= db/fontconfig \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dtemplate-dir=3D${= LOCALBASE}/etc/fonts/conf.avail \<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dxml-dir=3D${LOCAL= BASE}/etc/fonts<br> </blockquote></div><div><br clear=3D"all"></div><br><span class=3D"gmail_si= gnature_prefix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><d= iv dir=3D"ltr"><div><font color=3D"#888888">Nuno Teixeira</font></div><div>= <div><font color=3D"#888888"> FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a h= ref=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://Fr= eeBSD.org</a><br></font></div></div></div></div> --0000000000006c599406291a0d96--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7U%2BCiD8LXD%2BRkkFHdkNgEmFNVxFjFukbBA9zeVr4NvV9aA>