CVS commit: pkgsrc/textproc/p5-Text-Markdown-Discount

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/p5-Text-Markdown-Discount
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Tue, 28 Jan 2025 00:47:04 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jan 28 00:47:04 UTC 2025

Modified Files:
        pkgsrc/textproc/p5-Text-Markdown-Discount: Makefile distinfo
        pkgsrc/textproc/p5-Text-Markdown-Discount/patches: patch-MANIFEST
Added Files:
        pkgsrc/textproc/p5-Text-Markdown-Discount/patches:
            patch-builder_MyBuilder.pm patch-lib_Text_Markdown_Discount.xs
Removed Files:
        pkgsrc/textproc/p5-Text-Markdown-Discount/patches: patch-Discount.xs
            patch-Makefile.PL

Log Message:
p5-Text-Markdown-Discount: update to 0.18. Changes:

- maintenance release (just update toolchains)


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Discount.xs
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST
cvs rdiff -u -r1.8 -r0 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-Makefile.PL
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-builder_MyBuilder.pm \
    pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-lib_Text_Markdown_Discount.xs

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

Modified files:

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile
diff -u pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile:1.30 pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile:1.31
--- pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile:1.30     Tue Dec 31 14:31:09 2024
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/Makefile  Tue Jan 28 00:47:03 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2024/12/31 14:31:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.31 2025/01/28 00:47:03 schmonz Exp $
 
-DISTNAME=              Text-Markdown-Discount-0.17
+DISTNAME=              Text-Markdown-Discount-0.18
 PKGNAME=               p5-${DISTNAME}
 CATEGORIES=            textproc perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Text/}
@@ -12,8 +12,10 @@ LICENSE=             ${PERL5_LICENSE}
 
 PERL5_PACKLIST=                auto/Text/Markdown/Discount/.packlist
 
+PERL5_MODULE_TYPE=     Module::Build
+
 SUBST_CLASSES+=                paths
-SUBST_FILES.paths=     Makefile.PL
+SUBST_FILES.paths=     builder/MyBuilder.pm
 SUBST_VARS.paths=      PREFIX
 SUBST_STAGE.paths=     pre-configure
 

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo
diff -u pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo:1.18 pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo:1.19
--- pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo:1.18     Tue Dec 31 14:31:09 2024
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/distinfo  Tue Jan 28 00:47:03 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2024/12/31 14:31:09 schmonz Exp $
+$NetBSD: distinfo,v 1.19 2025/01/28 00:47:03 schmonz Exp $
 
-BLAKE2s (Text-Markdown-Discount-0.17.tar.gz) = e3447eaf85fd224bf311c4d285306f990dd0e33460bef862bf61f4937373758a
-SHA512 (Text-Markdown-Discount-0.17.tar.gz) = 7b2c7b70cd721786b6234b69107c9c03360d36c14656b304d6c70592050940ded08730d2681cf27335d4028d4b681bd7da5c1463fa5194500a4446dd47d28ad7
-Size (Text-Markdown-Discount-0.17.tar.gz) = 210367 bytes
-SHA1 (patch-Discount.xs) = 6851538b8c894a9069eb70994a6c32b533510601
-SHA1 (patch-MANIFEST) = 941bfa770eb9815950b1c573af9aa3fb0088a084
-SHA1 (patch-Makefile.PL) = d83e9f1b02acf288154ba6e2d20d593afec758b2
+BLAKE2s (Text-Markdown-Discount-0.18.tar.gz) = b8cde170a00ab1721120b34f02eb55e3c04b359bfb299b5267e669e546d5b51d
+SHA512 (Text-Markdown-Discount-0.18.tar.gz) = 3af7113676b897d9f0b1fdd35906e4f622797fdb0b942975678a0072f8e780bd630a903151acdc33899a34272c3d83106d85603a2a26096acc05c74e65ff7e71
+Size (Text-Markdown-Discount-0.18.tar.gz) = 269175 bytes
+SHA1 (patch-MANIFEST) = a458ba174a0c673280295d01acf6883a8443cd4b
+SHA1 (patch-builder_MyBuilder.pm) = 941e78a43fb409da9f9740f685d8bce7886e6106
+SHA1 (patch-lib_Text_Markdown_Discount.xs) = 6e75b2ec3de2ffb661d826e554772efdc89165ef
 SHA1 (patch-t_12.utf8.t) = cea58d7c8a4e50d97cf031b2e7913314fe46b056

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST
diff -u pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST:1.4 pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST:1.5
--- pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST:1.4        Tue Dec 31 14:31:09 2024
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-MANIFEST    Tue Jan 28 00:47:04 2025
@@ -1,11 +1,25 @@
-$NetBSD: patch-MANIFEST,v 1.4 2024/12/31 14:31:09 schmonz Exp $
+$NetBSD: patch-MANIFEST,v 1.5 2025/01/28 00:47:04 schmonz Exp $
 
 Remove local copy of libdiscount.
 
---- MANIFEST.orig      2024-12-31 06:37:59.000000000 +0000
+--- MANIFEST.orig      2025-01-27 23:05:20.727777716 +0000
 +++ MANIFEST
-@@ -1,129 +1,4 @@
- Changes
+@@ -6,80 +6,6 @@ META.json
+ README.md
+ builder/MyBuilder.pm
+ cpanfile
+-discount-2.2.7d/COPYRIGHT
+-discount-2.2.7d/CREDITS
+-discount-2.2.7d/Csio.c
+-discount-2.2.7d/INSTALL
+-discount-2.2.7d/Makefile.in
+-discount-2.2.7d/Plan9/README.md
+-discount-2.2.7d/Plan9/markdown.1
+-discount-2.2.7d/Plan9/markdown.2
+-discount-2.2.7d/Plan9/markdown.6
+-discount-2.2.7d/Plan9/mkfile
+-discount-2.2.7d/README
+-discount-2.2.7d/VERSION
 -discount-2.2.7d/amalloc.c
 -discount-2.2.7d/amalloc.h
 -discount-2.2.7d/basename.c
@@ -14,9 +28,6 @@ Remove local copy of libdiscount.
 -discount-2.2.7d/cmake/discount-config.cmake.in
 -discount-2.2.7d/configure.inc
 -discount-2.2.7d/configure.sh
--discount-2.2.7d/COPYRIGHT
--discount-2.2.7d/CREDITS
--discount-2.2.7d/Csio.c
 -discount-2.2.7d/css.c
 -discount-2.2.7d/cstring.h
 -discount-2.2.7d/docheader.c
@@ -30,10 +41,8 @@ Remove local copy of libdiscount.
 -discount-2.2.7d/github_flavoured.c
 -discount-2.2.7d/h1title.c
 -discount-2.2.7d/html5.c
--discount-2.2.7d/INSTALL
 -discount-2.2.7d/libmarkdown.pc.in
 -discount-2.2.7d/main.c
--discount-2.2.7d/Makefile.in
 -discount-2.2.7d/makepage.1
 -discount-2.2.7d/makepage.c
 -discount-2.2.7d/markdown.1
@@ -50,87 +59,36 @@ Remove local copy of libdiscount.
 -discount-2.2.7d/mkdio.c
 -discount-2.2.7d/mkdio.h.in
 -discount-2.2.7d/mktags.c
--discount-2.2.7d/msvc/config.h.vc
 -discount-2.2.7d/msvc/Makefile
 -discount-2.2.7d/msvc/README.md
+-discount-2.2.7d/msvc/config.h.vc
 -discount-2.2.7d/notspecial.c
 -discount-2.2.7d/pgm_options.c
 -discount-2.2.7d/pgm_options.h
--discount-2.2.7d/Plan9/markdown.1
--discount-2.2.7d/Plan9/markdown.2
--discount-2.2.7d/Plan9/markdown.6
--discount-2.2.7d/Plan9/mkfile
--discount-2.2.7d/Plan9/README.md
--discount-2.2.7d/README
 -discount-2.2.7d/resource.c
 -discount-2.2.7d/setup.c
 -discount-2.2.7d/tags.c
 -discount-2.2.7d/tags.h
--discount-2.2.7d/tests/autolink.t
--discount-2.2.7d/tests/automatic.t
--discount-2.2.7d/tests/backslash.t
--discount-2.2.7d/tests/callbacks.t
--discount-2.2.7d/tests/chrome.text
--discount-2.2.7d/tests/code.t
--discount-2.2.7d/tests/codeblock.t
--discount-2.2.7d/tests/compat.t
--discount-2.2.7d/tests/crash.t
--discount-2.2.7d/tests/data/f01.html
--discount-2.2.7d/tests/data/f01.text
--discount-2.2.7d/tests/data/README
--discount-2.2.7d/tests/defects.t
--discount-2.2.7d/tests/div.t
--discount-2.2.7d/tests/dl.t
--discount-2.2.7d/tests/embedlinks.text
--discount-2.2.7d/tests/emphasis.t
--discount-2.2.7d/tests/extrafootnotes.t
--discount-2.2.7d/tests/flow.t
--discount-2.2.7d/tests/footnotes.t
--discount-2.2.7d/tests/functions.sh
--discount-2.2.7d/tests/githubtags.t
--discount-2.2.7d/tests/header.t
--discount-2.2.7d/tests/html.t
--discount-2.2.7d/tests/html5.t
--discount-2.2.7d/tests/html_comment.t
--discount-2.2.7d/tests/latex.t
--discount-2.2.7d/tests/links.text
--discount-2.2.7d/tests/linkylinky.t
--discount-2.2.7d/tests/linkypix.t
--discount-2.2.7d/tests/list.t
--discount-2.2.7d/tests/list3deep.t
--discount-2.2.7d/tests/misc.t
--discount-2.2.7d/tests/muñoz.t
--discount-2.2.7d/tests/pandoc.t
--discount-2.2.7d/tests/para.t
--discount-2.2.7d/tests/peculiarities.t
--discount-2.2.7d/tests/pseudo.t
--discount-2.2.7d/tests/reddit.t
--discount-2.2.7d/tests/reparse.t
--discount-2.2.7d/tests/safelinks.t
--discount-2.2.7d/tests/schiraldi.t
--discount-2.2.7d/tests/smarty.t
--discount-2.2.7d/tests/snakepit.t
--discount-2.2.7d/tests/strikethrough.t
--discount-2.2.7d/tests/style.t
--discount-2.2.7d/tests/superscript.t
--discount-2.2.7d/tests/syntax.text
--discount-2.2.7d/tests/tables.t
--discount-2.2.7d/tests/tabstop.t
--discount-2.2.7d/tests/toc.t
--discount-2.2.7d/tests/xml.t
+-discount-2.2.7d/test.md
 -discount-2.2.7d/theme.1
 -discount-2.2.7d/theme.c
 -discount-2.2.7d/toc.c
+-discount-2.2.7d/tools/README
 -discount-2.2.7d/tools/branch.c
 -discount-2.2.7d/tools/checkbits.sh
 -discount-2.2.7d/tools/cols.c
 -discount-2.2.7d/tools/echo.c
 -discount-2.2.7d/tools/pandoc_headers.c
--discount-2.2.7d/tools/README
--discount-2.2.7d/VERSION
 -discount-2.2.7d/version.c.in
 -discount-2.2.7d/xml.c
 -discount-2.2.7d/xmlpage.c
- Discount.xs
- INSTALL.Discount
  lib/Text/Markdown/Discount.pm
+ lib/Text/Markdown/Discount.xs
+ lib/Text/Markdown/ppport.h
+@@ -140,4 +66,4 @@ xt/MarkdownXS.pl
+ xt/index.text
+ xt/test.pl
+ META.yml
+-MANIFEST
+\ No newline at end of file
++MANIFEST

Added files:

Index: pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-builder_MyBuilder.pm
diff -u /dev/null pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-builder_MyBuilder.pm:1.1
--- /dev/null   Tue Jan 28 00:47:04 2025
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-builder_MyBuilder.pm        Tue Jan 28 00:47:04 2025
@@ -0,0 +1,48 @@
+$NetBSD: patch-builder_MyBuilder.pm,v 1.1 2025/01/28 00:47:04 schmonz Exp $
+
+Remove build instructions for the local copy of libdiscount.
+
+--- builder/MyBuilder.pm.orig  2025-01-26 05:05:59.000000000 +0000
++++ builder/MyBuilder.pm
+@@ -4,40 +4,20 @@ use warnings;
+ 
+ use base "Module::Build";
+ 
+-my $DISCOUNT_VERSION = "2.2.7d";
+-
+ sub new {
+     my ($class, %argv) = @_;
+ 
+     $class->SUPER::new(
+         %argv,
+         needs_compiler => 1,
+-        include_dirs => ["discount-$DISCOUNT_VERSION"],
++        extra_linker_flags => ['-L@PREFIX@/lib', '-lmarkdown'],
+     );
+ }
+ 
+-sub _build_discount {
+-    my $self = shift;
+-
+-    chdir "discount-$DISCOUNT_VERSION";
+-    my $ok = do {
+-        local $ENV{CC} = $self->config("cc") . " -fPIC";
+-        $self->do_system("sh", "configure.sh");
+-    };
+-    $ok &&= $self->do_system($self->config("make"), "libmarkdown");
+-    chdir "..";
+-    $ok;
+-}
+-
+ sub ACTION_code {
+     my ($self, @argv) = @_;
+ 
+     my $spec = $self->_infer_xs_spec(File::Spec->catfile("lib", "Text", "Markdown", "Discount.xs"));
+-    my $archive = File::Spec->catfile("discount-$DISCOUNT_VERSION", "libmarkdown.a");
+-    if (!$self->up_to_date($archive, $spec->{lib_file})) {
+-        $self->_build_discount or die;
+-        push @{$self->{properties}{objects}}, $archive;
+-    }
+     $self->SUPER::ACTION_code(@argv);
+ }
+ 
Index: pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-lib_Text_Markdown_Discount.xs
diff -u /dev/null pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-lib_Text_Markdown_Discount.xs:1.1
--- /dev/null   Tue Jan 28 00:47:04 2025
+++ pkgsrc/textproc/p5-Text-Markdown-Discount/patches/patch-lib_Text_Markdown_Discount.xs       Tue Jan 28 00:47:04 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_Text_Markdown_Discount.xs,v 1.1 2025/01/28 00:47:04 schmonz Exp $
+
+Don't expect to find this in /usr/include or equivalent.
+
+--- lib/Text/Markdown/Discount.xs.orig 2025-01-27 22:57:34.104267097 +0000
++++ lib/Text/Markdown/Discount.xs
+@@ -5,7 +5,7 @@
+ #include "ppport.h"
+ 
+ #include <string.h>
+-#include <mkdio.h>
++#include "mkdio.h"
+ 
+ MODULE = Text::Markdown::Discount             PACKAGE = Text::Markdown::Discount      PREFIX = TextMarkdown_
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index