svn commit: r347429 - in head/devel: libvirt libvirt-glib libvirt/files

[Jason Helfman]

Author: jgh
Date: Fri Mar  7 22:34:55 2014
New Revision: 347429
URL: http://svnweb.freebsd.org/changeset/ports/347429
QAT: https://qat.redports.org/buildarchive/r347429/

Log:
  - update libvirt to 1.2.2
    - fix qemu when not enabled, and disable linux containers [1]
  - update libvirt-glib to 0.1.8
  
  Changes:	http://libvirt.org/news.html
  Submitted by:	roman@ [1]

Added:
  head/devel/libvirt/files/patch-src__Makefile.in   (contents, props changed)
Modified:
  head/devel/libvirt-glib/Makefile
  head/devel/libvirt-glib/distinfo
  head/devel/libvirt/Makefile
  head/devel/libvirt/distinfo
  head/devel/libvirt/pkg-plist

Modified: head/devel/libvirt-glib/Makefile
==============================================================================
--- head/devel/libvirt-glib/Makefile	Fri Mar  7 21:52:57 2014	(r347428)
+++ head/devel/libvirt-glib/Makefile	Fri Mar  7 22:34:55 2014	(r347429)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt-glib
-PORTVERSION=	0.1.7
-PORTREVISION=	1
+PORTVERSION=	0.1.8
 CATEGORIES=	devel
 MASTER_SITES=	ftp://libvirt.org/libvirt/glib/
 
@@ -22,8 +21,19 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -fstack-protector
 CONFIGURE_ARGS+=	--enable-introspection
 
+SHLIB_VER=	1.0
+STRIP_FILES=	libvirt-glib-${SHLIB_VER}.so.1 \
+		libvirt-gconfig-${SHLIB_VER}.so.1 \
+		libvirt-gobject-${SHLIB_VER}.so.1
+
 post-patch-script:
 	@${REINPLACE_CMD} 's}--quiet}--quiet --libtool=${LIBTOOL}}' \
 		${WRKSRC}/libvirt-*/Makefile.in
 
+post-install-script:
+.for lib in ${STRIP_FILES}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
+.endfor
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}/python${PYTHON_VER}/site-packages/libvirtglibmod.so
+
 .include <bsd.port.mk>

Modified: head/devel/libvirt-glib/distinfo
==============================================================================
--- head/devel/libvirt-glib/distinfo	Fri Mar  7 21:52:57 2014	(r347428)
+++ head/devel/libvirt-glib/distinfo	Fri Mar  7 22:34:55 2014	(r347429)
@@ -1,2 +1,2 @@
-SHA256 (libvirt-glib-0.1.7.tar.gz) = 39652c07d95f980ff30b39e0fd072e768fb85d778d65432da24b17dee9d36429
-SIZE (libvirt-glib-0.1.7.tar.gz) = 746318
+SHA256 (libvirt-glib-0.1.8.tar.gz) = da0e45952dbe1d5d9fde4f845f3a10763e7fed0b1e45906a46fdb74b777aa751
+SIZE (libvirt-glib-0.1.8.tar.gz) = 800459

Modified: head/devel/libvirt/Makefile
==============================================================================
--- head/devel/libvirt/Makefile	Fri Mar  7 21:52:57 2014	(r347428)
+++ head/devel/libvirt/Makefile	Fri Mar  7 22:34:55 2014	(r347429)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvirt
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -45,6 +44,7 @@ CONFIGURE_ARGS=	--without-sasl \
 		--without-netcf \
 		--without-network \
 		--without-sysctl \
+		--without-lxc \
 		--with-ssh2
 
 # workaround to override pkg-config calls

Modified: head/devel/libvirt/distinfo
==============================================================================
--- head/devel/libvirt/distinfo	Fri Mar  7 21:52:57 2014	(r347428)
+++ head/devel/libvirt/distinfo	Fri Mar  7 22:34:55 2014	(r347429)
@@ -1,2 +1,2 @@
-SHA256 (libvirt-1.2.1.tar.gz) = bc29b5751bf36753c17e2fdbb75e70c7b07df3d9527586d3426e90f5f4abb898
-SIZE (libvirt-1.2.1.tar.gz) = 27228694
+SHA256 (libvirt-1.2.2.tar.gz) = a48377e307c5c21b67e43db99af909a23c33aff8cbbaa3361fd389eb047cbbc3
+SIZE (libvirt-1.2.2.tar.gz) = 28340039

Added: head/devel/libvirt/files/patch-src__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libvirt/files/patch-src__Makefile.in	Fri Mar  7 22:34:55 2014	(r347429)
@@ -0,0 +1,25 @@
+--- ./src/Makefile.in.orig	2014-03-07 08:08:47.000000000 -0800
++++ ./src/Makefile.in	2014-03-07 08:10:53.000000000 -0800
+@@ -288,9 +288,9 @@
+ @WITH_LIBVIRTD_TRUE at am__append_159 = lockd.la
+ @WITH_LIBVIRTD_TRUE at am__append_160 = locking/libvirt_lockd.aug \
+ @WITH_LIBVIRTD_TRUE@	locking/virtlockd.aug
+- at WITH_LIBVIRTD_TRUE@am__append_161 = test_libvirt_lockd.aug \
+- at WITH_LIBVIRTD_TRUE@	test_virtlockd.aug
+- at WITH_LIBVIRTD_TRUE@am__append_162 = test_libvirt_lockd.aug
++ at WITH_LIBVIRTD_TRUE@@WITH_QEMU_TRUE at am__append_161 = test_libvirt_lockd.aug \
++ at WITH_LIBVIRTD_TRUE@@WITH_QEMU_TRUE@	test_virtlockd.aug
++ at WITH_LIBVIRTD_TRUE@@WITH_QEMU_TRUE at am__append_162 = test_libvirt_lockd.aug
+ @WITH_DTRACE_PROBES_TRUE@@WITH_LIBVIRTD_TRUE at am__append_163 = libvirt_probes.lo
+ @WITH_LIBVIRTD_TRUE@@WITH_QEMU_TRUE at am__append_164 = locking/qemu-lockd.conf
+ @WITH_LIBVIRTD_TRUE@@WITH_QEMU_TRUE at am__append_165 = locking/qemu-lockd.conf
+@@ -9678,6 +9678,8 @@
+ @WITH_QEMU_TRUE@		locking/qemu-lockd.conf $(AUG_GENTEST)
+ @WITH_QEMU_TRUE@	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@
+ 
++ at WITH_QEMU_FALSE@test_libvirt_lockd.aug:
++
+ test_virtlockd.aug: locking/test_virtlockd.aug.in \
+ 		locking/virtlockd.conf $(AUG_GENTEST)
+ 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< $@
+

Modified: head/devel/libvirt/pkg-plist
==============================================================================
--- head/devel/libvirt/pkg-plist	Fri Mar  7 21:52:57 2014	(r347428)
+++ head/devel/libvirt/pkg-plist	Fri Mar  7 22:34:55 2014	(r347429)
@@ -47,9 +47,7 @@ share/augeas/lenses/libvirt_lockd.aug
 share/augeas/lenses/libvirtd.aug
 share/augeas/lenses/virtlockd.aug
 %%QEMU%%share/augeas/lenses/libvirtd_qemu.aug
-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
 %%DOCSDIR%%%%PORTVERSION%%/html/32favicon.png
 %%DOCSDIR%%%%PORTVERSION%%/html/404.html