Remove kludge which tries to add "/var/wwwoffle" to package list. Instead

of that we create a tar archive with the spool directory layout which
will be extracted during installation of the binary package.

4 files changed, 11 insertions, 84 deletions

diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 4b66a8c322b..84840958fa5 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/20 20:06:49 tron Exp $
 
 DISTNAME=	wwwoffle-2.2
 CATEGORIES=	www
@@ -15,9 +15,9 @@ NO_CONFIGURE=	yes
 PLIST_SRC=	${WRKDIR}/PLIST
 
 post-build:
-	@${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/wwwoffle.sh \
+	@${SED} -e 's#@PREFIX@#${PREFIX}#g' <${FILESDIR}/wwwoffle.sh \
 	  >${WRKDIR}/wwwoffle.sh
-	@${SH} ${SCRIPTDIR}/plist ${PREFIX} ${PKGDIR}/PLIST ${PLIST_SRC}
+	@${SED} -e 's#@GTAR@#${GTAR}#g' <${PKGDIR}/PLIST >${PLIST_SRC}
 
 pre-install:
 	${MKDIR} ${PREFIX}/etc/wwwoffle
@@ -26,5 +26,6 @@ post-install:
 	${CP} ${PREFIX}/etc/wwwoffle/wwwoffle.conf \
 	  ${PREFIX}/etc/wwwoffle/wwwoffle.conf.default
 	${INSTALL_SCRIPT} ${WRKDIR}/wwwoffle.sh ${PREFIX}/etc/rc.d
+	${GTAR} czCf / ${PREFIX}/libdata/wwwoffle-spool.tar.gz var/wwwoffle
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/wwwoffle/pkg/MESSAGE b/www/wwwoffle/pkg/MESSAGE
index afec4106ece..7e658685aaf 100644
--- a/www/wwwoffle/pkg/MESSAGE
+++ b/www/wwwoffle/pkg/MESSAGE
@@ -1,3 +1 @@
-$NetBSD: MESSAGE,v 1.2 1998/08/07 11:14:31 agc Exp $
-
 Please add "${PREFIX}/etc/rc.d/wwwoffle.sh" to "/etc/rc.local".
diff --git a/www/wwwoffle/pkg/PLIST b/www/wwwoffle/pkg/PLIST
index 7e0ae52da45..768a63c3660 100644
--- a/www/wwwoffle/pkg/PLIST
+++ b/www/wwwoffle/pkg/PLIST
@@ -1,78 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/13 18:20:08 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/04/20 20:06:50 tron Exp $
 bin/wwwoffle
 bin/wwwoffle-tools
 bin/wwwoffle-ls
 bin/wwwoffle-mv
 bin/wwwoffle-rm
 etc/rc.d/wwwoffle.sh
+etc/wwwoffle/wwwoffle.conf.default
+@exec cp -p %F %D/etc/wwwoffle/wwwoffle.conf
+@unexec rm -f %D/etc/wwwoffle/wwwoffle.conf
+libdata/wwwoffle-spool.tar.gz
 man/man1/wwwoffle.1
 man/man5/wwwoffle.conf.5
 man/man8/wwwoffled.8
 sbin/wwwoffled
-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
+@exec @GTAR@ xzCf / %D/libdata/wwwoffle-spool.tar.gz
+@unexec rm -rf /var/wwwoffle
diff --git a/www/wwwoffle/scripts/plist b/www/wwwoffle/scripts/plist
deleted file mode 100644
index cb994741dad..00000000000
--- a/www/wwwoffle/scripts/plist
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: plist,v 1.2 1998/08/07 11:14:31 agc Exp $
-#
-PREFIX=$1
-RELPATH=
-while [ $PREFIX != / ]
-do
- RELPATH=../$RELPATH
- PREFIX=`dirname $PREFIX`
-done
-exec sed s#@RELPATH@#${RELPATH}# <$2 >$3