From daf7fa2ce7a8b146dc0a0d7aca4ea961208f5655 Mon Sep 17 00:00:00 2001 From: Ernst de Haan Date: Wed, 11 Jun 2003 10:30:58 +0000 Subject: Fix broken port. Upgrades to mod_jk 1.2.3 (portepoch bumped). PR: 52776 Submitted by: Palle Girgensohn --- www/mod_jk/Makefile | 57 +++++++++++++++--------------- www/mod_jk/distinfo | 2 +- www/mod_jk/files/Makefile.freebsd | 50 -------------------------- www/mod_jk/files/mod_jk.conf | 8 ----- www/mod_jk/files/mod_jk.conf.sample | 14 ++++++++ www/mod_jk/files/patch-configure.in | 11 ++++++ www/mod_jk/files/workers.properties.sample | 12 +++++++ www/mod_jk/pkg-descr | 2 +- www/mod_jk/pkg-message | 6 ++-- www/mod_jk/pkg-plist | 5 +-- 10 files changed, 73 insertions(+), 94 deletions(-) delete mode 100644 www/mod_jk/files/Makefile.freebsd delete mode 100644 www/mod_jk/files/mod_jk.conf create mode 100644 www/mod_jk/files/mod_jk.conf.sample create mode 100644 www/mod_jk/files/patch-configure.in create mode 100644 www/mod_jk/files/workers.properties.sample (limited to 'www/mod_jk') diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile index da99948c5131..e29230974dec 100644 --- a/www/mod_jk/Makefile +++ b/www/mod_jk/Makefile @@ -6,46 +6,45 @@ # PORTNAME= mod_jk -PORTVERSION= 3.3.1 -PORTREVISION= 2 +PORTVERSION= 1.2.3 +PORTEPOCH= 1 CATEGORIES= www -MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/src/ \ - http://www.metaverse.nl/~ernst/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= znerd -DISTNAME= jakarta-tomcat-${PORTVERSION}-src +MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} +MASTER_SITE_SUBDIR= jakarta-tomcat-connectors/jk/release/v${PORTVERSION}/src +DISTNAME= jakarta-tomcat-connectors-jk-${PORTVERSION}-src MAINTAINER= parv_fm@emailgroups.net -COMMENT= Apache module for Tomcat 3 - -BROKEN= "Broken dependency" +COMMENT= Apache JK module for Tomcat BUILD_DEPENDS= ${APXS}:${APACHE_PORT} -RUN_DEPENDS= ${APXS}:${APACHE_PORT} \ - ${TOMCAT_HOME}/lib/tomcat.jar:${PORTSDIR}/www/jakarta-tomcat3 - -USE_GMAKE= YES -USE_JAVA= 1.2+ -MAKEFILE= Makefile.freebsd -WRKSRC= ${WRKDIR}/jakarta-tomcat-${PORTVERSION}-src/src/native/mod_jk/apache1.3 +RUN_DEPENDS= ${APXS}:${APACHE_PORT} -APXS?= ${LOCALBASE}/sbin/apxs +APXS= ${LOCALBASE}/sbin/apxs APACHE_PORT?= ${PORTSDIR}/www/apache13 -TOMCAT_HOME?= ${LOCALBASE}/jakarta-tomcat${PORTVERSION} +APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2} +WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native -post-extract: - ${MV} ${WRKSRC}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd.orig +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=${APXS} +APACHE2?= +APACHE_VER?= 1.3 +PLIST_SUB= APACHE2=${APACHE2} post-patch: - ${SED} \ - -e "s#%%APXS%%#${APXS}#g" \ - -e "s#%%JAVA_HOME%%#${JAVA_HOME}#g" \ - ${FILESDIR}/Makefile.freebsd \ - > ${WRKSRC}/Makefile.freebsd + cd ${WRKSRC}; ${ACLOCAL}; ${LOCALBASE}/bin/libtoolize do-install: - ${APXS} -i -A -n jk ${WRKSRC}/mod_jk.so - ${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 + ${APXS} -i -A -n jk ${WRKSRC}/apache-${APACHE_VER}/mod_jk.so + ${SED} -e "s#%%APACHE_CONF%%#${APACHE_CONF}#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} + +post-install: + ${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g" .include diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo index 989de0d06bd6..70f093b40d65 100644 --- a/www/mod_jk/distinfo +++ b/www/mod_jk/distinfo @@ -1 +1 @@ -MD5 (jakarta-tomcat-3.3.1-src.tar.gz) = 7f472a332d098a3591a3ce861747e995 +MD5 (jakarta-tomcat-connectors-jk-1.2.3-src.tar.gz) = 4c2c2a4e6a6ad8a912afaffbff173227 diff --git a/www/mod_jk/files/Makefile.freebsd b/www/mod_jk/files/Makefile.freebsd deleted file mode 100644 index d9b98f9a2310..000000000000 --- a/www/mod_jk/files/Makefile.freebsd +++ /dev/null @@ -1,50 +0,0 @@ -# Makefile for mod_jk on FreeBSD. -# -# Customized for the www/mod_jk port on FreeBSD by -# Ernst de Haan -# -# $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 -CFLAGS=-DHAVE_CONFIG_H -g -fpic -DSHARED_MODULE -O2 -pthread -DLINUX -Wall - -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 - - -OBJS=${patsubst %.c,%.o,${SRCS}} - -%.o: ${JK}/%.c - ${CC} -c ${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 deleted file mode 100644 index 1a7c0e04a3d6..000000000000 --- a/www/mod_jk/files/mod_jk.conf +++ /dev/null @@ -1,8 +0,0 @@ - - JkWorkersFile %%TOMCAT_HOME%%/conf/jk/workers.properties - JkLogFile logs/jk.log - JkLogLevel warn - JkMount /*.jsp ajp12 - JkMount /servlet/* ajp12 - JkMount /examples/* ajp12 - diff --git a/www/mod_jk/files/mod_jk.conf.sample b/www/mod_jk/files/mod_jk.conf.sample new file mode 100644 index 000000000000..c97545d64e9e --- /dev/null +++ b/www/mod_jk/files/mod_jk.conf.sample @@ -0,0 +1,14 @@ +# Replace jsp-hostname with the hostname of your JSP server, as +# specified in workers.properties. +# + + JkWorkersFile %%APACHE_CONF%%/workers.properties + JkLogFile logs/jk.log + JkLogLevel warn + + # Sample JkMounts. Replace these with the paths you would + # like to mount from your JSP server. + JkMount /*.jsp jsp-hostname + JkMount /servlet/* jsp-hostname + JkMount /examples/* jsp-hostname + diff --git a/www/mod_jk/files/patch-configure.in b/www/mod_jk/files/patch-configure.in new file mode 100644 index 000000000000..67a42809dd45 --- /dev/null +++ b/www/mod_jk/files/patch-configure.in @@ -0,0 +1,11 @@ +--- configure.in.orig Tue Dec 17 05:20:55 2002 ++++ configure.in Thu Apr 10 13:18:40 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 + fi + AC_MSG_RESULT([building connector for \"$WEBSERVER\"]) + diff --git a/www/mod_jk/files/workers.properties.sample b/www/mod_jk/files/workers.properties.sample new file mode 100644 index 000000000000..a814538b44e6 --- /dev/null +++ b/www/mod_jk/files/workers.properties.sample @@ -0,0 +1,12 @@ +# Incredibly simple workers.properties file, intended for connecting +# to one host, via AJP13. See the tomcat documentation for +# information on more exotic configuration options. +# +# Change jsp-hostname to the hostname of your JSP server. +# +worker.list=jsp-hostname + +worker.jsp-hostname.port=8009 +worker.jsp-hostname.host=jsp-hostname +worker.jsp-hostname.type=ajp13 +worker.jsp-hostname.lbfactor=1 diff --git a/www/mod_jk/pkg-descr b/www/mod_jk/pkg-descr index ffa2bf1a4deb..cb9f33bc8e2b 100644 --- a/www/mod_jk/pkg-descr +++ b/www/mod_jk/pkg-descr @@ -2,4 +2,4 @@ mod_jk is a replacement to the elderly mod_jserv. It is a completely new Tomcat-Apache plugin that handles the communication between Tomcat and Apache. -WWW: http://jakarta.apache.org/tomcat/tomcat-3.2-doc/mod_jk-howto.html +WWW: http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jk2/jk/aphowto.html diff --git a/www/mod_jk/pkg-message b/www/mod_jk/pkg-message index 4722f0fe1f26..3b26184449a8 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 ${PREFIX}/etc/apache/httpd.conf -and mod_jk is configured. Have a look at ${PREFIX}/etc/apache/mod_jk.conf -for an example. +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.sample for an example. ***************************************************************************** diff --git a/www/mod_jk/pkg-plist b/www/mod_jk/pkg-plist index de0f9ff2ed7a..c157a4e124de 100644 --- a/www/mod_jk/pkg-plist +++ b/www/mod_jk/pkg-plist @@ -1,4 +1,5 @@ -etc/apache/mod_jk.conf -libexec/apache/mod_jk.so +etc/apache%%APACHE2%%/mod_jk.conf.sample +etc/apache%%APACHE2%%/workers.properties.sample +libexec/apache%%APACHE2%%/mod_jk.so @exec %D/sbin/apxs -e -A -n jk %f @unexec %D/sbin/apxs -e -A -n jk %f -- cgit v1.2.3