Date: Thu, 16 Dec 2004 16:03:42 GMT From: Kang Liu <liukang@bjut.edu.cn> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/75152: [maintainer] update www/jakarta-tomcat5 to 5.0.30 Message-ID: <200412161603.iBGG3gGC040999@www.freebsd.org> Resent-Message-ID: <200412161610.iBGGAWkX048297@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75152
>Category: ports
>Synopsis: [maintainer] update www/jakarta-tomcat5 to 5.0.30
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 16 16:10:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Kang Liu
>Release: 4.10 & 5.3
>Organization:
Beijing University of Technology
>Environment:
FreeBSD 4.11-PRERELEASE #81
>Description:
1. Update www/jakarta-tomcat to 5.0.30
2. Use MAN1 in Makefile
3. Improved way for Backing up config files during deinstall (suggested by Brent Verner <brent@rcfile.org> in PR: ports/43565)
4. Fix pkg_add warnings.
>How-To-Repeat:
[2]. The manual page of tomcatctl5 will not be removed during deinstall.
[3]. During deinstall, all config files would be removed, even backuped config files.
[4]. Run make package, then pkg_add the newly built package.
>Fix:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat5/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 3 Nov 2004 16:35:35 -0000 1.12
+++ distinfo 15 Dec 2004 13:48:35 -0000
@@ -1,2 +1,2 @@
-MD5 (jakarta-tomcat-5.0.29.tar.gz) = 7c2552f9de414fe17dcc7737088c6a61
-SIZE (jakarta-tomcat-5.0.29.tar.gz) = 10799056
+MD5 (jakarta-tomcat-5.0.30.tar.gz) = e140483d062de8dd703cfd6ecac58c71
+SIZE (jakarta-tomcat-5.0.30.tar.gz) = 10842790
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat5/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 3 Nov 2004 16:35:35 -0000 1.21
+++ Makefile 15 Dec 2004 17:07:24 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= jakarta-tomcat
-PORTVERSION= 5.0.29
+PORTVERSION= 5.0.30
CATEGORIES= www java
MASTER_SITES= ${MASTER_SITE_APACHE_JAKARTA}
MASTER_SITE_SUBDIR= tomcat-5/v${PORTVERSION}/bin
@@ -18,6 +18,10 @@
JAVA_VERSION= 1.3+
NO_BUILD= YES
+.if !defined(NOPORTDOCS)
+MAN1= ${CONTROL_SCRIPT_NAME}.1
+.endif
+
MAJOR_VER= ${PORTVERSION:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION:R}
@@ -50,6 +54,8 @@
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
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>
pre-patch:
@@ -113,13 +119,19 @@
@${MKDIR} ${LOG_DIR}
@${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 ]"
-
- @${ECHO_CMD} -n ">> Copying files to destination directory..."
+ @${ECHO_CMD} ">> Copying files to destination directory..."
+ @${CP} ${WRKDIR}/server.xml ${WRKSRC}/conf/
+ @(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_CMD} " Installing local configuration file: ${APP_HOME}/$$a"; \
+ ${CP} ${WRKSRC}/$$a.${CONF_EXT} ${WRKSRC}/$$a; \
+ else \
+ ${ECHO_CMD} " Preserving local configuration file: ${APP_HOME}/$$a"; \
+ fi; \
+ done
@${CP} -R ${WRKSRC}/* ${APP_HOME}
- @${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Compiling and installing control program..."
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat5/pkg-plist,v
retrieving revision 1.13
diff -u -r1.13 pkg-plist
--- pkg-plist 3 Nov 2004 16:35:35 -0000 1.13
+++ pkg-plist 16 Dec 2004 15:34:55 -0000
@@ -1,19 +1,13 @@
-@exec mkdir %D/%%T%%/server || true
-@exec mkdir %D/%%T%%/server/classes || true
-@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
-@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
-@exec mkdir %D/%%T%%/server/webapps/admin/host || true
-@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
-@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
-@exec mkdir %D/%%T%%/server/webapps/admin/context || true
-@exec mkdir %D/%%T%%/server/webapps/admin/server || true
-@exec mkdir %D/%%T%%/server/webapps/admin/service || true
-@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
-@exec mkdir %D/%%T%%/shared || true
-@exec mkdir %D/%%T%%/shared/classes || true
-@exec mkdir %D/%%T%%/shared/lib || true
-@exec mkdir %D/%%T%%/temp || true
-@exec mkdir %D/%%T%%/conf.orig || true
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/admin.xml %D/%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/admin.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/admin.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/balancer.xml %D/%%T%%/conf/Catalina/localhost/balancer.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/balancer.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/balancer.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/Catalina/localhost/manager.xml %D/%%T%%/conf/Catalina/localhost/manager.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/Catalina/localhost/manager.xml; else echo If permanently deleting this package, %D/%%T%%/conf/Catalina/localhost/manager.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; else echo If permanently deleting this package, %D/%%T%%/conf/catalina.policy must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/catalina.properties %D/%%T%%/conf/catalina.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.properties; else echo If permanently deleting this package, %D/%%T%%/conf/catalina.properties must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/jk2.properties %D/%%T%%/conf/jk2.properties.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/jk2.properties; else echo If permanently deleting this package, %D/%%T%%/conf/jk2.properties must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/server-minimal.xml %D/%%T%%/conf/server-minimal.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server-minimal.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server-minimal.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; else echo If permanently deleting this package, %D/%%T%%/conf/server.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/tomcat-users.xml %D/%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/tomcat-users.xml; else echo If permanently deleting this package, %D/%%T%%/conf/tomcat-users.xml must be removed manually; fi
+@unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; else echo If permanently deleting this package, %D/%%T%%/conf/web.xml must be removed manually; fi
bin/tomcat50ctl
etc/rc.d/020.jakarta-tomcat50.sh
%%T%%/LICENSE
@@ -28,6 +22,9 @@
%%T%%/bin/commons-daemon.jar
%%T%%/bin/commons-launcher.jar
%%T%%/bin/commons-logging-api.jar
+%%T%%/bin/contrib/GNU-Linux/catalina.sh
+%%T%%/bin/contrib/README.txt
+%%T%%/bin/contrib/openVMS-alpha/TOMCAT_Setup_Java.com
%%T%%/bin/digest.sh
%%T%%/bin/jmx.jar
%%T%%/bin/jsvc.tar.gz
@@ -57,16 +54,16 @@
%%T%%/common/lib/naming-resources.jar
%%T%%/common/lib/servlet-api.jar
%%T%%/common/lib/tools.jar
-%%T%%/conf/Catalina/localhost/admin.xml
-%%T%%/conf/Catalina/localhost/balancer.xml
-%%T%%/conf/Catalina/localhost/manager.xml
-%%T%%/conf/catalina.policy
-%%T%%/conf/catalina.properties
-%%T%%/conf/jk2.properties
-%%T%%/conf/server-minimal.xml
-%%T%%/conf/server.xml
-%%T%%/conf/tomcat-users.xml
-%%T%%/conf/web.xml
+%%T%%/conf/Catalina/localhost/admin.xml.%%CONF_EXT%%
+%%T%%/conf/Catalina/localhost/balancer.xml.%%CONF_EXT%%
+%%T%%/conf/Catalina/localhost/manager.xml.%%CONF_EXT%%
+%%T%%/conf/catalina.policy.%%CONF_EXT%%
+%%T%%/conf/catalina.properties.%%CONF_EXT%%
+%%T%%/conf/jk2.properties.%%CONF_EXT%%
+%%T%%/conf/server-minimal.xml.%%CONF_EXT%%
+%%T%%/conf/server.xml.%%CONF_EXT%%
+%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%
+%%T%%/conf/web.xml.%%CONF_EXT%%
%%T%%/logs/stderr.log
%%T%%/logs/stdout.log
%%T%%/server/lib/catalina-ant.jar
@@ -833,8 +830,11 @@
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-summary.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-tree.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ByteArrayServletOutputStream.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ResponseIncludeWrapper.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSICommand.html
+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConfig.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIEcho.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExec.html
@@ -851,9 +851,6 @@
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletRequestUtil.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSISet.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIStopProcessingException.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-frame.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-summary.html
%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-tree.html
@@ -1447,6 +1444,7 @@
%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-summary.html
%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-tree.html
%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityClassLoad.html
+%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityUtil.html
%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-frame.html
%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-summary.html
%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-tree.html
@@ -1749,8 +1747,22 @@
%%T%%/webapps/webdav/tomcat.gif
@exec mkdir %D/%%T%%/work || true
@exec mkdir %D/%%T%%/common/classes ||true
+@exec mkdir %D/%%T%%/server/classes || true
+@exec mkdir %D/%%T%%/server/webapps/admin/connector || true
+@exec mkdir %D/%%T%%/server/webapps/admin/defaultcontext || true
+@exec mkdir %D/%%T%%/server/webapps/admin/host || true
+@exec mkdir %D/%%T%%/server/webapps/admin/logger || true
+@exec mkdir %D/%%T%%/server/webapps/admin/realm || true
+@exec mkdir %D/%%T%%/server/webapps/admin/context || true
+@exec mkdir %D/%%T%%/server/webapps/admin/server || true
+@exec mkdir %D/%%T%%/server/webapps/admin/service || true
+@exec mkdir %D/%%T%%/server/webapps/admin/valve || true
+@exec mkdir %D/%%T%%/shared || true
+@exec mkdir %D/%%T%%/shared/classes || true
+@exec mkdir %D/%%T%%/shared/lib || true
+@exec mkdir %D/%%T%%/temp || true
+@exec mkdir %D/%%T%%/webapps/balancer/images || true
@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
-@unexec rm -Rf %%T%%/conf.orig
@dirrm %%T%%/work
@dirrm %%T%%/webapps/webdav/WEB-INF
@dirrm %%T%%/webapps/webdav
@@ -2006,5 +2018,8 @@
@dirrm %%T%%/common/endorsed
@dirrm %%T%%/common/classes
@dirrm %%T%%/common
+@dirrm %%T%%/bin/contrib/openVMS-alpha
+@dirrm %%T%%/bin/contrib/GNU-Linux
+@dirrm %%T%%/bin/contrib
@dirrm %%T%%/bin
@dirrm %%T%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412161603.iBGG3gGC040999>