- Regen PLIST

- Replace INSTALL with MESSAGE
- Replace DEINSTALL with UNMESSAGE and @unexec
- Don't hardcode /etc
- Bump PKGNAME

ok sturm@ kurt@

www/jserv/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2004/01/13 21:32:36 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.12 2004/11/30 18:33:14 alek Exp $
 
 BROKEN=	"HANDLER THREAD PROBLEM: java.net.SocketException: Resource temporarily unavailable"
 
@@ -11,7 +11,7 @@ COMMENT=	"Tomcat (Servlet/JSP) - Apache Connector"
 ONLY_FOR_ARCHS=	i386
 
 V=		3.2.4
-PKGNAME=	jserv-${V}
+PKGNAME=	jserv-${V}p0
 DISTNAME=	jakarta-tomcat-${V}-src
 CATEGORIES=	www
 MASTER_SITES=	http://archive.apache.org/dist/jakarta/tomcat-3/archive/v${V}/src/

www/jserv/files/jserv-enable

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: jserv-enable,v 1.1.1.1 2001/06/17 12:22:17 reinhard Exp $
+# $OpenBSD: jserv-enable,v 1.2 2004/11/30 18:33:14 alek Exp $
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
@@ -18,10 +18,10 @@ else
     apxs -i -a -n jserv ${MODULE}
     echo "" >> $HTTPD_CONF
     echo "# jserv (Apache-Tomcat connector)" >> $HTTPD_CONF
-    echo "include /etc/tomcat/tomcat-apache.conf" >> $HTTPD_CONF
+    echo "include ${SYSCONFDIR}/tomcat/tomcat-apache.conf" >> $HTTPD_CONF
     echo ""
     echo "You may want to disable the 'HttpConnectionHandler' on port 8080"
-    echo "in /etc/tomcat/server.xml if jakarta-tomcat should only serve"
+    echo "in ${SYSCONFDIR}/tomcat/server.xml if jakarta-tomcat should only serve"
     echo "requests for Apache."
     echo "See ${XML} for an example."
 fi

www/jserv/pkg/DEINSTALL

@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: DEINSTALL,v 1.2 2001/06/18 09:15:30 reinhard Exp $
-#
-# jserv de-installation
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-CONF=`apxs -q SYSCONFDIR`/httpd.conf
-
-rm -f /usr/lib/apache/modules/mod_jserv.so
-
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you"
-echo "| need to perform these steps as root:"
-echo "|"
-echo "|        edit ${CONF}"
-echo "|        and remove the lines"
-echo "|        'LoadModule jserv_module'"
-echo "|        and"
-echo "|        'include /etc/tomcat/tomcat-apache.conf'"
-echo "|"
-echo "| Do not do this if you plan on re-installing jserv"
-echo "| package at some future time."
-echo "+---------------"
-echo
-
-exit 0

www/jserv/pkg/INSTALL

@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: INSTALL,v 1.1.1.1 2001/06/17 12:22:17 reinhard Exp $
-#
-# jserv installation
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| To finish the install, you need to enable the jserv"
-    echo "| module using the following command"
-    echo "|"
-    echo "|       $PREFIX/sbin/jserv-enable"
-    echo "+---------------"
-    echo
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	do_notice $1
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0

www/jserv/pkg/MESSAGE

@@ -0,0 +1,4 @@
+To finish the install, you need to enable the jserv module using the
+following command:
+
+      ${PREFIX}/sbin/jserv-enable

www/jserv/pkg/PLIST

@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/06/17 12:22:17 reinhard Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/11/30 18:33:14 alek Exp $
 lib/mod_jserv.so
 sbin/jserv-enable
+share/examples/jserv/
 share/examples/jserv/server.xml
-@dirrm share/examples/jserv
+@unexec rm -f /usr/lib/apache/modules/mod_jserv.so

www/jserv/pkg/UNMESSAGE

@@ -0,0 +1,5 @@
+To completely deinstall the jserv package you need to edit
+/var/www/conf/httpd.conf and remove the lines
+        LoadModule jserv_module
+and
+        include ${SYSCONFDIR}/tomcat/tomcat-apache.conf