Date: Wed, 4 Jan 2006 12:59:27 +0800 (CST) From: Rong-En Fan <rafan@infor.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dd@FreeBSD.org Subject: ports/91294: [PATCH] textproc/dict: install .sample for configuration files Message-ID: <200601040459.k044xRxu008238@svm.csie.ntu.edu.tw> Resent-Message-ID: <200601040500.k0450D3C091042@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 91294
>Category: ports
>Synopsis: [PATCH] textproc/dict: install .sample for 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: Wed Jan 04 05:00:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rong-En Fan
>Release: FreeBSD 6.0
>Organization:
NTU CSIE
>Environment:
>Description:
This port installs etc/dict.conf everytime and removes it
even if this file is changed.
Bump PORTREVISION since package contents are changed.
Port maintainer (dd@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
install textproc/dict, change dict.conf, pkg_delete it.
Then, etc/dict.conf is gone.
>Fix:
Changes follow Porters' Handbook 7.3 Configuration files.
--- dict-1.10.4_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/dict/Makefile /home/rafan/tmp/ports/dict/Makefile
--- /usr/ports/textproc/dict/Makefile Wed Jan 4 12:17:29 2006
+++ /home/rafan/tmp/ports/dict/Makefile Wed Jan 4 12:54:16 2006
@@ -8,7 +8,7 @@
PORTNAME= dict
PORTVERSION= 1.10.4
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= dict
@@ -33,8 +33,9 @@
${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/dict.1.in
post-install:
+ ${INSTALL_DATA} ${FILESDIR}/dict.conf ${PREFIX}/etc/dict.conf.sample
if [ ! -f ${PREFIX}/etc/dict.conf ]; then \
- ${INSTALL_DATA} ${FILESDIR}/dict.conf ${PREFIX}/etc; \
+ ${CP} -p ${PREFIX}/etc/dict.conf.sample ${PREFIX}/etc/dict.conf; \
fi
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/textproc/dict/pkg-plist /home/rafan/tmp/ports/dict/pkg-plist
--- /usr/ports/textproc/dict/pkg-plist Thu Apr 15 16:18:09 2004
+++ /home/rafan/tmp/ports/dict/pkg-plist Wed Jan 4 12:50:11 2006
@@ -1,4 +1,6 @@
@comment $FreeBSD: ports/textproc/dict/pkg-plist,v 1.5 2004/04/15 08:18:09 kris Exp $
bin/dict
bin/dictl
-etc/dict.conf
+@unexec if cmp -s %D/etc/dict.conf.sample %D/etc/dict.conf; then rm -f %D/etc/dict.conf; fi
+etc/dict.conf.sample
+@exec [ -f %B/dict.conf ] || cp %B/%f %B/dict.conf
--- dict-1.10.4_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601040459.k044xRxu008238>