4 files changed, 31 insertions, 29 deletions

diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index f661d0bd9569..4a500a18c675 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libvirt
-PORTVERSION=	0.9.8
+PORTVERSION=	0.9.9
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/
 
diff --git a/devel/libvirt/distinfo b/devel/libvirt/distinfo
index 5a2f27fd29f2..9954b1fc6a7c 100644
--- a/devel/libvirt/distinfo
+++ b/devel/libvirt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvirt-0.9.8.tar.gz) = 31b20864e44bb18a2d01b7ac6569f114cbe1007689219bf24a07ddb7528abe0e
-SIZE (libvirt-0.9.8.tar.gz) = 18403525
+SHA256 (libvirt-0.9.9.tar.gz) = f3253567dc0f22b1bd72121c4163b0caf17f5beb55adaa4104c7e4636e7edf94
+SIZE (libvirt-0.9.9.tar.gz) = 18610224
diff --git a/devel/libvirt/files/patch-daemon__Makefile.am b/devel/libvirt/files/patch-daemon__Makefile.am
index aada0fb5f782..7e2b88f67306 100644
--- a/devel/libvirt/files/patch-daemon__Makefile.am
+++ b/devel/libvirt/files/patch-daemon__Makefile.am
@@ -1,5 +1,5 @@
---- ./daemon/Makefile.am.orig	2011-12-12 12:08:01.000000000 -0800
-+++ ./daemon/Makefile.am	2011-12-12 12:08:40.000000000 -0800
+--- ./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					\
@@ -8,34 +8,35 @@
  	libvirtd.aug                                    \
  	libvirtd.logrotate.in                           \
  	libvirtd.qemu.logrotate.in                      \
-@@ -172,14 +171,13 @@
+@@ -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
- 	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
- 	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
+ 	$(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-sysctl
-+		uninstall-data-sasl uninstall-data-polkit
+ 		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 || :
-@@ -244,14 +242,6 @@
- uninstall-sysconfig:
+@@ -256,15 +255,6 @@
  	rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
+ 	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
  
 -install-sysctl:
--	mkdir -p $(DESTDIR)$(sysconfdir)/sysctl.d
+-	$(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
  
diff --git a/devel/libvirt/files/patch-daemon__Makefile.in b/devel/libvirt/files/patch-daemon__Makefile.in
index 39282d1b9369..3a22eb75636b 100644
--- a/devel/libvirt/files/patch-daemon__Makefile.in
+++ b/devel/libvirt/files/patch-daemon__Makefile.in
@@ -1,6 +1,6 @@
---- ./daemon/Makefile.in.orig	2011-12-12 12:11:23.000000000 -0800
-+++ ./daemon/Makefile.in	2011-12-12 12:12:05.000000000 -0800
-@@ -1503,7 +1503,7 @@
+--- ./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 \
@@ -9,35 +9,36 @@
  	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) \
-@@ -2108,14 +2108,13 @@
+@@ -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@	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
- @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
+ @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-sysctl
-+@WITH_LIBVIRTD_TRUE@		uninstall-data-sasl uninstall-data-polkit
+ @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 || :
-@@ -2172,14 +2171,6 @@
- @WITH_LIBVIRTD_TRUE@uninstall-sysconfig:
+@@ -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@	$(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@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
  @LIBVIRT_INIT_SCRIPT_RED_HAT_TRUE@@WITH_LIBVIRTD_TRUE@	$(INSTALL_SCRIPT) libvirtd.init \