From fmysh@quad.dyndns.org  Fri Nov 10 09:02:49 2006
Return-Path: <fmysh@quad.dyndns.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6BD4A16A407
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Nov 2006 09:02:49 +0000 (UTC)
	(envelope-from fmysh@quad.dyndns.org)
Received: from xeon.quad.dyndns.org (228.142.138.210.bn.2iij.net [210.138.142.228])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 127FD43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Nov 2006 09:02:49 +0000 (GMT)
	(envelope-from fmysh@quad.dyndns.org)
Received: from localhost (localhost [127.0.0.1])
	by xeon.quad.dyndns.org (Postfix) with ESMTP id 4982E15344D;
	Fri, 10 Nov 2006 18:02:48 +0900 (JST)
Received: from xeon.quad.dyndns.org ([127.0.0.1])
	by localhost (xeon.quad.dyndns.org [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id M7WfgJ6zBvcb; Fri, 10 Nov 2006 18:02:37 +0900 (JST)
Received: by xeon.quad.dyndns.org (Postfix, from userid 1001)
	id 6E78A15344C; Fri, 10 Nov 2006 18:02:37 +0900 (JST)
Message-Id: <20061110090237.6E78A15344C@xeon.quad.dyndns.org>
Date: Fri, 10 Nov 2006 18:02:37 +0900 (JST)
From: TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
Reply-To: TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc: TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
Subject: [patch] dns/checkdns: conform to ports conventions
X-Send-Pr-Version: 3.113
X-GNATS-Notify: joe@joeholden.co.uk

>Number:         105364
>Category:       ports
>Synopsis:       [patch] dns/checkdns: conform to ports conventions
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    xride
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 10 09:10:17 GMT 2006
>Closed-Date:    Sat Dec 09 11:53:25 GMT 2006
>Last-Modified:  Sat Dec 09 11:53:25 GMT 2006
>Originator:     TAOKA Fumiyoshi
>Release:        
>Organization:
>Environment:
>Description:
	
	- Save user's checkdns.conf and install checkdns.conf-dist.
	- Respect NOPORTDOCS and install docs to DOCSDIR.

	- Install missing checkdns.css.
	- Don't install uninstall.sh.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/dns/checkdns/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	4 May 2006 21:41:11 -0000	1.5
+++ Makefile	10 Nov 2006 08:29:53 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	checkdns
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://www.enderunix.org/checkdns/ \
 		http://www.trunix.org/projeler/checkdns/
@@ -16,11 +17,24 @@
 
 SUB_FILES=	pkg-message
 
+PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README THANKS TODO
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/main.c \
 		${WRKSRC}/INSTALL ${WRKSRC}/README ${WRKSRC}/checkdns.conf-dist
 
 post-install:
+	@if [ ! -f ${PREFIX}/etc/checkdns.conf ]; then \
+		${CP} -p ${PREFIX}/etc/checkdns.conf-dist ${PREFIX}/etc/checkdns.conf ; \
+	fi
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_MAN} ${WRKSRC}/$f ${DOCSDIR}
+.endfor
+.endif
+
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/dns/checkdns/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	20 May 2005 21:19:10 -0000	1.1
+++ pkg-plist	9 Nov 2006 15:54:44 -0000
@@ -1,13 +1,8 @@
 bin/checkdns
-etc/checkdns.conf
-%%DATADIR%%/README
-%%DATADIR%%/THANKS
-%%DATADIR%%/TODO
-%%DATADIR%%/AUTHORS
-%%DATADIR%%/COPYING
-%%DATADIR%%/INSTALL
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/uninstall.sh
+@unexec if cmp -s %D/etc/checkdns.conf-dist %D/etc/checkdns.conf; then rm -f %D/etc/checkdns.conf; fi
+etc/checkdns.conf-dist
+@exec if [ ! -f %D/etc/checkdns.conf ] ; then cp -p %D/%F %B/checkdns.conf; fi
+%%DATADIR%%/checkdns.css
 %%DATADIR%%/lang/english
 %%DATADIR%%/lang/spanish
 %%DATADIR%%/lang/turkish
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/dns/checkdns/files/patch-Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile
--- files/patch-Makefile	20 May 2005 21:19:10 -0000	1.1
+++ files/patch-Makefile	9 Nov 2006 15:43:09 -0000
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Jan 15 21:40:27 2005
-+++ Makefile	Fri May 20 23:12:20 2005
+--- Makefile.orig	Fri Nov 10 00:41:08 2006
++++ Makefile	Fri Nov 10 00:41:25 2006
 @@ -9,7 +9,15 @@
  	$(CC) -o checkdns $(OBJS)
  
@@ -8,9 +8,9 @@
 +	cp checkdns ${PREFIX}/bin/checkdns
 +	chown root ${PREFIX}/bin/checkdns
 +	chmod 700 ${PREFIX}/bin/checkdns
-+	cp -pf checkdns.conf-dist ${PREFIX}/etc/checkdns.conf
++	cp -pf checkdns.conf-dist ${PREFIX}/etc/
 +	mkdir -p ${PREFIX}/share/checkdns/lang
-+	cp -f README THANKS TODO AUTHORS COPYING INSTALL ChangeLog uninstall.sh ${PREFIX}/share/checkdns
++	cp -f checkdns.css ${PREFIX}/share/checkdns
 +	cp -f lang/* ${PREFIX}/share/checkdns/lang
 +
 +

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Nov 10 09:10:29 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105364 
Responsible-Changed-From-To: freebsd-ports-bugs->xride 
Responsible-Changed-By: xride 
Responsible-Changed-When: Fri Nov 17 16:26:04 UTC 2006 
Responsible-Changed-Why:  
i'll take this one 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/105364: commit references a PR
Date: Sat,  9 Dec 2006 11:41:00 +0000 (UTC)

 miwi        2006-12-09 11:40:51 UTC
 
   FreeBSD ports repository
 
   Modified files:
     dns/checkdns         Makefile pkg-plist 
     dns/checkdns/files   patch-Makefile 
   Log:
   - Save user's checkdns.conf and install checkdns.conf-dist.
   - Respect NOPORTDOCS and install docs to DOCSDIR.
   
   - Install missing checkdns.css.
   - Don't install uninstall.sh.
   
   PR:             ports/105364
   Submitted by:   TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
   Approved by:    maintainer timeout
                   xride (is holder of this pr)
   
   Revision  Changes    Path
   1.6       +14 -0     ports/dns/checkdns/Makefile
   1.2       +4 -4      ports/dns/checkdns/files/patch-Makefile
   1.2       +4 -9      ports/dns/checkdns/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"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: xride 
State-Changed-When: Sat Dec 9 11:51:55 UTC 2006 
State-Changed-Why:  
miwi has committed it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105364 
>Unformatted:
