Update to 3.20190207. From the changelog:

* graph: Add an optional "file" parameter
* emailauth: When email can't be sent, show the error message
* osm: Don't raise errors if tags don't have attached icons
* cgi: Avoid C compiler warnings for waitpid() on NetBSD
* Hide popup template content from documentation (Closes: #898836)
* meta: Make [[!meta date]] show an error if dates are invalid or
  Date::Parse can't be loaded
* inline: Cope with non-ASCII `rootpage` parameter.
  Thanks, Feng Shu
* table: Cope with non-ASCII content in CSV format tables.
  Thanks, Feng Shu
* trail: Allow unescaped punctuation in `pagenames` parameter
* comments: Hide "add comment" link from print stylesheet.
  Thanks, Antoine Beaupré
* recentchangesdiff, relativedate, toggle:
  Import JavaScript at the end of the page content, not the beginning,
  so that the browser can render content as soon as possible.
  Thanks, Antoine Beaupré
* inline: Add basic test coverage for [[!inline rootpage]]
* table: Add basic test coverage
* po: Add enough test coverage to reproduce Debian #911356
* comments: Improve test coverage
* tests: Exercise Unicode more
* aggregate: Fix aggregation of posts without a title.
  Thanks, Alexandre Oliva
* poll: Added postlink and posttrail options for better multi-page polls.
* Fix permalink to comments.

5 files changed, 7 insertions, 61 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index e6dad40cd6a..2741cf0a541 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.159 2018/10/22 04:33:25 schmonz Exp $
+# $NetBSD: Makefile,v 1.160 2019/02/07 15:47:32 schmonz Exp $
 #
 
-DISTNAME=		ikiwiki_3.20180311.orig
+DISTNAME=		ikiwiki_3.20190207.orig
 PKGNAME=		${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=		4
 CATEGORIES=		www textproc
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 EXTRACT_SUFX=		.tar.xz
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 318d700ecba..334274d8d43 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.130 2018/10/22 04:33:25 schmonz Exp $
+$NetBSD: distinfo,v 1.131 2019/02/07 15:47:32 schmonz Exp $
 
-SHA1 (ikiwiki_3.20180311.orig.tar.xz) = 9c567bb9f46e8a86a41ddc2358d0426248934e33
-RMD160 (ikiwiki_3.20180311.orig.tar.xz) = 22a2f1963e73fae82a7a6a29c84488c898c7c4fa
-SHA512 (ikiwiki_3.20180311.orig.tar.xz) = 12042d90217995eb43d47df1e81cbced825fc2b2262893680447448abac88ef5279bcddd6c438613b41c4f35308a4f1e8d23157e018bb99d883bc0941af1d469
-Size (ikiwiki_3.20180311.orig.tar.xz) = 2639052 bytes
-SHA1 (patch-IkiWiki_Plugin_graphviz.pm) = 7fb033dfa46a3cdffd591fcf6af338399107572b
-SHA1 (patch-IkiWiki_Wrapper.pm) = 68a9c4c64b5e95bbb6dec721ea95dc27cecb1bc9
-SHA1 (patch-doc_ikiwiki_directive_graph.mdwn) = 78e3a7e2151ab122fe770b3a0d75759a00e978a2
+SHA1 (ikiwiki_3.20190207.orig.tar.xz) = 3caa33eebec59eca406159b9862eae8f5cb77aa6
+RMD160 (ikiwiki_3.20190207.orig.tar.xz) = 5ac30ade28070a53413554e95de5e68e886fce05
+SHA512 (ikiwiki_3.20190207.orig.tar.xz) = f5b6961a4efe11d0911d96bfa7cc28643cbeaa1654f12c63053eb8ac070bc7f622942386b3b2a150f09bffd66a572a96e981fa111f3bdffa6844124feb91c32a
+Size (ikiwiki_3.20190207.orig.tar.xz) = 2668840 bytes
 SHA1 (patch-ikiwiki-mass-rebuild) = b8d5785d77736508de9cfc0f059cc36e0e607bce
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_graphviz.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_graphviz.pm
deleted file mode 100644
index 0f10df06d0c..00000000000
--- a/www/ikiwiki/patches/patch-IkiWiki_Plugin_graphviz.pm
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-IkiWiki_Plugin_graphviz.pm,v 1.1 2018/10/22 04:33:25 schmonz Exp $
-
-Add upstream patch to give graph an optional "file" param, like table's.
-
---- IkiWiki/Plugin/graphviz.pm.orig	2018-03-11 15:54:34.000000000 +0000
-+++ IkiWiki/Plugin/graphviz.pm
-@@ -95,6 +95,14 @@ sub render_graph (\%) {
- sub graph (@) {
- 	my %params=@_;
- 
-+	if (exists $params{file}) {
-+		if (! exists $pagesources{$params{file}}) {
-+			error gettext("cannot find file");
-+		}
-+		$params{src} = readfile(srcfile($params{file}));
-+		add_depends($params{page}, $params{file});
-+	}
-+
- 	# Support wikilinks in the graph source.
- 	my $src=$params{src};
- 	$src="" unless defined $src;
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Wrapper.pm b/www/ikiwiki/patches/patch-IkiWiki_Wrapper.pm
deleted file mode 100644
index 539f41f7574..00000000000
--- a/www/ikiwiki/patches/patch-IkiWiki_Wrapper.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-IkiWiki_Wrapper.pm,v 1.3 2018/08/29 08:03:38 schmonz Exp $
-
-Apply upstream patch 64aa6eb:
-Need <sys/wait.h> for waitpid (NetBSD 8 warns).
-
---- IkiWiki/Wrapper.pm.orig	2018-03-11 15:54:34.000000000 +0000
-+++ IkiWiki/Wrapper.pm
-@@ -182,6 +182,7 @@ EOF
- #include <stdlib.h>
- #include <string.h>
- #include <sys/file.h>
-+#include <sys/wait.h>
- 
- extern char **environ;
- int newenvironlen=0;
diff --git a/www/ikiwiki/patches/patch-doc_ikiwiki_directive_graph.mdwn b/www/ikiwiki/patches/patch-doc_ikiwiki_directive_graph.mdwn
deleted file mode 100644
index 998c5e725a3..00000000000
--- a/www/ikiwiki/patches/patch-doc_ikiwiki_directive_graph.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-doc_ikiwiki_directive_graph.mdwn,v 1.1 2018/10/22 04:33:25 schmonz Exp $
-
-Add upstream patch to give graph an optional "file" param, like table's.
-
---- doc/ikiwiki/directive/graph.mdwn.orig	2018-03-11 15:54:34.000000000 +0000
-+++ doc/ikiwiki/directive/graph.mdwn
-@@ -21,6 +21,7 @@ ikiwiki, [[WikiLinks|ikiwiki/wikilink]] 
- The `graph` directive supports the following parameters:
- 
- - `src` - The graphviz source to render.
-+* `file` - A file in the wiki containing the graphviz source.
- - `type` - The type of graph to render: `graph` or `digraph`.  Defaults to
-   `digraph`.
- - `prog` - The graphviz program to render with: `dot`, `neato`, `fdp`, `twopi`,