Update mod_jk to 1.2.4 & add optional apache2 building

	This update updates mod_jk to 1.2.4 and optionally creates
	an apache2 module, if APACHE_PORT is set to ${PORTSDIR}/www/apache2

	As a separate PR, I send a new slave port that will hopefully
	see to it that there's a package at your favourite package
	site for both versions of apache.

PR:		ports/56657
Submitted by:	Palle Girgensohn <girgen@pingpong.net>

4 files changed, 39 insertions, 12 deletions

diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index 903641181a16..b4ad691c5026 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mod_jk
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.4
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
@@ -14,14 +14,31 @@ MASTER_SITE_SUBDIR=	jakarta-tomcat-connectors/jk/release/v${PORTVERSION}/src
 DISTNAME=	jakarta-tomcat-connectors-jk-${PORTVERSION}-src
 
 MAINTAINER=	girgen@pingpong.net
-COMMENT=	Apache JK module for Tomcat
+COMMENT=	Apache JK module for connecting to Tomcat using AJP1X
+
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/include/apache2/apr.h)
+APACHE_PORT?=	${PORTSDIR}/www/apache2
+.else
+APACHE_PORT?=	${PORTSDIR}/www/apache13
+.endif
+
+.if ${APACHE_PORT:S/${PORTSDIR}\///} == "www/apache2"
+APACHE_VER=	2.0
+APACHE2=	2
+PLIST_SUB=	APACHE2=2
+PKGNAMESUFFIX=	-apache2
+.else
+APACHE_VER=	1.3
+APACHE2=
+PLIST_SUB=	APACHE2=
+.endif
 
-PATCH_DEPENDS=	${AUTOMAKE}:${PORTSDIR}/devel/automake
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
 APXS=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 APACHE_CONF=	${LOCALBASE}/etc/apache${APACHE2}
 WRKSRC=		${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
 
@@ -32,9 +49,8 @@ USE_AUTOMAKE_VER=	15
 AUTOMAKE_ARGS=	--add-missing
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
-APACHE2?=
-APACHE_VER?=	1.3
-PLIST_SUB=	APACHE2=${APACHE2}
+
+pre-patch:	build-depends
 
 post-patch:
 	cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE}
@@ -48,4 +64,4 @@ do-install:
 post-install:
 	${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo
index 70f093b40d65..f64a63c8b8c2 100644
--- a/www/mod_jk/distinfo
+++ b/www/mod_jk/distinfo
@@ -1 +1 @@
-MD5 (jakarta-tomcat-connectors-jk-1.2.3-src.tar.gz) = 4c2c2a4e6a6ad8a912afaffbff173227
+MD5 (jakarta-tomcat-connectors-jk-1.2.4-src.tar.gz) = 9641a826b87e64692377161215cfd5e1
diff --git a/www/mod_jk/files/patch-common::jk_mt-h b/www/mod_jk/files/patch-common::jk_mt-h
new file mode 100644
index 000000000000..16fa29736d8a
--- /dev/null
+++ b/www/mod_jk/files/patch-common::jk_mt-h
@@ -0,0 +1,11 @@
+--- common/jk_mt.h~	Thu Jun  6 03:23:25 2002
++++ common/jk_mt.h	Wed Sep 10 01:22:36 2003
+@@ -70,7 +70,7 @@
+  * All WIN32 code is MT, UNIX code that uses pthreads is marked by the POSIX 
+  * _REENTRANT define.
+  */
+-#if defined (WIN32) || defined(_REENTRANT)
++#if defined (WIN32) || ( defined(FREEBSD_THREAD_HACK) && defined(_THREAD_SAFE) )
+ 
+     /*
+      * Marks execution under MT compilation
diff --git a/www/mod_jk/files/patch-configure.in b/www/mod_jk/files/patch-configure.in
index 67a42809dd45..5d2786974811 100644
--- a/www/mod_jk/files/patch-configure.in
+++ b/www/mod_jk/files/patch-configure.in
@@ -1,11 +1,11 @@
---- configure.in.orig	Tue Dec 17 05:20:55 2002
-+++ configure.in	Thu Apr 10 13:18:40 2003
+--- configure.in.orig	Thu Jun  5 15:18:04 2003
++++ configure.in	Fri Sep  5 17:06:25 2003
 @@ -102,7 +102,7 @@
                  WEBSERVER="apache-2.0"
                	APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS`"
                	APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
 -                APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk
 +                APACHE_CONFIG_VARS=${prefix}/share/apache2/build/config_vars.mk
+                 LIBTOOL=`$APXS -q LIBTOOL`
              fi
              AC_MSG_RESULT([building connector for \"$WEBSERVER\"])
-