Update to 3.20150614. From the changelog:

* inline: change default sort order from age to "age title" for
  determinism, partially fixing deterministic build for git-annex,
  ikiwiki-hosting etc. (Closes: #785757)
* img: avoid ImageMagick misinterpreting filenames containing a colon
* img test: set old timestamp on source file that will change, so that
  the test will pass even if it takes less than 1 second

5 files changed, 64 insertions, 7 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 74409b170a6..ecc7a342f7c 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.134 2015/06/12 10:51:50 wiz Exp $
+# $NetBSD: Makefile,v 1.135 2015/06/15 01:49:50 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20150610
+DISTNAME=		ikiwiki_3.20150614
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 616bb56e200..be4addc8d63 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.106 2015/06/11 14:15:33 schmonz Exp $
+$NetBSD: distinfo,v 1.107 2015/06/15 01:49:50 schmonz Exp $
 
-SHA1 (ikiwiki_3.20150610.tar.gz) = 1265eb208a5f533bc35c2ea30e0474e5e648b814
-RMD160 (ikiwiki_3.20150610.tar.gz) = 69f4f2a000c67a36ae1ae9716659d3156f77140c
-Size (ikiwiki_3.20150610.tar.gz) = 3342097 bytes
+SHA1 (ikiwiki_3.20150614.tar.gz) = 22722f25f5dbc3a55c211a064854d823ed6d4bc8
+RMD160 (ikiwiki_3.20150614.tar.gz) = 7ba865d9f37e45ddd97a0a34acf47f38a66877e6
+Size (ikiwiki_3.20150614.tar.gz) = 3344970 bytes
+SHA1 (patch-IkiWiki_Plugin_teximg.pm) = fe51d946ae50da9e34f7ae3a8f76f7208cfdc2a3
+SHA1 (patch-pm__filter) = d89be6c329590bf461eb8dfd61d5bd7a03521949
+SHA1 (patch-t_inline.t) = ea24b4a96cce2cef01e526d2c729164b0d0d0823
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_teximg.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_teximg.pm
new file mode 100644
index 00000000000..f7f5a2abaf3
--- /dev/null
+++ b/www/ikiwiki/patches/patch-IkiWiki_Plugin_teximg.pm
@@ -0,0 +1,17 @@
+$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
new file mode 100644
index 00000000000..b506f62f889
--- /dev/null
+++ b/www/ikiwiki/patches/patch-pm__filter
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..3a1828948c3
--- /dev/null
+++ b/www/ikiwiki/patches/patch-t_inline.t
@@ -0,0 +1,24 @@
+$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');