Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Nov 2006 18:02:37 +0900 (JST)
From:      TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
Subject:   ports/105364: [patch] dns/checkdns: conform to ports conventions
Message-ID:  <20061110090237.6E78A15344C@xeon.quad.dyndns.org>
Resent-Message-ID: <200611100910.kAA9AIM3056349@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         105364
>Category:       ports
>Synopsis:       [patch] dns/checkdns: conform to ports conventions
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 10 09:10:17 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061110090237.6E78A15344C>