CVS commit: pkgsrc/textproc/ada-markdown-25

["Dmytro Kazankov" <dkazankov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Fri Oct  3 13:40:04 UTC 2025

Modified Files:
        pkgsrc/textproc/ada-markdown-25: Makefile distinfo
        pkgsrc/textproc/ada-markdown-25/patches: patch-Makefile
Added Files:
        pkgsrc/textproc/ada-markdown-25/patches:
            patch-commonmark-spec_test_normalize.py

Log Message:
ada-markdown-25: add test support


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/ada-markdown-25/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ada-markdown-25/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/ada-markdown-25/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/ada-markdown-25/patches/patch-commonmark-spec_test_normalize.py

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

Modified files:

Index: pkgsrc/textproc/ada-markdown-25/Makefile
diff -u pkgsrc/textproc/ada-markdown-25/Makefile:1.3 pkgsrc/textproc/ada-markdown-25/Makefile:1.4
--- pkgsrc/textproc/ada-markdown-25/Makefile:1.3        Tue Sep  9 07:25:11 2025
+++ pkgsrc/textproc/ada-markdown-25/Makefile    Fri Oct  3 13:40:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2025/09/09 07:25:11 dkazankov Exp $
+# $NetBSD: Makefile,v 1.4 2025/10/03 13:40:03 dkazankov Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=       ${GITHUB_PROJECT}-${GNAT_NAME}-25.0.0
@@ -36,6 +36,14 @@ MAKE_FLAGS+=                 ALL_LIBRARY_TYPES=static
 
 MAKE_FLAGS+=                   PREFIX=${GNAT_PREFIX} BUILD_MODE=prod
 
+GITHUB_SUBMODULES+=    commonmark      commonmark-spec a0a91dd commonmark-spec
+
+.if ${PKGSRC_RUN_TEST:tl} == "yes"
+.include "../../lang/python/tool.mk"
+.endif
+
+TEST_TARGET=   check
+
 GENERATE_PLIST+= \
        cd ${DESTDIR}${PREFIX} && \
        ${FIND} ${GNAT_PKGBASE} \( -type f -or -type l \) -print | ${SORT};

Index: pkgsrc/textproc/ada-markdown-25/distinfo
diff -u pkgsrc/textproc/ada-markdown-25/distinfo:1.1 pkgsrc/textproc/ada-markdown-25/distinfo:1.2
--- pkgsrc/textproc/ada-markdown-25/distinfo:1.1        Sun Sep  7 07:42:08 2025
+++ pkgsrc/textproc/ada-markdown-25/distinfo    Fri Oct  3 13:40:03 2025
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.1 2025/09/07 07:42:08 dkazankov Exp $
+$NetBSD: distinfo,v 1.2 2025/10/03 13:40:03 dkazankov Exp $
 
+BLAKE2s (commonmark-commonmark-spec-a0a91dd.tar.gz) = 123864aa46f60917b60cfc18925060ef32bbc383cb1b7f3178034b085147b6f4
+SHA512 (commonmark-commonmark-spec-a0a91dd.tar.gz) = 879d75f3cf6da3a8466e5a3f74b2e64e5cf93715dd81af532e09d1cdebd4c5273eaf3d65d065a96238c8073d63b19ec1dd05f356c21b48248f43f44fbc087687
+Size (commonmark-commonmark-spec-a0a91dd.tar.gz) = 75536 bytes
 BLAKE2s (markdown-25.0.0.tar.gz) = e66bcdd5fe88dfc6f4f45a8c3e404dda0d701683cd0e6eea99d741670fa13ed1
 SHA512 (markdown-25.0.0.tar.gz) = 1818110a0539b91d407b1bba6ca2d9f18e0d5fe71be97dc9cd1000331e579a5f06349f4f1b11f09341e507dbff9e47cafb31df2d5816e33c1c84baa9e4b01009
 Size (markdown-25.0.0.tar.gz) = 48445 bytes
-SHA1 (patch-Makefile) = 47588d3bd18c7afdc6f061391106fb7a1e26f93b
+SHA1 (patch-Makefile) = be2f7de12e629de10427daad6db7d0973c0a4850
+SHA1 (patch-commonmark-spec_test_normalize.py) = fec7d381a1370a161ee3d4a8521e08d023a620fc

Index: pkgsrc/textproc/ada-markdown-25/patches/patch-Makefile
diff -u pkgsrc/textproc/ada-markdown-25/patches/patch-Makefile:1.1 pkgsrc/textproc/ada-markdown-25/patches/patch-Makefile:1.2
--- pkgsrc/textproc/ada-markdown-25/patches/patch-Makefile:1.1  Sun Sep  7 07:42:08 2025
+++ pkgsrc/textproc/ada-markdown-25/patches/patch-Makefile      Fri Oct  3 13:40:04 2025
@@ -1,9 +1,10 @@
-$NetBSD: patch-Makefile,v 1.1 2025/09/07 07:42:08 dkazankov Exp $
+$NetBSD: patch-Makefile,v 1.2 2025/10/03 13:40:04 dkazankov Exp $
 
 Make BUILD_MODE externally settable
 Add ALL_LIBRARY_TYPES to build several libraries
 Add options for gprbuild and gprinstall
 Fix GPRINSTALL parameters
+Remove test specs download
 
 --- Makefile.orig      2024-05-04 22:43:19.000000000 +0300
 +++ Makefile
@@ -17,7 +18,7 @@ Fix GPRINSTALL parameters
  
  GPRBUILD_FLAGS = -p -j0 -XBUILD_MODE=$(BUILD_MODE)
  PREFIX                 ?= /usr
-@@ -26,10 +27,24 @@
+@@ -26,17 +27,31 @@
  .PHONY: spellcheck check
  
  all:
@@ -43,4 +44,13 @@ Fix GPRINSTALL parameters
 +      done;
  
  build_tests: all
-       gprbuild $(GPRBUILD_FLAGS) -aP gnat -P gnat/tests/commonmark_tests.gpr
+-      gprbuild $(GPRBUILD_FLAGS) -aP gnat -P gnat/tests/commonmark_tests.gpr
++      gprbuild $(GPRBUILD_FLAGS) -aP gnat -P gnat/tests/commonmark_tests.gpr $(GPRBUILD_OPTIONS)
+ 
+ check: build_tests check_markdown
+ 
+-check_markdown: commonmark-spec
++check_markdown:
+       cd commonmark-spec; python3 test/spec_tests.py --program ../.objs/static/tests/commonmark_tests |\
+         grep -E "^Example|^[0-9]+.passed" |\
+         tee markdown_tests_result | tail

Added files:

Index: pkgsrc/textproc/ada-markdown-25/patches/patch-commonmark-spec_test_normalize.py
diff -u /dev/null pkgsrc/textproc/ada-markdown-25/patches/patch-commonmark-spec_test_normalize.py:1.1
--- /dev/null   Fri Oct  3 13:40:04 2025
+++ pkgsrc/textproc/ada-markdown-25/patches/patch-commonmark-spec_test_normalize.py     Fri Oct  3 13:40:04 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-commonmark-spec_test_normalize.py,v 1.1 2025/10/03 13:40:04 dkazankov Exp $
+
+Fix syntax warnings
+
+--- commonmark-spec/test/normalize.py.orig     2025-09-16 23:53:08.000000000 +0300
++++ commonmark-spec/test/normalize.py
+@@ -18,7 +18,7 @@
+ # Normalization code, adapted from
+ # https://github.com/karlcow/markdown-testsuite/
+ significant_attrs = ["alt", "href", "src", "title"]
+-whitespace_re = re.compile('\s+')
++whitespace_re = re.compile(r'\s+')
+ class MyHTMLParser(HTMLParser):
+     def __init__(self):
+         HTMLParser.__init__(self)
+@@ -176,7 +176,7 @@
+         '\u2200&><"'
+ 
+     """
+-    html_chunk_re = re.compile("(\<!\[CDATA\[.*?\]\]\>|\<[^>]*\>|[^<]+)")
++    html_chunk_re = re.compile(r'(\<!\[CDATA\[.*?\]\]\>|\<[^>]*\>|[^<]+)')
+     try:
+         parser = MyHTMLParser()
+         # We work around HTMLParser's limitations parsing CDATA