- update to 1.2.0 and bump shared libraries in respective ports

- while here shift new lib_depends format where needed

Changes:	http://libvirt.org/news.html

16 files changed, 27 insertions, 32 deletions

diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index 7ba65d1619fa..02cf46a82c51 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	virt-manager
 PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils net-mgmt
 MASTER_SITES=	http://virt-manager.et.redhat.com/download/sources/${PORTNAME}/ \
 		LOCAL/jgh/deskutils/${PORTNAME}/
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index 3ba749c76e19..9865b95b48b0 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt-glib
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://libvirt.org/libvirt/glib/
 
diff --git a/devel/libvirt-java/Makefile b/devel/libvirt-java/Makefile
index 826798b91ba2..9d2c2972b49e 100644
--- a/devel/libvirt-java/Makefile
+++ b/devel/libvirt-java/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt-java
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://libvirt.org/sources/java/ \
 		ftp://libvirt.org/libvirt/java/
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index aabed450baad..2ed3922f7fa5 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	1.1.4
+PORTVERSION=	1.2.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -55,8 +55,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib -fstack-protector
 USES=		charsetfix pathfix gmake pkgconfig perl5
 USE_PERL5=	build
 USE_LDCONFIG=	yes
-USE_PYTHON_BUILD=	yes
-SHLIB_VER=	1001
+SHLIB_VER=	1002
 PLIST_SUB=	PORTVERSION="-${PORTVERSION}" \
 		SHLIB_VER=${SHLIB_VER}
 PORTDOCS=	*
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index dbf97cd21ba3..f827142e53dc 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvirt-1.1.4.tar.gz) = 5910f5cf607a50c606d959e6b1e5d6e67966b7aa7324982afd7f85d9c24bd98f
-SIZE (libvirt-1.1.4.tar.gz) = 26799019
+SHA256 (libvirt-1.2.0.tar.gz) = a8e578ae7861db2ac5f454073293d2ef3229fd3f6c4f9029101763244db22ddd
+SIZE (libvirt-1.2.0.tar.gz) = 26916717
diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist
index b67e88de8e7f..4857005bf56c 100644
--- a/devel/libvirt/pkg-plist
+++ b/devel/libvirt/pkg-plist
@@ -38,15 +38,6 @@ lib/libvirt-qemu.so.%%SHLIB_VER%%
 lib/libvirt.la
 lib/libvirt.so
 lib/libvirt.so.%%SHLIB_VER%%
-%%PYTHON_SITELIBDIR%%/libvirt.py
-%%PYTHON_SITELIBDIR%%/libvirtmod.la
-%%PYTHON_SITELIBDIR%%/libvirtmod.so
-%%PYTHON_SITELIBDIR%%/libvirtmod_lxc.so
-%%PYTHON_SITELIBDIR%%/libvirtmod_lxc.la
-%%PYTHON_SITELIBDIR%%/libvirt_lxc.py
-%%PYTHON_SITELIBDIR%%/libvirt_qemu.py
-%%PYTHON_SITELIBDIR%%/libvirtmod_qemu.la
-%%PYTHON_SITELIBDIR%%/libvirtmod_qemu.so
 libdata/pkgconfig/libvirt.pc
 libexec/libvirt_iohelper
 libexec/libvirt-guests.sh
@@ -73,6 +64,7 @@ share/augeas/lenses/tests/test_virtlockd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/archnetwork.html
 %%DOCSDIR%%%%PORTVERSION%%/html/archnode.html
 %%DOCSDIR%%%%PORTVERSION%%/html/archstorage.html
+%%DOCSDIR%%%%PORTVERSION%%/html/auditlog.html
 %%DOCSDIR%%%%PORTVERSION%%/html/auth.html
 %%DOCSDIR%%%%PORTVERSION%%/html/bindings.html
 %%DOCSDIR%%%%PORTVERSION%%/html/bugs.html
@@ -158,6 +150,7 @@ share/augeas/lenses/tests/test_virtlockd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/python.html
 %%DOCSDIR%%%%PORTVERSION%%/html/relatedlinks.html
 %%DOCSDIR%%%%PORTVERSION%%/html/remote.html
+%%DOCSDIR%%%%PORTVERSION%%/html/secureusage.html
 %%DOCSDIR%%%%PORTVERSION%%/html/securityprocess.html
 %%DOCSDIR%%%%PORTVERSION%%/html/sitemap.html
 %%DOCSDIR%%%%PORTVERSION%%/html/storage.html
@@ -283,8 +276,6 @@ lib/libvirt/connection-driver/libvirt_driver_vbox.so
 lib/libvirt/connection-driver/libvirt_driver_vbox.la
 @dirrmtry etc/logrotate.d
 @dirrm include/libvirt
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
 @dirrm lib/libvirt/connection-driver
 @dirrm lib/libvirt/lock-driver
 @dirrm lib/libvirt
diff --git a/devel/p5-Sys-Virt/Makefile b/devel/p5-Sys-Virt/Makefile
index 478d50b70d94..7cbe027c2790 100644
--- a/devel/p5-Sys-Virt/Makefile
+++ b/devel/p5-Sys-Virt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Virt
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index b95c37f7596f..c04fd70a72e1 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	4.10.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -410,7 +410,7 @@ PLIST_SUB+=	TOKYOTYRANT="@comment "
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=--enable-libvirt
-LIB_DEPENDS+=	virt.1001:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=	libvirt.so:${PORTSDIR}/devel/libvirt
 PLIST_SUB+=	VIRT=""
 .else
 CONFIGURE_ARGS+=--disable-libvirt
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 8c1653b731b5..703503da9315 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
@@ -387,7 +387,7 @@ PLIST_SUB+=	TOKYOTYRANT="@comment "
 .if empty(PORT_OPTIONS:MXML)
 IGNORE=		VIRT requires XML. Either select XML or deselect VIRT.
 .endif
-LIB_DEPENDS+=	virt.1001:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=	libvirt.so:${PORTSDIR}/devel/libvirt
 CONFIGURE_ARGS+=--enable-libvirt
 PLIST_SUB+=	VIRT=""
 .else
diff --git a/net-mgmt/virt-viewer/Makefile b/net-mgmt/virt-viewer/Makefile
index 3c3705d09aca..a80f3c8d7d2d 100644
--- a/net-mgmt/virt-viewer/Makefile
+++ b/net-mgmt/virt-viewer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	virt-viewer
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/
 
@@ -11,8 +12,8 @@ COMMENT=	Provides a graphical viewer for a guest OS display
 
 BUILD_DEPENDS=	xml2-config:${PORTSDIR}/textproc/libxml2 \
 		intltoolize:${PORTSDIR}/textproc/intltool
-LIB_DEPENDS=	virt.1001:${PORTSDIR}/devel/libvirt \
-		gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc
+LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt \
+		libgtk-vnc-1.0.so:${PORTSDIR}/net/gtk-vnc
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/net-mgmt/virtinst/Makefile b/net-mgmt/virtinst/Makefile
index 31c999c7aa8b..ee2dbc88d9a8 100644
--- a/net-mgmt/virtinst/Makefile
+++ b/net-mgmt/virtinst/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	virtinst
 PORTVERSION=	0.600.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Module to help in starting installations inside of virtual machines
 
-LIB_DEPENDS=	virt.1001:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.9.1:${PORTSDIR}/www/py-urlgrabber
 
 FETCH_ARGS=	-Fpr
diff --git a/net-mgmt/zenpack-libvirt/Makefile b/net-mgmt/zenpack-libvirt/Makefile
index ceae535ce7e1..2b20bcc77b01 100644
--- a/net-mgmt/zenpack-libvirt/Makefile
+++ b/net-mgmt/zenpack-libvirt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	1.96
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=   https://github.com/zenoss/${ZPACKPREFIX}${PORTNAME}/tarball/master/
 DISTNAME=       zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index 691a2cb46500..b37dcfef83ad 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.5.0b1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
@@ -78,7 +78,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt.1001:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
 .endif
 
 MAN8=	cf-agent.8	cf-key.8	cf-monitord.8	\
diff --git a/sysutils/cfengine33/Makefile b/sysutils/cfengine33/Makefile
index eed7191d8e8e..7c1ea18a2a88 100644
--- a/sysutils/cfengine33/Makefile
+++ b/sysutils/cfengine33/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.3.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 PKGNAMESUFFIX=	33
diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile
index c870730d86db..15c82e606288 100644
--- a/sysutils/cfengine34/Makefile
+++ b/sysutils/cfengine34/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -78,7 +78,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt.1001${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
 .endif
 
 MAN8=	cf-agent.8	cf-key.8	cf-monitord.8	\
diff --git a/sysutils/cfengine35/Makefile b/sysutils/cfengine35/Makefile
index b6d8eb748780..c44bdb1b4d3f 100644
--- a/sysutils/cfengine35/Makefile
+++ b/sysutils/cfengine35/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.5.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -73,7 +74,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		libvirt.so.1001:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
 .endif
 
 .include <bsd.port.post.mk>