Update to 3.1415. From the changelog:

* img: Fix extra double quote with alt text. (smcv)
* Updated French debconf templates translation. Closes: #535103
* openid: Support Net::OpenID 2.x when pretty-printing openids. (smcv)
* highlight: Fix utf-8 encoding bug. Closes: #535028
* comment: Make comment directives no longer use the internal
    "\_comment" form, and document the comment directive syntax.
* Avoid relying on translators preserving the case when translating
    "discussion", which caused Discussion pages to get unwanted
    Discussion links.
* Tighten up matching of bare words inside directives; do not allow
    an unterminated triple string to be treated as a series of bare
    words. Fixes runaway regexp recursion/backtracking in strange
    situations.
* Setup automator: Check that each plugin added to the generated
    setup file can be loaded and that its config is ok. If a plugin
    fails for any reason, disable it in the generated file. Closes:
    #532001
* pagecount: Fix broken optimisation for * pagespec.
* goto: Support being passed a page title that is not a valid page
    name, to support several cases including mercurial's long user
    names on the RecentChanges page, and urls with spaces being
    handled by the 404 plugin.
* Optimise use of gettext, and avoid ugly warnings if Locale::gettext
    is not available. Closes: #532285
* meta: Add openid delegate parameter to allow delegating only
    openid or openid2.
* Disable the Preferences link if no plugin with an auth hook is enabled.
* Updated French translation. Closes: #532654
* aggregate: Fix storing of changed md5.
* aggregate: Avoid resetting ctime when an item md5 changes.
* highlight: New plugin supporting syntax highlighting of pretty
    much anything.
* debian/control: Add suggests for libhighlight-perl, although that
    package is not yet created by Debian's highlight source package.
    (See #529869)
* format: Provide a htmlizefallback hook that other plugins can use
    to handle formats that are not suitable for general-purpose
    htmlize hooks. Used by highlight.
* Fix test suite to not rely on an installed copy of ikiwiki after
    underlaydir change. Closes: #530502
* Danish translation update. Closes: #530877

4 files changed, 28 insertions, 7 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 72e1a71dd15..3015de9227a 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2009/06/01 20:24:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2009/07/09 22:15:09 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.13
+DISTNAME=	ikiwiki_3.1415
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
@@ -11,6 +11,8 @@ HOMEPAGE=	http://ikiwiki.info/
 COMMENT=	Wiki compiler
 LICENSE=	gnu-gpl-v2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown
 DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index 05f5cb32d56..42f35ba30d4 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 22:00:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/07/09 22:15:09 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
@@ -47,6 +47,7 @@ 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/comment.mdwn
 share/ikiwiki/directives/ikiwiki/directive/copy.mdwn
 share/ikiwiki/directives/ikiwiki/directive/cut.mdwn
 share/ikiwiki/directives/ikiwiki/directive/cutpaste.mdwn
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index a3371602e8c..9383fff24f5 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.15 2009/06/01 20:24:42 schmonz Exp $
+$NetBSD: distinfo,v 1.16 2009/07/09 22:15:09 schmonz Exp $
 
-SHA1 (ikiwiki_3.13.tar.gz) = 6df3c41b7934db8b72b101fb6ce4b4505b373bd8
-RMD160 (ikiwiki_3.13.tar.gz) = 28f94bc5d701177ec92e2de0d918c79bc18e1ea9
-Size (ikiwiki_3.13.tar.gz) = 1184152 bytes
+SHA1 (ikiwiki_3.1415.tar.gz) = 06735b45165a54dca1a3106d857b6867606b8fab
+RMD160 (ikiwiki_3.1415.tar.gz) = 10fb97e6dde14eb1837290fe53c5e47c9e89edbe
+Size (ikiwiki_3.1415.tar.gz) = 1218824 bytes
 SHA1 (patch-aa) = e3ae3104f9445e15244a2b65c4867536cdfdcbca
 SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194
+SHA1 (patch-ac) = 1cac904d17297b6372161cbc4d62afa769718296
diff --git a/www/ikiwiki/patches/patch-ac b/www/ikiwiki/patches/patch-ac
new file mode 100644
index 00000000000..761657b4372
--- /dev/null
+++ b/www/ikiwiki/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.3 2009/07/09 22:15:09 schmonz Exp $
+
+--- IkiWiki/Plugin/svn.pm.orig	2009-05-27 16:32:36.000000000 -0400
++++ IkiWiki/Plugin/svn.pm
+@@ -243,10 +243,10 @@ sub rcs_rename ($$) {
+ 	
+ 	if (-d "$config{srcdir}/.svn") {
+ 		# Add parent directory for $dest
+-		my $parent=dirname($dest);
++		my $parent=IkiWiki::dirname($dest);
+ 		if (! -d "$config{srcdir}/$parent/.svn") {
+ 			while (! -d "$config{srcdir}/$parent/.svn") {
+-				$parent=dirname($dest);
++				$parent=IkiWiki::dirname($dest);
+ 			}
+ 			if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
+ 				warn("svn add $parent failed\n");