From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 15 20:30:06 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C04216A41F for ; Thu, 15 Dec 2005 20:30:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C08A43D5C for ; Thu, 15 Dec 2005 20:30:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id jBFKU4k9090736 for ; Thu, 15 Dec 2005 20:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id jBFKU4t0090732; Thu, 15 Dec 2005 20:30:04 GMT (envelope-from gnats) Resent-Date: Thu, 15 Dec 2005 20:30:04 GMT Resent-Message-Id: <200512152030.jBFKU4t0090732@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alan Snelson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8558416A420 for ; Thu, 15 Dec 2005 20:26:50 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F01343D99 for ; Thu, 15 Dec 2005 20:26:37 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id jBFKQXpY071794 for ; Thu, 15 Dec 2005 20:26:33 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id jBFKQX2m071793; Thu, 15 Dec 2005 20:26:33 GMT (envelope-from nobody) Message-Id: <200512152026.jBFKQX2m071793@www.freebsd.org> Date: Thu, 15 Dec 2005 20:26:33 GMT From: Alan Snelson To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/90457: Update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2005 20:30:06 -0000 >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: