From jhelfman@experts-exchange.com  Tue Nov  8 22:18:11 2011
Return-Path: <jhelfman@experts-exchange.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AAB1E106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Nov 2011 22:18:11 +0000 (UTC)
	(envelope-from jhelfman@experts-exchange.com)
Received: from mail.experts-exchange.com (mail.experts-exchange.com [72.29.183.251])
	by mx1.freebsd.org (Postfix) with ESMTP id 8AC968FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Nov 2011 22:18:11 +0000 (UTC)
Received: from mail.experts-exchange.com (localhost [127.0.0.1])
	by mail.experts-exchange.com (Postfix) with ESMTP id 5C7B5716C57
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Nov 2011 14:18:11 -0800 (PST)
Received: from mail.experts-exchange.com ([127.0.0.1])
	by mail.experts-exchange.com (mail.experts-exchange.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id dF4f3eUkACKW for <FreeBSD-gnats-submit@freebsd.org>;
	Tue,  8 Nov 2011 14:18:11 -0800 (PST)
Received: from experts-exchange.com (unknown [192.168.103.120])
	by mail.experts-exchange.com (Postfix) with SMTP id 383AA716C4B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Nov 2011 14:18:11 -0800 (PST)
Received: (nullmailer pid 21682 invoked by uid 1001);
	Tue, 08 Nov 2011 22:17:57 -0000
Message-Id: <1320790677.115852.21681.nullmailer@experts-exchange.com>
Date: Tue, 08 Nov 2011 14:17:57 -0800
From: Jason Helfman <jhelfman@experts-exchange.com>
Reply-To: Jason Helfman <jhelfman@experts-exchange.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch][maintainer-update] devel/libvirt: update to 0.9.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         162387
>Category:       ports
>Synopsis:       [patch][maintainer-update] devel/libvirt: update to 0.9.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 08 22:20:08 UTC 2011
>Closed-Date:    Fri Nov 11 17:27:24 UTC 2011
>Last-Modified:  Fri Nov 11 17:30:16 UTC 2011
>Originator:     Jason Helfman
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
Experts Exchange, LLC.
>Environment:
System: FreeBSD eggman.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
Update to libvirt 0.9.7
Handle additional configuration file (libvirt.conf)
Builds cleanly in Tinderbox => http://jgh.devio.us/files/logs/libvirt-0.9.7.log

>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/jhelfman/ncvs/ports/devel/libvirt/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	30 Oct 2011 17:35:48 -0000	1.9
+++ Makefile	8 Nov 2011 22:01:59 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libvirt
-PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTVERSION=	0.9.7
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/
 
@@ -62,4 +61,8 @@
 		${WRKSRC}/daemon/Makefile.am \
 		${WRKSRC}/daemon/Makefile.in
 
+	@${MV} ${WRKSRC}/src/libvirt.conf ${WRKSRC}/src/libvirt.conf.sample
+	@${REINPLACE_CMD} -e 's|conf_DATA = libvirt.conf|conf_DATA = libvirt.conf.sample|' \
+		${WRKSRC}/src/Makefile.am
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/jhelfman/ncvs/ports/devel/libvirt/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	27 Sep 2011 06:42:25 -0000	1.5
+++ distinfo	8 Nov 2011 21:06:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (libvirt-0.9.6.tar.gz) = ce29b1cd3067b224aa834fec2a93d7613c0e72bc035760ad536a2142430bc02b
-SIZE (libvirt-0.9.6.tar.gz) = 17326676
+SHA256 (libvirt-0.9.7.tar.gz) = 29ff05bfe5177d6680c02c279ed2573dcfae993f2824bffa192a3a2cdd05af23
+SIZE (libvirt-0.9.7.tar.gz) = 17853636
Index: pkg-plist
===================================================================
RCS file: /home/jhelfman/ncvs/ports/devel/libvirt/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	30 Oct 2011 17:35:48 -0000	1.6
+++ pkg-plist	8 Nov 2011 21:39:34 -0000
@@ -5,6 +5,9 @@
 @unexec if cmp -s %D/%%ETCDIR%%/libvirtd.conf.sample %D/%%ETCDIR%%/libvirtd.conf; then rm -f %D/%%ETCDIR%%/libvirtd.conf; fi
 %%ETCDIR%%/libvirtd.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/libvirtd.conf ] ; then cp -p %D/%%ETCDIR%%/libvirtd.conf.sample %D/%%ETCDIR%%/libvirtd.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/libvirt.conf.sample %D/%%ETCDIR%%/libvirt.conf; then rm -f %D/%%ETCDIR%%/libvirt.conf; fi
+%%ETCDIR%%/libvirt.conf.sample
+@exec if [ ! -f %D/%%ETCDIR%%/libvirt.conf ] ; then cp -p %D/%%ETCDIR%%/libvirt.conf.sample %D/%%ETCDIR%%/libvirt.conf; fi
 %%ETCDIR%%/nwfilter/allow-arp.xml
 %%ETCDIR%%/nwfilter/allow-dhcp-server.xml
 %%ETCDIR%%/nwfilter/allow-dhcp.xml
@@ -123,6 +126,12 @@
 %%DOCSDIR%%%%PORTVERSION%%/html/logging.html
 %%DOCSDIR%%%%PORTVERSION%%/html/madeWith.png
 %%DOCSDIR%%%%PORTVERSION%%/html/main.css
+%%DOCSDIR%%%%PORTVERSION%%/html/migration.html
+%%DOCSDIR%%%%PORTVERSION%%/html/migration-managed-direct.png
+%%DOCSDIR%%%%PORTVERSION%%/html/migration-managed-p2p.png
+%%DOCSDIR%%%%PORTVERSION%%/html/migration-native.png
+%%DOCSDIR%%%%PORTVERSION%%/html/migration-tunnel.png
+%%DOCSDIR%%%%PORTVERSION%%/html/migration-unmanaged-direct.png
 %%DOCSDIR%%%%PORTVERSION%%/html/news.html
 %%DOCSDIR%%%%PORTVERSION%%/html/node.gif
 %%DOCSDIR%%%%PORTVERSION%%/html/php.html
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed Nov 9 03:55:21 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162387 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Nov 11 17:27:24 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162387 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/162387: commit references a PR
Date: Fri, 11 Nov 2011 17:27:29 +0000 (UTC)

 miwi        2011-11-11 17:27:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/libvirt        Makefile distinfo pkg-plist 
   Log:
   - Update to 0.9.7
   
   PR:             162387
   Submitted by:   Jason Helfman <jhelfman@experts-exchange.com> (maintainer)
   Feature safe:   yes
   
   Revision  Changes    Path
   1.10      +5 -2      ports/devel/libvirt/Makefile
   1.6       +2 -2      ports/devel/libvirt/distinfo
   1.7       +10 -1     ports/devel/libvirt/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
