Date: Thu, 15 Dec 2005 20:26:33 GMT From: Alan Snelson <Alan@Wave2.co.uk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/90457: Update Message-ID: <200512152026.jBFKQX2m071793@www.freebsd.org> Resent-Message-ID: <200512152030.jBFKU4t0090732@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90457
>Category: ports
>Synopsis: Update
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 15 20:30:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Alan Snelson
>Release: FreeBSD 5.4-RELEASE
>Organization:
Wave2 Limited
>Environment:
FreeBSD bserver1.wave2.co.uk 5.4-RELEASE FreeBSD 5.4-RELEASE #1: Wed May 18 19:23:58 BST 2005 root@bserver1.wave2.co.uk:/usr/obj/usr/src/sys/bserver1 i386
>Description:
Modified variable name CONF_FILES as per ports/90436, changed to LOCAL_CONF_FILES in following files:
- epylog/Makefile
- epylog/files/pkg-deinstall.in
- epylog/files/pkg-install.in
>How-To-Repeat:
>Fix:
==============================================================
--- Makefile Thu Dec 15 20:18:42 2005
+++ /usr/ports/sysutils/epylog/Makefile Thu Dec 15 20:19:18 2005
@@ -28,7 +28,7 @@
USE_PERL5= yes
USE_PYTHON= yes
-CONF_FILES= epylog.conf \
+LOCAL_CONF_FILES= epylog.conf \
modules.d/logins.conf \
modules.d/mail.conf \
modules.d/notices.conf \
@@ -40,7 +40,7 @@
weed_local.cf
SUB_FILES= pkg-install pkg-deinstall
-SUB_LIST= CONF_FILES="${CONF_FILES}"
+SUB_LIST= LOCAL_CONF_FILES="${LOCAL_CONF_FILES}"
post-patch:
@${REINPLACE_CMD} -e 's|$$sysconfdir/cron\.daily|$$sysconfdir/epylog|' \
==============================================================
--- files/pkg-install.in Thu Dec 15 20:18:42 2005
+++ /usr/ports/sysutils/epylog/files/pkg-install.in Thu Dec 15 20:19:45 2005
@@ -2,7 +2,7 @@
[ "$2" != "POST-INSTALL" ] && exit 0
-for f in %%CONF_FILES%%; do
+for f in %%LOCAL_CONF_FILES%%; do
if ! [ -f "${PKG_PREFIX}/etc/epylog/$f" ]; then
cp -p "${PKG_PREFIX}/etc/epylog/$f.default" "${PKG_PREFIX}/etc/epylog/$f"
fi
==============================================================
--- files/pkg-deinstall.in Thu Dec 15 20:18:42 2005
+++ /usr/ports/sysutils/epylog/files/pkg-deinstall.in Thu Dec 15 20:19:34 2005
@@ -2,7 +2,7 @@
[ "$2" != "DEINSTALL" ] && exit 0
-for f in %%CONF_FILES%%; do
+for f in %%LOCAL_CONF_FILES%%; do
if cmp -s "${PKG_PREFIX}/etc/epylog/$f" "${PKG_PREFIX}/etc/epylog/$f.default"; then
rm -f "${PKG_PREFIX}/etc/epylog/$f"
fi
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512152026.jBFKQX2m071793>