Upgrade to version 3.3.1.

Note that this mod_jk cannot be used for Tomcat 4.
This commit is contained in:
Ernst de Haan 2002-04-03 21:10:59 +00:00
parent def53cc628
commit ef9bf0b9ec
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=57279
3 changed files with 10 additions and 10 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= mod_jk
PORTVERSION= 3.2.4
PORTVERSION= 3.3.1
CATEGORIES= www
MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/src/ \
http://www.metaverse.nl/~ernst/ \
@ -19,11 +19,11 @@ MAINTAINER= znerd@FreeBSD.org
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 \
${JAVA_HOME}/bin/javac:${JAVA_PORT}
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13 \
${TOMCAT_HOME}/lib/webserver.jar:${PORTSDIR}/www/jakarta-tomcat
${TOMCAT_HOME}/lib/webserver.jar:${PORTSDIR}/www/jakarta-tomcat3
USE_GMAKE= YES
MAKEFILE= Makefile.freebsd
WRKSRC= ${WRKDIR}/jakarta-tomcat-${PORTVERSION}-src/src/native/apache1.3
WRKSRC= ${WRKDIR}/jakarta-tomcat-${PORTVERSION}-src/src/native/mod_jk/apache1.3
APXS?= ${LOCALBASE}/sbin/apxs
JAVA_HOME?= ${LOCALBASE}/jdk1.3.1
@ -31,12 +31,13 @@ JAVA_PORT?= ${PORTSDIR}/java/jdk13
APACHE_PORT?= ${PORTSDIR}/www/apache13
TOMCAT_HOME?= ${LOCALBASE}/jakarta-tomcat${PORTVERSION}
pre-build:
post-extract:
${MV} ${WRKSRC}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd.orig
${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
> ${WRKSRC}/Makefile.freebsd
do-install:
${APXS} -i -A -n jk ${WRKSRC}/mod_jk.so

View File

@ -1 +1 @@
MD5 (jakarta-tomcat-3.2.4-src.tar.gz) = 40047345467dfeffe3dc60813d13c94d
MD5 (jakarta-tomcat-3.3.1-src.tar.gz) = 7f472a332d098a3591a3ce861747e995

View File

@ -23,10 +23,9 @@ 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
CFLAGS=-DHAVE_CONFIG_H -g -fpic -DSHARED_MODULE -O2 -D_REENTRANT -pthread -DLINUX -Wall
JK=../jk/
JK=../common/
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
@ -35,7 +34,7 @@ SRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
OBJS=${patsubst %.c,%.o,${SRCS}}
%.o: ${JK}/%.c
${CC} -c ${XCFLAGS} ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@
${CC} -c ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@
.c.o:
${APXS} -c ${JAVA_INCL} -DFREEBSD ${A13_FLAGS} -I${JK} $<