Update ap-jk and ap2-jk to ver 1.2.37. Fix pkglint warnings. Fixes PR#40542

8 files changed, 59 insertions, 54 deletions

diff --git a/www/ap-jk/MESSAGE b/www/ap-jk/MESSAGE
index 1f7359d337e..d259beac753 100644
--- a/www/ap-jk/MESSAGE
+++ b/www/ap-jk/MESSAGE
@@ -1,21 +1,34 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/02/17 23:30:27 grant Exp $
+$NetBSD: MESSAGE,v 1.5 2012/10/21 21:33:25 erh Exp $
 
 In order to use this module in your Apache installation, you need to
 add the following to your httpd.conf file:
 
   LoadModule jk_module lib/httpd/mod_jk.so
+  AddModule  mod_jk.c
 
-You will also need a running Java Servlet engine, e.g. www/jakarta-tomcat
-or www/ap-jserv.  You will need to consult the servlet engine documentation
-for to finish configuring Apache before you can use mod_jk.so.  A possible
-configuration you can add to your httpd.conf to use Jakarta Tomcat is:
+You will also need a running Java Servlet engine, e.g. www/apache-tomcat6
+You will need to consult the servlet engine documentation to finish
+configuring Apache before you can use mod_jk.so.
+Possible settings you can add to your httpd.conf to use Apache Tomcat are:
+(according to http://tomcat.apache.org/connectors-doc/generic_howto/quick.html)
 
   <IfModule mod_jk.c>
   JkWorkersFile	${PREFIX}/tomcat/conf/workers.properties
   JkLogFile     /var/log/httpd/mod_jk.log
+  JkShmFile     /var/log/httpd/mod_jk.shm
   JkLogLevel    info
   JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
+  JkMount /examples/* worker1
   </IfModule>
 
+With a minimum workers.properties file:
+
+  # Define 1 real worker using ajp13
+  worker.list=worker1
+  # Set properties for worker1 (ajp13)
+  worker.worker1.type=ajp13
+  worker.worker1.host=localhost
+  worker.worker1.port=8009
+
 ===========================================================================
diff --git a/www/ap-jk/Makefile.common b/www/ap-jk/Makefile.common
index 8fa4208d7b5..d94a180c1a3 100644
--- a/www/ap-jk/Makefile.common
+++ b/www/ap-jk/Makefile.common
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile.common,v 1.6 2007/05/29 02:22:22 obache Exp $
+# $NetBSD: Makefile.common,v 1.7 2012/10/21 21:33:25 erh Exp $
+# used by www/ap-jk/Makefile
+# used by www/ap2-jk/Makefile
 
-JK_VERSION=	1.2.23
+JK_VERSION=	1.2.37
 CATEGORIES=	www java
-MASTER_SITES=	http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-${JK_VERSION}/
+MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/}
 
-MAINTAINER=	erh@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tomcat.apache.org/connectors-doc/
 COMMENT=	Apache connector for accessing Jakarta Tomcat
+LICENSE=    apache-2.0
 
 CONFLICTS=	ap-jk-[0-9]*
 
@@ -24,7 +27,7 @@ USE_TOOLS+=	gmake
 SUBST_CLASSES+=		jk-lt
 SUBST_STAGE.jk-lt=	post-configure
 SUBST_FILES.jk-lt=	Makefile common/Makefile apache-2.0/Makefile
-SUBST_SED.jk-lt=	-e "s|^\(LIBTOOL =\) [^ ]*$$|\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
+SUBST_SED.jk-lt=	-e "s|^\\(LIBTOOL =\\) [^ ]*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
 SUBST_MESSAGE.jk-lt=	Fixing libtool references.
 
 # XXX The standard --with-apxs2 when using apache2 doesn't work
diff --git a/www/ap-jk/distinfo b/www/ap-jk/distinfo
index 31b215fd150..463b3a3f154 100644
--- a/www/ap-jk/distinfo
+++ b/www/ap-jk/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.10 2010/02/16 14:52:13 joerg Exp $
+$NetBSD: distinfo,v 1.11 2012/10/21 21:33:25 erh Exp $
 
-SHA1 (tomcat-connectors-1.2.23-src.tar.gz) = 9ab3c108a9e6b20dc7dd172917f8941eee0ec32c
-RMD160 (tomcat-connectors-1.2.23-src.tar.gz) = d7892ff73f22e83feb49b4746d769f518e3f4c6a
-Size (tomcat-connectors-1.2.23-src.tar.gz) = 1368060 bytes
-SHA1 (patch-aa) = c7a68265883fd7494356543a17dcec0be7744fe9
-SHA1 (patch-ab) = 57e4ead1a73d9a47fb634d5c7fb18d49d0393a08
-SHA1 (patch-ac) = 14fdec1c921f369ee51a5d73a3bee3ec9056f07a
-SHA1 (patch-ad) = aeb977deea6ae10d6d346aa71d9ab3c00abcf069
+SHA1 (tomcat-connectors-1.2.37-src.tar.gz) = 99e9ba0b2e72b28da7de6b14f103302e7b392a5d
+RMD160 (tomcat-connectors-1.2.37-src.tar.gz) = fbc47d9f767c75b039554dfc0776876290c580d9
+Size (tomcat-connectors-1.2.37-src.tar.gz) = 1528647 bytes
+SHA1 (patch-ab) = ce0e84952f94a97d55fe143a27d3208afe027cf0
+SHA1 (patch-ad) = a7a77730b694ccb6d3d3fdc820cf74de522120bc
diff --git a/www/ap-jk/patches/patch-aa b/www/ap-jk/patches/patch-aa
deleted file mode 100644
index 0518d2ddd9f..00000000000
--- a/www/ap-jk/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2007/04/25 06:24:02 obache Exp $
-
---- common/jk_util.c.orig	2007-04-10 14:29:48.000000000 +0000
-+++ common/jk_util.c
-@@ -1720,7 +1720,7 @@ int jk_gettid()
-     pthread_getunique_np(&t, &tid);
-     return ((int)(tid.intId.lo & 0xFFFFFFFF));
- #else
--    int tid = (int)(t & 0xFFFF);
-+	int tid = (int)t;
-     return tid;
- #endif /* AS400 */
- }
diff --git a/www/ap-jk/patches/patch-ab b/www/ap-jk/patches/patch-ab
index 618a693abbd..4b4053049ae 100644
--- a/www/ap-jk/patches/patch-ab
+++ b/www/ap-jk/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2005/03/30 16:41:47 erh Exp $
+$NetBSD: patch-ab,v 1.2 2012/10/21 21:33:25 erh Exp $
 
---- apache-2.0/Makefile.in.orig	2004-12-24 05:18:10.000000000 -0600
-+++ apache-2.0/Makefile.in	2005-03-29 15:05:10.000000000 -0600
-@@ -20,6 +20,8 @@
+Fixup the Makefile so it uses the right libtool.
+
+--- apache-2.0/Makefile.in.orig	2012-05-09 08:08:26.000000000 -0500
++++ apache-2.0/Makefile.in	2012-10-21 15:25:01.000000000 -0500
+@@ -34,6 +34,8 @@
  # Apache2 settings, values guessed by Apache config and used to build it
  # Will define libexecdir, LIBTOOL, etc
  include @APACHE_CONFIG_VARS@
 +top_builddir = ..
 +LIBTOOL = 
  
- # Local settings ( overriding/appending to Apache's ) 
+ # Local settings ( overriding/appending to Apache's )
  COMMON=../common
diff --git a/www/ap-jk/patches/patch-ac b/www/ap-jk/patches/patch-ac
deleted file mode 100644
index 658050a7e2f..00000000000
--- a/www/ap-jk/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/03/30 16:41:47 erh Exp $
-
---- jni/Makefile.in.orig	2005-03-29 15:59:54.000000000 -0600
-+++ jni/Makefile.in	2005-03-29 16:00:04.000000000 -0600
-@@ -1,5 +1,7 @@
- OEXT=.lo
- include @APACHE_CONFIG_VARS@
-+top_builddir = ..
-+LIBTOOL = 
- 
- JK=../common/
- COMMON_OBJECTS=${JK}jk_map${OEXT} ${JK}jk_util${OEXT} ${JK}jk_pool${OEXT}
diff --git a/www/ap-jk/patches/patch-ad b/www/ap-jk/patches/patch-ad
index 4fda6028819..1398984b4e9 100644
--- a/www/ap-jk/patches/patch-ad
+++ b/www/ap-jk/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2010/02/16 14:52:13 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2012/10/21 21:33:25 erh Exp $
+
+Fixup the Makefile so it doesn't use libtool to install.
 
 --- apache-1.3/Makefile.in.orig	2006-03-02 16:45:37.000000000 +0000
 +++ apache-1.3/Makefile.in	2006-03-02 16:45:52.000000000 +0000
diff --git a/www/ap2-jk/MESSAGE b/www/ap2-jk/MESSAGE
index b603ea68e8a..c0eb23002e1 100644
--- a/www/ap2-jk/MESSAGE
+++ b/www/ap2-jk/MESSAGE
@@ -1,21 +1,33 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2006/07/22 19:43:29 abs Exp $
+$NetBSD: MESSAGE,v 1.2 2012/10/21 21:33:25 erh Exp $
 
 In order to use this module in your Apache installation, you need to
 add the following to your httpd.conf file:
 
   LoadModule jk_module lib/httpd/mod_jk.so
 
-You will also need a running Java Servlet engine, e.g. www/jakarta-tomcat
-or www/ap-jserv.  You will need to consult the servlet engine documentation
-for to finish configuring Apache before you can use mod_jk.so.  A possible
-configuration you can add to your httpd.conf to use Jakarta Tomcat is:
+You will also need a running Java Servlet engine, e.g. www/apache-tomcat6
+You will need to consult the servlet engine documentation to finish
+configuring Apache before you can use mod_jk.so.
+Possible settings you can add to your httpd.conf to use Apache Tomcat are:
+(according to http://tomcat.apache.org/connectors-doc/generic_howto/quick.html)
 
   <IfModule mod_jk.c>
   JkWorkersFile	${PREFIX}/tomcat/conf/workers.properties
   JkLogFile     /var/log/httpd/mod_jk.log
+  JkShmFile     /var/log/httpd/mod_jk.shm
   JkLogLevel    info
   JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
+  JkMount /examples/* worker1
   </IfModule>
 
+With a minimum workers.properties file:
+
+  # Define 1 real worker using ajp13
+  worker.list=worker1
+  # Set properties for worker1 (ajp13)
+  worker.worker1.type=ajp13
+  worker.worker1.host=localhost
+  worker.worker1.port=8009
+
 ===========================================================================