head	1.77;
access;
symbols
	RELEASE_8_3_0:1.66
	RELEASE_9_0_0:1.64
	RELEASE_7_4_0:1.57
	RELEASE_8_2_0:1.57
	RELEASE_6_EOL:1.55
	RELEASE_8_1_0:1.50
	RELEASE_7_3_0:1.48
	RELEASE_8_0_0:1.47
	RELEASE_7_2_0:1.47
	RELEASE_7_1_0:1.46
	RELEASE_6_4_0:1.46
	RELEASE_5_EOL:1.44
	RELEASE_7_0_0:1.44
	RELEASE_6_3_0:1.44
	PRE_XORG_7:1.40
	RELEASE_4_EOL:1.39
	RELEASE_6_2_0:1.38
	RELEASE_6_1_0:1.35
	RELEASE_5_5_0:1.35
	old_RELEASE_6_0_0:1.26
	old_old_RELEASE_5_4_0:1.24
	old_old_RELEASE_4_11_0:1.22
	old_old_RELEASE_5_3_0:1.20
	old_old_RELEASE_4_10_0:1.16
	old_old_RELEASE_5_2_1:1.6
	old_old_RELEASE_5_2_0:1.6
	old_old_RELEASE_4_9_0:1.2;
locks; strict;
comment	@# @;


1.77
date	2013.01.31.20.07.23;	author svnexp;	state dead;
branches;
next	1.76;

1.76
date	2013.01.08.07.57.28;	author svnexp;	state Exp;
branches;
next	1.75;

1.75
date	2012.12.11.08.27.47;	author svnexp;	state Exp;
branches;
next	1.74;

1.74
date	2012.12.11.07.56.01;	author svnexp;	state Exp;
branches;
next	1.73;

1.73
date	2012.11.17.06.03.07;	author svnexp;	state Exp;
branches;
next	1.72;

1.72
date	2012.10.19.04.53.06;	author jgh;	state Exp;
branches;
next	1.71;

1.71
date	2012.08.05.23.19.36;	author dougb;	state Exp;
branches;
next	1.70;

1.70
date	2012.07.16.19.44.20;	author jgh;	state Exp;
branches;
next	1.69;

1.69
date	2012.07.13.17.32.13;	author jgh;	state Exp;
branches;
next	1.68;

1.68
date	2012.06.27.16.57.51;	author jgh;	state Exp;
branches;
next	1.67;

1.67
date	2012.03.27.20.29.20;	author jgh;	state Exp;
branches;
next	1.66;

1.66
date	2012.01.19.18.34.01;	author jgh;	state Exp;
branches;
next	1.65;

1.65
date	2011.12.20.17.10.19;	author jgh;	state Exp;
branches;
next	1.64;

1.64
date	2011.10.03.18.47.14;	author beat;	state Exp;
branches;
next	1.63;

1.63
date	2011.09.11.12.04.20;	author crees;	state Exp;
branches;
next	1.62;

1.62
date	2011.08.11.00.06.33;	author wen;	state Exp;
branches;
next	1.61;

1.61
date	2011.07.21.21.44.51;	author pav;	state Exp;
branches;
next	1.60;

1.60
date	2011.07.21.05.03.01;	author linimon;	state Exp;
branches;
next	1.59;

1.59
date	2011.07.19.22.45.27;	author ohauer;	state Exp;
branches;
next	1.58;

1.58
date	2011.02.15.07.22.27;	author wen;	state Exp;
branches;
next	1.57;

1.57
date	2011.01.08.19.16.08;	author swills;	state Exp;
branches;
next	1.56;

1.56
date	2010.12.12.01.09.28;	author pgollucci;	state Exp;
branches;
next	1.55;

1.55
date	2010.10.07.21.17.36;	author ohauer;	state Exp;
branches;
next	1.54;

1.54
date	2010.08.20.20.55.05;	author rene;	state Exp;
branches;
next	1.53;

1.53
date	2010.08.20.06.55.57;	author linimon;	state Exp;
branches;
next	1.52;

1.52
date	2010.07.30.05.33.52;	author linimon;	state Exp;
branches;
next	1.51;

1.51
date	2010.07.29.01.59.16;	author linimon;	state Exp;
branches;
next	1.50;

1.50
date	2010.06.29.10.39.30;	author stefan;	state Exp;
branches;
next	1.49;

1.49
date	2010.05.06.20.11.32;	author stefan;	state Exp;
branches;
next	1.48;

1.48
date	2010.02.26.01.18.54;	author wen;	state Exp;
branches;
next	1.47;

1.47
date	2008.10.26.11.26.11;	author stefan;	state Exp;
branches;
next	1.46;

1.46
date	2008.06.21.10.42.59;	author miwi;	state Exp;
branches;
next	1.45;

1.45
date	2008.06.06.14.07.15;	author edwin;	state Exp;
branches;
next	1.44;

1.44
date	2007.09.20.01.38.44;	author miwi;	state Exp;
branches;
next	1.43;

1.43
date	2007.08.22.09.56.54;	author miwi;	state Exp;
branches;
next	1.42;

1.42
date	2007.08.20.08.56.50;	author miwi;	state Exp;
branches;
next	1.41;

1.41
date	2007.05.19.20.25.33;	author flz;	state Exp;
branches;
next	1.40;

1.40
date	2007.03.23.19.57.48;	author pav;	state Exp;
branches;
next	1.39;

1.39
date	2006.11.01.12.06.01;	author lawrance;	state Exp;
branches;
next	1.38;

1.38
date	2006.09.08.09.31.07;	author pav;	state Exp;
branches;
next	1.37;

1.37
date	2006.09.06.22.33.49;	author hq;	state Exp;
branches;
next	1.36;

1.36
date	2006.07.03.09.49.56;	author hq;	state Exp;
branches;
next	1.35;

1.35
date	2006.02.08.13.35.17;	author lawrance;	state Exp;
branches;
next	1.34;

1.34
date	2006.02.07.13.41.00;	author lawrance;	state Exp;
branches;
next	1.33;

1.33
date	2006.02.07.08.50.09;	author lawrance;	state Exp;
branches;
next	1.32;

1.32
date	2005.12.27.16.12.35;	author hq;	state Exp;
branches;
next	1.31;

1.31
date	2005.12.24.03.43.37;	author hq;	state Exp;
branches;
next	1.30;

1.30
date	2005.12.24.03.20.30;	author hq;	state Exp;
branches;
next	1.29;

1.29
date	2005.09.29.15.08.23;	author hq;	state Exp;
branches;
next	1.28;

1.28
date	2005.09.06.03.23.45;	author hq;	state Exp;
branches;
next	1.27;

1.27
date	2005.09.02.12.45.34;	author hq;	state Exp;
branches;
next	1.26;

1.26
date	2005.07.25.16.10.34;	author hq;	state Exp;
branches;
next	1.25;

1.25
date	2005.06.13.14.08.34;	author hq;	state Exp;
branches;
next	1.24;

1.24
date	2005.03.21.00.08.05;	author hq;	state Exp;
branches;
next	1.23;

1.23
date	2005.03.19.18.44.28;	author krion;	state Exp;
branches;
next	1.22;

1.22
date	2004.12.17.03.15.06;	author hq;	state Exp;
branches;
next	1.21;

1.21
date	2004.11.03.16.35.35;	author glewis;	state Exp;
branches;
next	1.20;

1.20
date	2004.09.01.19.37.51;	author glewis;	state Exp;
branches;
next	1.19;

1.19
date	2004.07.26.15.28.49;	author vanilla;	state Exp;
branches;
next	1.18;

1.18
date	2004.06.16.21.18.38;	author glewis;	state Exp;
branches;
next	1.17;

1.17
date	2004.05.13.22.36.23;	author linimon;	state Exp;
branches;
next	1.16;

1.16
date	2004.04.04.12.39.24;	author pav;	state Exp;
branches;
next	1.15;

1.15
date	2004.04.03.21.48.46;	author pav;	state Exp;
branches;
next	1.14;

1.14
date	2004.03.12.02.39.29;	author eik;	state Exp;
branches;
next	1.13;

1.13
date	2004.03.08.09.50.08;	author znerd;	state Exp;
branches;
next	1.12;

1.12
date	2004.02.24.01.46.41;	author jeh;	state Exp;
branches;
next	1.11;

1.11
date	2004.02.19.22.14.10;	author glewis;	state Exp;
branches;
next	1.10;

1.10
date	2004.02.04.05.09.29;	author marcus;	state Exp;
branches;
next	1.9;

1.9
date	2004.01.31.09.13.22;	author linimon;	state Exp;
branches;
next	1.8;

1.8
date	2004.01.02.12.31.11;	author znerd;	state Exp;
branches;
next	1.7;

1.7
date	2003.12.27.18.16.35;	author znerd;	state Exp;
branches;
next	1.6;

1.6
date	2003.11.20.19.59.02;	author glewis;	state Exp;
branches;
next	1.5;

1.5
date	2003.11.13.12.54.55;	author trevor;	state Exp;
branches;
next	1.4;

1.4
date	2003.09.26.05.54.44;	author daichi;	state Exp;
branches;
next	1.3;

1.3
date	2003.09.25.08.59.31;	author znerd;	state Exp;
branches;
next	1.2;

1.2
date	2003.09.08.14.12.22;	author znerd;	state Exp;
branches;
next	1.1;

1.1
date	2003.08.13.11.39.38;	author znerd;	state Exp;
branches;
next	;


desc
@@


1.77
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/311329
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# Created by:	Kang Liu <liukang@@bjpu.edu.cn>
# $FreeBSD: head/www/tomcat55/Makefile 310075 2013-01-08 07:14:17Z jgh $

PORTNAME=	tomcat
PORTVERSION=	5.5.36
PORTREVISION=	1
CATEGORIES=	www java
MASTER_SITES=	${MASTER_SITE_APACHE} \
	LOCAL/jgh
MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
DISTNAME=	apache-tomcat-${PORTVERSION}

MAINTAINER=	jgh@@FreeBSD.org
COMMENT=	Open-source Java web server by Apache, 5.5.x branch

OPTIONS_RADIO=	LOG
OPTIONS_RADIO_LOG=	CRONOLOG CRONOLOG_DEVEL
CRONOLOG_DESC=	Use Cronolog for Log Processing
CRONOLOG_DEVEL_DESC=	Use Cronlog-Devel for Log Processing

DEPRECATED=	EOL approaching, consider www/tomcat{6,7}
EXPIRATION_DATE=2013-01-31

USE_JAVA=	yes
JAVA_VERSION?=	1.6+
NO_BUILD=	YES

USE_RC_SUBR=	tomcat55
SUB_FILES=	pkg-install pkg-deinstall

MAJOR_VER=	${PORTVERSION:R}
APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
LOG_DIR=	${APP_HOME}/logs
APP_TITLE=	Apache Tomcat
APP_SHORTNAME=	tomcat${MAJOR_VER:S/.//}
TOMCAT_USER?=	www
TOMCAT_GROUP?=	www
TOMCAT_UID?=	80
HTTP_PORT?=	8180
HTTP_TIMEOUT?=	20000
SHUTDOWN_PORT?=	8005
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}/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
WRKSRC=		${WRKDIR}/apache-tomcat-${PORTVERSION}
PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
LATEST_LINK=	${APP_SHORTNAME}
CONF_EXT=	sample
PLIST_SUB+=	CONF_EXT=${CONF_EXT}

SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
		APP_HOME=${APP_HOME} \
		APP_SHORTNAME=${APP_SHORTNAME} \
		APP_TITLE="${APP_TITLE}" \
		GROUP=${TOMCAT_GROUP} \
		HTTP_PORT=${HTTP_PORT} \
		HTTP_TIMEOUT=${HTTP_TIMEOUT} \
		JAR_FILE=${JAR_FILE} \
		JAVA_HOME=${JAVA_HOME} \
		LOG_ARGS=${LOG_ARGS} \
		LOG_DIR=${LOG_DIR} \
		PID_FILE=${PID_FILE} \
		PORTNAME=${PORTNAME} \
		SHUTDOWN_PORT=${SHUTDOWN_PORT} \
		STDERR_LOG=${STDERR_LOG} \
		STDOUT_LOG=${STDOUT_LOG} \
		TOMCAT_HOME=${APP_HOME} \
		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
		USER=${TOMCAT_USER} \
		UID=${TOMCAT_UID}

.include <bsd.port.pre.mk>

.if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.4"
DISTFILES+=	apache-tomcat-${PORTVERSION}-compat.tar.gz
PLIST_SUB+=	JAVA14=""
.else
PLIST_SUB+=	JAVA14="@@comment "
.endif

.if ${PORT_OPTIONS:MCRONOLOG}
RUN_DEPENDS+=	cronolog:${PORTSDIR}/sysutils/cronolog
.endif

.if ${PORT_OPTIONS:MCRONOLOG_DEVEL}
RUN_DEPENDS+=	cronolog:${PORTSDIR}/sysutils/cronolog-devel
.endif

.if empty(PORT_OPTIONS:MLOG)
LOG_ARGS?=">> \$${tomcat\%\%TOMCAT_VERSION\%\%_stdout_log} 2>> \$${tomcat\%\%TOMCAT_VERSION\%\%_stderr_log}"
.else
LOG_ARGS?="2>\&1 | ${LOCALBASE}/sbin/cronolog --link \$${tomcat\%\%TOMCAT_VERSION\%\%_catalina_base}/logs/catalina.out \$${tomcat\%\%TOMCAT_VERSION\%\%_catalina_base}/logs/catalina.\%Y_\%m_\%d.out >/dev/null 2>\&1 \&"
.endif

pre-patch:
	@@${ECHO_MSG} "Installation settings:"
	@@${ECHO_MSG} "   Destination directory:    ${APP_HOME}"
	@@${ECHO_MSG} "   Location of JDK:          ${JAVA_HOME}"
	@@${ECHO_MSG} "   Location of Java port:    ${JAVA_PORT}"
	@@${ECHO_MSG} "   Running as (user/group/uid):  ${TOMCAT_USER}/${TOMCAT_GROUP}/${TOMCAT_UID}"
	@@${ECHO_MSG} "   HTTP port:                ${HTTP_PORT}"
	@@${ECHO_MSG} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
	@@${ECHO_MSG} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
	@@${ECHO_MSG} "   Logfile stdout:           ${STDOUT_LOG}"
	@@${ECHO_MSG} "   Logfile stderr:           ${STDERR_LOG}"

	@@${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
	@@${ECHO_MSG} " [ DONE ]"

.for file in ${REPLACE_FILES}
	@@${ECHO_MSG} -n ">> Customizing `basename ${file}`..."
	@@${SED} ${REPLACE_LIST_TEMP} ${file} > ${WRKDIR}/`basename ${file}`
	@@${ECHO_MSG} " [ DONE ]"
.endfor

post-patch-script:
	@@${ECHO_MSG} -n ">> Removing unneeded patched files..."
	@@${FIND} ${WRKSRC} -type f \( -name '*.orig' \) -delete
	@@${ECHO_MSG} " [ DONE ]"

do-install:
	@@${ECHO_MSG} -n ">> Creating destination directory..."
	@@${MKDIR} ${APP_HOME}
	@@${MKDIR} ${LOG_DIR}
	@@${ECHO_MSG} " [ DONE ]"

	@@${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}; \
			if [ ! -e "${APP_HOME}/$$a" ]; then \
				${ECHO_MSG} "	Installing local configuration file: ${APP_HOME}/$$a"; \
				${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
			else \
				${ECHO_MSG} "	Preserving local configuration file: ${APP_HOME}/$$a"; \
			fi; \
		done
	@@${CP} -R ${WRKSRC}/* ${APP_HOME}

# create missing directories and fix permissions
post-install:
	@@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
	@@${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
.include <bsd.port.post.mk>
@


1.76
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/310075
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r310075 | jgh | 2013-01-08 07:14:17 +0000 (Tue, 08 Jan 2013) | 3 lines
## SVN ##
## SVN ## - adjust EXPIRATION to match announcement
## SVN ##   http://lists.freebsd.org/pipermail/freebsd-ports-announce/2012-October/000039.html
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@@


1.75
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/308671
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r308671 | jgh | 2012-12-11 08:24:05 +0000 (Tue, 11 Dec 2012) | 2 lines
## SVN ##
## SVN ## - Convert SINGLE to RADIO option
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: head/www/tomcat55/Makefile 308671 2012-12-11 08:24:05Z jgh $
d22 1
a22 1
EXPIRATION_DATE=2012-12-31
@


1.74
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/308670
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r308670 | jgh | 2012-12-11 07:50:14 +0000 (Tue, 11 Dec 2012) | 2 lines
## SVN ##
## SVN ## -use default java_vendor of openjdk
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: head/www/tomcat55/Makefile 308670 2012-12-11 07:50:14Z jgh $
d16 2
a17 4
OPTIONS_DEFINE=	LOG
OPTIONS_SINGLE=	LOG
OPTIONS_SINGLE_LOG= CRONOLOG CRONOLOG_DEVEL
LOG_DESC=	Use Log Pre-Processor
@


1.73
log
@Switch exporter over
@
text
@d2 1
a2 2
#
# $FreeBSD: head/www/tomcat55/Makefile 306104 2012-10-19 04:53:06Z jgh $
d6 1
d27 1
a27 2
JAVA_VERSION?=	1.5+
JAVA_VENDOR?=	freebsd
@


1.72
log
@SVN rev 306104 on 2012-10-19 04:53:06Z by jgh

- update to 5.5.36
- while here add myself as master_site to deliver distfile post-eol (max 1 month)

Users are encouraged to update to 6.x or 7.x branch, respectively.
http://tomcat.apache.org/tomcat-55-eol.html

Feature safe:	yes
@
text
@d3 1
a3 1
# $FreeBSD$
@


1.71
log
@SVN rev 302141 on 2012-08-05 23:19:36Z by dougb

Move the rc.d scripts of the form *.sh.in to *.in

Where necessary add $FreeBSD$ to the file

No PORTREVISION bump necessary because this is a no-op
@
text
@d1 1
a1 3
# New ports collection makefile for:	jakarta-tomcat-devel
# Date created:		Tue Aug 12 23:26:32 CST 2003
# Whom:			Kang Liu <liukang@@bjpu.edu.cn>
a3 1
#
d6 1
a6 2
PORTVERSION=	5.5.35
PORTREVISION=	2
d8 2
a9 1
MASTER_SITES=	${MASTER_SITE_APACHE}
@


1.70
log
@SVN rev 300974 on 2012-07-16 19:44:20Z by jgh

- revert back to r300102, user isn't required a LOG option
- bump portrevision

Submitted by: pointhat@@
@
text
@d34 1
a34 1
USE_RC_SUBR=	tomcat55.sh
@


1.69
log
@- fix LOG_ARGS logic in single option, bump portrevision as this affects runtime
@
text
@d10 1
a10 1
PORTREVISION=	1
d19 1
d21 2
a22 1
OPTIONS_SINGLE_LOG=	CRONOLOG CRONOLOG_DEVEL
d101 1
a101 1
.if ( empty(PORT_OPTIONS:MCRONOLOG) &&  empty(PORT_OPTIONS:MCRONOLOG_DEVEL) )
@


1.68
log
@- adopt optionsNG
@
text
@d10 1
a18 1
OPTIONS_DEFINE=	LOG
d20 1
a20 2
OPTIONS_SINGLE_LOG= CRONOLOG CRONOLOG_DEVEL
LOG_DESC=	Use Log Pre-Processor
d99 1
a99 1
.if empty(PORT_OPTIONS:MLOG)
@


1.67
log
@- adjust EXPIRATION by +3 months (2012-12-31) per
  http://tomcat.apache.org/tomcat-55-eol.html

Suggested by:	bapt
Feature safe:	yes
@
text
@d18 6
a23 2
OPTIONS=	CRONOLOG "Use Cronolog for Log Processing" Off \
		CRONOLOG_DEVEL "Use Cronlog-Devel for Log Processing" Off
d92 1
a92 1
.if defined(WITH_CRONOLOG)
d96 1
a96 1
.if defined(WITH_CRONOLOG_DEVEL)
d100 1
a100 1
.if !( defined(WITH_CRONOLOG) || (WITH_CRONOLOG_DEVEL) )
a105 4
.if ( defined(WITH_CRONOLOG) && defined(WITH_CRONOLOG_DEVEL) )
BROKEN=		You can only define one log pre-processor application.
.endif

@


1.66
log
@- Update to 5.5.35

Approved by:	crees, rene (mentors, implicit)
@
text
@d22 1
a22 1
EXPIRATION_DATE=2012-09-30
@


1.65
log
@move contributor address => jgh

Approved by:	crees (mentor)
@
text
@d9 1
a9 1
PORTVERSION=	5.5.34
@


1.64
log
@- Update to 5.5.34
- Add in fix for remote ssh restarts for log_args (when cronolog enabled)

PR:		ports/161217
Submitted by:	Jason Helfman <jhelfman AT experts-exchange.com> (maintainer)
@
text
@d15 1
a15 1
MAINTAINER=	jhelfman@@experts-exchange.com
@


1.63
log
@- Allow user to add flags for startup case only
- (while here, stop using '::' in patchfile names)

PR:		ports/160571
Submitted by:	Phil Phillips <pphillips@@experts-exchange.com>
Approved by:	Jason Helfman <jhelfman@@e-e.com> (maintainer)
@
text
@d9 1
a9 2
PORTVERSION=	5.5.33
PORTREVISION=	2
d99 1
a99 1
LOG_ARGS?="2>\&1 | ${LOCALBASE}/sbin/cronolog --link \$${tomcat\%\%TOMCAT_VERSION\%\%_catalina_base}/logs/catalina.out \$${tomcat\%\%TOMCAT_VERSION\%\%_catalina_base}/logs/catalina.\%Y_\%m_\%d.out \&"
@


1.62
log
@- Set deprecation/expiration

PR:		ports/159651
Submitted by:	Jason Helfman <jhelfman@@experts-exchange.com> (maintainer)
@
text
@d10 1
a10 1
PORTREVISION=	1
@


1.61
log
@- Don't install .orig files

Submitted by:	Jason Helfman <jhelfman@@e-e.com> (maintainer)
@
text
@d22 3
@


1.60
log
@Now that the Java 1.3 and Java 1.4 ports are deprecated and will expire soon,
remove support for them from bsd.java.mk.  As Jikes is not available in Java 1.5
or higher, remove it from bsd.java.mk too (suggested by hq@@) and from the ports
which used it (only occurences were USE_JIKES=no).  Support for the Blackdown VM
is also removed, as it is not available in Java 1.5 and higher.

Also remove the mapping from Java 1.1-1.4 to Java 1.5+ in bsd.java.mk to detect
old, broken ports; therefore bump the minimal value of JAVA_VERSION to 1.5.
While here, replace static values of JAVA_VERSION in files/*.in by
%%JAVA_VERSION%% .

PR:		ports/158969
Submitted by:	rene
Tested on:	pointyhat-west -exp
@
text
@d127 5
@


1.59
log
@- fix cronolog processing option [1]
- improve pidfile handling in rc script [2]

PR:		ports/158237 [1], ports/158410 [2]
Submitted by:	Jason Helfman <jhelfman _at_ experts-exchange.com> (maintainer) [1]
		Phil Phillips <pphillips _at_ experts-exchange.com> [2]
Approved by:	maintainer
@
text
@d23 1
a23 1
JAVA_VERSION?=	1.4+
@


1.58
log
@- Update to 5.5.33

PR:		ports/154787
Submitted by:	Jason Helfman <jhelfman@@experts-exchange.com> (maintainer)
@
text
@d10 1
d14 1
a14 1
DISTFILES=	apache-tomcat-${PORTVERSION}.tar.gz
d65 1
d94 4
a97 9
.if ( defined(WITH_CRONOLOG) || (WITH_CRONOLOG_DEVEL) )
LOG_PROCESSOR?= ${LOCALBASE}/sbin/cronolog
LOG_PROCESSOR_DIRECTIVES?= "\$$CATALINA_OUT \$$CATALINA_BASE/logs/catalina.out.\%Y_\%m_\%d.out"
LOG_PROCESSOR_OPTS?= --link
REDIRECT?=     "2\>\&1"
SUB_LIST+=     LOG_PROCESSOR=${LOG_PROCESSOR} \
	       LOG_PROCESSOR_DIRECTIVES=${LOG_PROCESSOR_DIRECTIVES} \
	       LOG_PROCESSOR_OPTS=${LOG_PROCESSOR_OPTS} \
	       REDIRECT=${REDIRECT}
a115 5
post-patch:
.if ( defined(WITH_CRONOLOG) || (WITH_CRONOLOG_DEVEL) )
	@@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/logprocessor-cronolog
.endif

@


1.57
log
@- Add cronolog-devel as an optional log processor

PR:		ports/153505
Submitted by:	Jason Helfman <jhelfman at experts-exchange.com> (maintainer)
Approved by:	wxs (mentor)
@
text
@d9 1
a9 2
PORTVERSION=	5.5.31
PORTREVISION=	1
d93 1
a93 1
LOG_PROCESSOR?= ${LOCALBASE}/sbin/cronolog 
d105 1
a105 1
.endif 
@


1.56
log
@- Allow cronolog
- Update MAINTAINER email
- Remove MD5
- Bump PORTREVISION

PR:             ports/152975
Submitted by:   Jason Helfman <jhelfman@@experts-exchange.com> (maintainer)
@
text
@d19 2
a20 1
OPTIONS=	CRONOLOG "Use Cronolog for Tomcat Log Processing" Off
d86 11
a101 4
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
d104 4
d121 1
a121 1
.if defined(WITH_CRONOLOG)
@


1.55
log
@- update tomcat to 5.5.31
- replace a silly find construct in Makefile
- rewrite pkg-install
- include PATCH from PR 151078

PR:		150576
Submitted by:	Jason <jgh _at_ experts-exchange.com> (maintainer)
Approved by:	glarkin (mentor)
@
text
@d10 1
d16 1
a16 1
MAINTAINER=	jgh@@experts-exchange.com
d19 2
d44 2
a45 1
REPLACE_FILES=	${WRKSRC}/conf/server.xml
d84 12
d109 4
d132 1
@


1.54
log
@- update to 5.5.30
- remove some unneeded Windows-only libraries
- pkg-plist fixes

PR:		ports/148611
Submitted by:	L Pacey [lpfreebsd gmail.com]
Approved by:	Jason [jgh experts-exchange.com] (maintainer)
@
text
@d9 1
a9 1
PORTVERSION=	5.5.30
d35 1
d57 1
d59 2
d62 1
d94 1
a94 1
	@@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'` `${FIND} ${WRKSRC} -name '*.dll'`
a103 3
pre-install:
	@@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

a122 21
	@@${ECHO_MSG} " [ DONE ]"

	@@${ECHO_MSG} -n ">> Creating log files..."
	@@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDOUT_LOG}
	@@${INSTALL} -m 664 -o ${TOMCAT_USER} -g ${TOMCAT_GROUP} /dev/null ${STDERR_LOG}
	@@${ECHO_MSG} " [ DONE ]"

	@@${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
	@@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
	@@${ECHO_MSG} " [ DONE ]"

	@@${ECHO_MSG} -n ">> Fixing ownership settings..."
	@@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
		${APP_HOME}/temp ${APP_HOME}/work ${APP_HOME}/webapps
	@@${ECHO_MSG} " [ DONE ]"

	@@${ECHO_MSG} -n ">> Fixing permissions..."
	@@${FIND} ${APP_HOME} -type d | while read a; do\
		${CHMOD} 755 "$$a"; \
	done
	@@${ECHO_MSG} " [ DONE ]"
d124 1
d126 1
@


1.53
log
@Make the default java version and vendor overrideable.

PR:		ports/148650
Submitted by:	maintainer
@
text
@d9 1
a9 2
PORTVERSION=	5.5.28
PORTREVISION=	1
d89 2
a90 1
	@@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
@


1.52
log
@Over to new volunteer.
@
text
@d20 2
a21 1
JAVA_VERSION=	1.4+
@


1.51
log
@Reset tomasv@@megalogika.lt at his request, as his company no longer uses FreeBSD.
@
text
@d16 1
a16 1
MAINTAINER=	ports@@FreeBSD.org
@


1.50
log
@Make the UID as configurable as the user/group.

PR:		144878
Submitted by:	Jason Helfman <jhelfman@@e-e.com>
Approved by:	maintainer timeout (>3 months)
Feature safe:	yes
@
text
@d16 1
a16 1
MAINTAINER=	tomasv@@megalogika.lt
@


1.49
log
@Fix stopping the server process via the port's rc.d script.

PR:		ports/140829
Submitted by:	Ruben van Staveren <ruben@@verweg.com>
Approved by:	maintainer timeout (>5 months)
@
text
@d33 1
d63 2
a64 1
		USER=${TOMCAT_USER}
d80 1
a80 1
	@@${ECHO_MSG} "   Running as (user/group):  ${TOMCAT_USER}/${TOMCAT_GROUP}"
@


1.48
log
@- Update to 5.5.28

PR:		ports/144279
Submitted by:	Wen Heping(myself)
Approved by:	maintainer
Feature safe:	yes
@
text
@d10 1
@


1.47
log
@Update to 5.5.27.

PR:		127817
Submitted by:	maintainer
@
text
@d9 1
a9 1
PORTVERSION=	5.5.27
@


1.46
log
@- Update to 5.5.26

PR:		123072
Submitted by:	"Bart&#322;omiej Syryjczyk" <bartlomiej.syryjczyk@@expro.pl>
Approved by:	maintainer timeout
@
text
@d9 1
a9 1
PORTVERSION=	5.5.26
a31 1
PW?=		/usr/sbin/pw
@


1.45
log
@Bump portrevision due to upgrade of devel/gettext.

The affected ports are the ones with gettext as a run-dependency
according to ports/INDEX-7 (5007 of them) and the ones with USE_GETTEXT
in Makefile (29 of them).

PR:             ports/124340
Submitted by:   edwin@@
Approved by:    portmgr (pav)
@
text
@d9 1
a9 2
PORTVERSION=	5.5.25
PORTREVISION=	1
@


1.44
log
@- Update to 5.5.25

PR:		116307
Submitted by:	Tomas Verbaitis <tomasv@@megalogika.lt> (maintainer)
@
text
@d10 1
@


1.43
log
@My last commit changed functionality, but the old actions
were still present. So, just remove the old line.

PR:		115680
Submitted by:	Tomas Verbaitis <tomasv@@megalogika.lt> (maintainer)
@
text
@d9 1
a9 2
PORTVERSION=	5.5.23
PORTREVISION=	3
@


1.42
log
@- Set ownership $TOMCAT_HOME/webapps directory to $TOMCAT_USER:$TOMCAT_GROUP [1]

- While upgrading www/tomcat55 port, if there any directories with spaces in
their names within $TOMCAT_HOME/webapps or $TOMCAT_HOME/work directories,
setting up permissions fail. Rewrite the "Fixing permissions" loop. [2]

PR:		115463
		Gabor Tjong A Hung <g.v.tjongahung@@gmail.com> [1]
		Alexey Rubtsov <arubtsov@@swsoft.com> [2]
Approved by:	Tomas Verbaitis <tomasv@@megalogika.lt> (maintainer):x
@
text
@d10 1
a10 1
PORTREVISION=	2
a138 1
	@@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
@


1.41
log
@- Welcome X.org 7.2 \o/.
- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.
@
text
@d10 1
a10 1
PORTREVISION=	1
d132 1
a132 1
		${APP_HOME}/temp ${APP_HOME}/work
d136 3
@


1.40
log
@- Update to 5.5.23
- Take maintainership

PR:		ports/110192
Submitted by:	Tomas Verbaitis <tomasv@@megalogika.lt>
@
text
@d10 1
@


1.39
log
@Update to 5.5.20.

PR:		ports/104459
Submitted by:	Tomas Verbaitis <tomasv@@megalogika.lt>
@
text
@d9 1
a9 1
PORTVERSION=	5.5.20
d15 1
a15 1
MAINTAINER=	ports@@FreeBSD.org
@


1.38
log
@- Work around an inability of rc.subr's _find_processes() to work with
  processes that show as [java] on ps output.  This should fix the rc script
  stop action for all folks.
@
text
@d9 1
a9 2
PORTVERSION=	5.5.17
PORTREVISION=	1
@


1.37
log
@Reset maintainer

Approved by:	maintainer
@
text
@d10 1
@


1.36
log
@Update to 5.5.17

PR:		98581
Submitted by:	Tomas Verbaitis <tomasv@@megalogika.lt>
Approved by:	maintainer timeout
@
text
@d15 1
a15 1
MAINTAINER=	liukang@@cn.freebsd.org
@


1.35
log
@- Make sure the rc script creates and chowns the PID file before running
  'daemon'.  No need for the port to create a PID file at install time
  (it would just be eaten by rc.d/cleanvar anyway).
- Use 'ps -o comm' to grab a suitable procname.  'ps -o command' is not
  reliable enough.
- Bump PORTREVISION since these changes fix broken rc script operation.

Approved by:	maintainer timeout (as part of previous update)
@
text
@d9 1
a9 2
PORTVERSION=	5.5.12
PORTREVISION=	3
d11 2
a12 2
MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
@


1.34
log
@Since the procname of tomcat processes may vary due to javavmwrapper,
subvert the 'check_pid_file' procname check by setting it from the output
of 'ps'.

Remove the previous attempt at handling this problem, which was to put
a wildcard in procname.  I'll wear my pointy hat for that bogus hack.

Reported by:	Fritz Heinrichmeyer <Fritz.Heinrichmeyer@@FernUni-Hagen.de>
@
text
@d10 1
a10 1
PORTREVISION=	2
a138 6
	@@${ECHO_MSG} -n ">> Creating PID file..."
	@@${TOUCH} ${PID_FILE}
	@@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${PID_FILE}
	@@${CHMOD} 0600 ${PID_FILE}
	@@${ECHO_MSG} " [ DONE ]"

@


1.33
log
@Clean up Tomcat 4, 4.1, 5, and 5.5 ports.

These changes apply to all ports, unless mentioned otherwise:

- Move jakarta-tomcat55 to tomcat55 (it is no longer a Jakarta project). [6]
- Improve the tomcat55 rc script.  Fix PID handling.  Improve the
  shutdown process.  Use USE_RC_SUBR to its full potential. [2]
- Backport tomcat55 rc script to the other tomcat ports.  This allows
  us to pass command line arguments to the JVM.  Noted in UPDATING.
  [1], [3], [4]
- Change ownership of installed files.  All files are now installed
  with default uid/gid (root:wheel) except for those in the conf/, logs/,
  temp/ and work/ directories. [5]
- No longer install tomcatXXctl binary.  rc scripts are more flexible
  and can be reconfigured without recompiling.
- Remove AUTO_START and STOP_TIMEOUT (replaced with rc tomcatXX_stop_timeout).
- Remove a long list of sed expressions in favour of SUB_LIST.
- Move pkg_{,de}install to files/pkg_{,de}install.in.  Add them to
  SUB_FILES.  Tidy up substitutions and remove hardcoded values.
- Some nonfunctional tidying and removal of Makefile cruft.

PR:		ports/38018 [1], ports/38020 [2], ports/74344 [3],
		ports/75143 [4], ports/83434 [5], ports/92692 [6]
Submitted by:	Ari Suutari <ari.suutari@@syncrontech.com> [1] [2],
		SimpleRezo Team <freebsd@@simplerezo.com> [3],
		Anton Yudin <toha@@toha.org.ua> [4],
		Jan Grant <jan.grant@@bristol.ac.uk> [5],
		lawrance [6]
Approved by:	Kang Liu <liukang@@cn.freebsd.org> (maintainer) [6]
		Maintainer timeouts on [1], [2], [3], [4], [5]
Big thanks to:	hq for the initial tomcat55 script
		jasonb on FreeNode #tomcat for packaging advice
@
text
@d10 1
a10 1
PORTREVISION=	1
@


1.32
log
@Fix build when using Java 1.4: the compatibility distfile was wrong

PR:		90913
Submitted by:	maintainer, lesi
Reported by:	Yamamoto Takao <takao@@oakat.org>,
		Ion-Mihai Tetcu <itetcu@@people.tecnik93.com>
@
text
@d8 1
a8 1
PORTNAME=	jakarta-tomcat
d10 1
d23 2
a24 5
USE_RC_SUBR=	yes

.if !defined(NOPORTDOCS)
MAN1=	${CONTROL_SCRIPT_NAME}.1
.endif
a26 1
WRKSRC=		${WRKDIR}/apache-tomcat-${PORTVERSION}
d29 1
a29 1
APP_TITLE=	Jakarta Tomcat
a30 6
CONTROL_SCRIPT_NAME=	${APP_SHORTNAME}ctl
CONTROL_SCRIPT=	${PREFIX}/bin/${CONTROL_SCRIPT_NAME}
CONTROL_SCRIPT_MANPAGE_TITLE=	${CONTROL_SCRIPT_NAME:U}
STARTUP_ORDER?=	020
STARTUP_SCRIPT_NAME=	${PORTNAME}${MAJOR_VER:S/.//}.sh
STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/${STARTUP_ORDER}.${STARTUP_SCRIPT_NAME}
a35 1
WARP_PORT?=	8008
a38 2
AUTO_START?=	NO
STOP_TIMEOUT?=	5
d40 2
a41 3
REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
		${WRKSRC}/conf/server.xml
d44 1
d50 11
a60 2
SUB_FILES=	tomcat.sh
SUB_LIST=	TOMCAT_VERSION=${MAJOR_VER:S/.//} \
d62 2
a63 8
		USER=${TOMCAT_USER} \
		STDOUT_LOG=${STDOUT_LOG} \
		STDERR_LOG=${STDERR_LOG}

REPLACE_FILES+=	${PKGDIR}/pkg-install \
		${PKGDIR}/pkg-deinstall
PKGINSTALL=	${WRKDIR}/pkg-install
PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
a76 2
	@@${ECHO_MSG} "   Control program location: ${CONTROL_SCRIPT}"
	@@${ECHO_MSG} "   Startup script location:  ${STARTUP_SCRIPT}"
a81 1
	@@${ECHO_MSG} "   WARP port:                ${WARP_PORT}"
a84 2
	@@${ECHO_MSG} "   Starting after install:   ${AUTO_START}"
	@@${ECHO_MSG} "   Stop time-out:            ${STOP_TIMEOUT} sec."
d91 3
a93 29
.for f in ${REPLACE_FILES}
	@@${ECHO_MSG} -n ">> Customizing `basename $f`..."
	@@${SED} \
	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
	-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
	-e "/%%CONTROL_SCRIPT_MANPAGE_TITLE%%/s//${CONTROL_SCRIPT_MANPAGE_TITLE}/g" \
	-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
	-e "/%%GROUP%%/s//${TOMCAT_GROUP}/g" \
	-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
	-e "/%%JAVA_CMD%%/s//bin\/java/g" \
	-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
	-e "/%%JAR_FILE%%/s//${JAR_FILE:S/\//\\\//g}/g" \
	-e "/%%LOG_DIR%%/s//${LOG_DIR:S/\//\\\//g}/g" \
	-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
	-e "/%%PORTNAME%%/s//${PORTNAME}/g" \
	-e "/%%PORTVERSION%%/s//${PORTVERSION}/g" \
	-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
	-e "/%%SHUTDOWN_PORT%%/s//${SHUTDOWN_PORT}/g" \
	-e "/%%STARTUP_SCRIPT_NAME%%/s//${STARTUP_SCRIPT_NAME}/g" \
	-e "/%%STARTUP_SCRIPT%%/s//${STARTUP_SCRIPT:S/\//\\\//g}/g" \
	-e "/%%STDERR_LOG%%/s//${STDERR_LOG:S/\//\\\//g}/g" \
	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
	-e "/%%USER%%/s//${TOMCAT_USER}/g" \
	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
	$f > ${WRKDIR}/`basename $f`
a120 21
	@@${ECHO_MSG} -n ">> Compiling and installing control program..."
	@@${SED} \
	-e "/%%JAVA_ARGS%%/s//\"-Dcatalina.home=${APP_HOME:S/\//\\\//g}\",/g" \
	-e "/%%JAR_ARGS%%/s//\"start\",/g" \
	${WRKDIR}/daemonctl.c > ${WRKDIR}/daemonctl_.c
	@@cd ${WRKDIR} && ${CC} -ansi -o ${CONTROL_SCRIPT_NAME} daemonctl_.c
	@@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
	@@${CHOWN} ${TOMCAT_USER}:${TOMCAT_GROUP} ${CONTROL_SCRIPT}
	@@${CHMOD} 6754 ${CONTROL_SCRIPT}
	@@${ECHO_MSG} " [ DONE ]"

	@@${ECHO_MSG} -n ">> Installing startup script..."
	@@${INSTALL_SCRIPT} ${WRKDIR}/tomcat.sh ${PREFIX}/etc/rc.d/jakarta-tomcat${MAJOR_VER:S/.//}.sh
	@@${ECHO_MSG} " [ DONE ]"

.if !defined(NOPORTDOCS)
	@@${ECHO_MSG} -n ">> Installing man pages..."
	@@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
	@@${ECHO_MSG} " [ DONE ]"
.endif

d131 2
a132 1
	@@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}
a146 7
	@@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${TOMCAT_GROUP}."
.if !defined(NOPORTDOCS)
	@@${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
.endif
.if ${AUTO_START} == "YES"
	@@${CONTROL_SCRIPT} start || true
.endif
@


1.31
log
@Update maintainer address

Requested by:	maintainer
@
text
@d13 1
a13 1
DISTNAME=	apache-tomcat-${PORTVERSION}
d77 1
a77 1
DISTFILES+=	${PORTNAME}-${PORTVERSION}-compat.tar.gz
@


1.30
log
@- Update to 5.5.12
- Add SHA256 info
- Update WWW

PR:		90380
Submitted by:	maintainer
@
text
@d15 1
a15 1
MAINTAINER=	liukang@@bjut.edu.cn
@


1.29
log
@- Allow user to specify a Tomcat deamon user/group through TOMCAT_USER and
  TOMCAT_GROUP (www/www by default)
- Make it possible to add user/group even if UID/GID number is reserved

PR:		85761
Submitted by:	Pawel Wieleba <P.Wieleba@@iem.pw.edu.pl>
Approved by:	maintainer
@
text
@d9 1
a9 1
PORTVERSION=	5.5.9
d13 1
a13 1
DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
d29 1
a29 1
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@


1.28
log
@Install ${PREFIX}/bin/tomcat55ctl even if rcNG script does not make use of it.
This should help users that are used to it.

As a side effect, this change will also fix the packing list.

Reported by:	pointyhat via kris
@
text
@d40 2
a41 2
USER=		www
GROUP=		www
d57 1
a57 1
PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
d65 1
a65 1
		USER=${USER} \
d69 5
d90 1
a90 1
	@@${ECHO_MSG} "   Running as (user/group):  ${USER}/${GROUP}"
a98 1
	@@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
d115 1
a115 1
	-e "/%%GROUP%%/s//${GROUP}/g" \
d131 1
a131 1
	-e "/%%USER%%/s//${USER}/g" \
d137 3
d168 1
a168 1
	@@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
d183 2
a184 2
	@@${INSTALL} -m 664 -o ${USER} -g ${GROUP} /dev/null ${STDOUT_LOG}
	@@${INSTALL} -m 664 -o ${USER} -g ${GROUP} /dev/null ${STDERR_LOG}
d192 1
a192 1
	@@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
d201 1
a201 1
	@@${CHOWN} ${USER}:${GROUP} ${PID_FILE}
d207 1
a207 1
	@@${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
@


1.27
log
@- New RCng stratup script with no use of tomcat55ctl. Several extra flags are
  provided to customize the behavior of the Tomcat process. See the header of
  the script for further information.
- Fix permission issue with ${STDOUT_LOG} and ${STDERR_LOG}

PR:		38018 [1], 38020 [2], 59571 [3], 74344 [4], 75143 [5]
Submitted by:	Ari Suutari <ari.suutari@@syncrontech.com> [1] [2],
		ve <ve@@hardcore.lt> [3],
		SimpleRezo Team <freebsd@@simplerezo.com> [4],
		Anton Yudin <toha@@toha.org.ua> [5]
Discussed on:	freebsd-java@@
Reviewed by:	Jan Grant <Jan.Grant@@bristol.ac.uk>
Approved by:	maintainer timeout
@
text
@d160 3
@


1.26
log
@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
@
text
@d22 2
a53 1
		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
d62 7
a159 3
	@@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
	@@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
	@@${CHMOD} 6754 ${CONTROL_SCRIPT}
d163 1
a163 2
	@@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
	@@${CHMOD} 0544 ${STARTUP_SCRIPT}
d173 2
a174 2
	@@${INSTALL} /dev/null ${STDOUT_LOG}
	@@${INSTALL} /dev/null ${STDERR_LOG}
@


1.25
log
@Update to version 5.5.9: this port is a repocopy of www/jakarta-tomcat5 and it
now tracks the Tomcat 5.5.x branch

PR:		81458
Reported by:	Scott Balmos <scott.balmos@@utoledo.edu>
Submitted by:	Kang Liu <liukang@@bjut.edu.cn> (maintainer)
@
text
@d13 1
d19 1
a19 1
JAVA_VERSION=	1.5+
d60 1
d63 7
@


1.24
log
@- Fix a patching problem in Tomcat ports
- Add a patch-dependency on jakarta-tomcat4

PR:		79052
Submitted by:	maintainer
Obtained from:	des (for jakarta-tomcat41)
@
text
@d9 1
a9 1
PORTVERSION=	5.0.30
d15 1
a15 2
COMMENT=	Open-source Java web server by Apache, 5.0.x branch
PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
d18 1
a18 1
JAVA_VERSION=	1.3+
d26 1
d52 1
a52 1
		conf/server.xml
d54 1
d86 1
a86 1
	@@(cd ${WRKSRC} && ${SED} \
d112 1
a112 1
	$f > ${WRKDIR}/`basename $f`)
@


1.23
log
@Remove hardcoded WRKDIRPREFIX.

Proposed by:	des
@
text
@d16 1
a26 1
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
d52 1
a52 1
		${WRKSRC}/conf/server.xml
d85 1
a85 1
	@@${SED} \
d111 1
a111 1
	$f > ${WRKDIR}/`basename $f`
@


1.22
log
@- Update to 5.0.30 [1]
- Use MAN1 in Makefile [1]
- Back up config files during deinstall [2]
- Fix pkg_add warnings [1]
- Add $FreeBSD$ tags where missing
- Use ECHO_MSG rather than ECHO_CMD

PR:		75152 [1], 43565 [2]
Submitted by:	maintainer [1], Brent Verner <brent@@rcfile.org> [2]
@
text
@a53 1
WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
@


1.21
log
@. Update to 5.0.29.

PR:		73275
Submitted by:	Kang Liu <liukang@@bjut.edu.cn> (maintainer)
@
text
@d9 1
a9 1
PORTVERSION=	5.0.29
d21 4
d57 2
d62 15
a76 15
	@@${ECHO_CMD} "Installation settings:"
	@@${ECHO_CMD} "   Destination directory:    ${APP_HOME}"
	@@${ECHO_CMD} "   Control program location: ${CONTROL_SCRIPT}"
	@@${ECHO_CMD} "   Startup script location:  ${STARTUP_SCRIPT}"
	@@${ECHO_CMD} "   Location of JDK:          ${JAVA_HOME}"
	@@${ECHO_CMD} "   Location of Java port:    ${JAVA_PORT}"
	@@${ECHO_CMD} "   Running as (user/group):  ${USER}/${GROUP}"
	@@${ECHO_CMD} "   HTTP port:                ${HTTP_PORT}"
	@@${ECHO_CMD} "   Shutdown listener port:   ${SHUTDOWN_PORT}"
	@@${ECHO_CMD} "   WARP port:                ${WARP_PORT}"
	@@${ECHO_CMD} "   AJP 1.3 connector port:   ${AJP_1_3_PORT}"
	@@${ECHO_CMD} "   Logfile stdout:           ${STDOUT_LOG}"
	@@${ECHO_CMD} "   Logfile stderr:           ${STDERR_LOG}"
	@@${ECHO_CMD} "   Starting after install:   ${AUTO_START}"
	@@${ECHO_CMD} "   Stop time-out:            ${STOP_TIMEOUT} sec."
d80 1
a80 1
	@@${ECHO_CMD} -n ">> Removing unneeded files..."
d82 1
a82 1
	@@${ECHO_CMD} " [ DONE ]"
d85 1
a85 1
	@@${ECHO_CMD} -n ">> Customizing `basename $f`..."
d113 1
a113 1
	@@${ECHO_CMD} " [ DONE ]"
d117 1
a117 1
	@@${ECHO_CMD} -n ">> Creating destination directory..."
d120 1
a120 5
	@@${ECHO_CMD} " [ DONE ]"

	@@${ECHO_CMD} -n ">> Backing up configuration files..."
	@@${MV} ${APP_HOME}/conf ${APP_HOME}/conf.orig 2>/dev/null || true
	@@${ECHO_CMD} " [ DONE ]"
d122 12
a133 1
	@@${ECHO_CMD} -n ">> Copying files to destination directory..."
d135 1
a135 2
	@@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
	@@${ECHO_CMD} " [ DONE ]"
d137 1
a137 1
	@@${ECHO_CMD} -n ">> Compiling and installing control program..."
d146 1
a146 1
	@@${ECHO_CMD} " [ DONE ]"
d148 1
a148 1
	@@${ECHO_CMD} -n ">> Installing startup script..."
d151 1
a151 1
	@@${ECHO_CMD} " [ DONE ]"
d154 1
a154 1
	@@${ECHO_CMD} -n ">> Installing man pages..."
d156 1
a156 1
	@@${ECHO_CMD} " [ DONE ]"
d159 1
a159 1
	@@${ECHO_CMD} -n ">> Creating log files..."
d162 1
a162 1
	@@${ECHO_CMD} " [ DONE ]"
d164 1
a164 1
	@@${ECHO_CMD} -n ">> Creating symlink to tools.jar..."
d166 1
a166 1
	@@${ECHO_CMD} " [ DONE ]"
d168 1
a168 1
	@@${ECHO_CMD} -n ">> Fixing ownership settings..."
d170 1
a170 1
	@@${ECHO_CMD} " [ DONE ]"
d172 1
a172 1
	@@${ECHO_CMD} -n ">> Fixing permissions..."
d174 1
a174 1
	@@${ECHO_CMD} " [ DONE ]"
d176 1
a176 1
	@@${ECHO_CMD} -n ">> Creating PID file..."
d180 1
a180 1
	@@${ECHO_CMD} " [ DONE ]"
d183 2
a184 2
	@@${ECHO_CMD} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
	@@${ECHO_CMD} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
d186 1
a186 1
	@@${ECHO_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
@


1.20
log
@. Update to 5.0.28.

PR:		71240
Submitted by:	Kang Liu <liukang@@bjut.edu.cn> (maintainer)
@
text
@d9 1
a9 1
PORTVERSION=	5.0.28
@


1.19
log
@1. update www/jakarta-tomcat5 to 5.0.27
2. move the orignal config file to ${APP_HOME}/conf.orig, I think it would be helpful if the config files have been changed.

PR:		ports/69617
Submitted by:	maintainer
@
text
@d9 1
a9 1
PORTVERSION=	5.0.27
@


1.18
log
@. Update to 5.0.25.
. Update maintainer's email address.

PR:		67623
Submitted by:	Kang Liu <liukang@@bjpu.edu.cn> (maintainer)
@
text
@d9 1
a9 1
PORTVERSION=	5.0.25
d114 4
@


1.17
log
@Update to 5.0.24.

PR:		ports/66614
Submitted by:	Kang Liu <liukang@@bjpu.edu.cn> (maintainer)
@
text
@d9 1
a9 1
PORTVERSION=	5.0.24
d14 1
a14 1
MAINTAINER=	liukang@@bjpu.edu.cn
@


1.16
log
@- Use MASTER_SITES_APACHE_JAKARTA

PR:		ports/65158
Submitted by:	Kang Liu <liukang@@bjpu.edu.cn> (maintainer)
@
text
@d9 1
a9 1
PORTVERSION=	5.0.19
d12 1
a12 1
MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin 
@


1.15
log
@- Convert to bsd.java.mk 2.0 macros

PR:		ports/65118
Submitted by:	Kang Liu <liukang@@bjpu.edu.cn> (maintainer)
@
text
@d11 2
a12 3
MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
		http://distfiles.coredump.cn/
@


1.14
log
@remove duplicate LATEST_LINK

PR:		64134
Submitted by:	Kang Liu <liukang@@bjpu.edu.cn>
@
text
@d18 2
a19 1
USE_JAVA=	1.3+
@


1.13
log
@Set LATEST_LINK.

Reported by:	kris
@
text
@a19 1
LATEST_LINK=	jakarta-tomcat5
@


1.12
log
@1. jakarta-tomcat3,4,41,5 has the same PORTNAME and didn't set LATEST_LINK in
their Makefile.It may cause tomcat5 to conflict with other tomcat(s).
2. Replace spaces by tab

PR:		63209
Submitted by:	MAINTAINER
@
text
@d20 1
@


1.11
log
@. Update jakarta-tomcat5 to 5.0.19
. Add SIZE in distinfo

PR:		63062
Submitted by:	Kang Liu <liukang@@bjpu.edu.cn> (maintainer)
@
text
@d51 2
a52 1
PLIST_SUB+=     T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
@


1.10
log
@Bump PORTREVISION on all ports that depend on gettext to aid with upgrading.

(Part 1)
@
text
@d9 1
a9 2
PORTVERSION=	5.0.18
PORTREVISION=	1
@


1.9
log
@1.Update www/jakarta-tomcat to 5.0.18.
Changelog: http://jakarta.apache.org/tomcat/tomcat-5.0-doc/changelog.html
2.Fix wrong url in the 2nd master site

PR:		ports/61767
Submitted by:	Kang Liu <liukang@@bjpu.edu.cn> (maintainer)
@
text
@d10 1
@


1.8
log
@Fixed name of PID file in pkg-deinstall.
Bumped PORTREVISION.

PR:		60781
Submitted by:	Kang Liu <liukang@@bjpu.edu.cn>
@
text
@d9 1
a9 2
PORTVERSION=	5.0.16
PORTREVISION=	1
d12 1
a12 1
		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}/bin/ \
@


1.7
log
@Update to 5.0.16.

Submitted by:	maintainer
PR:		60036
@
text
@d10 1
@


1.6
log
@. Update to 5.0.14

PR:		59480
Submitted by:	Angelo Turetta <aturetta@@commit.it>
Approved by:	"Kang Liu" <liukang@@bjpu.edu.cn> (maintainer)
@
text
@d9 1
a9 1
PORTVERSION=	5.0.14
d11 2
a12 2
MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-beta/bin/ \
		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin/ \
d18 1
a18 1
USE_JAVA=	1.4+
a173 1
	@@${ECHO_CMD} "Using Tomcat 5.x in a production environment is NOT recommended!"
@


1.5
log
@Use the FIND and XARGS macros introduced in bsd.port.mk 1.391.
@
text
@d9 1
a9 2
PORTVERSION=	5.0.12
PORTREVISION=	1
@


1.4
log
@fix: www/jakarta-tomcat5
  - fix pkg permission and master_sites problem

PR:		57234
Submitted by:	Kang Liu <liukang@@bjpu.edu.cn> (maintainer)
Pointed out by:	Angelo Turetta
@
text
@d157 1
a157 1
	@@${CHMOD} 755 `find ${APP_HOME} -type d`
@


1.3
log
@Update to 5.0.12.

PR:		56764
Submitted by:	SADA Kenji <sada@@BSDclub.org>
Approved by:	maintainer
@
text
@d10 1
d13 1
a13 1
		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin \
a25 1
PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
d52 1
a52 1

@


1.2
log
@Update to 5.0.10.

PR:		56581
Submitted by:	maintainer
@
text
@d9 1
a9 1
PORTVERSION=	5.0.10
d11 3
a13 1
MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-alpha/bin/
@


1.1
log
@New port: Jakarta Tomcat 5.x.
See:
http://jakarta.apache.org/site/news.html#20030804.1
http://jakarta.apache.org/tomcat/tomcat-5.0-doc/index.html

PR:		55502
Submitted by:	Kang Liu <lazykang@@hotmail.com>
@
text
@d9 1
a9 1
PORTVERSION=	5.0.6
@

