Received: by mail.netbsd.org (Postfix, from userid 605) id C19D384EA8; Thu, 8 Dec 2022 19:16:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EF95F84E9E for ; Thu, 8 Dec 2022 19:16:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id UJTorMlUDDB3 for ; Thu, 8 Dec 2022 19:16:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 79E3584D21 for ; Thu, 8 Dec 2022 19:16:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 71AD4FA90; Thu, 8 Dec 2022 19:16:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1670526980164570" MIME-Version: 1.0 Date: Thu, 8 Dec 2022 19:16:20 +0000 From: "Pierre Pronchery" Subject: CVS commit: pkgsrc/textproc/libfyaml To: pkgsrc-changes@NetBSD.org Reply-To: khorben@netbsd.org X-Mailer: log_accum Message-Id: <20221208191620.71AD4FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1670526980164570 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: khorben Date: Thu Dec 8 19:16:20 UTC 2022 Added Files: pkgsrc/textproc/libfyaml: DESCR Makefile PLIST distinfo pkgsrc/textproc/libfyaml/patches: patch-configure.ac patch-include_libfyaml.h patch-src_internal_libfyaml-parser.c patch-src_lib_fy-atom.c patch-src_lib_fy-ctype.h patch-src_lib_fy-diag.c patch-src_lib_fy-event.c patch-src_lib_fy-token.c patch-src_lib_fy-utf8.h patch-src_tool_fy-tool.c patch-src_valgrind_fy-valgrind.h patch-test_libfyaml-test.c Log Message: libfyaml: import version 0.7.12 libfyaml is a fancy 1.2 YAML and JSON parser/writer. Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite. It is designed to be very efficient, avoiding copies of data, and has no artificial limits like the 1024 character limit for implicit keys. libfyaml is using https://github.com/yaml/yaml-test-suite as a core part of its testsuite. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libfyaml/DESCR \ pkgsrc/textproc/libfyaml/Makefile pkgsrc/textproc/libfyaml/PLIST \ pkgsrc/textproc/libfyaml/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libfyaml/patches/patch-configure.ac \ pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml.h \ pkgsrc/textproc/libfyaml/patches/patch-src_internal_libfyaml-parser.c \ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-atom.c \ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-ctype.h \ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-diag.c \ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-event.c \ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-token.c \ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-utf8.h \ pkgsrc/textproc/libfyaml/patches/patch-src_tool_fy-tool.c \ pkgsrc/textproc/libfyaml/patches/patch-src_valgrind_fy-valgrind.h \ pkgsrc/textproc/libfyaml/patches/patch-test_libfyaml-test.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1670526980164570 Content-Disposition: inline Content-Length: 14171 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/textproc/libfyaml/DESCR diff -u /dev/null pkgsrc/textproc/libfyaml/DESCR:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/DESCR Thu Dec 8 19:16:20 2022 @@ -0,0 +1,10 @@ +libfyaml is a fancy 1.2 YAML and JSON parser/writer. + +Fully feature complete YAML parser and emitter, supporting the latest YAML spec +and passing the full YAML testsuite. + +It is designed to be very efficient, avoiding copies of data, and has no +artificial limits like the 1024 character limit for implicit keys. + +libfyaml is using https://github.com/yaml/yaml-test-suite as a core part of its +testsuite. Index: pkgsrc/textproc/libfyaml/Makefile diff -u /dev/null pkgsrc/textproc/libfyaml/Makefile:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/Makefile Thu Dec 8 19:16:20 2022 @@ -0,0 +1,22 @@ +# $NetBSD: Makefile,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +DISTNAME= libfyaml-0.7.12 +CATEGORIES= textproc +MASTER_SITES= ${MASTER_SITE_GITHUB:=pantoniou/} +GITHUB_TAG= v${PKGVERSION_NOREV} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://github.com/pantoniou/libfyaml/ +COMMENT= Feature-complete YAML parser and emitter +LICENSE= mit + +USE_LIBTOOL= yes +USE_TOOLS+= autoconf automake autoreconf +GNU_CONFIGURE= yes + +PKGCONFIG_OVERRIDE+= libfyaml.pc.in + +pre-configure: + cd ${WRKSRC} && autoreconf -fvi + +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/libfyaml/PLIST diff -u /dev/null pkgsrc/textproc/libfyaml/PLIST:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/PLIST Thu Dec 8 19:16:20 2022 @@ -0,0 +1,18 @@ +@comment $NetBSD: PLIST,v 1.1 2022/12/08 19:16:20 khorben Exp $ +bin/fy-compose +bin/fy-dump +bin/fy-filter +bin/fy-join +bin/fy-testsuite +bin/fy-tool +bin/fy-ypath +include/libfyaml.h +lib/libfyaml.la +lib/pkgconfig/libfyaml.pc +man/man1/fy-compose.1 +man/man1/fy-dump.1 +man/man1/fy-filter.1 +man/man1/fy-join.1 +man/man1/fy-testsuite.1 +man/man1/fy-tool.1 +man/man1/fy-ypath.1 Index: pkgsrc/textproc/libfyaml/distinfo diff -u /dev/null pkgsrc/textproc/libfyaml/distinfo:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/distinfo Thu Dec 8 19:16:20 2022 @@ -0,0 +1,17 @@ +$NetBSD: distinfo,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +BLAKE2s (libfyaml-0.7.12.tar.gz) = d3a2986816a70ee0f0155233b7aea9b83de297a57af9932145ebca7bc64576bf +SHA512 (libfyaml-0.7.12.tar.gz) = 9153563353b167be5a396b71f9a2c7b9b59afde492c7515043b2d94348093bcb65cde823a83d41812b7d20a5a9ed2ed06ca4f30a8c65f842add1a75a28ca113d +Size (libfyaml-0.7.12.tar.gz) = 354250 bytes +SHA1 (patch-configure.ac) = 6050829ddfe6d04833190d910c226cef54e4dd91 +SHA1 (patch-include_libfyaml.h) = e50484d638d0fd0ab850d154249b9996cb3f5101 +SHA1 (patch-src_internal_libfyaml-parser.c) = 44567a6ee961bd304b4c3ea677d02d5516374281 +SHA1 (patch-src_lib_fy-atom.c) = 3a5390ea153bb8642cd8c6ebcae06a3d72e87be7 +SHA1 (patch-src_lib_fy-ctype.h) = c90a22b02ffeae77854a7307b400519f395d55fd +SHA1 (patch-src_lib_fy-diag.c) = 21fd0747fba20c24d557aeaca556e706e5e264bf +SHA1 (patch-src_lib_fy-event.c) = ac5831f8c65c22ff53577ccd657510f7077f23aa +SHA1 (patch-src_lib_fy-token.c) = 4ce5422b00f684719d6ada366aa161b575c79c76 +SHA1 (patch-src_lib_fy-utf8.h) = a5249d029a17670928c7512b1a453d604d3befe1 +SHA1 (patch-src_tool_fy-tool.c) = 4ed718d9d0d4ce49cd5e4b4da90d1370c264389a +SHA1 (patch-src_valgrind_fy-valgrind.h) = 3b2c611bdad32d807e10019c71814ec97f27a1f4 +SHA1 (patch-test_libfyaml-test.c) = 3dd36f405995c54cd157616f8a979c19d323a1c1 Index: pkgsrc/textproc/libfyaml/patches/patch-configure.ac diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-configure.ac:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-configure.ac Thu Dec 8 19:16:20 2022 @@ -0,0 +1,54 @@ +$NetBSD: patch-configure.ac,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +Compatibility fixes + +--- configure.ac.orig 2022-01-19 10:32:21.000000000 +0000 ++++ configure.ac +@@ -162,7 +162,7 @@ AC_DEFINE_UNQUOTED([HAVE_CHECK], [$HAVE_ + AM_CONDITIONAL([HAVE_CHECK], [ test x$HAVE_CHECK = x1 ]) + + HAVE_COMPATIBLE_CHECK=0 +-if test "x$HAVE_CHECK" == "x1" ; then ++if test "x$HAVE_CHECK" = "x1" ; then + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$LIBS $CHECK_LIBS" +@@ -257,7 +257,7 @@ if test "x$SPHINX" != "x" ; then + fi + + AC_MSG_CHECKING([whether sphinx installation works]) +- if test "x$HAVE_SPHINX" == "x1" ; then ++ if test "x$HAVE_SPHINX" = "x1" ; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +@@ -279,25 +279,25 @@ AM_CONDITIONAL([HAVE_GIT], [ test x$HAVE + + AC_ARG_VAR(TESTSUITEURL, [Testsuite git repo URL (default: https://github.com/yaml/yaml-test-suite)]) + +-if test "x$TESTSUITEURL" == "x" ; then ++if test "x$TESTSUITEURL" = "x" ; then + TESTSUITEURL="https://github.com/yaml/yaml-test-suite" + fi + + AC_ARG_VAR(TESTSUITECHECKOUT, [Testsuite checkout (default: 6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f)]) + +-if test "x$TESTSUITECHECKOUT" == "x" ; then ++if test "x$TESTSUITECHECKOUT" = "x" ; then + TESTSUITECHECKOUT="6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f" + fi + + AC_ARG_VAR(JSONTESTSUITEURL, [JSON Testsuite git repo URL (default: https://github.com/nst/JSONTestSuite)]) + +-if test "x$JSONTESTSUITEURL" == "x" ; then ++if test "x$JSONTESTSUITEURL" = "x" ; then + JSONTESTSUITEURL="https://github.com/nst/JSONTestSuite" + fi + + AC_ARG_VAR(JSONTESTSUITECHECKOUT, [JSON Testsuite checkout (default: d64aefb55228d9584d3e5b2433f720ea8fd00c82)]) + +-if test "x$JSONTESTSUITECHECKOUT" == "x" ; then ++if test "x$JSONTESTSUITECHECKOUT" = "x" ; then + JSONTESTSUITECHECKOUT="d64aefb55228d9584d3e5b2433f720ea8fd00c82" + fi + Index: pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml.h diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml.h:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml.h Thu Dec 8 19:16:20 2022 @@ -0,0 +1,16 @@ +$NetBSD: patch-include_libfyaml.h,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +Replace by +Already merged upstream (https://github.com/pantoniou/libfyaml/pull/50) + +--- include/libfyaml.h.orig 2022-01-19 10:32:21.000000000 +0000 ++++ include/libfyaml.h +@@ -37,7 +37,7 @@ extern "C" { + #include + #include + #include +-#include ++#include + + #if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) + #include Index: pkgsrc/textproc/libfyaml/patches/patch-src_internal_libfyaml-parser.c diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_internal_libfyaml-parser.c:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-src_internal_libfyaml-parser.c Thu Dec 8 19:16:20 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_internal_libfyaml-parser.c,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +getopt_long_only is not very portable; use getopt_long instead + +--- src/internal/libfyaml-parser.c.orig 2022-12-08 19:03:44.942254815 +0000 ++++ src/internal/libfyaml-parser.c +@@ -3822,7 +3822,7 @@ int main(int argc, char *argv[]) + + fy_valgrind_check(&argc, &argv); + +- while ((opt = getopt_long_only(argc, argv, "I:m:i:w:d:rsc:C:D:M:W:S:qh", lopts, &lidx)) != -1) { ++ while ((opt = getopt_long(argc, argv, "I:m:i:w:d:rsc:C:D:M:W:S:qh", lopts, &lidx)) != -1) { + switch (opt) { + case 'I': + tmp = alloca(strlen(cfg.search_path) + 1 + strlen(optarg) + 1); Index: pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-atom.c diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-atom.c:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-atom.c Thu Dec 8 19:16:20 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_lib_fy-atom.c,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +Replace by +Already merged upstream (https://github.com/pantoniou/libfyaml/pull/50) + +--- src/lib/fy-atom.c.orig 2022-01-19 10:32:21.000000000 +0000 ++++ src/lib/fy-atom.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + #include + + #include Index: pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-ctype.h diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-ctype.h:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-ctype.h Thu Dec 8 19:16:20 2022 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_lib_fy-ctype.h,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +Replace by +Already merged upstream (https://github.com/pantoniou/libfyaml/pull/50) + +--- src/lib/fy-ctype.h.orig 2022-01-19 10:32:21.000000000 +0000 ++++ src/lib/fy-ctype.h +@@ -13,7 +13,7 @@ + #endif + + #include +-#include ++#include + #include + #include + Index: pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-diag.c diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-diag.c:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-diag.c Thu Dec 8 19:16:20 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_lib_fy-diag.c,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +Replace by +Already merged upstream (https://github.com/pantoniou/libfyaml/pull/50) + +--- src/lib/fy-diag.c.orig 2022-01-19 10:32:21.000000000 +0000 ++++ src/lib/fy-diag.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + #include + #include + Index: pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-event.c diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-event.c:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-event.c Thu Dec 8 19:16:20 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_lib_fy-event.c,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +Replace by +Already merged upstream (https://github.com/pantoniou/libfyaml/pull/50) + +--- src/lib/fy-event.c.orig 2022-01-19 10:32:21.000000000 +0000 ++++ src/lib/fy-event.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + + #include + Index: pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-token.c diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-token.c:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-token.c Thu Dec 8 19:16:20 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_lib_fy-token.c,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +Replace by +Already merged upstream (https://github.com/pantoniou/libfyaml/pull/50) + +--- src/lib/fy-token.c.orig 2022-01-19 10:32:21.000000000 +0000 ++++ src/lib/fy-token.c +@@ -17,7 +17,6 @@ + #include + #include + #include +-#include + + #include + Index: pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-utf8.h diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-utf8.h:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-src_lib_fy-utf8.h Thu Dec 8 19:16:20 2022 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_lib_fy-utf8.h,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +Replace by +Already merged upstream (https://github.com/pantoniou/libfyaml/pull/50) + +--- src/lib/fy-utf8.h.orig 2022-01-19 10:32:21.000000000 +0000 ++++ src/lib/fy-utf8.h +@@ -13,7 +13,7 @@ + #endif + + #include +-#include ++#include + #include + + #include Index: pkgsrc/textproc/libfyaml/patches/patch-src_tool_fy-tool.c diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_tool_fy-tool.c:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-src_tool_fy-tool.c Thu Dec 8 19:16:20 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_tool_fy-tool.c,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +getopt_long_only is not very portable; use getopt_long instead + +--- src/tool/fy-tool.c.orig 2022-12-08 19:03:03.058455798 +0000 ++++ src/tool/fy-tool.c +@@ -1475,7 +1475,7 @@ int main(int argc, char *argv[]) + (STRIP_DOC_DEFAULT ? FYECF_STRIP_DOC : 0); + apply_mode_flags(MODE_DEFAULT, &emit_flags); + +- while ((opt = getopt_long_only(argc, argv, ++ while ((opt = getopt_long(argc, argv, + "I:" "d:" "i:" "w:" "rsc" "C:" "m:" "V" "f:" "t:" "T:F:" "j:" "qhvl", + lopts, &lidx)) != -1) { + switch (opt) { Index: pkgsrc/textproc/libfyaml/patches/patch-src_valgrind_fy-valgrind.h diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_valgrind_fy-valgrind.h:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-src_valgrind_fy-valgrind.h Thu Dec 8 19:16:20 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_valgrind_fy-valgrind.h,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +Replace by +Already merged upstream (https://github.com/pantoniou/libfyaml/pull/50) + +--- src/valgrind/fy-valgrind.h.orig 2022-01-19 10:32:21.000000000 +0000 ++++ src/valgrind/fy-valgrind.h +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + #include + + enum fy_valgrind_tool { Index: pkgsrc/textproc/libfyaml/patches/patch-test_libfyaml-test.c diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-test_libfyaml-test.c:1.1 --- /dev/null Thu Dec 8 19:16:20 2022 +++ pkgsrc/textproc/libfyaml/patches/patch-test_libfyaml-test.c Thu Dec 8 19:16:20 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-test_libfyaml-test.c,v 1.1 2022/12/08 19:16:20 khorben Exp $ + +getopt_long_only is not very portable; use getopt_long instead + +--- test/libfyaml-test.c.orig 2022-12-08 19:03:14.553897741 +0000 ++++ test/libfyaml-test.c +@@ -66,7 +66,7 @@ int main(int argc, char *argv[]) + + fy_valgrind_check(&argc, &argv); + +- while ((opt = getopt_long_only(argc, argv, "qh", lopts, &lidx)) != -1) { ++ while ((opt = getopt_long(argc, argv, "qh", lopts, &lidx)) != -1) { + switch (opt) { + case 'q': + quiet = true; --_----------=_1670526980164570--