From e5091c86fa164e6832e6ae83d12c8c89b471d710 Mon Sep 17 00:00:00 2001
From: hq <hq@FreeBSD.org>
Date: Mon, 25 Jul 2005 16:10:34 +0000
Subject: Allow the port to build/install/run with Java 1.4

PR:		81458
Submitted by:	Scott Balmos <scott.balmos@utoledo.edu>
Approved by:	maintainer timeout
---
 www/tomcat6/Makefile  | 11 ++++++++++-
 www/tomcat6/distinfo  |  2 ++
 www/tomcat6/pkg-plist |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'www/tomcat6')

diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index fed49ab26bd8..c0aade630ceb 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -10,12 +10,13 @@ PORTVERSION=	5.5.9
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.5+
+JAVA_VERSION=	1.4+
 NO_BUILD=	YES
 
 .if !defined(NOPORTDOCS)
@@ -56,8 +57,16 @@ PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
+
 .include <bsd.port.pre.mk>
 
+.if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.4"
+DISTFILES+=	${PORTNAME}-${PORTVERSION}-compat.tar.gz
+PLIST_SUB+=	JAVA14=""
+.else
+PLIST_SUB+=	JAVA14="@comment "
+.endif
+
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
diff --git a/www/tomcat6/distinfo b/www/tomcat6/distinfo
index 0fb35f09d06c..d65e8deb9c04 100644
--- a/www/tomcat6/distinfo
+++ b/www/tomcat6/distinfo
@@ -1,2 +1,4 @@
 MD5 (jakarta-tomcat-5.5.9.tar.gz) = 35ea177af353446af1de3c762a4f0f4d
 SIZE (jakarta-tomcat-5.5.9.tar.gz) = 5210986
+MD5 (jakarta-tomcat-5.5.9-compat.tar.gz) = 33f27b14f0ece9aedccecf7212d73ffc
+SIZE (jakarta-tomcat-5.5.9-compat.tar.gz) = 1367217
diff --git a/www/tomcat6/pkg-plist b/www/tomcat6/pkg-plist
index fd6b52c30264..84265d604fa4 100644
--- a/www/tomcat6/pkg-plist
+++ b/www/tomcat6/pkg-plist
@@ -30,6 +30,7 @@ etc/rc.d/020.jakarta-tomcat55.sh
 %%T%%/bin/commons-daemon.jar
 %%T%%/bin/commons-logging-api.jar
 %%T%%/bin/digest.sh
+%%JAVA14%%%%T%%/bin/jmx.jar
 %%T%%/bin/jsvc.tar.gz
 %%T%%/bin/setclasspath.sh
 %%T%%/bin/shutdown.sh
@@ -38,6 +39,8 @@ etc/rc.d/020.jakarta-tomcat55.sh
 %%T%%/bin/tool-wrapper.sh
 %%T%%/bin/version.sh
 %%T%%/common/classes/logging.properties
+%%JAVA14%%%%T%%/common/endorsed/xercesImpl.jar
+%%JAVA14%%%%T%%/common/endorsed/xml-apis.jar
 %%T%%/common/i18n/tomcat-i18n-en.jar
 %%T%%/common/i18n/tomcat-i18n-es.jar
 %%T%%/common/i18n/tomcat-i18n-fr.jar
-- 
cgit