From 457d34dee9410f9cbc48b7166809bcbdeb0fff82 Mon Sep 17 00:00:00 2001 From: abs Date: Tue, 26 Sep 2006 13:48:43 +0000 Subject: Update www/wwwoffle from 2.8e to 2.9a - from PR/34532 by Marko Schutz Changelog runs to over 1000 lines --- www/wwwoffle/Makefile | 25 +++++++++++++++---------- www/wwwoffle/PLIST | 16 +++++++--------- www/wwwoffle/distinfo | 14 +++++++++----- www/wwwoffle/patches/patch-ab | 10 +--------- 4 files changed, 32 insertions(+), 33 deletions(-) (limited to 'www/wwwoffle') diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index fdea6caab7b..e9bd8e91e8d 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.65 2006/04/11 08:10:40 joerg Exp $ +# $NetBSD: Makefile,v 1.66 2006/09/26 13:48:43 abs Exp $ -DISTNAME= wwwoffle-2.8e -PKGREVISION= 3 +DISTNAME= wwwoffle-2.9a CATEGORIES= www MASTER_SITES= http://www.gedanken.freeserve.co.uk/download-wwwoffle/ \ ftp://ftp.ibiblio.org/pub/Linux/apps/www/servers/ @@ -11,7 +10,7 @@ MAINTAINER= abs@NetBSD.org HOMEPAGE= http://www.gedanken.demon.co.uk/wwwoffle/ COMMENT= WWW proxy with support for offline browsing -USE_TOOLS+= gmake gzip +USE_TOOLS+= gmake gzip perl tar GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q} @@ -24,6 +23,13 @@ PLIST_SUBST+= GZIP_CMD=${GZIP_CMD:Q} RCD_SCRIPTS= wwwoffled +SUBST_CLASSES+= fix-paths +SUBST_STAGE.fix-paths= pre-configure +SUBST_MESSAGE.fix-paths= Fixing absolute paths. +SUBST_FILES.fix-paths= cache/search/namazu/scripts/wwwoffle-namazu +SUBST_FILES.fix-paths+= cache/search/hyperestraier/scripts/wwwoffle-estseek +SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g' + .include "options.mk" post-build: @@ -43,17 +49,16 @@ pre-install: ${MKDIR} ${VARBASE}/wwwoffle/prevtime1 post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/convert-cache \ - ${PREFIX}/sbin/wwwoffle-convert-cache - ${INSTALL_PROGRAM} ${WRKSRC}/src/uncompress-cache \ - ${PREFIX}/sbin/wwwoffle-uncompress-cache ${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl \ ${PREFIX}/sbin/wwwoffle-upgrade-config.pl - ${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config-2.x-2.5.pl \ - ${PREFIX}/sbin/wwwoffle-upgrade-config-2.x-2.5.pl + ${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config-2.0-2.5.pl \ + ${PREFIX}/sbin/wwwoffle-upgrade-config-2.0-2.5.pl # Directories other than html and search are automatically created at run time ${TAR} cCf / - var/wwwoffle/html var/wwwoffle/search | ${GZIP_CMD} -9 \ > ${PREFIX}/libdata/wwwoffle-spool.tar.gz + ${RMDIR} ${PREFIX}/share/doc/wwwoffle/ru + ${RMDIR} ${PREFIX}/share/doc/wwwoffle/nl + ${RMDIR} ${PREFIX}/share/doc/wwwoffle/it @${ECHO} @${ECHO} ==+===+===+===+===+===+===+===+===+===+===+===+===+===+===+= @${ECHO} diff --git a/www/wwwoffle/PLIST b/www/wwwoffle/PLIST index a74cea8e2b0..3077b0725ff 100644 --- a/www/wwwoffle/PLIST +++ b/www/wwwoffle/PLIST @@ -1,5 +1,8 @@ -@comment $NetBSD: PLIST,v 1.13 2006/04/11 08:10:41 joerg Exp $ +@comment $NetBSD: PLIST,v 1.14 2006/09/26 13:48:43 abs Exp $ bin/wwwoffle +bin/wwwoffle-fsck +bin/wwwoffle-gunzip +bin/wwwoffle-gzip bin/wwwoffle-hash bin/wwwoffle-ls bin/wwwoffle-mv @@ -11,13 +14,10 @@ libdata/wwwoffle-spool.tar.gz man/man1/wwwoffle.1 man/man5/wwwoffle.conf.5 man/man8/wwwoffled.8 -sbin/wwwoffle-convert-cache -sbin/wwwoffle-uncompress-cache sbin/wwwoffle-upgrade-config.pl -sbin/wwwoffle-upgrade-config-2.x-2.5.pl +sbin/wwwoffle-upgrade-config-2.0-2.5.pl sbin/wwwoffled share/doc/wwwoffle/CHANGES.CONF -share/doc/wwwoffle/CONVERT share/doc/wwwoffle/COPYING share/doc/wwwoffle/FAQ share/doc/wwwoffle/INSTALL @@ -29,6 +29,8 @@ share/doc/wwwoffle/README.PWD share/doc/wwwoffle/README.URL share/doc/wwwoffle/README.compress share/doc/wwwoffle/README.htdig +share/doc/wwwoffle/README.https +share/doc/wwwoffle/README.hyperestraier share/doc/wwwoffle/README.lang share/doc/wwwoffle/README.mnogosearch share/doc/wwwoffle/README.namazu @@ -41,7 +43,6 @@ share/doc/wwwoffle/de/README.1st share/doc/wwwoffle/de/README.CONF share/doc/wwwoffle/de/README.CONF.html share/doc/wwwoffle/de/README.html -share/doc/wwwoffle/es/CONVERT share/doc/wwwoffle/es/INSTALL share/doc/wwwoffle/es/LSM share/doc/wwwoffle/es/README @@ -61,10 +62,7 @@ share/doc/wwwoffle/pl/README.1st share/doc/wwwoffle/pl/README.lang share/examples/rc.d/wwwoffled share/examples/wwwoffle/wwwoffle.conf -@unexec ${RMDIR} %D/share/doc/wwwoffle/ru 2>/dev/null || ${TRUE} @dirrm share/doc/wwwoffle/pl -@unexec ${RMDIR} %D/share/doc/wwwoffle/nl 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/doc/wwwoffle/it 2>/dev/null || ${TRUE} @dirrm share/doc/wwwoffle/fr @dirrm share/doc/wwwoffle/es @dirrm share/doc/wwwoffle/de diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo index 587417dcd1f..709e6efaf85 100644 --- a/www/wwwoffle/distinfo +++ b/www/wwwoffle/distinfo @@ -1,7 +1,11 @@ -$NetBSD: distinfo,v 1.23 2006/04/11 08:10:41 joerg Exp $ +$NetBSD: distinfo,v 1.24 2006/09/26 13:48:43 abs Exp $ -SHA1 (wwwoffle-2.8e.tgz) = 719cc53a2c66c14aa7dfcb6ca0ef9f033b454bd9 -RMD160 (wwwoffle-2.8e.tgz) = a9243f0c2aab2c735ce355ee81d3a802e8d797dc -Size (wwwoffle-2.8e.tgz) = 1015694 bytes +SHA1 (wwwoffle-2.9a.tgz) = 9070d944c609979b9f8d14e38d31536214e2caf4 +RMD160 (wwwoffle-2.9a.tgz) = b183fe881f9824a0dbf11480fc8d98f57cd5a7f8 +Size (wwwoffle-2.9a.tgz) = 1071362 bytes SHA1 (patch-aa) = 897de385a47826e16a8a09b1bc1c207a2d350f94 -SHA1 (patch-ab) = 7f73e34c6f80ee5febadbe2da3fbda9499226490 +SHA1 (patch-ab) = 8a76c65991ac7aeab65d0e3027c9423901e68759 +SHA1 (patch-ac) = d63ea67a612d61f0eff83cbfbbc86b99db24f3e4 +SHA1 (patch-ad) = cb2d858b89b498f99adf82dd6e9395908f5ed993 +SHA1 (patch-ae) = c6ba677d6a5dd8b43572e9cf021c8f2aefcf3e74 +SHA1 (patch-af) = 5899e59a22b1d51ca48b0a8ad6a6fd203f513512 diff --git a/www/wwwoffle/patches/patch-ab b/www/wwwoffle/patches/patch-ab index 1b4735b6dfb..26b8bca8bbd 100644 --- a/www/wwwoffle/patches/patch-ab +++ b/www/wwwoffle/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.11 2006/04/11 08:10:41 joerg Exp $ +$NetBSD: patch-ab,v 1.12 2006/09/26 13:48:43 abs Exp $ --- conf/Makefile.in.orig 2006-04-10 16:42:27.000000000 +0000 +++ conf/Makefile.in @@ -11,11 +11,3 @@ $NetBSD: patch-ab,v 1.11 2006/04/11 08:10:41 joerg Exp $ REAL_SPOOLDIR=@SPOOLDIR@ REAL_CONFDIR=@CONFDIR@ -@@ -45,6 +45,7 @@ compile : conf-file - ######## INSTALLATION ######## - - install : compile -+ - sed -e 's%SPOOLDIR%$(REAL_SPOOLDIR)%' -e 's%CONFDIR%$(REAL_CONFDIR)%' < wwwoffle.conf > wwwoffle.conf.install - [ -x $(CONFDIR) ] || $(INSTALL) -d -m 750 $(CONFDIR) - @[ ! -f $(DESTDIR)/etc/wwwoffle.conf ] || \ -- cgit v1.2.3