NetBSD Problem Report #56602
From www@netbsd.org Mon Jan 3 12:53:57 2022
Return-Path: <www@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
by mollari.NetBSD.org (Postfix) with ESMTPS id E6DE71A9239
for <gnats-bugs@gnats.NetBSD.org>; Mon, 3 Jan 2022 12:53:56 +0000 (UTC)
Message-Id: <20220103125355.6C54A1A923A@mollari.NetBSD.org>
Date: Mon, 3 Jan 2022 12:53:55 +0000 (UTC)
From: vladimir@stupin.su
Reply-To: vladimir@stupin.su
To: gnats-bugs@NetBSD.org
Subject: New option group "markdown" for package source www/ikiwiki
X-Send-Pr-Version: www-1.0
>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: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Mon Jan 03 12:55:00 +0000 2022
>Closed-Date: Mon Jan 03 16:59:22 +0000 2022
>Last-Modified: Mon Jan 03 17:00:02 +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:/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
>Release-Note:
>Audit-Trail:
From: Thomas Klausner <wiz@NetBSD.org>
To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
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 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
From: =?UTF-8?B?0JLQu9Cw0LTQuNC80LjRgCDQodGC0YPQv9C40L0=?= <vladimir@stupin.su>
To: gnats-bugs@netbsd.org
Cc: Thomas Klausner <wiz@NetBSD.org>, pkg-manager@netbsd.org,
gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org
Subject: Re: pkg/56602: New option group "markdown" for package source
www/ikiwiki
Date: Mon, 3 Jan 2022 21:50:48 +0500
This is a multi-part message in MIME format.
--Multipart=_Mon__3_Jan_2022_21_50_48_+0500_nWQiqE6FfM4xiLbQ
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
On Mon, 3 Jan 2022 14:05:02 +0000 (UTC)
Thomas Klausner <wiz@NetBSD.org> wrote:
> The following reply was made to PR pkg/56602; it has been noted by GNATS.
>
> From: Thomas Klausner <wiz@NetBSD.org>
> To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
> 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 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>
--Multipart=_Mon__3_Jan_2022_21_50_48_+0500_nWQiqE6FfM4xiLbQ
Content-Type: text/x-diff;
name="www_ikiwiki_markdown.patch"
Content-Disposition: attachment;
filename="www_ikiwiki_markdown.patch"
Content-Transfer-Encoding: 7bit
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
--Multipart=_Mon__3_Jan_2022_21_50_48_+0500_nWQiqE6FfM4xiLbQ--
State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Mon, 03 Jan 2022 16:59:22 +0000
State-Changed-Why:
Committed, thanks!
From: "Thomas Klausner" <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/56602 CVS commit: pkgsrc
Date: Mon, 3 Jan 2022 16:58:40 +0000
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.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.