Upgrade to 1.2.18 and fix buiding with Apache 2.x.

PR:	96508, 97574

5 files changed, 24 insertions, 31 deletions

diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index 815f5e8611cf..c6b92cad6d62 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -6,52 +6,44 @@
 #
 
 PORTNAME=	mod_jk
-PORTVERSION=	1.2.15
+PORTVERSION=	1.2.18
 PORTREVISION=	0
 PORTEPOCH?=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	tomcat-connectors/jk/source/jk-${PORTVERSION:S/.1$//}
-DISTNAME=	jakarta-tomcat-connectors-${PORTVERSION}-src
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	tomcat/tomcat-connectors/jk/source/jk-${PORTVERSION}
+DISTNAME=	tomcat-connectors-${PORTVERSION}-src
 
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	Apache JK module for connecting to Tomcat using AJP1X
 
-USE_APACHE=	YES
+USE_APACHE=	1.3+
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/include/apache2/apr.h)
-WITH_APACHE2=	YES
-.endif
-
-.if defined(WITH_APACHE2)
+.if ${APACHE_VERSION} >= 20
 APACHE_VER=	2.0
-APACHE2=	2
-PLIST_SUB=	APACHE2=2
-PKGNAMESUFFIX=	-apache2
 .else
 APACHE_VER=	1.3
-APACHE2=
-PLIST_SUB=	APACHE2=
 .endif
 
-APACHE_CONF=	${LOCALBASE}/etc/apache${APACHE2}
-WRKSRC=		${WRKDIR}/jakarta-tomcat-connectors-${PORTVERSION}-src/jk/native
+WRKSRC=		${WRKDIR}/tomcat-connectors-${PORTVERSION}-src/native
 
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 
+PLIST_SUB=	APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR}
+
 do-install:
 	${APXS} -i -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
 	- ${APXS} -e -A -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so
-	${SED} -e "s#%%APACHE_CONF%%#${APACHE_CONF}#g" ${FILESDIR}/mod_jk.conf.sample \
+	${SED} -e "s#%%APACHE_CONF%%#${APACHEETCDIR}#g" ${FILESDIR}/mod_jk.conf.sample \
 		 > ${WRKDIR}/mod_jk.conf.sample
-	${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${APACHE_CONF}
-	${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${APACHE_CONF}
+	${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${PREFIX}/${APACHEETCDIR}
+	${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${PREFIX}/${APACHEETCDIR}
 
 post-install:
-	${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g"
+	${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g; s|etc/apache|etc/apache${APACHE2}|g"
 
 .include <bsd.port.post.mk>
diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo
index 4b91e183f2fc..a558d4f38b03 100644
--- a/www/mod_jk/distinfo
+++ b/www/mod_jk/distinfo
@@ -1,3 +1,3 @@
-MD5 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = b815a666329f7de097775113547539e0
-SHA256 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641
-SIZE (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = 722463
+MD5 (tomcat-connectors-1.2.18-src.tar.gz) = 58e1b9406e0cfe11bd4bc297ba146b4f
+SHA256 (tomcat-connectors-1.2.18-src.tar.gz) = 149de5bf40d4f7d29efaf3e61d401a74db93c1cf27e0053dd29a316db98ad311
+SIZE (tomcat-connectors-1.2.18-src.tar.gz) = 929823
diff --git a/www/mod_jk/files/mod_jk.conf.sample b/www/mod_jk/files/mod_jk.conf.sample
index c97545d64e9e..2c45d0e17f7a 100644
--- a/www/mod_jk/files/mod_jk.conf.sample
+++ b/www/mod_jk/files/mod_jk.conf.sample
@@ -3,8 +3,9 @@
 #
 <IfModule mod_jk.c>
 	JkWorkersFile %%APACHE_CONF%%/workers.properties
-	JkLogFile  logs/jk.log
-	JkLogLevel warn
+	JkLogFile  /var/log/jk.log
+	JkShmFile  /var/log/jk-runtime-status
+	JkLogLevel error
 
 	# Sample JkMounts.  Replace these with the paths you would
 	# like to mount from your JSP server.
diff --git a/www/mod_jk/pkg-message b/www/mod_jk/pkg-message
index 3b26184449a8..8ee47a2ad630 100644
--- a/www/mod_jk/pkg-message
+++ b/www/mod_jk/pkg-message
@@ -1,5 +1,5 @@
 *****************************************************************************
-Make sure mod_jk.so is enabled in /usr/local/etc/apache/httpd.conf and
+Make sure mod_jk.so is enabled in %%APACHEETCDIR%%/httpd.conf and
 mod_jk is configured.  Have a look at
-/usr/local/etc/apache/mod_jk.conf.sample for an example.
+%%APACHEETCDIR%%/mod_jk.conf.sample for an example.
 *****************************************************************************
diff --git a/www/mod_jk/pkg-plist b/www/mod_jk/pkg-plist
index afb948c7a038..c3a672d6cc94 100644
--- a/www/mod_jk/pkg-plist
+++ b/www/mod_jk/pkg-plist
@@ -1,5 +1,5 @@
-etc/apache%%APACHE2%%/mod_jk.conf.sample
-etc/apache%%APACHE2%%/workers.properties.sample
-libexec/apache%%APACHE2%%/mod_jk.so
+%%APACHEETCDIR%%/mod_jk.conf.sample
+%%APACHEETCDIR%%/workers.properties.sample
+%%APACHEMODDIR%%/mod_jk.so
 @exec %D/sbin/apxs -e -A -n jk %f || true
 @unexec %D/sbin/apxs -e -A -n jk %f || true