ports/75604: [maintainer] fix several bugs in www/jakarta-tomcat4
Kang Liu
liukang at bjut.edu.cn
Wed Dec 29 10:30:23 UTC 2004
>Number: 75604
>Category: ports
>Synopsis: [maintainer] fix several bugs in www/jakarta-tomcat4
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 29 10:30:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Kang Liu
>Release: 4.11 & 5.3
>Organization:
Beijing University of Technology
>Environment:
FreeBSD 4.11-PRERELEASE #81: Mon Dec 13 00:56:55 CST 2004
>Description:
1. Backup config files during deinstall
2. Use "MAN1=" in Makefile
3. Fix pkg_add permission problem, described in PR: ports/57235
4. ECHO_CMD -> ECHO_MSG
5. Bump PORTREVISION.
6. Mark as DEPRECATED
7. Change MASTER_SITES
>How-To-Repeat:
1. make deinstall
2. portlint
3. pkg_add , then check the permission
6. http://jakarta.apache.org/tomcat/index.html said "We encourage all users to upgrade to Tomcat 5.x whenever possible."
7. make fetch
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat4/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile 3 Dec 2004 14:20:04 -0000 1.50
+++ Makefile 29 Dec 2004 09:56:41 -0000
@@ -7,23 +7,28 @@
PORTNAME= jakarta-tomcat
PORTVERSION= 4.0.6
+PORTREVISION= 1
CATEGORIES= www java
-MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat-${PORTVERSION:R}/release/v${PORTVERSION}/bin/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= znerd
+MASTER_SITES= http://distfiles.coredump.cn/
MAINTAINER= liukang at bjut.edu.cn
COMMENT= Open-source Java web server by Apache, stable 4.0.x branch
+DEPRECATED= "www/jakarta-tomcat5 is recommended instead for new installations"
+
USE_JAVA= 1.2+
NO_BUILD= YES
LATEST_LINK= ${APP_SHORTNAME}
+.if !defined(NOPORTDOCS)
+MAN1= ${CONTROL_SCRIPT_NAME}.1
+.endif
+
MAJOR_VER= ${PORTVERSION:R:R}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION:R}
LOG_DIR= ${APP_HOME}/logs
-PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///}
+PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
APP_TITLE= Jakarta Tomcat
APP_SHORTNAME= tomcat${MAJOR_VER}
CONTROL_SCRIPT_NAME= ${APP_SHORTNAME}ctl
@@ -50,34 +55,36 @@
${WRKSRC}/conf/server.xml
JAR_FILE= bin/bootstrap.jar
WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
+CONF_EXT= sample
+PLIST_SUB+= CONF_EXT=${CONF_EXT}
.include <bsd.port.pre.mk>
pre-patch:
- @${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."
+ @${ECHO_MSG} "Installation settings:"
+ @${ECHO_MSG} " Destination directory: ${APP_HOME}"
+ @${ECHO_MSG} " Control program location: ${CONTROL_SCRIPT}"
+ @${ECHO_MSG} " Startup script location: ${STARTUP_SCRIPT}"
+ @${ECHO_MSG} " Location of JDK: ${JAVA_HOME}"
+ @${ECHO_MSG} " Location of Java port: ${JAVA_PORT}"
+ @${ECHO_MSG} " Running as (user/group): ${USER}/${GROUP}"
+ @${ECHO_MSG} " HTTP port: ${HTTP_PORT}"
+ @${ECHO_MSG} " Shutdown listener port: ${SHUTDOWN_PORT}"
+ @${ECHO_MSG} " WARP port: ${WARP_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} " Starting after install: ${AUTO_START}"
+ @${ECHO_MSG} " Stop time-out: ${STOP_TIMEOUT} sec."
@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
post-patch:
- @${ECHO_CMD} -n ">> Removing unneeded files..."
+ @${ECHO_MSG} -n ">> Removing unneeded files..."
@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
.for f in ${REPLACE_FILES}
- @${ECHO_CMD} -n ">> Customizing `basename $f`..."
+ @${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" \
@@ -105,21 +112,31 @@
-e "/%%USER%%/s//${USER}/g" \
-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
$f > ${WRKDIR}/`basename $f`
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
.endfor
do-install:
- @${ECHO_CMD} -n ">> Creating destination directory..."
+ @${ECHO_MSG} -n ">> Creating destination directory..."
@${MKDIR} ${APP_HOME}
@${MKDIR} ${LOG_DIR}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Copying files to destination directory..."
+ @${ECHO_MSG} ">> 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_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}
- @${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Compiling and installing control program..."
+ @${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" \
@@ -128,47 +145,47 @@
@${CP} ${WRKDIR}/${CONTROL_SCRIPT_NAME} ${CONTROL_SCRIPT}
@${CHOWN} ${USER}:${GROUP} ${CONTROL_SCRIPT}
@${CHMOD} 6754 ${CONTROL_SCRIPT}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Installing startup script..."
+ @${ECHO_MSG} -n ">> Installing startup script..."
@${CP} ${WRKDIR}/startup.sh ${STARTUP_SCRIPT}
@${CHMOD} 0544 ${STARTUP_SCRIPT}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
.if !defined(NOPORTDOCS)
- @${ECHO_CMD} -n ">> Installing man pages..."
+ @${ECHO_MSG} -n ">> Installing man pages..."
@${INSTALL_MAN} ${WRKDIR}/daemonctl.1 ${MANPREFIX}/man/man1/${CONTROL_SCRIPT_NAME}.1
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
.endif
- @${ECHO_CMD} -n ">> Creating log files..."
+ @${ECHO_MSG} -n ">> Creating log files..."
@${INSTALL} /dev/null ${STDOUT_LOG}
@${INSTALL} /dev/null ${STDERR_LOG}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Creating symlink to tools.jar..."
+ @${ECHO_MSG} -n ">> Creating symlink to tools.jar..."
@${LN} -sf ${JAVA_HOME}/lib/tools.jar ${APP_HOME}/common/lib/tools.jar
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Fixing ownership settings..."
+ @${ECHO_MSG} -n ">> Fixing ownership settings..."
@${CHOWN} -R ${USER}:${GROUP} ${APP_HOME}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Fixing permissions..."
+ @${ECHO_MSG} -n ">> Fixing permissions..."
@${CHMOD} 755 `${FIND} ${APP_HOME} -type d`
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
- @${ECHO_CMD} -n ">> Creating PID file..."
+ @${ECHO_MSG} -n ">> Creating PID file..."
@${TOUCH} ${PID_FILE}
@${CHOWN} ${USER}:${GROUP} ${PID_FILE}
@${CHMOD} 0600 ${PID_FILE}
- @${ECHO_CMD} " [ DONE ]"
+ @${ECHO_MSG} " [ DONE ]"
post-install:
- @${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}."
+ @${ECHO_MSG} "${APP_TITLE} ${PORTVERSION} has been installed in ${APP_HOME}."
+ @${ECHO_MSG} "If a user should be able to use ${CONTROL_SCRIPT_NAME}, then put this user in the group ${GROUP}."
.if !defined(NOPORTDOCS)
- @${ECHO_CMD} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
+ @${ECHO_MSG} "Use 'man ${CONTROL_SCRIPT_NAME}' for information about starting and stopping ${APP_TITLE}."
.endif
.if ${AUTO_START} == "YES"
@${CONTROL_SCRIPT} start || true
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat4/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- pkg-plist 10 Oct 2002 22:51:09 -0000 1.18
+++ pkg-plist 29 Dec 2004 09:41:26 -0000
@@ -1,3 +1,9 @@
+ at comment $FreeBSD$
+ at unexec if cmp -s %D/%%T%%/conf/server.xml %D/%%T%%/conf/server.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/web.xml %D/%%T%%/conf/web.xml.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/web.xml; fi
+ at unexec if cmp -s %D/%%T%%/conf/server-noexamples.xml.config %D/%%T%%/conf/server-noexamples.xml.config.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/server-noexamples.xml.config; fi
+ at 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; fi
+ at unexec if cmp -s %D/%%T%%/conf/catalina.policy %D/%%T%%/conf/catalina.policy.%%CONF_EXT%%; then rm -f %D/%%T%%/conf/catalina.policy; fi
bin/tomcat4ctl
etc/rc.d/020.jakarta-tomcat4.sh
%%T%%/logs/stdout.log
@@ -892,11 +898,11 @@
%%T%%/webapps/ROOT/tomcat.gif
%%T%%/webapps/ROOT/tomcat-power.gif
%%T%%/webapps/manager/WEB-INF/web.xml
-%%T%%/conf/server.xml
-%%T%%/conf/web.xml
-%%T%%/conf/server-noexamples.xml.config
-%%T%%/conf/tomcat-users.xml
-%%T%%/conf/catalina.policy
+%%T%%/conf/server.xml.%%CONF_EXT%%
+%%T%%/conf/web.xml.%%CONF_EXT%%
+%%T%%/conf/server-noexamples.xml.config.%%CONF_EXT%%
+%%T%%/conf/tomcat-users.xml.%%CONF_EXT%%
+%%T%%/conf/catalina.policy.%%CONF_EXT%%
%%T%%/common/lib/jndi.jar
%%T%%/common/lib/jta-spec1_0_1.jar
%%T%%/common/lib/tyrex-0.9.7.0.jar
@@ -959,7 +965,13 @@
%%T%%/RELEASE-NOTES-4.0.4.txt
%%T%%/RELEASE-NOTES-4.0.2.txt
%%T%%/RELEASE-NOTES-4.0.2-B2.txt
-man/man1/tomcat4ctl.1
+ at exec mkdir %D/%%T%%/common/classes || true
+ at exec mkdir %D/%%T%%/classes || true
+ at exec mkdir %D/%%T%%/temp || true
+ at exec mkdir %D/%%T%%/server/classes || true
+ at exec mkdir %D/%%T%%/work || true
+ at exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
+ at unexec rmdir %D/%%T%%/conf 2>/dev/null || true
@dirrm %%T%%/logs
@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/src/mypackage
@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/src
@@ -1072,7 +1084,6 @@
@dirrm %%T%%/webapps/manager/WEB-INF
@dirrm %%T%%/webapps/manager
@dirrm %%T%%/webapps
- at dirrm %%T%%/conf
@dirrm %%T%%/common/lib
@dirrm %%T%%/common/classes
@dirrm %%T%%/common
@@ -1084,4 +1095,4 @@
@dirrm %%T%%/server/classes
@dirrm %%T%%/server
@dirrm %%T%%/work
- at dirrm %%T%%
+ at unexec rmdir %D/%%T%% 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list