aboutsummaryrefslogtreecommitdiff
path: root/www/mod_jk
diff options
context:
space:
mode:
authorErnst de Haan <znerd@FreeBSD.org>2002-04-16 19:27:50 +0000
committerErnst de Haan <znerd@FreeBSD.org>2002-04-16 19:27:50 +0000
commit7ca01b048033af4ade37af5af2af09c6e4c020ab (patch)
tree451e8bb4e78fc272a2c8b805352f8968fb60a9a9 /www/mod_jk
parent0a2bad5a69baa1e1faa06e39ecc3bf4c480298d6 (diff)
downloadports-7ca01b048033af4ade37af5af2af09c6e4c020ab.tar.gz
ports-7ca01b048033af4ade37af5af2af09c6e4c020ab.zip
Notes
Diffstat (limited to 'www/mod_jk')
-rw-r--r--www/mod_jk/Makefile14
-rw-r--r--www/mod_jk/files/mod_jk.conf2
2 files changed, 8 insertions, 8 deletions
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index fc47e917b374..1cf02c234afc 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mod_jk
PORTVERSION= 3.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://jakarta.apache.org/Builds/jakarta-tomcat/release/v${PORTVERSION}/src/ \
http://www.metaverse.nl/~ernst/ \
@@ -17,23 +17,23 @@ DISTNAME= jakarta-tomcat-${PORTVERSION}-src
MAINTAINER= znerd@FreeBSD.org
-BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 \
- ${JAVA_HOME}/bin/javac:${JAVA_PORT}
-RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 \
- ${TOMCAT_HOME}/lib/webserver.jar:${PORTSDIR}/www/jakarta-tomcat3
+BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
+RUN_DEPENDS= ${APXS}:${APACHE_PORT} \
+ ${TOMCAT_HOME}/lib/tomcat.jar:${PORTSDIR}/www/jakarta-tomcat3
USE_GMAKE= YES
+USE_JAVA= 1.2+
MAKEFILE= Makefile.freebsd
WRKSRC= ${WRKDIR}/jakarta-tomcat-${PORTVERSION}-src/src/native/mod_jk/apache1.3
APXS?= ${LOCALBASE}/sbin/apxs
-JAVA_HOME?= ${LOCALBASE}/jdk1.3.1
-JAVA_PORT?= ${PORTSDIR}/java/jdk13
APACHE_PORT?= ${PORTSDIR}/www/apache13
TOMCAT_HOME?= ${LOCALBASE}/jakarta-tomcat${PORTVERSION}
post-extract:
${MV} ${WRKSRC}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd.orig
+
+post-patch:
${SED} \
-e "s#%%APXS%%#${APXS}#g" \
-e "s#%%JAVA_HOME%%#${JAVA_HOME}#g" \
diff --git a/www/mod_jk/files/mod_jk.conf b/www/mod_jk/files/mod_jk.conf
index 6b1bb84b6f16..1a7c0e04a3d6 100644
--- a/www/mod_jk/files/mod_jk.conf
+++ b/www/mod_jk/files/mod_jk.conf
@@ -1,5 +1,5 @@
<IfModule mod_jk.c>
- JkWorkersFile %%TOMCAT_HOME%%/conf/workers.properties
+ JkWorkersFile %%TOMCAT_HOME%%/conf/jk/workers.properties
JkLogFile logs/jk.log
JkLogLevel warn
JkMount /*.jsp ajp12