summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/ap-jk/Makefile5
-rw-r--r--www/ap-jk/Makefile.common6
-rw-r--r--www/ap-jk/distinfo8
-rw-r--r--www/ap2-jk/Makefile7
4 files changed, 14 insertions, 12 deletions
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 96e9bfbcc6e..33a8f32129f 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2006/07/22 19:41:34 abs Exp $
+# $NetBSD: Makefile,v 1.39 2006/11/15 11:04:04 abs Exp $
-DISTNAME= jakarta-tomcat-connectors-${JK_VERSION}-src
+DISTNAME= tomcat-connectors-${JK_VERSION}-src
PKGNAME= ap-jk-${JK_VERSION}
-PKGREVISION= 1
MAKE_PARAMS+= USE_APXS=1
MAKE_PARAMS+= WITH_APXS=${APXS}
diff --git a/www/ap-jk/Makefile.common b/www/ap-jk/Makefile.common
index 2ba45f79c6b..b0ce5dfab8f 100644
--- a/www/ap-jk/Makefile.common
+++ b/www/ap-jk/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2006/10/14 08:24:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/11/15 11:04:04 abs Exp $
-JK_VERSION= 1.2.15
+JK_VERSION= 1.2.19
CATEGORIES= www java
MASTER_SITES= http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-${JK_VERSION}/
@@ -13,7 +13,7 @@ CONFLICTS= ap-jk-[0-9]*
PATCHDIR= ${.CURDIR}/../../www/ap-jk/patches
DISTINFO_FILE= ${.CURDIR}/../../www/ap-jk/distinfo
-WRKSRC= ${WRKDIR}/${DISTNAME}/jk/native
+WRKSRC= ${WRKDIR}/${DISTNAME}/native
APACHE_MODULE= YES
BUILD_DEFS+= JK_ENABLE_JNI
diff --git a/www/ap-jk/distinfo b/www/ap-jk/distinfo
index e7a9fba9116..fe9ade001c4 100644
--- a/www/ap-jk/distinfo
+++ b/www/ap-jk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/03/02 16:55:21 erh Exp $
+$NetBSD: distinfo,v 1.7 2006/11/15 11:04:04 abs Exp $
-SHA1 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = c9a67de4e03d6d7780cf0b14284f62d30bb78156
-RMD160 (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667
-Size (jakarta-tomcat-connectors-1.2.15-src.tar.gz) = 722463 bytes
+SHA1 (tomcat-connectors-1.2.19-src.tar.gz) = 7e49c98000455ea226b16c45cf63fd565c2221eb
+RMD160 (tomcat-connectors-1.2.19-src.tar.gz) = f48895b847b84a77f95ec87faa47115b023f686f
+Size (tomcat-connectors-1.2.19-src.tar.gz) = 1246419 bytes
SHA1 (patch-aa) = 27774432ecc82209e47beca24a54ef5139d4e2eb
SHA1 (patch-ab) = 57e4ead1a73d9a47fb634d5c7fb18d49d0393a08
SHA1 (patch-ac) = 14fdec1c921f369ee51a5d73a3bee3ec9056f07a
diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile
index ce47839b9ae..062772570cd 100644
--- a/www/ap2-jk/Makefile
+++ b/www/ap2-jk/Makefile
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/22 19:43:29 abs Exp $
+# $NetBSD: Makefile,v 1.2 2006/11/15 11:04:04 abs Exp $
-DISTNAME= jakarta-tomcat-connectors-${JK_VERSION}-src
+DISTNAME= tomcat-connectors-${JK_VERSION}-src
PKGNAME= ap2-jk-${JK_VERSION}
+MAKE_PARAMS+= USE_APXS=1
+MAKE_PARAMS+= WITH_APXS=${APXS}
+
.include "../../www/ap-jk/Makefile.common"
.include "../../www/apache2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"