Update to 3.20110321. From the changelog:

* comment: Don't show comments of subpages on parent pages.
  (Fixes bug introduced in version 3.20100505.)
* darcs: Fix multiple issues preventing rcs_diff from working.
* aggregate: Read cookies from ~/.ikiwiki/cookies by default.
  Also, the cookiejar configuration setting can be used by
  other plugins to provide a custom `cookie_jar` object for LWP::UserAgent.
  (Thanks, schmonz)
* Avoid escaping / characters in filenames when building the cgiurl,
  as this confuses eg, cvsweb.

5 files changed, 31 insertions, 15 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 4a4660a3193..99707447360 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2011/02/26 03:04:38 schmonz Exp $
+# $NetBSD: Makefile,v 1.75 2011/03/23 22:25:05 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20110225
+DISTNAME=	ikiwiki_3.20110321
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
@@ -47,12 +47,12 @@ REPLACE_PERL+=	plugins/externaldemo	# XXX not installed
 REPLACE_PYTHON+=plugins/proxy.py plugins/pythondemo plugins/rst
 
 SUBST_CLASSES+=		sysconfdir
-SUBST_STAGE.sysconfdir=	post-patch
+SUBST_STAGE.sysconfdir=	pre-configure
 SUBST_FILES.sysconfdir=	ikiwiki-mass-rebuild ikiwiki-update-wikilist
 SUBST_SED.sysconfdir+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 
 SUBST_CLASSES+=		perlpath
-SUBST_STAGE.perlpath=	post-patch
+SUBST_STAGE.perlpath=	pre-configure
 SUBST_FILES.perlpath=	IkiWiki/Setup/Standard.pm
 SUBST_SED.perlpath+=	-e 's,@PERL5@,${PERL5},g'
 
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index def0856b854..2fbab247693 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.59 2011/02/26 03:04:38 schmonz Exp $
+$NetBSD: distinfo,v 1.60 2011/03/23 22:25:05 schmonz Exp $
 
-SHA1 (ikiwiki_3.20110225.tar.gz) = 863d61e87897f0cc1f4a1658b7d42d8df65b4234
-RMD160 (ikiwiki_3.20110225.tar.gz) = d7f8719e5cba5c455c1c72bd4f2e9ccf79e8cb1c
-Size (ikiwiki_3.20110225.tar.gz) = 2327000 bytes
-SHA1 (patch-aa) = 3f6c613520fdb979d68e0b4eda7698e62d4d8961
+SHA1 (ikiwiki_3.20110321.tar.gz) = b7b2d7b4c390f760f9d6c659b1048b8c176dc2fd
+RMD160 (ikiwiki_3.20110321.tar.gz) = 568050510e31fe1908042179d42259b7fb4d5609
+Size (ikiwiki_3.20110321.tar.gz) = 2340126 bytes
+SHA1 (patch-aa) = 0ddf4825daec821bf93978c665af99645c5538c0
 SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903
+SHA1 (patch-ac) = 621983c0405f747566a9bed2a01261d58741a5bd
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
 SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index 32431264cb6..bd771525234 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2010/10/24 15:45:34 schmonz Exp $
+# $NetBSD: options.mk,v 1.12 2011/03/23 22:25:05 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ikiwiki
 PKG_SUPPORTED_OPTIONS=		cvs ikiwiki-amazon-s3 ikiwiki-search
@@ -58,7 +58,7 @@ post-install:
 		${PREFIX}/share/doc/${PKGBASE}/w3mmode/ikiwiki.setup
 .else
 SUBST_CLASSES+=		w3m
-SUBST_STAGE.w3m=	post-patch
+SUBST_STAGE.w3m=	pre-configure
 SUBST_FILES.w3m=	Makefile.PL
 SUBST_SED.w3m+=		-e 's,^\(.*install .*W3M_CGI_BIN\),\#\1,'
 .endif
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
index f5420173cd3..378a275b280 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.20 2011/01/02 05:13:02 schmonz Exp $
+$NetBSD: patch-aa,v 1.21 2011/03/23 22:25:06 schmonz Exp $
 
---- Makefile.PL.orig	2010-12-11 18:33:22.000000000 +0000
+--- Makefile.PL.orig	2011-03-19 18:02:24.000000000 +0000
 +++ Makefile.PL
 @@ -19,6 +19,8 @@ SED?=sed
  
@@ -15,8 +15,8 @@ $NetBSD: patch-aa,v 1.20 2011/01/02 05:13:02 schmonz Exp $
  	./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
  	./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
  	$(MAKE) -C po
--	$(SED) -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
-+	#$(SED) -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
+-	$(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec
++	#$(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec
  	rm -f ikiwiki.spec.bkp
  	
  docwiki:
diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac
new file mode 100644
index 00000000000..303014b90ae
--- /dev/null
+++ b/www/ikiwiki/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.9 2011/03/23 22:25:06 schmonz Exp $
+
+--- IkiWiki/Plugin/aggregate.pm.orig	2011-03-21 18:44:36.000000000 +0000
++++ IkiWiki/Plugin/aggregate.pm
+@@ -70,8 +70,8 @@ sub checkconfig () {
+ 	if (! defined $config{aggregateinternal}) {
+ 		$config{aggregateinternal}=1;
+ 	}
+-	if (! defined $config{cookies}) {
+-		$config{cookies}={ file => "$ENV{HOME}/.ikiwiki/cookies" };
++	if (! defined $config{cookiejar}) {
++		$config{cookiejar}={ file => "$ENV{HOME}/.ikiwiki/cookies" };
+ 	}
+ 
+ 	# This is done here rather than in a refresh hook because it