summaryrefslogtreecommitdiff
path: root/www/jakarta-tomcat
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-01-29 11:34:21 +0000
committerwiz <wiz@pkgsrc.org>2001-01-29 11:34:21 +0000
commitb979f7222ad9bade13f010cd27e5bc6afab1681c (patch)
tree86f14acd24842161759a420487862022044c2b4b /www/jakarta-tomcat
parent6a13219ca89e5dae86f27159ff86006058c06859 (diff)
downloadpkgsrc-b979f7222ad9bade13f010cd27e5bc6afab1681c.tar.gz
Add automatic ${VARIABLE} handling for MESSAGE files.
Convert most MESSAGE files to new syntax (${VARIABLE} gets replaced, not @VARIABLE@, nor @@VARIABLE@@). By default, substitutions are done for LOCALBASE, PKGNAME, PREFIX, X11BASE, X11PREFIX; additional patterns can be added via MESSAGE_SUBST. Clean up some packages while I'm there; add RCS tags to most MESSAGEs. Remove some uninteresting MESSAGEs.
Diffstat (limited to 'www/jakarta-tomcat')
-rw-r--r--www/jakarta-tomcat/Makefile8
-rw-r--r--www/jakarta-tomcat/pkg/MESSAGE11
2 files changed, 8 insertions, 11 deletions
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 52481c59c34..828184131b6 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/12/13 03:49:30 jwise Exp $
+# $NetBSD: Makefile,v 1.12 2001/01/29 11:34:46 wiz Exp $
DISTNAME= jakarta-tomcat.src
PKGNAME= jakarta-tomcat-3.1.1
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/jakarta-tomcat-3.1.1-src
JAKARTA_HOME= ${PREFIX}/jakarta
MAKE_ENV+= JAVA_HOME=${JAVA_HOME}
-MESSAGE_FILE= ${WRKDIR}/MESSAGE
+MESSAGE_SUBST+= TOMCAT_HOME=${JAKARTA_HOME}
post-patch:
${SED} -e s,@JAKARTA_HOME@,${JAKARTA_HOME},g \
@@ -34,10 +34,6 @@ do-build:
cd ${WRKSRC}/../jakarta-ant && ${SH} bootstrap.sh
cd ${WRKSRC} && ${SH} ./build.sh
-post-build:
- ${SED} 's,@TOMCAT_HOME@,${JAKARTA_HOME}/tomcat,g' \
- < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
-
do-install:
${MKDIR} ${JAKARTA_HOME}/tomcat
cd ${WRKSRC} && ${SH} ./build.sh dist
diff --git a/www/jakarta-tomcat/pkg/MESSAGE b/www/jakarta-tomcat/pkg/MESSAGE
index d17cec029f8..0467bd3d91f 100644
--- a/www/jakarta-tomcat/pkg/MESSAGE
+++ b/www/jakarta-tomcat/pkg/MESSAGE
@@ -1,16 +1,17 @@
-=============================================================
+======================================================================
+$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:46 wiz Exp $
For detailed instructions on how to run Tomcat, either as a
standalone server or in conjunction with Apache (using the
www/ap-jserv package), see:
- @TOMCAT_HOME@/doc/uguide/tomcat_ug.html
+ ${TOMCAT_HOME}/doc/uguide/tomcat_ug.html
-For more information on application development with Tomcat
+For more information on application development with Tomcat, see
- @TOMCAT_HOME@/doc/appdev/index.html
+ ${TOMCAT_HOME}/doc/appdev/index.html
Note also that in order for Tomcat to start up, ${JAVA_HOME}
must point to your JVM installation.
-=============================================================
+======================================================================