Upgrade delegate to 5.8.8

Adapt this package to NetBSD.

9 files changed, 77 insertions, 54 deletions

diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index 6e87cb66e6b..52adcdef890 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -1,35 +1,36 @@
-# New ports collection makefile for:	DeleGate
-# Version required:		5.7.2
-# Date created:			26 Jan 1997
-# Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
-#
-# $Id: Makefile,v 1.1.1.1 1999/02/23 18:20:59 rh Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/23 18:28:34 rh Exp $
+# FreeBSD Id: Makefile,v 1.14 1998/11/09 09:24:20 max Exp
 #
 
-DISTNAME=	delegate5.7.2
-PKGNAME=	delegate-5.7.2
-CATEGORIES=	net www japanese
+DISTNAME=	delegate5.8.8
+PKGNAME=	delegate-5.8.8
+CATEGORIES=	net
 MASTER_SITES=	ftp://etlport.etl.go.jp/pub/DeleGate/
 
-MAINTAINER=	max@FreeBSD.ORG
+MAINTAINER=	packages@NetBSD.ORG
+HOMEPAGE=	http://wall.etl.go.jp/delegate/
 
 MAKE_ENV=	PATH=$${PATH}:.
 
-.if defined(BATCH)
+DELEGATE_MANAGER?=	root@localhost
+
 pre-build:
-	@echo "MANAGER=root@localhost" >> ${WRKSRC}/DELEGATE_CONF
-.endif
+	@echo "MANAGER=${DELEGATE_MANAGER}" >> ${WRKSRC}/DELEGATE_CONF
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/delegated ${PREFIX}/sbin
-	@${MKDIR} ${PREFIX}/share/examples/delegate
-	${INSTALL_DATA} ${FILESDIR}/delegated.sh \
-	   ${PREFIX}/share/examples/delegate
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/delegate
+	${SED} -e 's:__PREFIX__:${PREFIX}:g' \
+	    -e 's:__MANAGER__:${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}/share/doc/delegate
-.endif
-	@${CAT} ${PKGDIR}/MESSAGE
+	   ${PREFIX}/man/cat8/delegated.0
+	@${MKDIR} ${PREFIX}/share/doc/delegate
+	${INSTALL_DATA} ${WRKSRC}/tutor-en.htm \
+	   ${PREFIX}/share/doc/delegate/tutorial-en.html
+	${INSTALL_DATA} ${WRKSRC}/tutor-jp.htm \
+	   ${PREFIX}/share/doc/delegate/tutorial-jp.html
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/delegate/files/delegated.sh b/net/delegate/files/delegated.sh
deleted file mode 100644
index a8997bcba30..00000000000
--- a/net/delegate/files/delegated.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ -x /usr/local/sbin/delegated ]; then
-        echo -n ' delegated'
-        /usr/local/sbin/delegated -P8080 \
-	MANAGER=delegate-master@your.host.domain \
-        CHARCODE=JIS \
-        CACHEDIR=/var/spool/delegate/cache \
-        EXPIRE=7d \
-        RELIABLE=hostname \
-        > /dev/null 2>&1
-
-fi
diff --git a/net/delegate/files/md5 b/net/delegate/files/md5
index 5fbb39368cb..642a7a1109f 100644
--- a/net/delegate/files/md5
+++ b/net/delegate/files/md5
@@ -1 +1,3 @@
-MD5 (delegate5.7.2.tar.gz) = e733d1673af91bb788a2902a69221baa
+$NetBSD: md5,v 1.2 1999/02/23 18:28:35 rh Exp $
+
+MD5 (delegate5.8.8.tar.gz) = e9df3c4e6fc2bb154f0f9f3f908276fe
diff --git a/net/delegate/patches/patch-aa b/net/delegate/patches/patch-aa
index 7232ff8e789..c194c201fa8 100644
--- a/net/delegate/patches/patch-aa
+++ b/net/delegate/patches/patch-aa
@@ -1,5 +1,7 @@
+$NetBSD: patch-aa,v 1.2 1999/02/23 18:28:35 rh Exp $
+
 --- src/lock.c.orig	Tue Aug  4 09:13:18 1998
-+++ src/lock.c	Thu Nov 19 18:17:09 1998
++++ src/lock.c	Mon Feb 22 15:36:21 1999
 @@ -18,6 +18,7 @@
  History:
  	970403	extracted from cache.c
diff --git a/net/delegate/patches/patch-ab b/net/delegate/patches/patch-ab
new file mode 100644
index 00000000000..49461e00fc7
--- /dev/null
+++ b/net/delegate/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 1999/02/23 18:28:35 rh Exp $
+
+--- /dev/null	Tue Feb 23 03:26:24 1999
++++ delegated.sh.template	Tue Feb 23 16:15:33 1999
+@@ -0,0 +1,11 @@
++#!/bin/sh
++
++if [ -x __PREFIX__/sbin/delegated ]; then
++	__PREFIX__/sbin/delegated -P8080 \
++	MANAGER=__MANAGER__ \
++	CHARCODE=JIS \
++	CACHEDIR=/var/spool/delegate/cache \
++	EXPIRE=7d \
++	RELIABLE=hostname \
++	> /dev/null 2>&1 && echo -n ' delegated'
++fi
diff --git a/net/delegate/patches/patch-ac b/net/delegate/patches/patch-ac
new file mode 100644
index 00000000000..30c73767151
--- /dev/null
+++ b/net/delegate/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 1999/02/23 18:28:35 rh Exp $
+
+--- doc/Manual.txt.orig	Wed Jan 13 13:29:59 1999
++++ doc/Manual.txt	Tue Feb 23 15:56:56 1999
+@@ -1,8 +1,3 @@
+->>>>>>>>>>>>>>>>>>>>>>>>>>>>>> HALF DONE (^_^; <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+-
+-((((((( ``DeleGate Home Page'' is at http://wall.etl.go.jp/delegate/ )))))))
+-
+-
+ DELEGATED(8)              MAINTENANCE COMMANDS                 DELEGATED(8)
+ 
+ NAME
diff --git a/net/delegate/pkg/DESCR b/net/delegate/pkg/DESCR
index 00aefb548ef..3a010f5780a 100644
--- a/net/delegate/pkg/DESCR
+++ b/net/delegate/pkg/DESCR
@@ -1,9 +1,10 @@
-DeleGate is a general purpose protocol proxy system for protocols
-using TCP/IP.  This software includes support for HTTP, Gopher, FTP,
-SMTP, NNTP, POP, Telnet, Wais, Whois, etc.
-
-More information can be found at:
-  http://wall.etl.go.jp/delegate/
-
-- Max
-
+DeleGate is a general purpose application level gateway, or a proxy
+server which runs on multiple platforms (Unix, Windows and OS/2).
+DeleGate mediates communication of various protocols (HTTP, FTP, NNTP,
+POP, Telnet, etc.), applying cache and conversion for mediated data,
+controlling access from clients and routing toward servers.  It
+translates protocols between clients and servers, merging several
+servers into a single server view with aliasing and filtering.  Born
+as a tiny proxy for Gopher in March 1994, it has steadily grown into a
+general purpose proxy server.  Besides proxy, DeleGate can be used as a
+simple origin server for some protocols (HTTP, FTP and NNTP). 
diff --git a/net/delegate/pkg/MESSAGE b/net/delegate/pkg/MESSAGE
index 99d68eb79bb..282a3f4be0e 100644
--- a/net/delegate/pkg/MESSAGE
+++ b/net/delegate/pkg/MESSAGE
@@ -1,11 +1,10 @@
 **********************************************************************
-Now, edit the sample script in /usr/local/share/examples/delegate directory
-and copy it into /usr/local/etc/rc.d.
-Especially, don't forget to specify correct value for the MANAGER.
+Now, edit the sample script in ${PREFIX}/etc/rc.d/delegated.sh.sample
+and copy it into ${PREFIX}/etc/rc.d/delegated.sh.
+Don't forget to specify a correct e-mail address for MANAGER.
 
 You can also run an interactive configuration session by executing 
 delegated with no argument.
 
-Consult /usr/local/share/doc/delegate/Manual.txt for configuration 
-information.
+For more configuration information, consult delegated(8).
 **********************************************************************
diff --git a/net/delegate/pkg/PLIST b/net/delegate/pkg/PLIST
index d8a769ac763..a3656ea6f90 100644
--- a/net/delegate/pkg/PLIST
+++ b/net/delegate/pkg/PLIST
@@ -1,5 +1,7 @@
+@comment $NetBSD: PLIST,v 1.2 1999/02/23 18:28:35 rh Exp $
 sbin/delegated
-share/examples/delegate/delegated.sh
-share/doc/delegate/Manual.txt
+etc/rc.d/delegated.sh.sample
+man/cat8/delegated.0
+share/doc/delegate/tutorial-en.html
+share/doc/delegate/tutorial-jp.html
 @dirrm share/doc/delegate
-@dirrm share/examples/delegate