Update wwwwoffle to 2.7. Very many bug fixes, including fixes for

dealing better with javascript pages, and fixes for old ftp servers.
Lots of new features and configure options, too. Also, new
translations for French, Dutch, Polish, German; docs and notes in
a few other languages; and translations for local pages are now
selected by browser settings!

6 files changed, 112 insertions, 190 deletions

diff --git a/www/wwwoffle/INSTALL b/www/wwwoffle/INSTALL
new file mode 100644
index 00000000000..6e24b5abcc2
--- /dev/null
+++ b/www/wwwoffle/INSTALL
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2002/03/10 22:14:29 fredb Exp $
+
+PATH=${PKG_PREFIX+${PKG_PREFIX}/sbin:}${PATH}
+
+# Make an educated guess:
+if [ -e ${PKG_PREFIX-/usr/pkg}/etc/wwwoffle ]
+then
+	CONFDIR=${PKG_PREFIX-/usr/pkg}/etc/wwwoffle
+else
+	CONFDIR=/etc/wwwoffle
+fi
+
+if [ X"${2}" = XPOST-INSTALL ]
+then
+	for p in `find /var/wwwoffle/html -name wwwoffle.pac`
+	do
+		cd `dirname ${p}`
+		mv ${p} ${p}.dist
+		sed /PROXY/s/localhost/`hostname`/ ${p}.dist > ${p}
+	done
+	cd ${CONFDIR} && wwwoffle-upgrade-config.pl wwwoffle.conf || true
+	wwwoffle-convert-cache /var/wwwoffle
+fi
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 1267f7d9420..caf76342475 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2001/08/18 20:31:13 fredb Exp $
+# $NetBSD: Makefile,v 1.33 2002/03/10 22:14:30 fredb Exp $
 
-DISTNAME=	wwwoffle-2.6d
+DISTNAME=	wwwoffle-2.7
 CATEGORIES=	www
-MASTER_SITES=	http://www.gedanken.demon.co.uk/download-wwwoffle/ \
-		ftp://ftp.demon.co.uk/pub/unix/httpd/ \
+MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/httpd/ \
+		http://www.gedanken.freeserve.co.uk/download-wwwoffle/ \
 		${MASTER_SITE_SUNSITE:=apps/www/servers/}
 EXTRACT_SUFX=	.tgz
 
@@ -12,26 +12,15 @@ HOMEPAGE=	http://www.gedanken.demon.co.uk/wwwoffle/
 COMMENT=	WWW proxy with support for offline browsing
 
 USE_GMAKE=	yes
-NO_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 
-PLIST_SUBST+=	GTAR="${GTAR}" MKDIR="${MKDIR}" PREFIX="${PREFIX}"
+CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR}/wwwoffle
+CONFIGURE_ARGS+= --with-spooldir=/var/wwwoffle
 
-BUILD_DEFS+=	USE_INET6
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${USE_INET6} == "YES"
-MAKE_ENV+=	USE_IPV6=1
-.else
-MAKE_ENV+=	USE_IPV6=0
-.endif
-
-.if ${OPSYS} == "SunOS"
-MAKE_ENV+=	LIBRARY="-lnsl -lsocket"
-.endif
+PLIST_SUBST+=	GTAR="${GTAR}" PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
 
 post-build:
-	cd ${WRKSRC}/html/search/htdig/scripts; \
+	cd ${WRKSRC}/cache/search/htdig/scripts; \
 	for f in wwwoffle-ht*; do \
 		${MV} $$f $$f.old; \
 		${SED} -e '/htsearch/s#^#${PREFIX}/libexec/cgi-bin/#' \
@@ -43,39 +32,44 @@ post-build:
 	@${SED} -e 's#@PREFIX@#${PREFIX}#g' <${FILESDIR}/wwwoffled \
 	  >${WRKDIR}/wwwoffled
 
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/wwwoffle
-	if [ -d /var/wwwoffle ]; then \
-	  ${RM} -rf /var/wwwoffle/html.old; \
-	  ${INSTALL_DATA_DIR} /var/wwwoffle/prevtime1; \
-	fi
-
 post-install:
 	if [ ! -f ${PREFIX}/etc/wwwoffle/wwwoffle.conf.install ]; then \
 		${CP} -p ${PREFIX}/etc/wwwoffle/wwwoffle.conf \
 		  ${PREFIX}/etc/wwwoffle/wwwoffle.conf.install; \
 	fi
-	${INSTALL_PROGRAM} ${WRKSRC}/convert-cache \
+	${INSTALL_PROGRAM} ${WRKSRC}/src/convert-cache \
 	  ${PREFIX}/sbin/wwwoffle-convert-cache
-	${INSTALL_SCRIPT} ${WRKSRC}/upgrade-config.pl \
+	${INSTALL_PROGRAM} ${WRKSRC}/src/uncompress-cache \
+	  ${PREFIX}/sbin/wwwoffle-uncompress-cache
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl \
 	  ${PREFIX}/sbin/wwwoffle-upgrade-config.pl
-	${INSTALL_SCRIPT} ${WRKSRC}/upgrade-config-2.x-2.5.pl \
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config-2.x-2.5.pl \
 	  ${PREFIX}/sbin/wwwoffle-upgrade-config-2.x-2.5.pl
 	${INSTALL_SCRIPT} ${WRKDIR}/wwwoffle.sh ${PREFIX}/etc/rc.d/wwwoffle
 	${INSTALL_SCRIPT} ${WRKDIR}/wwwoffled ${PREFIX}/etc/rc.d
-	# directories other than html are automatically created at run time
-	${GTAR} czCf / ${PREFIX}/libdata/wwwoffle-spool.tar.gz var/wwwoffle/html
+# Directories other than html and search are automatically created at run time
+	${GTAR} czCf / ${PREFIX}/libdata/wwwoffle-spool.tar.gz \
+		var/wwwoffle/html var/wwwoffle/search
+# We don't do the following automatically, as that would inconvenience
+# package build machines, not to mention putting the wrong information
+# in the "wwwoffle.pac" files.
 	@${ECHO}
 	@${ECHO} ==+===+===+===+===+===+===+===+===+===+===+===+===+===+===+=
 	@${ECHO}
 	@${ECHO} Attention pkgsrc source users:
 	@${ECHO}
-	@${ECHO} If your are upgrading from an older version of wwwoffle,
-	@${ECHO} your cache will not be converted automatically. Please do
-	@${ECHO} so by executing the command
-	@${ECHO} \"${PREFIX}/libexec/wwwoffle-convert-cache /var/wwwoffle\".
+	@${ECHO} "Running \`sh INSTALL _ POST-INSTALL' from this directory"
+	@${ECHO} 'will fix up the installed "wwwoffle.pac" files and convert'
+	@${ECHO} 'your old cache to the new format, exactly as in the binary'
+	@${ECHO} 'package install.'
 	@${ECHO}
 	@${ECHO} ==+===+===+===+===+===+===+===+===+===+===+===+===+===+===+=
 	@${ECHO}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${USE_INET6} == "YES"
+CONFIGURE_ARGS+= --with-ipv6
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/wwwoffle/PLIST b/www/wwwoffle/PLIST
index 03e6bf2fb52..91fdfc49642 100644
--- a/www/wwwoffle/PLIST
+++ b/www/wwwoffle/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:05 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/03/10 22:14:30 fredb Exp $
 bin/wwwoffle
+bin/wwwoffle-hash
 bin/wwwoffle-ls
 bin/wwwoffle-mv
 bin/wwwoffle-read
@@ -9,12 +10,13 @@ bin/wwwoffle-write
 etc/rc.d/wwwoffle
 etc/rc.d/wwwoffled
 etc/wwwoffle/wwwoffle.conf.install
-@exec if [ ! -f %D/etc/wwwoffle/wwwoffle.conf ]; then cp -p %D/etc/wwwoffle/wwwoffle.conf.install %D/etc/wwwoffle/wwwoffle.conf; fi
+@exec if [ ! -f ${PKG_SYSCONFDIR}/wwwoffle/wwwoffle.conf ]; then cp -p ${PKG_SYSCONFDIR}/wwwoffle/wwwoffle.conf.install ${PKG_SYSCONFDIR}/wwwoffle/wwwoffle.conf; fi
 libdata/wwwoffle-spool.tar.gz
 man/man1/wwwoffle.1
 man/man5/wwwoffle.conf.5
 man/man8/wwwoffled.8
 sbin/wwwoffle-convert-cache
+sbin/wwwoffle-uncompress-cache
 sbin/wwwoffle-upgrade-config.pl
 sbin/wwwoffle-upgrade-config-2.x-2.5.pl
 sbin/wwwoffled
@@ -32,16 +34,47 @@ share/doc/wwwoffle/README.URL
 share/doc/wwwoffle/README.compress
 share/doc/wwwoffle/README.htdig
 share/doc/wwwoffle/README.lang
-share/doc/wwwoffle/README.udmsearch
+share/doc/wwwoffle/README.mnogosearch
+share/doc/wwwoffle/README.namazu
 share/doc/wwwoffle/README.win32
+share/doc/wwwoffle/de/CHANGES.CONF
+share/doc/wwwoffle/de/INSTALL
+share/doc/wwwoffle/de/LSM
+share/doc/wwwoffle/de/NEWS
+share/doc/wwwoffle/de/README.1st
+share/doc/wwwoffle/de/README.CONF.html
+share/doc/wwwoffle/de/README.html
+share/doc/wwwoffle/es/CONVERT
+share/doc/wwwoffle/es/INSTALL
+share/doc/wwwoffle/es/LSM
+share/doc/wwwoffle/es/README
+share/doc/wwwoffle/es/README.1st
+share/doc/wwwoffle/es/README.CONF
+share/doc/wwwoffle/es/README.PWD
+share/doc/wwwoffle/es/README.URL
+share/doc/wwwoffle/es/README.htdig
+share/doc/wwwoffle/es/README.udmsearch
+share/doc/wwwoffle/es/README.win32
+share/doc/wwwoffle/es/wwwoffle.conf
+share/doc/wwwoffle/fr/README.CONF
+share/doc/wwwoffle/fr/wwwoffle.conf.man
+share/doc/wwwoffle/pl/INSTALL
+share/doc/wwwoffle/pl/LSM
+share/doc/wwwoffle/pl/README.1st
+share/doc/wwwoffle/pl/README.lang
+@unexec rmdir %D/share/doc/wwwoffle/ru 2>/dev/null || true
+@dirrm share/doc/wwwoffle/pl
+@unexec rmdir %D/share/doc/wwwoffle/nl 2>/dev/null || true
+@unexec rmdir %D/share/doc/wwwoffle/it 2>/dev/null || true
+@dirrm share/doc/wwwoffle/fr
+@dirrm share/doc/wwwoffle/es
+@dirrm share/doc/wwwoffle/de
 @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
-@exec ${MKDIR} /var/wwwoffle/outgoing
-@exec ${MKDIR} /var/wwwoffle/monitor
-@exec ${MKDIR} /var/wwwoffle/lastime
-@exec ${MKDIR} /var/wwwoffle/prevtime1
-@exec ${PREFIX}/sbin/wwwoffle-convert-cache /var/wwwoffle
-@unexec cd /var/wwwoffle && ${RM} -rf html*
+@comment exec ${MKDIR} /var/wwwoffle/outgoing
+@comment exec ${MKDIR} /var/wwwoffle/monitor
+@comment exec ${MKDIR} /var/wwwoffle/lastime
+@comment exec ${MKDIR} /var/wwwoffle/prevtime1
+@unexec cd /var/wwwoffle && ${RM} -rf html* search*
 @unexec ${RMDIR} /var/wwwoffle/* 2>/dev/null && ${RMDIR} /var/wwwoffle 2>/dev/null || true
 @unexec if [ -d /var/wwwoffle ]; then echo "If you won't use the WWWOFFLE package anymore, remove the cache manually by"; echo '	rm -rf /var/wwwoffle'; fi
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index 121c6bdccf8..1be0cd7fff4 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2001/08/18 20:31:14 fredb Exp $
+$NetBSD: distinfo,v 1.7 2002/03/10 22:14:30 fredb Exp $
 
-SHA1 (wwwoffle-2.6d.tgz) = abb7cdfb03dfffb3ae777753938068c25e390c63
-Size (wwwoffle-2.6d.tgz) = 645469 bytes
-SHA1 (patch-aa) = ed2b9ad709b1ad849517e241fb8fb8c8d375662f
-SHA1 (patch-ac) = 14c3cbff4c9bf2ecf0cf97222db43a3339cecaf2
+SHA1 (wwwoffle-2.7.tgz) = d898f6b15a34e55ddc49161278726a55b01ec377
+Size (wwwoffle-2.7.tgz) = 832728 bytes
+SHA1 (patch-aa) = 580868aed26f02378db32303f8a16fb178ca92dd
diff --git a/www/wwwoffle/patches/patch-aa b/www/wwwoffle/patches/patch-aa
index 5c8a43c4216..02f9189327a 100644
--- a/www/wwwoffle/patches/patch-aa
+++ b/www/wwwoffle/patches/patch-aa
@@ -1,106 +1,13 @@
-$NetBSD: patch-aa,v 1.15 2001/08/18 20:31:15 fredb Exp $
+$NetBSD: patch-aa,v 1.16 2002/03/10 22:14:30 fredb Exp $
 
---- Makefile.orig	Tue May 29 13:29:03 2001
-+++ Makefile
-@@ -18,11 +18,11 @@
- LOCALHOST=localhost:8080
+--- doc/Makefile.in.orig	Sun Mar 10 14:14:34 2002
++++ doc/Makefile.in
+@@ -22,7 +22,7 @@
  
- # For UNIX.
--INSTDIR=/usr/local
--SPOOLDIR=/var/spool/wwwoffle
--CONFDIR=/var/spool/wwwoffle
-+INSTDIR=${PREFIX}
-+SPOOLDIR=/var/wwwoffle
-+CONFDIR=${PREFIX}/etc/wwwoffle
- MANDIR=$(INSTDIR)/man
--DOCDIR=$(INSTDIR)/doc/wwwoffle
-+DOCDIR=$(INSTDIR)/share/doc/wwwoffle
+ prefix=@prefix@
+ mandir=@mandir@
+-docdir=${prefix}/doc/wwwoffle
++docdir=${prefix}/share/doc/wwwoffle
  
- # For Cygwin (win32).
- #INSTDIR=/wwwoffle
-@@ -54,13 +54,13 @@
- ########
- 
- CC=gcc
--CFLAGS=-O2 -Wall -g
-+CFLAGS=-O2 -Wall
- 
- # This is used in the FreeBSD port (http://www.freebsd.org/ports/).
- #CFLAGS=-O2 -Wall
- 
- LD=gcc
--LDFLAGS=-g
-+LDFLAGS=-s
- 
- # For HP/UX this is a good idea.
- #LDFLAGS=
-@@ -89,12 +89,12 @@
- #USE_IPV6=1
- 
- # The option to use IPv6 sockets if required.
--USE_IPV6=0
-+#USE_IPV6=0
- 
- ########
- 
--INCLUDE=
--LIBRARY=-lz
-+#INCLUDE=
-+#LIBRARY=-lz
- 
- # To compile without zlib
- #LIBRARY=
-@@ -167,7 +167,7 @@
- 	     configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
- 
- wwwoffle : $(WWWOFFLE_OBJ)
--	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
-+	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY) -lz
- 
- ####
- 
-@@ -179,7 +179,7 @@
- 	      configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
- 
- wwwoffled : $(WWWOFFLED_OBJ)
--	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
-+	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY) -lz
- 
- ####
- 
-@@ -190,7 +190,7 @@
- 	           configfile.o config.o errors.o io.o misc.o proto.o sockets.o md5.o
- 
- wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
--	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
-+	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY) -lz
- 
- ####
- 
-@@ -200,7 +200,7 @@
- 	    configfile.o config.o errors.o io.o misc.o proto.o sockets.o spool.o md5.o
- 
- convert-cache : $(CONVERT_OBJ)
--	$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY)
-+	$(LINK) $(CONVERT_OBJ) -o $@ $(LIBRARY) -lz
- 
- ####
- 
-@@ -210,7 +210,7 @@
- 	       configfile.o config.o errors.o io.o misc.o proto.o sockets.o spool.o md5.o
- 
- uncompress-cache : $(UNCOMPRESS_OBJ)
--	$(LINK) $(UNCOMPRESS_OBJ) -o $@ $(LIBRARY)
-+	$(LINK) $(UNCOMPRESS_OBJ) -o $@ $(LIBRARY) -lz
- 
- ####
- 
-@@ -396,7 +396,7 @@
- 	@[ ! -f $(CONFDIR)/wwwoffle.conf ] || \
- 	 (echo "WWWOFFLE: " ;\
- 	  echo "WWWOFFLE: There is already a config file $(CONFDIR)/wwwoffle.conf." ;\
--	  echo "WWWOFFLE: Run 'upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
-+	  echo "WWWOFFLE: Run 'wwwoffle-upgrade-config.pl $(CONFDIR)/wwwoffle.conf' to upgrade it." ;\
- 	  echo "WWWOFFLE: " )
- 	[  ! -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
- 	[    -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
+ SPOOLDIR=@SPOOLDIR@
+ CONFDIR=@CONFDIR@
diff --git a/www/wwwoffle/patches/patch-ac b/www/wwwoffle/patches/patch-ac
deleted file mode 100644
index 93d81d0b342..00000000000
--- a/www/wwwoffle/patches/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/08/16 04:23:46 fredb Exp $
-
---- sockets6.c.orig	Thu Jun 28 13:48:36 2001
-+++ sockets6.c
-@@ -81,7 +81,6 @@
-     if(errno!=ETIMEDOUT)
-        errno=ERRNO_USE_GAI_ERRNO;
-     PrintMessage(Warning,"Unknown host '%s' for server [%!s].",host);
--    freeaddrinfo(server);
-     return(-1);
-    }
- 
-@@ -144,7 +143,6 @@
-     if(errno!=ETIMEDOUT)
-        errno=ERRNO_USE_GAI_ERRNO;
-     PrintMessage(Warning,"Unknown host '%s' for server [%!s].",NULL);
--    freeaddrinfo(server);
-     return(-1);
-    }
- 
-@@ -507,9 +505,12 @@
-  struct sigaction action;
-  static char _host[NI_MAXHOST],_ip[46],_port[12];
- 
-- *host="(unknown)";
-- *ip="(unknown)";
-- *port="0";
-+ if(host)
-+   *host="(unknown)";
-+ if(ip)
-+   *ip="(unknown)";
-+ if(port)
-+   *port="0";
- 
- start:
-