svn commit: r307421 - in head: . www/mod_jk www/mod_jk-apache2

[Palle Girgensohn]

Author: girgen
Date: Wed Nov 14 15:42:05 2012
New Revision: 307421
URL: http://svnweb.freebsd.org/changeset/ports/307421

Log:
  Update mod_jk to latest version, and remove the now
  obsolete mod_jk-apache2.
  Feature safe: yes

Deleted:
  head/www/mod_jk-apache2/
Modified:
  head/MOVED
  head/www/mod_jk/Makefile
  head/www/mod_jk/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Nov 14 15:36:14 2012	(r307420)
+++ head/MOVED	Wed Nov 14 15:42:05 2012	(r307421)
@@ -3840,3 +3840,4 @@ x11-wm/waimea||2012-11-05|Has expired: D
 x11-wm/waimea-devel||2012-11-05|Has expired: Development ceased
 devel/py-liblarch_gtk||2012-11-09|Merged into devel/py-liblarch
 x11-fonts/tolkien-ttf||2012-11-11|Has expired: Does not fetch: there are no more public distfiles
+www/mod_jk-apache2|www/mod_jk|2012-11-14|Apache 1.3 is no longer in the tree

Modified: head/www/mod_jk/Makefile
==============================================================================
--- head/www/mod_jk/Makefile	Wed Nov 14 15:36:14 2012	(r307420)
+++ head/www/mod_jk/Makefile	Wed Nov 14 15:42:05 2012	(r307421)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mod_jk
-PORTVERSION=	1.2.32
-PORTREVISION=	1
+PORTVERSION=	1.2.37
 PORTEPOCH?=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE}
@@ -21,16 +20,10 @@ COMMENT?=	Apache JK module for connectin
 MAKE_JOBS_SAFE=	yes
 
 USE_APACHE?=	22+
+APACHE_VER=	2.0
 
 .include <bsd.port.pre.mk>
 
-.if ${APACHE_VERSION} >= 20
-PKGNAMESUFFIX=	-ap2
-APACHE_VER=	2.0
-.else
-APACHE_VER=	1.3
-.endif
-
 WRKSRC=		${WRKDIR}/tomcat-connectors-${PORTVERSION}-src/native
 
 USE_GMAKE=	yes

Modified: head/www/mod_jk/distinfo
==============================================================================
--- head/www/mod_jk/distinfo	Wed Nov 14 15:36:14 2012	(r307420)
+++ head/www/mod_jk/distinfo	Wed Nov 14 15:42:05 2012	(r307421)
@@ -1,2 +1,2 @@
-SHA256 (tomcat-connectors-1.2.32-src.tar.gz) = 512a5d4ae06fd6d6aa7ba6f177b7c9ba1c8297c676b3c33686c1ffacb83035b6
-SIZE (tomcat-connectors-1.2.32-src.tar.gz) = 1545588
+SHA256 (tomcat-connectors-1.2.37-src.tar.gz) = 38a92623ddd28b85bbf54cf77f4c867ccbebafb71233131471623691e4e751f9
+SIZE (tomcat-connectors-1.2.37-src.tar.gz) = 1528647