pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/56602: New option group "markdown" for package source www/ikiwiki
>Number: 56602
>Category: pkg
>Synopsis: New option group "markdown" for package source www/ikiwiki
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Mon Jan 03 12:55:00 +0000 2022
>Originator: Vladimir Stupin
>Release: pkgsrc trunk Thu Dec 30 17:24:35 2021 +0000
>Organization:
>Environment:
NetBSD sysbuild.vm.stupin.su 9.2_STABLE NetBSD 9.2_STABLE (MODULAR_M2) #2: Tue Nov 23 02:20:27 +05 2021 sysbuild%sysbuild.vm.stupin.su@localhost:/home/sysbuild/i386/obj/home/sysbuild/src/sys/arch/i386/compile/MODULAR_M2 i386
>Description:
I am added new optiongroup "markdown" to package source www/ikiwiki to select which module are used to rendering HTML-pages from markdown:
- "discount" for Perl-module Text::Markdown::Discount,
- "markdown" for Perl-module Text::Markdown,
- "multimarkdown" for Perl-Module Text::MultiMarkdown.
Patch attached.
>How-To-Repeat:
>Fix:
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index 4e6542a7de1..4be77343c9c 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -139,6 +139,7 @@ deliver-suid Install deliver executable setuid root.
disable-compile-inits Disable compile time implicit initialization.
disable-filter-url Disable php://filter URL feature.
disable-ld Disable building GNU ld in binutils.
+discount Use Text::Markdown::Discount to rendering HTML-pages.
djbdns-cachestats Patch to add stats for cache hits/misses.
djbdns-ignoreip2 Patch to treat certain responses as NXDOMAIN.
djbdns-listenmultiple Patches to specify more than one listening IP.
@@ -538,6 +539,7 @@ magick Use ImageMagick as the image processing backend.
maintainer-zts Enable the Zend Thread Safety option for PHP.
manual Include manual.
marble Enable marble (virtual globe) support.
+markdown Use Text::Markdown to rendering HTML-pages.
mbedtls Enable mbed TLS support.
mc-charset Enable charset selection and conversion.
mc-edit Include the built-in editor.
@@ -594,6 +596,7 @@ mplayer-win32 Enable usage of Win32 DLLs (codecs).
mrtg-snmpv3 Enable SNMPv3 support.
mstats Enable memory statistics.
mtpz Enable MTPZ support using libgcrypt.
+multimarkdown Use Text::MultMarkdown to rendering HTML-pages.
musepack Enable the portable Musepack decoder library.
musicbrainz Enable musicbrainz support.
musicpd-lastfm Enable Last.FM support in musicpd.
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..eb14ec667aa 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= discount markdown multimarkdown
+PKG_SUGGESTED_OPTIONS= cgi ikiwiki-sudo 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:Mdiscount)
+DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount
+.endif
+
+.if !empty(PKG_OPTIONS:Mmarkdown)
+DEPENDS+= p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown
+.endif
+
+.if !empty(PKG_OPTIONS:Mmultimarkdown)
+DEPENDS+= p5-Text-MultiMarkdown-[0-9]*:../../textproc/p5-Text-MultiMarkdown
+.endif
Home |
Main Index |
Thread Index |
Old Index