Attachment #145424 for bug #192441




# $FreeBSD: head/devel/libvirt/Makefile 363436 2014-07-30 03:57:23Z pi $

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

LIBVIRT_RUNDIR=	${VARDIR}/run/libvirt
RUNDIR_NETWORK=	${LIBVIRT_RUNDIR}/network
RUNDIR_QEMU=	${LIBVIRT_RUNDIR}/qemu
RUNDIR_LOCKD=	${LIBVIRT_RUNDIR}/lockd

LIBVIRT_LOGDIR=	${VARDIR}/log/libvirt
LOGDIR_UML=	${LIBVIRT_LOGDIR}/uml
LOGDIR_QEMU=	${LIBVIRT_LOGDIR}/qemu
LOGDIR_LXC=	${LIBVIRT_LOGDIR}/lxc

LIBVIRT_VARLIBDIR=	${VARDIR}/lib/libvirt
VARLIBDIR_LOCKD=	${LIBVIRT_VARLIBDIR}/lockd
VARLIBDIR_LOCKD_FILES=	${VARLIBDIR_LOCKD}/files
VARLIBDIR_IMAGES=	${LIBVIRT_VARLIBDIR}/images
VARLIBDIR_BOOT=	${LIBVIRT_VARLIBDIR}/boot
VARLIBDIR_DNSMASQ=	${LIBVIRT_VARLIBDIR}/dnsmasq
VARLIBDIR_FILESYSTEMS=	${LIBVIRT_VARLIBDIR}/filesystems
VARLIBDIR_NETWORK=	${LIBVIRT_VARLIBDIR}/network
VARLIBDIR_QEMUDIR=	${LIBVIRT_VARLIBDIR}/qemu
VARLIBDIR_QEMUDIR_CHANNEL=	${VARLIBDIR_QEMUDIR}/channel
VARLIBDIR_QEMUDIR_CHANNEL_TARGET=	${VARLIBDIR_QEMUDIR_CHANNEL}/target

LIBVIRT_CACHEDIR=	${VARDIR}/cache/libvirt
CACHEDIR_QEMU=	${LIBVIRT_CACHEDIR}/qemu

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--without-sasl \
		--without-avahi \

		--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

		SSH2_CFLAGS="-I${LOCALBASE}/include" \
		ac_cv_type_struct_random_data=""

LIBVIRT_SUB=	LIBVIRT_RUNDIR="${LIBVIRT_RUNDIR}" \
		RUNDIR_NETWORK="${RUNDIR_NETWORK}" \
		RUNDIR_QEMU="${RUNDIR_QEMU}" \
		RUNDIR_LOCKD="${RUNDIR_LOCKD}" \
		LIBVIRT_LOGDIR="${LIBVIRT_LOGDIR}" \
		LOGDIR_UML="${LOGDIR_UML}" \
		LOGDIR_QEMU="${LOGDIR_QEMU}" \
		LOGDIR_LXC="${LOGDIR_LXC}" \
		LIBVIRT_VARLIBDIR="${LIBVIRT_VARLIBDIR}" \
		VARLIBDIR_LOCKD="${VARLIBDIR_LOCKD}" \
		VARLIBDIR_LOCKD_FILES="${VARLIBDIR_LOCKD_FILES}" \
		VARLIBDIR_IMAGES="${VARLIBDIR_IMAGES}" \
		VARLIBDIR_BOOT="${VARLIBDIR_BOOT}" \
		VARLIBDIR_DNSMASQ="${VARLIBDIR_DNSMASQ}" \
		VARLIBDIR_FILESYSTEMS="${VARLIBDIR_FILESYSTEMS}" \
		VARLIBDIR_NETWORK="${VARLIBDIR_NETWORK}" \
		VARLIBDIR_QEMUDIR="${VARLIBDIR_QEMUDIR}" \
		VARLIBDIR_QEMUDIR_CHANNEL="${VARLIBDIR_QEMUDIR_CHANNEL}" \
		VARLIBDIR_QEMUDIR_CHANNEL_TARGET="${VARLIBDIR_QEMUDIR_CHANNEL_TARGET}" \
		LIBVIRT_CACHEDIR="${LIBVIRT_CACHEDIR}" \
		CACHEDIR_QEMU="${CACHEDIR_QEMU}"

# limit production release x.x.x
PORTSCOUT=	limit:\d+\.\d+\.\d+$$


USE_LDCONFIG=	yes
SHLIB_VER=	1002
PLIST_SUB=	PORTVERSION="-${PORTVERSION}" \
		SHLIB_VER=${SHLIB_VER} \
		${LIBVIRT_SUB}

SUB_LIST+=	VARDIR=${VARDIR}

PORTDOCS=	*
STRIP_FILES=	libvirt.so.${SHLIB_VER} \
		libvirt-qemu.so.${SHLIB_VER} \

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

.for dir in ${LIBVIRT_RUNDIR} ${RUNDIR_NETWORK} ${RUNDIR_QEMU} ${RUNDIR_LOCKD} \
	${LIBVIRT_LOGDIR} ${LOGDIR_UML} ${LOGDIR_QEMU} ${LOGDIR_LXC} ${LIBVIRT_VARLIBDIR} \
	${VARLIBDIR_LOCKD} ${VARLIBDIR_LOCKD_FILES} ${VARLIBDIR_IMAGES} ${VARLIBDIR_BOOT} \
	${VARLIBDIR_DNSMASQ} ${VARLIBDIR_FILESYSTEMS} ${VARLIBDIR_NETWORK} \
	${VARLIBDIR_QEMUDIR} ${VARLIBDIR_QEMUDIR_CHANNEL} \
	${VARLIBDIR_QEMUDIR_CHANNEL_TARGET} ${LIBVIRT_CACHEDIR} ${CACHEDIR_QEMU}
	@${MKDIR} "${STAGEDIR}${dir}"
.endfor

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


Lines 1-2 Link Here

(-)libvirt/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

(-)libvirt/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=%%VARDIR%%/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 %%RUNDIR_NETWORK%%
@dirrmtry %%RUNDIR_QEMU%%
@dirrmtry %%RUNDIR_LOCKD%%
@dirrmtry %%LIBVIRT_RUNDIR%%
@dirrmtry %%LOGDIR_UML%%
@dirrmtry %%LOGDIR_QEMU%%
@dirrmtry %%LOGDIR_LXC%%
@dirrmtry %%LIBVIRT_LOGDIR%%
@dirrmtry %%VARLIBDIR_LOCKD%%
@dirrmtry %%VARLIBDIR_LOCKD_FILES%%
@dirrmtry %%VARLIBDIR_IMAGES%%
@dirrmtry %%VARLIBDIR_BOOT%%
@dirrmtry %%VARLIBDIR_DNSMASQ%%
@dirrmtry %%VARLIBDIR_FILESYSTEMS%%
@dirrmtry %%VARLIBDIR_NETWORK%%
@dirrmtry %%VARLIBDIR_QEMUDIR%%
@dirrmtry %%VARLIBDIR_QEMUDIR_CHANNEL_TARGET%%
@dirrmtry %%VARLIBDIR_QEMUDIR_CHANNEL%%
@dirrmtry %%LIBVIRT_VARLIBDIR%%
@dirrmtry %%CACHEDIR_QEMU%%
@dirrmtry %%LIBVIRT_CACHEDIR%%
@dirrmtry var/lib
%%QEMU%%@dirrmtry var/cache/libvirt/qemu
@dirrmtry var/cache/libvirt
@dirrmtry var/cache
@dirrmtry var

Return to bug 192441

Lines 333-361 Link Here

(-)libvirt/pkg-plist (-26 / +21 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 %%RUNDIR_NETWORK%%
337	%%QEMU%%@dirrmtry var/run/libvirt/qemu	337	@dirrmtry %%RUNDIR_QEMU%%
338	@dirrmtry var/run/libvirt/lockd	338	@dirrmtry %%RUNDIR_LOCKD%%
339	@dirrmtry var/run/libvirt	339	@dirrmtry %%LIBVIRT_RUNDIR%%
340	@dirrmtry var/run	340	@dirrmtry %%LOGDIR_UML%%
341	@dirrmtry var/log/libvirt/uml	341	@dirrmtry %%LOGDIR_QEMU%%
342	@dirrmtry var/log/libvirt/qemu	342	@dirrmtry %%LOGDIR_LXC%%
343	@dirrmtry var/log/libvirt/lxc	343	@dirrmtry %%LIBVIRT_LOGDIR%%
344	@dirrmtry var/log/libvirt	344	@dirrmtry %%VARLIBDIR_LOCKD%%
345	@dirrmtry var/log	345	@dirrmtry %%VARLIBDIR_LOCKD_FILES%%
346	@dirrmtry var/lib/libvirt/lockd/files	346	@dirrmtry %%VARLIBDIR_IMAGES%%
347	@dirrmtry var/lib/libvirt/lockd	347	@dirrmtry %%VARLIBDIR_BOOT%%
348	@dirrmtry var/lib/libvirt/images	348	@dirrmtry %%VARLIBDIR_DNSMASQ%%
349	@dirrmtry var/lib/libvirt/boot	349	@dirrmtry %%VARLIBDIR_FILESYSTEMS%%
350	@dirrmtry var/lib/libvirt/dnsmasq	350	@dirrmtry %%VARLIBDIR_NETWORK%%
351	@dirrmtry var/lib/libvirt/filesystems	351	@dirrmtry %%VARLIBDIR_QEMUDIR%%
352	@dirrmtry var/lib/libvirt/network	352	@dirrmtry %%VARLIBDIR_QEMUDIR_CHANNEL_TARGET%%
353	%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel/target	353	@dirrmtry %%VARLIBDIR_QEMUDIR_CHANNEL%%
354	%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel	354	@dirrmtry %%LIBVIRT_VARLIBDIR%%
355	%%QEMU%%@dirrmtry var/lib/libvirt/qemu	355	@dirrmtry %%CACHEDIR_QEMU%%
356	@dirrmtry var/lib/libvirt	356	@dirrmtry %%LIBVIRT_CACHEDIR%%
357	@dirrmtry var/lib
358	%%QEMU%%@dirrmtry var/cache/libvirt/qemu
359	@dirrmtry var/cache/libvirt
360	@dirrmtry var/cache
361	@dirrmtry var

Lines 2-9 Link Here

(-)libvirt/Makefile (-4 / +66 lines)
2	# $FreeBSD: head/devel/libvirt/Makefile 363436 2014-07-30 03:57:23Z pi $	2	# $FreeBSD: head/devel/libvirt/Makefile 363436 2014-07-30 03:57:23Z pi $
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-47 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
		46	LIBVIRT_RUNDIR= ${VARDIR}/run/libvirt
		47	RUNDIR_NETWORK= ${LIBVIRT_RUNDIR}/network
		48	RUNDIR_QEMU= ${LIBVIRT_RUNDIR}/qemu
		49	RUNDIR_LOCKD= ${LIBVIRT_RUNDIR}/lockd
		50
		51	LIBVIRT_LOGDIR= ${VARDIR}/log/libvirt
		52	LOGDIR_UML= ${LIBVIRT_LOGDIR}/uml
		53	LOGDIR_QEMU= ${LIBVIRT_LOGDIR}/qemu
		54	LOGDIR_LXC= ${LIBVIRT_LOGDIR}/lxc
		55
		56	LIBVIRT_VARLIBDIR= ${VARDIR}/lib/libvirt
		57	VARLIBDIR_LOCKD= ${LIBVIRT_VARLIBDIR}/lockd
		58	VARLIBDIR_LOCKD_FILES= ${VARLIBDIR_LOCKD}/files
		59	VARLIBDIR_IMAGES= ${LIBVIRT_VARLIBDIR}/images
		60	VARLIBDIR_BOOT= ${LIBVIRT_VARLIBDIR}/boot
		61	VARLIBDIR_DNSMASQ= ${LIBVIRT_VARLIBDIR}/dnsmasq
		62	VARLIBDIR_FILESYSTEMS= ${LIBVIRT_VARLIBDIR}/filesystems
		63	VARLIBDIR_NETWORK= ${LIBVIRT_VARLIBDIR}/network
		64	VARLIBDIR_QEMUDIR= ${LIBVIRT_VARLIBDIR}/qemu
		65	VARLIBDIR_QEMUDIR_CHANNEL= ${VARLIBDIR_QEMUDIR}/channel
		66	VARLIBDIR_QEMUDIR_CHANNEL_TARGET= ${VARLIBDIR_QEMUDIR_CHANNEL}/target
		67
		68	LIBVIRT_CACHEDIR= ${VARDIR}/cache/libvirt
		69	CACHEDIR_QEMU= ${LIBVIRT_CACHEDIR}/qemu
		70
45	GNU_CONFIGURE= yes	71	GNU_CONFIGURE= yes
46	CONFIGURE_ARGS= --without-sasl \	72	CONFIGURE_ARGS= --without-sasl \
47	--without-avahi \	73	--without-avahi \
Lines 52-58 Link Here
52	--without-sysctl \	78	--without-sysctl \
53	--without-lxc \	79	--without-lxc \
54	--without-uml \	80	--without-uml \
55	--with-ssh2	81	--with-ssh2 \
		82	--localstatedir=${VARDIR}
56		83
57	# workaround to override pkg-config calls	84	# workaround to override pkg-config calls
58	# random_data fix can be removed when 8.x is eol	85	# random_data fix can be removed when 8.x is eol
Lines 60-65 Link Here
60	SSH2_CFLAGS="-I${LOCALBASE}/include" \	87	SSH2_CFLAGS="-I${LOCALBASE}/include" \
61	ac_cv_type_struct_random_data=""	88	ac_cv_type_struct_random_data=""
62		89
		90	LIBVIRT_SUB= LIBVIRT_RUNDIR="${LIBVIRT_RUNDIR}" \
		91	RUNDIR_NETWORK="${RUNDIR_NETWORK}" \
		92	RUNDIR_QEMU="${RUNDIR_QEMU}" \
		93	RUNDIR_LOCKD="${RUNDIR_LOCKD}" \
		94	LIBVIRT_LOGDIR="${LIBVIRT_LOGDIR}" \
		95	LOGDIR_UML="${LOGDIR_UML}" \
		96	LOGDIR_QEMU="${LOGDIR_QEMU}" \
		97	LOGDIR_LXC="${LOGDIR_LXC}" \
		98	LIBVIRT_VARLIBDIR="${LIBVIRT_VARLIBDIR}" \
		99	VARLIBDIR_LOCKD="${VARLIBDIR_LOCKD}" \
		100	VARLIBDIR_LOCKD_FILES="${VARLIBDIR_LOCKD_FILES}" \
		101	VARLIBDIR_IMAGES="${VARLIBDIR_IMAGES}" \
		102	VARLIBDIR_BOOT="${VARLIBDIR_BOOT}" \
		103	VARLIBDIR_DNSMASQ="${VARLIBDIR_DNSMASQ}" \
		104	VARLIBDIR_FILESYSTEMS="${VARLIBDIR_FILESYSTEMS}" \
		105	VARLIBDIR_NETWORK="${VARLIBDIR_NETWORK}" \
		106	VARLIBDIR_QEMUDIR="${VARLIBDIR_QEMUDIR}" \
		107	VARLIBDIR_QEMUDIR_CHANNEL="${VARLIBDIR_QEMUDIR_CHANNEL}" \
		108	VARLIBDIR_QEMUDIR_CHANNEL_TARGET="${VARLIBDIR_QEMUDIR_CHANNEL_TARGET}" \
		109	LIBVIRT_CACHEDIR="${LIBVIRT_CACHEDIR}" \
		110	CACHEDIR_QEMU="${CACHEDIR_QEMU}"
		111
63	# limit production release x.x.x	112	# limit production release x.x.x
64	PORTSCOUT= limit:\d+\.\d+\.\d+$$	113	PORTSCOUT= limit:\d+\.\d+\.\d+$$
65		114
Lines 70-76 Link Here
70	USE_LDCONFIG= yes	119	USE_LDCONFIG= yes
71	SHLIB_VER= 1002	120	SHLIB_VER= 1002
72	PLIST_SUB= PORTVERSION="-${PORTVERSION}" \	121	PLIST_SUB= PORTVERSION="-${PORTVERSION}" \
73	SHLIB_VER=${SHLIB_VER}	122	SHLIB_VER=${SHLIB_VER} \
		123	${LIBVIRT_SUB}
		124
		125	SUB_LIST+= VARDIR=${VARDIR}
		126
74	PORTDOCS= *	127	PORTDOCS= *
75	STRIP_FILES= libvirt.so.${SHLIB_VER} \	128	STRIP_FILES= libvirt.so.${SHLIB_VER} \
76	libvirt-qemu.so.${SHLIB_VER} \	129	libvirt-qemu.so.${SHLIB_VER} \
Lines 123-128 Link Here
123	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}	176	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
124	.endfor	177	.endfor
125		178
		179	.for dir in ${LIBVIRT_RUNDIR} ${RUNDIR_NETWORK} ${RUNDIR_QEMU} ${RUNDIR_LOCKD} \
		180	${LIBVIRT_LOGDIR} ${LOGDIR_UML} ${LOGDIR_QEMU} ${LOGDIR_LXC} ${LIBVIRT_VARLIBDIR} \
		181	${VARLIBDIR_LOCKD} ${VARLIBDIR_LOCKD_FILES} ${VARLIBDIR_IMAGES} ${VARLIBDIR_BOOT} \
		182	${VARLIBDIR_DNSMASQ} ${VARLIBDIR_FILESYSTEMS} ${VARLIBDIR_NETWORK} \
		183	${VARLIBDIR_QEMUDIR} ${VARLIBDIR_QEMUDIR_CHANNEL} \
		184	${VARLIBDIR_QEMUDIR_CHANNEL_TARGET} ${LIBVIRT_CACHEDIR} ${CACHEDIR_QEMU}
		185	@${MKDIR} "${STAGEDIR}${dir}"
		186	.endfor
		187
126	regression-test: build	188	regression-test: build
127	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check	189	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
128		190