From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 18 19:50:13 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 DA80F1065672 for ; Wed, 18 May 2011 19:50:13 +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 BA9718FC30 for ; Wed, 18 May 2011 19:50:13 +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 p4IJoDH2033996 for ; Wed, 18 May 2011 19:50:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4IJoDut033995; Wed, 18 May 2011 19:50:13 GMT (envelope-from gnats) Resent-Date: Wed, 18 May 2011 19:50:13 GMT Resent-Message-Id: <201105181950.p4IJoDut033995@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 2A8D1106566C for ; Wed, 18 May 2011 19:48:23 +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 1C9BD8FC0C for ; Wed, 18 May 2011 19:48:23 +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 p4IJmMEu032994 for ; Wed, 18 May 2011 19:48:22 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p4IJmMeQ032993; Wed, 18 May 2011 19:48:22 GMT (envelope-from nobody) Message-Id: <201105181948.p4IJmMeQ032993@red.freebsd.org> Date: Wed, 18 May 2011 19:48:22 GMT From: Chris Rees To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/157166: Fix port: www/tomcat7 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:14 -0000 >Number: 157166 >Category: ports >Synopsis: Fix port: www/tomcat7 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:13 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/www/tomcat7/Makefile,v retrieving revision 1.65 diff -u -r1.65 Makefile --- Makefile 4 May 2011 07:47:56 -0000 1.65 +++ Makefile 18 May 2011 18:40:43 -0000 @@ -28,7 +28,7 @@ TOMCAT_SUBDIR?= ${DISTNAME:R} TOMCAT_HOME= ${PREFIX}/${TOMCAT_SUBDIR} -CONF_FILES= catalina.policy catalina.properties context.xml logging.properties server.xml tomcat-users.xml web.xml +TOMCAT_CONF_FILES= catalina.policy catalina.properties context.xml logging.properties server.xml tomcat-users.xml web.xml CONF_EXT= sample PLIST_SUB= T=${TOMCAT_SUBDIR} CONF_EXT=${CONF_EXT} \ WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} @@ -47,7 +47,7 @@ post-patch: @${FIND} ${WRKSRC} -name '*.bat' -delete -.for f in ${CONF_FILES} +.for f in ${TOMCAT_CONF_FILES} @${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT} .endfor @@ -61,7 +61,7 @@ @${CP} -R ${WRKSRC}/* ${TOMCAT_HOME} @${ECHO_MSG} " [ DONE ]" -.for f in ${CONF_FILES} +.for f in ${TOMCAT_CONF_FILES} . if !exists(${TOMCAT_HOME}/conf/${f}) @${CP} ${TOMCAT_HOME}/conf/${f}.${CONF_EXT} ${TOMCAT_HOME}/conf/${f} . else >Release-Note: >Audit-Trail: >Unformatted: