summaryrefslogtreecommitdiff
path: root/www/jakarta-tomcat5
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-12-05 20:49:47 +0000
committerrillig <rillig@pkgsrc.org>2005-12-05 20:49:47 +0000
commitb71a1d488b6b45e0a968a4c149990c25b6a09215 (patch)
treedac5b1dd14794d86b061d26b9503adb2552ed3f8 /www/jakarta-tomcat5
parent624eed58928f83676fbd7ca01a5f6974bb2cce2a (diff)
downloadpkgsrc-b71a1d488b6b45e0a968a4c149990c25b6a09215.tar.gz
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some other changes are outlined in http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'www/jakarta-tomcat5')
-rw-r--r--www/jakarta-tomcat5/Makefile8
1 files changed, 2 insertions, 6 deletions
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index a5d8ef05a00..cb058f26aae 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:12 rillig Exp $
PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION}
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
@@ -42,13 +42,11 @@ CONF_FILES= # empty
.for f in ${CFILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
.for f in ${CF2FILES}
CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f}
.endfor
-.undef f
-FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME} TOMCAT_LIB=${TOMCAT_LIB}
+FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
do-build:
@${MV} ${WRKSRC}/conf ${WRKDIR}
@@ -57,11 +55,9 @@ do-install:
.for f in ${CFILES}
${INSTALL_DATA} ${WRKDIR}/conf/${f} ${EGDIR}
.endfor
-.undef f
.for f in ${CF2FILES}
${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2}
.endfor
-.undef f
${INSTALL_DATA_DIR} ${TOMCAT_LIB}
@(cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB}; \
${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \