diff options
author | schmonz <schmonz@pkgsrc.org> | 2018-10-22 04:33:25 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2018-10-22 04:33:25 +0000 |
commit | aeebc1c877eca388dfb2a6f535eff26028157937 (patch) | |
tree | 6d324a8f4fb48b44d0d7fc5b29b622e3eb99cb2c /www | |
parent | 5b9fce03eaaa87afb1a9318fe8b57b8f62b86244 (diff) | |
download | pkgsrc-aeebc1c877eca388dfb2a6f535eff26028157937.tar.gz |
Add upstream patch to give graph an optional "file" param, like table's.
Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r-- | www/ikiwiki/Makefile | 4 | ||||
-rw-r--r-- | www/ikiwiki/distinfo | 4 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-IkiWiki_Plugin_graphviz.pm | 21 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-doc_ikiwiki_directive_graph.mdwn | 14 |
4 files changed, 40 insertions, 3 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 35b4fb928c9..e6dad40cd6a 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.158 2018/08/29 08:03:37 schmonz Exp $ +# $NetBSD: Makefile,v 1.159 2018/10/22 04:33:25 schmonz Exp $ # DISTNAME= ikiwiki_3.20180311.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} -PKGREVISION= 3 +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 2451931f6d1..318d700ecba 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.129 2018/08/29 08:03:37 schmonz Exp $ +$NetBSD: distinfo,v 1.130 2018/10/22 04:33:25 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 (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 new file mode 100644 index 00000000000..0f10df06d0c --- /dev/null +++ b/www/ikiwiki/patches/patch-IkiWiki_Plugin_graphviz.pm @@ -0,0 +1,21 @@ +$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-doc_ikiwiki_directive_graph.mdwn b/www/ikiwiki/patches/patch-doc_ikiwiki_directive_graph.mdwn new file mode 100644 index 00000000000..998c5e725a3 --- /dev/null +++ b/www/ikiwiki/patches/patch-doc_ikiwiki_directive_graph.mdwn @@ -0,0 +1,14 @@ +$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`, |