pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/textproc/libfyaml
Module Name: pkgsrc
Committed By: adam
Date: Fri Nov 14 09:45:24 UTC 2025
Modified Files:
pkgsrc/textproc/libfyaml: Makefile distinfo
pkgsrc/textproc/libfyaml/patches: patch-configure
Added Files:
pkgsrc/textproc/libfyaml: buildlink3.mk
pkgsrc/textproc/libfyaml/patches: patch-src_internal_fy-b3sum.c
patch-src_internal_fy-thread.c
Removed Files:
pkgsrc/textproc/libfyaml/patches: patch-include_libfyaml.h
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_valgrind_fy-valgrind.h
Log Message:
libfyaml: updated to 0.9
0.9
libclang/blake3 integrated but not yet used.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/libfyaml/Makefile \
pkgsrc/textproc/libfyaml/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libfyaml/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/libfyaml/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
pkgsrc/textproc/libfyaml/patches/patch-include_libfyaml.h \
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_valgrind_fy-valgrind.h
cvs rdiff -u -r0 -r1.1 \
pkgsrc/textproc/libfyaml/patches/patch-src_internal_fy-b3sum.c \
pkgsrc/textproc/libfyaml/patches/patch-src_internal_fy-thread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/textproc/libfyaml/Makefile
diff -u pkgsrc/textproc/libfyaml/Makefile:1.2 pkgsrc/textproc/libfyaml/Makefile:1.3
--- pkgsrc/textproc/libfyaml/Makefile:1.2 Wed Dec 14 15:38:59 2022
+++ pkgsrc/textproc/libfyaml/Makefile Fri Nov 14 09:45:24 2025
@@ -1,20 +1,35 @@
-# $NetBSD: Makefile,v 1.2 2022/12/14 15:38:59 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/11/14 09:45:24 adam Exp $
-DISTNAME= libfyaml-0.7.12
+DISTNAME= libfyaml-0.9
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=pantoniou/}
GITHUB_RELEASE= v${PKGVERSION_NOREV}
-# remove on next update
-DIST_SUBDIR= libfyaml-0.7.12
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/pantoniou/libfyaml/
+HOMEPAGE= https://github.com/pantoniou/libfyaml
COMMENT= Feature-complete YAML parser and emitter
LICENSE= mit
USE_LIBTOOL= yes
+USE_TOOLS+= bash:test
GNU_CONFIGURE= yes
+TEST_TARGET= check
PKGCONFIG_OVERRIDE+= libfyaml.pc.in
+SUBST_CLASSES+= alloca
+SUBST_STAGE.alloca= pre-configure
+SUBST_MESSAGE.alloca= Changing alloca.h to stdlib.h.
+SUBST_FILES.alloca+= src/blake3/blake3_backend.c
+SUBST_FILES.alloca+= src/blake3/blake3_be_cpusimd.c
+SUBST_FILES.alloca+= src/blake3/blake3_host_state.c
+SUBST_FILES.alloca+= src/blake3/blake3.c
+SUBST_FILES.alloca+= src/blake3/fy-blake3.c
+SUBST_FILES.alloca+= src/internal/fy-b3sum.c
+SUBST_FILES.alloca+= src/internal/fy-thread.c
+SUBST_FILES.alloca+= src/thread/fy-thread.c
+SUBST_FILES.alloca+= src/util/fy-utf8.h
+SUBST_FILES.alloca+= test/libfyaml-test-private-id.c
+SUBST_SED.alloca= -e 's,alloca.h,stdlib.h,'
+
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/libfyaml/distinfo
diff -u pkgsrc/textproc/libfyaml/distinfo:1.2 pkgsrc/textproc/libfyaml/distinfo:1.3
--- pkgsrc/textproc/libfyaml/distinfo:1.2 Wed Dec 14 15:38:59 2022
+++ pkgsrc/textproc/libfyaml/distinfo Fri Nov 14 09:45:24 2025
@@ -1,17 +1,11 @@
-$NetBSD: distinfo,v 1.2 2022/12/14 15:38:59 wiz Exp $
+$NetBSD: distinfo,v 1.3 2025/11/14 09:45:24 adam Exp $
-BLAKE2s (libfyaml-0.7.12/libfyaml-0.7.12.tar.gz) = c43756b236e54d048fdbace52e60927875566b188d3247e5dac5977a13dcab2b
-SHA512 (libfyaml-0.7.12/libfyaml-0.7.12.tar.gz) = 568beadf007d002babd760abbf8153ef8c4191dface276d8614b30ffc0c9606eb7cffc2f63047042f843da5ded7ef4b302b36a36ed19a6f38e2c6e22f310aa29
-Size (libfyaml-0.7.12/libfyaml-0.7.12.tar.gz) = 757218 bytes
-SHA1 (patch-configure) = 75356f186f967f0048707153e5a051d18d8f0efa
-SHA1 (patch-include_libfyaml.h) = e50484d638d0fd0ab850d154249b9996cb3f5101
+BLAKE2s (libfyaml-0.9.tar.gz) = ceb29b020caf2bd4669cda49095325750947e68ea3e3bbea88145ede1f21c0c8
+SHA512 (libfyaml-0.9.tar.gz) = 95979361ed50a46acc6da698e4750562f6e3e46aa5d050180225d93afb74929981d9c1d1ca3b6a77fe21a1546a68a9e3df17cdfef5f93257ad5d0c7ad03ae2eb
+Size (libfyaml-0.9.tar.gz) = 875608 bytes
+SHA1 (patch-configure) = 737547863414f1b6e3a94ce8200fc87b73378bd6
+SHA1 (patch-src_internal_fy-b3sum.c) = 298d40016b11fd8c4d62d06637716b37493569d4
+SHA1 (patch-src_internal_fy-thread.c) = 8173aeefdfb03a7fd71afee477e6b93d728caac4
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
diff -u pkgsrc/textproc/libfyaml/patches/patch-configure:1.1 pkgsrc/textproc/libfyaml/patches/patch-configure:1.2
--- pkgsrc/textproc/libfyaml/patches/patch-configure:1.1 Wed Dec 14 15:38:59 2022
+++ pkgsrc/textproc/libfyaml/patches/patch-configure Fri Nov 14 09:45:24 2025
@@ -1,55 +1,46 @@
-$NetBSD: patch-configure,v 1.1 2022/12/14 15:38:59 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2025/11/14 09:45:24 adam Exp $
-Fix unportable test(1) operator.
-https://github.com/pantoniou/libfyaml/pull/62
+Portability fixes.
---- configure.orig 2022-01-19 10:32:36.000000000 +0000
+--- configure.orig 2025-10-29 18:19:39.646936444 +0000
+++ configure
-@@ -18525,7 +18525,7 @@ fi
-
-
- 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"
-@@ -18744,7 +18744,7 @@ $as_echo "N/A" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sphinx installation works" >&5
- $as_echo_n "checking whether sphinx installation works... " >&6; }
-- if test "x$HAVE_SPHINX" == "x1" ; then
-+ if test "x$HAVE_SPHINX" = "x1" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
-@@ -18829,25 +18829,25 @@ fi
-
-
-
--if test "x$TESTSUITEURL" == "x" ; then
-+if test "x$TESTSUITEURL" = "x" ; then
- TESTSUITEURL="https://github.com/yaml/yaml-test-suite";
- fi
-
-
-
--if test "x$TESTSUITECHECKOUT" == "x" ; then
-+if test "x$TESTSUITECHECKOUT" = "x" ; then
- TESTSUITECHECKOUT="6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f"
+@@ -19526,14 +19526,14 @@ then :
fi
-
-
--if test "x$JSONTESTSUITEURL" == "x" ; then
-+if test "x$JSONTESTSUITEURL" = "x" ; then
- JSONTESTSUITEURL="https://github.com/nst/JSONTestSuite";
+ HAVE_PORTABLE_TARGET=0
+-if test "x$enable_portable_target" == "xyes"; then
++if test "x$enable_portable_target" = "xyes"; then
+ HAVE_PORTABLE_TARGET=1
fi
+ printf "%s\n" "#define HAVE_PORTABLE_TARGET $HAVE_PORTABLE_TARGET" >>confdefs.h
--if test "x$JSONTESTSUITECHECKOUT" == "x" ; then
-+if test "x$JSONTESTSUITECHECKOUT" = "x" ; then
- JSONTESTSUITECHECKOUT="d64aefb55228d9584d3e5b2433f720ea8fd00c82"
- fi
-
+- if test x$HAVE_PORTABLE_TARGET == x1 ; then
++ if test x$HAVE_PORTABLE_TARGET = x1 ; then
+ HAVE_PORTABLE_TARGET_TRUE=
+ HAVE_PORTABLE_TARGET_FALSE='#'
+ else
+@@ -19872,7 +19872,7 @@ fi
+ HAVE_ASAN=0
+ ASAN_CFLAGS=""
+ ASAN_LIBS=""
+-if test "x$enable_asan" == "xyes" ; then
++if test "x$enable_asan" = "xyes" ; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking location of ASAN library" >&5
+ printf %s "checking location of ASAN library... " >&6; }
+ ASANLIB1=`${CC} -print-file-name=libasan.so`
+@@ -20649,11 +20649,11 @@ LIBCLANG_CPPFLAGS=""
+ LIBCLANG_LDFLAGS=""
+ LIBCLANG_LIBS=""
+ if test "x$with_libclang" != "xno"; then
+- if test "x$with_libclang" == "xauto"; then
++ if test "x$with_libclang" = "xauto"; then
+ # try to auto detect (llvm 15 down to 8)
+ check="llvm-config llvm-config-15 llvm-config-14 llvm-config-13 llvm-config-12 llvm-config-11 llvm-config-10"
+ else
+- if test "x$with_libclang" == "xlatest"; then
++ if test "x$with_libclang" = "xlatest"; then
+ check="llvm-config"
+ else
+ check="llvm-config-$with_libclang"
Added files:
Index: pkgsrc/textproc/libfyaml/buildlink3.mk
diff -u /dev/null pkgsrc/textproc/libfyaml/buildlink3.mk:1.1
--- /dev/null Fri Nov 14 09:45:24 2025
+++ pkgsrc/textproc/libfyaml/buildlink3.mk Fri Nov 14 09:45:24 2025
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2025/11/14 09:45:24 adam Exp $
+
+BUILDLINK_TREE+= libfyaml
+
+.if !defined(LIBFYAML_BUILDLINK3_MK)
+LIBFYAML_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libfyaml+= libfyaml>=0.9
+BUILDLINK_PKGSRCDIR.libfyaml?= ../../textproc/libfyaml
+.endif # LIBFYAML_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -libfyaml
Index: pkgsrc/textproc/libfyaml/patches/patch-src_internal_fy-b3sum.c
diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_internal_fy-b3sum.c:1.1
--- /dev/null Fri Nov 14 09:45:25 2025
+++ pkgsrc/textproc/libfyaml/patches/patch-src_internal_fy-b3sum.c Fri Nov 14 09:45:24 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_internal_fy-b3sum.c,v 1.1 2025/11/14 09:45:24 adam Exp $
+
+getopt_long_only is not very portable; use getopt_long instead
+
+--- src/internal/fy-b3sum.c.orig 2025-10-30 16:35:16.908068086 +0000
++++ src/internal/fy-b3sum.c
+@@ -316,7 +316,7 @@ int main(int argc, char *argv[])
+ uint8_t key[BLAKE3_OUT_LEN];
+ ssize_t rdn;
+
+- while ((opt = getopt_long_only(argc, argv, "cl:b:dh", lopts, &lidx)) != -1) {
++ while ((opt = getopt_long(argc, argv, "cl:b:dh", lopts, &lidx)) != -1) {
+ switch (opt) {
+
+ case OPT_DERIVE_KEY:
Index: pkgsrc/textproc/libfyaml/patches/patch-src_internal_fy-thread.c
diff -u /dev/null pkgsrc/textproc/libfyaml/patches/patch-src_internal_fy-thread.c:1.1
--- /dev/null Fri Nov 14 09:45:25 2025
+++ pkgsrc/textproc/libfyaml/patches/patch-src_internal_fy-thread.c Fri Nov 14 09:45:24 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_internal_fy-thread.c,v 1.1 2025/11/14 09:45:24 adam Exp $
+
+getopt_long_only is not very portable; use getopt_long instead
+
+--- src/internal/fy-thread.c.orig 2025-10-30 16:33:56.743298864 +0000
++++ src/internal/fy-thread.c
+@@ -549,7 +549,7 @@ int main(int argc, char *argv[])
+ unsigned int num_threads = 0;
+ int exitcode = EXIT_FAILURE, opti;
+
+- while ((opt = getopt_long_only(argc, argv, "h", lopts, &lidx)) != -1) {
++ while ((opt = getopt_long(argc, argv, "h", lopts, &lidx)) != -1) {
+ switch (opt) {
+ case OPT_NUM_THREADS:
+ opti = atoi(optarg);
Home |
Main Index |
Thread Index |
Old Index