Date: Wed, 18 May 2011 19:48:03 GMT From: Chris Rees <utisoft@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/157165: Fix port: www/tomcat6 uses CONF_FILES internally Message-ID: <201105181948.p4IJm3bx032968@red.freebsd.org> Resent-Message-ID: <201105181950.p4IJoDoo033986@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105181948.p4IJm3bx032968>