Attachment #35013 for bug #56661

View | Details | Raw Unified | Return to bug 56661
Collapse All | Expand All




# New ports collection makefile for:	mod_jk2
# Date created:				Thu May 29 01:24:15 CEST 2003
# Whom:					Palle Girgensohn <girgen@pingpong.net>
#
# $FreeBSD$
#

PORTNAME=	mod_jk2
PORTVERSION=	2.0.4
CATEGORIES=	www
MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD:S/httpd/jakarta/}
MASTER_SITE_SUBDIR=	tomcat-4/source
DISTVERSION=	4.1.27
DISTNAME=	jakarta-tomcat-connectors-${DISTVERSION}-src
# The version numbers are a real mess, but hey, it's not my fault. The
# distributions of tomcat are *really* messy.  The mod_jk2 is
# distributed with tomcat-xxx, but does not share its version
# numbering.  There is also a separate dist, but it seems to have been
# left to die without further comments...

MAINTAINER=	girgen@pingpong.net
COMMENT=	Apache JK2 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

BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
RUN_DEPENDS=	${APXS}:${APACHE_PORT}

APXS=		${LOCALBASE}/sbin/apxs
APACHE_CONF=	${LOCALBASE}/etc/apache${APACHE2}
WRKSRC=		${WRKDIR}/jakarta-tomcat-connectors-${DISTVERSION}-src/jk/native2
WRKSRC=		${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native

USE_GMAKE=	YES
USE_LIBTOOL=	YES
USE_AUTOCONF_VER=	253
USE_AUTOMAKE_VER=	15
AUTOMAKE_ARGS=	--add-missing
GNU_CONFIGURE=	YES
CONFIGURE_ARGS+=	--with-apxs${APACHE2}=${APXS}
ALL_TARGET=	jk2-build-apxs

pre-patch:	build-depends

post-patch:
	cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE}

do-install:
	cd ${WRKSRC}/server/${APACHE_PORT:C/.*(apache[0-9]*).*/\1/} ;\
		${GMAKE} -f Makefile.apxs install ;\
		${APXS} -e -A -n jk2 mod_jk2.so
	${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${APACHE_CONF}

.include <bsd.port.post.mk>

Line 1 Link Here

(-)mod_jk2/distinfo (-1 / +1 lines)
1	MD5 (jakarta-tomcat-connectors-jk-1.2.2-src.tar.gz) = 5e9e76f538d2dbd28d4e1d4f42145ab9	1	MD5 (jakarta-tomcat-connectors-4.1.27-src.tar.gz) = 3dd9a39f008427dafe19be4a14464442

Lines 1-5 Link Here

(-)mod_jk2/pkg-descr (-3 / +2 lines)
1	mod_jk is a replacement to the elderly mod_jserv. It is a completely	1	mod_jk2 handles the communication between Tomcat and Apache.
2	new Tomcat-Apache plugin that handles the communication between	2	JK2 is a refactoring of JK and is much more powerful.
3	Tomcat and Apache.
4		3
5	WWW: http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/jk/aphowto.html	4	WWW: http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/jk/aphowto.html

Lines 1-5 Link Here

(-)mod_jk2/pkg-plist (-5 / +3 lines)
1	etc/apache2/mod_jk.conf.sample	1	libexec/apache%%APACHE2%%/mod_jk2.so
2	etc/apache2/workers.properties.sample	2	@exec %D/sbin/apxs -e -A -n jk2 %f
3	libexec/apache2/mod_jk.so	3	@unexec %D/sbin/apxs -e -A -n jk2 %f
4	@exec %D/sbin/apxs -e -A -n jk %f
5	@unexec %D/sbin/apxs -e -A -n jk %f




The apache mod_jk modules *communicate* with Java using an internet
protocol, AJP13, but they are written in C.  I can't come up with any
reason to look for a JDK here, it's plain stupid! Since apache and
tomcat can be run on separate machines, there is no dependency
whatsoever... /Palle

--- configure.in~	Wed Mar 19 10:21:04 2003
+++ configure.in	Thu May 29 01:50:48 2003
@@ -184,10 +184,10 @@
 
 dnl Java settings
 
-JK_JDK()
-JK_JDK_OS()
-JK_JNI()
-JK_PCRE()
+dnl JK_JDK()
+dnl JK_JDK_OS()
+dnl JK_JNI()
+dnl JK_PCRE()
 
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JAVA_PLATFORM)




--- server/apache13/Makefile.apxs.in.orig	Wed Mar 19 10:21:04 2003
+++ server/apache13/Makefile.apxs.in	Wed Jun 18 03:10:02 2003
@@ -18,7 +18,10 @@
 all: mod_jk2.so
 
 mod_jk2.so: 
-	$(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}" mod_jk2.c ${COMMON_C_FILES} 
+	$(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}" jk_service_apache13.c mod_jk2.c ${COMMON_C_FILES} 
+
+install:
+	$(APXS) -i mod_jk2.so
 
 clean:
 	rm -f *.o *.so

Added Link Here

(-)mod_jk2/files/patch-common::jk_mutex_thread_c (+11 lines)
1	--- common/jk_mutex_thread.c~ Thu Jul 31 19:30:38 2003
2	+++ common/jk_mutex_thread.c Wed Sep 10 01:37:29 2003
3	@@ -159,7 +159,7 @@
4	}
5
6
7	-#elif defined( _REENTRANT )
8	+#elif defined( _THREAD_SAFE ) && defined( FREEBSD_THREAD_HACK )
9	/-------------------- PThread - @deprecated, use APR if possible -------------------- /
10
11	#include <pthread.h>




--- include/jk_mutex.h~	Thu Jul 31 19:30:40 2003
+++ include/jk_mutex.h	Wed Sep 10 01:33:27 2003
@@ -76,7 +76,7 @@
 #include "apr_thread_mutex.h"
 #elif defined( WIN32 )
 #include <windows.h>
-#elif defined( _REENTRANT )
+#elif defined( _THREAD_SAFE ) && defined ( FREEBSD_THREAD_HACK )
 #include <pthread.h>
 #endif
 
@@ -122,7 +122,7 @@
     apr_thread_mutex_t *threadMutex;
 #elif defined( WIN32 )
     CRITICAL_SECTION threadMutex;
-#elif defined( _REENTRANT )
+#elif defined( _THREAD_SAFE ) && defined ( FREEBSD_THREAD_HACK )
     pthread_mutex_t threadMutex;
 #else
     void *threadMutex;

Return to bug 56661

Lines 1-40 Link Here

(-)mod_jk2/Makefile (-25 / +54 lines)
1	# New ports collection makefile for: mod_jk	1	# New ports collection makefile for: mod_jk2
2	# Date created: Thu Apr 10 15:14:37 EDT 2003	2	# Date created: Thu May 29 01:24:15 CEST 2003
3	# Whom: Larry Lansing <lansil@fuzzynerd.com>	3	# Whom: Palle Girgensohn <girgen@pingpong.net>
4	#	4	#
5	# $FreeBSD: ports/www/mod_jk2/Makefile,v 1.1 2003/06/06 12:59:19 edwin Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= mod_jk	8	PORTNAME= mod_jk2
9	PORTVERSION= 1.2.2	9	PORTVERSION= 2.0.4
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}	11	MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD:S/httpd/jakarta/}
12	MASTER_SITE_SUBDIR= jakarta-tomcat-connectors/jk/release/v${PORTVERSION}/src	12	MASTER_SITE_SUBDIR= tomcat-4/source
13	PKGNAMESUFFIX= -apache2	13	DISTVERSION= 4.1.27
14	DISTNAME= jakarta-tomcat-connectors-jk-${PORTVERSION}-src	14	DISTNAME= jakarta-tomcat-connectors-${DISTVERSION}-src
		15	# The version numbers are a real mess, but hey, it's not my fault. The
		16	# distributions of tomcat are really messy. The mod_jk2 is
		17	# distributed with tomcat-xxx, but does not share its version
		18	# numbering. There is also a separate dist, but it seems to have been
		19	# left to die without further comments...
		20
		21	MAINTAINER= girgen@pingpong.net
		22	COMMENT= Apache JK2 module for connecting to Tomcat using AJP1X
15		23
16	MAINTAINER= lansil@fuzzynerd.com	24	.include <bsd.port.pre.mk>
17	COMMENT= Apache 2.0 module for Tomcat	25
		26	.if exists(${LOCALBASE}/include/apache2/apr.h)
		27	APACHE_PORT?= ${PORTSDIR}/www/apache2
		28	.else
		29	APACHE_PORT?= ${PORTSDIR}/www/apache13
		30	.endif
		31
		32	.if ${APACHE_PORT:S/${PORTSDIR}\///} == "www/apache2"
		33	APACHE_VER= 2.0
		34	APACHE2= 2
		35	PLIST_SUB= APACHE2=2
		36	PKGNAMESUFFIX= -apache2
		37	.else
		38	APACHE_VER= 1.3
		39	APACHE2=
		40	PLIST_SUB= APACHE2=
		41	.endif
18		42
19	BUILD_DEPENDS= ${APXS}:${APACHE_PORT}	43	BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
20	RUN_DEPENDS= ${APXS}:${APACHE_PORT}	44	RUN_DEPENDS= ${APXS}:${APACHE_PORT}
21		45
22	APXS?= ${PREFIX}/sbin/apxs	46	APXS= ${LOCALBASE}/sbin/apxs
23	APACHE_PORT?= ${PORTSDIR}/www/apache2	47	APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2}
24	APACHE_CONF= ${PREFIX}/etc/apache2	48	WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-${DISTVERSION}-src/jk/native2
25	WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native
26		49
27	USE_GMAKE= YES	50	USE_GMAKE= YES
28	USE_LIBTOOL= YES	51	USE_LIBTOOL= YES
29	USE_AUTOCONF= YES	52	USE_AUTOCONF_VER= 253
30	USE_AUTOMAKE= YES	53	USE_AUTOMAKE_VER= 15
31	HAS_CONFIGURE= YES	54	AUTOMAKE_ARGS= --add-missing
32	CONFIGURE_ARGS+= --with-apxs=${APXS}	55	GNU_CONFIGURE= YES
		56	CONFIGURE_ARGS+= --with-apxs${APACHE2}=${APXS}
		57	ALL_TARGET= jk2-build-apxs
		58
		59	pre-patch: build-depends
		60
		61	post-patch:
		62	cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE}
33		63
34	do-install:	64	do-install:
35	${APXS} -i -A -n jk ${WRKSRC}/apache-2.0/mod_jk.so	65	cd ${WRKSRC}/server/${APACHE_PORT:C/.(apache[0-9]).*/\1/} ;\
36	${SED} -e "s#%%APACHE_CONF%%#${APACHE_CONF}#g" ${FILESDIR}/mod_jk.conf.sample > ${WRKDIR}/mod_jk.conf.sample	66	${GMAKE} -f Makefile.apxs install ;\
37	${INSTALL_DATA} ${WRKDIR}/mod_jk.conf.sample ${APACHE_CONF}	67	${APXS} -e -A -n jk2 mod_jk2.so
38	${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${APACHE_CONF}
39		68
40	.include <bsd.port.mk>	69	.include <bsd.port.post.mk>

Lines 1-12 Link Here

(-)mod_jk2/files/patch-configure.in (-12 / +23 lines)
1	--- configure.in.orig Thu Sep 4 05:05:30 2003	1	The apache mod_jk modules communicate with Java using an internet
2	+++ configure.in Thu Sep 4 05:06:25 2003	2	protocol, AJP13, but they are written in C. I can't come up with any
3	@@ -102,7 +102,8 @@	3	reason to look for a JDK here, it's plain stupid! Since apache and
4	WEBSERVER="apache-2.0"	4	tomcat can be run on separate machines, there is no dependency
5	APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS`"	5	whatsoever... /Palle
6	APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"	6
7	- APACHE_CONFIG_VARS=${apache_dir}/build/config_vars.mk	7	--- configure.in~ Wed Mar 19 10:21:04 2003
8	+ APACHE_CONFIG_VARS=${prefix}/share/apache2/build/config_vars.mk	8	+++ configure.in Thu May 29 01:50:48 2003
9	+ LIBTOOL=`$APXS -q LIBTOOL`	9	@@ -184,10 +184,10 @@
10	fi	10
11	AC_MSG_RESULT([building connector for \"$WEBSERVER\"])	11	dnl Java settings
12		12
		13	-JK_JDK()
		14	-JK_JDK_OS()
		15	-JK_JNI()
		16	-JK_PCRE()
		17	+dnl JK_JDK()
		18	+dnl JK_JDK_OS()
		19	+dnl JK_JNI()
		20	+dnl JK_PCRE()
		21
		22	AC_SUBST(JAVA_HOME)
		23	AC_SUBST(JAVA_PLATFORM)

Added Link Here

(-)mod_jk2/files/patch-apache13-makefile-apxs-in (+14 lines)
1	--- server/apache13/Makefile.apxs.in.orig Wed Mar 19 10:21:04 2003
2	+++ server/apache13/Makefile.apxs.in Wed Jun 18 03:10:02 2003
3	@@ -18,7 +18,10 @@
4	all: mod_jk2.so
5
6	mod_jk2.so:
7	- $(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}" mod_jk2.c ${COMMON_C_FILES}
8	+ $(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}" jk_service_apache13.c mod_jk2.c ${COMMON_C_FILES}
9	+
10	+install:
11	+ $(APXS) -i mod_jk2.so
12
13	clean:
14	rm -f .o .so

Added Link Here

(-)mod_jk2/files/patch-include::jk_mutex_h (+20 lines)
1	--- include/jk_mutex.h~ Thu Jul 31 19:30:40 2003
2	+++ include/jk_mutex.h Wed Sep 10 01:33:27 2003
3	@@ -76,7 +76,7 @@
4	#include "apr_thread_mutex.h"
5	#elif defined( WIN32 )
6	#include <windows.h>
7	-#elif defined( _REENTRANT )
8	+#elif defined( _THREAD_SAFE ) && defined ( FREEBSD_THREAD_HACK )
9	#include <pthread.h>
10	#endif
11
12	@@ -122,7 +122,7 @@
13	apr_thread_mutex_t *threadMutex;
14	#elif defined( WIN32 )
15	CRITICAL_SECTION threadMutex;
16	-#elif defined( _REENTRANT )
17	+#elif defined( _THREAD_SAFE ) && defined ( FREEBSD_THREAD_HACK )
18	pthread_mutex_t threadMutex;
19	#else
20	void *threadMutex;