Update delegate to 6.1.7. Changes include numerous bug fixes,

support for SSI (Server Side Include) support, HTTP/1.1,
DGROOT, LIBPATH, SocksV5 server, and lots more.

8 files changed, 27 insertions, 70 deletions

diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index 2056baee15a..dd7ff02f646 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2000/03/16 13:53:26 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2000/04/16 15:19:14 rh Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/11/09 09:24:20 max Exp
 #
 
-DISTNAME=	delegate5.9.13
-PKGNAME=	delegate-5.9.13
+DISTNAME=	delegate6.1.7
+PKGNAME=	delegate-6.1.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://etlport.etl.go.jp/pub/DeleGate/ \
 		ftp://ftp.kyushu-u.ac.jp/pub/Net/WWW/server/delegate/ \
@@ -24,22 +24,23 @@ DEPENDS+=	readline-4.0:../../devel/readline
 DELEGATE_MANAGER?=	root@localhost
 
 pre-build:
-	@${ECHO} "MANAGER=${DELEGATE_MANAGER}" >> ${WRKSRC}/DELEGATE_CONF
+	@${ECHO} "ADMIN=${DELEGATE_MANAGER}" >> ${WRKSRC}/DELEGATE_CONF
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/delegated ${PREFIX}/sbin
 	${SED} -e 's:__PREFIX__:${PREFIX}:g' \
-	    -e 's:__MANAGER__:${DELEGATE_MANAGER}:g' \
+	    -e 's:__ADMIN__:${DELEGATE_MANAGER}:g' \
 	    ${WRKSRC}/delegated.sh.template \
 	    > ${WRKSRC}/delegated.sh.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/delegated.sh.sample \
 	   ${PREFIX}/etc/rc.d
-	${INSTALL_DATA} ${WRKSRC}/doc/Manual.txt \
-	   ${PREFIX}/man/cat8/delegated.0
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/delegate
+	${INSTALL_DATA} ${WRKSRC}/doc/Manual.htm \
+	   ${PREFIX}/share/doc/delegate/manual.html
 	@${MKDIR} ${PREFIX}/share/doc/delegate
-	${INSTALL_DATA} ${WRKSRC}/tutor-en.htm \
+	${INSTALL_DATA} ${WRKSRC}/doc/tutor-en.htm \
 	   ${PREFIX}/share/doc/delegate/tutorial-en.html
-	${INSTALL_DATA} ${WRKSRC}/tutor-jp.htm \
+	${INSTALL_DATA} ${WRKSRC}/doc/tutor-jp.htm \
 	   ${PREFIX}/share/doc/delegate/tutorial-jp.html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/delegate/files/md5 b/net/delegate/files/md5
index ec8c3099387..0acac7a89b7 100644
--- a/net/delegate/files/md5
+++ b/net/delegate/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 2000/01/27 07:39:30 rh Exp $
+$NetBSD: md5,v 1.8 2000/04/16 15:19:15 rh Exp $
 
-MD5 (delegate5.9.13.tar.gz) = febd995ffa9444844dcc7a76a8ec0dde
+MD5 (delegate6.1.7.tar.gz) = e342ef381ae1473ba5b1ab4023fc9f46
diff --git a/net/delegate/files/patch-sum b/net/delegate/files/patch-sum
index 94e3ea7a4a5..a68deed14a5 100644
--- a/net/delegate/files/patch-sum
+++ b/net/delegate/files/patch-sum
@@ -1,6 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/03/08 17:02:04 pooka Exp $
+$NetBSD: patch-sum,v 1.5 2000/04/16 15:19:15 rh Exp $
 
 MD5 (patch-aa) = eaad38bea7b23b391d45acdbe536049f
-MD5 (patch-ab) = 9ec290fe19ec4b9a99a642865f0eb870
-MD5 (patch-ac) = a4d11fee5d789f3cc8cf32e086282e64
-MD5 (patch-ad) = 316b9a5b3f7f303a9594a5f0a6a44405
+MD5 (patch-ab) = 44eb9b852c927f34cf8cc572556c74b6
diff --git a/net/delegate/patches/patch-ab b/net/delegate/patches/patch-ab
index 49461e00fc7..c530770cf89 100644
--- a/net/delegate/patches/patch-ab
+++ b/net/delegate/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 1999/02/23 18:28:35 rh Exp $
+$NetBSD: patch-ab,v 1.2 2000/04/16 15:19:15 rh Exp $
 
---- /dev/null	Tue Feb 23 03:26:24 1999
-+++ delegated.sh.template	Tue Feb 23 16:15:33 1999
+--- /dev/null	Sun Apr 16 13:06:24 2000
++++ delegated.sh.template	Sun Apr 16 13:08:29 2000
 @@ -0,0 +1,11 @@
 +#!/bin/sh
 +
 +if [ -x __PREFIX__/sbin/delegated ]; then
 +	__PREFIX__/sbin/delegated -P8080 \
-+	MANAGER=__MANAGER__ \
++	ADMIN=__ADMIN__ \
 +	CHARCODE=JIS \
 +	CACHEDIR=/var/spool/delegate/cache \
 +	EXPIRE=7d \
diff --git a/net/delegate/patches/patch-ac b/net/delegate/patches/patch-ac
deleted file mode 100644
index 6e81c88b607..00000000000
--- a/net/delegate/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/08/22 15:55:51 rh Exp $
-
---- doc/Manual.txt.orig	Wed Jun  2 05:31:41 1999
-+++ doc/Manual.txt	Sun Aug 22 17:05:59 1999
-@@ -1,9 +1,3 @@
--
--((((((( ``DeleGate Home Page'' is at http://wall.etl.go.jp/delegate/ )))))))
--(((((((      Read http://wall.etl.go.jp/delegate/tutorial/ first.    )))))))
--
-->>>>>>>>>>>>>>>>>>>>>>>>>>>>>> HALF DONE (^_^; <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
--
- DELEGATED(8)              MAINTENANCE COMMANDS                 DELEGATED(8)
- 
- NAME
diff --git a/net/delegate/patches/patch-ad b/net/delegate/patches/patch-ad
deleted file mode 100644
index 0438f8e34bb..00000000000
--- a/net/delegate/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/03/08 17:02:05 pooka Exp $
-
---- Makefile.orig	Fri Nov  5 09:42:28 1999
-+++ Makefile	Wed Mar  8 18:14:30 2000
-@@ -21,8 +21,8 @@
- 
- FILES = $(FILEC) $(MIME)
- 
--MKMKMK = mkmkmk.exe
--MKMAKE = mkmake.exe
-+MKMKMK = ./mkmkmk.exe
-+MKMAKE = ./mkmake.exe
- 
- HDRDIRS = -I../include $(CFLAGS)
- LIBDIRS = -L../lib
-@@ -32,12 +32,7 @@
- 		SHELL="$(SHELL)" HDRDIRS="$(HDRDIRS)" LIBDIRS="$(LIBDIRS)"
- 
- $(MKMAKE): Makefile mkmkmk.c maker/mkmake.c
--	$(CC) -DMKMKMK -DDEFCC=\"$(CC)\" $(HDRDIRS) $(LIBDIRS) mkmkmk.c -o $(MKMKMK)
--	@echo "-----------------------------------------------------------------"
--	@echo "This Makefile assumes '.' is included in your PATH environment."
--	@echo "If the following rule failed in '$(MKMKMK): not found'"
--	@echo "retry like this >>>>>>>>   $(MAKE) "PATH=\".:\$$PATH\"
--	@echo "-----------------------------------------------------------------"
-+	$(CC) -DMKMKMK -DDEFCC='"$(CC)"' $(HDRDIRS) $(LIBDIRS) mkmkmk.c -o $(MKMKMK)
- 	$(MKMKMK) -mkmkmk "$(CC)" $(HDRDIRS) $(LIBDIRS) maker/mkmake.c -o $@
- 
- files:;	@echo $(FILES)
diff --git a/net/delegate/pkg/MESSAGE b/net/delegate/pkg/MESSAGE
index b9de6f79627..5e8f4468daf 100644
--- a/net/delegate/pkg/MESSAGE
+++ b/net/delegate/pkg/MESSAGE
@@ -1,14 +1,15 @@
-$NetBSD: MESSAGE,v 1.3 1999/11/08 16:25:51 rh Exp $
+$NetBSD: MESSAGE,v 1.4 2000/04/16 15:19:17 rh Exp $
 
-**********************************************************************
-Now, copy the sample script in ${PREFIX}/etc/rc.d/delegated.sh.sample
+======================================================================
+Now copy the sample script in ${PREFIX}/etc/rc.d/delegated.sh.sample
 to ${PREFIX}/etc/rc.d/delegated.sh and edit it according to your
 needs.
 
-Don't forget to specify a correct e-mail address for MANAGER.
+Don't forget to specify a correct e-mail address for ADMIN.
 
 You can also run an interactive configuration session by executing 
 delegated with no argument.
 
-For more configuration information, consult delegated(8).
-**********************************************************************
+For more configuration information, consult
+${PREFIX}/share/doc/delegate/manual.html
+======================================================================
diff --git a/net/delegate/pkg/PLIST b/net/delegate/pkg/PLIST
index a3656ea6f90..ced1f00715d 100644
--- a/net/delegate/pkg/PLIST
+++ b/net/delegate/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 1999/02/23 18:28:35 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/04/16 15:19:17 rh Exp $
 sbin/delegated
 etc/rc.d/delegated.sh.sample
-man/cat8/delegated.0
+share/doc/delegate/manual.html
 share/doc/delegate/tutorial-en.html
 share/doc/delegate/tutorial-jp.html
 @dirrm share/doc/delegate