summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2003-11-20 23:41:09 +0000
committerGreg Lewis <glewis@FreeBSD.org>2003-11-20 23:41:09 +0000
commit9ec05ac2e37b466c9b67d11bda8386b84bfc0700 (patch)
tree1eb3f47dbd7c5f54cb9d2b7e02dfbf25bcd4c92e
parentForce to use gcc2.95. Fix configuration problems, too. (diff)
. Use the newer, more simplified APACHE dependency handling.
Submitted by: Palle Girgensohn <girgen@pingpong.net> (maintainer)
Notes
Notes: svn path=/head/; revision=94578
-rw-r--r--www/mod_jk/Makefile11
1 files changed, 4 insertions, 7 deletions
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index 1053eb5d8ce5..8646b2ffce64 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -16,15 +16,15 @@ DISTNAME= jakarta-tomcat-connectors-jk-${PORTVERSION}-src
MAINTAINER= girgen@pingpong.net
COMMENT= Apache JK module for connecting to Tomcat using AJP1X
+USE_APACHE= YES
+
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/include/apache2/apr.h)
-APACHE_PORT?= ${PORTSDIR}/www/apache2
-.else
-APACHE_PORT?= ${PORTSDIR}/www/apache13
+WITH_APACHE2= YES
.endif
-.if ${APACHE_PORT:S/${PORTSDIR}\///} == "www/apache2"
+.if defined(WITH_APACHE2)
APACHE_VER= 2.0
APACHE2= 2
PLIST_SUB= APACHE2=2
@@ -35,9 +35,6 @@ APACHE2=
PLIST_SUB= APACHE2=
.endif
-BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT}
-RUN_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT}
-
APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2}
WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native