diff options
| author | znerd <znerd@FreeBSD.org> | 2002-04-16 19:27:50 +0000 |
|---|---|---|
| committer | znerd <znerd@FreeBSD.org> | 2002-04-16 19:27:50 +0000 |
| commit | 6aff4adc7adc333c5295e335b3877df212852cd7 (patch) | |
| tree | 066c6305e55aabfdf285b0f1c1ffb12231d5d533 /www/mod_jk | |
| parent | c9c441c6cfa15199c3108f10a3e63420fe414a67 (diff) | |
| download | FreeBSD-ports-6aff4adc7adc333c5295e335b3877df212852cd7.zip FreeBSD-ports-6aff4adc7adc333c5295e335b3877df212852cd7.tar.gz | |
Using USE_JAVA. Supporting the setting of APACHE_PORT. This
has not been tested with Apache 2.0 though.
Looks for the right Tomcat JAR file. Since Tomcat 3.3
${TOMCAT_HOME}/lib/webserver.jar no longer exists.
Moved the file replacements (using ${SED}) from post-extract
to post-patch.
Changed the mod_jk.conf file to point to the right location
for the workers.properties file.
Bumped PORTREVISION.
Diffstat (limited to 'www/mod_jk')
| -rw-r--r-- | www/mod_jk/Makefile | 14 | ||||
| -rw-r--r-- | www/mod_jk/files/mod_jk.conf | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile index fc47e91..1cf02c2 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 6b1bb84..1a7c0e0 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 |
