From owner-cvs-all@FreeBSD.ORG Tue Feb 7 08:50:10 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EAD3C16A420; Tue, 7 Feb 2006 08:50:10 +0000 (GMT) (envelope-from lawrance@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D09043D49; Tue, 7 Feb 2006 08:50:10 +0000 (GMT) (envelope-from lawrance@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k178oAEe057087; Tue, 7 Feb 2006 08:50:10 GMT (envelope-from lawrance@repoman.freebsd.org) Received: (from lawrance@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k178oAI3057086; Tue, 7 Feb 2006 08:50:10 GMT (envelope-from lawrance) Message-Id: <200602070850.k178oAI3057086@repoman.freebsd.org> From: Sam Lawrance Date: Tue, 7 Feb 2006 08:50:10 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports MOVED UPDATING ports/www Makefile ports/www/jakarta-tomcat4 Makefile pkg-deinstall pkg-install pkg-plist ports/www/jakarta-tomcat4/files pkg-deinstall.in pkg-install.in startup.sh tomcat4.sh.in ports/www/jakarta-tomcat41 ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2006 08:50:11 -0000 lawrance 2006-02-07 08:50:10 UTC FreeBSD ports repository Modified files: . MOVED UPDATING www Makefile www/jakarta-tomcat4 Makefile pkg-plist www/jakarta-tomcat41 Makefile pkg-plist www/jakarta-tomcat5 Makefile pkg-plist www/tomcat55 Makefile pkg-descr pkg-plist www/tomcat55/files patch-conf::server.xml Added files: www/jakarta-tomcat4/files pkg-deinstall.in pkg-install.in tomcat4.sh.in www/jakarta-tomcat41/files pkg-deinstall.in pkg-install.in tomcat41.sh.in www/jakarta-tomcat5/files pkg-deinstall.in pkg-install.in tomcat50.sh.in www/tomcat55/files pkg-deinstall.in pkg-install.in tomcat55.sh.in Removed files: www/jakarta-tomcat4 pkg-deinstall pkg-install www/jakarta-tomcat4/files startup.sh www/jakarta-tomcat41 pkg-deinstall pkg-install www/jakarta-tomcat5 pkg-deinstall pkg-install www/jakarta-tomcat55 Makefile distinfo pkg-deinstall pkg-descr pkg-install pkg-plist www/jakarta-tomcat55/files patch-conf::server.xml tomcat.sh.in www/tomcat55 pkg-deinstall pkg-install www/tomcat55/files tomcat.sh.in 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 [1] [2], SimpleRezo Team [3], Anton Yudin [4], Jan Grant [5], lawrance [6] Approved by: Kang Liu (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 Revision Changes Path 1.900 +2 -1 ports/MOVED 1.286 +22 -1 ports/UPDATING 1.1318 +1 -1 ports/www/Makefile 1.55 +38 -86 ports/www/jakarta-tomcat4/Makefile 1.1 +47 -0 ports/www/jakarta-tomcat4/files/pkg-deinstall.in (new) 1.1 +46 -0 ports/www/jakarta-tomcat4/files/pkg-install.in (new) 1.5 +0 -34 ports/www/jakarta-tomcat4/files/startup.sh (dead) 1.1 +153 -0 ports/www/jakarta-tomcat4/files/tomcat4.sh.in (new) 1.5 +0 -45 ports/www/jakarta-tomcat4/pkg-deinstall (dead) 1.2 +0 -46 ports/www/jakarta-tomcat4/pkg-install (dead) 1.21 +2 -4 ports/www/jakarta-tomcat4/pkg-plist 1.62 +36 -88 ports/www/jakarta-tomcat41/Makefile 1.1 +47 -0 ports/www/jakarta-tomcat41/files/pkg-deinstall.in (new) 1.1 +46 -0 ports/www/jakarta-tomcat41/files/pkg-install.in (new) 1.1 +153 -0 ports/www/jakarta-tomcat41/files/tomcat41.sh.in (new) 1.6 +0 -45 ports/www/jakarta-tomcat41/pkg-deinstall (dead) 1.2 +0 -46 ports/www/jakarta-tomcat41/pkg-install (dead) 1.25 +2 -3 ports/www/jakarta-tomcat41/pkg-plist 1.25 +40 -89 ports/www/jakarta-tomcat5/Makefile 1.1 +47 -0 ports/www/jakarta-tomcat5/files/pkg-deinstall.in (new) 1.1 +46 -0 ports/www/jakarta-tomcat5/files/pkg-install.in (new) 1.1 +153 -0 ports/www/jakarta-tomcat5/files/tomcat50.sh.in (new) 1.3 +0 -45 ports/www/jakarta-tomcat5/pkg-deinstall (dead) 1.2 +0 -46 ports/www/jakarta-tomcat5/pkg-install (dead) 1.15 +2 -4 ports/www/jakarta-tomcat5/pkg-plist 1.33 +0 -214 ports/www/jakarta-tomcat55/Makefile (dead) 1.17 +0 -6 ports/www/jakarta-tomcat55/distinfo (dead) 1.4 +0 -35 ports/www/jakarta-tomcat55/files/patch-conf::server.xml (dead) 1.3 +0 -115 ports/www/jakarta-tomcat55/files/tomcat.sh.in (dead) 1.4 +0 -45 ports/www/jakarta-tomcat55/pkg-deinstall (dead) 1.5 +0 -13 ports/www/jakarta-tomcat55/pkg-descr (dead) 1.4 +0 -51 ports/www/jakarta-tomcat55/pkg-install (dead) 1.19 +0 -1020 ports/www/jakarta-tomcat55/pkg-plist (dead) 1.33 +26 -93 ports/www/tomcat55/Makefile 1.4 +1 -1 ports/www/tomcat55/files/patch-conf::server.xml 1.1 +47 -0 ports/www/tomcat55/files/pkg-deinstall.in (new) 1.1 +53 -0 ports/www/tomcat55/files/pkg-install.in (new) 1.3 +0 -115 ports/www/tomcat55/files/tomcat.sh.in (dead) 1.1 +153 -0 ports/www/tomcat55/files/tomcat55.sh.in (new) 1.4 +0 -45 ports/www/tomcat55/pkg-deinstall (dead) 1.5 +1 -1 ports/www/tomcat55/pkg-descr 1.4 +0 -51 ports/www/tomcat55/pkg-install (dead) 1.19 +2 -4 ports/www/tomcat55/pkg-plist