Update to 3.20091017. From the changelog:

   * Added support framework for multiple types of dependencies, including
     dependncies that are only affected by page precence or link changes.
   * Rebuild wikis on upgrade to this version to get improved dependency
     info.
   * pagecount, calendar, postsparkline, progress: Use a presence dependency,
     which makes these directives much less expensive to use, since page
     edits will no longer trigger an unnecessary update.
   * map: Use a presence dependency unless show= is specified.
     This makes maps efficient enough that they can be used on sidebars!
   * inline: Use a presence dependency in quick mode.
   * brokenlinks: Use a link dependency.
     This makes it much more efficient, only updating when really necessary.
   * orphans, pagestats: Use a combination of presence and link dependencies.
     This makes them more efficient. It also fixes a longstanding bug,
     where if only a small set of pages were considered by orphans/pagestats,
     changes to links on other pages failed to cause an update.
   * linkmap: Use a combination of presence and link dependencies.
     This makes the map be regenerated much less frequently in many cases,
     so larger maps are more practical to use now.
   * Plugins providing PageSpec `match_*` functions should pass additional
     influence information when creating result objects. This allows correctly
     handling many more complicated dependencies.
   * API change: `pagespec_match_list` has completly changed its interface.
     The old interface will be removed soon, and a warning will be printed
     if any plugins try to use it.
   * Transitive dependencies are now correctly supported.
   * ikiwiki-calendar: New command automates creation of archive pages
     using the calendar plugin.
   * calendar: Fix midnight rebuild trigger of calendars with explicit
     month/year.
   * calendar: Fix bug in next/previous year/month links, which sometimes
     linked to an archive page from the wrong year, or were missing.
   * git: --getctime will now follow renames back to the original creation
     of a file.
   * calendar: Fix CSS for year calendar to match the plugin documentation.
   * Added minimal default CSS for calendar plugin, just highlighting the
     current day.
   * inline: Optimize generation of archives, etc by not getting inlined page
     content if the template does not use it.

5 files changed, 31 insertions, 22 deletions

diff --git a/www/ikiwiki/MESSAGE b/www/ikiwiki/MESSAGE
index b8b00eb80da..7ec1c2ce641 100644
--- a/www/ikiwiki/MESSAGE
+++ b/www/ikiwiki/MESSAGE
@@ -1,11 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2009/08/30 23:30:08 schmonz Exp $
+$NetBSD: MESSAGE,v 1.5 2009/10/18 04:43:16 schmonz Exp $
 
 If you use custom templates, make sure they are correct when
 upgrading.
 
-In order to fix a performance bug, all wikis need to be rebuilt on
-upgrade to 3.1415926. If you listed your wiki in /etc/ikiwiki/wikilist,
-use ikiwiki-mass-rebuild to force a rebuild.
+
+To take advantage of significant performance improvements, all wikis
+need to be rebuilt on upgrade to 3.20091017. If you listed your
+wiki in ${PKG_SYSCONFDIR}/wikilist, use ikiwiki-mass-rebuild to force a
+rebuild.
 
 ===========================================================================
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 4c901285452..2b512bd1b91 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2009/10/10 17:58:41 schmonz Exp $
+# $NetBSD: Makefile,v 1.34 2009/10/18 04:43:16 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20091009
+DISTNAME=	ikiwiki_3.20091017
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index f0f74c7a137..d251f9382fd 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.18 2009/10/10 17:58:41 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/10/18 04:43:16 schmonz Exp $
 bin/ikiwiki
+bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
 bin/ikiwiki-update-wikilist
 lib/ikiwiki/plugins/proxy.py
 lib/ikiwiki/plugins/rst
 ${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
+man/man1/ikiwiki-calendar.1
 man/man1/ikiwiki-makerepo.1
 man/man1/ikiwiki-transition.1
 man/man1/ikiwiki-update-wikilist.1
@@ -26,6 +28,7 @@ share/ikiwiki/basewiki/ikiwiki/openid.mdwn
 share/ikiwiki/basewiki/ikiwiki/pagespec.mdwn
 share/ikiwiki/basewiki/ikiwiki/pagespec/attachment.mdwn
 share/ikiwiki/basewiki/ikiwiki/pagespec/po.mdwn
+share/ikiwiki/basewiki/ikiwiki/pagespec/sorting.mdwn
 share/ikiwiki/basewiki/ikiwiki/searching.mdwn
 share/ikiwiki/basewiki/ikiwiki/subpage.mdwn
 share/ikiwiki/basewiki/ikiwiki/subpage/linkingrules.mdwn
@@ -292,6 +295,8 @@ share/ikiwiki/templates/atomitem.tmpl
 share/ikiwiki/templates/atompage.tmpl
 share/ikiwiki/templates/autoindex.tmpl
 share/ikiwiki/templates/blogpost.tmpl
+share/ikiwiki/templates/calendarmonth.tmpl
+share/ikiwiki/templates/calendaryear.tmpl
 share/ikiwiki/templates/change.tmpl
 share/ikiwiki/templates/comment.tmpl
 share/ikiwiki/templates/commentmoderation.tmpl
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index aa582c651aa..368123aae86 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2009/10/10 17:58:41 schmonz Exp $
+$NetBSD: distinfo,v 1.22 2009/10/18 04:43:16 schmonz Exp $
 
-SHA1 (ikiwiki_3.20091009.tar.gz) = 8f38559a316d04b0930d02d69c74fb731cf49718
-RMD160 (ikiwiki_3.20091009.tar.gz) = 42db0b1921ee470c8b199aa65d56604b803b3b15
-Size (ikiwiki_3.20091009.tar.gz) = 1453616 bytes
-SHA1 (patch-aa) = a1c77fbdf31ab25abf354678c73c10fd5897f894
+SHA1 (ikiwiki_3.20091017.tar.gz) = acdad5f6d15494d4dc9372b4e855d08b45d02807
+RMD160 (ikiwiki_3.20091017.tar.gz) = 69f119cac8cf30f64c6f59f80dd8f178b739202a
+Size (ikiwiki_3.20091017.tar.gz) = 1457316 bytes
+SHA1 (patch-aa) = 16937124fbe7f4186dea5101ef9a1559a7712071
 SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d
 SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f
diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
index 1203fc68302..41f6870db3f 100644
--- a/www/ikiwiki/patches/patch-aa
+++ b/www/ikiwiki/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2009/08/30 23:30:08 schmonz Exp $
+$NetBSD: patch-aa,v 1.12 2009/10/18 04:43:16 schmonz Exp $
 
---- Makefile.PL.orig	2009-08-30 15:09:22.000000000 -0400
+--- Makefile.PL.orig	2009-10-14 13:24:13.000000000 -0400
 +++ Makefile.PL
 @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.11 2009/08/30 23:30:08 schmonz Exp $
  
  tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
  extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
-@@ -57,7 +59,7 @@ underlay_install:
+@@ -58,7 +60,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 \
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.11 2009/08/30 23:30:08 schmonz Exp $
  			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
  		done; \
  	done
-@@ -76,7 +78,7 @@ extra_install: underlay_install
+@@ -77,7 +79,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 \
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.11 2009/08/30 23:30:08 schmonz Exp $
  		install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
  	done
  
-@@ -95,14 +97,14 @@ extra_install: underlay_install
+@@ -96,15 +98,15 @@ extra_install: underlay_install
  		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
  	done
  
@@ -38,11 +38,13 @@ $NetBSD: patch-aa,v 1.11 2009/08/30 23:30:08 schmonz Exp $
 -	install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1
 -	install -m 644 ikiwiki-transition.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-transition.1
 -	install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1
+-	install -m 644 ikiwiki-calendar.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-calendar.1
 +	install -d $(DESTDIR)$(MANDIR)/man1
 +	install -m 644 ikiwiki.man $(DESTDIR)$(MANDIR)/man1/ikiwiki.1
 +	install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-makerepo.1
 +	install -m 644 ikiwiki-transition.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-transition.1
 +	install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-update-wikilist.1
++	install -m 644 ikiwiki-calendar.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-calendar.1
  	
 -	install -d $(DESTDIR)$(PREFIX)/share/man/man8
 -	install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8
@@ -51,7 +53,7 @@ $NetBSD: patch-aa,v 1.11 2009/08/30 23:30:08 schmonz Exp $
  	
  	install -d $(DESTDIR)$(PREFIX)/sbin
  	install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
-@@ -118,10 +120,10 @@ extra_install: underlay_install
+@@ -120,10 +122,10 @@ extra_install: underlay_install
  	
  	# These might fail if a regular user is installing into a home
  	# directory.
@@ -59,10 +61,10 @@ $NetBSD: patch-aa,v 1.11 2009/08/30 23:30:08 schmonz Exp $
 -	-install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
 -	-install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
 -	-install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki
-+	-install -d $(DESTDIR)$(CONFIGDIR)
-+	-install -m 0644 wikilist $(DESTDIR)$(CONFIGDIR)
-+	-install -m 0644 auto.setup $(DESTDIR)$(CONFIGDIR)
-+	-install -m 0644 auto-blog.setup $(DESTDIR)$(CONFIGDIR)
++	-install -d $(DESTDIR)/$(CONFIGDIR)
++	-install -m 0644 wikilist $(DESTDIR)/$(CONFIGDIR)
++	-install -m 0644 auto.setup $(DESTDIR)/$(CONFIGDIR)
++	-install -m 0644 auto-blog.setup $(DESTDIR)/$(CONFIGDIR)
  }
  }