fix problem where ${D} got into default config file. cleanup ebuild.

remove old revisions.

11 files changed, 19 insertions, 384 deletions

diff --git a/net-www/wwwoffle/ChangeLog b/net-www/wwwoffle/ChangeLog
index 88e746a7a899..38b9d33ba656 100644
--- a/net-www/wwwoffle/ChangeLog
+++ b/net-www/wwwoffle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/wwwoffle
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.3 2002/03/16 14:22:47 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/ChangeLog,v 1.4 2002/03/26 12:48:38 danarmak Exp $
+
+  26 Mar 2002; Dan Armak <danarmak@gentoo.org>: general cleanup
+  of the ebuild. Fix bug that made the default spooldir /var/tmp/portage/...
 
 *wwwoffle-2.7-r1 (16 Mar 2002)
 
diff --git a/net-www/wwwoffle/files/digest-wwwoffle-2.6d b/net-www/wwwoffle/files/digest-wwwoffle-2.6d
deleted file mode 100644
index e84f68070385..000000000000
--- a/net-www/wwwoffle/files/digest-wwwoffle-2.6d
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a6de704d05fdc3c19f5dfbcec68d8bd wwwoffle-2.6d.tgz 645469
diff --git a/net-www/wwwoffle/files/digest-wwwoffle-2.6d-r6 b/net-www/wwwoffle/files/digest-wwwoffle-2.6d-r6
deleted file mode 100644
index e84f68070385..000000000000
--- a/net-www/wwwoffle/files/digest-wwwoffle-2.6d-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a6de704d05fdc3c19f5dfbcec68d8bd wwwoffle-2.6d.tgz 645469
diff --git a/net-www/wwwoffle/files/digest-wwwoffle-2.7 b/net-www/wwwoffle/files/digest-wwwoffle-2.7
deleted file mode 100644
index 08097429fbfa..000000000000
--- a/net-www/wwwoffle/files/digest-wwwoffle-2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a2908c3eaaa2d9b49366c5a721c8916c wwwoffle-2.7.tgz 832728
diff --git a/net-www/wwwoffle/files/wwwoffle-2.6d-gentoo.diff b/net-www/wwwoffle/files/wwwoffle-2.6d-gentoo.diff
deleted file mode 100644
index a26930ddac9a..000000000000
--- a/net-www/wwwoffle/files/wwwoffle-2.6d-gentoo.diff
+++ /dev/null
@@ -1,100 +0,0 @@
---- Makefile.orig	Tue May 29 21:29:03 2001
-+++ Makefile	Wed Jul 18 00:17:57 2001
-@@ -18,11 +18,14 @@
- LOCALHOST=localhost:8080
- 
- # For UNIX.
--INSTDIR=/usr/local
--SPOOLDIR=/var/spool/wwwoffle
--CONFDIR=/var/spool/wwwoffle
--MANDIR=$(INSTDIR)/man
--DOCDIR=$(INSTDIR)/doc/wwwoffle
-+INSTDIR=${DESTDIR}/usr
-+SPOOLDIR=${DESTDIR}/var/spool/wwwoffle
-+CONFDIR=${DESTDIR}/var/spool/wwwoffle
-+MANDIR=$(INSTDIR)/share/man
-+DOCDIR=$(INSTDIR)/share/doc/wwwoffle
-+
-+REALSPOOLDIR=/var/spool/wwwoffle
-+REALCONFDIR=/var/spool/wwwoffle
- 
- # For Cygwin (win32).
- #INSTDIR=/wwwoffle
-@@ -54,7 +57,7 @@
- ########
- 
- CC=gcc
--CFLAGS=-O2 -Wall -g
-+NEWCFLAGS=-O2 -Wall -g ${CFLAGS}
- 
- # This is used in the FreeBSD port (http://www.freebsd.org/ports/).
- #CFLAGS=-O2 -Wall
-@@ -106,7 +109,7 @@
- # For Solaris you need the following instead.
- #LIBRARY=-lnsl -lsocket -lz
- 
--COMPILE=$(CC) -c $(CFLAGS)
-+COMPILE=$(CC) -c $(NEWCFLAGS)
- 
- LINK=$(LD) $(LDFLAGS)
- 
-@@ -340,7 +343,7 @@
- 	[ -x $(MANDIR)/man1 ] || $(INSTALL) -d -m 755 $(MANDIR)/man1
- 	$(INSTALL) -c -m 644 wwwoffle.man $(MANDIR)/man1/wwwoffle.1
- 	[ -x $(MANDIR)/man5 ] || $(INSTALL) -d -m 755 $(MANDIR)/man5
--	sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf.man > wwwoffle.conf.man.install
-+	sed -e 's%SPOOLDIR%$(TRUESPOOLDIR)%' -e 's%CONFDIR%$(TRUECONFDIR)%' < wwwoffle.conf.man > wwwoffle.conf.man.install
- 	$(INSTALL) -c -m 644 wwwoffle.conf.man.install $(MANDIR)/man5/wwwoffle.conf.5
- 	[ -x $(MANDIR)/man8 ] || $(INSTALL) -d -m 755 $(MANDIR)/man8
- 	$(INSTALL) -c -m 644 wwwoffled.man $(MANDIR)/man8/wwwoffled.8
-@@ -356,7 +359,7 @@
- 	  done )
- 
- install_cache :
--	@[ ! -d $(SPOOLDIR) ] || [ ! -d $(SPOOLDIR)/outgoing ] || [ -d $(SPOOLDIR)/prevtime1 ] || \
-+	@[ ! -d $(REALSPOOLDIR) ] || [ ! -d $(REALSPOOLDIR)/outgoing ] || [ -d $(REALSPOOLDIR)/prevtime1 ] || \
- 	 (echo "WWWOFFLE: " ;\
- 	  echo "WWWOFFLE: Your existing cache looks earlier than version 2.2, cannot continue." ;\
- 	  echo "WWWOFFLE: Read the file NEWS for details." ;\
-@@ -373,12 +376,13 @@
- 	done
- 
- install_html : html
--	@[ ! -x $(SPOOLDIR)/html.old ] || \
--	 (echo "WWWOFFLE: " ;\
--	  echo "WWWOFFLE: There is already a directory $(SPOOLDIR)/html.old." ;\
--	  echo "WWWOFFLE: Remove it and re-run make." ;\
--	  echo "WWWOFFLE: " ;\
--	  exit 1 )
-+	# This is handled in the ebuild to avoid writing out of ${D}.
-+	#@[ ! -x $(REALSPOOLDIR)/html.old ] || \
-+	# (echo "WWWOFFLE: " ;\
-+	#  echo "WWWOFFLE: There is already a directory $(REALSPOOLDIR)/html.old." ;\
-+	#  echo "WWWOFFLE: Remove it and re-run make." ;\
-+	#  echo "WWWOFFLE: " ;\
-+	#  exit 1 )
- 	[ ! -x $(SPOOLDIR)/html ] || mv $(SPOOLDIR)/html $(SPOOLDIR)/html.old
- 	[ -x $(SPOOLDIR)/html ] || mkdir $(SPOOLDIR)/html
- 	tar cf $(SPOOLDIR)/html.tar html && cd $(SPOOLDIR) && tar xpf html.tar && rm html.tar
-@@ -391,15 +395,15 @@
- 	-chgrp -R 0 $(SPOOLDIR)/html > /dev/null 2>&1
- 
- install_config :
--	sed -e 's%SPOOLDIR%$(SPOOLDIR)%' -e 's%CONFDIR%$(CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install
-+	sed -e 's%SPOOLDIR%$(REALSPOOLDIR)%' -e 's%CONFDIR%$(REALCONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install
- 	[ -x $(CONFDIR) ] || $(INSTALL) -d -m 750 $(CONFDIR)
--	@[ ! -f $(CONFDIR)/wwwoffle.conf ] || \
-+	@[ ! -f $(REALCONFDIR)/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: There is already a config file $(REALCONFDIR)/wwwoffle.conf." ;\
-+	  echo "WWWOFFLE: Run 'upgrade-config.pl $(REALCONFDIR)/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
-+	[  ! -f $(REALCONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf.install
-+	[    -f $(REALCONFDIR)/wwwoffle.conf ] || $(INSTALL) -c -m 640 wwwoffle.conf.install $(CONFDIR)/wwwoffle.conf
- 
- install_fixup-win32:
- 	for file in $(DOCDIR)/* ; do \
diff --git a/net-www/wwwoffle/files/wwwoffled.rc6 b/net-www/wwwoffle/files/wwwoffled
index 3e1a26bbf4bf..e5927c612943 100644
--- a/net-www/wwwoffle/files/wwwoffled.rc6
+++ b/net-www/wwwoffle/files/wwwoffled
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/files/wwwoffled.rc6,v 1.3 2001/12/23 23:25:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/files/wwwoffled,v 1.4 2002/03/26 12:48:38 danarmak Exp $
 
 EXE=`which wwwoffled`
 
diff --git a/net-www/wwwoffle/files/wwwoffled.rc5 b/net-www/wwwoffle/files/wwwoffled.rc5
deleted file mode 100644
index 81b518f3b663..000000000000
--- a/net-www/wwwoffle/files/wwwoffled.rc5
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:70:This line is required for script management
-
-. /etc/rc.d/config/functions
-. /etc/rc.d/config/basic
-
-SERVICE="wwwoffled"
-opts="start stop restart"
-
-#PIDFILE=/var/run/wwwoffled.pid
-EXE=/usr/sbin/wwwoffled
-
-# WARNING: wwwoffled detaches from the console and as it does so it assumes
-# a new pid. DO NOT use pidfile tracking, it does NOT work!
-# (This was a note to self, who did use pidfile tracking until he learned better)
-
-start() {
-    ebegin "Starting $SERVICE"
-    start-stop-daemon --start --quiet --exec $EXE -- -c /var/spool/wwwoffle/wwwoffle.conf
-    eend $? "Started $SERVICE." "Error starting $SERVICE."
-}
-
-stop() {
-    ebegin "Stopping $SERVICE"
-    start-stop-daemon --stop --quiet --exec $EXE
-    eend $? "Stopped $SERVICE." "Error stopping $SERVICE."
-}
-
-restart() {
-    stop
-    sleep 1s
-    start
-}
-
-doservice ${@}
diff --git a/net-www/wwwoffle/wwwoffle-2.6d-r6.ebuild b/net-www/wwwoffle/wwwoffle-2.6d-r6.ebuild
deleted file mode 100644
index cc574b23a78a..000000000000
--- a/net-www/wwwoffle/wwwoffle-2.6d-r6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.6d-r6.ebuild,v 1.2 2001/10/20 17:36:22 danarmak Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="wwwoffle = WWW Offline Explorer, an adv. caching proxy suitable for nonpermanent (e.g. DUN) Internet connections"
-
-SRC_URI="ftp://ftp.demon.co.uk/pub/unix/httpd/${P}.tgz
-	 ftp://metalab.unc.edu/pub/Linux/apps/www/servers/${P}.tgz"
-
-HOMEPAGE="http://www.gedanken.demon.co.uk/"
-
-DEPEND="sys-devel/flex 
-	sys-libs/zlib
-	sys-devel/gcc
-	virtual/glibc"
-
-src_unpack() {
-    
-    unpack ${A}
-    cd ${S}
-    
-    patch -p0 <${FILESDIR}/${P}-gentoo.diff
-    
-    if [ "`use ipv6 `" ]; then
-	cp Makefile 2
-	sed -e 's/USE_IPV6=0/USE_IPV6=1/' 2 > Makefile
-	rm 2
-    fi
-        
-}
-
-src_compile() {
-    
-    emake all || die
-    
-}
-
-src_install () {
-    
-    # This is necessary to install over an existing installation.
-    # Don't worry, no (interesting) info is lost.
-    # what's deleted is the backup info from a previous over-installation.
-    rm -rf /var/spool/wwwoffle/html.old
-    mv /var/spool/wwwoffle/html /var/spool/wwwoffle/html.old
-    
-    # Install the files
-    make DESTDIR=${D} install || die
-    
-    # Install the wwwoffled init script
-    insinto /etc/init.d
-    doins ${FILESDIR}/wwwoffled-online
-    newins ${FILESDIR}/wwwoffled.rc6 wwwoffled
-    chmod a+x ${D}/etc/init.d/{wwwoffled,wwwoffled-online}
-    
-}
-
-pkg_postinst() {
-    
-    # This simply prints out some useful instructions.
-    echo "
-    
-    -----------
-    What's Next
-    -----------
-    
-    You have successfully installed wwwoffle.
-    
-    To configure it, read and edit /var/spool/wwwoffle/wwwoffle.conf.
-    It's well commented and very powerful.
-    
-    To start using wwwoffle:
-    1. rc-update add wwwoffled to boot.
-    2. rc-update add wwwoffled-online to your 'online' runlevels.
-    3. Configure any programs to use localhost:8080 as a proxy
-       server for HTTP, HTTPS, FTP and finger.
-    "
-    
-}
\ No newline at end of file
diff --git a/net-www/wwwoffle/wwwoffle-2.6d.ebuild b/net-www/wwwoffle/wwwoffle-2.6d.ebuild
deleted file mode 100644
index 536e2a715a9c..000000000000
--- a/net-www/wwwoffle/wwwoffle-2.6d.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.6d.ebuild,v 1.3 2001/10/20 17:36:22 danarmak Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="wwwoffle = WWW Offline Explorer, an adv. caching proxy suitable for nonpermanent (e.g. DUN) Internet connections"
-
-SRC_URI="ftp://ftp.demon.co.uk/pub/unix/httpd/${P}.tgz
-	 ftp://metalab.unc.edu/pub/Linux/apps/www/servers/${P}.tgz"
-
-HOMEPAGE="http://www.gedanken.demon.co.uk/"
-
-DEPEND="sys-devel/flex 
-	sys-libs/zlib
-	sys-devel/gcc
-	virtual/glibc"
-
-src_unpack() {
-    
-    unpack ${A}
-    cd ${S}
-    
-    patch -p0 <${FILESDIR}/${P}-gentoo.diff
-    
-    if [ "`use ipv6 `" ]; then
-	cp Makefile 2
-	sed -e 's/USE_IPV6=0/USE_IPV6=1/' 2 > Makefile
-	rm 2
-    fi
-        
-}
-
-src_compile() {
-    
-    emake all || die
-    
-}
-
-src_install () {
-    
-    # This is necessary to install over an existing installation.
-    # Don't worry, no (interesting) info is lost.
-    # what's deleted is the backup info from a previous over-installation.
-    rm -rf /var/spool/wwwoffle/html.old
-    mv /var/spool/wwwoffle/html /var/spool/wwwoffle/html.old
-    
-    # Install the files
-    make DESTDIR=${D} install || die
-    
-    # Install the wwwoffled init script
-    insinto /etc/rc.d/init.d
-    newins ${FILESDIR}/wwwoffled.rc5 wwwoffled
-    chmod a+x ${D}/etc/rc.d/init.d/wwwoffled
-    
-}
-
-pkg_postinst() {
-    
-    # This simply prints out some useful instructions.
-    echo "
-    
-    -----------
-    What's Next
-    -----------
-    
-    You have successfully installed wwwoffle.
-    
-    To configure it, read and edit /var/spool/wwwoffle/wwwoffle.conf.
-    It's well commented and very powerful.
-    
-    To start using wwwoffle:
-    1. Run 'rc-update add wwwoffled <runlevels>'.
-    2. Run 'wwwoffle -online; wwwoffle -fetch' whenever you go online
-       (at boot if you're on a network) and 'wwwoffle -offline'
-       when you disconnect.
-    3. Configure any programs to use localhost:8080 as a proxy
-       server for HTTP, HTTPS, FTP and finger.
-    "
-    
-}
\ No newline at end of file
diff --git a/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild b/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild
index 2a6a4e627118..6e30c7f2c7d8 100644
--- a/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild,v 1.1 2002/03/16 14:22:47 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild,v 1.2 2002/03/26 12:48:38 danarmak Exp $
 
 S=${WORKDIR}/${P}
 
@@ -33,17 +33,19 @@ src_install () {
     # Install the files
     make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
     
+    cd ${D}/etc
+    mv wwwoffle.conf 1
+    sed -e "s:${D}::" 1 > wwwoffle.conf
+    rm 1
+    
     # Install the wwwoffled init script
     exeinto /etc/init.d
-    doexe ${FILESDIR}/wwwoffled-online
-    newexe ${FILESDIR}/wwwoffled.rc6 wwwoffled
+    doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
     
     # someday i'll make it use the file in /etc. for now we at least get
     # config file protection this way.
     dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
     
-    echo test
-    
 }
 
 pkg_preinst() {
@@ -75,15 +77,17 @@ pkg_postinst() {
     
     You have successfully installed wwwoffle.
     
-    To configure it, read and edit /var/spool/wwwoffle/wwwoffle.conf.
-    It's well commented and very powerful.
+    To configure it, read and edit /etc/wwwoffle.conf.
+    It's well commented and very powerful. Alternatively, browse to
+    http://localhost:8080 and you'll be presented with a webform-based
+    configuration interface.
     
     To start using wwwoffle:
     1. rc-update add wwwoffled to boot.
     2. rc-update add wwwoffled-online to your 'online' runlevels.
-    3. Configure any programs to use localhost:8080 as a proxy
-       server for HTTP, HTTPS, FTP and finger.
-    "
+    3. Configure any programs to use localhost:8080 as a proxy server
+       for HTTP, HTTPS, FTP and finger.
+"
     
 }
 
diff --git a/net-www/wwwoffle/wwwoffle-2.7.ebuild b/net-www/wwwoffle/wwwoffle-2.7.ebuild
deleted file mode 100644
index 02e25bde2893..000000000000
--- a/net-www/wwwoffle/wwwoffle-2.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7.ebuild,v 1.1 2002/03/04 20:58:09 danarmak Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="wwwoffle = WWW Offline Explorer, an adv. caching proxy especially suitable for nonpermanent (e.g. dialup) Internet connections"
-
-SRC_URI="ftp://ftp.demon.co.uk/pub/unix/httpd/${P}.tgz
-	 ftp://metalab.unc.edu/pub/Linux/apps/www/servers/${P}.tgz"
-
-HOMEPAGE="http://www.gedanken.demon.co.uk/"
-
-DEPEND="sys-devel/flex 
-	sys-libs/zlib
-	sys-devel/gcc
-	virtual/glibc"
-
-
-src_compile() {
-    
-    local myconf
-    use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
-    ./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
-    
-    emake || die
-    
-}
-
-src_install () {
-    
-#    einfo "Attempting to stop a running wwwoffled initscript; start it again later if needed"
-#    /etc/init.d/wwwoffled stop
-        
-    # Install the files
-    make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
-    
-    # Install the wwwoffled init script
-    exeinto /etc/init.d
-    doexe ${FILESDIR}/wwwoffled-online
-    newexe ${FILESDIR}/wwwoffled.rc6 wwwoffled
-    
-    # someday i'll make it use the file in /etc. for now we at least get
-    # config file protection this way.
-    dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
-    
-}
-
-pkg_postinst() {
-    
-    # This simply prints out some useful instructions.
-    einfo "
-    
-    -----------
-    What's Next
-    -----------
-    
-    You have successfully installed wwwoffle.
-    
-    To configure it, read and edit /var/spool/wwwoffle/wwwoffle.conf.
-    It's well commented and very powerful.
-    
-    To start using wwwoffle:
-    1. rc-update add wwwoffled to boot.
-    2. rc-update add wwwoffled-online to your 'online' runlevels.
-    3. Configure any programs to use localhost:8080 as a proxy
-       server for HTTP, HTTPS, FTP and finger.
-    "
-    
-}
\ No newline at end of file