[pkgsrc/trunk]: pkgsrc/www/wwwoffle Update wwwoffle to wwwoffle-2.8enb1

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e82692d0cd0
branches:  trunk
changeset: 501994:8e82692d0cd0
user:      abs <abs%pkgsrc.org@localhost>
date:      Tue Nov 01 12:22:24 2005 +0000

description:
Update wwwoffle to wwwoffle-2.8enb1
        - Use gzip rather than gtar to extract in PLIST (should really be
          an INSTALL script)
        - Fix some lines in MESSAGE to for pkglint

diffstat:

 www/wwwoffle/MESSAGE  |  25 ++++++++++++-------------
 www/wwwoffle/Makefile |  11 ++++++-----
 www/wwwoffle/PLIST    |   4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

diffs (107 lines):

diff -r 01a6c86ee217 -r 8e82692d0cd0 www/wwwoffle/MESSAGE
--- a/www/wwwoffle/MESSAGE      Tue Nov 01 12:21:23 2005 +0000
+++ b/www/wwwoffle/MESSAGE      Tue Nov 01 12:22:24 2005 +0000
@@ -1,32 +1,31 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2004/10/11 22:14:51 reed Exp $
+$NetBSD: MESSAGE,v 1.6 2005/11/01 12:22:24 abs Exp $
 
 1) To enable "wwwwoffled" to start on boot on NetBSD-1.5 or newer,
-please copy "${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/wwwoffled" to "/etc/rc.d/" and add
-"wwwoffled=YES" to /etc/rc.conf. To do the same on older systems,
-add the following to /etc/rc.local:
+   please copy "${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/wwwoffled" to
+   "/etc/rc.d/" and add "wwwoffled=YES" to /etc/rc.conf. To do the
+   same on older systems, add the following to /etc/rc.local:
 
 if [ -x ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/wwwoffle ]; then
     ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/wwwoffle
 fi
 
 2) The hooks are present to to use the package version of "htdig",
-if installed, to serve a searchable index of your cached pages.
-To make the word database, start "wwwoffle" and execute the script
-"/var/wwwoffle/search/htdig/scripts/wwwoffle-htdig-full".
+   if installed, to serve a searchable index of your cached pages.
+   To make the word database, start "wwwoffle" and execute the script
+   "/var/wwwoffle/search/htdig/scripts/wwwoffle-htdig-full".
 
 2a) A complete installation will purge the cache (and optionally
-reindex the database for "htdig") periodically, as by the following
-example "crontab fragment":
+   reindex the database for "htdig") periodically, as by the following
+   example "crontab fragment":
 
 # wwwoffle proxy maintenance
 01      1       *       *       0-5     /usr/bin/nice ${PREFIX}/bin/wwwoffle -purge -c ${PREFIX}/etc/wwwoffle/wwwoffle.conf && /bin/sh /var/wwwoffle/search/htdig/scripts/wwwoffle-htdig-incr
 01      1       *       *       6       /usr/bin/nice ${PREFIX}/bin/wwwoffle -purge -c ${PREFIX}/etc/wwwoffle/wwwoffle.conf && /bin/sh /var/wwwoffle/search/htdig/scripts/wwwoffle-htdig-full
 
 3) Docs and links for the other supported cache searchers, and all
-documentation in fact, is easily accessible once wwwoffle is started,
-via
-
-http://localhost:8080/Welcome.html
+   documentation in fact, is easily accessible once wwwoffle is started,
+   via
+       http://localhost:8080/Welcome.html
 
 ===========================================================================
diff -r 01a6c86ee217 -r 8e82692d0cd0 www/wwwoffle/Makefile
--- a/www/wwwoffle/Makefile     Tue Nov 01 12:21:23 2005 +0000
+++ b/www/wwwoffle/Makefile     Tue Nov 01 12:22:24 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2005/05/22 20:08:46 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2005/11/01 12:22:24 abs Exp $
 
 DISTNAME=      wwwoffle-2.8e
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://www.gedanken.freeserve.co.uk/download-wwwoffle/ \
                ftp://ftp.ibiblio.org/pub/Linux/apps/www/servers/
@@ -10,7 +11,7 @@
 HOMEPAGE=      http://www.gedanken.demon.co.uk/wwwoffle/
 COMMENT=       WWW proxy with support for offline browsing
 
-USE_TOOLS+=    gmake gtar
+USE_TOOLS+=    gmake gzip
 USE_PKGINSTALL=        yes
 GNU_CONFIGURE= yes
 
@@ -18,7 +19,7 @@
 CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle
 
 PKG_SYSCONFSUBDIR=     wwwoffle
-PLIST_SUBST+=          GTAR="${GTAR}"
+PLIST_SUBST+=          GZIP_CMD="${GZIP_CMD}"
 INSTALL_EXTRA_TMPL=    ${PKGDIR}/INSTALL
 
 RCD_SCRIPTS=           wwwoffled
@@ -58,8 +59,8 @@
        ${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config-2.x-2.5.pl \
          ${PREFIX}/sbin/wwwoffle-upgrade-config-2.x-2.5.pl
 # Directories other than html and search are automatically created at run time
-       ${GTAR} czCf / ${PREFIX}/libdata/wwwoffle-spool.tar.gz \
-               var/wwwoffle/html var/wwwoffle/search
+       ${TAR} cCf / - var/wwwoffle/html var/wwwoffle/search | ${GZIP_CMD} -9 \
+               > ${PREFIX}/libdata/wwwoffle-spool.tar.gz
        @${ECHO}
        @${ECHO} ==+===+===+===+===+===+===+===+===+===+===+===+===+===+===+=
        @${ECHO}
diff -r 01a6c86ee217 -r 8e82692d0cd0 www/wwwoffle/PLIST
--- a/www/wwwoffle/PLIST        Tue Nov 01 12:21:23 2005 +0000
+++ b/www/wwwoffle/PLIST        Tue Nov 01 12:22:24 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/10/23 16:51:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/11/01 12:22:24 abs Exp $
 bin/wwwoffle
 bin/wwwoffle-hash
 bin/wwwoffle-ls
@@ -69,7 +69,7 @@
 @dirrm share/doc/wwwoffle/es
 @dirrm share/doc/wwwoffle/de
 @dirrm share/doc/wwwoffle
-@exec ${GTAR} xzCf / %D/libdata/wwwoffle-spool.tar.gz
+@exec gzip -d -c %D/libdata/wwwoffle-spool.tar.gz | tar xzCf /
 @unexec cd /var/wwwoffle && ${RM} -rf html* search*
 @unexec ${RMDIR} /var/wwwoffle/* 2>/dev/null && ${RMDIR} /var/wwwoffle 2>/dev/null || ${TRUE}
 @unexec if [ -d /var/wwwoffle ]; then echo "If you won't use the WWWOFFLE package anymore, remove the cache manually by"; echo '       rm -rf /var/wwwoffle'; fi