From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 18 19:50:12 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB9471065672 for ; Wed, 18 May 2011 19:50:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CB3778FC21 for ; Wed, 18 May 2011 19:50:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p4IJoBpD033932 for ; Wed, 18 May 2011 19:50:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4IJoB4T033931; Wed, 18 May 2011 19:50:11 GMT (envelope-from gnats) Resent-Date: Wed, 18 May 2011 19:50:11 GMT Resent-Message-Id: <201105181950.p4IJoB4T033931@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, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C51781065674 for ; Wed, 18 May 2011 19:45:27 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 9CBAC8FC13 for ; Wed, 18 May 2011 19:45:27 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p4IJjREh032563 for ; Wed, 18 May 2011 19:45:27 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p4IJjRcK032562; Wed, 18 May 2011 19:45:27 GMT (envelope-from nobody) Message-Id: <201105181945.p4IJjRcK032562@red.freebsd.org> Date: Wed, 18 May 2011 19:45:27 GMT From: Chris Rees To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/157160: Fix port: security/amap uses CONF_FILES internally 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: Wed, 18 May 2011 19:50:12 -0000 >Number: 157160 >Category: ports >Synopsis: Fix port: security/amap uses CONF_FILES internally >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 May 18 19:50:11 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Chris Rees >Release: >Organization: >Environment: >Description: As discussed on ports@ and with bapt, new variables CONF_FILES and CONF_DIRS are to be introduced to bsd.port.mk. This causes problems in some ports, of which this is one. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /exports/cvsroot-freebsd/ports/security/amap/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 7 Aug 2006 12:55:51 -0000 1.18 +++ Makefile 18 May 2011 18:30:38 -0000 @@ -29,7 +29,7 @@ LOCAL_CONF_FILES= appdefs.resp appdefs.rpc appdefs.trig SUB_FILES= pkg-install pkg-deinstall -SUB_LIST= CONF_FILES="${LOCAL_CONF_FILES}" CONF_DIR="${CONF_DIR}" +SUB_LIST= LOCAL_CONF_FILES="${LOCAL_CONF_FILES}" CONF_DIR="${CONF_DIR}" post-patch: @${REINPLACE_CMD} -e \ Index: files/pkg-deinstall.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/security/amap/files/pkg-deinstall.in,v retrieving revision 1.1 diff -u -r1.1 pkg-deinstall.in --- files/pkg-deinstall.in 22 May 2005 15:16:46 -0000 1.1 +++ files/pkg-deinstall.in 18 May 2011 18:31:39 -0000 @@ -2,7 +2,7 @@ [ "$2" != "DEINSTALL" ] && exit 0 -for f in %%CONF_FILES%%; do +for f in %%LOCAL_CONF_FILES%%; do if cmp -s "%%CONF_DIR%%/$f" "%%CONF_DIR%%/$f.default"; then rm -f "%%CONF_DIR%%/$f" fi Index: files/pkg-install.in =================================================================== RCS file: /exports/cvsroot-freebsd/ports/security/amap/files/pkg-install.in,v retrieving revision 1.1 diff -u -r1.1 pkg-install.in --- files/pkg-install.in 22 May 2005 15:16:46 -0000 1.1 +++ files/pkg-install.in 18 May 2011 18:31:04 -0000 @@ -2,6 +2,6 @@ [ "$2" != "POST-INSTALL" ] && exit 0 -for f in %%CONF_FILES%%; do +for f in %%LOCAL_CONF_FILES%%; do [ -f "%%CONF_DIR%%/$f" ] || cp -p "%%CONF_DIR%%/$f.default" "%%CONF_DIR%%/$f" done >Release-Note: >Audit-Trail: >Unformatted: