Update "wwwoffle" to version 2.2.

5 files changed, 100 insertions, 12 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index b77b486303d..6af2cc66e0c 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,18 +1,24 @@
-# $NetBSD: Makefile,v 1.2 1998/06/22 13:14:31 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/07/13 18:20:08 tron Exp $
 
-DISTNAME=	wwwoffle-2.1c
+DISTNAME=	wwwoffle-2.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.gedanken.demon.co.uk/wwwoffle/version-2.1/
+MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/httpd/ \
+		ftp://sunsite.unc.edu/pub/Linux/apps/www/servers/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	magick@bundy.lip.owl.de
 
+CONFLICTS=	wwwoffle-2.1c
+
 USE_GMAKE=	yes
 NO_CONFIGURE=	yes
 
+PLIST_SRC=	${WRKDIR}/PLIST
+
 post-build:
-	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/wwwoffle.sh \
+	@${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/wwwoffle.sh \
 	  >${WRKDIR}/wwwoffle.sh
+	@${SH} ${SCRIPTDIR}/plist ${PREFIX} ${PKGDIR}/PLIST ${PLIST_SRC}
 
 pre-install:
 	${MKDIR} ${PREFIX}/etc/wwwoffle
diff --git a/www/wwwoffle/files/md5 b/www/wwwoffle/files/md5
index cba5ca137b7..8b135ac38d4 100644
--- a/www/wwwoffle/files/md5
+++ b/www/wwwoffle/files/md5
@@ -1 +1 @@
-MD5 (wwwoffle-2.1c.tgz) = d55e936eabd30ee0d1ab0eb6948d4dd3
+MD5 (wwwoffle-2.2.tgz) = 8409cdb2be9c5a7dcc2d51be1fd1a5d0
diff --git a/www/wwwoffle/patches/patch-aa b/www/wwwoffle/patches/patch-aa
index b1db490314e..600dfff1c75 100644
--- a/www/wwwoffle/patches/patch-aa
+++ b/www/wwwoffle/patches/patch-aa
@@ -1,13 +1,14 @@
---- Makefile.orig	Sat Jun  6 18:02:38 1998
-+++ Makefile	Sat Jun  6 18:05:01 1998
+--- Makefile.orig	Mon Jun 15 20:58:24 1998
++++ Makefile	Sat Jul 11 23:42:20 1998
 @@ -14,17 +14,17 @@
  
  ########
  
 -INSTDIR=/usr/local
-+INSTDIR=${PREFIX}
- SPOOLDIR=/var/spool/wwwoffle
+-SPOOLDIR=/var/spool/wwwoffle
 -CONFDIR=/var/spool/wwwoffle
++INSTDIR=${PREFIX}
++SPOOLDIR=/var/wwwoffle
 +CONFDIR=${PREFIX}/etc/wwwoffle
  
  ########
@@ -19,6 +20,15 @@
  LD=gcc
 -LDFLAGS=-g
 +LDFLAGS=-s
+ # For HP/UX this is a good idea.
+ #LDFLAGS=
  
- LEX=flex -i -L
- 
+@@ -240,7 +240,7 @@
+ 	[ -e $(SPOOLDIR)/html -a ! -e $(SPOOLDIR)/html.old ] && mv $(SPOOLDIR)/html $(SPOOLDIR)/html.old ;\
+ 	[ ! -e $(SPOOLDIR)/html ] && mkdir $(SPOOLDIR)/html
+ 	@for f in html/* ; do \
+-	  cp -a $$f $(SPOOLDIR)/$$f && echo "Installing $(SPOOLDIR)/$$f";\
++	  cp -R $$f $(SPOOLDIR)/$$f && echo "Installing $(SPOOLDIR)/$$f";\
+ 	 done
+ 	@([ -d $(SPOOLDIR) -a ! -d $(SPOOLDIR)/prevtime1 ] && ./endian-cache > /dev/null 2>&1 ) || \
+ 	 (echo "WWWOFFLE: " ;\
diff --git a/www/wwwoffle/pkg/PLIST b/www/wwwoffle/pkg/PLIST
index 309a0ba3239..7e0ae52da45 100644
--- a/www/wwwoffle/pkg/PLIST
+++ b/www/wwwoffle/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/06/06 17:03:59 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/07/13 18:20:08 tron Exp $
 bin/wwwoffle
 bin/wwwoffle-tools
 bin/wwwoffle-ls
@@ -13,3 +13,66 @@ etc/wwwoffle/wwwoffle.conf.default
 @exec cp %F %D/etc/wwwoffle/wwwoffle.conf
 @unexec rm -f %D/etc/wwwoffle/wwwoffle.conf
 @dirrm etc/wwwoffle
+@RELPATH@var/wwwoffle/outgoing/Owwwoffle-user
+@RELPATH@var/wwwoffle/outgoing/Uwwwoffle-user
+@RELPATH@var/wwwoffle/outgoing/Owwwoffle-browser
+@RELPATH@var/wwwoffle/outgoing/Uwwwoffle-browser
+@RELPATH@var/wwwoffle/html/FAQ.html
+@RELPATH@var/wwwoffle/html/Welcome.html
+@RELPATH@var/wwwoffle/html/messages/AddInfoRefresh.html
+@RELPATH@var/wwwoffle/html/messages/RefreshRedirect.html
+@RELPATH@var/wwwoffle/html/messages/README
+@RELPATH@var/wwwoffle/html/messages/WillGet.html
+@RELPATH@var/wwwoffle/html/messages/LocalDirRedirect.html
+@RELPATH@var/wwwoffle/html/messages/PageNotFound.html
+@RELPATH@var/wwwoffle/html/messages/RemoteHostError.html
+@RELPATH@var/wwwoffle/html/messages/HostNotGot.html
+@RELPATH@var/wwwoffle/html/messages/IllegalProtocol.html
+@RELPATH@var/wwwoffle/html/messages/CantRefreshPosted.html
+@RELPATH@var/wwwoffle/html/messages/RefreshWillGet.html
+@RELPATH@var/wwwoffle/html/messages/IndexIllegal.html
+@RELPATH@var/wwwoffle/html/messages/PasswordNotAllowed.html
+@RELPATH@var/wwwoffle/html/messages/MonitorIllegal.html
+@RELPATH@var/wwwoffle/html/messages/ControlPage.html
+@RELPATH@var/wwwoffle/html/messages/RefusedRequest.html
+@RELPATH@var/wwwoffle/html/messages/RefreshIllegal.html
+@RELPATH@var/wwwoffle/html/messages/RefreshPage.html
+@RELPATH@var/wwwoffle/html/messages/MonitorFormError.html
+@RELPATH@var/wwwoffle/html/messages/IndexRedirect.html
+@RELPATH@var/wwwoffle/html/messages/Index-Head.html
+@RELPATH@var/wwwoffle/html/messages/RefreshFormError.html
+@RELPATH@var/wwwoffle/html/messages/ControlIllegal.html
+@RELPATH@var/wwwoffle/html/messages/IndexURLRedirect.html
+@RELPATH@var/wwwoffle/html/messages/FTPDirRedirect.html
+@RELPATH@var/wwwoffle/html/messages/MonitorPage.html
+@RELPATH@var/wwwoffle/html/messages/ControlAuthFail.html
+@RELPATH@var/wwwoffle/html/messages/MonitorWillGet.html
+@RELPATH@var/wwwoffle/html/messages/ConfigEditPage-Head.html
+@RELPATH@var/wwwoffle/html/messages/Index-Tail.html
+@RELPATH@var/wwwoffle/html/messages/ConfigEditPage-Tail.html
+@RELPATH@var/wwwoffle/html/messages/ConfigUpdate.html
+@RELPATH@var/wwwoffle/html/messages/ControlWWWOFFLE-Head.html
+@RELPATH@var/wwwoffle/html/messages/ControlDelete.html
+@RELPATH@var/wwwoffle/html/messages/ConfigError.html
+@RELPATH@var/wwwoffle/html/messages/IndexRoot-Body.html
+@RELPATH@var/wwwoffle/html/messages/ControlWWWOFFLE-Tail.html
+@RELPATH@var/wwwoffle/html/messages/FTPDir-Tail.html
+@RELPATH@var/wwwoffle/html/messages/ConfigEditPage-Body.html
+@RELPATH@var/wwwoffle/html/messages/FTPDir-Head.html
+@RELPATH@var/wwwoffle/html/messages/ServerError.html
+@RELPATH@var/wwwoffle/html/robots.txt
+@RELPATH@var/wwwoffle/html/wwwoffle.pac
+@RELPATH@var/wwwoffle/html/index.html
+@dirrm @RELPATH@var/wwwoffle/outgoing
+@exec mkdir -p %D/@RELPATH@var/wwwoffle/monitor
+@dirrm @RELPATH@var/wwwoffle/monitor
+@exec mkdir -p %D/@RELPATH@var/wwwoffle/lasttime
+@dirrm @RELPATH@var/wwwoffle/lasttime
+@unexec rm -rf %D/@RELPATH@var/wwwoffle/http
+@unexec rm -rf %D/@RELPATH@var/wwwoffle/ftp
+@unexec rm -rf %D/@RELPATH@var/wwwoffle/finger
+@exec mkdir -p %D/@RELPATH@var/wwwoffle/html/local
+@dirrm @RELPATH@var/wwwoffle/html/local
+@dirrm @RELPATH@var/wwwoffle/html/messages
+@dirrm @RELPATH@var/wwwoffle/html
+@dirrm @RELPATH@var/wwwoffle
diff --git a/www/wwwoffle/scripts/plist b/www/wwwoffle/scripts/plist
new file mode 100644
index 00000000000..84ed28aa6bb
--- /dev/null
+++ b/www/wwwoffle/scripts/plist
@@ -0,0 +1,9 @@
+#!/bin/sh
+PREFIX=$1
+RELPATH=
+while [ $PREFIX != / ]
+do
+ RELPATH=../$RELPATH
+ PREFIX=`dirname $PREFIX`
+done
+exec sed s#@RELPATH@#${RELPATH}# <$2 >$3