Re: pkg/56602: New option group "markdown" for package source www/ikiwiki

[Владимир Ступин <vladimir%stupin.su@localhost>]

On Mon,  3 Jan 2022 14:05:02 +0000 (UTC)
Thomas Klausner <wiz%NetBSD.org@localhost> wrote:

> The following reply was made to PR pkg/56602; it has been noted by GNATS.
> 
> From: Thomas Klausner <wiz%NetBSD.org@localhost>
> To: NetBSD bugtracking <gnats-bugs%NetBSD.org@localhost>
> Cc: 
> Subject: Re: pkg/56602: New option group "markdown" for package source
>  www/ikiwiki
> Date: Mon, 3 Jan 2022 14:59:56 +0100
> 
>  On Mon, Jan 03, 2022 at 12:55:00PM +0000, vladimir%stupin.su@localhost wrote:
>  > >Synopsis:       New option group "markdown" for package source www/ikiwiki
>  
>  Thanks!
>  
>  Since these options are ikiwiki-specific, can you please prefix the
>  option names with 'ikiwiki-'?
>  
>   Thomas
>   
>  

Done, patch attached.

-- 
Владимир Ступин <vladimir%stupin.su@localhost>

diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index 4e6542a7de1..a3a4db72dda 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -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).
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 459c9d4c05c..996d0fb32d6 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -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
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index 7c31dc10424..861280266d3 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -5,7 +5,9 @@ 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