Date: Thu, 12 Dec 2024 22:19:13 +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: <CAFDf7ULJnN9LEwiCv%2Br3Vwp_h9ssr7RUW2Mc6nmHOT7t6CQOeg@mail.gmail.com> In-Reply-To: <CAFDf7U%2BCiD8LXD%2BRkkFHdkNgEmFNVxFjFukbBA9zeVr4NvV9aA@mail.gmail.com> References: <202412122057.4BCKvP3Z094444@gitrepo.freebsd.org> <CAFDf7U%2BCiD8LXD%2BRkkFHdkNgEmFNVxFjFukbBA9zeVr4NvV9aA@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] (...) Nevermind, it seams that MESON_ARGS accepts -Dlocalstatedir or --localstatedir as valid options. Sorry for the noise. Nuno Teixeira <eduardo@freebsd.org> escreveu (quinta, 12/12/2024 à(s) 22:15): > Hello, > > Could pacman be checked? > > --- a/sysutils/pacman/Makefile > <https://cgit.freebsd.org/ports/tree/sysutils/pacman/Makefile?id=7b20f87790b64c5e3c068c4ab055f5f9758db0b7>; > +++ b/sysutils/pacman/Makefile > <https://cgit.freebsd.org/ports/tree/sysutils/pacman/Makefile?id=f735bc3d93c4559aef3b2c9924d3c408ff3a3191>; > @@ -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 > > Cheers, > > Jan Beich <jbeich@freebsd.org> escreveu (quinta, 12/12/2024 à(s) 20:57): > >> The branch main has been updated by jbeich: >> >> URL: >> https://cgit.FreeBSD.org/ports/commit/?id=f735bc3d93c4559aef3b2c9924d3c408ff3a3191 >> >> 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=/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 >> > > > -- > Nuno Teixeira > FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org > -- Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org [-- Attachment #2 --] <div dir="ltr"><div>(...)</div><div><br></div><div>Nevermind, it seams that MESON_ARGS accepts -Dlocalstatedir or --localstatedir as valid options.<br><br></div><div>Sorry for the noise.<br></div></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">Nuno Teixeira <<a href="mailto:eduardo@freebsd.org">eduardo@freebsd.org</a>> escreveu (quinta, 12/12/2024 à(s) 22:15):<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>Hello,</div><div><br></div><div>Could pacman be checked?</div><div><br></div><div><div>--- a/<a href="https://cgit.freebsd.org/ports/tree/sysutils/pacman/Makefile?id=7b20f87790b64c5e3c068c4ab055f5f9758db0b7" target="_blank">sysutils/pacman/Makefile</a><br>+++ b/<a href="https://cgit.freebsd.org/ports/tree/sysutils/pacman/Makefile?id=f735bc3d93c4559aef3b2c9924d3c408ff3a3191" target="_blank">sysutils/pacman/Makefile</a></div><div>@@ -28,7 +28,7 @@ SHEBANG_FILES= ${WRKSRC}/scripts/<a href="http://makepkg-template.pl.in" target="_blank">makepkg-template.pl.in</a> \</div><div> ${WRKSRC}/scripts/libmakepkg/<a href="http://lint_config.sh.in" target="_blank">lint_config.sh.in</a></div><div> BINARY_ALIAS= python3=${PYTHON_CMD}</div><div> MESON_ARGS= -Droot-dir=${PACMAN_ROOT} \</div><div><b>- -Dlocalstatedir=${PACMAN_ROOT}/var \</b></div><div><b>+ --localstatedir=${PACMAN_ROOT}/var \</b></div><div> -Dsysconfdir=${PREFIX}/etc \</div><div> -Dcrypto=openssl</div><div> USE_LDCONFIG= yes</div><div><br></div><div>Cheers,<br></div></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Jan Beich <<a href="mailto:jbeich@freebsd.org" target="_blank">jbeich@freebsd.org</a>> escreveu (quinta, 12/12/2024 à(s) 20:57):<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by jbeich:<br> <br> URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=f735bc3d93c4559aef3b2c9924d3c408ff3a3191" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=f735bc3d93c4559aef3b2c9924d3c408ff3a3191</a><br>; <br> commit f735bc3d93c4559aef3b2c9924d3c408ff3a3191<br> Author: Jan Beich <jbeich@FreeBSD.org><br> AuthorDate: 2024-12-08 08:38:09 +0000<br> Commit: Jan Beich <jbeich@FreeBSD.org><br> CommitDate: 2024-12-12 20:56:40 +0000<br> <br> Mk/Uses/<a href="http://meson.mk" rel="noreferrer" target="_blank">meson.mk</a>: pass --localstatedir like GNU_CONFIGURE after 9f4546a03cc0<br> <br> Meson defaults to --localstatedir=/var/local if --prefix=/usr/local<br> but this is not valid for ports/ or FreeBSD hier(7).<br> <br> See also 68edbeeaae96 and<br> <a href="https://github.com/mesonbuild/meson/commit/24549dbed5fe" rel="noreferrer" target="_blank">https://github.com/mesonbuild/meson/commit/24549dbed5fe</a><br>; <br> PR: 273605<br> Analyzed by: Tatsuki Makino<br> Exp-run by: antoine<br> ---<br> Mk/Uses/<a href="http://meson.mk" rel="noreferrer" target="_blank">meson.mk</a> | 1 +<br> devel/glib20/Makefile | 1 -<br> devel/libvirt/Makefile | 7 ++-----<br> graphics/colord/Makefile | 3 +--<br> net/netatalk3/Makefile | 1 -<br> ports-mgmt/packagekit/Makefile | 2 +-<br> sysutils/accountsservice/Makefile | 1 -<br> sysutils/pacman/Makefile | 2 +-<br> sysutils/polkit/Makefile | 1 -<br> sysutils/upower/Makefile | 1 -<br> x11-fonts/fontconfig/Makefile | 1 -<br> 11 files changed, 6 insertions(+), 15 deletions(-)<br> <br> diff --git a/Mk/Uses/<a href="http://meson.mk" rel="noreferrer" target="_blank">meson.mk</a> b/Mk/Uses/<a href="http://meson.mk" rel="noreferrer" target="_blank">meson.mk</a><br> index 571e8a990be0..eded01a885bf 100644<br> --- a/Mk/Uses/<a href="http://meson.mk" rel="noreferrer" target="_blank">meson.mk</a><br> +++ b/Mk/Uses/<a href="http://meson.mk" rel="noreferrer" target="_blank">meson.mk</a><br> @@ -33,6 +33,7 @@ BUILD_DEPENDS+= meson:devel/meson<br> USE_LOCALE?= en_US.UTF-8<br> <br> CONFIGURE_ARGS+= --prefix ${PREFIX} \<br> + --localstatedir /var \<br> --infodir ${INFO_PATH}<br> <br> # Enable all optional features to make builds deterministic. Consumers 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= -Db_lundef=false \<br> -Dinstalled_tests=false \<br> -Dintrospection=disabled \<br> -Dlibmount=disabled \<br> - -Dlocalstatedir=/var \<br> -Druntime_dir=/var/run \<br> -Dselinux=disabled \<br> -Dxattr=false<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= libssh2.so:security/libssh2<br> <br> ZFS_MESON_ENABLED= storage_zfs<br> <br> -VARDIR= /var<br> -<br> MESON_ARGS+= \<br> -Dapparmor=disabled \<br> -Dapparmor_profiles=disabled \<br> @@ -122,8 +120,7 @@ MESON_ARGS+= \<br> -Dwireshark_dissector=disabled \<br> -Dinit_script=none \<br> -Dbash_completion=disabled \<br> - -Duserfaultfd_sysctl=disabled \<br> - -Dlocalstatedir=${VARDIR}<br> + -Duserfaultfd_sysctl=disabled<br> <br> # random_data fix can be removed when 8.x is eol<br> CONFIGURE_ENV= ac_cv_type_struct_random_data=""<br> @@ -203,7 +200,7 @@ post-install:<br> lib/libvirt/network \<br> lib/libvirt/qemu/channel/target \<br> cache/libvirt/qemu<br> - @${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}"<br> + @${MKDIR} "${STAGEDIR}/var/${dir}"<br> .endfor<br> <br> .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= yes<br> MAKE_ENV= PYTHONDONTWRITEBYTECODE=1<br> MESON_ARGS= -Dsystemd=false -Dudev_rules=false \<br> -Ddaemon_user=colord -Dlibcolordcompat=true \<br> - -Dpnp_ids=${LOCALBASE}/share/hwdata/pnp.ids \<br> - --localstatedir=/var \<br> + -Dpnp_ids=${LOCALBASE}/share/hwdata/pnp.ids<br> <br> INSTALL_TARGET= 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= -Dwith-libgcrypt-path=${LOCALBASE} \<br> -Dwith-shadow=false \<br> -Dwith-pgp-uam=false \<br> -Ddefault_library=both \<br> - --localstatedir=/var \<br> --infodir=${PREFIX}/share/info<br> <br> OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP SPOTLIGHT<br> diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile<br> index 405978bfc380..bf0290e2eb9f 100644<br> --- a/ports-mgmt/packagekit/Makefile<br> +++ b/ports-mgmt/packagekit/Makefile<br> @@ -27,7 +27,7 @@ USE_LDCONFIG= yes<br> CPE_VENDOR= packagekit_project<br> SHEBANG_FILES= contrib/cron/packagekit-background.cron<br> <br> -MESON_ARGS= -Dlocalstatedir=/var -Dsysconfdir=${PREFIX}/etc \<br> +MESON_ARGS= -Dsysconfdir=${PREFIX}/etc \<br> -Dpackaging_backend=freebsd -Dsystemd=false -Doffline_update=false \<br> -Dbash_completion=false -Dbash_command_not_found=false \<br> -Dgstreamer_plugin=false<br> diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile<br> index 95c78eed1ac9..d7b57124c667 100644<br> --- a/sysutils/accountsservice/Makefile<br> +++ b/sysutils/accountsservice/Makefile<br> @@ -22,7 +22,6 @@ USE_LDCONFIG= yes<br> MESON_ARGS= -Dconsolekit=true \<br> -Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \<br> -Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \<br> - -Dlocalstatedir=/var \<br> -Dsystemdsystemunitdir=no \<br> -Dvapi=false \<br> -Dtests=false<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= ${WRKSRC}/scripts/<a href="http://makepkg-template.pl.in" rel="noreferrer" target="_blank">makepkg-template.pl.in</a> \<br> ${WRKSRC}/scripts/libmakepkg/<a href="http://lint_config.sh.in" rel="noreferrer" target="_blank">lint_config.sh.in</a><br> BINARY_ALIAS= python3=${PYTHON_CMD}<br> MESON_ARGS= -Droot-dir=${PACMAN_ROOT} \<br> - -Dlocalstatedir=${PACMAN_ROOT}/var \<br> + --localstatedir=${PACMAN_ROOT}/var \<br> -Dsysconfdir=${PREFIX}/etc \<br> -Dcrypto=openssl<br> USE_LDCONFIG= 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= -Dpam_include=system \<br> -Dsession_tracking=ConsoleKit \<br> -Dtests=false \<br> -Dintrospection=true \<br> - -Dlocalstatedir=/var \<br> -Dgtk_doc=false<br> <br> OPTIONS_DEFINE= 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= glib20 introspection:build<br> USE_LDCONFIG= yes<br> MESON_ARGS= -Dgtk-doc=false \<br> -Dos_backend=freebsd \<br> - -Dlocalstatedir=/var \<br> -Dudevrulesdir=no \<br> -Dudevhwdbdir=no \<br> -Dsystemdsystemunitdir=no \<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= LOCALBASE=${LOCALBASE}<br> MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled \<br> -Ddefault-fonts-dirs=${PREFIX}/share/fonts \<br> -Dadditional-fonts-dirs=${LOCALBASE}/lib/X11/fonts \<br> - -Dlocalstatedir=/var \<br> -Dcache-dir=/var/db/fontconfig \<br> -Dtemplate-dir=${LOCALBASE}/etc/fonts/conf.avail \<br> -Dxml-dir=${LOCALBASE}/etc/fonts<br> </blockquote></div><div><br clear="all"></div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888"> FreeBSD UNIX: <eduardo@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div>; </blockquote></div><div><br clear="all"></div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888"> FreeBSD UNIX: <eduardo@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div>;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7ULJnN9LEwiCv%2Br3Vwp_h9ssr7RUW2Mc6nmHOT7t6CQOeg>