Update to 3.20160121. From the changelog:

[ Amitai Schlair ]
* meta: Fix [[!meta name=foo]] by closing the open quote.
* Avoid unescaped "{" in regular expressions
* meta test: Add tests for many behaviors of the directive.
* img test: Bail gracefully when ImageMagick is not present.

[ Joey Hess ]
* emailauth: Added emailauth_sender config.
* Modified page.tmpl to to set html lang= and dir= when
  values have been specified for them, which the po plugin does.
* Specifically license the javascript underlay under the permissive
  basewiki license.

[ Simon McVittie ]
* git: if no committer identity is known, set it to
  "IkiWiki <ikiwiki.info>" in .git/config. This resolves commit errors
  in versions of git that require a non-trivial committer identity.
* inline, trail: rename show, feedshow parameters to limit, feedlimit
  (with backwards compatibility)
* pagestats: add "show" option to show meta fields. Thanks, Louis
* inline: force RSS <comments> to be a fully absolute URL as required
  by the W3C validator. Please use Atom feeds if relative URLs are
  desirable on your site.
* inline: add <atom:link rel="self"> to RSS feeds as recommended by
  the W3C validator
* inline: do not produce links containing /./ or /../
* syslog: accept and encode UTF-8 messages
* syslog: don't fail to log if the wiki name contains %s
* Change dependencies from transitional package perlmagick
  to libimage-magick-perl (Closes: #789221)
* debian/copyright: update for the rename of openid-selector to
  login-selector
* d/control: remove leading article from Description
  (lintian: description-synopsis-starts-with-article)
* d/control: Standards-Version: 3.9.6, no changes required
* Wrap and sort control files (wrap-and-sort -abst)
* Silence "used only once: possible typo" warnings for variables
  that are part of modules' APIs
* Run autopkgtest tests using autodep8 and the pkg-perl team's
  infrastructure
* Add enough build-dependencies to run all tests, except for
  non-git VCSs
* tests: consistently use done_testing instead of no_plan
* t/img.t: do not spuriously skip
* img test: skip testing PDFs if unsupported
* img test: use the right filenames when testing that deletion occurs

-- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 09:53:07 +0000

7 files changed, 10 insertions, 83 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 544fec34085..481cf4dfb27 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.136 2015/08/30 03:07:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.137 2016/01/21 18:36:38 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20150614
+DISTNAME=		ikiwiki_3.20160121
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
@@ -35,7 +34,7 @@ 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
 
-WRKSRC=			${WRKDIR}/${PKGBASE}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 PERL5_PACKLIST=		auto/IkiWiki/.packlist
 USE_LANGUAGES=		c
 USE_TOOLS+=		gmake msgfmt perl:run xgettext
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index d047d5c1236..ce39508300e 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2015/06/11 14:15:33 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.45 2016/01/21 18:36:38 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-comment
@@ -129,6 +129,7 @@ share/ikiwiki/examples/blog/comments.mdwn
 share/ikiwiki/examples/blog/index.mdwn
 share/ikiwiki/examples/blog/posts.mdwn
 share/ikiwiki/examples/blog/posts/first_post.mdwn
+share/ikiwiki/examples/blog/posts/second_post.mdwn
 share/ikiwiki/examples/blog/sidebar.mdwn
 share/ikiwiki/examples/blog/tags.mdwn
 share/ikiwiki/examples/softwaresite.mdwn
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index d86fdc6e051..79ffb04fcc0 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.109 2015/11/04 02:46:55 agc Exp $
+$NetBSD: distinfo,v 1.110 2016/01/21 18:36:38 schmonz Exp $
 
-SHA1 (ikiwiki_3.20150614.tar.gz) = 22722f25f5dbc3a55c211a064854d823ed6d4bc8
-RMD160 (ikiwiki_3.20150614.tar.gz) = 7ba865d9f37e45ddd97a0a34acf47f38a66877e6
-SHA512 (ikiwiki_3.20150614.tar.gz) = 1d04b6e6e557c91fab24b2fc51e3634abe7362e13d052cb216d07964ca139d8ff4ecdad41ce0ee89a0ec87a8c1805cd261fd36f1d457973cc32def38ae2cfe3f
-Size (ikiwiki_3.20150614.tar.gz) = 3344970 bytes
-SHA1 (patch-IkiWiki_Plugin_meta.pm) = 545813c56c61bebaf9ae07838a9aaf4c0ebeccd9
-SHA1 (patch-IkiWiki_Plugin_teximg.pm) = fe51d946ae50da9e34f7ae3a8f76f7208cfdc2a3
-SHA1 (patch-pm__filter) = d89be6c329590bf461eb8dfd61d5bd7a03521949
-SHA1 (patch-t_inline.t) = ea24b4a96cce2cef01e526d2c729164b0d0d0823
+SHA1 (ikiwiki_3.20160121.tar.gz) = add644497a852e52d87b03fa8eafa496a5ecd71a
+RMD160 (ikiwiki_3.20160121.tar.gz) = e9aadc3a36077d0c1fbb9333a1b65d77cc7b56dd
+SHA512 (ikiwiki_3.20160121.tar.gz) = bbbf37e6c9413db158c80ee85953019f4dc0bb862ecc06b934c037372ffcb414e8a8927cf8bd19585fb4069849679ac16b6ea79fe6601ab11be5a4702224e1c9
+Size (ikiwiki_3.20160121.tar.gz) = 3403392 bytes
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_meta.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_meta.pm
deleted file mode 100644
index 2ea6d3f4d43..00000000000
--- a/www/ikiwiki/patches/patch-IkiWiki_Plugin_meta.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-IkiWiki_Plugin_meta.pm,v 1.1 2015/08/30 03:07:03 schmonz Exp $
-
-Fix [[!meta name=foo]] by closing the open quote.
-
---- IkiWiki/Plugin/meta.pm.orig	2014-09-12 20:23:58.000000000 +0000
-+++ IkiWiki/Plugin/meta.pm
-@@ -294,6 +294,7 @@ sub preprocess (@) {
- 	elsif ($key eq 'name') {
- 		push @{$metaheaders{$page}}, scrub('<meta name="'.
- 			encode_entities($value).
-+			'" '.
- 			join(' ', map { "$_=\"$params{$_}\"" } keys %params).
- 			' />', $page, $destpage);
- 	}
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_teximg.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_teximg.pm
deleted file mode 100644
index f7f5a2abaf3..00000000000
--- a/www/ikiwiki/patches/patch-IkiWiki_Plugin_teximg.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-IkiWiki_Plugin_teximg.pm,v 1.1 2015/06/15 01:49:50 schmonz Exp $
-
-Squelch Perl 5.22 regex deprecation warning.
-
---- IkiWiki/Plugin/teximg.pm.orig	2014-09-12 20:23:58.000000000 +0000
-+++ IkiWiki/Plugin/teximg.pm
-@@ -146,8 +146,8 @@ sub gen_image ($$$$) {
- 	my $tex = $config{teximg_prefix};
- 	$tex .= '\['.$code.'\]';
- 	$tex .= $config{teximg_postfix};
--	$tex =~ s!\\documentclass{article}!\\documentclass[${height}pt]{article}!g;
--	$tex =~ s!\\documentclass{scrartcl}!\\documentclass[${height}pt]{scrartcl}!g;
-+	$tex =~ s!\\documentclass\{article}!\\documentclass[${height}pt]{article}!g;
-+	$tex =~ s!\\documentclass\{scrartcl}!\\documentclass[${height}pt]{scrartcl}!g;
- 
- 	my $tmp = eval { create_tmp_dir($digest) };
- 	if (! $@ &&
diff --git a/www/ikiwiki/patches/patch-pm__filter b/www/ikiwiki/patches/patch-pm__filter
deleted file mode 100644
index b506f62f889..00000000000
--- a/www/ikiwiki/patches/patch-pm__filter
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-pm__filter,v 1.1 2015/06/15 01:49:50 schmonz Exp $
-
-Squelch Perl 5.22 regex deprecation warning.
-
---- pm_filter.orig	2014-09-12 20:23:58.000000000 +0000
-+++ pm_filter
-@@ -28,6 +28,6 @@ elsif (/^use lib/) {
- elsif ($. == 1 && ($ENV{NOTAINT}=0) && m{^(#!.*perl.*?)$}) {
- 	$_=qq{$1 -T\n};
- }
--elsif (/^\$ENV{PATH}="(.*)";/) {
-+elsif (/^\$ENV\{PATH}="(.*)";/) {
- 	$_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";
- }
diff --git a/www/ikiwiki/patches/patch-t_inline.t b/www/ikiwiki/patches/patch-t_inline.t
deleted file mode 100644
index 3a1828948c3..00000000000
--- a/www/ikiwiki/patches/patch-t_inline.t
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-t_inline.t,v 1.1 2015/06/15 01:49:50 schmonz Exp $
-
-Squelch Perl 5.22 regex deprecation warning.
-
---- t/inline.t.orig	2015-06-14 15:12:56.000000000 +0000
-+++ t/inline.t
-@@ -52,7 +52,7 @@ $blob = readfile("t/tmp/out/friends.html
- like($blob, qr{\Q$add_new_post\E}, 'postform=yes forces postform');
- like($blob, qr{<input type="hidden" name="from" value="friends"},
- 	'implicit rootpage is /friends');
--like($blob, qr[this page is {friends/garrus}.*this page is {friends/liara}]s,
-+like($blob, qr[this page is \{friends/garrus}.*this page is \{friends/liara}]s,
- 	'first two pages in desired sort order are present');
- unlike($blob, qr{friends/(?:midna|telma)},
- 	'pages excluded by show should not be present');
-@@ -62,7 +62,7 @@ unlike($blob, qr{\Q$add_new_post\E}, 'de
- 
- $blob = readfile("t/tmp/out/enemies.html");
- unlike($blob, qr{\Q$add_new_post\E}, 'postform=no forces no postform');
--like($blob, qr[this page is {enemies/zant}.*this page is {enemies/rachni}]s,
-+like($blob, qr[this page is \{enemies/zant}.*this page is \{enemies/rachni}]s,
- 	'first two pages in reversed sort order are present');
- unlike($blob, qr{enemies/(?:benezia|geth)},
- 	'pages excluded by show should not be present');