- Update to 0.9.12

- remove patch files in favor of --without-sysctl (Daniel P. Berrange)

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

5 files changed, 6 insertions, 91 deletions

diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 7347ea5a05fa..bfc785f9119e 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libvirt
-PORTVERSION=	0.9.11
+PORTVERSION=	0.9.12
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/
 
@@ -31,6 +31,7 @@ CONFIGURE_ARGS=	--without-sasl \
 		--without-udev \
 		--without-netcf \
 		--without-network \
+		--without-sysctl \
 		--with-libssh2
 
 #limit to non-stable release x.x.x
@@ -67,7 +68,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \
 			  ${WRKSRC}/aclocal.m4
 	@${MV} ${WRKSRC}/daemon/libvirtd.conf ${WRKSRC}/daemon/libvirtd.conf.sample
-	@${REINPLACE_CMD} -e 's|libvirtd.conf|libvirtd.conf.sample|' \
+	@${REINPLACE_CMD} -e 's|libvirtd\.conf|libvirtd.conf.sample|' \
 		${WRKSRC}/daemon/Makefile.am \
 		${WRKSRC}/daemon/Makefile.in
 
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index db473fab2cb9..6233aff969be 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvirt-0.9.11.tar.gz) = ce98fe435f83e109623a021b1f714fe806c3ab556d0780ce959cf75c98766062
-SIZE (libvirt-0.9.11.tar.gz) = 19519376
+SHA256 (libvirt-0.9.12.tar.gz) = 298ffc7f2a6d6e78aae46f11a0980f4bc17fa2928f5de6cd9e8abaf5990336e7
+SIZE (libvirt-0.9.12.tar.gz) = 20054618
diff --git a/devel/libvirt/files/patch-daemon__Makefile.am b/devel/libvirt/files/patch-daemon__Makefile.am
deleted file mode 100644
index 7e2b88f67306..000000000000
--- a/devel/libvirt/files/patch-daemon__Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
---- ./daemon/Makefile.am.orig	2012-01-11 11:23:42.000000000 -0800
-+++ ./daemon/Makefile.am	2012-01-11 11:25:29.000000000 -0800
-@@ -38,7 +38,6 @@
- 	libvirtd.policy-1				\
- 	libvirtd.sasl					\
- 	libvirtd.sysconf				\
--	libvirtd.sysctl					\
- 	libvirtd.aug                                    \
- 	libvirtd.logrotate.in                           \
- 	libvirtd.qemu.logrotate.in                      \
-@@ -172,14 +171,14 @@
- 
- install-data-local: install-init-redhat install-init-systemd install-init-upstart \
- 		install-data-sasl install-data-polkit \
--		install-logrotate install-sysctl
-+		install-logrotate
- 	$(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt \
- 		   $(DESTDIR)$(localstatedir)/run/libvirt \
- 		   $(DESTDIR)$(localstatedir)/lib/libvirt
- 
- uninstall-local:: uninstall-init-redhat uninstall-init-systemd uninstall-init-upstart \
- 		uninstall-data-sasl uninstall-data-polkit \
--		uninstall-logrotate uninstall-sysctl
-+		uninstall-logrotate
- 	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
- 	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
- 	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
-@@ -256,15 +255,6 @@
- 	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
- 	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
- 
--install-sysctl:
--	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d
--	$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
--	  $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
--
--uninstall-sysctl:
--	rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
--	rmdir $(DESTDIR)$(sysconfdir)/sysctl.d || :
--
- if LIBVIRT_INIT_SCRIPT_RED_HAT
- 
- BUILT_SOURCES += libvirtd.init
diff --git a/devel/libvirt/files/patch-daemon__Makefile.in b/devel/libvirt/files/patch-daemon__Makefile.in
deleted file mode 100644
index 3a22eb75636b..000000000000
--- a/devel/libvirt/files/patch-daemon__Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- ./daemon/Makefile.in.orig	2012-01-11 11:23:48.000000000 -0800
-+++ ./daemon/Makefile.in	2012-01-11 11:25:10.000000000 -0800
-@@ -1504,7 +1504,7 @@
- EXTRA_DIST = remote_dispatch.h qemu_dispatch.h libvirtd.conf \
- 	libvirtd.init.in libvirtd.upstart libvirtd.policy-0 \
- 	libvirtd.policy-1 libvirtd.sasl libvirtd.sysconf \
--	libvirtd.sysctl libvirtd.aug libvirtd.logrotate.in \
-+	libvirtd.aug libvirtd.logrotate.in \
- 	libvirtd.qemu.logrotate.in libvirtd.lxc.logrotate.in \
- 	libvirtd.uml.logrotate.in test_libvirtd.aug THREADS.txt \
- 	libvirtd.pod.in libvirtd.8.in $(DAEMON_SOURCES) \
-@@ -2109,14 +2109,14 @@
- 
- @WITH_LIBVIRTD_TRUE@install-data-local: install-init-redhat install-init-systemd install-init-upstart \
- @WITH_LIBVIRTD_TRUE@		install-data-sasl install-data-polkit \
--@WITH_LIBVIRTD_TRUE@		install-logrotate install-sysctl
-+@WITH_LIBVIRTD_TRUE@		install-logrotate
- @WITH_LIBVIRTD_TRUE@	$(MKDIR_P) $(DESTDIR)$(localstatedir)/log/libvirt \
- @WITH_LIBVIRTD_TRUE@		   $(DESTDIR)$(localstatedir)/run/libvirt \
- @WITH_LIBVIRTD_TRUE@		   $(DESTDIR)$(localstatedir)/lib/libvirt
- 
- @WITH_LIBVIRTD_TRUE@uninstall-local:: uninstall-init-redhat uninstall-init-systemd uninstall-init-upstart \
- @WITH_LIBVIRTD_TRUE@		uninstall-data-sasl uninstall-data-polkit \
--@WITH_LIBVIRTD_TRUE@		uninstall-logrotate uninstall-sysctl
-+@WITH_LIBVIRTD_TRUE@		uninstall-logrotate
- @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
- @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
- @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
-@@ -2185,15 +2185,6 @@
- @WITH_LIBVIRTD_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
- @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
- 
--@WITH_LIBVIRTD_TRUE@install-sysctl:
--@WITH_LIBVIRTD_TRUE@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d
--@WITH_LIBVIRTD_TRUE@	$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
--@WITH_LIBVIRTD_TRUE@	  $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
--
--@WITH_LIBVIRTD_TRUE@uninstall-sysctl:
--@WITH_LIBVIRTD_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd
--@WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/sysctl.d || :
--
- @LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@install-init-redhat: install-sysconfig libvirtd.init
- @LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
- @LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@	$(INSTALL_SCRIPT) libvirtd.init \
diff --git a/devel/libvirt/pkg-plist b/devel/libvirt/pkg-plist
index 1f7baa2bb92e..1e8cbc848fb9 100644
--- a/devel/libvirt/pkg-plist
+++ b/devel/libvirt/pkg-plist
@@ -137,6 +137,7 @@ share/augeas/lenses/tests/test_libvirtd.aug
 %%DOCSDIR%%%%PORTVERSION%%/html/migration-unmanaged-direct.png
 %%DOCSDIR%%%%PORTVERSION%%/html/news.html
 %%DOCSDIR%%%%PORTVERSION%%/html/node.gif
+%%DOCSDIR%%%%PORTVERSION%%/html/pending.html
 %%DOCSDIR%%%%PORTVERSION%%/html/php.html
 %%DOCSDIR%%%%PORTVERSION%%/html/python.html
 %%DOCSDIR%%%%PORTVERSION%%/html/relatedlinks.html