update to jakarta-tomcat 3.2.4

This commit is contained in:
reinhard 2002-03-12 12:57:28 +00:00
parent a43f40dcb3
commit d8b5eee351
5 changed files with 37 additions and 39 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2002/01/05 15:28:09 reinhard Exp $
# $OpenBSD: Makefile,v 1.2 2002/03/12 12:57:28 reinhard Exp $
COMMENT= "java servlet 2.2 and java server pages 1.1 server"
V= 3.2.3
V= 3.2.4
DISTNAME= jakarta-tomcat-${V}
CATEGORIES= www
NEED_VERSION= 1.499
NEED_VERSION= 1.504
MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${V}/bin/
EXTRACT_SUFX= .zip
@ -15,7 +15,7 @@ MAINTAINER= Reinhard J. Sammer <reinhard@openbsd.org>
JDK_VERSION= 1.2-blackdown
JAVA_HOME= ${LOCALBASE}/jdk${JDK_VERSION}
RUN_DEPENDS= :jdk-blackdown-*:devel/jdk/${JDK_VERSION}
RUN_DEPENDS= :jdk-blackdown-1.2:devel/jdk/${JDK_VERSION}
# Apache Software License
PERMIT_PACKAGE_CDROM= Yes
@ -28,7 +28,7 @@ NO_REGRESS= Yes
WRKSRC= ${WRKDIR}/${DISTNAME}
DIRS= bin conf doc lib logs src webapps
DIRS= bin conf doc lib logs src webapps
CONFDIR= /etc/tomcat
TOMCATDIR= /var/tomcat
SUBST_VARS= TOMCATDIR CONFDIR
@ -37,6 +37,7 @@ post-patch:
@perl -pi -e 's|JAVA_HOME|${JAVA_HOME}|g' ${WRKSRC}/conf/workers.properties
@perl -pi -e 's|TOMCATDIR|${TOMCATDIR}|g' ${WRKSRC}/bin/tomcat.sh
@perl -pi -e 's|PREFIX|${PREFIX}|g' ${WRKSRC}/bin/tomcat.sh
@cd ${WRKDIST}/conf && perl -pi -e 's,^M,,g' *
do-install:
@${INSTALL_DATA_DIR} ${PREFIX}/tomcat

View File

@ -1,3 +1,3 @@
MD5 (jakarta-tomcat-3.2.3.zip) = 00000ef43e59d1029fb60964bad5face
RMD160 (jakarta-tomcat-3.2.3.zip) = cb21115fe53a2d23320bc0304b6d25a5b2c5ebdc
SHA1 (jakarta-tomcat-3.2.3.zip) = 06e57f6ca519e5e6429a37d498c4f2a3aad8322f
MD5 (jakarta-tomcat-3.2.4.zip) = df53110502556ceeab2e57702d50c8d2
RMD160 (jakarta-tomcat-3.2.4.zip) = 12deb9703e8ea3e073733bc486f6a64118196240
SHA1 (jakarta-tomcat-3.2.4.zip) = 3eb5b73d9c060674b1a34e44795388fe24ab29c0

View File

@ -1,28 +1,28 @@
$OpenBSD: patch-conf_workers_properties,v 1.1.1.1 2002/01/05 15:28:09 reinhard Exp $
--- conf/workers.properties.orig Tue Dec 12 22:36:26 2000
+++ conf/workers.properties Fri May 18 15:24:26 2001
$OpenBSD: patch-conf_workers_properties,v 1.2 2002/03/12 12:57:28 reinhard Exp $
--- conf/workers.properties.orig Tue Nov 20 16:43:26 2001
+++ conf/workers.properties Fri Mar 1 12:00:12 2002
@@ -40,20 +40,20 @@
# installed tomcat. This is where you have your conf, webapps and lib
# directories.
#
-workers.tomcat_home=c:\jakarta-tomcat
# installed tomcat. This is where you have your conf, webapps and lib
# directories.
#
-workers.tomcat_home=c:\jakarta-tomcat
+workers.tomcat_home=/var/tomcat
#
# workers.java_home should point to your Java installation. Normally
# you should have a bin and lib directories beneath it.
#
-workers.java_home=c:\jdk1.2.2
#
# workers.java_home should point to your Java installation. Normally
# you should have a bin and lib directories beneath it.
#
-workers.java_home=c:\jdk1.2.2
+workers.java_home=JAVA_HOME
#
# You should configure your environment slash... ps=\ on NT and / on UNIX
# and maybe something different elsewhere.
#
-ps=\
-# ps=/
+#ps=\
+ps=/
#
#------ ADVANCED MODE ------------------------------------------------
#
# You should configure your environment slash... ps=\ on NT and / on UNIX
# and maybe something different elsewhere.
#
-ps=\
-# ps=/
+#ps=\
+ps=/
#
#------ ADVANCED MODE ------------------------------------------------

View File

@ -1,12 +1,9 @@
For detailed instructions on how to run Tomcat see:
${PREFIX}/tomcat/doc/uguide/tomcat_ug.html
For more information on application development with Tomcat, see
${PREFIX}/tomcat/doc/appdev/index.html
Note that tomcat may be started with the following command:
${PREFIX}/tomcat/bin/startup.sh

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2002/01/05 15:28:10 reinhard Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/03/12 12:57:28 reinhard Exp $
tomcat/LICENSE
tomcat/bin/ant
tomcat/bin/antRun
@ -65,9 +65,9 @@ tomcat/doc/uguide/tomcat-security-unix.html
tomcat/doc/uguide/tomcat-security.html
tomcat/doc/uguide/tomcat_ug.html
tomcat/lib/ant.jar
tomcat/lib/crimson.jar
tomcat/lib/jasper.jar
tomcat/lib/jaxp.jar
tomcat/lib/parser.jar
tomcat/lib/servlet.jar
tomcat/lib/test/Golden/Err.txt
tomcat/lib/test/Golden/ForwardWithQuery.txt
@ -402,7 +402,7 @@ tomcat/webapps/test.war
@dirrm tomcat/doc/appdev/sample/web/images
@dirrm tomcat/doc/appdev/sample/web
@dirrm tomcat/doc/appdev/sample/src
@dirrm tomcat/doc/appdev/sample/etc
@dirrm tomcat/doc/appdev/sample${SYSCONFDIR}
@dirrm tomcat/doc/appdev/sample
@dirrm tomcat/doc/appdev
@dirrm tomcat/doc