[pkgsrc/trunk]: pkgsrc/www/ikiwiki Update to 3.20200202.3. From the changelog:

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/61dd23d750e8
branches:  trunk
changeset: 423248:61dd23d750e8
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Feb 13 19:03:57 2020 +0000

description:
Update to 3.20200202.3. From the changelog:

* highlight: Adapt to API change in highlight >= 3.51
* mdwn: Fix inverted footnote configuration when MultiMarkdown is
  enabled. Thanks, Giuseppe Bilotta
* Updated German basewiki and directives translation from Sebastian Kuhnert.
* Updated German program translation from Sebastian Kuhnert.

pkgsrc changes:

- Add 'ikiwiki-sudo' option for portable ikiwiki-mass-rebuild, on by default

diffstat:

 www/ikiwiki/Makefile                                  |   5 +--
 www/ikiwiki/PLIST                                     |  24 ++++++++++++++++++-
 www/ikiwiki/distinfo                                  |  11 +++----
 www/ikiwiki/options.mk                                |  11 +++++++-
 www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm |  21 ----------------
 5 files changed, 39 insertions(+), 33 deletions(-)

diffs (195 lines):

diff -r 156442ab4ea0 -r 61dd23d750e8 www/ikiwiki/Makefile
--- a/www/ikiwiki/Makefile      Thu Feb 13 18:57:21 2020 +0000
+++ b/www/ikiwiki/Makefile      Thu Feb 13 19:03:57 2020 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.167 2019/09/01 02:19:37 schmonz Exp $
+# $NetBSD: Makefile,v 1.168 2020/02/13 19:03:57 schmonz Exp $
 #
 
-DISTNAME=              ikiwiki_3.20190228.orig
+DISTNAME=              ikiwiki_3.20200202.3.orig
 PKGNAME=               ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=           5
 CATEGORIES=            www textproc
 MASTER_SITES=          ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 EXTRACT_SUFX=          .tar.xz
diff -r 156442ab4ea0 -r 61dd23d750e8 www/ikiwiki/PLIST
--- a/www/ikiwiki/PLIST Thu Feb 13 18:57:21 2020 +0000
+++ b/www/ikiwiki/PLIST Thu Feb 13 19:03:57 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2018/03/02 19:20:20 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.50 2020/02/13 19:03:57 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-comment
@@ -243,14 +243,18 @@
 ${PLIST.l10n}share/ikiwiki/locale/de/basewiki/sandbox.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/basewiki/shortcuts.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/basewiki/templates.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/basewiki/templates/note.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/basewiki/templates/popup.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/aggregate.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/brokenlinks.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/calendar.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/color.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/comment.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/commentmoderation.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/cutpaste.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/date.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/edittemplate.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/flattr.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/format.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/fortune.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/graph.mdwn
@@ -264,6 +268,7 @@
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/meta.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/more.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/orphans.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/osm.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/pagecount.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/pagestats.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/pagetemplate.mdwn
@@ -273,15 +278,22 @@
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/postsparkline.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/progress.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/shortcut.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/sidebar.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/sparkline.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/table.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/tag.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/template.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/templatebody.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/testpagespec.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/teximg.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/toc.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/toggle.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/trailitem.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/trailitems.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/traillink.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/trailoptions.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/version.mdwn
+${PLIST.l10n}share/ikiwiki/locale/de/directives/ikiwiki/directive/waypoint.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/de/smiley/smileys.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/es/basewiki/ikiwiki.mdwn
 ${PLIST.l10n}share/ikiwiki/locale/es/basewiki/ikiwiki/directive.mdwn
@@ -466,11 +478,13 @@
 share/ikiwiki/po/de/directives/ikiwiki/directive/calendar.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/color.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/comment.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/commentmoderation.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/copy.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/cut.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/cutpaste.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/date.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/edittemplate.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/flattr.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/format.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/fortune.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/graph.de.po
@@ -484,6 +498,7 @@
 share/ikiwiki/po/de/directives/ikiwiki/directive/meta.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/more.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/orphans.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/osm.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/pagecount.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/pagestats.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/pagetemplate.de.po
@@ -494,17 +509,24 @@
 share/ikiwiki/po/de/directives/ikiwiki/directive/postsparkline.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/progress.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/shortcut.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/sidebar.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/sparkline.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/table.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/tag.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/taglink.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/template.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/templatebody.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/testpagespec.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/teximg.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/toc.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/toggle.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/toggleable.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/trailitem.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/trailitems.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/traillink.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/trailoptions.de.po
 share/ikiwiki/po/de/directives/ikiwiki/directive/version.de.po
+share/ikiwiki/po/de/directives/ikiwiki/directive/waypoint.de.po
 share/ikiwiki/po/de/smiley/smileys.de.po
 share/ikiwiki/po/es/basewiki/ikiwiki.es.po
 share/ikiwiki/po/es/basewiki/ikiwiki/directive.es.po
diff -r 156442ab4ea0 -r 61dd23d750e8 www/ikiwiki/distinfo
--- a/www/ikiwiki/distinfo      Thu Feb 13 18:57:21 2020 +0000
+++ b/www/ikiwiki/distinfo      Thu Feb 13 19:03:57 2020 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.136 2019/09/01 02:19:37 schmonz Exp $
+$NetBSD: distinfo,v 1.137 2020/02/13 19:03:57 schmonz Exp $
 
-SHA1 (ikiwiki_3.20190228.orig.tar.xz) = 46f5b0a1498c1e098fe248eae1f2e3f56b25dc2f
-RMD160 (ikiwiki_3.20190228.orig.tar.xz) = f47968a69528aea864ad412c8508a8c5063edb9d
-SHA512 (ikiwiki_3.20190228.orig.tar.xz) = 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
-Size (ikiwiki_3.20190228.orig.tar.xz) = 2672244 bytes
-SHA1 (patch-IkiWiki_Plugin_highlight.pm) = 14a2d8e1d3eb671863cdef4a936ebbb7b09ce3b9
+SHA1 (ikiwiki_3.20200202.3.orig.tar.xz) = abbb8ca6611cffe859e5ec323f61bc02377dcb97
+RMD160 (ikiwiki_3.20200202.3.orig.tar.xz) = 3062c04b31e0ca6aea30d47405a6d47eb80127dc
+SHA512 (ikiwiki_3.20200202.3.orig.tar.xz) = a1d89ccc0d02cddb3ef53c4c4a4a3349139d558fd4eb418263551a48cb635ed29ef430f8276ef6b42486a9232706908752e15e88590e919db6665e1a8844a4e5
+Size (ikiwiki_3.20200202.3.orig.tar.xz) = 2689636 bytes
 SHA1 (patch-Makefile.PL) = 44324917c22ec3cd2aa216439e2ae5a3dc2f9787
 SHA1 (patch-ikiwiki-mass-rebuild) = eb03ac0ec83078be593f76968f5a1f9080ea50b9
 SHA1 (patch-po_Makefile) = 468b500da41c606c6af6b65c8080d692acb69336
diff -r 156442ab4ea0 -r 61dd23d750e8 www/ikiwiki/options.mk
--- a/www/ikiwiki/options.mk    Thu Feb 13 18:57:21 2020 +0000
+++ b/www/ikiwiki/options.mk    Thu Feb 13 19:03:57 2020 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.20 2019/11/04 22:09:56 rillig Exp $
+# $NetBSD: options.mk,v 1.21 2020/02/13 19:03:57 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ikiwiki
 PKG_SUPPORTED_OPTIONS=         cgi imagemagick l10n python w3m
 PKG_SUPPORTED_OPTIONS+=                cvs git svn     # not mutually exclusive
 PKG_SUPPORTED_OPTIONS+=                ikiwiki-amazon-s3 ikiwiki-highlight ikiwiki-search
-PKG_SUGGESTED_OPTIONS=         cgi
+PKG_SUPPORTED_OPTIONS+=                ikiwiki-sudo
+PKG_SUGGESTED_OPTIONS=         cgi ikiwiki-sudo
 
 .include "../../mk/bsd.options.mk"
 
@@ -43,6 +44,12 @@
 DEPENDS+=      xapian-omega-[0-9]*:../../textproc/xapian-omega
 .endif
 
+.if !empty(PKG_OPTIONS:Mikiwiki-sudo)
+.  if !exists(/usr/bin/sudo)
+DEPENDS+=      sudo-[0-9]*:../../security/sudo
+.  endif
+.endif
+
 .if !empty(PKG_OPTIONS:Mimagemagick)
 DEPENDS+=      p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
 # suggest ghostscript (required for PDF-to-PNG thumbnailing)
diff -r 156442ab4ea0 -r 61dd23d750e8 www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm
--- a/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm     Thu Feb 13 18:57:21 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-IkiWiki_Plugin_highlight.pm,v 1.1 2019/05/27 03:53:31 schmonz Exp $
-
-Catch up to highlight 3.51 API change.
-From upstream git 4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce
-
---- IkiWiki/Plugin/highlight.pm.orig   2019-02-26 23:01:54.000000000 +0000
-+++ IkiWiki/Plugin/highlight.pm
-@@ -62,10 +62,10 @@ sub checkconfig () {
-       if (! exists $config{filetypes_conf}) {
-         if (! $data_dir ) {
-               $config{filetypes_conf}= "/etc/highlight/filetypes.conf";
--            } elsif ( $data_dir -> can('searchFile') ) {
--              # 3.18 +
-+            } elsif ( $data_dir -> can('getFiletypesConfPath') ) {
-+              # 3.14 +
-               $config{filetypes_conf}=
--                $data_dir -> searchFile("filetypes.conf");
-+                $data_dir -> getFiletypesConfPath("filetypes");
-             } else {
-               # 3.9 +
-               $config{filetypes_conf}=