Remove ap-jserv:

Does not build on 2.0 and 3.0, and has been superseded by tomcat
and ap-jk.  Maintainer jwise agrees.

10 files changed, 1 insertions, 274 deletions

diff --git a/www/Makefile b/www/Makefile
index a3d88a69044..38e766af8f4 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.421 2005/11/19 15:06:36 rillig Exp $
+# $NetBSD: Makefile,v 1.422 2005/12/09 20:46:30 wiz Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -26,7 +26,6 @@ SUBDIR+=	ap-fastcgi
 SUBDIR+=	ap-gzip
 SUBDIR+=	ap-iasp
 SUBDIR+=	ap-jk
-SUBDIR+=	ap-jserv
 SUBDIR+=	ap-layout
 SUBDIR+=	ap-mp3
 SUBDIR+=	ap-perl
diff --git a/www/ap-jserv/DESCR b/www/ap-jserv/DESCR
deleted file mode 100644
index 8dba0665a03..00000000000
--- a/www/ap-jserv/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-mod_jserv is a module for Apache Server which provides servlet support
-using the JSDK version 2.0.  It can also be used with the Jakarta
-project's Tomcat servlet environment, which is the next generation of
-servlet development from Sun and Apache -- see the jakarta-tomcat
-package for details.
-
-Jakarta Tomcat, the apache project's newer Java Servlet and JSP engine
-is probably a better choice for new projects. That connector is available
-in the ap-jk package. This package is provided for support of existing
-JServ users.
diff --git a/www/ap-jserv/MESSAGE b/www/ap-jserv/MESSAGE
deleted file mode 100644
index 613da18026c..00000000000
--- a/www/ap-jserv/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:44 wiz Exp $
-
-In order to use this module in your Apache installation, you need to
-add the following to your httpd.conf file:
-
-  Include ${PREFIX}/etc/httpd/jserv/jserv.conf
-
-For more information, see
-
-	${PREFIX}/share/httpd/htdocs/jserv-docs
-
-===========================================================================
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
deleted file mode 100644
index 556debf273d..00000000000
--- a/www/ap-jserv/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:21 rillig Exp $
-
-DISTNAME=	ApacheJServ-1.1.2
-PKGNAME=	ap-jserv-1.1.2
-CATEGORIES=	www java
-MASTER_SITES=	http://java.apache.org/jserv/dist/
-
-MAINTAINER=	jwise@NetBSD.org
-HOMEPAGE=	http://java.apache.org/
-COMMENT=	Older Java Servlet engine for Apache Server
-
-DEPENDS+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}:../../www/apache
-# yes, this needs _exactly_ version 2.0
-DEPENDS+=	jsdk-2.0:../../www/jsdk20
-
-USE_TOOLS+=		gmake perl
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/src/scripts/build/unix/ltconfig
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-apxs=${LOCALBASE}/sbin/apxs
-CONFIGURE_ARGS+=	--with-jdk-home=${PKG_JAVA_HOME:Q}
-CONFIGURE_ARGS+=	--with-JSDK=${PREFIX}/lib/java/jsdk.jar
-CONFIGURE_ARGS+=	--with-logdir=${VARBASE}/log/httpd
-CONFIGURE_ARGS+=	--with-servlets=${LOCALBASE}/share/httpd/servlets
-CONFIGURE_ARGS+=	--enable-EAPI
-
-.include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.mk"
-
-JSDK_HOME=	${PKG_JAVA_HOME}/jsdk
-BUILD_DEFS+=	JSDK_HOME
diff --git a/www/ap-jserv/PLIST b/www/ap-jserv/PLIST
deleted file mode 100644
index 93b9aefd142..00000000000
--- a/www/ap-jserv/PLIST
+++ /dev/null
@@ -1,159 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:15:47 zuntum Exp $
-etc/httpd/jserv/jserv.conf
-etc/httpd/jserv/jserv.properties
-etc/httpd/jserv/zone.properties
-lib/httpd/mod_jserv.so
-lib/httpd/ApacheJServ.jar
-share/httpd/htdocs/jserv-docs/api/org/apache/java/io/ReadFullyInputStream.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/io/package-tree.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/io/package-frame.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/io/Logger.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/io/LogRecord.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/io/LogWriter.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/io/LogWriter.Agent.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/io/SimpleFileFilter.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/io/package-summary.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/TimeoutException.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/package-tree.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/package-frame.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/Stoppable.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/AdaptiveClassLoader.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/AdaptiveClassLoader.ClassCacheEntry.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/Bytes.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/Lock.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/Semaphore.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/lang/package-summary.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/net/package-summary.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/net/package-tree.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/net/package-frame.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/net/AuthenticatedServerSocket.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/net/AuthenticatedSocket.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/net/AuthenticationException.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/pool/package-summary.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/pool/package-tree.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/pool/package-frame.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/pool/Worker.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/pool/WorkerContainer.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/pool/WorkerPool.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/package-tree.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/package-frame.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/Controller.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/Recyclable.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/RecycleBin.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/AdaptiveController.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/Container.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/ControlledContainer.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/ControllerFactory.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/DefaultController.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/GaussianController.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/LimitedContainer.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/MinMaxController.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/RecycleBinIsEmpty.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/package-summary.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/RecycleBinIsFull.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/security/package-summary.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/security/package-tree.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/security/package-frame.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/security/MD5.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/security/MessageDigest.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/util/SimpleQueue.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/util/package-tree.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/util/package-frame.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/util/Configurations.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/util/ConfigurationsRepository.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/util/ExtendedProperties.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/util/ExtendedProperties.PropertiesReader.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/util/ExtendedProperties.PropertiesTokenizer.html
-share/httpd/htdocs/jserv-docs/api/org/apache/java/util/package-summary.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServUtils.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/package-tree.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/package-frame.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServDefs.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServLogChannels.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServSendError.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/Ajpv12InputStream.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServ.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServConnection.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServConnection.JServInputStream.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServConnection.JServOutputStream.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServContext.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServLog.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServServletManager.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServSession.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServSTMStore.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/JServServletManager.ACLObjectInputStream.html
-share/httpd/htdocs/jserv-docs/api/org/apache/jserv/package-summary.html
-share/httpd/htdocs/jserv-docs/api/stylesheet.css
-share/httpd/htdocs/jserv-docs/api/serialized-form.html
-share/httpd/htdocs/jserv-docs/api/packages.html
-share/httpd/htdocs/jserv-docs/api/overview-tree.html
-share/httpd/htdocs/jserv-docs/api/overview-summary.html
-share/httpd/htdocs/jserv-docs/api/package-list
-share/httpd/htdocs/jserv-docs/api/index.html
-share/httpd/htdocs/jserv-docs/api/index-all.html
-share/httpd/htdocs/jserv-docs/api/help-doc.html
-share/httpd/htdocs/jserv-docs/api/deprecated-list.html
-share/httpd/htdocs/jserv-docs/api/allclasses-frame.html
-share/httpd/htdocs/jserv-docs/api/overview-frame.html
-share/httpd/htdocs/jserv-docs/images/apache_pb.gif
-share/httpd/htdocs/jserv-docs/images/java-apache-project.gif
-share/httpd/htdocs/jserv-docs/images/lbfail001.gif
-share/httpd/htdocs/jserv-docs/images/lbfail002.gif
-share/httpd/htdocs/jserv-docs/images/lbfail003.gif
-share/httpd/htdocs/jserv-docs/images/lbprod001.gif
-share/httpd/htdocs/jserv-docs/images/lbprod002.gif
-share/httpd/htdocs/jserv-docs/images/lbshm001.gif
-share/httpd/htdocs/jserv-docs/install/howto.security.html
-share/httpd/htdocs/jserv-docs/install/howto.servlets.html
-share/httpd/htdocs/jserv-docs/install/howto.status.html
-share/httpd/htdocs/jserv-docs/install/howto.unix_install.html
-share/httpd/htdocs/jserv-docs/install/howto.win32_install.html
-share/httpd/htdocs/jserv-docs/install/index.html
-share/httpd/htdocs/jserv-docs/protocol/AJPv1.html
-share/httpd/htdocs/jserv-docs/protocol/AJPv11.html
-share/httpd/htdocs/jserv-docs/protocol/AJPv2.html
-share/httpd/htdocs/jserv-docs/protocol/AJPv21.html
-share/httpd/htdocs/jserv-docs/future/index.html
-share/httpd/htdocs/jserv-docs/future/sandboxing.html
-share/httpd/htdocs/jserv-docs/FAQ.html
-share/httpd/htdocs/jserv-docs/STATUS.txt
-share/httpd/htdocs/jserv-docs/bugs.html
-share/httpd/htdocs/jserv-docs/changes.html
-share/httpd/htdocs/jserv-docs/contributing.html
-share/httpd/htdocs/jserv-docs/contributors.html
-share/httpd/htdocs/jserv-docs/features.html
-share/httpd/htdocs/jserv-docs/glossary.html
-share/httpd/htdocs/jserv-docs/howto.load-balancing.html
-share/httpd/htdocs/jserv-docs/index.html
-share/httpd/htdocs/jserv-docs/license.html
-share/httpd/htdocs/jserv-docs/modules.html
-share/httpd/htdocs/jserv-docs/operation.html
-share/httpd/htdocs/jserv-docs/security.html
-share/httpd/htdocs/jserv-docs/sendbug.html
-share/httpd/htdocs/jserv-docs/support.html
-share/httpd/htdocs/jserv-docs/y2k.html
-share/httpd/htdocs/jserv-docs/upgrade.html
-share/httpd/htdocs/jserv-docs/zones.html
-share/httpd/servlets/IsItWorking.class
-share/httpd/servlets/Hello.class
-share/httpd/servlets/IsItWorking.java
-share/httpd/servlets/Hello.java
-@dirrm share/httpd/servlets
-@dirrm share/httpd/htdocs/jserv-docs/protocol
-@dirrm share/httpd/htdocs/jserv-docs/install
-@dirrm share/httpd/htdocs/jserv-docs/images
-@dirrm share/httpd/htdocs/jserv-docs/future
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache/jserv
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache/java/util
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache/java/security
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle/pool
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache/java/recycle
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache/java/net
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache/java/lang
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache/java/io
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache/java
-@dirrm share/httpd/htdocs/jserv-docs/api/org/apache
-@dirrm share/httpd/htdocs/jserv-docs/api/org
-@dirrm share/httpd/htdocs/jserv-docs/api
-@dirrm share/httpd/htdocs/jserv-docs
-@dirrm etc/httpd/jserv
diff --git a/www/ap-jserv/distinfo b/www/ap-jserv/distinfo
deleted file mode 100644
index c26c2385e9e..00000000000
--- a/www/ap-jserv/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:08:28 wiz Exp $
-
-SHA1 (ApacheJServ-1.1.2.tar.gz) = 0e1618a40785a6f34669b6b2ef6958b868f3e891
-RMD160 (ApacheJServ-1.1.2.tar.gz) = d02fafa148701eefc206d7bf1cca587935766bfa
-Size (ApacheJServ-1.1.2.tar.gz) = 770638 bytes
-SHA1 (patch-aa) = 41e03fd458430e000629c5af29dcd42a1e366f2b
-SHA1 (patch-ab) = bd1de609f0ef106718718d3437151354c628e2ce
-SHA1 (patch-ac) = 8beb08182fdd3ae6fa35726479f4a23025a5a958
-SHA1 (patch-ad) = 6fafae8e5ac3333967d4d5a6e63905c99f27362a
diff --git a/www/ap-jserv/patches/patch-aa b/www/ap-jserv/patches/patch-aa
deleted file mode 100644
index c1c865f4cdb..00000000000
--- a/www/ap-jserv/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/05/20 18:21:28 cjep Exp $
---- configure.orig	Sat Jun 17 15:05:17 2000
-+++ configure	Mon Jan 14 10:16:23 2002
-@@ -2439,8 +2439,8 @@
- else
-   echo "$ac_t""no" 1>&6
- fi
--# Extract the first word of "make", so it can be a program name with args.
--set dummy make; ac_word=$2
-+# Extract the first word of "gmake", so it can be a program name with args.
-+set dummy gmake; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:2446: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
diff --git a/www/ap-jserv/patches/patch-ab b/www/ap-jserv/patches/patch-ab
deleted file mode 100644
index 9fde1009e80..00000000000
--- a/www/ap-jserv/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/01/14 20:59:02 jwise Exp $
---- docs/Makefile.in.orig	Fri Jan 14 14:33:41 2000
-+++ docs/Makefile.in	Fri Jan 14 14:33:56 2000
-@@ -113,7 +113,7 @@
- 
- DOCFILES = $(strip $(shell ls $(EXTRA_DIST)))
- 
--docdir = ${prefix}/docs
-+docdir = ${prefix}/share/httpd/htdocs/jserv-docs
- doc_DATA = $(DOCFILES)
- mkinstalldirs = $(SHELL) $(top_srcdir)/src/scripts/build/unix/mkinstalldirs
- CONFIG_CLEAN_FILES = 
diff --git a/www/ap-jserv/patches/patch-ac b/www/ap-jserv/patches/patch-ac
deleted file mode 100644
index c99aefa34ca..00000000000
--- a/www/ap-jserv/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/01/14 20:59:02 jwise Exp $
---- docs/api/Makefile.in.orig	Fri Jan 14 14:53:18 2000
-+++ docs/api/Makefile.in	Fri Jan 14 14:53:44 2000
-@@ -112,7 +112,7 @@
- 
- FILES = org *.html *.css package-list
- 
--docdir = ${prefix}/docs/api
-+docdir = ${prefix}/share/httpd/htdocs/jserv-docs/api
- mkinstalldirs = $(SHELL) $(top_srcdir)/src/scripts/build/unix/mkinstalldirs
- CONFIG_CLEAN_FILES = 
- DIST_COMMON =  Makefile.am Makefile.in
diff --git a/www/ap-jserv/patches/patch-ad b/www/ap-jserv/patches/patch-ad
deleted file mode 100644
index c0c489334bc..00000000000
--- a/www/ap-jserv/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/02/05 13:59:49 wiz Exp $
---- src/c/Makefile.in.orig	Sat Jan 15 20:09:12 2000
-+++ src/c/Makefile.in	Sat Jan 15 20:30:00 2000
-@@ -391,7 +391,7 @@
- @MAKE_LIBJSERV_TRUE@	# file is also created (and on Solaris, the .a file isn't created)
- @MAKE_LIBJSERV_TRUE@	# so check for that to make things work.
- @MAKE_LIBJSERV_TRUE@	# HPUX uses .sl
--@MAKE_LIBJSERV_TRUE@	@ if ${TEST} -e ./.libs/${LIBJA} ; then \
-+@MAKE_LIBJSERV_TRUE@	@ if false ; then \
- @MAKE_LIBJSERV_TRUE@		echo "${CP} ./.libs/${LIBJA} $(DESTDIR)${LIBEXECDIR}/${MODSO}" ; \
- @MAKE_LIBJSERV_TRUE@		${CP} ./.libs/${LIBJA} $(DESTDIR)${LIBEXECDIR}/${MODSO} ; \
- @MAKE_LIBJSERV_TRUE@        elif ${TEST} -e ./.libs/${LIBJSO} ; then \