3 files changed, 37 insertions, 22 deletions

diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 5dcb15d8cdae..48183548bf37 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	1.2.5
+PORTVERSION=	1.2.6
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -17,6 +17,8 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libssh2.so:${PORTSDIR}/security/libssh2
+BUILD_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq
+RUN_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq
 
 OPTIONS_DEFINE=	DOCS NLS QEMU
 OPTIONS_DEFINE_amd64=	BHYVE
@@ -46,9 +48,9 @@ CONFIGURE_ARGS=	--without-sasl \
 		--without-hal \
 		--without-udev \
 		--without-netcf \
-		--without-network \
 		--without-sysctl \
 		--without-lxc \
+		--without-uml \
 		--with-ssh2
 
 # workaround to override pkg-config calls
@@ -79,6 +81,10 @@ STRIP_FILES=	libvirt.so.${SHLIB_VER} \
 
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} >= 1000000
+OPTIONS_DEFAULT_amd64=	BHYVE
+.endif
+
 #work around an options bug (thanks mat@)
 .if ${ARCH} != amd64
 PLIST_SUB+=	BHYVE="@comment "
@@ -103,15 +109,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|qemu.conf$$|qemu.conf.sample|' \
 		${WRKSRC}/src/Makefile.in
 
+	@${REINPLACE_CMD} -e 's|cp $$(DESTDIR)|cp -f $$(DESTDIR)|' \
+		${WRKSRC}/src/Makefile.in
+
 post-install:
-	@for configuration in libvirt libvirtd ${QEMU_CONFIG}; do \
-	if [ ! -e "${STAGEDIR}${ETCDIR}/$${configuration}.conf" ]; then \
-			${ECHO_MSG} "	Installing local configuration file: ${STAGEDIR}${ETCDIR}/$${configuration}.conf"; \
-			${CP} ${STAGEDIR}${ETCDIR}/$${configuration}.conf.sample ${STAGEDIR}${ETCDIR}/$${configuration}.conf; \
-		else \
-			${ECHO_MSG} "	Preserving local configuration file: ${STAGEDIR}${ETCDIR}/$${configuration}.conf"; \
-	fi; \
-	done
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index f32780eb03a3..2f72d59e5d38 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvirt-1.2.5.tar.gz) = 8ee97de3435b823ad2bc40a0b3c395efe2184ae748a92e2211fbe9393939ed45
-SIZE (libvirt-1.2.5.tar.gz) = 28829671
+SHA256 (libvirt-1.2.6.tar.gz) = 38a224559a1d04e5d4163c5c1b810df1f29804ebbb1f057d4abcb41a9e5d5dea
+SIZE (libvirt-1.2.6.tar.gz) = 29346718
diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist
index 6850e8342854..f3d1baa7cad9 100644
--- a/devel/libvirt/pkg-plist
+++ b/devel/libvirt/pkg-plist
@@ -8,16 +8,12 @@ man/man1/virt-xml-validate.1.gz
 man/man1/virt-host-validate.1.gz
 man/man8/libvirtd.8.gz
 man/man8/virtlockd.8.gz
-@unexec if cmp -s %D/%%ETCDIR%%/libvirtd.conf.sample %D/%%ETCDIR%%/libvirtd.conf; then rm -f %D/%%ETCDIR%%/libvirtd.conf; fi
-%%ETCDIR%%/libvirtd.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/libvirtd.conf ] ; then cp -p %D/%%ETCDIR%%/libvirtd.conf.sample %D/%%ETCDIR%%/libvirtd.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/libvirt.conf.sample %D/%%ETCDIR%%/libvirt.conf; then rm -f %D/%%ETCDIR%%/libvirt.conf; fi
-%%ETCDIR%%/libvirt.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/libvirt.conf ] ; then cp -p %D/%%ETCDIR%%/libvirt.conf.sample %D/%%ETCDIR%%/libvirt.conf; fi
+@sample %%ETCDIR%%/libvirt.conf.sample
+@sample %%ETCDIR%%/libvirtd.conf.sample
+%%QEMU%%@sample %%ETCDIR%%/qemu.conf.sample
 %%ETCDIR%%/virtlockd.conf
-%%QEMU%%@unexec if cmp -s %D/%%ETCDIR%%/qemu.conf.sample %D/%%ETCDIR%%/qemu.conf; then rm -f %D/%%ETCDIR%%/qemu.conf; fi
-%%QEMU%%%%ETCDIR%%/qemu.conf.sample
-%%QEMU%%@exec if [ ! -f %D/%%ETCDIR%%/qemu.conf ] ; then cp -p %D/%%ETCDIR%%/qemu.conf.sample %D/%%ETCDIR%%/qemu.conf; fi
+%%ETCDIR%%/qemu/networks/default.xml
+%%ETCDIR%%/qemu/networks/autostart/default.xml
 %%QEMU%%%%ETCDIR%%/qemu-lockd.conf
 etc/logrotate.d/libvirtd
 etc/logrotate.d/libvirtd.lxc
@@ -39,14 +35,18 @@ lib/libvirt.la
 lib/libvirt.so
 lib/libvirt.so.%%SHLIB_VER%%
 libdata/pkgconfig/libvirt.pc
-libexec/libvirt_iohelper
+libdata/pkgconfig/libvirt-lxc.pc
+libdata/pkgconfig/libvirt-qemu.pc
 libexec/libvirt-guests.sh
+libexec/libvirt_iohelper
+libexec/libvirt_leaseshelper
 sbin/libvirtd
 sbin/virtlockd
 share/augeas/lenses/libvirt_lockd.aug
 share/augeas/lenses/libvirtd.aug
 share/augeas/lenses/virtlockd.aug
 %%QEMU%%share/augeas/lenses/libvirtd_qemu.aug
+%%QEMU%%share/augeas/lenses/tests/test_libvirt_lockd.aug
 share/augeas/lenses/tests/test_libvirtd.aug
 share/augeas/lenses/tests/test_virtlockd.aug
 %%QEMU%%share/augeas/lenses/tests/test_libvirtd_qemu.aug
@@ -189,6 +189,7 @@ share/gtk-doc/html/libvirt/up.png
 %%DATADIR%%/schemas/nodedev.rng
 %%DATADIR%%/schemas/nwfilter.rng
 %%DATADIR%%/schemas/secret.rng
+%%DATADIR%%/schemas/storagecommon.rng
 %%DATADIR%%/schemas/storagepool.rng
 %%DATADIR%%/schemas/storagevol.rng
 %%NLS%%share/locale/af/LC_MESSAGES/libvirt.mo
@@ -270,6 +271,8 @@ share/gtk-doc/html/libvirt/up.png
 %%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.la
 %%BHYVE%%lib/libvirt/connection-driver/libvirt_driver_bhyve.la
 %%BHYVE%%lib/libvirt/connection-driver/libvirt_driver_bhyve.so
+lib/libvirt/connection-driver/libvirt_driver_network.so
+lib/libvirt/connection-driver/libvirt_driver_network.la
 lib/libvirt/connection-driver/libvirt_driver_secret.so
 lib/libvirt/connection-driver/libvirt_driver_secret.la
 lib/libvirt/connection-driver/libvirt_driver_storage.so
@@ -326,7 +329,12 @@ lib/libvirt/connection-driver/libvirt_driver_vbox.la
 %%NLS%%@dirrmtry share/locale/bo
 %%NLS%%@dirrmtry share/locale/as/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/as
+@dirrmtry %%ETCDIR%%/qemu/networks/autostart
+@dirrmtry %%ETCDIR%%/qemu/networks
+@dirrmtry %%ETCDIR%%/qemu
 @dirrm %%ETCDIR%%
+@dirrmtry var/run/libvirt/network
+%%QEMU%%@dirrmtry var/run/libvirt/qemu
 @dirrmtry var/run/libvirt/lockd
 @dirrmtry var/run/libvirt
 @dirrmtry var/run
@@ -339,9 +347,15 @@ lib/libvirt/connection-driver/libvirt_driver_vbox.la
 @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
+%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel/target
+%%QEMU%%@dirrmtry var/lib/libvirt/qemu/channel
+%%QEMU%%@dirrmtry var/lib/libvirt/qemu
 @dirrmtry var/lib/libvirt
 @dirrmtry var/lib
+%%QEMU%%@dirrmtry var/cache/libvirt/qemu
 @dirrmtry var/cache/libvirt
 @dirrmtry var/cache
 @dirrmtry var