CVS commit: pkgsrc/converters/sratom

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Nov  5 18:18:12 UTC 2024

Modified Files:
        pkgsrc/converters/sratom: Makefile PLIST buildlink3.mk distinfo
            options.mk

Log Message:
sratom: updated to 0.6.16

sratom (0.6.16) stable; urgency=medium

* Clean up code
* Constrain relative URI references to the base URI
* Fix dependencies in pkg-config file
* Override pkg-config dependency within meson
* Remove junk files from documentation install
* Replace duplicated dox_to_sphinx script with sphinxygen dependency

sratom (0.6.14) stable; urgency=medium

* Add project metadata
* Adopt REUSE machine-readable licensing standard

sratom (0.6.12) stable; urgency=medium

* Switch to meson build system


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/converters/sratom/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/sratom/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/converters/sratom/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/converters/sratom/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/sratom/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/converters/sratom/Makefile
diff -u pkgsrc/converters/sratom/Makefile:1.35 pkgsrc/converters/sratom/Makefile:1.36
--- pkgsrc/converters/sratom/Makefile:1.35      Sun Oct 20 14:03:31 2024
+++ pkgsrc/converters/sratom/Makefile   Tue Nov  5 18:18:12 2024
@@ -1,28 +1,36 @@
-# $NetBSD: Makefile,v 1.35 2024/10/20 14:03:31 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2024/11/05 18:18:12 adam Exp $
 
-DISTNAME=      sratom-0.6.10
-PKGREVISION=   10
+DISTNAME=      sratom-0.6.16
 CATEGORIES=    converters
 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/sratom/
+HOMEPAGE=      https://drobilla.net/software/sratom.html
 COMMENT=       Library for serialising LV2 atoms to/from RDF
 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+=   sratom.pc.in
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           output/meson-private/sratom-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"
-BUILDLINK_API_DEPENDS.sord+=   sord>=0.14.0
-.include "../../textproc/sord/buildlink3.mk"
+
+.include "../../audio/lv2/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../lang/python/tool.mk"
 BUILDLINK_API_DEPENDS.serd+=   serd>=0.30.0
 .include "../../textproc/serd/buildlink3.mk"
-BUILDLINK_API_DEPENDS.lv2+=    lv2>=1.10.0
-.include "../../audio/lv2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.sord+=   sord>=0.14.0
+.include "../../textproc/sord/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/converters/sratom/PLIST
diff -u pkgsrc/converters/sratom/PLIST:1.1 pkgsrc/converters/sratom/PLIST:1.2
--- pkgsrc/converters/sratom/PLIST:1.1  Sun Apr 19 23:45:06 2015
+++ pkgsrc/converters/sratom/PLIST      Tue Nov  5 18:18:12 2024
@@ -1,9 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/19 23:45:06 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/11/05 18:18:12 adam Exp $
 include/sratom-0/sratom/sratom.h
 lib/libsratom-0.so
-lib/libsratom-0.so.0
 lib/libsratom-0.so.${PKGVERSION}
+lib/libsratom-0.so.0
 lib/pkgconfig/sratom-0.pc
-${PLIST.doc}man/man3/sratom.3
+${PLIST.doc}share/doc/sratom-0/html/_static/pygments.css
+${PLIST.doc}share/doc/sratom-0/html/_static/sphinx_lv2_theme.css
+${PLIST.doc}share/doc/sratom-0/html/api/sratom.html
+${PLIST.doc}share/doc/sratom-0/html/genindex.html
 ${PLIST.doc}share/doc/sratom-0/html/index.html
-${PLIST.doc}share/doc/sratom-0/html/style.css
+${PLIST.doc}share/doc/sratom-0/html/overview.html
+${PLIST.doc}share/doc/sratom-0/singlehtml/_static/pygments.css
+${PLIST.doc}share/doc/sratom-0/singlehtml/_static/sphinx_lv2_theme.css
+${PLIST.doc}share/doc/sratom-0/singlehtml/index.html

Index: pkgsrc/converters/sratom/buildlink3.mk
diff -u pkgsrc/converters/sratom/buildlink3.mk:1.2 pkgsrc/converters/sratom/buildlink3.mk:1.3
--- pkgsrc/converters/sratom/buildlink3.mk:1.2  Mon Aug 14 05:23:58 2023
+++ pkgsrc/converters/sratom/buildlink3.mk      Tue Nov  5 18:18:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2023/08/14 05:23:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2024/11/05 18:18:12 adam Exp $
 
 BUILDLINK_TREE+=       sratom
 
@@ -6,11 +6,11 @@ BUILDLINK_TREE+=      sratom
 SRATOM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sratom+= sratom>=0.4.6
-BUILDLINK_ABI_DEPENDS.sratom?= sratom>=0.6.10nb5
+BUILDLINK_ABI_DEPENDS.sratom+= sratom>=0.6.10nb5
 BUILDLINK_PKGSRCDIR.sratom?=   ../../converters/sratom
 
-.include "../../textproc/sord/buildlink3.mk"
 .include "../../textproc/serd/buildlink3.mk"
+.include "../../textproc/sord/buildlink3.mk"
 .endif # SRATOM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -sratom

Index: pkgsrc/converters/sratom/distinfo
diff -u pkgsrc/converters/sratom/distinfo:1.9 pkgsrc/converters/sratom/distinfo:1.10
--- pkgsrc/converters/sratom/distinfo:1.9       Sat Jun 11 12:19:06 2022
+++ pkgsrc/converters/sratom/distinfo   Tue Nov  5 18:18:12 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2022/06/11 12:19:06 nia Exp $
+$NetBSD: distinfo,v 1.10 2024/11/05 18:18:12 adam Exp $
 
-BLAKE2s (sratom-0.6.10.tar.bz2) = 9905590801b49bedc49f96f2c4c30d57c0aabdeef8d98a10a0e642d6255bb335
-SHA512 (sratom-0.6.10.tar.bz2) = cc5d2848d61de45a37d1f844b2c741016decf065bcac975214dd01108171ba332f0a51526f2f1078d5f501055af0a48716704515cbe7a9f73526fd878621ca4b
-Size (sratom-0.6.10.tar.bz2) = 327047 bytes
+BLAKE2s (sratom-0.6.16.tar.xz) = 38e183d0be9488298440b31abdde7696650f1bd884ca042e4623183a5586c0fd
+SHA512 (sratom-0.6.16.tar.xz) = 8e01eec642bff63745e8d99a814780ff34e4b79cc99699a1bb7ddac60da8808231d3b4a615a1d87464cbcf4dc26b8ec39e71688a268d493df71dc75892bf6479
+Size (sratom-0.6.16.tar.xz) = 18940 bytes

Index: pkgsrc/converters/sratom/options.mk
diff -u pkgsrc/converters/sratom/options.mk:1.3 pkgsrc/converters/sratom/options.mk:1.4
--- pkgsrc/converters/sratom/options.mk:1.3     Tue Jun  6 12:40:25 2023
+++ pkgsrc/converters/sratom/options.mk Tue Nov  5 18:18:12 2024
@@ -1,23 +1,26 @@
-# $NetBSD: options.mk,v 1.3 2023/06/06 12:40:25 riastradh Exp $
+# $NetBSD: options.mk,v 1.4 2024/11/05 18:18:12 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sratom
-PKG_SUPPORTED_OPTIONS= debug doc tests
-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
+TOOL_DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz
+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
+MESON_ARGS+=   -Dtests=enabled
+.else
+MESON_ARGS+=   -Dtests=disabled
 .endif