ports/108674: [PATCH] misc/ytree: Correctly handle configuration files

[Rong-En Fan]

>Number:         108674
>Category:       ports
>Synopsis:       [PATCH] misc/ytree: Correctly handle configuration files
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 02 04:30:12 GMT 2007
>Closed-Date:
>Last-Modified:
>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 at 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
+ at 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
+ at 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:
>Unformatted: