upgrade to 2.6. pull IPv6 patch from ftp.kame.net (maintenance reason)

Version 2.6 of WWWOFFLE released : Sat Nov 18 19:15:00 2000
-----------------------------------------------------------

Bug Fixes:
 Improve HTML modification for unterminated tags.  Allow passworded pages to be
 fetched.  Improve compilation on non-Linux systems.  Fix bug with proxy config
 file entry.  Fix an error with not truncating files.  Fix an error with
 dir-perm and file-perm.  Fix problem when getting pages with passwords.  Fix
 problem deleting pages with passwords.

Documentation
 Added a note to the FAQ about DoS attacks and ipchains.


*NOTE* If upgrading from version 2.[2345] then you will need to convert your
       cache to the new format, see the file CONVERT for details.

*NOTE* If upgrading from version 2.4[abc] the max-size option in the Purge
       section of the configuration file has changed.  See CHANGES.CONF.

*NOTE* If upgrading from version 2.[123] the setting of the times of monitoring
       URLs has changed, check the monitor index and correct where needed.

*NOTE* If upgrading from version 1.x or 2.[01] then you will need to delete
       your cache since conversion from those formats is no longer provided.


Version 2.6-beta of WWWOFFLE released : Sun Oct 22 10:30:00 2000
----------------------------------------------------------------

Bug Fixes:
 Handle usernames specified in URLs including the '@' character.  Fix problems
 deleting URLs with arguments.  Fix bug with recursive fetching in same dir.
 Retry the select system call if it is interrupted.

Win32 Bug Fixes:
 Fix for local web-pages not being opened in binary mode.  Compilation fixes.

Internal Changes:
 Re-examined all URL-encoding and URL-decoding issues (small cache change).
 Ensure that the canonical form of the URL is used throughout.
 Changed the URLs in the indexes for monitor, delete & refresh.

Documentation
 Re-written the README.CONF file with new layout and more information.
 Added three more questions to the FAQ and updated several others.

Configuration File
 Allow many of the configuration file options be selectable on a URL by URL basis.
 Move some configuration file options around and create some new sections.
 Allow purge ages to be specified in larger units (weeks, months, years).
 Allow re-request times to be specified in larger units (minutes, hours, days).

New Configuration Options
 Add the ability to demoronise HTML (replace bogus characters with real ones).
 Add the ability to remove meta refresh tags that redirect browsers.
 Added the option to convert redirections to DontGet pages to errors.
 Allow the HTML modifications to happen to pages viewed when online.
 Add timeouts to DNS lookups to stop WWWOFFLE servers hanging up.
 Add the option to enable the use of lock files (defaults to disabled).

New Features
 Remove the index of the latest pages (was slow on big caches).
 Add an index of the pages that were in the outgoing directory last time.
 Change the don't cache option so that pages are not requested when offline.
 Allow password protected URLs to be deleted.
 Aliased pages now use a redirect rather than re-writing the URL.
 Make it safe to have symlinks in the cache.

Searching
 Changed the ht://Dig search URLs in WWWOFFLE from /htdig/* to /search/htdig/*.
 Allow the use of UdmSearch instead of ht://Dig.

Contrib
 Improved the audit-usage.pl script to show cache hit/miss status for requests.

13 files changed, 24 insertions, 1090 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 50b0767506d..216d5cd3c8b 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.19 2000/08/07 08:27:37 fredb Exp $
+# $NetBSD: Makefile,v 1.20 2000/11/20 05:12:38 itojun Exp $
 
-DISTNAME=	wwwoffle-2.5e
+DISTNAME=	wwwoffle-2.6
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/httpd/ \
+MASTER_SITES=	http://www.gedanken.demon.co.uk/download-wwwoffle/ \
+		ftp://ftp.demon.co.uk/pub/unix/httpd/ \
 		${MASTER_SITE_SUNSITE:=apps/www/servers/}
 EXTRACT_SUFX=	.tgz
 
+PATCHFILES+=	wwwoffle-26-v6-20001120.diff.gz
+PATCH_SITES+=	ftp://ftp.kame.net/pub/kame/misc/
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gedanken.demon.co.uk/wwwoffle/
 
@@ -17,25 +22,12 @@ PLIST_SRC=	${WRKDIR}/PLIST
 
 BUILD_DEFS+=	USE_INET6
 
-# to get USE_INET6
 .include "../../mk/bsd.prefs.mk"
 
-# IPv6 support
-.if defined(USE_INET6) && ${USE_INET6} == YES
-PATCHDIR=       ${WRKDIR}/.patches
-.endif
-
 .if ${OPSYS} == "SunOS"
 MAKE_ENV+=	LIBRARY="-lnsl -lsocket"
 .endif
 
-pre-patch:
-.if defined(USE_INET6) && ${USE_INET6} == YES
-	${MKDIR} ${WRKDIR}/.patches
-	${CP} ${.CURDIR}/patches/patch-* ${WRKDIR}/.patches
-	${CP} ${.CURDIR}/patches.v6/patch-* ${WRKDIR}/.patches
-.endif
-
 post-build:
 	cd ${WRKSRC}/html/htdig/scripts; \
 	for f in wwwoffle-ht*; do \
diff --git a/www/wwwoffle/files/md5 b/www/wwwoffle/files/md5
index 1001b502638..7c671e5fad3 100644
--- a/www/wwwoffle/files/md5
+++ b/www/wwwoffle/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.8 2000/06/06 13:22:29 itojun Exp $
+$NetBSD: md5,v 1.9 2000/11/20 05:12:38 itojun Exp $
 
-MD5 (wwwoffle-2.5e.tgz) = a622bdfe4045171aed8934220d3c4630
+MD5 (wwwoffle-2.6.tgz) = 40360860c6f57c27316f1a6efcc90457
+MD5 (wwwoffle-26-v6-20001120.diff.gz) = 88d3def5c50f914369c8631e1d994fc8
diff --git a/www/wwwoffle/files/patch-sum b/www/wwwoffle/files/patch-sum
index 500a6b02701..3f9825f35ee 100644
--- a/www/wwwoffle/files/patch-sum
+++ b/www/wwwoffle/files/patch-sum
@@ -1,11 +1,3 @@
-$NetBSD: patch-sum,v 1.10 2000/06/06 13:22:29 itojun Exp $
+$NetBSD: patch-sum,v 1.11 2000/11/20 05:12:38 itojun Exp $
 
-MD5 (patch-aa) = 368edeacd11a25735194b25b6b1a00bc
-MD5 (patch-ba) = 697b7cad9f1cd82c4b74da1317f4f987
-MD5 (patch-bb) = 06fd1d3b05e51f2594d97c4213b897ae
-MD5 (patch-bc) = 6bb173924ac901827f282fcdef72b71a
-MD5 (patch-bd) = 526ecc28c80aaaf26fd5fc34893a97fa
-MD5 (patch-be) = 0a1d40853dc4b1efaff7d96981efad2d
-MD5 (patch-bf) = 757112e555a41d0365eaaf85d177dadd
-MD5 (patch-bg) = 041ca5bbe12ab11e3fecce0d239c4528
-MD5 (patch-bh) = 1241dca0eb0e06a56ad2bee04c4b0591
+MD5 (patch-aa) = e3f0fba77d933f06ed9b8abc753d2f11
diff --git a/www/wwwoffle/patches.v6/patch-ba b/www/wwwoffle/patches.v6/patch-ba
deleted file mode 100644
index c2e68ba56ea..00000000000
--- a/www/wwwoffle/patches.v6/patch-ba
+++ /dev/null
@@ -1,117 +0,0 @@
-$NetBSD: patch-ba,v 1.3 1999/11/26 06:09:01 itohy Exp $
-
---- config.c.orig	Thu Sep 23 01:31:33 1999
-+++ config.c	Thu Nov 25 20:00:34 1999
-@@ -798,11 +798,15 @@
-     localhost=(*LocalHost)->key.string;
-  else
-     localhost="localhost";
--
-+ 
-  ret=(char*)malloc(strlen(localhost)+8);
- 
-- if(port)
--    sprintf(ret,"%s:%d",localhost,HTTP_Port);
-+ if(port) {
-+    if (strchr(localhost, ':')) 
-+       sprintf(ret,"[%s]:%d",localhost,HTTP_Port);
-+    else
-+       sprintf(ret,"%s:%d",localhost,HTTP_Port);
-+ }
-  else
-     strcpy(ret,localhost);
- 
-@@ -821,20 +825,32 @@
-   int port If true then check the port number as well.
-   ++++++++++++++++++++++++++++++++++++++*/
- 
--int IsLocalHost(char *host,int port)
-+int IsLocalHost(char *hoststr,int port)
- {
-  KeyPair **p;
-- char *colon=strchr(host,':');
-+ char *escl, *escr, *host, *colon;
-  int isit=0;
- 
-- if(colon)
--    *colon=0;
-+ escl=strchr(hoststr,'[');
-+ escr=strrchr(hoststr,']');
-+ colon=strrchr(hoststr,':');
-+ host = hoststr;
-+
-+ if (escl && escr) {
-+     host = escl + 1;
-+     *escr = 0;
-+ }
-+ else if(colon)
-+     *colon=0;
- 
-  if(LocalHost)
-     for(p=LocalHost;(*p)!=&KeyPairEnd;p++)
-        if(!strcmp((*p)->key.string,host))
-          {isit=1;break;}
- 
-+ if (escl && escr) 
-+     *escr = ']';
-+
-  if(colon)
-     *colon=':';
- 
-@@ -859,14 +875,23 @@
-   char *host The name of the host (and port number) to be checked.
-   ++++++++++++++++++++++++++++++++++++++*/
- 
--int IsLocalNetHost(char *host)
-+int IsLocalNetHost(char *hoststr)
- {
-  KeyPair **p;
-- char *colon=strchr(host,':');
-+ char *escl, *escr, *host, *colon;
-  int isit=0;
- 
-- if(colon)
--    *colon=0;
-+ escl=strchr(hoststr,'[');
-+ escr=strrchr(hoststr,']');
-+ colon=strrchr(hoststr,':');
-+ host = hoststr;
-+
-+ if (escl && escr) {
-+     host = escl + 1;
-+     *escr = 0;
-+ }
-+ else if(colon) 
-+     *colon=0;
- 
-  if(IsLocalHost(host,0))
-     isit=1;
-@@ -881,6 +906,10 @@
-        else if(wildcard_match(host,(*p)->key.string))
-          {isit=1;break;}
- 
-+
-+ if (escl && escr) 
-+     *escr = ']';
-+
-  if(colon)
-     *colon=':';
- 
-@@ -2192,7 +2221,7 @@
-        {errmsg=(char*)malloc(40);strcpy(errmsg,"Expecting a hostname, got nothing.");}
-      else
-        {
--        char *colon=strchr(text,':'),*p;
-+        char *colon = NULL,*p;
-         if(colon)
-           {errmsg=(char*)malloc(56+strlen(text));sprintf(errmsg,"Expecting a hostname not a port number, got '%s'.",text);}
-         else
-@@ -2219,7 +2248,7 @@
-       {errmsg=(char*)malloc(48);strcpy(errmsg,"Expecting a hostname (and port), got nothing.");}
-     else
-       {
--       char *colon=strchr(text,':'),*p;
-+       char *colon=strrchr(text,':'),*p;
-        if(*text==':')
-          {errmsg=(char*)malloc(48+strlen(text));sprintf(errmsg,"Expecting a hostname before the ':', got '%s'.",text);}
-        else
diff --git a/www/wwwoffle/patches.v6/patch-bb b/www/wwwoffle/patches.v6/patch-bb
deleted file mode 100644
index 25528a523eb..00000000000
--- a/www/wwwoffle/patches.v6/patch-bb
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-bb,v 1.3 1999/11/26 06:09:01 itohy Exp $
-
---- http.c.orig	Sun Oct 24 18:05:45 1999
-+++ http.c	Thu Nov 25 20:00:34 1999
-@@ -44,8 +44,8 @@
- char *HTTP_Open(URL *Url)
- {
-  char *msg=NULL;
-- char *colon;
-- char *server_host=NULL;
-+ char *colon, *escr, *escl;
-+ char *server_host, *host;
-  int server_port=Protocols[Protocol_HTTP].defport;
- 
-  proxy=WhichProxy(Url->proto,Url->host);
-@@ -63,7 +63,19 @@
-     strcpy(server_host,Url->host);
-    }
- 
-- if((colon=strchr(server_host,':')))
-+ escl=strchr(server_host,'[');
-+ escr=strrchr(server_host,']');
-+ if (escr && escl) {
-+     *escr=0;
-+     host = escl+1;
-+     colon = strrchr(escr+1,':');
-+ }     
-+ else {
-+     host = server_host;
-+     colon = strrchr(server_host,':');
-+ }
-+
-+ if(colon) 
-    {
-     *colon++=0;
-     if(*colon)
-@@ -72,11 +84,11 @@
- 
-  /* Open the connection. */
- 
-- server=OpenClientSocket(server_host,server_port,ConnectTimeout);
-+ server=OpenClientSocket(host,server_port,ConnectTimeout);
-  init_buffer(server);
- 
-  if(server==-1)
--    msg=PrintMessage(Warning,"Cannot open the HTTP connection to %s port %d; [%!s].",server_host,server_port);
-+    msg=PrintMessage(Warning,"Cannot open the HTTP connection to %s port %d; [%!s].",host,server_port);
- 
-  free(server_host);
- 
diff --git a/www/wwwoffle/patches.v6/patch-bc b/www/wwwoffle/patches.v6/patch-bc
deleted file mode 100644
index e4b22a6744c..00000000000
--- a/www/wwwoffle/patches.v6/patch-bc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-bc,v 1.5 2000/02/16 00:24:41 itohy Exp $
-
---- misc.c.orig	Sun Dec 19 01:07:01 1999
-+++ misc.c	Wed Feb 16 07:49:26 2000
-@@ -44,7 +44,7 @@
-  URL *Url=(URL*)malloc(sizeof(URL));
-  char *copyurl,*mallocurl=malloc(strlen(url)+2);
-  int i=0,n=0;
-- char *colon,*slash,*at,*ques,*temppath,root[2];
-+ char *colon,*slash,*escr,*at,*ques,*temppath,root[2];
- 
-  copyurl=mallocurl;
-  strcpy(copyurl,url);
-@@ -175,12 +175,17 @@
-     strcpy(Url->host,copyurl);
-    }
- 
-- for(i=0;Url->host[i] && Url->host[i]!=':';i++)
-+ colon=strrchr(Url->host,':');
-+ escr=strrchr(Url->host,']');
-+ if (escr && colon < escr)
-+     colon = strrchr(escr+1,':');
-+
-+ for(i=0;Url->host[i] && (i != colon - Url->host);i++)
-     Url->host[i]=tolower(Url->host[i]);
- 
-- if(Url->host[i]==':')
--    if(atoi(&Url->host[i+1])==(Url->Protocol?Url->Protocol->defport:80))
--       Url->host[i]=0;
-+ if(colon)
-+    if(atoi(colon+1)==(Url->Protocol?Url->Protocol->defport:80))
-+       *colon=0;
- 
-  if(!Url->local && IsLocalHost(Url->host,1) && Url->Protocol && Url->Protocol==&Protocols[0])
-    {
diff --git a/www/wwwoffle/patches.v6/patch-bd b/www/wwwoffle/patches.v6/patch-bd
deleted file mode 100644
index bb8fb7aae74..00000000000
--- a/www/wwwoffle/patches.v6/patch-bd
+++ /dev/null
@@ -1,455 +0,0 @@
-$NetBSD: patch-bd,v 1.3 1999/11/26 06:09:01 itohy Exp $
-
---- sockets.c.orig	Tue Jul  6 03:46:16 1999
-+++ sockets.c	Thu Nov 25 20:00:36 1999
-@@ -15,6 +15,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include <errno.h>
- #include <unistd.h>
-@@ -47,93 +48,133 @@
- 
- int OpenClientSocket(char* host, int port,int timeout)
- {
-- int s;
-- int retval;
-- struct sockaddr_in server;
-- struct hostent* hp;
-+ int s = -1;
-+ int connected, err;
-+ struct addrinfo hints, *r, *res = NULL;
-  int noblock,flags;
-+ char *aport = NULL;
- 
-- server.sin_family=AF_INET;
-- server.sin_port=htons((unsigned short)port);
--
-- hp=gethostbyname(host);
-- if(!hp)
--   {
--    unsigned long int addr=inet_addr(host);
--    if(addr!=-1)
--       hp=gethostbyaddr((char*)addr,sizeof(addr),AF_INET);
--
--    if(!hp)
--      {errno=-1;PrintMessage(Warning,"Unknown host '%s' for server [%!s].",host);return(-1);}
--   }
-- memcpy((char*)&server.sin_addr,(char*)hp->h_addr,sizeof(server.sin_addr));
--
-- s=socket(PF_INET,SOCK_STREAM,0);
-- if(s==-1)
--   {PrintMessage(Warning,"Cannot create client socket [%!s].");return(-1);}
--
-+ err = asprintf(&aport, "%d", port);
-+ if (err < 0) {
-+     errno=-1;
-+     PrintMessage(Warning,"Memory Alloc Fails [%!s].");
-+     return(-1);
-+ }
-+ 
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_flags = AI_NUMERICHOST;
-+ hints.ai_family = AF_UNSPEC;
-+ hints.ai_socktype= SOCK_STREAM;
-+ err = getaddrinfo(host, aport, &hints, &res);
-+ if (res) {
-+     freeaddrinfo(res);
-+     res = NULL;
-+ }
-+
-+ if (!err) {
-+     /*numeric*/
-+     memset(&hints, 0, sizeof(hints));
-+     hints.ai_flags = AI_CANONNAME;
-+     hints.ai_family = AF_UNSPEC;
-+     hints.ai_socktype = SOCK_STREAM;
-+     hints.ai_protocol = 0;
-+     err = getaddrinfo(host, aport, &hints, &res);
-+ } else {
-+     /*non-numeric*/
-+     memset(&hints, 0, sizeof(hints));
-+     hints.ai_family = AF_UNSPEC;
-+     hints.ai_socktype = SOCK_STREAM;
-+     hints.ai_protocol = 0;
-+     err = getaddrinfo(host, aport, &hints, &res);
-+ }
-+
-+ if (err) {
-+     s = -1; errno=-1;
-+     PrintMessage(Warning,"%s '%s', server [%!s].", gai_strerror(err), host);
-+ }
-+ else {
-+        err = 0; s = -1;
-+        connected = 0;
-+        for (r = res; r && !connected; r = r->ai_next) {
-+                s = socket(r->ai_family, r->ai_socktype, r->ai_protocol);
-+                if (s < 0) {
-+                        PrintMessage(Warning,"Cannot create client socket [%!s].");
-+                        continue;
-+                }
- #ifdef O_NONBLOCK
-- flags=fcntl(s,F_GETFL,0);
-- if(flags!=-1)
--    noblock=fcntl(s,F_SETFL,flags|O_NONBLOCK);
-- else
--    noblock=-1;
-+		flags=fcntl(s,F_GETFL,0);
-+		if(flags!=-1)
-+		    noblock=fcntl(s,F_SETFL,flags|O_NONBLOCK);
-+		else
-+		    noblock=-1;
- #else
-- flags=1;
-- noblock=ioctl(s,FIONBIO,&flags);
-+		flags=1;
-+		noblock=ioctl(s,FIONBIO,&flags);
- #endif
- 
-- retval=connect(s,(struct sockaddr *)&server,sizeof(server));
--
-- if(retval==-1 && noblock!=-1 && errno==EINPROGRESS)
--   {
--    fd_set writefd;
--    struct timeval tv;
--
--    FD_ZERO(&writefd);
--    FD_SET(s,&writefd);
--
--    tv.tv_sec=timeout;
--    tv.tv_usec=0;
--
--    retval=select(s+1,NULL,&writefd,NULL,&tv);
--
--    if(retval>0)
--      {
--       int arglen=sizeof(int);
--
--       if(getsockopt(s,SOL_SOCKET,SO_ERROR,&retval,&arglen)<0)
--          retval=errno;
--
--       if(retval!=0)
--          errno=retval,retval=-1;
--       if(errno==EINPROGRESS)
--          errno=ETIMEDOUT;
--      }
--    else if(retval==0)
--       errno=ETIMEDOUT,retval=-1;
--   }
--
-- if(retval<0)
--   {
--    close(s);
--    s=-1;
--
--    PrintMessage(Warning,"Connect fail [%!s].");
--   }
-- else
--   {
-+                err = connect(s, r->ai_addr, r->ai_addrlen);
-+		if(err==-1 && noblock!=-1 && errno==EINPROGRESS)
-+		{
-+		    fd_set writefd;
-+		    struct timeval tv;
-+
-+		    FD_ZERO(&writefd);
-+		    FD_SET(s,&writefd);
-+
-+		    tv.tv_sec=timeout;
-+		    tv.tv_usec=0;
-+
-+		    err=select(s+1,NULL,&writefd,NULL,&tv);
-+
-+		    if(err>0)
-+		    {
-+			int arglen=sizeof(int);
-+
-+			if(getsockopt(s,SOL_SOCKET,SO_ERROR,&err,&arglen)<0)
-+			    err=errno;
-+
-+			if(err!=0)
-+			    errno=err,err=-1;
-+			if(errno==EINPROGRESS)
-+			    errno=ETIMEDOUT;
-+		    }
-+		    else if(err==0)
-+			errno=ETIMEDOUT,err=-1;
-+		}
-+
-+		if(err<0)
-+		{
-+		    close(s);
-+		    s=-1;
-+
-+		    PrintMessage(Warning,"Connect fail [%!s].");
-+		    continue;
-+		}
-+		else
-+		{
- #ifdef O_NONBLOCK
--    flags=fcntl(s,F_GETFL,0);
--    if(flags!=-1)
--       fcntl(s,F_SETFL,flags&~O_NONBLOCK);
-+		    flags=fcntl(s,F_GETFL,0);
-+		    if(flags!=-1)
-+			fcntl(s,F_SETFL,flags&~O_NONBLOCK);
- #else
--    flags=0;
--    ioctl(s,FIONBIO,&flags);
-+		    flags=0;
-+		    ioctl(s,FIONBIO,&flags);
- #endif
--   }
--
-- return(s);
-+		}
-+		
-+                PrintMessage(Inform,"Connected ok to client [%!s].");
-+                connected++;
-+                break;
-+        }
-+        if (!connected) s = -1;
-+ } 
-+ if (res) freeaddrinfo(res);
-+ if (aport) free(aport);
-+
-+ if (s < 0) 
-+        PrintMessage(Warning,"OSC Connect fail [%!s].");
-+ 
-+ return (s);
- }
- 
- 
-@@ -145,30 +186,75 @@
-   int port The port number to use.
-   ++++++++++++++++++++++++++++++++++++++*/
- 
--int OpenServerSocket(int port)
-+int *OpenServerSockets(int port)
- {
-- int s;
-- int retval;
-- struct sockaddr_in server;
-- int reuse_addr=1;
--
-- s=socket(PF_INET,SOCK_STREAM,0);
-- if(s==-1)
--   {PrintMessage(Warning,"Cannot create server socket [%!s].");return(-1);}
--
-- setsockopt(s,SOL_SOCKET,SO_REUSEADDR,&reuse_addr,sizeof(reuse_addr));
--
-- server.sin_family=AF_INET;
-- server.sin_addr.s_addr=INADDR_ANY;
-- server.sin_port=htons((unsigned int)port);
-+ int *s = NULL, *slist = NULL, maxs, error;
-+ int reuse_addr = 1;
-+ struct addrinfo hints, *r = NULL, *res;
-+ char *aport = NULL;
-+
-+ error = asprintf(&aport, "%d", port);
-+ if (error < 0)
-+     PrintMessage(Warning,"Memory Alloc Fails [%!s].");
-+ else {
-+ 	memset(&hints, 0, sizeof(hints));
-+ 	hints.ai_flags = AI_PASSIVE;
-+ 	hints.ai_family = AF_UNSPEC;
-+ 	hints.ai_socktype = SOCK_STREAM;
-+ 	hints.ai_protocol = 0;
-+ 	error = getaddrinfo(NULL, aport, &hints, &res);
-+ 	if (error) 
-+     		PrintMessage(Warning,"%s  [%!s].",gai_strerror(error));
-+	if (aport) 
-+	    free (aport);
-+
-+	if (!error) {
-+	    for (maxs = 0, r = res; r; r = r->ai_next, maxs++);
-+	    slist = malloc ((maxs+1) * sizeof(int));
-+	    if (!slist) 
-+     		PrintMessage(Warning,"Memory Alloc Fails [%!s].");
-+	    else {
-+ 		slist[0] = 0; /* counting number of sockets */
-+
-+ 		s = slist+1;
-+ 		for (r = res; r; r = r->ai_next) {
-+		    *s = socket(r->ai_family, r->ai_socktype, r->ai_protocol);
-+		    if (*s < 0) {
-+			PrintMessage(Warning,"Cannot create server socket [%!s].");
-+			continue;
-+		    }
-+		    setsockopt(*s,SOL_SOCKET,SO_REUSEADDR,&reuse_addr,sizeof(reuse_addr));
-+		    
-+		    if (bind(*s, r->ai_addr, r->ai_addrlen) < 0) {
-+			PrintMessage(Warning,"Failed to bind server socket [%!s].");
-+			close (*s);
-+			continue;
-+		    }
-+		    if (listen(*s, 4) < 0) {
-+			close (*s);
-+			continue;
-+		    }
-+		    slist[0] = slist[0] + 1;
-+		    s++;
-+		}
-+	    }
-+	} else
-+	    slist = NULL;
-+ } 
-+ 
-+
-+ if (res) freeaddrinfo(res);
-+
-+ if (slist && !slist[0]) {
-+      	PrintMessage(Warning,"Failed to bind server socket [%!s].");
-+ 	free (slist);
-+       	slist = NULL;
-+ }   
- 
-- retval=bind(s,(struct sockaddr*)&server,sizeof(server));
-- if(retval==-1)
--   {PrintMessage(Warning,"Failed to bind server socket [%!s].");return(-1);}
-+ if (!slist)
-+     	errno = -1;
- 
-- listen(s,4);
--
-- return(s);
-+ return (slist);
- }
- 
- 
-@@ -209,35 +295,43 @@
- 
- int SocketRemoteName(int socket,char **name,char **ipname,int *port)
- {
-- struct sockaddr_in server;
-- int length=sizeof(server),retval;
-- static char host[MAXHOSTNAMELEN],ip[16];
-- struct hostent* hp=NULL;
--
-- retval=getpeername(socket,(struct sockaddr*)&server,&length);
-- if(retval==-1)
--    PrintMessage(Warning,"Failed to get socket peername [%!s].");
-- else
--   {
--    hp=gethostbyaddr((char*)&server.sin_addr,sizeof(server.sin_addr),AF_INET);
--    if(hp)
--       strcpy(host,hp->h_name);
--    else
--       strcpy(host,inet_ntoa(server.sin_addr));
--
--    strcpy(ip,inet_ntoa(server.sin_addr));
-+ struct sockaddr_storage server;
-+ int length=sizeof(server),retval,error;
-+ static char host[NI_MAXHOST],ip[NI_MAXHOST],portstr[NI_MAXSERV];
-+
-+ error = getpeername(socket,(struct sockaddr*)&server,&length);
-+ if(error) {
-+     	PrintMessage(Warning,"Failed to get socket peername [%!s].");
-+ 	retval = error;	
-+ } else {
-+     	error = getnameinfo((struct sockaddr*)&server, length, host,
-+				NI_MAXHOST, NULL, 0, 0);
-+	retval = getnameinfo((struct sockaddr*)&server, length, ip,
-+			      	NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-+	if (error)
-+		retval = error;
-+
-+        error = getnameinfo((struct sockaddr*)&server, length, NULL, 0,
-+                             portstr, NI_MAXSERV, 0);
-+                             
-+        if (error)           
-+            retval = getnameinfo((struct sockaddr*)&server, length, ip,
-+                                 NI_MAXHOST, portstr, NI_MAXSERV,
-+                                 NI_NUMERICSERV);
-+     	if (retval)
-+	 	PrintMessage(Warning,"Failed Name Lookup [%!s]: %s.", gai_strerror(retval));
- 
--    if(name)
--       *name=host;
-+ 	if(name)
-+     		*name=host;
- #ifdef __CYGWIN__
--    if(!strcmp(ip,"127.0.0.1"))
--       *name="localhost";
-+ 	if(!strcmp(ip,"127.0.0.1"))
-+     		*name="localhost";
- #endif
--    if(ipname)
--       *ipname=ip;
--    if(port)
--       *port=ntohs(server.sin_port);
--   }
-+ 	if(ipname)
-+     		*ipname=ip;
-+ 	if(port)
-+     		*port=atoi(portstr);
-+ }
- 
-  return(retval);
- }
-@@ -259,37 +353,35 @@
- 
- int SocketLocalName(int socket,char **name,char **ipname,int *port)
- {
-- struct sockaddr_in server;
-- int length=sizeof(server),retval;
-- static char host[MAXHOSTNAMELEN],ip[16];
-- struct hostent* hp=NULL;
--
-- retval=getsockname(socket,(struct sockaddr*)&server,&length);
-- if(retval==-1)
--    PrintMessage(Warning,"Failed to get socket name [%!s].");
-- else
--   {
--    hp=gethostbyaddr((char*)&server.sin_addr,sizeof(server.sin_addr),AF_INET);
--    if(hp)
--       strcpy(host,hp->h_name);
--    else
--       strcpy(host,inet_ntoa(server.sin_addr));
--
--    strcpy(ip,inet_ntoa(server.sin_addr));
--
-+    struct sockaddr_storage server;
-+    int length=sizeof(server), retval, error;
-+    static char host[NI_MAXHOST],ip[NI_MAXHOST],portstr[NI_MAXSERV];
-+    
-+    error = getsockname(socket,(struct sockaddr*)&server,&length);
-+    if(error) {
-+         retval = error;          
-+   	 PrintMessage(Warning,"Failed to get socket name [%!s].");
-+    }
-+    else {
-+        error = name ? getnameinfo((struct sockaddr*)&server, length, host,
-+                            NI_MAXHOST, NULL, 0, 0) : 0;
-+        retval = ipname ? getnameinfo((struct sockaddr*)&server, length, ip,
-+                            NI_MAXHOST, NULL, NI_MAXSERV, NI_NUMERICHOST) : 0;
-+	if (error)
-+        	retval = error;     
-+        
-+        retval = port ? getnameinfo((struct sockaddr*)&server, length, NULL, 0,
-+                         	 portstr, NI_MAXSERV, NI_NUMERICSERV) : 0;
-+    }                            
-+        
-     if(name)
--       *name=host;
--#ifdef __CYGWIN__
--    if(!strcmp(ip,"127.0.0.1"))
--       *name="localhost";
--#endif
-+        *name=host;
-     if(ipname)
--       *ipname=ip;
-+        *ipname=ip;
-     if(port)
--       *port=ntohs(server.sin_port);
--   }
--
-- return(retval);
-+        *port=atoi(portstr);
-+        
-+    return(retval);
- }
- 
- 
diff --git a/www/wwwoffle/patches.v6/patch-be b/www/wwwoffle/patches.v6/patch-be
deleted file mode 100644
index 6302807685d..00000000000
--- a/www/wwwoffle/patches.v6/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.3 1999/11/26 06:09:01 itohy Exp $
-
---- sockets.h.orig	Tue Jul  6 03:46:16 1999
-+++ sockets.h	Thu Nov 25 20:00:36 1999
-@@ -20,7 +20,7 @@
- 
- int OpenClientSocket(char* host, int port,int timeout);
- 
--int OpenServerSocket(int port);
-+int *OpenServerSockets(int port);
- int AcceptConnect(int socket);
- 
- int SocketRemoteName(int socket,char **name,char **ipname,int *port);
diff --git a/www/wwwoffle/patches.v6/patch-bf b/www/wwwoffle/patches.v6/patch-bf
deleted file mode 100644
index 9e91869247c..00000000000
--- a/www/wwwoffle/patches.v6/patch-bf
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-bf,v 1.3 1999/11/26 06:09:01 itohy Exp $
-
---- wwwoffle.c.orig	Fri Oct 15 18:26:54 1999
-+++ wwwoffle.c	Thu Nov 25 20:00:36 1999
-@@ -245,7 +245,7 @@
- 
-     if(!strcmp(argv[i],"-p"))
-       {
--       char *colon;
-+       char *colon, *escr, *escl;
- 
-        if(++i>=argc)
-          {fprintf(stderr,"wwwoffle: The '-p' argument requires a hostname and optionally a port number.\n"); exit(1);}
-@@ -253,7 +253,7 @@
-        if(ConfigFile)
-          {fprintf(stderr,"wwwoffle: The '-p' and '-c' options cannot be used together.\n"); exit(1);}
- 
--       if((colon=strchr(argv[i],':')))
-+       if((colon=strrchr(argv[i],':')))
-          {
-           *colon++=0;
- 
-@@ -263,7 +263,14 @@
-             {fprintf(stderr,"wwwoffle: The port number %d '%s' is invalid.\n",port,argv[i]); exit(1);}
-          }
- 
--       host=argv[i];
-+       escl=strchr(argv[i],'[');
-+       escr=strrchr(argv[i],']');
-+       if (escl && escr) {
-+	   host=escl+1;
-+	   *escr=0;
-+       }
-+       else
-+	   host=argv[i];
- 
-        argv[i-1]=NULL;
-        argv[i]=NULL;
-@@ -379,12 +386,12 @@
-        host=(char*)malloc(strlen(env)+1);
-        strcpy(host,env);
- 
--       if((colon1=strchr(host,':')))
-+       if((colon2=strrchr(host,':')))
-          {
--          *colon1=0;
--          if((colon2=strchr(colon1+1,':')))
-+          *colon2=0;
-+          if((colon1=strchr(host,':')))
-             {
--             *colon2=0;
-+             *colon1=0;
-              if(action==Get || action==Output || action==OutputWithHeader)
-                 port=atoi(colon1+1);
-              else
diff --git a/www/wwwoffle/patches.v6/patch-bg b/www/wwwoffle/patches.v6/patch-bg
deleted file mode 100644
index d2ddf90633d..00000000000
--- a/www/wwwoffle/patches.v6/patch-bg
+++ /dev/null
@@ -1,194 +0,0 @@
-$NetBSD: patch-bg,v 1.5 2000/02/22 00:49:01 itohy Exp $
-
---- wwwoffled.c.orig	Wed Dec 29 05:05:15 1999
-+++ wwwoffled.c	Tue Feb 22 08:34:12 2000
-@@ -50,8 +50,8 @@
- 
- 
- /*+ The server sockets that we listen on +*/
--int http_fd=-1,                 /*+ for the HTTP connections. +*/
--    wwwoffle_fd=-1;             /*+ for the WWWOFFLE connections. +*/
-+int *http_fd_list, http_fd,              /*+ for the HTTP connections. +*/
-+    *wwwoffle_fd_list, wwwoffle_fd;      /*+ for the WWWOFFLE connections. +*/
- 
- /*+ The online / offline /autodial status. +*/
- int online=0;
-@@ -173,12 +173,12 @@
-  if(WWWOFFLE_Gid != -1 || WWWOFFLE_Uid != -1)
-     PrintMessage(Inform,"Running with uid=%d, gid=%d.",getuid(),getgid());
- 
-- http_fd=OpenServerSocket(HTTP_Port);
-- if(http_fd==-1)
-+ http_fd_list=OpenServerSockets(HTTP_Port);
-+ if(!http_fd_list)
-     PrintMessage(Fatal,"Cannot create HTTP server socket.");
- 
-- wwwoffle_fd=OpenServerSocket(WWWOFFLE_Port);
-- if(wwwoffle_fd==-1)
-+ wwwoffle_fd_list=OpenServerSockets(WWWOFFLE_Port);
-+ if(!wwwoffle_fd_list)
-     PrintMessage(Fatal,"Cannot create WWWOFFLE server socket.");
- 
-  umask(0);
-@@ -213,20 +213,29 @@
-    {
-     struct timeval tv;
-     fd_set readfd;
-+    int fd, i;
-     int nfds;
-     int retval;
- 
--    if(http_fd>wwwoffle_fd)
--       nfds=http_fd+1;
--    else
--       nfds=wwwoffle_fd+1;
-+    fd = http_fd_list[1];
-+    for (i = 1; i <= http_fd_list[0]; i++) {
-+	if (!fd || fd < http_fd_list[i])
-+	    fd = http_fd_list[i];
-+    }
-+    for (i = 1; i <= wwwoffle_fd_list[0]; i++) {
-+	if (!fd || fd < wwwoffle_fd_list[i])
-+	    fd = wwwoffle_fd_list[i];
-+    }
-+    nfds=fd+1;
- 
-     FD_ZERO(&readfd);
- 
--    FD_SET(wwwoffle_fd,&readfd);
-+    for (i = 1; i <= wwwoffle_fd_list[0]; i++)
-+	FD_SET(wwwoffle_fd_list[i],&readfd);
- 
-     if(n_servers<MaxServers)
--       FD_SET(http_fd,&readfd);
-+	for (i = 1; i <= http_fd_list[0]; i++)
-+	    FD_SET(http_fd_list[i],&readfd);
- 
-     tv.tv_sec=10;
-     tv.tv_usec=0;
-@@ -235,56 +244,62 @@
- 
-     if(retval!=-1)
-       {
--       if(FD_ISSET(wwwoffle_fd,&readfd))
--         {
--          char *host,*ip;
--          int port,client;
--
--          client=AcceptConnect(wwwoffle_fd);
--          init_buffer(client);
--
--          if(client>=0 && !SocketRemoteName(client,&host,&ip,&port))
--            {
--             if(IsAllowedConnectHost(host) || IsAllowedConnectHost(ip))
--               {
--                PrintMessage(Important,"WWWOFFLE Connection from host %s (%s).",host,ip); /* Used in audit-usage.pl */
--
--                CommandConnect(client);
--
--                if(fetch_fd!=client)
--                   CloseSocket(client);
--               }
--             else
--               {
--                PrintMessage(Warning,"WWWOFFLE Connection rejected from host %s (%s).",host,ip); /* Used in audit-usage.pl */
--                CloseSocket(client);
--               }
--            }
--         }
--
--       if(FD_ISSET(http_fd,&readfd))
--         {
--          char *host,*ip;
--          int port,client;
--
--          client=AcceptConnect(http_fd);
--          init_buffer(client);
--
--          if(client>=0 && !SocketRemoteName(client,&host,&ip,&port))
--            {
--             if(IsAllowedConnectHost(host) || IsAllowedConnectHost(ip))
--               {
--                PrintMessage(Inform,"HTTP Proxy connection from host %s (%s).",host,ip); /* Used in audit-usage.pl */
--                ForkServer(client,1);
--               }
--             else
--                PrintMessage(Warning,"HTTP Proxy connection rejected from host %s (%s).",host,ip); /* Used in audit-usage.pl */
--
--             CloseSocket(client);
--            }
--         }
-+	  for (i = 1; i <= wwwoffle_fd_list[0]; i++) {
-+	      wwwoffle_fd = wwwoffle_fd_list[i];
-+	      if(FD_ISSET(wwwoffle_fd,&readfd))
-+	      {
-+		  char *host,*ip;
-+		  int port,client;
-+
-+		  client=AcceptConnect(wwwoffle_fd);
-+		  init_buffer(client);
-+
-+		  if(client>=0 && !SocketRemoteName(client,&host,&ip,&port))
-+		  {
-+		      if(IsAllowedConnectHost(host) || IsAllowedConnectHost(ip))
-+		      {
-+			  PrintMessage(Important,"WWWOFFLE Connection from host %s (%s).",host,ip); /* Used in audit-usage.pl */
-+
-+			  CommandConnect(client);
-+
-+			  if(fetch_fd!=client)
-+			      CloseSocket(client);
-+		      }
-+		      else
-+		      {
-+			  PrintMessage(Warning,"WWWOFFLE Connection rejected from host %s (%s).",host,ip); /* Used in audit-usage.pl */
-+			  CloseSocket(client);
-+		      }
-+		  }
-+	      }
-+	  }
-+	  for (i = 1; i <= http_fd_list[0]; i++) {
-+	      http_fd = http_fd_list[i];
-+
-+	      if(FD_ISSET(http_fd,&readfd))
-+	      {
-+		  char *host,*ip;
-+		  int port,client;
-+
-+		  client=AcceptConnect(http_fd);
-+		  init_buffer(client);
-+
-+		  if(client>=0 && !SocketRemoteName(client,&host,&ip,&port))
-+		  {
-+		      if(IsAllowedConnectHost(host) || IsAllowedConnectHost(ip))
-+		      {
-+			  PrintMessage(Inform,"HTTP Proxy connection from host %s (%s).",host,ip); /* Used in audit-usage.pl */
-+			  ForkServer(client,1);
-+		      }
-+		      else
-+			  PrintMessage(Warning,"HTTP Proxy connection rejected from host %s (%s).",host,ip); /* Used in audit-usage.pl */
-+
-+		      CloseSocket(client);
-+		  }
-+	      }
-+	  }
-       }
--
-+   
-     if(readconfig)
-       {
-        readconfig=0;
-@@ -373,9 +388,11 @@
-  while(!closedown);
- 
-  /* Close down and exit. */
-+ for (i = 1; i <= wwwoffle_fd_list[0]; i++)
-+     CloseSocket(wwwoffle_fd_list[i]);
- 
-- CloseSocket(http_fd);
-- CloseSocket(wwwoffle_fd);
-+ for (i = 1; i <= http_fd_list[0]; i++)
-+     CloseSocket(http_fd_list[i]);
- 
-  if(n_servers)
-     PrintMessage(Important,"Exit signalled - waiting for %d child wwwoffles servers.",n_servers);
diff --git a/www/wwwoffle/patches.v6/patch-bh b/www/wwwoffle/patches.v6/patch-bh
deleted file mode 100644
index 7556d4b41ae..00000000000
--- a/www/wwwoffle/patches.v6/patch-bh
+++ /dev/null
@@ -1,133 +0,0 @@
-$NetBSD: patch-bh,v 1.1 1999/11/26 06:09:01 itohy Exp $
-
---- ftp.c.orig	Sat Sep 11 23:00:02 1999
-+++ ftp.c	Thu Nov 25 20:00:36 1999
-@@ -473,52 +473,87 @@
- 
-  /* Create the data connection. */
- 
-- if(write_string(server_ctrl,"PASV\r\n")==-1)
--   {
--    msg=PrintMessage(Warning,"Failed to write 'PASV' command to remote FTP host [%!s].");
--    return(msg);
--   }
-+ if(write_string(server_ctrl,"EPSV\r\n")==-1) {
-+     msg=PrintMessage(Warning,"Failed to write 'EPSV' command to remote FTP host [%!s].");
-+     return(msg);
-+ }
- 
-  do
--   {
--    str=read_line_or_timeout(server_ctrl,str,SocketTimeout);
--    PrintMessage(ExtraDebug,"FTP: sent 'PASV'; got: %s",str);
--   }
-+ {
-+     str=read_line_or_timeout(server_ctrl,str,SocketTimeout);
-+#if DEBUG_FTP
-+     PrintMessage(Debug,"FTP: sent 'EPSV'; got: %s",str);
-+#endif
-+ }
-  while(str && (!isdigit(str[0]) || !isdigit(str[1]) || !isdigit(str[2]) || str[3]!=' '));
- 
-- if(!str || atoi(str)!=227)
--   {
--    if(str)
--      {
--       char *p=str+strlen(str)-1;
--       while(*p=='\n' || *p=='\r') *p--=0;
--       msg=PrintMessage(Warning,"Got '%s' message after sending 'PASV' command",str);
--      }
--    else
--       msg=PrintMessage(Warning,"No reply from FTP server to 'PASV' command; timed out?");
--    return(msg);
--   }
-+ if(!str) {
-+     msg=PrintMessage(Warning,"No reply from FTP server to 'EPSV' command; timed out?");
-+     return(msg);
-+ }
-+
-+ if(atoi(str) == 229) {
-+     host=strchr(str,'(') + 1;
-+     if(sscanf(host,"%*c%*c%*c%d%*c",&port_h) != 1) {
-+         char *p=str+strlen(str)-1;
-+         while(*p=='\n' || *p=='\r') *p--=0;
-+         msg=PrintMessage(Warning,"Got '%s' message after sending 'EPSV' command, cannot parse %d.",str, port_h);
-+         return(msg);
-+     }
-+     if (SocketRemoteName(server_ctrl, &host, NULL, NULL)) {
-+         msg=PrintMessage(Warning,"Cannot determine server address.");
-+         return(msg);
-+     }
-+ } else if (atoi(str) != 500) {
-+     char *p=str+strlen(str)-1;
-+
-+     while(*p=='\n' || *p=='\r') *p--=0;
-+     msg=PrintMessage(Warning,"Got '%s' message after sending 'EPSV' command",str);
-+     return(msg);
-+ } else { /* Let's try PASV instead then */
-+     if(write_string(server_ctrl,"PASV\r\n")==-1) {
-+         msg=PrintMessage(Warning,"Failed to write 'PASV' command to remote FTP host [%!s].");
-+         return(msg);
-+     }  
-+ 
-+     do
-+     {
-+         str=read_line_or_timeout(server_ctrl,str,SocketTimeout);
-+#if DEBUG_FTP
-+         PrintMessage(Debug,"FTP: sent 'PASV'; got: %s",str);
-+#endif
-+     }
-+     while(str && (!isdigit(str[0]) || !isdigit(str[1]) || !isdigit(str[2]) || str[3]!=' '));
-+ 
-+     if(!str) {
-+         msg=PrintMessage(Warning,"No reply from FTP server to 'PASV' command; timed out?");
-+         return(msg);
-+     }  
-+ 
-+     if(atoi(str) == 227) {
-+ 
-+         if((host=strchr(str,',')))
-+         {
-+             while(isdigit(*--host));
-+             host++;
-+         }
-+   
-+         if(!host || sscanf(host,"%*d,%*d,%*d,%*d%n,%d,%d",&l,&port_h,&port_l)!=2)
-+         {
-+             char *p=str+strlen(str)-1;
-+             while(*p=='\n' || *p=='\r') *p--=0;
-+             msg=PrintMessage(Warning,"Got '%s' message after sending 'PASV' command, cannot parse.",str);
-+             return(msg);
-+         }
-+         port_h = port_l+256*port_h;
-+         host[l]=0;
-+         for(;l>0;l--)
-+             if(host[l]==',')
-+                 host[l]='.';
-+     }     
-+ }
- 
-- if((host=strchr(str,',')))
--   {
--    while(isdigit(*--host));
--    host++;
--   }
--
-- if(!host || sscanf(host,"%*d,%*d,%*d,%*d%n,%d,%d",&l,&port_h,&port_l)!=2)
--   {
--    char *p=str+strlen(str)-1;
--    while(*p=='\n' || *p=='\r') *p--=0;
--    msg=PrintMessage(Warning,"Got '%s' message after sending 'PASV' command, cannot parse.",str);
--    return(msg);
--   }
--
-- host[l]=0;
-- for(;l>0;l--)
--    if(host[l]==',')
--       host[l]='.';
--
-- server_data=OpenClientSocket(host,port_l+256*port_h,ConnectTimeout);
-+ server_data=OpenClientSocket(host, port_h,ConnectTimeout);
-  init_buffer(server_data);
- 
-  if(server_data==-1)
diff --git a/www/wwwoffle/patches/patch-aa b/www/wwwoffle/patches/patch-aa
index d0486b5f51a..5e84d3a0189 100644
--- a/www/wwwoffle/patches/patch-aa
+++ b/www/wwwoffle/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2000/06/06 13:22:29 itojun Exp $
+$NetBSD: patch-aa,v 1.11 2000/11/20 05:12:38 itojun Exp $
 
---- Makefile.orig	Mon Apr  3 00:27:30 2000
-+++ Makefile	Tue Jun  6 22:08:00 2000
+--- Makefile.orig	Sun Oct 22 03:32:41 2000
++++ Makefile	Mon Nov 20 13:03:42 2000
 @@ -16,9 +16,9 @@
  
  LOCALHOST=localhost:8080
@@ -42,24 +42,24 @@ $NetBSD: patch-aa,v 1.10 2000/06/06 13:22:29 itojun Exp $
  
  # For Solaris you need the following instead.
  #LIBRARY=-lnsl -lsocket
-@@ -289,13 +289,13 @@
+@@ -280,13 +280,13 @@
  	$(INSTALL) -c -m 644 wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5
  	[ -x $(INSTDIR)/man/man8 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man8
  	$(INSTALL) -c -m 644 wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
 -	[ -x $(INSTDIR)/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/doc/wwwoffle
 +	[ -x $(INSTDIR)/share/doc/wwwoffle ] || $(INSTALL) -d -m 755 $(INSTDIR)/share/doc/wwwoffle
- 	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \
+ 	for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* ; do \
 -	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file ;\
 +	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/share/doc/wwwoffle/$$file ;\
  	done
  	[ "x$(LANG)" = "x" ] || [ ! -d lang-$(LANG) ] || ( cd lang-$(LANG) && \
- 	  for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* UPGRADE ; do \
+ 	  for file in CHANGES.CONF CONVERT COPYING FAQ INSTALL NEWS README* ; do \
 -	    [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file-$(LANG) ;\
 +	    [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
  	  done )
  
  
-@@ -369,7 +369,7 @@
+@@ -360,7 +360,7 @@
  	[    -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
  
  install_fixup-win32:
diff --git a/www/wwwoffle/pkg/PLIST b/www/wwwoffle/pkg/PLIST
index ec82f144c59..4cc9f41dead 100644
--- a/www/wwwoffle/pkg/PLIST
+++ b/www/wwwoffle/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/08/07 09:10:33 fredb Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/11/20 05:12:40 itojun Exp $
 bin/wwwoffle
 bin/wwwoffle-ls
 bin/wwwoffle-mv
@@ -24,10 +24,11 @@ share/doc/wwwoffle/README
 share/doc/wwwoffle/README.1st
 share/doc/wwwoffle/README.CONF
 share/doc/wwwoffle/README.PWD
+share/doc/wwwoffle/README.URL
 share/doc/wwwoffle/README.htdig
-share/doc/wwwoffle/README.win32
 share/doc/wwwoffle/README.lang
-share/doc/wwwoffle/UPGRADE
+share/doc/wwwoffle/README.udmsearch
+share/doc/wwwoffle/README.win32
 @dirrm share/doc/wwwoffle
 @exec @GTAR@ xzCf / %D/libdata/wwwoffle-spool.tar.gz
 @exec cd /var/wwwoffle/html && mv wwwoffle.pac wwwoffle.pac.dist && sed /PROXY/s/localhost/`hostname`/ <wwwoffle.pac.dist >wwwoffle.pac