- update to 1.1.0 and bump shared libraries in respective ports

- while here:
  - fix option check in sysutils/cfengine34
  - move devel/libvirt-glib to use glib20 in favor of gio-fam-backend (suggested by kwm@)
  - restore ABI version in net-mgmt/collectd5

5 files changed, 12 insertions, 8 deletions

diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 485c0873aa70..039567ec0e44 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	4.10.9
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -392,7 +393,7 @@ PLIST_SUB+=	TOKYOTYRANT="@comment "
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=--enable-libvirt
-LIB_DEPENDS+=	virt.1000:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=	virt.1001:${PORTSDIR}/devel/libvirt
 PLIST_SUB+=	VIRT=""
 .else
 CONFIGURE_ARGS+=--disable-libvirt
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 38981361b872..5c5d4148cc7b 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.3.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -337,7 +338,7 @@ PLIST_SUB+=	TOKYOTYRANT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVIRT}
-LIB_DEPENDS+=	virt:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=	virt.1001:${PORTSDIR}/devel/libvirt
 CONFIGURE_ARGS+=--enable-libvirt
 .if empty(PORT_OPTIONS:MXML)
 IGNORE=		VIRT requires XML. Either select XML or deselect VIRT.
diff --git a/net-mgmt/virt-viewer/Makefile b/net-mgmt/virt-viewer/Makefile
index fe0d69c982a0..b08eae481997 100644
--- a/net-mgmt/virt-viewer/Makefile
+++ b/net-mgmt/virt-viewer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	virt-viewer
 PORTVERSION=	0.5.6
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/
 
@@ -11,7 +12,7 @@ COMMENT=	Provides a graphical viewer for a guest OS display
 
 BUILD_DEPENDS=	xml2-config:${PORTSDIR}/textproc/libxml2 \
 		intltoolize:${PORTSDIR}/textproc/intltool
-LIB_DEPENDS=	virt.1000:${PORTSDIR}/devel/libvirt \
+LIB_DEPENDS=	virt.1001:${PORTSDIR}/devel/libvirt \
 		gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc
 
 OPTIONS_DEFINE=	NLS
diff --git a/net-mgmt/virtinst/Makefile b/net-mgmt/virtinst/Makefile
index 191ea559552c..16f82984a516 100644
--- a/net-mgmt/virtinst/Makefile
+++ b/net-mgmt/virtinst/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	virtinst
 PORTVERSION=	0.600.4
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Module to help in starting installations inside of virtual machines
 
-LIB_DEPENDS=	virt.1000:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	virt.1001:${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 02d7d8d72eba..b97206b555dd 100644
--- a/net-mgmt/zenpack-libvirt/Makefile
+++ b/net-mgmt/zenpack-libvirt/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=    1.96
-PORTREVISION=	2
+PORTVERSION=	1.96
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=   https://github.com/zenoss/${ZPACKPREFIX}${PORTNAME}/tarball/master/
 DISTNAME=       zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
@@ -21,7 +21,7 @@ USES=		zenoss
 
 ZPACKPREFIX=	ZenPacks.community.
 ZPACKGROUP=	community
-WRKSRC=  ${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
-TAG=  4113cfe
+WRKSRC=	${WRKDIR}/zenoss-${ZPACKPREFIX}${PORTNAME}-${TAG}
+TAG=	4113cfe
 
 .include <bsd.port.mk>