aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgirgen <girgen@FreeBSD.org>2012-11-14 23:42:05 +0800
committergirgen <girgen@FreeBSD.org>2012-11-14 23:42:05 +0800
commitb08a9e419d02cbf45081a2f8e696424b1e5a4424 (patch)
tree870be21b756a77ed3ea0e8a7e3909a57e9f0ca2b
parent3a6e4a5f5666da790514aca89ce30be6f0c2d821 (diff)
downloadfreebsd-ports-gnome-b08a9e419d02cbf45081a2f8e696424b1e5a4424.tar.gz
freebsd-ports-gnome-b08a9e419d02cbf45081a2f8e696424b1e5a4424.tar.zst
freebsd-ports-gnome-b08a9e419d02cbf45081a2f8e696424b1e5a4424.zip
Update mod_jk to latest version, and remove the now
obsolete mod_jk-apache2. Feature safe: yes
-rw-r--r--MOVED1
-rw-r--r--www/mod_jk-apache2/Makefile17
-rw-r--r--www/mod_jk/Makefile11
-rw-r--r--www/mod_jk/distinfo4
4 files changed, 5 insertions, 28 deletions
diff --git a/MOVED b/MOVED
index 1abf9faded04..3ad71bf8eaca 100644
--- a/MOVED
+++ b/MOVED
@@ -3840,3 +3840,4 @@ x11-wm/waimea||2012-11-05|Has expired: Development ceased
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
diff --git a/www/mod_jk-apache2/Makefile b/www/mod_jk-apache2/Makefile
deleted file mode 100644
index 2d1925262bd8..000000000000
--- a/www/mod_jk-apache2/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Larry Lansing <lansil@fuzzynerd.com>
-# $FreeBSD$
-
-MASTERDIR= ${.CURDIR}/../mod_jk
-USE_APACHE= 22
-PORTREVISION= 2
-PORTEPOCH= 0
-LATEST_LINK= mod_jk-ap2
-
-MAINTAINER= girgen@FreeBSD.org
-COMMENT= Apache2 JK module for connecting to Tomcat using AJP1X
-
-MAKE_JOBS_SAFE= yes
-
-CFLAGS+= -I${LOCALBASE}/include
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index 84d754378c16..26ca71b9f508 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -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 connecting to Tomcat using AJP1X
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
diff --git a/www/mod_jk/distinfo b/www/mod_jk/distinfo
index f794380786ac..a1b814ba1863 100644
--- a/www/mod_jk/distinfo
+++ b/www/mod_jk/distinfo
@@ -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