Update to 3.20100515. From the changelog:

   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
     a single template, page.tmpl.
   * If you have a locally customised page.tmpl, it needs to be updated
     to set <base> when BASEURL or FORCEBAREURL is set.
   * comments: Comments pending moderation are now stored in the srcdir
     alongside accepted comments, but with a `._comment_pending` extension.
     This allows easier byhand moderation, as the "_pending" need
     only be stripped off and the comment be committed to version control.
   * The `comment_pending()` pagespec can be used to match such unmoderated
     comments, which makes it easy to add a feed of them, or a counter
     indicating how many there are.
   * Belatedly added a `comment()` pagespec.
   * Gave comment and page editing forms some CSS and accessability love.
   * Renamed postscan hook to indexhtml, to reflect its changed position,
     and typical use.
   * inline: Call indexhtml when inlining internal pages, so their
     text can be indexed for searching.
   * Delete hooks are passed deleted internal pages.
   * openid: Incorporated a fancy openid-selector signin form.
     (Based on <http://code.google.com/p/openid-selector/>)
   * openid: Use "openid_identifier" as the form field, as required
     by OpenID Authentication v2.0 spec.
   * Removed the openidsignup option. Instead, my recommendation is to
     leave passwordauth enabled and let people who don't have an openid use it.
     The openid selector form avoids the UI annoyance of having both openid
     and passwordauth on one form.
   * calendar: Allow negative month to be specified. -1 is last month, etc.
     (And also negative years.)
   * calendar: Display year in title of month calendar.
   * Use xhtml friendly pubdate setting.
   * remove, rename: Add guards against XSRF attacks.

3 files changed, 10 insertions, 8 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index d607a768667..f066d66575e 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2010/05/05 14:31:51 schmonz Exp $
+# $NetBSD: Makefile,v 1.53 2010/05/16 12:35:09 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20100504
+DISTNAME=	ikiwiki_3.20100515
 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 b1f258920af..eb21697bbbb 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2010/04/27 13:15:46 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.24 2010/05/16 12:35:09 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
@@ -119,6 +119,8 @@ share/ikiwiki/examples/softwaresite/templates/release.mdwn
 share/ikiwiki/javascript/ikiwiki/ikiwiki.js
 share/ikiwiki/javascript/ikiwiki/relativedate.js
 share/ikiwiki/javascript/ikiwiki/toggle.js
+share/ikiwiki/openid-selector/ikiwiki/openid/jquery.js
+share/ikiwiki/openid-selector/ikiwiki/openid/openid-jquery.js
 share/ikiwiki/po/cs/basewiki/ikiwiki.cs.po
 share/ikiwiki/po/cs/basewiki/ikiwiki/directive.cs.po
 share/ikiwiki/po/cs/basewiki/ikiwiki/formatting.cs.po
@@ -398,7 +400,7 @@ share/ikiwiki/templates/feedlink.tmpl
 share/ikiwiki/templates/googleform.tmpl
 share/ikiwiki/templates/inlinepage.tmpl
 share/ikiwiki/templates/microblog.tmpl
-share/ikiwiki/templates/misc.tmpl
+share/ikiwiki/templates/openid-selector.tmpl
 share/ikiwiki/templates/page.tmpl
 share/ikiwiki/templates/passwordmail.tmpl
 share/ikiwiki/templates/pocreatepage.tmpl
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 9036a1686b9..a7dc3b9ec4b 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.38 2010/05/05 14:31:51 schmonz Exp $
+$NetBSD: distinfo,v 1.39 2010/05/16 12:35:09 schmonz Exp $
 
-SHA1 (ikiwiki_3.20100504.tar.gz) = 2c1b7a3a343ce1fe455936b5010aa67533ece405
-RMD160 (ikiwiki_3.20100504.tar.gz) = 7aa22abe6632875aa4fcc9a9450033c846c21124
-Size (ikiwiki_3.20100504.tar.gz) = 1735073 bytes
+SHA1 (ikiwiki_3.20100515.tar.gz) = c07238a71a03fa7ae6e295e05f41a48bdb6e46a0
+RMD160 (ikiwiki_3.20100515.tar.gz) = 37ce131cb1aaad6b635ae6c50b2d2130d2dc2c1a
+Size (ikiwiki_3.20100515.tar.gz) = 1752596 bytes
 SHA1 (patch-aa) = 12cfd5be1b6e8b66e3e78cdf36e848a10b9642c3
 SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d