5 files changed, 340 insertions, 51 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index c8570ee50cc6..ccbc564518a5 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,22 +1,87 @@
 # New ports collection makefile for:	wwwoffle
-# Version required:	2.1
+# Version required:	2.4
 # Date created:		1 Jun 1998
 # Whom:			Peter Mutsaers
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/09 01:17:19 steve Exp $
+# $Id: Makefile,v 1.2 1999/03/08 19:58:02 fenner Exp $
 #
 
-DISTNAME=	wwwoffle-2.1
+DISTNAME=	wwwoffle-2.4
 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
+
 USE_GMAKE=	yes
+USE_PERL5=	yes
 
 MAN1=		wwwoffle.1
 MAN5=		wwwoffle.conf.5
 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
+
+post-install:
+	# upgrade cache, convert cache, build additional files, configure html and wwwoffle.conf
+	$(PKGDIR)/INSTALL ${DISTNAME} POST-INSTALL
+
+# keep at end
 .include <bsd.port.mk>
diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo
index a9a3bd57c15b..ad4ff35d0c04 100644
--- a/www/wwwoffle/distinfo
+++ b/www/wwwoffle/distinfo
@@ -1 +1 @@
-MD5 (wwwoffle-2.1.tgz) = 25a98bb5f7f22ee028edd6981827f4ee
+MD5 (wwwoffle-2.4.tgz) = fbd0d04618b274ed5eac7977dfba6e3c
diff --git a/www/wwwoffle/files/patch-aa b/www/wwwoffle/files/patch-aa
index 85bcc7187791..6628cdea485e 100644
--- a/www/wwwoffle/files/patch-aa
+++ b/www/wwwoffle/files/patch-aa
@@ -1,25 +1,30 @@
-*** Makefile.orig	Sun Mar  8 17:10:55 1998
---- Makefile	Sun Mar  8 17:11:37 1998
-***************
-*** 21,30 ****
-  ########
-  
-  CC=gcc
-! CFLAGS=-O2 -Wall -g
-  
-  LD=gcc
-! LDFLAGS=-g
-  
-  LEX=flex -i -L
-  
---- 21,30 ----
-  ########
-  
-  CC=gcc
-! CFLAGS=-O2 -Wall
-  
-  LD=gcc
-! LDFLAGS=-s
-  
-  LEX=flex -i -L
-  
+--- Makefile.orig	Thu Dec  3 19:19:46 1998
++++ Makefile	Sun Mar  7 09:13:34 1999
+@@ -16,9 +16,9 @@
+ 
+ LOCALHOST=localhost:8080
+ 
+-INSTDIR=/usr/local
+-SPOOLDIR=/var/spool/wwwoffle
+-CONFDIR=/var/spool/wwwoffle
++INSTDIR=$(PREFIX)
++SPOOLDIR=$(SPOOL)/wwwoffle
++CONFDIR=$(SPOOL)/wwwoffle
+ 
+ # For Cygwin (win32)
+ #INSTDIR=/wwwoffle
+@@ -28,13 +28,12 @@
+ ########
+ 
+ CC=gcc
+-CFLAGS=-O2 -Wall -g
+ 
+ # 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=
diff --git a/www/wwwoffle/files/patch-ab b/www/wwwoffle/files/patch-ab
deleted file mode 100644
index e91365565b76..000000000000
--- a/www/wwwoffle/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** misc.c.orig	Sun Mar  8 17:19:03 1998
---- misc.c	Sun Mar  8 17:19:38 1998
-***************
-*** 316,322 ****
-           tim->tm_hour,
-           tim->tm_min,
-           tim->tm_sec,
-!          utc?"GMT":tzname[tim->tm_isdst>0]);
-  
-   return(value);
-  }
---- 316,322 ----
-           tim->tm_hour,
-           tim->tm_min,
-           tim->tm_sec,
-!          utc?"GMT":tim->tm_zone);
-  
-   return(value);
-  }
diff --git a/www/wwwoffle/pkg-plist b/www/wwwoffle/pkg-plist
index b61741297f52..74daee745645 100644
--- a/www/wwwoffle/pkg-plist
+++ b/www/wwwoffle/pkg-plist
@@ -1,17 +1,255 @@
+bin/endian-cache
+bin/upgrade-cache
 bin/wwwoffle
-bin/wwwoffle-tools
 bin/wwwoffle-ls
 bin/wwwoffle-mv
+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
 @cwd /var/spool
-wwwoffle/wwwoffle.conf
+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
+wwwoffle/hold/upgrade-config.pl
+wwwoffle/html/FAQ.html
+wwwoffle/html/Welcome.html
+wwwoffle/html/htdig/button1.gif
+wwwoffle/html/htdig/button10.gif
+wwwoffle/html/htdig/button2.gif
+wwwoffle/html/htdig/button3.gif
+wwwoffle/html/htdig/button4.gif
+wwwoffle/html/htdig/button5.gif
+wwwoffle/html/htdig/button6.gif
+wwwoffle/html/htdig/button7.gif
+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/htfuzzy.conf
+wwwoffle/html/htdig/conf/htmerge.conf
+wwwoffle/html/htdig/conf/htsearch.conf
+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-htsearch
+wwwoffle/html/htdig/search.html
+wwwoffle/html/htdig/star.gif
+wwwoffle/html/htdig/star_blank.gif
+wwwoffle/html/htdig/start1.html
+wwwoffle/html/htdig/start2.html
+wwwoffle/html/htdig/start3.html
+wwwoffle/html/htdig/start4.html
+wwwoffle/html/index.html
+wwwoffle/html/local/images/trans-1x1.gif
+wwwoffle/html/messages/AddCacheInfo.html
+wwwoffle/html/messages/CantRefreshPosted.html
+wwwoffle/html/messages/ConfigEditPage-Body.html
+wwwoffle/html/messages/ConfigEditPage-Head.html
+wwwoffle/html/messages/ConfigEditPage-Tail.html
+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/ControlIllegal.html
+wwwoffle/html/messages/ControlPage.html
+wwwoffle/html/messages/ControlWWWOFFLE-Head.html
+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/FileLocked.html
+wwwoffle/html/messages/HostNotGot.html
+wwwoffle/html/messages/IllegalProtocol.html
+wwwoffle/html/messages/Index-Head.html
+wwwoffle/html/messages/Index-Tail.html
+wwwoffle/html/messages/IndexError-Body.html
+wwwoffle/html/messages/IndexHost-Body.html
+wwwoffle/html/messages/IndexHost-Head.html
+wwwoffle/html/messages/IndexHost-Tail.html
+wwwoffle/html/messages/IndexIllegal.html
+wwwoffle/html/messages/IndexLastTime-Body.html
+wwwoffle/html/messages/IndexLastTime-Head.html
+wwwoffle/html/messages/IndexLastTime-Tail.html
+wwwoffle/html/messages/IndexLatest-Body.html
+wwwoffle/html/messages/IndexLatest-Head.html
+wwwoffle/html/messages/IndexLatest-Tail.html
+wwwoffle/html/messages/IndexMonitor-Body.html
+wwwoffle/html/messages/IndexMonitor-Head.html
+wwwoffle/html/messages/IndexMonitor-Tail.html
+wwwoffle/html/messages/IndexOutgoing-Body.html
+wwwoffle/html/messages/IndexOutgoing-Head.html
+wwwoffle/html/messages/IndexOutgoing-Tail.html
+wwwoffle/html/messages/IndexProtocol-Body.html
+wwwoffle/html/messages/IndexProtocol-Head.html
+wwwoffle/html/messages/IndexProtocol-Tail.html
+wwwoffle/html/messages/IndexRedirect.html
+wwwoffle/html/messages/IndexRoot-Body.html
+wwwoffle/html/messages/IndexSeparator-Body.html
+wwwoffle/html/messages/IndexURLRedirect.html
+wwwoffle/html/messages/LocalDirRedirect.html
+wwwoffle/html/messages/MethodUnsupported.html
+wwwoffle/html/messages/MonitorFormError.html
+wwwoffle/html/messages/MonitorIllegal.html
+wwwoffle/html/messages/MonitorPage.html
+wwwoffle/html/messages/MonitorWillGet.html
+wwwoffle/html/messages/PageNotFound.html
+wwwoffle/html/messages/ProxyAuthFail.html
+wwwoffle/html/messages/README
+wwwoffle/html/messages/RefreshFormError.html
+wwwoffle/html/messages/RefreshIllegal.html
+wwwoffle/html/messages/RefreshPage.html
+wwwoffle/html/messages/RefreshRedirect.html
+wwwoffle/html/messages/RefreshWillGet.html
+wwwoffle/html/messages/RefusedRequest.html
+wwwoffle/html/messages/RemoteHostError.html
+wwwoffle/html/messages/ServerError.html
+wwwoffle/html/messages/UserNeedsPass.html
+wwwoffle/html/messages/WillGet.html
+wwwoffle/html/robots.txt
+wwwoffle/html/wwwoffle.pac
 wwwoffle/outgoing/Owwwoffle-browser
 wwwoffle/outgoing/Owwwoffle-user
 wwwoffle/outgoing/Uwwwoffle-browser
 wwwoffle/outgoing/Uwwwoffle-user
-@dirrm wwwoffle/http
+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/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/lasttime
 @dirrm wwwoffle/monitor
 @dirrm wwwoffle/outgoing
+@dirrm wwwoffle/http
 @dirrm wwwoffle