Update to 3.20091113. From the changelog:

* underlay: Fix example values put in setup file to be array references.
* underlay: Avoid crashing if lists of underlays (or template
    directories) are not configured.
* Moved the postscan hook to run on the raw html of a page, before
    the template is filled out. This improves the search plugin's
    indexing, since it will not include navigational elements from
    the page template or sidebar.
* localstyle: New plugin, allows overrding the toplevel local.css
    with one that is closer to a page.
* httpauth: Add cgiauthurl setting that can be used to do http basic
    auth only when ikiwiki needs authentication, rather than for any
    access to the cgi/wiki.
* inline: Do not generated feeds for nested inlines.
* inline: Allow direct inclusion of non-page files in raw mode.
* inline: Fix display of all pages when archive=yes or show=0 are used.

4 files changed, 17 insertions, 26 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 65c385c790d..c5dfdea0610 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2009/11/02 04:23:37 schmonz Exp $
+# $NetBSD: Makefile,v 1.39 2009/11/16 22:51:14 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20091031
+DISTNAME=	ikiwiki_3.20091113
 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 cbccdec1ddf..48f2c4ec379 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2009/11/02 04:23:37 schmonz Exp $
+$NetBSD: distinfo,v 1.26 2009/11/16 22:51:14 schmonz Exp $
 
-SHA1 (ikiwiki_3.20091031.tar.gz) = a9cc49432087991e3336c3f2a2981f5ac78fb79a
-RMD160 (ikiwiki_3.20091031.tar.gz) = 4c3467118fc5e18dfbe202e170d0c5f166f12a0f
-Size (ikiwiki_3.20091031.tar.gz) = 1491046 bytes
-SHA1 (patch-aa) = 49a2baa2a832e94bf29a18d79d640ee262d38edb
+SHA1 (ikiwiki_3.20091113.tar.gz) = daaef9d99fa6504bf3b54dac73d62dd73122b1e8
+RMD160 (ikiwiki_3.20091113.tar.gz) = a2550867fe2aa6588fce0ab0190190ad51bba7ef
+Size (ikiwiki_3.20091113.tar.gz) = 1474045 bytes
+SHA1 (patch-aa) = 476b04ac233cd78f15a1a26506c529d41a8f8140
 SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
 SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index f7b0bd16a80..29bcbe63aa6 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2009/09/25 07:29:21 schmonz Exp $
+# $NetBSD: options.mk,v 1.7 2009/11/16 22:51:14 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ikiwiki
 PKG_SUPPORTED_OPTIONS=		cvs ikiwiki-amazon-s3 ikiwiki-search
@@ -59,7 +59,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 496f50df609..72245df6467 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $
+$NetBSD: patch-aa,v 1.14 2009/11/16 22:51:14 schmonz Exp $
 
---- Makefile.PL.orig	2009-10-29 11:36:03.000000000 -0400
+--- Makefile.PL.orig	2009-11-13 15:06:57.000000000 -0500
 +++ Makefile.PL
 @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\
  
@@ -11,16 +11,7 @@ $NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $
  
  tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
  extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
-@@ -44,7 +46,7 @@ extra_build: ikiwiki.out ikiwiki.setup d
- 	./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 "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
-+#	sed -i "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
- 	
- docwiki: ikiwiki.out
- 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
-@@ -59,7 +61,7 @@ underlay_install:
+@@ -60,7 +62,7 @@ underlay_install:
  	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
  		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
  		for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
@@ -29,7 +20,7 @@ $NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $
  			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
  		done; \
  	done
-@@ -78,7 +80,7 @@ extra_install: underlay_install
+@@ -79,7 +81,7 @@ extra_install: underlay_install
  		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
  	done
  	for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; do \
@@ -38,7 +29,7 @@ $NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $
  		install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
  	done
  
-@@ -97,15 +99,15 @@ extra_install: underlay_install
+@@ -98,15 +100,15 @@ extra_install: underlay_install
  		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
  	done
  
@@ -62,7 +53,7 @@ $NetBSD: patch-aa,v 1.13 2009/11/02 04:23:37 schmonz Exp $
  	
  	install -d $(DESTDIR)$(PREFIX)/sbin
  	install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
-@@ -121,10 +123,10 @@ extra_install: underlay_install
+@@ -122,10 +124,10 @@ extra_install: underlay_install
  	
  	# These might fail if a regular user is installing into a home
  	# directory.