Update to 2.64, plus a few bugfixes that'll be in 2.65. From the changelog:

* aggregate: Expire excess or old items on the same pass that adds them,
    not only on subsequent passes.
* editdiff: Broken since 2.62 due to wrong syntax, now fixed.
* aggregate: Support atom feeds with only a summary element, and no content
    elements.

* Avoid uninitialised value when --dumpsetup is used and no
    srcdir/destdir specified.
* ddate: Stop clobbering timeformat when not enabled.
* progress: New plugin to generate progress bars (willu)
* Add allow\_symlinks\_before\_srcdir to config so websetup doesn't eat it.
* img: Support sizes like 200x. Closes: #[475149](http://bugs.debian.org/475149)
* goodstuff: Remove otl plugin from the bundle since it needs a
    significant external dependency and is not commonly used. If
    you use otl, make sure you explicitly enable it now.
* goodstuff: Add more, progress, and table plugins to the bundle.
* Improve error message if external plugin fails to load. Closes:
    #[498458](http://bugs.debian.org/498458)
* Directive documentation broken out of the plugin documentation
    and into pages suitable to be used as an underlay. Thanks to
    Willu for doing most of the tedious work.
* Move the directive documentation into its own underlay, separate
    from basewiki, since it's sorta large compared to the rest of
    basewiki.
* listdirectives: Enable use of the directives underlay.
* Removed the obsolete blog page from the basewiki. ikiwiki/blog
    still remains, but is now deprecated too.
* Removed old redirecton pages from basewiki (helponformatting,
    markdown, openid, pagespec, preprocessordirective, subpage,
    wikilink).
* inline: Treat rootpage as a link, so that it can refer to a subpage
    without hardcoding the path.

5 files changed, 118 insertions, 15 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 5edfb67eae0..325f6a1dceb 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2008/09/09 17:19:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.20 2008/09/22 15:09:05 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_2.63
+DISTNAME=	ikiwiki_2.64
 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 27398ba6177..16b6bfa1146 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2008/09/04 15:34:30 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/09/22 15:09:05 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
@@ -14,9 +14,8 @@ ${PLIST.w3m}share/doc/ikiwiki/w3mmode.html
 ${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup
 share/examples/ikiwiki/auto.setup
 share/examples/ikiwiki/wikilist
-share/ikiwiki/basewiki/blog.mdwn
+share/ikiwiki/basewiki/directive.mdwn
 share/ikiwiki/basewiki/favicon.ico
-share/ikiwiki/basewiki/helponformatting.mdwn
 share/ikiwiki/basewiki/ikiwiki.mdwn
 share/ikiwiki/basewiki/ikiwiki/blog.mdwn
 share/ikiwiki/basewiki/ikiwiki/directive.mdwn
@@ -32,22 +31,57 @@ share/ikiwiki/basewiki/ikiwiki/subpage/linkingrules.mdwn
 share/ikiwiki/basewiki/ikiwiki/wikilink.mdwn
 share/ikiwiki/basewiki/index.mdwn
 share/ikiwiki/basewiki/local.css
-share/ikiwiki/basewiki/markdown.mdwn
-share/ikiwiki/basewiki/openid.mdwn
-share/ikiwiki/basewiki/pagespec.mdwn
-share/ikiwiki/basewiki/preprocessordirective.mdwn
 share/ikiwiki/basewiki/recentchanges.mdwn
 share/ikiwiki/basewiki/sandbox.mdwn
 share/ikiwiki/basewiki/shortcuts.mdwn
 share/ikiwiki/basewiki/style.css
-share/ikiwiki/basewiki/subpage.mdwn
 share/ikiwiki/basewiki/templates.mdwn
 share/ikiwiki/basewiki/templates/note.mdwn
 share/ikiwiki/basewiki/templates/popup.mdwn
 share/ikiwiki/basewiki/wikiicons/diff.png
 share/ikiwiki/basewiki/wikiicons/openidlogin-bg.gif
 share/ikiwiki/basewiki/wikiicons/search-bg.gif
-share/ikiwiki/basewiki/wikilink.mdwn
+share/ikiwiki/directives/ikiwiki/directive/aggregate.mdwn
+share/ikiwiki/directives/ikiwiki/directive/brokenlinks.mdwn
+share/ikiwiki/directives/ikiwiki/directive/calendar.mdwn
+share/ikiwiki/directives/ikiwiki/directive/color.mdwn
+share/ikiwiki/directives/ikiwiki/directive/copy.mdwn
+share/ikiwiki/directives/ikiwiki/directive/cut.mdwn
+share/ikiwiki/directives/ikiwiki/directive/cutpaste.mdwn
+share/ikiwiki/directives/ikiwiki/directive/edittemplate.mdwn
+share/ikiwiki/directives/ikiwiki/directive/fortune.mdwn
+share/ikiwiki/directives/ikiwiki/directive/graph.mdwn
+share/ikiwiki/directives/ikiwiki/directive/haiku.mdwn
+share/ikiwiki/directives/ikiwiki/directive/if.mdwn
+share/ikiwiki/directives/ikiwiki/directive/img.mdwn
+share/ikiwiki/directives/ikiwiki/directive/inline.mdwn
+share/ikiwiki/directives/ikiwiki/directive/linkmap.mdwn
+share/ikiwiki/directives/ikiwiki/directive/listdirectives.mdwn
+share/ikiwiki/directives/ikiwiki/directive/map.mdwn
+share/ikiwiki/directives/ikiwiki/directive/meta.mdwn
+share/ikiwiki/directives/ikiwiki/directive/more.mdwn
+share/ikiwiki/directives/ikiwiki/directive/orphans.mdwn
+share/ikiwiki/directives/ikiwiki/directive/pagecount.mdwn
+share/ikiwiki/directives/ikiwiki/directive/pagestats.mdwn
+share/ikiwiki/directives/ikiwiki/directive/pagetemplate.mdwn
+share/ikiwiki/directives/ikiwiki/directive/paste.mdwn
+share/ikiwiki/directives/ikiwiki/directive/ping.mdwn
+share/ikiwiki/directives/ikiwiki/directive/poll.mdwn
+share/ikiwiki/directives/ikiwiki/directive/polygen.mdwn
+share/ikiwiki/directives/ikiwiki/directive/postsparkline.mdwn
+share/ikiwiki/directives/ikiwiki/directive/progress.mdwn
+share/ikiwiki/directives/ikiwiki/directive/shortcut.mdwn
+share/ikiwiki/directives/ikiwiki/directive/sparkline.mdwn
+share/ikiwiki/directives/ikiwiki/directive/table.mdwn
+share/ikiwiki/directives/ikiwiki/directive/tag.mdwn
+share/ikiwiki/directives/ikiwiki/directive/taglink.mdwn
+share/ikiwiki/directives/ikiwiki/directive/template.mdwn
+share/ikiwiki/directives/ikiwiki/directive/testpagespec.mdwn
+share/ikiwiki/directives/ikiwiki/directive/teximg.mdwn
+share/ikiwiki/directives/ikiwiki/directive/toc.mdwn
+share/ikiwiki/directives/ikiwiki/directive/toggle.mdwn
+share/ikiwiki/directives/ikiwiki/directive/toggleable.mdwn
+share/ikiwiki/directives/ikiwiki/directive/version.mdwn
 share/ikiwiki/smiley/smileys.mdwn
 share/ikiwiki/smiley/smileys/alert.png
 share/ikiwiki/smiley/smileys/angry.png
@@ -113,6 +147,9 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo
 @dirrm share/ikiwiki/templates
 @dirrm share/ikiwiki/smiley/smileys
 @dirrm share/ikiwiki/smiley
+@dirrm share/ikiwiki/directives/ikiwiki/directive
+@dirrm share/ikiwiki/directives/ikiwiki
+@dirrm share/ikiwiki/directives
 @dirrm share/ikiwiki/basewiki/wikiicons
 @dirrm share/ikiwiki/basewiki/templates
 @dirrm share/ikiwiki/basewiki/ikiwiki/subpage
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index ee975ef1792..7785e2d31b3 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2008/09/09 17:19:13 schmonz Exp $
+$NetBSD: distinfo,v 1.11 2008/09/22 15:09:05 schmonz Exp $
 
-SHA1 (ikiwiki_2.63.tar.gz) = f32d28ca58cb79b3a8463bf22cd79b72f2bb052f
-RMD160 (ikiwiki_2.63.tar.gz) = 58faa7c63dedce4de1df20610d37da1b461ac0ab
-Size (ikiwiki_2.63.tar.gz) = 961932 bytes
+SHA1 (ikiwiki_2.64.tar.gz) = aed64906830cbccc42f67596f88c602a18c59e6b
+RMD160 (ikiwiki_2.64.tar.gz) = 14e152ccca739a948cda9c3400c362c5cbe98340
+Size (ikiwiki_2.64.tar.gz) = 975180 bytes
 SHA1 (patch-aa) = 3bc1bca3c6ef5e986f60e40ce2b61afe0142d7da
+SHA1 (patch-ab) = e664ddb7eb01a9fe05b223860763758fd5812ab7
+SHA1 (patch-ac) = a8e9c285d896a682763dd5f8b8769bdc92f6db1a
diff --git a/www/ikiwiki/patches/patch-ab b/www/ikiwiki/patches/patch-ab
new file mode 100644
index 00000000000..b4695bd8016
--- /dev/null
+++ b/www/ikiwiki/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2008/09/22 15:09:05 schmonz Exp $
+
+--- IkiWiki/Plugin/editdiff.pm.orig	2008-09-08 12:30:11.000000000 -0400
++++ IkiWiki/Plugin/editdiff.pm
+@@ -56,7 +56,7 @@ sub formbuilder_setup { #{{{
+ 	my %params=@_;
+ 	my $form=$params{form};
+ 
+-	return if defined ! $form->field("do") || $form->field("do") ne "edit";
++	return if ! defined $form->field("do") || $form->field("do") ne "edit";
+ 
+ 	my $page=$form->field("page");
+ 	$page = IkiWiki::possibly_foolish_untaint($page);
diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac
new file mode 100644
index 00000000000..094736495d8
--- /dev/null
+++ b/www/ikiwiki/patches/patch-ac
@@ -0,0 +1,51 @@
+$NetBSD: patch-ac,v 1.1 2008/09/22 15:09:05 schmonz Exp $
+
+--- IkiWiki/Plugin/aggregate.pm.orig	2008-09-08 12:30:11.000000000 -0400
++++ IkiWiki/Plugin/aggregate.pm
+@@ -421,7 +421,7 @@ sub expire () { #{{{
+ 		my $count=0;
+ 		my %seen;
+ 		foreach my $item (sort { $IkiWiki::pagectime{$b->{page}} <=> $IkiWiki::pagectime{$a->{page}} }
+-		                  grep { exists $_->{page} && $_->{feed} eq $feed->{name} && $IkiWiki::pagectime{$_->{page}} }
++		                  grep { exists $_->{page} && $_->{feed} eq $feed->{name} }
+ 		                  values %guids) {
+ 			if ($feed->{expireage}) {
+ 				my $days_old = (time - $IkiWiki::pagectime{$item->{page}}) / 60 / 60 / 24;
+@@ -520,12 +520,18 @@ sub aggregate (@) { #{{{
+ 		}
+ 
+ 		foreach my $entry ($f->entries) {
++			my $content=$content=$entry->content->body;
++			# atom feeds may have no content, only a summary
++			if (! defined $content && ref $entry->summary) {
++				$content=$entry->summary->body;
++			}
++
+ 			add_page(
+ 				feed => $feed,
+ 				copyright => $f->copyright,
+ 				title => defined $entry->title ? decode_entities($entry->title) : "untitled",
+ 				link => $entry->link,
+-				content => defined $entry->content->body ? $entry->content->body : "",
++				content => defined $content ? $content : "",
+ 				guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
+ 				ctime => $entry->issued ? ($entry->issued->epoch || time) : time,
+ 			);
+@@ -612,10 +618,13 @@ sub add_page (@) { #{{{
+ 	writefile(htmlfn($guid->{page}), $config{srcdir},
+ 		$template->output);
+ 
+-	# Set the mtime, this lets the build process get the right creation
+-	# time on record for the new page.
+-	utime $mtime, $mtime, pagefile($guid->{page})
+-		if defined $mtime && $mtime <= time;
++	if (defined $mtime && $mtime <= time) {
++		# Set the mtime, this lets the build process get the right
++		# creation time on record for the new page.
++		utime $mtime, $mtime, pagefile($guid->{page});
++		# Store it in pagectime for expiry code to use also.
++		$IkiWiki::pagectime{$guid->{page}}=$mtime;
++	}
+ } #}}}
+ 
+ sub htmlescape ($) { #{{{