CVS commit: pkgsrc/textproc/sord

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Nov  5 17:20:04 UTC 2024

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

Log Message:
sord: updated to 0.16.16

sord (0.16.16) stable; urgency=medium

* Allow SORD_API to be defined by the user
* Fix command line help interface of sord_validate
* Fix dependencies in pkg-config file
* Override pkg-config dependency within meson
* Port sord_validate to pcre2
* Switch to external zix dependency

sord (0.16.14) stable; urgency=medium

* Adopt REUSE machine-readable licensing standard
* Allow programs to be used from subproject
* Fix accidentally exposed internal zix symbols

sord (0.16.12) stable; urgency=medium

* Fix various warnings
* Switch to meson build system


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/sord/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/sord/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/sord/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/sord/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/sord/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/sord/Makefile
diff -u pkgsrc/textproc/sord/Makefile:1.10 pkgsrc/textproc/sord/Makefile:1.11
--- pkgsrc/textproc/sord/Makefile:1.10  Mon Aug 14 05:25:25 2023
+++ pkgsrc/textproc/sord/Makefile       Tue Nov  5 17:20:04 2024
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2023/08/14 05:25:25 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2024/11/05 17:20:04 adam Exp $
 
-DISTNAME=      sord-0.16.10
-PKGREVISION=   1
+DISTNAME=      sord-0.16.16
 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/sord/
@@ -14,13 +13,14 @@ LICENSE=    isc
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gsed pkg-config
 
-PYTHON_FOR_BUILD_ONLY= tool
-PKGCONFIG_OVERRIDE+=   sord.pc.in
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           output/meson-private/sord-0.pc
 
 .include "options.mk"
-.include "../../devel/waf/waf.mk"
-.include "../../devel/pcre/buildlink3.mk"
+
+.include "../../devel/meson/build.mk"
+.include "../../devel/pcre2/buildlink3.mk"
+.include "../../devel/zix/buildlink3.mk"
 BUILDLINK_API_DEPENDS.serd+=   serd>=0.30.0
 .include "../../textproc/serd/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/sord/PLIST
diff -u pkgsrc/textproc/sord/PLIST:1.1 pkgsrc/textproc/sord/PLIST:1.2
--- pkgsrc/textproc/sord/PLIST:1.1      Sun Apr 19 23:23:10 2015
+++ pkgsrc/textproc/sord/PLIST  Tue Nov  5 17:20:04 2024
@@ -1,14 +1,55 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/19 23:23:10 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/11/05 17:20:04 adam Exp $
 bin/sord_validate
 bin/sordi
 include/sord-0/sord/sord.h
 include/sord-0/sord/sordmm.hpp
 lib/libsord-0.so
-lib/libsord-0.so.0
 lib/libsord-0.so.${PKGVERSION}
+lib/libsord-0.so.0
 lib/pkgconfig/sord-0.pc
-man/man1/sord_validate.1
-man/man1/sordi.1
-${PLIST.doc}man/man3/sord.3
+${PLIST.doc}man/man1/sord_validate.1
+${PLIST.doc}man/man1/sordi.1
+${PLIST.doc}share/doc/sord-0/html/bc_s.png
+${PLIST.doc}share/doc/sord-0/html/bc_sd.png
+${PLIST.doc}share/doc/sord-0/html/clipboard.js
+${PLIST.doc}share/doc/sord-0/html/closed.png
+${PLIST.doc}share/doc/sord-0/html/dir_9a371e47b713cbf140a6beeab466575d.html
+${PLIST.doc}share/doc/sord-0/html/dir_d436eb0fd9de10b54a828ce6435f7e81.html
+${PLIST.doc}share/doc/sord-0/html/doc.svg
+${PLIST.doc}share/doc/sord-0/html/docd.svg
+${PLIST.doc}share/doc/sord-0/html/doxygen.svg
+${PLIST.doc}share/doc/sord-0/html/doxygen_crawl.html
+${PLIST.doc}share/doc/sord-0/html/dynsections.js
+${PLIST.doc}share/doc/sord-0/html/folderclosed.svg
+${PLIST.doc}share/doc/sord-0/html/folderclosedd.svg
+${PLIST.doc}share/doc/sord-0/html/folderopen.svg
+${PLIST.doc}share/doc/sord-0/html/folderopend.svg
+${PLIST.doc}share/doc/sord-0/html/group__sord.html
 ${PLIST.doc}share/doc/sord-0/html/index.html
+${PLIST.doc}share/doc/sord-0/html/jquery.js
+${PLIST.doc}share/doc/sord-0/html/minus.svg
+${PLIST.doc}share/doc/sord-0/html/minusd.svg
+${PLIST.doc}share/doc/sord-0/html/nav_f.png
+${PLIST.doc}share/doc/sord-0/html/nav_fd.png
+${PLIST.doc}share/doc/sord-0/html/nav_g.png
+${PLIST.doc}share/doc/sord-0/html/nav_h.png
+${PLIST.doc}share/doc/sord-0/html/nav_hd.png
+${PLIST.doc}share/doc/sord-0/html/navtree.css
+${PLIST.doc}share/doc/sord-0/html/open.png
+${PLIST.doc}share/doc/sord-0/html/plus.svg
+${PLIST.doc}share/doc/sord-0/html/plusd.svg
+${PLIST.doc}share/doc/sord-0/html/resize.js
+${PLIST.doc}share/doc/sord-0/html/splitbar.png
+${PLIST.doc}share/doc/sord-0/html/splitbard.png
 ${PLIST.doc}share/doc/sord-0/html/style.css
+${PLIST.doc}share/doc/sord-0/html/sync_off.png
+${PLIST.doc}share/doc/sord-0/html/sync_on.png
+${PLIST.doc}share/doc/sord-0/html/tab_a.png
+${PLIST.doc}share/doc/sord-0/html/tab_ad.png
+${PLIST.doc}share/doc/sord-0/html/tab_b.png
+${PLIST.doc}share/doc/sord-0/html/tab_bd.png
+${PLIST.doc}share/doc/sord-0/html/tab_h.png
+${PLIST.doc}share/doc/sord-0/html/tab_hd.png
+${PLIST.doc}share/doc/sord-0/html/tab_s.png
+${PLIST.doc}share/doc/sord-0/html/tab_sd.png
+${PLIST.doc}share/doc/sord-0/html/tabs.css

Index: pkgsrc/textproc/sord/buildlink3.mk
diff -u pkgsrc/textproc/sord/buildlink3.mk:1.2 pkgsrc/textproc/sord/buildlink3.mk:1.3
--- pkgsrc/textproc/sord/buildlink3.mk:1.2      Mon Aug 14 05:25:25 2023
+++ pkgsrc/textproc/sord/buildlink3.mk  Tue Nov  5 17:20:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2023/08/14 05:25:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2024/11/05 17:20:04 adam Exp $
 
 BUILDLINK_TREE+=       sord
 
@@ -6,9 +6,10 @@ BUILDLINK_TREE+=       sord
 SORD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sord+=   sord>=0.12.2
-BUILDLINK_ABI_DEPENDS.sord?=   sord>=0.16.10nb1
+BUILDLINK_ABI_DEPENDS.sord+=   sord>=0.16.10nb1
 BUILDLINK_PKGSRCDIR.sord?=     ../../textproc/sord
 
+.include "../../devel/zix/buildlink3.mk"
 .include "../../textproc/serd/buildlink3.mk"
 .endif # SORD_BUILDLINK3_MK
 

Index: pkgsrc/textproc/sord/distinfo
diff -u pkgsrc/textproc/sord/distinfo:1.9 pkgsrc/textproc/sord/distinfo:1.10
--- pkgsrc/textproc/sord/distinfo:1.9   Sat Jun 11 12:09:50 2022
+++ pkgsrc/textproc/sord/distinfo       Tue Nov  5 17:20:04 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2022/06/11 12:09:50 nia Exp $
+$NetBSD: distinfo,v 1.10 2024/11/05 17:20:04 adam Exp $
 
-BLAKE2s (sord-0.16.10.tar.bz2) = a6a0ebcc3e8d11c5c3492525bc79debf993cf35c7dfc1fe5cc56671242ba66a0
-SHA512 (sord-0.16.10.tar.bz2) = 715201eaf4a13a3635337cf8fa7c1a1f229f1d589f70cdf8f67183d90df29cd8b4af180650ce9cd0c651c712d11901bfdc6b51f9b8d7c6e70d8d8f30b1861281
-Size (sord-0.16.10.tar.bz2) = 524630 bytes
+BLAKE2s (sord-0.16.16.tar.xz) = a25654c5b44af034991bc3d3bc40e24438f63a075e039710b60eb1ca52f39c3e
+SHA512 (sord-0.16.16.tar.xz) = 8728fa01466e8f64c1a70a6d4ce727cdac3aaba78db0163ad511d7e959a260c95ab47405cce24ca0e076fb1f0da761687d788cddef87a96aa813757d10f0bfe0
+Size (sord-0.16.16.tar.xz) = 107148 bytes

Index: pkgsrc/textproc/sord/options.mk
diff -u pkgsrc/textproc/sord/options.mk:1.3 pkgsrc/textproc/sord/options.mk:1.4
--- pkgsrc/textproc/sord/options.mk:1.3 Tue Jun  6 12:42:34 2023
+++ pkgsrc/textproc/sord/options.mk     Tue Nov  5 17:20:04 2024
@@ -1,28 +1,22 @@
-# $NetBSD: options.mk,v 1.3 2023/06/06 12:42:34 riastradh Exp $
+# $NetBSD: options.mk,v 1.4 2024/11/05 17:20:04 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sord
-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
-TOOL_DEPENDS+=         graphviz-[0-9]*:../../graphics/graphviz
-PLIST.doc=             yes
+MESON_ARGS+=   -Ddocs=enabled
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+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