- 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

14 files changed, 45 insertions, 46 deletions

diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index cf68ec13e295..8e14d57bf223 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	virt-manager
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	deskutils net-mgmt
 MASTER_SITES=	http://virt-manager.et.redhat.com/download/sources/${PORTNAME}/
 
@@ -11,7 +12,7 @@ COMMENT=	Toolkit to interact with virtualization capabilities
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	virt.1000:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	virt.1001:${PORTSDIR}/devel/libvirt
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:${PORTSDIR}/textproc/py-libxml2 \
 		${PYTHON_PKGNAMEPREFIX}virtinst>=0.600.4:${PORTSDIR}/net-mgmt/virtinst \
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index cec1062f85db..ee0c84d33fb3 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -3,20 +3,21 @@
 
 PORTNAME=	libvirt-glib
 PORTVERSION=	0.1.6
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://libvirt.org/libvirt/glib/
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Glib bindings for Libvirt virtualization API
 
-BUILD_DEPENDS=	gio-fam-backend>=0:${PORTSDIR}/devel/gio-fam-backend \
-		gobject-introspection>=1.34.2:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	virt.1000:${PORTSDIR}/devel/libvirt
+BUILD_DEPENDS=	gobject-introspection>=1.34.2:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS=	virt.1001:${PORTSDIR}/devel/libvirt
 
 GNU_CONFIGURE=	yes
 USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
+USE_GNOME=	glib20
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -fstack-protector
diff --git a/devel/libvirt-java/Makefile b/devel/libvirt-java/Makefile
index 20a7393f697b..6e93eafca80d 100644
--- a/devel/libvirt-java/Makefile
+++ b/devel/libvirt-java/Makefile
@@ -3,17 +3,17 @@
 
 PORTNAME=	libvirt-java
 PORTVERSION=	0.4.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	http://libvirt.org/sources/java/ \
 		ftp://libvirt.org/libvirt/java/
 
 MAINTAINER=	jgh@FreeBSD.org
-COMMENT=	Java bindings for the libvirt virtualization API
+COMMENT=	Java bindings for Libvirt virtualization API
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	virt.1000:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	virt.1001:${PORTSDIR}/devel/libvirt
 BUILD_DEPENDS=	jna>=3.2.7:${PORTSDIR}/devel/jna \
 		junit>=4.8.2:${PORTSDIR}/java/junit
 
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index ddd73589e1e7..60ccd85e7b78 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTVERSION=	1.1.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -19,9 +18,18 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		gnutls:${PORTSDIR}/security/gnutls \
 		ssh2:${PORTSDIR}/security/libssh2
 
-OPTIONS_DEFINE=	QEMU DOCS
+OPTIONS_DEFINE=	QEMU DOCS NLS
 QEMU_DESC=	QEMU bindings
 
+OPTIONS_SUB=	yes
+
+QEMU_CONFIGURE_ON=	--with-qemu
+QEMU_CONFIGURE_OFF=	--without-qemu
+
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
+
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=	yes
 CONFIGURE_ARGS=	--without-sasl \
@@ -33,7 +41,7 @@ CONFIGURE_ARGS=	--without-sasl \
 		--without-netcf \
 		--without-network \
 		--without-sysctl \
-		--with-libssh2
+		--with-ssh2
 
 #limit to non-stable release x.x.x
 PORTSCOUT=	limit:\d+\.\d+\.\d+$$
@@ -44,32 +52,13 @@ USES=		charsetfix pathfix
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON_BUILD=	yes
-SHLIB_VER=	1000
+SHLIB_VER=	1001
 PLIST_SUB=	PORTVERSION="-${PORTVERSION}" \
 		SHLIB_VER=${SHLIB_VER}
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MQEMU}
-CONFIGURE_ARGS+=	--with-qemu
-PLIST_SUB+=	QEMU=""
-QEMU_CONFIG=	qemu
-.else
-CONFIGURE_ARGS+=	--without-qemu
-PLIST_SUB+=	QEMU="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-CONFIGURE_ARGS+=	--enable-nls \
-			--with-libintl-prefix=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 MAN1=		virsh.1 virt-pki-validate.1 virt-xml-validate.1 virt-host-validate.1
 MAN8=		libvirtd.8
 
diff --git a/devel/p5-Sys-Virt/Makefile b/devel/p5-Sys-Virt/Makefile
index d7a2182d330f..e54572ddd9af 100644
--- a/devel/p5-Sys-Virt/Makefile
+++ b/devel/p5-Sys-Virt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Sys-Virt
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,7 +12,7 @@ MAINTAINER=	fw@moov.de
 COMMENT=	Perl bindings for libvirt
 
 BUILD_DEPENDS=	p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
-LIB_DEPENDS=	virt.1000:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	virt.1001:${PORTSDIR}/devel/libvirt
 RUN_DEPENDS=	p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
 TEST_DEPENDS=	p5-CPAN-Changes>=0:${PORTSDIR}/devel/p5-CPAN-Changes \
 		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
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>
diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index 644e21cbc3ce..64f384560a3b 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.5.0b1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
@@ -76,7 +77,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt.1000:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		virt.1001:${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 df2ed4f8e637..46bb9374bc3f 100644
--- a/sysutils/cfengine33/Makefile
+++ b/sysutils/cfengine33/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.3.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 PKGNAMESUFFIX=	33
@@ -70,7 +70,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt.1000:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		virt.1001:${PORTSDIR}/devel/libvirt
 .endif
 
 MAN8=	cf-agent.8	cf-key.8	cf-monitord.8	\
diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile
index 4de9fea49a03..da51b51c16b9 100644
--- a/sysutils/cfengine34/Makefile
+++ b/sysutils/cfengine34/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.4.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -74,9 +75,9 @@ LIB_DEPENDS+=		mysqlclient:${PORTSDIR}/${_MYSQL_CLIENT}
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 .endif
 
-.if ${PORT_OPTIONS:MLIBVERT}
+.if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt.1000:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		virt.1001${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 936023eef436..e152ac5306b1 100644
--- a/sysutils/cfengine35/Makefile
+++ b/sysutils/cfengine35/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -75,7 +76,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt.1000:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		virt.1001:${PORTSDIR}/devel/libvirt
 .endif
 
 .include <bsd.port.post.mk>