Subject: pkg/34532: update wwwoffle to version 2.9
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <schutz_m@usp.ac.fj>
List: pkgsrc-bugs
Date: 09/15/2006 00:55:00
>Number: 34532
>Category: pkg
>Synopsis: update wwwoffle to version 2.9
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Fri Sep 15 00:55:00 +0000 2006
>Originator: Marko Schütz
>Release: NetBSD 4.0_BETA
>Organization:
The University of the South Pacific
>Environment:
System: NetBSD fjpad.usp.ac.fj 4.0_BETA NetBSD 4.0_BETA (FJPAD) #2: Wed Sep 6 19:38:27 FJT 2006 marko@fjpad.usp.ac.fj:/usr/nbtmp/bsdobj/sys/arch/i386/compile/FJPAD i386
Architecture: i386
Machine: i386
>Description:
update wwwoffle to version 2.9
>How-To-Repeat:
wwwoffle in pkgsrc is currently at version 2.8e
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/wwwoffle/Makefile,v
retrieving revision 1.65
diff -u -C3 -r1.65 Makefile
cvs diff: conflicting specifications of output style
*** Makefile 11 Apr 2006 08:10:40 -0000 1.65
--- Makefile 14 Sep 2006 23:41:20 -0000
***************
*** 1,7 ****
# $NetBSD: Makefile,v 1.65 2006/04/11 08:10:40 joerg Exp $
! DISTNAME= wwwoffle-2.8e
! PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= http://www.gedanken.freeserve.co.uk/download-wwwoffle/ \
ftp://ftp.ibiblio.org/pub/Linux/apps/www/servers/
--- 1,7 ----
# $NetBSD: Makefile,v 1.65 2006/04/11 08:10:40 joerg Exp $
! DISTNAME= wwwoffle-2.9a
! PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.gedanken.freeserve.co.uk/download-wwwoffle/ \
ftp://ftp.ibiblio.org/pub/Linux/apps/www/servers/
***************
*** 11,17 ****
HOMEPAGE= http://www.gedanken.demon.co.uk/wwwoffle/
COMMENT= WWW proxy with support for offline browsing
! USE_TOOLS+= gmake gzip
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q}
--- 11,17 ----
HOMEPAGE= http://www.gedanken.demon.co.uk/wwwoffle/
COMMENT= WWW proxy with support for offline browsing
! USE_TOOLS+= gmake gzip perl
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q}
***************
*** 24,29 ****
--- 24,36 ----
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,56 ****
${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
# 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
--- 50,59 ----
${MKDIR} ${VARBASE}/wwwoffle/prevtime1
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl \
${PREFIX}/sbin/wwwoffle-upgrade-config.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
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/wwwoffle/PLIST,v
retrieving revision 1.13
diff -u -C3 -r1.13 PLIST
cvs diff: conflicting specifications of output style
*** PLIST 11 Apr 2006 08:10:41 -0000 1.13
--- PLIST 14 Sep 2006 23:41:20 -0000
***************
*** 11,20 ****
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/wwwoffled
share/doc/wwwoffle/CHANGES.CONF
share/doc/wwwoffle/CONVERT
--- 11,18 ----
man/man1/wwwoffle.1
man/man5/wwwoffle.conf.5
man/man8/wwwoffled.8
sbin/wwwoffle-upgrade-config.pl
! sbin/wwwoffle-upgrade-config-2.0-2.5.pl
sbin/wwwoffled
share/doc/wwwoffle/CHANGES.CONF
share/doc/wwwoffle/CONVERT
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/wwwoffle/distinfo,v
retrieving revision 1.23
diff -u -C3 -r1.23 distinfo
cvs diff: conflicting specifications of output style
*** distinfo 11 Apr 2006 08:10:41 -0000 1.23
--- distinfo 14 Sep 2006 23:41:20 -0000
***************
*** 1,7 ****
$NetBSD: distinfo,v 1.23 2006/04/11 08:10:41 joerg Exp $
! SHA1 (wwwoffle-2.8e.tgz) = 719cc53a2c66c14aa7dfcb6ca0ef9f033b454bd9
! RMD160 (wwwoffle-2.8e.tgz) = a9243f0c2aab2c735ce355ee81d3a802e8d797dc
! Size (wwwoffle-2.8e.tgz) = 1015694 bytes
SHA1 (patch-aa) = 897de385a47826e16a8a09b1bc1c207a2d350f94
SHA1 (patch-ab) = 7f73e34c6f80ee5febadbe2da3fbda9499226490
--- 1,11 ----
$NetBSD: distinfo,v 1.23 2006/04/11 08:10:41 joerg Exp $
! 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-ac) = d63ea67a612d61f0eff83cbfbbc86b99db24f3e4
+ SHA1 (patch-ad) = cb2d858b89b498f99adf82dd6e9395908f5ed993
+ SHA1 (patch-ae) = c6ba677d6a5dd8b43572e9cf021c8f2aefcf3e74
+ SHA1 (patch-af) = d4b60bc31cf6dae4ea31f5d05d1e919bc3cd5f79
----- patch-ac -----
$NetBSD$
--- cache/search/hyperestraier/scripts/wwwoffle-estseek.orig 2005-09-06 05:45:50.000000000 +1200
+++ cache/search/hyperestraier/scripts/wwwoffle-estseek
@@ -12,6 +12,7 @@ cd $wwwoffle_spool
PATH=$PATH:/usr/local/bin
PATH=$PATH:/usr/local/libexec # A possible location
+PATH=$PATH:@PREFIX@/libexec # A possible location
PATH=$PATH:/usr/lib/estraier # The Debian location
export PATH
----- patch-ad -----
$NetBSD$
--- cache/search/namazu/scripts/wwwoffle-namazu.orig 2003-11-16 01:51:14.000000000 +1200
+++ cache/search/namazu/scripts/wwwoffle-namazu
@@ -13,6 +13,7 @@ cd $wwwoffle_spool
PATH=$PATH:/usr/local/bin
PATH=$PATH:/usr/local/cgi-bin
PATH=$PATH:/usr/local/libexec
+PATH=$PATH:@PREFIX@/libexec/cgi-bin
PATH=$PATH:/usr/lib/cgi-bin # The Debian location
PATH=$PATH:/opt/www/cgi-bin # The Suse location
export PATH
----- patch-ae -----
$NetBSD$
--- cache/search/hyperestraier/conf/estseek.conf.orig 2005-09-05 03:34:30.000000000 +1200
+++ cache/search/hyperestraier/conf/estseek.conf
@@ -1,4 +1,4 @@
-indexname: ../db
+indexname: ../db/index
tmplfile: estseek.tmpl
topfile: estseek.top
logfile:
@@ -23,4 +23,8 @@ dotfidf: true
smplphrase: true
candetail: true
smlrvnum: 0
+smlrtune: 16 1024 4096
spcache:
+wildmax: 256
+qxpndcmd:
+
----- patch-af -----
$NetBSD$
--- cache/search/hyperestraier/scripts/wwwoffle-estcmd-full.orig 2005-09-06 05:45:59.000000000 +1200
+++ cache/search/hyperestraier/scripts/wwwoffle-estcmd-full
@@ -19,5 +19,5 @@ echo > search/hyperestraier/wwwoffle-est
# Do the gathering
-estwolefind . | estcmd gather -cl -fm -px @uri -sd -cm search/hyperestraier/db - \
+estwolefind . | estcmd gather -cl -fm -px @uri -sd -cm search/hyperestraier/db/index - \
>> search/hyperestraier/wwwoffle-estcmd.log 2>&1