diff options
| -rw-r--r-- | www/mod_jk-apache2/Makefile | 2 | ||||
| -rw-r--r-- | www/mod_jk/Makefile | 10 | ||||
| -rw-r--r-- | www/mod_jk/distinfo | 4 | ||||
| -rw-r--r-- | www/mod_jk/files/patch-configure.in | 11 |
4 files changed, 3 insertions, 24 deletions
diff --git a/www/mod_jk-apache2/Makefile b/www/mod_jk-apache2/Makefile index e4dcb65d9cf1..cf80ae3c77b8 100644 --- a/www/mod_jk-apache2/Makefile +++ b/www/mod_jk-apache2/Makefile @@ -12,6 +12,4 @@ PORTEPOCH= 0 MAINTAINER= girgen@pingpong.net COMMENT= Apache2 JK module for connecting to Tomcat using AJP1X -BROKEN= "Does not build" - .include "${MASTERDIR}/Makefile" diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile index 2562e4309946..2893d0f2adc8 100644 --- a/www/mod_jk/Makefile +++ b/www/mod_jk/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mod_jk -PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTVERSION= 1.2.6 PORTEPOCH?= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA} @@ -40,16 +39,9 @@ APACHE_CONF= ${LOCALBASE}/etc/apache${APACHE2} WRKSRC= ${WRKDIR}/jakarta-tomcat-connectors-jk-${PORTVERSION}-src/jk/native USE_GMAKE= YES -USE_LIBTOOL_VER= 13 -USE_AUTOCONF_VER= 253 -USE_AUTOMAKE_VER= 15 -AUTOMAKE_ARGS= --add-missing GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-apxs=${APXS} -run-autotools: - @cd ${WRKSRC}; ${ACLOCAL}; ${LIBTOOLIZE} - do-install: ${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 diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo index 36a1418986fb..34108dd8389f 100644 --- a/www/mod_jk/distinfo +++ b/www/mod_jk/distinfo @@ -1,2 +1,2 @@ -MD5 (jakarta-tomcat-connectors-jk-1.2.5-src.tar.gz) = 55727c871286e010222bb0fb91f21d08 -SIZE (jakarta-tomcat-connectors-jk-1.2.5-src.tar.gz) = 594386 +MD5 (jakarta-tomcat-connectors-jk-1.2.6-src.tar.gz) = 018b91a0ce874cbc3dae7700f452838b +SIZE (jakarta-tomcat-connectors-jk-1.2.6-src.tar.gz) = 849481 diff --git a/www/mod_jk/files/patch-configure.in b/www/mod_jk/files/patch-configure.in deleted file mode 100644 index 5d2786974811..000000000000 --- a/www/mod_jk/files/patch-configure.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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\"]) |