From rafan@svm.csie.ntu.edu.tw  Fri Feb  2 04:21:44 2007
Return-Path: <rafan@svm.csie.ntu.edu.tw>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6FFE916A401;
	Fri,  2 Feb 2007 04:21:44 +0000 (UTC)
	(envelope-from rafan@svm.csie.ntu.edu.tw)
Received: from svm.csie.ntu.edu.tw (svm.csie.ntu.edu.tw [140.112.90.75])
	by mx1.freebsd.org (Postfix) with ESMTP id 19B4C13C442;
	Fri,  2 Feb 2007 04:21:43 +0000 (UTC)
	(envelope-from rafan@svm.csie.ntu.edu.tw)
Received: from svm.csie.ntu.edu.tw (localhost [127.0.0.1])
	by svm.csie.ntu.edu.tw (8.13.8/8.13.8) with ESMTP id l124Lhg8049988;
	Fri, 2 Feb 2007 12:21:43 +0800 (CST)
	(envelope-from rafan@svm.csie.ntu.edu.tw)
Received: (from rafan@localhost)
	by svm.csie.ntu.edu.tw (8.13.8/8.13.8/Submit) id l124LhPm057998;
	Fri, 2 Feb 2007 12:21:43 +0800 (CST)
	(envelope-from rafan)
Message-Id: <200702020421.l124LhPm057998@svm.csie.ntu.edu.tw>
Date: Fri, 2 Feb 2007 12:21:43 +0800 (CST)
From: Rong-En Fan <rafan@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: olgeni@freebsd.org
Subject: [PATCH] misc/ytree: Correctly handle configuration files
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         108674
>Category:       ports
>Synopsis:       [PATCH] misc/ytree: Correctly handle configuration files
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    olgeni
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 02 04:30:12 GMT 2007
>Closed-Date:    Sat Feb 03 22:07:24 GMT 2007
>Last-Modified:  Sat Feb  3 22:10:12 GMT 2007
>Originator:     Rong-En Fan
>Release:        FreeBSD 6.2-PRERELEASE amd64
>Organization:
NTU CSIE
>Environment:
>Description:
This port leaves etc/ytree.conf after deinstall. I also change Makefile
to match the way described in Porters' Handbook.

Port maintainer (olgeni@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- ytree-1.87_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/misc/ytree/Makefile,v
retrieving revision 1.21
diff -u -u -r1.21 Makefile
--- Makefile	1 Feb 2007 20:51:07 -0000	1.21
+++ Makefile	2 Feb 2007 04:17:09 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	ytree
 PORTVERSION=	1.87
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.han.de/~werner/
 
@@ -26,8 +26,8 @@
 .for file in CHANGES README THANKS
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ytree
 .endfor
-	@if [ ! -e ${PREFIX}/etc/ytree.conf ]; then \
-		${INSTALL_DATA} ${WRKSRC}/ytree.conf ${PREFIX}/etc/ytree.conf; \
+	@if [ ! -f ${PREFIX}/etc/ytree.conf ]; then \
+		${CP} -p ${PREFIX}/etc/ytree.conf.sample ${PREFIX}/etc/ytree.conf; \
 	fi
 .endif
 
Index: pkg-plist
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/misc/ytree/pkg-plist,v
retrieving revision 1.7
diff -u -u -r1.7 pkg-plist
--- pkg-plist	19 Jun 2006 19:58:49 -0000	1.7
+++ pkg-plist	2 Feb 2007 04:17:09 -0000
@@ -1,5 +1,7 @@
 bin/ytree
+@unexec if cmp -s %D/etc/ytree.conf.sample %D/etc/ytree.conf; then rm -f %D/etc/ytree.conf; fi
 etc/ytree.conf.sample
+@exec if [ ! -f %D/etc/ytree.conf ] ; then cp -p %D/%F %B/ytree.conf; fi
 %%DOCSDIR%%/CHANGES
 %%DOCSDIR%%/README
 %%DOCSDIR%%/THANKS
--- ytree-1.87_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->olgeni 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Feb 2 04:30:48 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=108674 
State-Changed-From-To: open->closed 
State-Changed-By: olgeni 
State-Changed-When: Sat Feb 3 22:07:09 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/108674: commit references a PR
Date: Sat,  3 Feb 2007 22:07:16 +0000 (UTC)

 olgeni      2007-02-03 22:07:10 UTC
 
   FreeBSD ports repository
 
   Modified files:
     misc/ytree           Makefile pkg-plist 
   Log:
   Unbreak: add proper handling of configuration file.
   
   PR:             ports/108674
   Submitted by:   rafan
   
   Revision  Changes    Path
   1.23      +3 -5      ports/misc/ytree/Makefile
   1.8       +2 -0      ports/misc/ytree/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:
