Attachment #255699 for bug #273605

Lines 33-38 BUILD_DEPENDS+= meson:devel/meson Link Here

(-)b/Mk/Uses/meson.mk (+1 lines)
33	USE_LOCALE?= en_US.UTF-8	33	USE_LOCALE?= en_US.UTF-8
34		34
35	CONFIGURE_ARGS+= --prefix ${PREFIX} \	35	CONFIGURE_ARGS+= --prefix ${PREFIX} \
		36	--localstatedir /var \
36	--infodir ${INFO_PATH}	37	--infodir ${INFO_PATH}
37		38
38	# Enable all optional features to make builds deterministic. Consumers can	39	# Enable all optional features to make builds deterministic. Consumers can

Lines 32-38 MESON_ARGS= -Db_lundef=false \ Link Here

(-)b/devel/glib20/Makefile (-1 lines)
32	-Dinstalled_tests=false \	32	-Dinstalled_tests=false \
33	-Dintrospection=disabled \	33	-Dintrospection=disabled \
34	-Dlibmount=disabled \	34	-Dlibmount=disabled \
35	-Dlocalstatedir=/var \
36	-Druntime_dir=/var/run \	35	-Druntime_dir=/var/run \
37	-Dselinux=disabled \	36	-Dselinux=disabled \
38	-Dsysprof=disabled \	37	-Dsysprof=disabled \





ZFS_MESON_ENABLED=	storage_zfs

VARDIR=		/var

MESON_ARGS+=	\
		-Dapparmor=disabled \
		-Dapparmor_profiles=disabled \

		-Dwireshark_dissector=disabled \
		-Dinit_script=none \
		-Dbash_completion=disabled \
		-Duserfaultfd_sysctl=disabled
		-Dlocalstatedir=${VARDIR}

# random_data fix can be removed when 8.x is eol
CONFIGURE_ENV=	ac_cv_type_struct_random_data=""

	lib/libvirt/network \
	lib/libvirt/qemu/channel/target \
	cache/libvirt/qemu
	@${MKDIR} "${STAGEDIR}/var/${dir}"
.endfor

.for file in ${CONF_FILES}

Lines 56-63 CONFIGURE_ARGS+= \ Link Here

(-)b/emulators/qemu-cheri/Makefile (-2 / +1 lines)
56	--disable-xen \	56	--disable-xen \
57	--meson=${LOCALBASE}/bin/meson \	57	--meson=${LOCALBASE}/bin/meson \
58	--smbd=${LOCALBASE}/sbin/smbd \	58	--smbd=${LOCALBASE}/sbin/smbd \
59	--extra-cflags="-g ${EXTRA_CFLAGS}" \	59	--extra-cflags="-g ${EXTRA_CFLAGS}"
60	--localstatedir=/var
61	EXTRA_CFLAGS= -DCHERI_UNALIGNED	60	EXTRA_CFLAGS= -DCHERI_UNALIGNED
62		61
63	PLIST_FILES= bin/qemu-system-morello \	62	PLIST_FILES= bin/qemu-system-morello \

Lines 38-44 USE_XORG= pixman Link Here

(-)b/emulators/qemu-devel/Makefile (-1 / +1 lines)
38	SHEBANG_FILES= scripts/xml-preprocess.py	38	SHEBANG_FILES= scripts/xml-preprocess.py
39		39
40	HAS_CONFIGURE= yes	40	HAS_CONFIGURE= yes
41	CONFIGURE_ARGS= --localstatedir=/var --mandir=share/man --extra-ldflags=-L\"/usr/lib\" \	41	CONFIGURE_ARGS= --mandir=share/man --extra-ldflags=-L\"/usr/lib\" \
42	--extra-ldflags=-L\"${LOCALBASE}/lib\" --enable-debug \	42	--extra-ldflags=-L\"${LOCALBASE}/lib\" --enable-debug \
43	--prefix=${PREFIX} --cc=${CC} --enable-netmap --disable-kvm \	43	--prefix=${PREFIX} --cc=${CC} --enable-netmap --disable-kvm \
44	--disable-linux-user --disable-linux-aio --disable-xen \	44	--disable-linux-user --disable-linux-aio --disable-xen \

Lines 37-43 SUB_LIST= NAME=qemu_user_static Link Here

(-)b/emulators/qemu-user-static-devel/Makefile (-1 lines)
37		37
38	MAKE_ENV= BSD_MAKE="${MAKE}" V=1	38	MAKE_ENV= BSD_MAKE="${MAKE}" V=1
39	CONFIGURE_ARGS= --prefix=${PREFIX} --cc=${CC} \	39	CONFIGURE_ARGS= --prefix=${PREFIX} --cc=${CC} \
40	--localstatedir=/var \
41	--extra-ldflags=-L${LOCALBASE}/lib \	40	--extra-ldflags=-L${LOCALBASE}/lib \
42	--extra-cflags=-I${LOCALBASE}/include \	41	--extra-cflags=-I${LOCALBASE}/include \
43	--enable-debug \	42	--enable-debug \

Lines 69-75 CONFIGURE_ARGS+= --cc=${CC} \ Link Here

(-)b/emulators/qemu/Makefile (-1 lines)
69	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \	69	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \
70	--extra-ldflags=-L${LOCALBASE}/lib \	70	--extra-ldflags=-L${LOCALBASE}/lib \
71	--extra-ldflags=-L/usr/lib \	71	--extra-ldflags=-L/usr/lib \
72	--localstatedir=/var \
73	--mandir=${PREFIX}/share/man \	72	--mandir=${PREFIX}/share/man \
74	--prefix=${PREFIX} \	73	--prefix=${PREFIX} \
75	--python=${PYTHON_CMD}	74	--python=${PYTHON_CMD}

Lines 28-35 MAKE_JOBS_UNSAFE= yes Link Here

(-)b/graphics/colord/Makefile (-2 / +1 lines)
28	MAKE_ENV= PYTHONDONTWRITEBYTECODE=1	28	MAKE_ENV= PYTHONDONTWRITEBYTECODE=1
29	MESON_ARGS= -Dsystemd=false -Dudev_rules=false \	29	MESON_ARGS= -Dsystemd=false -Dudev_rules=false \
30	-Ddaemon_user=colord -Dlibcolordcompat=true \	30	-Ddaemon_user=colord -Dlibcolordcompat=true \
31	-Dpnp_ids=${LOCALBASE}/share/hwdata/pnp.ids \	31	-Dpnp_ids=${LOCALBASE}/share/hwdata/pnp.ids
32	--localstatedir=/var \
33		32
34	INSTALL_TARGET= install-strip	33	INSTALL_TARGET= install-strip
35		34

Lines 30-36 MESON_ARGS= -Dwith-libgcrypt-path=${LOCALBASE} \ Link Here

(-)b/net/netatalk3/Makefile (-1 lines)
30	-Dwith-shadow=false \	30	-Dwith-shadow=false \
31	-Dwith-pgp-uam=false \	31	-Dwith-pgp-uam=false \
32	-Ddefault_library=both \	32	-Ddefault_library=both \
33	--localstatedir=/var \
34	--infodir=${PREFIX}/share/info	33	--infodir=${PREFIX}/share/info
35		34
36	OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP SPOTLIGHT	35	OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP SPOTLIGHT

Lines 27-33 USE_LDCONFIG= yes Link Here

(-)b/ports-mgmt/packagekit/Makefile (-1 / +1 lines)
27	CPE_VENDOR= packagekit_project	27	CPE_VENDOR= packagekit_project
28	SHEBANG_FILES= contrib/cron/packagekit-background.cron	28	SHEBANG_FILES= contrib/cron/packagekit-background.cron
29		29
30	MESON_ARGS= -Dlocalstatedir=/var -Dsysconfdir=${PREFIX}/etc \	30	MESON_ARGS= -Dsysconfdir=${PREFIX}/etc \
31	-Dpackaging_backend=freebsd -Dsystemd=false -Doffline_update=false \	31	-Dpackaging_backend=freebsd -Dsystemd=false -Doffline_update=false \
32	-Dbash_completion=false -Dbash_command_not_found=false \	32	-Dbash_completion=false -Dbash_command_not_found=false \
33	-Dgstreamer_plugin=false	33	-Dgstreamer_plugin=false

Lines 22-28 USE_LDCONFIG= yes Link Here

(-)b/sysutils/accountsservice/Makefile (-1 lines)
22	MESON_ARGS= -Dconsolekit=true \	22	MESON_ARGS= -Dconsolekit=true \
23	-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \	23	-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
24	-Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \	24	-Dlightdmconffile=${LOCALBASE}/etc/lightdm/lightdm.conf \
25	-Dlocalstatedir=/var \
26	-Dsystemdsystemunitdir=no \	25	-Dsystemdsystemunitdir=no \
27	-Dvapi=false \	26	-Dvapi=false \
28	-Dtests=false	27	-Dtests=false

Lines 32-38 MESON_ARGS= -Dpam_include=system \ Link Here

(-)b/sysutils/polkit/Makefile (-1 lines)
32	-Dsession_tracking=ConsoleKit \	32	-Dsession_tracking=ConsoleKit \
33	-Dtests=false \	33	-Dtests=false \
34	-Dintrospection=true \	34	-Dintrospection=true \
35	-Dlocalstatedir=/var \
36	-Dgtk_doc=false	35	-Dgtk_doc=false
37		36
38	OPTIONS_DEFINE= MANPAGES	37	OPTIONS_DEFINE= MANPAGES

Lines 20-26 USE_GNOME= glib20 introspection:build Link Here

(-)b/sysutils/upower/Makefile (-1 lines)
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21	MESON_ARGS= -Dgtk-doc=false \	21	MESON_ARGS= -Dgtk-doc=false \
22	-Dos_backend=freebsd \	22	-Dos_backend=freebsd \
23	-Dlocalstatedir=/var \
24	-Dudevrulesdir=no \	23	-Dudevrulesdir=no \
25	-Dudevhwdbdir=no \	24	-Dudevhwdbdir=no \
26	-Dsystemdsystemunitdir=no \	25	-Dsystemdsystemunitdir=no \

Lines 35-41 SUB_LIST= LOCALBASE=${LOCALBASE} Link Here

(-)b/x11-fonts/fontconfig/Makefile (-1 lines)
35	MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled \	35	MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled \
36	-Ddefault-fonts-dirs=${PREFIX}/share/fonts \	36	-Ddefault-fonts-dirs=${PREFIX}/share/fonts \
37	-Dadditional-fonts-dirs=${LOCALBASE}/lib/X11/fonts \	37	-Dadditional-fonts-dirs=${LOCALBASE}/lib/X11/fonts \
38	-Dlocalstatedir=/var \
39	-Dcache-dir=/var/db/fontconfig \	38	-Dcache-dir=/var/db/fontconfig \
40	-Dtemplate-dir=${LOCALBASE}/etc/fonts/conf.avail \	39	-Dtemplate-dir=${LOCALBASE}/etc/fonts/conf.avail \
41	-Dxml-dir=${LOCALBASE}/etc/fonts	40	-Dxml-dir=${LOCALBASE}/etc/fonts

Return to bug 273605

Lines 71-78 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 Link Here

(-)b/devel/libvirt/Makefile (-5 / +2 lines)
71		71
72	ZFS_MESON_ENABLED= storage_zfs	72	ZFS_MESON_ENABLED= storage_zfs
73		73
74	VARDIR= /var
75
76	MESON_ARGS+= \	74	MESON_ARGS+= \
77	-Dapparmor=disabled \	75	-Dapparmor=disabled \
78	-Dapparmor_profiles=disabled \	76	-Dapparmor_profiles=disabled \
Lines 122-129 MESON_ARGS+= \ Link Here
122	-Dwireshark_dissector=disabled \	120	-Dwireshark_dissector=disabled \
123	-Dinit_script=none \	121	-Dinit_script=none \
124	-Dbash_completion=disabled \	122	-Dbash_completion=disabled \
125	-Duserfaultfd_sysctl=disabled \	123	-Duserfaultfd_sysctl=disabled
126	-Dlocalstatedir=${VARDIR}
127		124
128	# random_data fix can be removed when 8.x is eol	125	# random_data fix can be removed when 8.x is eol
129	CONFIGURE_ENV= ac_cv_type_struct_random_data=""	126	CONFIGURE_ENV= ac_cv_type_struct_random_data=""
Lines 203-209 post-install: Link Here
203	lib/libvirt/network \	200	lib/libvirt/network \
204	lib/libvirt/qemu/channel/target \	201	lib/libvirt/qemu/channel/target \
205	cache/libvirt/qemu	202	cache/libvirt/qemu
206	@${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}"	203	@${MKDIR} "${STAGEDIR}/var/${dir}"
207	.endfor	204	.endfor
208		205
209	.for file in ${CONF_FILES}	206	.for file in ${CONF_FILES}