CVS commit: pkgsrc/textproc/serd

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Nov  5 17:16:45 UTC 2024

Modified Files:
        pkgsrc/textproc/serd: Makefile PLIST buildlink3.mk distinfo options.mk

Log Message:
serd: updated to 0.32.2

serd (0.32.2) stable; urgency=medium

* Enable clang nullability checks
* Fix writing empty list objects within blank nodes

serd (0.32.0) stable; urgency=medium

* Add Windows path separator support to serd_node_new_file_uri()
* Add long "help" and "version" options to serdi
* Add options to disable html or singlehtml documentation
* Add serd_reader_skip_until_byte() to public API
* Allow SERD_API to be defined by the user
* Avoid creating test files in the current directory
* Avoid using ASCII grave as a quote
* Check for POSIX features with the build system
* Clean up and improve test suite
* Clean up code
* Fix crash when trying to read chunks without starting
* Fix hang when skipping an error at EOF when lax parsing
* Fix incorrect parsing of strange quote escape patterns
* Fix possible hang when writing nested Turtle lists
* Fix potential memory leaks when a write is aborted
* Fix relative URI creation
* Gracefully handle bad characters in Turtle blank node syntax
* Gracefully handle bad characters in Turtle datatype syntax
* Improve TriG pretty-printing and remove trailing newlines
* Improve pretty-printing of lists and inline subjects
* Improve serdi man page
* Improve writer error handling
* Make URI writing stricter by default
* Make serd_reader_read_chunk() work with NQuads
* Override pkg-config dependency within meson
* Remove junk files from documentation install
* Remove support for writing Turtle named inline nodes extension
* Replace duplicated dox_to_sphinx script with sphinxygen dependency
* Test header for warnings more strictly
* Update standard test suites


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/serd/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/serd/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/serd/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/serd/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/serd/options.mk

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

Modified files:

Index: pkgsrc/textproc/serd/Makefile
diff -u pkgsrc/textproc/serd/Makefile:1.12 pkgsrc/textproc/serd/Makefile:1.13
--- pkgsrc/textproc/serd/Makefile:1.12  Mon Aug 14 05:25:24 2023
+++ pkgsrc/textproc/serd/Makefile       Tue Nov  5 17:16:45 2024
@@ -1,22 +1,31 @@
-# $NetBSD: Makefile,v 1.12 2023/08/14 05:25:24 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2024/11/05 17:16:45 adam Exp $
 
-DISTNAME=      serd-0.30.12
-PKGREVISION=   1
+DISTNAME=      serd-0.32.2
 CATEGORIES=    textproc
 MASTER_SITES=  https://download.drobilla.net/
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://drobilla.net/software/serd/
+HOMEPAGE=      https://drobilla.net/software/serd.html
 COMMENT=       Lightweight C library for RDF syntax
 LICENSE=       isc
 
-USE_LANGUAGES= c99
-USE_TOOLS+=    gsed pkg-config
+USE_CC_FEATURES=       c99
+USE_LANGUAGES=         c
+USE_TOOLS+=            gsed pkg-config
 
-PYTHON_FOR_BUILD_ONLY= tool
-PKGCONFIG_OVERRIDE+=   serd.pc.in
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           output/meson-private/serd-0.pc
+
+SUBST_CLASSES+=                sphinx
+SUBST_STAGE.sphinx=    pre-configure
+SUBST_FILES.sphinx=    doc/meson.build
+SUBST_MESSAGE.sphinx=  Fixing Python binary names.
+SUBST_SED.sphinx+=     -e "s,'sphinx-build','sphinx-build-${PYVERSSUFFIX}',"
+SUBST_SED.sphinx+=     -e "s,'sphinxygen','sphinxygen-${PYVERSSUFFIX}',"
 
 .include "options.mk"
-.include "../../devel/waf/waf.mk"
+
+.include "../../devel/meson/build.mk"
+.include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/serd/PLIST
diff -u pkgsrc/textproc/serd/PLIST:1.1 pkgsrc/textproc/serd/PLIST:1.2
--- pkgsrc/textproc/serd/PLIST:1.1      Sun Apr 19 23:10:52 2015
+++ pkgsrc/textproc/serd/PLIST  Tue Nov  5 17:16:45 2024
@@ -1,11 +1,30 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/19 23:10:52 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/11/05 17:16:45 adam Exp $
 bin/serdi
 include/serd-0/serd/serd.h
 lib/libserd-0.so
-lib/libserd-0.so.0
 lib/libserd-0.so.${PKGVERSION}
+lib/libserd-0.so.0
 lib/pkgconfig/serd-0.pc
-man/man1/serdi.1
-${PLIST.doc}man/man3/serd.3
+${PLIST.doc}man/man1/serdi.1
+${PLIST.doc}share/doc/serd-0/html/_static/pygments.css
+${PLIST.doc}share/doc/serd-0/html/_static/serd.svg
+${PLIST.doc}share/doc/serd-0/html/_static/sphinx_lv2_theme.css
+${PLIST.doc}share/doc/serd-0/html/api/serd.html
+${PLIST.doc}share/doc/serd-0/html/api/serd_env.html
+${PLIST.doc}share/doc/serd-0/html/api/serd_event.html
+${PLIST.doc}share/doc/serd-0/html/api/serd_node.html
+${PLIST.doc}share/doc/serd-0/html/api/serd_reader.html
+${PLIST.doc}share/doc/serd-0/html/api/serd_status.html
+${PLIST.doc}share/doc/serd-0/html/api/serd_streams.html
+${PLIST.doc}share/doc/serd-0/html/api/serd_string.html
+${PLIST.doc}share/doc/serd-0/html/api/serd_uri.html
+${PLIST.doc}share/doc/serd-0/html/api/serd_writer.html
+${PLIST.doc}share/doc/serd-0/html/genindex.html
 ${PLIST.doc}share/doc/serd-0/html/index.html
-${PLIST.doc}share/doc/serd-0/html/style.css
+${PLIST.doc}share/doc/serd-0/html/overview.html
+${PLIST.doc}share/doc/serd-0/man/mandoc.css
+${PLIST.doc}share/doc/serd-0/man/serdi.html
+${PLIST.doc}share/doc/serd-0/singlehtml/_static/pygments.css
+${PLIST.doc}share/doc/serd-0/singlehtml/_static/serd.svg
+${PLIST.doc}share/doc/serd-0/singlehtml/_static/sphinx_lv2_theme.css
+${PLIST.doc}share/doc/serd-0/singlehtml/index.html

Index: pkgsrc/textproc/serd/buildlink3.mk
diff -u pkgsrc/textproc/serd/buildlink3.mk:1.2 pkgsrc/textproc/serd/buildlink3.mk:1.3
--- pkgsrc/textproc/serd/buildlink3.mk:1.2      Mon Aug 14 05:25:24 2023
+++ pkgsrc/textproc/serd/buildlink3.mk  Tue Nov  5 17:16:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2023/08/14 05:25:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2024/11/05 17:16:45 adam Exp $
 
 BUILDLINK_TREE+=       serd
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        serd
 SERD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.serd+=   serd>=0.20.0
-BUILDLINK_ABI_DEPENDS.serd?=   serd>=0.30.12nb1
+BUILDLINK_ABI_DEPENDS.serd+=   serd>=0.30.12nb1
 BUILDLINK_PKGSRCDIR.serd?=     ../../textproc/serd
 .endif # SERD_BUILDLINK3_MK
 

Index: pkgsrc/textproc/serd/distinfo
diff -u pkgsrc/textproc/serd/distinfo:1.11 pkgsrc/textproc/serd/distinfo:1.12
--- pkgsrc/textproc/serd/distinfo:1.11  Sat Jun 11 12:08:21 2022
+++ pkgsrc/textproc/serd/distinfo       Tue Nov  5 17:16:45 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/06/11 12:08:21 nia Exp $
+$NetBSD: distinfo,v 1.12 2024/11/05 17:16:45 adam Exp $
 
-BLAKE2s (serd-0.30.12.tar.bz2) = 1e6cdd20b4b976585a2495e61df761755c6018aa4695a3019f12454583644767
-SHA512 (serd-0.30.12.tar.bz2) = c330648eb2c947a6d220f42d0af63fd2744da496301483e58be3cda387da166711d6acd5cee2df8cbb837ab450e1802b3f9a0a2973e5ad6d976b69b863aecb7f
-Size (serd-0.30.12.tar.bz2) = 594475 bytes
+BLAKE2s (serd-0.32.2.tar.xz) = c71c13587830a04aa7891d0599edb031500e775fcbe1dc67a55c7efccf43d42c
+SHA512 (serd-0.32.2.tar.xz) = 052f0765a9af6883a7ef1a31bd90eea3c57d93747dfb989eeda8c4dabbf2ae7d2e868d437aa2a510243f3a535e366739fe266cf82ef0d280472868c87055d50a
+Size (serd-0.32.2.tar.xz) = 168840 bytes

Index: pkgsrc/textproc/serd/options.mk
diff -u pkgsrc/textproc/serd/options.mk:1.3 pkgsrc/textproc/serd/options.mk:1.4
--- pkgsrc/textproc/serd/options.mk:1.3 Tue Jun  6 12:42:34 2023
+++ pkgsrc/textproc/serd/options.mk     Tue Nov  5 17:16:45 2024
@@ -1,27 +1,25 @@
-# $NetBSD: options.mk,v 1.3 2023/06/06 12:42:34 riastradh Exp $
+# $NetBSD: options.mk,v 1.4 2024/11/05 17:16:45 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.serd
-PKG_SUPPORTED_OPTIONS= debug doc tests valgrind
-PKG_SUGGESTED_OPTIONS+=        # blank
-PLIST_VARS+=           doc
+PKG_SUPPORTED_OPTIONS= doc tests
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mdebug)
-WAF_ARGS+=             --debug
-.endif
+PLIST_VARS+=   doc
 
 .if !empty(PKG_OPTIONS:Mdoc)
-WAF_ARGS+=             --docs
-TOOL_DEPENDS+=         doxygen-[0-9]*:../../devel/doxygen
-PLIST.doc=             yes
+MESON_ARGS+=   -Ddocs=enabled
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>0:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-lv2-theme>0:../../textproc/py-sphinx-lv2-theme
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinxygen>0:../../textproc/py-sphinxygen
+PLIST.doc=     yes
+.else
+MESON_ARGS+=   -Ddocs=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)
-WAF_ARGS+=             --test
-.endif
-
-.if !empty(PKG_OPTIONS:Mvalgrind)
-WAF_ARGS+=             --grind
-TOOL_DEPENDS+=         valgrind-[0-9]*:../../devel/valgrind
+MESON_ARGS+=   -Dtests=enabled
+.else
+MESON_ARGS+=   -Dtests=disabled
 .endif