Increased PORTVERSION to 3.2.4, since it is now based on

Jakarta Tomcat 3.2.4 instead of 3.2.3. Cleaned the port
up a bit. It now also uses JDK 1.3.1 by default. This
behaviour can be changed by using the JAVA_PORT and the
JAVA_HOME parameters.

5 files changed, 68 insertions, 43 deletions

diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index a2ce4c7187b3..ee43f7f39525 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -17,21 +17,30 @@ DISTNAME=	jakarta-tomcat-${PORTVERSION}-src
 MAINTAINER=	znerd@FreeBSD.org
 
 BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk
+		${JAVA_HOME}/bin/javac:${JAVA_PORT}
 RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/jakarta-tomcat${PORTVERSION}/lib/webserver.jar:${PORTSDIR}/www/jakarta-tomcat
+		${TOMCAT_HOME}/lib/webserver.jar:${PORTSDIR}/www/jakarta-tomcat
 
 USE_GMAKE=	YES
 MAKEFILE=	Makefile.freebsd
 WRKSRC=		${WRKDIR}/jakarta-tomcat-${PORTVERSION}-src/src/native/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}
+
+pre-build:
+	${SED} \
+	-e "s#%%APXS%%#${APXS}#g" \
+	-e "s#%%JAVA_HOME%%#${JAVA_HOME}#g" \
+	${FILESDIR}/Makefile.freebsd \
+	> ${WRKDIR}/jakarta-tomcat-${PORTVERSION}-src/src/native/apache1.3/Makefile.freebsd
 
 do-install:
 	${APXS} -i -A -n jk ${WRKSRC}/mod_jk.so
-	${SED} -e "s#%%PREFIX%%#${PREFIX}#g" ${FILESDIR}/mod_jk.conf > ${WRKDIR}/mod_jk.conf
+	${SED} -e "s#%%TOMCAT_HOME%%#${TOMCAT_HOME}#g" ${FILESDIR}/mod_jk.conf > ${WRKDIR}/mod_jk.conf
 	${INSTALL_DATA} ${WRKDIR}/mod_jk.conf ${PREFIX}/etc/apache
 
-	@${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/www/mod_jk/files/Makefile.freebsd b/www/mod_jk/files/Makefile.freebsd
new file mode 100644
index 000000000000..9b09bd99a564
--- /dev/null
+++ b/www/mod_jk/files/Makefile.freebsd
@@ -0,0 +1,51 @@
+# Makefile for mod_jk on FreeBSD.
+#
+# Customized for the www/mod_jk port on FreeBSD by
+# Ernst de Haan <znerd@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+# Set the operating system
+OS=freebsd
+
+# Define the location of Apache apxs
+APXS=%%APXS%%
+
+# Apache 1.3 flags
+A13_FLAGS=-I${PREFIX}/include/apache
+
+# Set the location of Java 2
+JAVA_HOME=%%JAVA_HOME%%
+
+# The Java-related includes and libraries for the C compiler
+JAVA_INCL=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS}
+JAVA_LIB=-L${JAVA_HOME}/jre/lib/${ARCH} -L${JAVA_HOME}/lib/${ARCH}/native_threads
+
+# Some more C compiler flags
+XCFLAGS=${CFLAGS}
+CFLAGS=-DHAVE_CONFIG_H -fpic -DSHARED_MODULE -DFREEBSD -Wall
+
+JK=../jk/
+SRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
+     jk_jni_worker.c jk_pool.c jk_worker.c jk_ajp13_worker.c jk_lb_worker.c \
+     jk_sockbuf.c  jk_map.c jk_uri_worker_map.c          
+
+
+OBJS=${patsubst %.c,%.o,${SRCS}}
+
+%.o: ${JK}/%.c 
+	${CC} -c ${XCFLAGS} ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@ 
+
+.c.o:
+	${APXS} -c ${JAVA_INCL} -DFREEBSD ${A13_FLAGS} -I${JK} $<
+
+all: mod_jk.so
+
+mod_jk.so: ${OBJS} mod_jk.o
+	$(APXS) -c -o mod_jk.so ${OBJS} mod_jk.o
+	
+# $(CC) -shared -o mod_jk.so ${OBJS} mod_jk.o
+
+clean:
+	rm *.o *.so
diff --git a/www/mod_jk/files/mod_jk.conf b/www/mod_jk/files/mod_jk.conf
index a1da11d0d62a..6b1bb84b6f16 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 %%PREFIX%%/tomcat/conf/workers.properties
+	JkWorkersFile %%TOMCAT_HOME%%/conf/workers.properties
 	JkLogFile  logs/jk.log
 	JkLogLevel warn
 	JkMount /*.jsp ajp12
diff --git a/www/mod_jk/files/patch-aa b/www/mod_jk/files/patch-aa
deleted file mode 100644
index e315e0d2d9a6..000000000000
--- a/www/mod_jk/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.freebsd.orig	Tue Dec 12 23:51:55 2000
-+++ Makefile.freebsd	Sun May 20 15:50:41 2001
-@@ -1,18 +1,18 @@
- ## You need to edit this file - configure later :-)
- 
--APACHE_HOME=/usr/local/apache
- OS=freebsd
--APXS=${APACHE_HOME}/bin/apxs
-+APXS=${PREFIX}/sbin/apxs
- 
--A13_FLAGS=-I${APACHE_HOME}/include
-+A13_FLAGS=-I${PREFIX}/include/apache
- 
- ## I assume this one is set up already
--# JAVA_HOME=
-+JAVA_HOME=${PREFIX}/jdk1.1.8
- 
- JAVA_INCL=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS}
- JAVA_LIB=-L${JAVA_HOME}/jre/lib/${ARCH} -L${JAVA_HOME}/lib/${ARCH}/native_threads
- 
--CFLAGS=-DHAVE_CONFIG_H -g -fpic  -DSHARED_MODULE -O2 -D_REENTRANT -pthread -DLINUX -Wall
-+XCFLAGS=${CFLAGS}
-+CFLAGS=-DHAVE_CONFIG_H -fpic -DSHARED_MODULE -DFREEBSD -Wall
- 
- JK=../jk/
- SRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
-@@ -23,7 +23,7 @@
- OBJS=${patsubst %.c,%.o,${SRCS}}
- 
- %.o: ../jk/%.c 
--	${CC} -c ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@ 
-+	${CC} -c ${XCFLAGS} ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@ 
- 
- .c.o:
- 	${APXS} -c ${JAVA_INCL} -DFREEBSD ${A13_FLAGS} -I../jk $<
diff --git a/www/mod_jk/pkg-message b/www/mod_jk/pkg-message
index f7ff3221bc4a..4722f0fe1f26 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 mod_jk is configured. Have a look at /usr/local/etc/apache/mod_jk.conf
+Make sure mod_jk.so is enabled in ${PREFIX}/etc/apache/httpd.conf
+and mod_jk is configured. Have a look at ${PREFIX}/etc/apache/mod_jk.conf
 for an example.
 *****************************************************************************