[.joined/pkgsrc/trunk]: .joined/pkgsrc kiwiki: add option for choosing markdo...

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

details:   https://anonhg.NetBSD.org/.joined/pkgsrc/rev/b48be9508331
branches:  trunk
changeset: 371031:b48be9508331
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jan 03 16:58:40 2022 +0000

description:
kiwiki: add option for choosing markdown backend

>From Vladimir Stupin in PR 56602.

diffstat:

 mk/defaults/options.description |   3 +++
 www/ikiwiki/Makefile            |   3 +--
 www/ikiwiki/options.mk          |  18 ++++++++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diffs (66 lines):

diff -r df37c8e96c64 -r b48be9508331 mk/defaults/options.description
--- a/mk/defaults/options.description   Mon Jan 03 14:49:09 2022 +0000
+++ b/mk/defaults/options.description   Mon Jan 03 16:58:40 2022 +0000
@@ -347,7 +347,10 @@
 idea                   Enable support for the IDEA cryptographic algorithm (possible license+patent problems).
 idn                    Internationalized Domain Names (IDN) support.
 ikiwiki-amazon-s3      Enable publishing rendered pages to Amazon S3 servers.
+ikiwiki-discount       Use Text::Markdown::Discount to rendering HTML-pages.
 ikiwiki-highlight      Enable syntax highlighting in code blocks.
+ikiwiki-markdown       Use Text::Markdown to rendering HTML-pages.
+ikiwiki-multimarkdown  Use Text::MultMarkdown to rendering HTML-pages.
 ikiwiki-search         Enable full-text search using xapian.
 ikiwiki-sudo           Enable portable ikiwiki-mass-rebuild using sudo.
 ilbc                   Enable the use of iLBC (Internet Low Bit Rate Codec).
diff -r df37c8e96c64 -r b48be9508331 www/ikiwiki/Makefile
--- a/www/ikiwiki/Makefile      Mon Jan 03 14:49:09 2022 +0000
+++ b/www/ikiwiki/Makefile      Mon Jan 03 16:58:40 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.175 2021/11/02 09:44:48 schmonz Exp $
+# $NetBSD: Makefile,v 1.176 2022/01/03 16:58:40 wiz Exp $
 
 DISTNAME=              ikiwiki_3.20200202.3.orig
 PKGNAME=               ${DISTNAME:S/_/-/:S/.orig//}
@@ -12,7 +12,6 @@
 COMMENT=               Flexible static site generator with dynamic features
 LICENSE=               gnu-gpl-v2
 
-DEPENDS+=              p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount
 DEPENDS+=              p5-URI>=1.36:../../www/p5-URI
 DEPENDS+=              p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 DEPENDS+=              p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
diff -r df37c8e96c64 -r b48be9508331 www/ikiwiki/options.mk
--- a/www/ikiwiki/options.mk    Mon Jan 03 14:49:09 2022 +0000
+++ b/www/ikiwiki/options.mk    Mon Jan 03 16:58:40 2022 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: options.mk,v 1.22 2020/09/01 08:04:23 wiz Exp $
+# $NetBSD: options.mk,v 1.23 2022/01/03 16:58:40 wiz 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_SUPPORTED_OPTIONS+=                ikiwiki-sudo
-PKG_SUGGESTED_OPTIONS=         cgi ikiwiki-sudo
+PKG_OPTIONS_REQUIRED_GROUPS=   markdown
+PKG_OPTIONS_GROUP.markdown=    ikiwiki-discount ikiwiki-markdown ikiwiki-multimarkdown
+PKG_SUGGESTED_OPTIONS=         cgi ikiwiki-sudo ikiwiki-discount
 
 .include "../../mk/bsd.options.mk"
 
@@ -94,3 +96,15 @@
 SUBST_FILES.w3m=       Makefile.PL
 SUBST_SED.w3m+=                -e 's,^\(.*install .*W3M_CGI_BIN\),\#\1,'
 .endif
+
+.if !empty(PKG_OPTIONS:Mikiwiki-discount)
+DEPENDS+=              p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount
+.endif
+
+.if !empty(PKG_OPTIONS:Mikiwiki-markdown)
+DEPENDS+=              p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown
+.endif
+
+.if !empty(PKG_OPTIONS:Mikiwiki-multimarkdown)
+DEPENDS+=              p5-Text-MultiMarkdown-[0-9]*:../../textproc/p5-Text-MultiMarkdown
+.endif