aboutsummaryrefslogtreecommitdiffstats
path: root/www/tomcat7
diff options
context:
space:
mode:
authorcrees <crees@FreeBSD.org>2011-06-12 21:57:25 +0800
committercrees <crees@FreeBSD.org>2011-06-12 21:57:25 +0800
commite05ecc12868a226dbf0cc3511f90aaa191c03330 (patch)
tree7ff6da855d8faccc3091ad0e4bca0b9db5594df5 /www/tomcat7
parentcee9a847e56e0f7d889e39c6d414a347bdb11f5c (diff)
downloadfreebsd-ports-gnome-e05ecc12868a226dbf0cc3511f90aaa191c03330.tar.gz
freebsd-ports-gnome-e05ecc12868a226dbf0cc3511f90aaa191c03330.tar.zst
freebsd-ports-gnome-e05ecc12868a226dbf0cc3511f90aaa191c03330.zip
- Rename CONF_FILES to avoid conflict with incoming feature
PR: 157166 Approved by: rene (mentor), ale (maintainer timeout, 25 days)
Diffstat (limited to 'www/tomcat7')
-rw-r--r--www/tomcat7/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index 6361acc1ccf7..2345c780c6ec 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -28,7 +28,7 @@ USE_RC_SUBR= ${APP_SHORTNAME}
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 @@ pre-patch:
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 @@ do-install:
@${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
s'>+10 * Update to 2.8.5bland2006-01-042-4/+4 * Update to 2.8.4.marcus2005-11-162-3/+4 * Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixesmarcus2005-11-055-20/+25 * Update to 2.6.6.marcus2005-08-023-4/+6 * Fix patch name.jylefort2005-07-211-0/+0 * Fix memory leaks when G_ERRORCHECK_MUTEXES is used:jylefort2005-07-214-0/+267 * Fix patchingkwm2005-06-111-10/+10 * Update to 2.6.5.kwm2005-06-112-3/+3 * FreeBSD 504101 doesn't need the stacksize hack anymore, which marcus hasmezz2005-05-161-1/+1 * Update to 2.6.4.marcus2005-04-074-12/+15 * Presenting GNOME 2.10 for FreeBSD!marcus2005-03-126-37/+89 * Update MASTER_SITES for 2.3 -> 2.4.mezz2004-12-241-1/+1 * Clean up handling of locale directories at deinstall-time:kris2004-12-161-0/+6 * Update to 2.4.8.marcus2004-12-032-3/+3 * Update to 2.4.7.marcus2004-10-123-4/+5 * Fix a threading portability problem in which g_mutex_trylock_posix_impl() didmarcus2004-09-152-2/+12 * Update to 2.4.6bland2004-08-133-3/+4 * Update to 2.4.5.mezz2004-07-313-4/+4 * Remove the previous thread stack size hack, and add a slightly better one.marcus2004-07-283-14/+37 * Correct a patch that marcus has made a simple mistake with the path.mezz2004-07-251-2/+2 * Hack the default stack size for threads created with g_thread_create() tomarcus2004-07-252-0/+12 * Apply a big libtool patch to allow porters to use the libtool installed bymarcus2004-07-101-1/+1 * Update to 2.4.4bland2004-07-094-12/+5 * Update to 2.4.2bland2004-06-053-5/+5 * - Remove GNOME 2.4 -> 2.6 upgrade warning. It served it's purpose.pav2004-05-151-13/+0 * Fix a botch patch in the 2.4.1 update that resulted in the wrong PTHREAD_LIBSmarcus2004-05-052-6/+7 * * Update to 2.4.1marcus2004-05-014-11/+14 * Point users to the 2.4-to-2.6 upgrade FAQ instead of the devel FAQ.marcus2004-04-071-1/+1 * Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best releasemarcus2004-04-056-49/+58 * - Add SIZE to GNOME portspav2004-03-181-0/+1