- update libvirt to 1.0.0, and bump others for shlib change

- explictly tie to ABI version, required
- update historical headers
- add shared description for libvirt

15 files changed, 41 insertions, 55 deletions

diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk
index 7c4a2683e3a6..584938b79197 100644
--- a/Mk/bsd.options.desc.mk
+++ b/Mk/bsd.options.desc.mk
@@ -170,6 +170,7 @@ LIBEXTRACTOR_DESC?=	libextractor support
 LIBMNG_DESC?=		MNG animated images via libmng
 LIBPAPER_DESC?=		libpaper support
 LIBRSVG2_DESC?=		SVG vector graphics via librsvg2
+LIBVIRT_DESC?=		libvirt support
 LIBVISUAL_DESC?=	Audio visualisation via libvisual
 LIBWMF_DESC?=		libwmf support
 LIBWRAP_DESC?=		TCP wrapper support
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index 39027260d97c..183471017a49 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: virt-manager
-# Date created:    2011-05-28
-# Whom:      Jason Helfman <jhelfman@experts-exchange.com>
-#
+# Created by: Jason Helfman <jgh@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	virt-manager
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils net-mgmt
 MASTER_SITES=	http://virt-manager.et.redhat.com/download/sources/${PORTNAME}/
 
@@ -16,7 +12,7 @@ COMMENT=	Toolkit to interact with virtualization capabilities
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	virt.10:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	virt.1000:${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.3:${PORTSDIR}/net-mgmt/virtinst \
diff --git a/devel/libvirt-java/Makefile b/devel/libvirt-java/Makefile
index 079aa7b88541..20a7393f697b 100644
--- a/devel/libvirt-java/Makefile
+++ b/devel/libvirt-java/Makefile
@@ -1,7 +1,9 @@
+# Created by: Jason Helfman <jgh@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libvirt-java
 PORTVERSION=	0.4.9
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://libvirt.org/sources/java/ \
 		ftp://libvirt.org/libvirt/java/
@@ -11,7 +13,7 @@ COMMENT=	Java bindings for the libvirt virtualization API
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	virt.10:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	virt.1000:${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 c202d3e21890..76d22b7c1605 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -1,7 +1,8 @@
+# Created by: Jason Helfman <jgh@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	0.10.2
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/
 
@@ -40,7 +41,7 @@ USE_GNOME=	gnomehack
 GNOME_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
 USE_PYTHON_BUILD=	yes
-SHLIB_VER=	10
+SHLIB_VER=	1000
 PLIST_SUB=	PORTVERSION="-${PORTVERSION}" \
 		SHLIB_VER=${SHLIB_VER}
 
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index b3bea5cee139..45c54525570c 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvirt-0.10.2.tar.gz) = 1fe69ae1268a097cc0cf83563883b51780d528c6493efe3e7d94c4160cc46977
-SIZE (libvirt-0.10.2.tar.gz) = 21916817
+SHA256 (libvirt-1.0.0.tar.gz) = 14c8a30ebfb939c82cab5f759a95d09646b43b4210e45490e92459ae65123076
+SIZE (libvirt-1.0.0.tar.gz) = 21868950
diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist
index 20a39af3458c..2b6574e57508 100644
--- a/devel/libvirt/pkg-plist
+++ b/devel/libvirt/pkg-plist
@@ -66,7 +66,6 @@ share/augeas/lenses/tests/test_libvirtd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/auth.html
 %%DOCSDIR%%%%PORTVERSION%%/html/bindings.html
 %%DOCSDIR%%%%PORTVERSION%%/html/bugs.html
-%%DOCSDIR%%%%PORTVERSION%%/html/command.html
 %%DOCSDIR%%%%PORTVERSION%%/html/compiling.html
 %%DOCSDIR%%%%PORTVERSION%%/html/contact.html
 %%DOCSDIR%%%%PORTVERSION%%/html/csharp.html
@@ -80,6 +79,7 @@ share/augeas/lenses/tests/test_libvirtd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/drvlxc.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvopenvz.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvparallels.html
+%%DOCSDIR%%%%PORTVERSION%%/html/drvphyp.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvqemu.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvremote.html
 %%DOCSDIR%%%%PORTVERSION%%/html/drvtest.html
@@ -106,6 +106,7 @@ share/augeas/lenses/tests/test_libvirtd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/goals.html
 %%DOCSDIR%%%%PORTVERSION%%/html/hacking.html
 %%DOCSDIR%%%%PORTVERSION%%/html/hooks.html
+%%DOCSDIR%%%%PORTVERSION%%/html/internals.html
 %%DOCSDIR%%%%PORTVERSION%%/html/html/home.png
 %%DOCSDIR%%%%PORTVERSION%%/html/html/index.html
 %%DOCSDIR%%%%PORTVERSION%%/html/html/left.png
@@ -115,7 +116,9 @@ share/augeas/lenses/tests/test_libvirtd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/html/up.png
 %%DOCSDIR%%%%PORTVERSION%%/html/hvsupport.html
 %%DOCSDIR%%%%PORTVERSION%%/html/index.html
-%%DOCSDIR%%%%PORTVERSION%%/html/internals.html
+%%DOCSDIR%%%%PORTVERSION%%/html/internals/command.html
+%%DOCSDIR%%%%PORTVERSION%%/html/internals/locking.html
+%%DOCSDIR%%%%PORTVERSION%%/html/internals/rpc.html
 %%DOCSDIR%%%%PORTVERSION%%/html/intro.html
 %%DOCSDIR%%%%PORTVERSION%%/html/java.html
 %%DOCSDIR%%%%PORTVERSION%%/html/libvirt-daemon-arch.png
@@ -143,7 +146,6 @@ share/augeas/lenses/tests/test_libvirtd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/php.html
 %%DOCSDIR%%%%PORTVERSION%%/html/python.html
 %%DOCSDIR%%%%PORTVERSION%%/html/relatedlinks.html
-%%DOCSDIR%%%%PORTVERSION%%/html/rpc.html
 %%DOCSDIR%%%%PORTVERSION%%/html/remote.html
 %%DOCSDIR%%%%PORTVERSION%%/html/sitemap.html
 %%DOCSDIR%%%%PORTVERSION%%/html/storage.html
@@ -275,6 +277,7 @@ lib/libvirt/connection-driver/libvirt_driver_storage.la
 @dirrm lib/libvirt/connection-driver
 @dirrm lib/libvirt
 @dirrm %%DOCSDIR%%%%PORTVERSION%%/html/html
+@dirrm %%DOCSDIR%%%%PORTVERSION%%/html/internals
 @dirrm %%DOCSDIR%%%%PORTVERSION%%/html
 @dirrm %%DOCSDIR%%%%PORTVERSION%%
 @dirrm %%DOCSDIR%%-python%%PORTVERSION%%/examples
diff --git a/devel/p5-Sys-Virt/Makefile b/devel/p5-Sys-Virt/Makefile
index 87f9014e0b79..dca1bfde7391 100644
--- a/devel/p5-Sys-Virt/Makefile
+++ b/devel/p5-Sys-Virt/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	Sys-Virt
 PORTVERSION=	0.10.2
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -12,7 +13,7 @@ MAINTAINER=	fw@moov.de
 COMMENT=	Perl bindings for libvirt
 
 BUILD_DEPENDS=	p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
-LIB_DEPENDS=	virt.10:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	virt.1000:${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 c92b2be3c610..39978e644b6f 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	4.10.8
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -387,7 +388,7 @@ PLIST_SUB+=	TOKYOTYRANT="@comment "
 
 .if ${PORT_OPTIONS:MVIRT}
 CONFIGURE_ARGS+=--enable-libvirt
-LIB_DEPENDS+=	virt:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=	virt.1000:${PORTSDIR}/devel/libvirt
 PLIST_SUB+=	VIRT=""
 .else
 CONFIGURE_ARGS+=--disable-libvirt
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 25edd8c951df..a7215f5b1d8f 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	collectd
-# Date created:				Sat Sep 29 05:19:31 PDT 2007
-# Whom:					Matt Peterson <matt@peterson.org>
-#
+# Created by: Matt Peterson <matt@peterson.org>
 # $FreeBSD$
-#
-
 PORTNAME=	collectd
 PORTVERSION=	5.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
@@ -397,7 +392,7 @@ PLIST_SUB+=	TOKYOTYRANT="@comment "
 
 .if ${PORT_OPTIONS:MVIRT}
 CONFIGURE_ARGS+=--enable-libvirt
-LIB_DEPENDS+=	virt:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=	virt.1000:${PORTSDIR}/devel/libvirt
 PLIST_SUB+=	VIRT=""
 .else
 CONFIGURE_ARGS+=--disable-libvirt
diff --git a/net-mgmt/virt-viewer/Makefile b/net-mgmt/virt-viewer/Makefile
index 54fb9903eb9a..073898c7d702 100644
--- a/net-mgmt/virt-viewer/Makefile
+++ b/net-mgmt/virt-viewer/Makefile
@@ -1,7 +1,9 @@
+# Created by: Jason Helfman <jgh@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	virt-viewer
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/
 
@@ -10,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.10:${PORTSDIR}/devel/libvirt \
+LIB_DEPENDS=	virt.1000:${PORTSDIR}/devel/libvirt \
 		gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc
 
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/virtinst/Makefile b/net-mgmt/virtinst/Makefile
index 722c337afc3c..857d79e8af7e 100644
--- a/net-mgmt/virtinst/Makefile
+++ b/net-mgmt/virtinst/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: virtinst
-# Date created:    2011-06-07
-# Whom:      Jason Helfman <jhelfman@experts-exchange.com>
-#
+# Created by: Jason Helfman <jgh@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	virtinst
 PORTVERSION=	0.600.3
-PORTREVSION=	1
+PORTREVSION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Module to help in starting installations inside of virtual machines
 
-LIB_DEPENDS=	virt.10:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	virt.1000:${PORTSDIR}/devel/libvirt
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.9.1:${PORTSDIR}/www/py-urlgrabber
 
 USE_GETTEXT=	yes
diff --git a/net-mgmt/zenpack-libvirt/Makefile b/net-mgmt/zenpack-libvirt/Makefile
index a835919d2238..a6095798f3ca 100644
--- a/net-mgmt/zenpack-libvirt/Makefile
+++ b/net-mgmt/zenpack-libvirt/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for: libvirt
-# Date created:    20 May 2011
-# Whom:      Zenoss <zenoss@experts-exchange.com>
-#
+# Created by: Zenoss <zenoss@experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libvirt
 PORTVERSION=    1.96
-PORTREVISION=	1
+PORTREVISION=	2
 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 733e821d014a..579c4f9d97be 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -1,13 +1,9 @@
-
-# Date created:		February 2, 2009
-# Whom:			jrhett@netconsonance.com
-#
+# Created by: jrhett@netconsonance.com
 # $FreeBSD$
-#
 
 PORTNAME=	cfengine
 PORTVERSION=	3.4.0b2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
@@ -84,7 +80,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
 .if defined(WITH_LIBVIRT)
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		virt.1000:${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 014b61e8ff7b..528f015bd6a0 100644
--- a/sysutils/cfengine33/Makefile
+++ b/sysutils/cfengine33/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	cfengine
 PORTVERSION=	3.3.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -69,7 +69,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		virt.1000:${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 382472dade3f..6d1468e86a07 100644
--- a/sysutils/cfengine34/Makefile
+++ b/sysutils/cfengine34/Makefile
@@ -1,13 +1,9 @@
-
-# Date created:		February 2, 2009
-# Whom:			jrhett@netconsonance.com
-#
+# Created by: jrhett@netconsonance.com
 # $FreeBSD$
-#
 
 PORTNAME=	cfengine
 PORTVERSION=	3.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -80,7 +76,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 
 .if defined(WITH_LIBVIRT)
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		virt:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		virt.1000:${PORTSDIR}/devel/libvirt
 .endif
 
 MAN8=	cf-agent.8	cf-key.8	cf-monitord.8	\