CVS commit: pkgsrc/textproc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Feb 19 20:55:31 UTC 2022

Modified Files:
        pkgsrc/textproc/lua-dkjson: Makefile distinfo
        pkgsrc/textproc/lua-lustache: Makefile
        pkgsrc/textproc/lua-rapidjson: Makefile

Log Message:
textproc: Use LUA_USE_BUSTED


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/lua-dkjson/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/lua-dkjson/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/lua-lustache/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/lua-rapidjson/Makefile

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

Modified files:

Index: pkgsrc/textproc/lua-dkjson/Makefile
diff -u pkgsrc/textproc/lua-dkjson/Makefile:1.1 pkgsrc/textproc/lua-dkjson/Makefile:1.2
--- pkgsrc/textproc/lua-dkjson/Makefile:1.1     Wed Jul  8 16:00:22 2020
+++ pkgsrc/textproc/lua-dkjson/Makefile Sat Feb 19 20:55:31 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2020/07/08 16:00:22 nia Exp $
+# $NetBSD: Makefile,v 1.2 2022/02/19 20:55:31 nia Exp $
 
-DISTNAME=      dkjson-2.5
+DISTNAME=      dkjson-2.6
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME}
 CATEGORIES=    textproc lua
 MASTER_SITES=  http://dkolf.de/src/dkjson-lua.fsl/tarball/

Index: pkgsrc/textproc/lua-dkjson/distinfo
diff -u pkgsrc/textproc/lua-dkjson/distinfo:1.3 pkgsrc/textproc/lua-dkjson/distinfo:1.4
--- pkgsrc/textproc/lua-dkjson/distinfo:1.3     Tue Oct 26 11:22:19 2021
+++ pkgsrc/textproc/lua-dkjson/distinfo Sat Feb 19 20:55:31 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:22:19 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/02/19 20:55:31 nia Exp $
 
-BLAKE2s (dkjson-2.5.tar.gz) = cc3013d3f07deab4c7642dd32c93436bb6e627a40fa100aa997d8ab9b185b0ed
-SHA512 (dkjson-2.5.tar.gz) = 91c84c662932579e8dd0a34bfb931730502981ad2937029aacd5b7ece972942c1b425ec4b0c9428935c550a060412614d6b26cb5e205c4c840f9effed7995148
-Size (dkjson-2.5.tar.gz) = 15878 bytes
+BLAKE2s (dkjson-2.6.tar.gz) = 984073f8c3135357e9bebf495cb283712856b6cba3e4c00a9fe5874dee6fdb5b
+SHA512 (dkjson-2.6.tar.gz) = af7101a5e4b5bb7e0bd88e555a023b78fad581b6caa6fdccd13ba6c15879b5a07d4eab46ab83d4479853a844506db1813fbb4ca8de65f5882637e567500faa07
+Size (dkjson-2.6.tar.gz) = 17143 bytes

Index: pkgsrc/textproc/lua-lustache/Makefile
diff -u pkgsrc/textproc/lua-lustache/Makefile:1.5 pkgsrc/textproc/lua-lustache/Makefile:1.6
--- pkgsrc/textproc/lua-lustache/Makefile:1.5   Wed Jul  8 16:33:31 2020
+++ pkgsrc/textproc/lua-lustache/Makefile       Sat Feb 19 20:55:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/07/08 16:33:31 nia Exp $
+# $NetBSD: Makefile,v 1.6 2022/02/19 20:55:31 nia Exp $
 
 DISTNAME=      lustache-1.3.1
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME}
@@ -12,11 +12,11 @@ HOMEPAGE=   https://olivinelabs.com/lustac
 COMMENT=       Logic-less mustache templates with Lua
 LICENSE=       mit
 
-TEST_DEPENDS+= ${LUA_PKGPREFIX}-busted-[0-9]*:../../devel/lua-busted
-
 USE_LANGUAGES= # none
 NO_BUILD=      yes
 
+LUA_USE_BUSTED=        yes
+
 INSTALLATION_DIRS+=    ${LUA_LDIR}
 INSTALLATION_DIRS+=    ${LUA_LDIR}/lustache
 
@@ -24,8 +24,5 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/src/*.lua ${DESTDIR}${PREFIX}/${LUA_LDIR}
        ${INSTALL_DATA} ${WRKSRC}/src/lustache/*.lua ${DESTDIR}${PREFIX}/${LUA_LDIR}/lustache
 
-do-test:
-       cd ${WRKSRC} && ${PREFIX}/bin/busted${_LUA_DOT_VERSION}
-
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/lua-rapidjson/Makefile
diff -u pkgsrc/textproc/lua-rapidjson/Makefile:1.2 pkgsrc/textproc/lua-rapidjson/Makefile:1.3
--- pkgsrc/textproc/lua-rapidjson/Makefile:1.2  Mon Jun  7 11:53:31 2021
+++ pkgsrc/textproc/lua-rapidjson/Makefile      Sat Feb 19 20:55:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/06/07 11:53:31 nia Exp $
+# $NetBSD: Makefile,v 1.3 2022/02/19 20:55:31 nia Exp $
 
 DISTNAME=      lua-rapidjson-0.7.1
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME:S/^lua-//1}
@@ -12,11 +12,13 @@ HOMEPAGE=   https://github.com/xpol/lua-ra
 COMMENT=       JSON module for Lua, based on the very fast RapidJSON C++ library
 LICENSE=       mit
 
-TEST_DEPENDS+= ${LUA_PKGPREFIX}-busted-[0-9]*:../../devel/lua-busted
-
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
+LUA_USE_BUSTED=        yes
+
+TEST_DEPENDS+= ${LUA_PKGPREFIX}-utf8-[0-9]*:../../textproc/lua-utf8
+
 CMAKE_ARGS+=   -DLUA_RAPIDJSON_VERSION=${PKGVERSION}
 
 # C++11
@@ -31,8 +33,5 @@ pre-configure:
 do-install:
        ${INSTALL_LIB} ${WRKSRC}/rapidjson.so ${DESTDIR}${PREFIX}/${LUA_CDIR}
 
-do-test:
-       cd ${WRKSRC} && ${PREFIX}/bin/busted${_LUA_DOT_VERSION}
-
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"