CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan  3 16:58:40 UTC 2022

Modified Files:
        pkgsrc/mk/defaults: options.description
        pkgsrc/www/ikiwiki: Makefile options.mk

Log Message:
kiwiki: add option for choosing markdown backend

>From Vladimir Stupin in PR 56602.


To generate a diff of this commit:
cvs rdiff -u -r1.667 -r1.668 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.175 -r1.176 pkgsrc/www/ikiwiki/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/ikiwiki/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.667 pkgsrc/mk/defaults/options.description:1.668
--- pkgsrc/mk/defaults/options.description:1.667        Mon Dec  6 15:32:25 2021
+++ pkgsrc/mk/defaults/options.description      Mon Jan  3 16:58:40 2022
@@ -347,7 +347,10 @@ id3                        Enable id3 tagging support.
 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).

Index: pkgsrc/www/ikiwiki/Makefile
diff -u pkgsrc/www/ikiwiki/Makefile:1.175 pkgsrc/www/ikiwiki/Makefile:1.176
--- pkgsrc/www/ikiwiki/Makefile:1.175   Tue Nov  2 09:44:48 2021
+++ pkgsrc/www/ikiwiki/Makefile Mon Jan  3 16:58:40 2022
@@ -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 @@ HOMEPAGE=             https://ikiwiki.info/
 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

Index: pkgsrc/www/ikiwiki/options.mk
diff -u pkgsrc/www/ikiwiki/options.mk:1.22 pkgsrc/www/ikiwiki/options.mk:1.23
--- pkgsrc/www/ikiwiki/options.mk:1.22  Tue Sep  1 08:04:23 2020
+++ pkgsrc/www/ikiwiki/options.mk       Mon Jan  3 16:58:40 2022
@@ -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_STAGE.w3m=     pre-configure
 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