From ebe6ea67e9a3add5ae0d86845a6e15c8b639793c Mon Sep 17 00:00:00 2001
From: pgollucci <pgollucci@FreeBSD.org>
Date: Sun, 12 Dec 2010 01:09:28 +0000
Subject: - Allow cronolog - Update MAINTAINER email - Remove MD5 - Bump
 PORTREVISION

PR:             ports/152975
Submitted by:   Jason Helfman <jhelfman@experts-exchange.com> (maintainer)
---
 www/tomcat55/Makefile | 25 +++++++++++++++++++++++--
 www/tomcat55/distinfo |  4 ----
 2 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'www')

diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 44215e7e3532..dda3d329d1e8 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -7,14 +7,17 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	5.5.31
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
 DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
 
-MAINTAINER=	jgh@experts-exchange.com
+MAINTAINER=	jhelfman@experts-exchange.com
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
+OPTIONS=	CRONOLOG "Use Cronolog for Tomcat Log Processing" Off
+
 USE_JAVA=	yes
 JAVA_VERSION?=	1.4+
 JAVA_VENDOR?=	freebsd
@@ -38,7 +41,8 @@ AJP_1_3_PORT?=	8009
 STDOUT_LOG=	${LOG_DIR}/stdout.log
 STDERR_LOG=	${LOG_DIR}/stderr.log
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
-REPLACE_FILES=	${WRKSRC}/conf/server.xml
+REPLACE_FILES=	${WRKSRC}/bin/catalina.sh \
+		${WRKSRC}/conf/server.xml
 REPLACE_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 JAR_FILE=	bin/bootstrap.jar
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
@@ -77,6 +81,18 @@ PLIST_SUB+=	JAVA14=""
 PLIST_SUB+=	JAVA14="@comment "
 .endif
 
+.if defined(WITH_CRONOLOG)
+REDIRECT?=     "2\>\&1"
+SUB_LIST+=     LOG_PROCESSOR=${LOG_PROCESSOR} \
+	       LOG_PROCESSOR_DIRECTIVES=${LOG_PROCESSOR_DIRECTIVES} \
+	       LOG_PROCESSOR_OPTS=${LOG_PROCESSOR_OPTS} \
+	       REDIRECT=${REDIRECT}
+RUN_DEPENDS+=	cronolog:${PORTSDIR}/sysutils/cronolog
+LOG_PROCESSOR_DIRECTIVES?= "\$$CATALINA_OUT \$$CATALINA_BASE/logs/catalina.out.\%Y_\%m_\%d.out"
+LOG_PROCESSOR?= ${LOCALBASE}/sbin/cronolog 
+LOG_PROCESSOR_OPTS?= --link
+.endif
+
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
 	@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
@@ -90,6 +106,10 @@ pre-patch:
 	@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"
 
 post-patch:
+.if defined(WITH_CRONOLOG)
+	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/logprocessor-cronolog
+.endif
+
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.bat' -or -name '*.dll' -or -name '*.exe' -or -name '*.orig' \) -delete
 	@${RMDIR} ${WRKSRC}/bin/[i,x]64
@@ -109,6 +129,7 @@ do-install:
 
 	@${ECHO_MSG} ">> Copying files to destination directory..."
 	@${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
+	@${CP} ${WRKDIR}/catalina.sh ${WRKSRC}/bin/
 	@(cd ${WRKSRC};${FIND} conf -type f | ${SED} -e '/${CONF_EXT}/d') \
 		| while read a; do \
 			${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.${CONF_EXT}; \
diff --git a/www/tomcat55/distinfo b/www/tomcat55/distinfo
index 10f75ff5a366..430c1fd54a90 100644
--- a/www/tomcat55/distinfo
+++ b/www/tomcat55/distinfo
@@ -1,6 +1,2 @@
-MD5 (apache-tomcat-5.5.31.tar.gz) = 9ab07386e23f4c3dfc3b0a5e29b5f854
 SHA256 (apache-tomcat-5.5.31.tar.gz) = 9f02f47d2cf351bcff4c0d013a253c965ad0cc0fc0305d086f2f653022ccfa82
 SIZE (apache-tomcat-5.5.31.tar.gz) = 8277017
-MD5 (apache-tomcat-5.5.31-compat.tar.gz) = 31958bdab2926e41b6f7f93a8e2304b2
-SHA256 (apache-tomcat-5.5.31-compat.tar.gz) = 3b86e7a232bae1d94642b3119e0e713c2f27509b0e2c5f598666f77b6b1691b8
-SIZE (apache-tomcat-5.5.31-compat.tar.gz) = 1651313
-- 
cgit