Improved pkg-deinstall. It now displays a warning message

if the www user still exists. Bumped PORTREVISION.

2 files changed, 33 insertions, 7 deletions

diff --git a/www/orion/Makefile b/www/orion/Makefile
index 6f37a99ec6e1..73bb56825960 100644
--- a/www/orion/Makefile
+++ b/www/orion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	orion
 PORTVERSION=	1.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www java
 MASTER_SITES=	http://www.orionserver.com/distributions/ \
 		http://www.atlassian.com/software/orion/downloads/ \
diff --git a/www/orion/pkg-deinstall b/www/orion/pkg-deinstall
index 643e3cdebf39..a5703cab3ad4 100644
--- a/www/orion/pkg-deinstall
+++ b/www/orion/pkg-deinstall
@@ -1,8 +1,34 @@
 #!/bin/sh
-PID_FILE=/var/run/orion.pid
-if [ -e ${PID_FILE} ]; then
-	echo -n "Orion Server is still running."
-	/bin/kill `cat ${PID_FILE}`
-	rm -f ${PID_FILE}
-	echo " Stopped."
+#
+# This script does the following.
+#
+# * Checks if the Orion PID file exists. If it does, it kills the
+#   Orion 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 in the right stage of the process
+if [ "$2" = "DEINSTALL" ]; then
+	# Kill Orion if it is still running
+	PID_FILE=/var/run/orion.pid
+	if [ -e ${PID_FILE} ]; then
+		echo -n "Orion Server is still running."
+		/bin/kill `cat ${PID_FILE}`
+		rm -f ${PID_FILE}
+		echo " Stopped."
+	fi
 fi
+
+
+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