From fb6cc4416b423312e2d3f995c61bdb9fcd288c78 Mon Sep 17 00:00:00 2001
From: Ernst de Haan <znerd@FreeBSD.org>
Date: Sat, 30 Mar 2002 18:42:23 +0000
Subject: Stopping the server from pkg-deinstall. Applying replacements to
 server.xml. Bumped PORTREVISION.

---
 www/jakarta-tomcat3/Makefile      |  3 ++-
 www/jakarta-tomcat3/pkg-deinstall | 40 +++++++++++++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 9 deletions(-)

(limited to 'www/jakarta-tomcat3')

diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile
index 1b70c7eb5df0..17fa126bd2e1 100644
--- a/www/jakarta-tomcat3/Makefile
+++ b/www/jakarta-tomcat3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jakarta-tomcat
 PORTVERSION=	3.3.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	www java
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVERSION}/bin/ \
 		http://www.metaverse.nl/~ernst/ \
@@ -101,6 +101,7 @@ do-install:
 
 	@${ECHO_CMD} -n ">> Copying files to destination directory..."
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
+	@${CP} ${WRKDIR}/server.xml ${APP_HOME}/conf/
 	@${ECHO_CMD} " [ DONE ]"
 
 	@${ECHO_CMD} -n ">> Compiling and installing control script..."
diff --git a/www/jakarta-tomcat3/pkg-deinstall b/www/jakarta-tomcat3/pkg-deinstall
index 3a131360f1a5..55a1d8f0f9e5 100644
--- a/www/jakarta-tomcat3/pkg-deinstall
+++ b/www/jakarta-tomcat3/pkg-deinstall
@@ -2,20 +2,44 @@
 #
 # This script does the following.
 #
-# Checks if the 'www' user exists. If it does, then it displays
-# a message.
+# * Checks if the PID file exists. If it does, it kills the
+#   process and removes the PID file.
+#
+# * Checks if the 'www' user exists. If it does, then it displays
+#   a message.
 #
 # $FreeBSD$
 #
 
-# Make sure we're called during the 'make deinstall' process
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
+# Make sure we're in the right stage of the process
+if [ "$2" = "DEINSTALL" ]; then
+
+	# Kill the process if it is still running
+	PID_FILE=/var/run/tomcat.pid
+	if [ -s ${PID_FILE} ]; then
+		PID=`cat ${PID_FILE}`
+		echo -n ">> Killing Jakarta Tomcat process (${PID})..."
+		/bin/kill ${PID} > /dev/null 2> /dev/null
+		if [ $? -eq 0 ]; then
+			echo " [ DONE ]"
+		else
+			echo " [ FAILED ]"
+		fi
+		echo -n ">> Removing PID file (${PID_FILE})..."
+		rm ${PID_FILE} > /dev/null 2> /dev/null
+		if [ $? -eq 0 ]; then
+			echo " [ DONE ]"
+		else
+			echo " [ FAILED ]"
+		fi
+	fi
 fi
 
-# If the user exists, then display a message
-if pw usershow "www" 2>/dev/null 1>&2; then
-	echo "To delete the www user permanently, use 'pw userdel www'"
+if [ "$2" = "POST-DEINSTALL" ]; then
+	# If the user exists, then display a message
+	if pw usershow "www" 2>/dev/null 1>&2; then
+		echo "To delete the www user permanently, use 'pw userdel www'"
+	fi
 fi
 
 exit 0
-- 
cgit v1.2.3