Attachment #146081 for bug #192441




# $FreeBSD$

PORTNAME=	libvirt
PORTVERSION=	1.2.7
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	http://libvirt.org/sources/ \
		ftp://libvirt.org/libvirt/

NLS_CONFIGURE_ENABLE=	nls
NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}

VARDIR=		/var

USE_RC_SUBR=	libvirtd

GNU_CONFIGURE=	yes

		--without-sysctl \
		--without-lxc \
		--without-uml \
		--with-ssh2 \
		--localstatedir=${VARDIR}

# workaround to override pkg-config calls
# random_data fix can be removed when 8.x is eol

		libvirt/lock-driver/lockd.so \
		libvirt/connection-driver/libvirt_driver_vbox.so \
		libvirt/connection-driver/libvirt_driver_secret.so \
		libvirt/connection-driver/libvirt_driver_storage.so \
		libvirt/connection-driver/libvirt_driver_network.so

.include <bsd.port.options.mk>


PLIST_SUB+=	BHYVE="@comment "
.endif

.if ${PORT_OPTIONS:MBHYVE}
STRIP_FILES+=	libvirt/connection-driver/libvirt_driver_bhyve.so
.endif

post-patch:
.if ${OSVERSION} < 900000
	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||' \

	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
.endfor

.for dir in run/libvirt/network \
	run/libvirt/qemu \
	run/libvirt/lockd \
	log/libvirt/uml \
	log/libvirt/qemu \
	log/libvirt/lxc \
	lib/libvirt/boot \
	lib/libvirt/lockd/files \
	lib/libvirt/images \
	lib/libvirt/dnsmasq \
	lib/libvirt/filesystems \
	lib/libvirt/network \
	lib/libvirt/qemu/channel/target \
	cache/libvirt/qemu
	@${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}"
.endfor

regression-test: build
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (libvirt-1.2.6.tar.gz) = 38a224559a1d04e5d4163c5c1b810df1f29804ebbb1f057d4abcb41a9e5d5dea	1	SHA256 (libvirt-1.2.7.tar.gz) = 3dfb462cba1188d2c9ba700e1927fa0dbd71f20afdf81ab0c43b27b7fe77defc
2	SIZE (libvirt-1.2.6.tar.gz) = 29346718	2	SIZE (libvirt-1.2.7.tar.gz) = 29676178

Lines 20-26 Link Here

(-)files/libvirtd.in (-1 / +1 lines)
20	load_rc_config $name	20	load_rc_config $name
21		21
22	command=%%PREFIX%%/sbin/libvirtd	22	command=%%PREFIX%%/sbin/libvirtd
23	pidfile=%%LOCALBASE%%/var/run/${name}.pid	23	pidfile=/var/run/${name}.pid
24		24
25	command_args="--daemon --pid-file=${pidfile}"	25	command_args="--daemon --pid-file=${pidfile}"
26		26




@dirrmtry %%ETCDIR%%/qemu/networks
@dirrmtry %%ETCDIR%%/qemu
@dirrm %%ETCDIR%%
@dirrmtry /var/run/libvirt/network
@dirrmtry /var/run/libvirt/qemu
@dirrmtry /var/run/libvirt/lockd
@dirrmtry /var/run/libvirt
@dirrmtry /var/run
@dirrmtry /var/log/libvirt/uml
@dirrmtry /var/log/libvirt/qemu
@dirrmtry /var/log/libvirt/lxc
@dirrmtry /var/log/libvirt
@dirrmtry /var/log
@dirrmtry /var/lib/libvirt/lockd/files
@dirrmtry /var/lib/libvirt/lockd
@dirrmtry /var/lib/libvirt/images
@dirrmtry /var/lib/libvirt/boot
@dirrmtry /var/lib/libvirt/dnsmasq
@dirrmtry /var/lib/libvirt/filesystems
@dirrmtry /var/lib/libvirt/network
@dirrmtry /var/lib/libvirt/qemu/channel/target
@dirrmtry /var/lib/libvirt/qemu/channel
@dirrmtry /var/lib/libvirt/qemu
@dirrmtry /var/lib/libvirt
@dirrmtry /var/lib
@dirrmtry /var/cache/libvirt/qemu
@dirrmtry /var/cache/libvirt
@dirrmtry /var/cache
@dirrmtry var

Return to bug 192441

Lines 333-361 Link Here

(-)pkg-plist (-26 / +25 lines)
333	@dirrmtry %%ETCDIR%%/qemu/networks	333	@dirrmtry %%ETCDIR%%/qemu/networks
334	@dirrmtry %%ETCDIR%%/qemu	334	@dirrmtry %%ETCDIR%%/qemu
335	@dirrm %%ETCDIR%%	335	@dirrm %%ETCDIR%%
336	@dirrmtry var/run/libvirt/network	336	@dirrmtry /var/run/libvirt/network
337	%%QEMU%%@dirrmtry var/run/libvirt/qemu	337	@dirrmtry /var/run/libvirt/qemu
338	@dirrmtry var/run/libvirt/lockd	338	@dirrmtry /var/run/libvirt/lockd
339	@dirrmtry var/run/libvirt	339	@dirrmtry /var/run/libvirt
340	@dirrmtry var/run	340	@dirrmtry /var/run
341	@dirrmtry var/log/libvirt/uml	341	@dirrmtry /var/log/libvirt/uml
342	@dirrmtry var/log/libvirt/qemu	342	@dirrmtry /var/log/libvirt/qemu
343	@dirrmtry var/log/libvirt/lxc	343	@dirrmtry /var/log/libvirt/lxc
344	@dirrmtry var/log/libvirt	344	@dirrmtry /var/log/libvirt
345	@dirrmtry var/log	345	@dirrmtry /var/log
346	@dirrmtry var/lib/libvirt/lockd/files	346	@dirrmtry /var/lib/libvirt/lockd/files
347	@dirrmtry var/lib/libvirt/lockd	347	@dirrmtry /var/lib/libvirt/lockd
348	@dirrmtry var/lib/libvirt/images	348	@dirrmtry /var/lib/libvirt/images
349	@dirrmtry var/lib/libvirt/boot	349	@dirrmtry /var/lib/libvirt/boot
350	@dirrmtry var/lib/libvirt/dnsmasq	350	@dirrmtry /var/lib/libvirt/dnsmasq
351	@dirrmtry var/lib/libvirt/filesystems	351	@dirrmtry /var/lib/libvirt/filesystems
352	@dirrmtry var/lib/libvirt/network	352	@dirrmtry /var/lib/libvirt/network
353	%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel/target	353	@dirrmtry /var/lib/libvirt/qemu/channel/target
354	%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel	354	@dirrmtry /var/lib/libvirt/qemu/channel
355	%%QEMU%%@dirrmtry var/lib/libvirt/qemu	355	@dirrmtry /var/lib/libvirt/qemu
356	@dirrmtry var/lib/libvirt	356	@dirrmtry /var/lib/libvirt
357	@dirrmtry var/lib	357	@dirrmtry /var/lib
358	%%QEMU%%@dirrmtry var/cache/libvirt/qemu	358	@dirrmtry /var/cache/libvirt/qemu
359	@dirrmtry var/cache/libvirt	359	@dirrmtry /var/cache/libvirt
360	@dirrmtry var/cache	360	@dirrmtry /var/cache
361	@dirrmtry var

Lines 2-9 Link Here

(-)Makefile (-4 / +28 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libvirt	4	PORTNAME= libvirt
5	PORTVERSION= 1.2.6	5	PORTVERSION= 1.2.7
6	PORTREVISION= 2
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://libvirt.org/sources/ \	7	MASTER_SITES= http://libvirt.org/sources/ \
9	ftp://libvirt.org/libvirt/	8	ftp://libvirt.org/libvirt/
Lines 40-45 Link Here
40	NLS_CONFIGURE_ENABLE= nls	39	NLS_CONFIGURE_ENABLE= nls
41	NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE}	40	NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE}
42		41
		42	VARDIR= /var
		43
43	USE_RC_SUBR= libvirtd	44	USE_RC_SUBR= libvirtd
44		45
45	GNU_CONFIGURE= yes	46	GNU_CONFIGURE= yes
Lines 52-58 Link Here
52	--without-sysctl \	53	--without-sysctl \
53	--without-lxc \	54	--without-lxc \
54	--without-uml \	55	--without-uml \
55	--with-ssh2	56	--with-ssh2 \
		57	--localstatedir=${VARDIR}
56		58
57	# workaround to override pkg-config calls	59	# workaround to override pkg-config calls
58	# random_data fix can be removed when 8.x is eol	60	# random_data fix can be removed when 8.x is eol
Lines 78-84 Link Here
78	libvirt/lock-driver/lockd.so \	80	libvirt/lock-driver/lockd.so \
79	libvirt/connection-driver/libvirt_driver_vbox.so \	81	libvirt/connection-driver/libvirt_driver_vbox.so \
80	libvirt/connection-driver/libvirt_driver_secret.so \	82	libvirt/connection-driver/libvirt_driver_secret.so \
81	libvirt/connection-driver/libvirt_driver_storage.so	83	libvirt/connection-driver/libvirt_driver_storage.so \
		84	libvirt/connection-driver/libvirt_driver_network.so
82		85
83	.include <bsd.port.options.mk>	86	.include <bsd.port.options.mk>
84		87
Lines 91-96 Link Here
91	PLIST_SUB+= BHYVE="@comment "	94	PLIST_SUB+= BHYVE="@comment "
92	.endif	95	.endif
93		96
		97	.if ${PORT_OPTIONS:MBHYVE}
		98	STRIP_FILES+= libvirt/connection-driver/libvirt_driver_bhyve.so
		99	.endif
		100
94	post-patch:	101	post-patch:
95	.if ${OSVERSION} < 900000	102	.if ${OSVERSION} < 900000
96	@${REINPLACE_CMD} -e 's\|-Wmissing-include-dirs\|\|' \	103	@${REINPLACE_CMD} -e 's\|-Wmissing-include-dirs\|\|' \
Lines 123-128 Link Here
123	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}	130	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
124	.endfor	131	.endfor
125		132
		133	.for dir in run/libvirt/network \
		134	run/libvirt/qemu \
		135	run/libvirt/lockd \
		136	log/libvirt/uml \
		137	log/libvirt/qemu \
		138	log/libvirt/lxc \
		139	lib/libvirt/boot \
		140	lib/libvirt/lockd/files \
		141	lib/libvirt/images \
		142	lib/libvirt/dnsmasq \
		143	lib/libvirt/filesystems \
		144	lib/libvirt/network \
		145	lib/libvirt/qemu/channel/target \
		146	cache/libvirt/qemu
		147	@${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}"
		148	.endfor
		149
126	regression-test: build	150	regression-test: build
127	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check	151	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
128		152