Update to 2.5e.

PR:		18111
Submitted by:	Ben Smithurst <ben@scientia.demon.co.uk>
	    and Maxim Sobolev <sobomax@altavista.net> (additional patches)

8 files changed, 198 insertions, 204 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 9afafaa51bef..7a3298083f29 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	wwwoffle
-PORTVERSION= 	2.4
+PORTVERSION= 	2.5e
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/httpd/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/www/servers
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	aw1@stade.co.uk
+MAINTAINER=	ben@scientia.demon.co.uk
 
-USE_GMAKE=	yes
 USE_PERL5=	yes
 
 MAN1=		wwwoffle.1
@@ -24,64 +23,15 @@ MAN8=		wwwoffled.8
 
 SPOOL=		/var/spool
 
-MAKE_ENV+=	SPOOL=$(SPOOL)
-
-do-install:
-	#programs
-	[ -x $(PREFIX)/bin ] || $(INSTALL) -d $(PREFIX)/bin
-	$(INSTALL_PROGRAM) $(WRKSRC)/wwwoffle $(PREFIX)/bin
-	$(INSTALL_PROGRAM) $(WRKSRC)/upgrade-cache $(PREFIX)/bin
-	$(INSTALL_PROGRAM) $(WRKSRC)/endian-cache $(PREFIX)/bin
-	$(INSTALL_PROGRAM) $(WRKSRC)/wwwoffle-tools $(PREFIX)/bin
-	${LN} -sf wwwoffle-tools $(PREFIX)/bin/wwwoffle-ls
-	${LN} -sf wwwoffle-tools $(PREFIX)/bin/wwwoffle-mv
-	${LN} -sf wwwoffle-tools $(PREFIX)/bin/wwwoffle-rm
-	${LN} -sf wwwoffle-tools $(PREFIX)/bin/wwwoffle-read
-	${LN} -sf wwwoffle-tools $(PREFIX)/bin/wwwoffle-write
-	[ -x $(PREFIX)/sbin ] || $(INSTALL) -d $(PREFIX)/sbin
-	$(INSTALL_PROGRAM) $(WRKSRC)/wwwoffled $(PREFIX)/sbin
-	# man pages
-	[ -x $(PREFIX)/man ] || $(INSTALL) -d $(PREFIX)/man
-	[ -x $(PREFIX)/man/man1 ] || $(INSTALL) -d $(PREFIX)/man/man1
-	$(INSTALL_MAN)  $(WRKSRC)/wwwoffle.man $(PREFIX)/man/man1/wwwoffle.1
-	[ -x $(PREFIX)/man/man5 ] || $(INSTALL) -d $(PREFIX)/man/man5
-	$(SED) -e 's%SPOOLDIR%$(SPOOL)/wwwoffle%' -e 's%CONFDIR%$(SPOOL)/wwwoffle%' < $(WRKSRC)/wwwoffle.conf.man > $(WRKSRC)/wwwoffle.conf.man.install
-	$(INSTALL_MAN) $(WRKSRC)/wwwoffle.conf.man.install $(PREFIX)/man/man5/wwwoffle.conf.5
-	[ -x $(PREFIX)/man/man8 ] || $(INSTALL) -d $(PREFIX)/man/man8
-	$(INSTALL_MAN) $(WRKSRC)/wwwoffled.man $(PREFIX)/man/man8/wwwoffled.8
-	[ -x $(PREFIX)/doc/wwwoffle ] || $(INSTALL) -d $(PREFIX)/doc/wwwoffle
-	# documentation
-	$(INSTALL_DATA) \
-		$(WRKSRC)/CHANGES.CONF \
-		$(WRKSRC)/CONVERT \
-		$(WRKSRC)/COPYING \
-		$(WRKSRC)/FAQ \
-		$(WRKSRC)/INSTALL \
-		$(WRKSRC)/NEWS \
-		$(WRKSRC)/README \
-		$(WRKSRC)/README.1st \
-		$(WRKSRC)/README.CONF \
-		$(WRKSRC)/README.PWD \
-		$(WRKSRC)/README.htdig \
-		$(WRKSRC)/UPGRADE \
-		$(PREFIX)/doc/wwwoffle
-	# initial configuration file
-	[ -x $(SPOOL)/wwwoffle ] || $(INSTALL) -d $(SPOOL)/wwwoffle
-	$(SED) -e 's%SPOOLDIR%$(SPOOL)/wwwoffle%' -e 's%CONFDIR%$(SPOOL)/wwwoffle%' < $(WRKSRC)/wwwoffle.conf > $(WRKSRC)/wwwoffle.conf.install
-	$(INSTALL_DATA) $(WRKSRC)/wwwoffle.conf.install $(SPOOL)/wwwoffle/wwwoffle.conf.install
-	# html files to holding directory
-	[ -x $(SPOOL)/wwwoffle/hold ] || $(INSTALL) -d $(SPOOL)/wwwoffle/hold
-	tar cf - -C $(WRKSRC) html | tar xf - -C $(SPOOL)/wwwoffle/hold
-	# configuration upgrade script to holding directory
-	$(INSTALL_SCRIPT) $(WRKSRC)/upgrade-config.pl $(SPOOL)/wwwoffle/hold
-	# startup script
-	[ -x $(PREFIX)/etc/rc.d ] || $(INSTALL) -d $(PREFIX)/etc/rc.d
-	$(SED) -e 's:%PREFIX%:$(PREFIX):g' $(FILESDIR)/wwwoffled.sh > $(WRKDIR)/wwwoffled.sh
-	$(INSTALL_SCRIPT) $(WRKDIR)/wwwoffled.sh $(PREFIX)/etc/rc.d
+MAKE_ENV+=	SPOOL="${SPOOL}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_MAN="${INSTALL_MAN}"
 
 post-install:
-	# upgrade cache, convert cache, build additional files, configure html and wwwoffle.conf
-	$(SH) $(PKGDIR)/INSTALL ${DISTNAME} POST-INSTALL
+	@${MKDIR} ${SPOOL}/wwwoffle
+	@${INSTALL_SCRIPT} ${WRKSRC}/upgrade-config.pl ${SPOOL}/wwwoffle
+	@${INSTALL_SCRIPT} ${FILESDIR}/wwwoffled.sh ${PREFIX}/etc/rc.d
+	@${CAT} ${PKGMESSAGE}
 
-# keep at end
 .include <bsd.port.mk>
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index ad4ff35d0c04..a65e67076552 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1 +1 @@
-MD5 (wwwoffle-2.4.tgz) = fbd0d04618b274ed5eac7977dfba6e3c
+MD5 (wwwoffle-2.5e.tgz) = a622bdfe4045171aed8934220d3c4630
diff --git a/www/wwwoffle/files/patch-aa b/www/wwwoffle/files/patch-aa
index 6628cdea485e..2e8e41fe3a24 100644
--- a/www/wwwoffle/files/patch-aa
+++ b/www/wwwoffle/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Dec  3 19:19:46 1998
-+++ Makefile	Sun Mar  7 09:13:34 1999
+--- Makefile.orig	Sun Apr  2 18:27:30 2000
++++ Makefile	Thu Apr 20 15:27:06 2000
 @@ -16,9 +16,9 @@
  
  LOCALHOST=localhost:8080
@@ -11,20 +11,130 @@
 +SPOOLDIR=$(SPOOL)/wwwoffle
 +CONFDIR=$(SPOOL)/wwwoffle
  
- # For Cygwin (win32)
+ # For Cygwin (win32).
  #INSTDIR=/wwwoffle
-@@ -28,13 +28,12 @@
+@@ -45,14 +45,13 @@
+ 
  ########
  
- CC=gcc
+-CC=gcc
 -CFLAGS=-O2 -Wall -g
++CC?=gcc
  
- # This is used in the FreeBSD port (http://www.freebsd.org/ports/)
+ # This is used in the FreeBSD port (http://www.freebsd.org/ports/).
  #CFLAGS=-O2 -Wall
  
- LD=gcc
+-LD=gcc
 -LDFLAGS=-g
++LD=$(CC)
 +LDFLAGS=-s
  
  # For HP/UX this is a good idea.
  #LDFLAGS=
+@@ -72,7 +71,7 @@
+ ########
+ 
+ INCLUDE=
+-LIBRARY=
++LIBRARY= -lmd
+ 
+ # For Solaris you need the following instead.
+ #LIBRARY=-lnsl -lsocket
+@@ -123,7 +122,7 @@
+ WWWOFFLE_OBJ=wwwoffle.o \
+ 	     refresh.o messages.o parse.o spool.o \
+ 	     $(DOC_PARSERS)\
+-	     config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
++	     config-startup.o errors.o io.o misc.o proto-none.o sockets.o
+ 
+ wwwoffle : $(WWWOFFLE_OBJ)
+ 	$(LINK) $(WWWOFFLE_OBJ) -o $@ $(LIBRARY)
+@@ -135,7 +134,7 @@
+ 	      $(DOC_PARSERS) \
+ 	      gifmodify.o htmlmodify.o \
+ 	      connect.o control.o configedit.o htdig.o index.o messages.o monitor.o parse.o purge.o refresh.o spool.o \
+-	      config.o errors.o io.o misc.o proto.o sockets.o md5.o
++	      config.o errors.o io.o misc.o proto.o sockets.o
+ 
+ wwwoffled : $(WWWOFFLED_OBJ)
+ 	$(LINK) $(WWWOFFLED_OBJ) -o $@ $(LIBRARY)
+@@ -144,7 +143,7 @@
+ 
+ WWWOFFLE_TOOLS_OBJ=wwwoffle-tools.o \
+ 	           spool.o \
+-	           config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
++	           config-startup.o errors.o io.o misc.o proto-none.o sockets.o
+ 
+ wwwoffle-tools : $(WWWOFFLE_TOOLS_OBJ)
+ 	$(LINK) $(WWWOFFLE_TOOLS_OBJ) -o $@ $(LIBRARY)
+@@ -152,14 +151,14 @@
+ ####
+ 
+ UPGRADE_OBJ=upgrade-cache.o \
+-	    config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
++	    config-startup.o errors.o io.o misc.o proto-none.o sockets.o
+ 
+ upgrade-cache : $(UPGRADE_OBJ)
+ 	$(LINK) $(UPGRADE_OBJ) -o $@ $(LIBRARY)
+ 
+ ENDIAN_OBJ=endian-cache.o \
+ 	   spool.o \
+-	   config-startup.o errors.o io.o misc.o proto-none.o sockets.o md5.o
++	   config-startup.o errors.o io.o misc.o proto-none.o sockets.o
+ 
+ endian-cache : $(ENDIAN_OBJ)
+ 	$(LINK) $(ENDIAN_OBJ) -o $@ $(LIBRARY)
+@@ -257,15 +256,15 @@
+ 
+ install_binary : programs
+ 	[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
+-	$(INSTALL) -c -m 755 wwwoffle $(INSTDIR)/bin
+-	$(INSTALL) -c -m 755 wwwoffle-tools $(INSTDIR)/bin
++	$(INSTALL_PROGRAM) wwwoffle $(INSTDIR)/bin
++	$(INSTALL_PROGRAM) wwwoffle-tools $(INSTDIR)/bin
+ 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-ls
+ 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-mv
+ 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-rm
+ 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-read
+ 	ln -sf wwwoffle-tools $(INSTDIR)/bin/wwwoffle-write
+ 	[ -x $(INSTDIR)/sbin ] || $(INSTALL) -d -m 755 $(INSTDIR)/sbin
+-	$(INSTALL) -c -m 755 wwwoffled $(INSTDIR)/sbin
++	$(INSTALL_PROGRAM) wwwoffled $(INSTDIR)/sbin
+ 
+ install_binary-win32 : programs
+ 	[ -x $(INSTDIR)/bin ] || $(INSTALL) -d -m 755 $(INSTDIR)/bin
+@@ -283,19 +282,19 @@
+ install_doc :
+ 	[ -x $(INSTDIR)/man ] || $(INSTALL) -d -m 755 $(INSTDIR)/man
+ 	[ -x $(INSTDIR)/man/man1 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man1
+-	$(INSTALL) -c -m 644 wwwoffle.man $(INSTDIR)/man/man1/wwwoffle.1
++	$(INSTALL_MAN) wwwoffle.man $(INSTDIR)/man/man1/wwwoffle.1
+ 	[ -x $(INSTDIR)/man/man5 ] || $(INSTALL) -d -m 755 $(INSTDIR)/man/man5
+ 	sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf.man > wwwoffle.conf.man.install
+-	$(INSTALL) -c -m 644 wwwoffle.conf.man.install $(INSTDIR)/man/man5/wwwoffle.conf.5
++	$(INSTALL_MAN) 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
++	$(INSTALL_MAN) wwwoffled.man $(INSTDIR)/man/man8/wwwoffled.8
++	[ -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 \
+-	  $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file ;\
++	  $(INSTALL_MAN) $$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 \
+-	    [ ! -f $$file ] || $(INSTALL) -c -m 644 $$file $(INSTDIR)/doc/wwwoffle/$$file-$(LANG) ;\
++	    [ ! -f $$file ] || $(INSTALL_MAN) $$file $(INSTDIR)/share/doc/wwwoffle/$$file-$(LANG) ;\
+ 	  done )
+ 
+ 
+@@ -365,7 +364,7 @@
+ 	  echo "WWWOFFLE: There is already a configuration file $(CONFDIR)/wwwoffle.conf." ;\
+ 	  echo "WWWOFFLE: Run 'perl 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
++	$(INSTALL_DATA) wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
+ 	[    -f $(CONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
+ 
+ install_fixup-win32:
diff --git a/www/wwwoffle/files/patch-ab b/www/wwwoffle/files/patch-ab
new file mode 100644
index 000000000000..76395d05efca
--- /dev/null
+++ b/www/wwwoffle/files/patch-ab
@@ -0,0 +1,11 @@
+--- misc.c.orig	Thu Apr 20 15:20:56 2000
++++ misc.c	Thu Apr 20 15:21:12 2000
+@@ -28,7 +28,7 @@
+ #include "errors.h"
+ #include "proto.h"
+ #include "config.h"
+-#include "md5.h"
++#include <md5.h>
+ 
+ 
+ /*++++++++++++++++++++++++++++++++++++++
diff --git a/www/wwwoffle/pkg-comment b/www/wwwoffle/pkg-comment
index 5675906e6d94..7173e6333996 100644
--- a/www/wwwoffle/pkg-comment
+++ b/www/wwwoffle/pkg-comment
@@ -1 +1 @@
-A WWW proxy server for offline browsing
+A caching proxy server for HTTP and FTP designed for dial-up hosts
diff --git a/www/wwwoffle/pkg-descr b/www/wwwoffle/pkg-descr
index 133ac711b0d2..0d8be349983d 100644
--- a/www/wwwoffle/pkg-descr
+++ b/www/wwwoffle/pkg-descr
@@ -1,5 +1,15 @@
-See the website for more details.
+The wwwoffled program is a simple proxy server with special features
+for use with dial-up internet links. This means that it is possible to
+browse web pages and read them without having to remain connected.
 
-WWW: http://www.gedanken.demon.co.uk/wwwoffle/index.html
+ * Can be configured to use dial-on-demand for pages that are not cached. 
+ * Selection of pages to download next time online 
+   + Using normal browser to follow links. 
+   + Command line interface to select pages for downloading. 
+ * Control which pages can be requested when offline. 
+ * Provides non-cached access to intranet servers. 
 
-After installation, edit wwwoffle.conf. See 'man wwwoffle.conf'
+WWW: http://www.gedanken.demon.co.uk/wwwoffle/
+
+- Ben Smithurst
+  <ben@scientia.demon.co.uk>
diff --git a/www/wwwoffle/pkg-message b/www/wwwoffle/pkg-message
new file mode 100644
index 000000000000..0d03be342813
--- /dev/null
+++ b/www/wwwoffle/pkg-message
@@ -0,0 +1,15 @@
+NOTES:
+
+Please copy /var/spool/wwwoffle/wwwoffle.conf.install to
+/var/spool/wwwoffle/wwwoffle.conf, and edit the copy as needed.
+
+If you are upgrading from an old version of wwwoffle, you may need to
+convert the cache directory structure to work with the new version.  You
+can find programs in the WWWOFFLE distribution tarball to do this, along
+with instructions about what is needed.  A more common requirement is to run
+the `upgrade-config.pl' script, so you will find a copy of this in
+/var/spool/wwwoffle/upgrade-config.pl.  You should run this on your
+configuration file, e.g.:
+
+     $ perl /var/spool/wwwoffle/upgrade-config.pl \
+            /var/spool/wwwoffle/wwwoffle.conf
diff --git a/www/wwwoffle/pkg-plist b/www/wwwoffle/pkg-plist
index 49db82b6d307..648654717035 100644
--- a/www/wwwoffle/pkg-plist
+++ b/www/wwwoffle/pkg-plist
@@ -1,5 +1,3 @@
-bin/endian-cache
-bin/upgrade-cache
 bin/wwwoffle
 bin/wwwoffle-ls
 bin/wwwoffle-mv
@@ -7,125 +5,24 @@ bin/wwwoffle-read
 bin/wwwoffle-rm
 bin/wwwoffle-tools
 bin/wwwoffle-write
-doc/wwwoffle/CHANGES.CONF
-doc/wwwoffle/CONVERT
-doc/wwwoffle/COPYING
-doc/wwwoffle/FAQ
-doc/wwwoffle/INSTALL
-doc/wwwoffle/NEWS
-doc/wwwoffle/README
-doc/wwwoffle/README.1st
-doc/wwwoffle/README.CONF
-doc/wwwoffle/README.PWD
-doc/wwwoffle/README.htdig
-doc/wwwoffle/UPGRADE
-@dirrm doc/wwwoffle
 etc/rc.d/wwwoffled.sh
 sbin/wwwoffled
+share/doc/wwwoffle/CHANGES.CONF
+share/doc/wwwoffle/CONVERT
+share/doc/wwwoffle/COPYING
+share/doc/wwwoffle/FAQ
+share/doc/wwwoffle/INSTALL
+share/doc/wwwoffle/NEWS
+share/doc/wwwoffle/README
+share/doc/wwwoffle/README.1st
+share/doc/wwwoffle/README.CONF
+share/doc/wwwoffle/README.PWD
+share/doc/wwwoffle/README.htdig
+share/doc/wwwoffle/README.lang
+share/doc/wwwoffle/README.win32
+share/doc/wwwoffle/UPGRADE
+@dirrm share/doc/wwwoffle
 @cwd /var/spool
-wwwoffle/hold/html/FAQ.html
-wwwoffle/hold/html/Welcome.html
-wwwoffle/hold/html/fixup-install.sh
-wwwoffle/hold/html/htdig/button1.gif
-wwwoffle/hold/html/htdig/button10.gif
-wwwoffle/hold/html/htdig/button2.gif
-wwwoffle/hold/html/htdig/button3.gif
-wwwoffle/hold/html/htdig/button4.gif
-wwwoffle/hold/html/htdig/button5.gif
-wwwoffle/hold/html/htdig/button6.gif
-wwwoffle/hold/html/htdig/button7.gif
-wwwoffle/hold/html/htdig/button8.gif
-wwwoffle/hold/html/htdig/button9.gif
-wwwoffle/hold/html/htdig/buttonl.gif
-wwwoffle/hold/html/htdig/buttonr.gif
-wwwoffle/hold/html/htdig/conf/CONFIG
-wwwoffle/hold/html/htdig/conf/htdig-full.conf
-wwwoffle/hold/html/htdig/conf/htdig-incr.conf
-wwwoffle/hold/html/htdig/conf/htfuzzy.conf
-wwwoffle/hold/html/htdig/conf/htmerge.conf
-wwwoffle/hold/html/htdig/conf/htsearch.conf
-wwwoffle/hold/html/htdig/htdig.gif
-wwwoffle/hold/html/htdig/index.html
-wwwoffle/hold/html/htdig/scripts/wwwoffle-htdig-full
-wwwoffle/hold/html/htdig/scripts/wwwoffle-htdig-incr
-wwwoffle/hold/html/htdig/scripts/wwwoffle-htsearch
-wwwoffle/hold/html/htdig/search.html
-wwwoffle/hold/html/htdig/star.gif
-wwwoffle/hold/html/htdig/star_blank.gif
-wwwoffle/hold/html/htdig/start1.html
-wwwoffle/hold/html/htdig/start2.html
-wwwoffle/hold/html/htdig/start3.html
-wwwoffle/hold/html/htdig/start4.html
-wwwoffle/hold/html/index.html
-wwwoffle/hold/html/local/images/trans-1x1.gif
-wwwoffle/hold/html/messages/AddCacheInfo.html
-wwwoffle/hold/html/messages/CantRefreshPosted.html
-wwwoffle/hold/html/messages/ConfigEditPage-Body.html
-wwwoffle/hold/html/messages/ConfigEditPage-Head.html
-wwwoffle/hold/html/messages/ConfigEditPage-Tail.html
-wwwoffle/hold/html/messages/ConfigError.html
-wwwoffle/hold/html/messages/ConfigUpdate.html
-wwwoffle/hold/html/messages/ConfirmRequest.html
-wwwoffle/hold/html/messages/ControlAuthFail.html
-wwwoffle/hold/html/messages/ControlDelete.html
-wwwoffle/hold/html/messages/ControlIllegal.html
-wwwoffle/hold/html/messages/ControlPage.html
-wwwoffle/hold/html/messages/ControlWWWOFFLE-Head.html
-wwwoffle/hold/html/messages/ControlWWWOFFLE-Tail.html
-wwwoffle/hold/html/messages/FTPDir-Head.html
-wwwoffle/hold/html/messages/FTPDir-Tail.html
-wwwoffle/hold/html/messages/FTPDirRedirect.html
-wwwoffle/hold/html/messages/FileLocked.html
-wwwoffle/hold/html/messages/HostNotGot.html
-wwwoffle/hold/html/messages/IllegalProtocol.html
-wwwoffle/hold/html/messages/Index-Head.html
-wwwoffle/hold/html/messages/Index-Tail.html
-wwwoffle/hold/html/messages/IndexError-Body.html
-wwwoffle/hold/html/messages/IndexHost-Body.html
-wwwoffle/hold/html/messages/IndexHost-Head.html
-wwwoffle/hold/html/messages/IndexHost-Tail.html
-wwwoffle/hold/html/messages/IndexIllegal.html
-wwwoffle/hold/html/messages/IndexLastTime-Body.html
-wwwoffle/hold/html/messages/IndexLastTime-Head.html
-wwwoffle/hold/html/messages/IndexLastTime-Tail.html
-wwwoffle/hold/html/messages/IndexLatest-Body.html
-wwwoffle/hold/html/messages/IndexLatest-Head.html
-wwwoffle/hold/html/messages/IndexLatest-Tail.html
-wwwoffle/hold/html/messages/IndexMonitor-Body.html
-wwwoffle/hold/html/messages/IndexMonitor-Head.html
-wwwoffle/hold/html/messages/IndexMonitor-Tail.html
-wwwoffle/hold/html/messages/IndexOutgoing-Body.html
-wwwoffle/hold/html/messages/IndexOutgoing-Head.html
-wwwoffle/hold/html/messages/IndexOutgoing-Tail.html
-wwwoffle/hold/html/messages/IndexProtocol-Body.html
-wwwoffle/hold/html/messages/IndexProtocol-Head.html
-wwwoffle/hold/html/messages/IndexProtocol-Tail.html
-wwwoffle/hold/html/messages/IndexRedirect.html
-wwwoffle/hold/html/messages/IndexRoot-Body.html
-wwwoffle/hold/html/messages/IndexSeparator-Body.html
-wwwoffle/hold/html/messages/IndexURLRedirect.html
-wwwoffle/hold/html/messages/LocalDirRedirect.html
-wwwoffle/hold/html/messages/MethodUnsupported.html
-wwwoffle/hold/html/messages/MonitorFormError.html
-wwwoffle/hold/html/messages/MonitorIllegal.html
-wwwoffle/hold/html/messages/MonitorPage.html
-wwwoffle/hold/html/messages/MonitorWillGet.html
-wwwoffle/hold/html/messages/PageNotFound.html
-wwwoffle/hold/html/messages/ProxyAuthFail.html
-wwwoffle/hold/html/messages/README
-wwwoffle/hold/html/messages/RefreshFormError.html
-wwwoffle/hold/html/messages/RefreshIllegal.html
-wwwoffle/hold/html/messages/RefreshPage.html
-wwwoffle/hold/html/messages/RefreshRedirect.html
-wwwoffle/hold/html/messages/RefreshWillGet.html
-wwwoffle/hold/html/messages/RefusedRequest.html
-wwwoffle/hold/html/messages/RemoteHostError.html
-wwwoffle/hold/html/messages/ServerError.html
-wwwoffle/hold/html/messages/UserNeedsPass.html
-wwwoffle/hold/html/messages/WillGet.html
-wwwoffle/hold/html/robots.txt
-wwwoffle/hold/html/wwwoffle.pac
-@comment wwwoffle/hold/upgrade-config.pl
 wwwoffle/html/FAQ.html
 wwwoffle/html/Welcome.html
 wwwoffle/html/htdig/button1.gif
@@ -140,9 +37,9 @@ wwwoffle/html/htdig/button8.gif
 wwwoffle/html/htdig/button9.gif
 wwwoffle/html/htdig/buttonl.gif
 wwwoffle/html/htdig/buttonr.gif
-wwwoffle/html/htdig/conf/CONFIG
 wwwoffle/html/htdig/conf/htdig-full.conf
 wwwoffle/html/htdig/conf/htdig-incr.conf
+wwwoffle/html/htdig/conf/htdig-lasttime.conf
 wwwoffle/html/htdig/conf/htfuzzy.conf
 wwwoffle/html/htdig/conf/htmerge.conf
 wwwoffle/html/htdig/conf/htsearch.conf
@@ -150,10 +47,15 @@ wwwoffle/html/htdig/htdig.gif
 wwwoffle/html/htdig/index.html
 wwwoffle/html/htdig/scripts/wwwoffle-htdig-full
 wwwoffle/html/htdig/scripts/wwwoffle-htdig-incr
+wwwoffle/html/htdig/scripts/wwwoffle-htdig-lasttime
+wwwoffle/html/htdig/scripts/wwwoffle-htfuzzy
 wwwoffle/html/htdig/scripts/wwwoffle-htsearch
 wwwoffle/html/htdig/search.html
 wwwoffle/html/htdig/star.gif
 wwwoffle/html/htdig/star_blank.gif
+wwwoffle/html/htdig/start-lt2.html
+wwwoffle/html/htdig/start-lt3.html
+wwwoffle/html/htdig/start-lt4.html
 wwwoffle/html/htdig/start1.html
 wwwoffle/html/htdig/start2.html
 wwwoffle/html/htdig/start3.html
@@ -169,7 +71,9 @@ wwwoffle/html/messages/ConfigError.html
 wwwoffle/html/messages/ConfigUpdate.html
 wwwoffle/html/messages/ConfirmRequest.html
 wwwoffle/html/messages/ControlAuthFail.html
-wwwoffle/html/messages/ControlDelete.html
+wwwoffle/html/messages/ControlDelete-Body.html
+wwwoffle/html/messages/ControlDelete-Head.html
+wwwoffle/html/messages/ControlDelete-Tail.html
 wwwoffle/html/messages/ControlIllegal.html
 wwwoffle/html/messages/ControlPage.html
 wwwoffle/html/messages/ControlWWWOFFLE-Head.html
@@ -177,6 +81,7 @@ wwwoffle/html/messages/ControlWWWOFFLE-Tail.html
 wwwoffle/html/messages/FTPDir-Head.html
 wwwoffle/html/messages/FTPDir-Tail.html
 wwwoffle/html/messages/FTPDirRedirect.html
+wwwoffle/html/messages/FTPPut.html
 wwwoffle/html/messages/FileLocked.html
 wwwoffle/html/messages/HostNotGot.html
 wwwoffle/html/messages/IllegalProtocol.html
@@ -227,30 +132,23 @@ wwwoffle/html/messages/UserNeedsPass.html
 wwwoffle/html/messages/WillGet.html
 wwwoffle/html/robots.txt
 wwwoffle/html/wwwoffle.pac
-@unexec rm -rf %D/wwwoffle/http
 wwwoffle/outgoing/Owwwoffle-browser
 wwwoffle/outgoing/Owwwoffle-user
 wwwoffle/outgoing/Uwwwoffle-browser
 wwwoffle/outgoing/Uwwwoffle-user
-wwwoffle/wwwoffle.conf
+wwwoffle/upgrade-config.pl
 wwwoffle/wwwoffle.conf.install
-@dirrm wwwoffle/hold/html/htdig/conf
-@dirrm wwwoffle/hold/html/htdig/scripts
-@dirrm wwwoffle/hold/html/htdig
-@dirrm wwwoffle/hold/html/local/images
-@dirrm wwwoffle/hold/html/local
-@dirrm wwwoffle/hold/html/messages
-@dirrm wwwoffle/hold/html
-@dirrm wwwoffle/hold
 @dirrm wwwoffle/html/htdig/conf
+@dirrm wwwoffle/html/htdig/db
+@dirrm wwwoffle/html/htdig/db-lasttime
 @dirrm wwwoffle/html/htdig/scripts
 @dirrm wwwoffle/html/htdig
 @dirrm wwwoffle/html/local/images
 @dirrm wwwoffle/html/local
 @dirrm wwwoffle/html/messages
 @dirrm wwwoffle/html
-@dirrm wwwoffle/prevtime1
+@dirrm wwwoffle/http
 @dirrm wwwoffle/lasttime
 @dirrm wwwoffle/monitor
 @dirrm wwwoffle/outgoing
-@dirrm wwwoffle
+@dirrm wwwoffle/prevtime1