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