Update to 3.20150107. From the changelog:

[ Joey Hess ]
* Added ikiwiki-comment program.
* Add missing build-depends on libcgi-formbuilder-perl, needed for
  t/relativity.t
* openid: Stop suppressing the email field on the Preferences page.
* po: If msgmerge falls over on a problem po file, print a warning
  message, but don't let this problem crash ikiwiki entirely.
* Set Debian package maintainer to Simon McVittie as I'm retiring from
  Debian.

[ Simon McVittie ]
* calendar: add calendar_autocreate option, with which "ikiwiki --refresh"
  can mostly supersede the ikiwiki-calendar command.
  Thanks, Louis Paternault
* search: add more classes as a hook for CSS. Thanks, sajolida
* core: generate HTML5 by default, but keep avoiding new elements
  like <section> that require specific browser support unless html5 is
  set to 1.
* Tell mobile browsers to draw our pages in a device-sized viewport,
  not an 800-1000px viewport designed to emulate a desktop/laptop browser.
* Add new responsive_layout option which can be set to 0 if your custom
  CSS only works in a large viewport.
* style.css, actiontabs, blueview, goldtype, monochrome: adjust layout
  below 600px ("responsive layout") so that horizontal scrolling is not
  needed on smartphone browsers or other small viewports.
* core: new libdirs option alongside libdir. Thanks, Louis Paternault

[ Amitai Schlair ]
* core: log a debug message before waiting for the lock.
  Thanks, Mark Jason Dominus
* build: in po/Makefile, use the same $(MAKE) as the rest of the build.
  Thanks, ttw
* blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd).
  Closes: #774441

pkgsrc changes:

Add a not-yet-upstreamed patch to link to the commenter's URL for
anonymous-style comments committed directly via the VCS (i.e.,
imported from another CMS).

4 files changed, 67 insertions, 10 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 6a3f8e85e48..d0cf07595b8 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.130 2014/12/04 17:28:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.131 2015/01/07 16:09:23 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20141016
+DISTNAME=		ikiwiki_3.20150107
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
@@ -17,7 +16,7 @@ LICENSE=		gnu-gpl-v2
 MAKE_JOBS_SAFE=		no
 
 DEPENDS+=		p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount
-DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+=		p5-URI>=1.36:../../www/p5-URI
 DEPENDS+=		p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 DEPENDS+=		p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
 DEPENDS+=		p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
@@ -25,6 +24,7 @@ DEPENDS+=		p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail
 DEPENDS+=		p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration
 DEPENDS+=		p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 DEPENDS+=		p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
+DEPENDS+=		p5-JSON-[0-9]*:../../converters/p5-JSON
 DEPENDS+=		p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML
 DEPENDS+=		p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
 DEPENDS+=		p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed
@@ -33,7 +33,6 @@ DEPENDS+=		p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
 DEPENDS+=		p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
 DEPENDS+=		p5-gettext-[0-9]*:../../devel/p5-gettext
 DEPENDS+=		p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML
-#DEPENDS+=		po4a-[0-9]*:../../textproc/po4a
 
 WRKSRC=			${WRKDIR}/${PKGBASE}
 PERL5_PACKLIST=		auto/IkiWiki/.packlist
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index 80d29f4075f..735477f9f2b 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.41 2014/12/04 17:28:43 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.42 2015/01/07 16:09:23 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
+bin/ikiwiki-comment
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
 bin/ikiwiki-update-wikilist
@@ -8,6 +9,7 @@ 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-comment.1
 man/man1/ikiwiki-makerepo.1
 man/man1/ikiwiki-transition.1
 man/man1/ikiwiki-update-wikilist.1
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 62146ca06bc..7d07a7e5fe5 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.103 2014/10/17 11:50:42 schmonz Exp $
+$NetBSD: distinfo,v 1.104 2015/01/07 16:09:23 schmonz Exp $
 
-SHA1 (ikiwiki_3.20141016.tar.gz) = 472b3899eb3ca64b5a8d564b0de29f62e1847318
-RMD160 (ikiwiki_3.20141016.tar.gz) = db9ebfa5fa61516f089611804d9f15073b2f1b89
-Size (ikiwiki_3.20141016.tar.gz) = 3254923 bytes
+SHA1 (ikiwiki_3.20150107.tar.gz) = 9ef9f03c8565c2dda6fb78f26e1ec5349039818c
+RMD160 (ikiwiki_3.20150107.tar.gz) = 2ccb7097a4c72944bc073f115975fe541299837f
+Size (ikiwiki_3.20150107.tar.gz) = 3285794 bytes
+SHA1 (patch-IkiWiki_Plugin_comments.pm) = fd0dffac8e7f3928e48425e1840e70b8a4d68808
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_comments.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_comments.pm
new file mode 100644
index 00000000000..98e8c70420a
--- /dev/null
+++ b/www/ikiwiki/patches/patch-IkiWiki_Plugin_comments.pm
@@ -0,0 +1,55 @@
+$NetBSD: patch-IkiWiki_Plugin_comments.pm,v 1.1 2015/01/07 16:09:23 schmonz Exp $
+
+For anonymous-style comments committed directly via the VCS (i.e.,
+imported from another CMS), link to the provided URL if any.
+
+--- IkiWiki/Plugin/comments.pm.orig	2015-01-03 23:25:58.000000000 +0000
++++ IkiWiki/Plugin/comments.pm
+@@ -223,22 +223,9 @@ sub preprocess {
+ 		$commentauthor = gettext("Anonymous");
+ 	}
+ 
+-	$commentstate{$page}{commentuser} = $commentuser;
+-	$commentstate{$page}{commentopenid} = $commentopenid;
+-	$commentstate{$page}{commentip} = $commentip;
+-	$commentstate{$page}{commentauthor} = $commentauthor;
+-	$commentstate{$page}{commentauthorurl} = $commentauthorurl;
+-	$commentstate{$page}{commentauthoravatar} = $params{avatar};
+-	if (! defined $pagestate{$page}{meta}{author}) {
+-		$pagestate{$page}{meta}{author} = $commentauthor;
+-	}
+-	if (! defined $pagestate{$page}{meta}{authorurl}) {
+-		$pagestate{$page}{meta}{authorurl} = $commentauthorurl;
+-	}
+-
+ 	if ($config{comments_allowauthor}) {
+ 		if (defined $params{claimedauthor}) {
+-			$pagestate{$page}{meta}{author} = $params{claimedauthor};
++			$commentauthor = $params{claimedauthor};
+ 		}
+ 
+ 		if (defined $params{url}) {
+@@ -250,12 +237,21 @@ sub preprocess {
+ 			}
+ 
+ 			if (safeurl($url)) {
+-				$pagestate{$page}{meta}{authorurl} = $url;
++				$commentauthorurl = $url;
+ 			}
+ 		}
+ 	}
+-	else {
++
++	$commentstate{$page}{commentuser} = $commentuser;
++	$commentstate{$page}{commentopenid} = $commentopenid;
++	$commentstate{$page}{commentip} = $commentip;
++	$commentstate{$page}{commentauthor} = $commentauthor;
++	$commentstate{$page}{commentauthorurl} = $commentauthorurl;
++	$commentstate{$page}{commentauthoravatar} = $params{avatar};
++	if (! defined $pagestate{$page}{meta}{author}) {
+ 		$pagestate{$page}{meta}{author} = $commentauthor;
++	}
++	if (! defined $pagestate{$page}{meta}{authorurl}) {
+ 		$pagestate{$page}{meta}{authorurl} = $commentauthorurl;
+ 	}
+