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 8B9F81065680 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 6BAF58FC1A 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 p4IJoD6j033987 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 p4IJoDoo033986; 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.p4IJoDoo033986@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 541951065675 for ; Wed, 18 May 2011 19:48:03 +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 460FD8FC12 for ; Wed, 18 May 2011 19:48:03 +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 p4IJm30R032969 for ; Wed, 18 May 2011 19:48:03 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p4IJm3bx032968; Wed, 18 May 2011 19:48:03 GMT (envelope-from nobody) Message-Id: <201105181948.p4IJm3bx032968@red.freebsd.org> Date: Wed, 18 May 2011 19:48:03 GMT From: Chris Rees To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/157165: Fix port: www/tomcat6 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:13 -0000 >Number: 157165 >Category: ports >Synopsis: Fix port: www/tomcat6 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/tomcat6/Makefile,v retrieving revision 1.62 diff -u -r1.62 Makefile --- Makefile 4 May 2011 07:41:56 -0000 1.62 +++ Makefile 18 May 2011 18:46:41 -0000 @@ -37,7 +37,8 @@ STDOUT_LOG= ${LOG_DIR}/stdout.log STDERR_LOG= ${LOG_DIR}/stderr.log JAR_FILE= bin/bootstrap.jar -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=${APP_HOME:S/^${PREFIX}\///} CONF_EXT=${CONF_EXT} \ WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP} @@ -73,7 +74,7 @@ post-patch: @${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${WRKSRC}/conf/server.xml @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete -.for f in ${CONF_FILES} +.for f in ${TOMCAT_CONF_FILES} @${MV} ${WRKSRC}/conf/${f} ${WRKSRC}/conf/${f}.${CONF_EXT} .endfor @@ -91,7 +92,7 @@ @${CP} -R ${WRKSRC}/* ${APP_HOME} @${ECHO_MSG} " [ DONE ]" -.for f in ${CONF_FILES} +.for f in ${TOMCAT_CONF_FILES} . if !exists(${APP_HOME}/conf/${f}) @${CP} ${APP_HOME}/conf/${f}.${CONF_EXT} ${APP_HOME}/conf/${f} . else >Release-Note: >Audit-Trail: >Unformatted: