summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/jakarta-tomcat/Makefile3
-rw-r--r--www/jakarta-tomcat/pkg-deinstall40
-rw-r--r--www/jakarta-tomcat3/Makefile3
-rw-r--r--www/jakarta-tomcat3/pkg-deinstall40
-rw-r--r--www/jakarta-tomcat4/Makefile3
-rw-r--r--www/jakarta-tomcat4/pkg-deinstall40
-rw-r--r--www/jakarta-tomcat41/Makefile3
-rw-r--r--www/jakarta-tomcat41/pkg-deinstall40
-rw-r--r--www/tomcat41/Makefile3
-rw-r--r--www/tomcat41/pkg-deinstall40
10 files changed, 170 insertions, 45 deletions
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 1b70c7eb5df0..17fa126bd2e1 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/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-tomcat/pkg-deinstall b/www/jakarta-tomcat/pkg-deinstall
index 3a131360f1a5..55a1d8f0f9e5 100644
--- a/www/jakarta-tomcat/pkg-deinstall
+++ b/www/jakarta-tomcat/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
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
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index 1b70c7eb5df0..17fa126bd2e1 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/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-tomcat4/pkg-deinstall b/www/jakarta-tomcat4/pkg-deinstall
index 3a131360f1a5..55a1d8f0f9e5 100644
--- a/www/jakarta-tomcat4/pkg-deinstall
+++ b/www/jakarta-tomcat4/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
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index 1b70c7eb5df0..17fa126bd2e1 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/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-tomcat41/pkg-deinstall b/www/jakarta-tomcat41/pkg-deinstall
index 3a131360f1a5..55a1d8f0f9e5 100644
--- a/www/jakarta-tomcat41/pkg-deinstall
+++ b/www/jakarta-tomcat41/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
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index 1b70c7eb5df0..17fa126bd2e1 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/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/tomcat41/pkg-deinstall b/www/tomcat41/pkg-deinstall
index 3a131360f1a5..55a1d8f0f9e5 100644
--- a/www/tomcat41/pkg-deinstall
+++ b/www/tomcat41/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:58:13 +0000