CVS commit: pkgsrc/devel/yajl

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 11 08:49:19 UTC 2025

Modified Files:
        pkgsrc/devel/yajl: distinfo
Added Files:
        pkgsrc/devel/yajl/patches: patch-CMakeLists.txt
            patch-reformatter_CMakeLists.txt patch-verify_CMakeLists.txt

Log Message:
yajl: fix build with cmake 4

using patches from github pull request


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/yajl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/yajl/patches/patch-CMakeLists.txt \
    pkgsrc/devel/yajl/patches/patch-reformatter_CMakeLists.txt \
    pkgsrc/devel/yajl/patches/patch-verify_CMakeLists.txt

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

Modified files:

Index: pkgsrc/devel/yajl/distinfo
diff -u pkgsrc/devel/yajl/distinfo:1.5 pkgsrc/devel/yajl/distinfo:1.6
--- pkgsrc/devel/yajl/distinfo:1.5      Tue Oct 26 10:20:10 2021
+++ pkgsrc/devel/yajl/distinfo  Mon Aug 11 08:49:18 2025
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:20:10 nia Exp $
+$NetBSD: distinfo,v 1.6 2025/08/11 08:49:18 wiz Exp $
 
 BLAKE2s (yajl-2.1.0.tar.gz) = 549a95149082f503efca7ee48538c33d93c22a5767386a3f85852d0bc28ebb35
 SHA512 (yajl-2.1.0.tar.gz) = 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
 Size (yajl-2.1.0.tar.gz) = 84039 bytes
+SHA1 (patch-CMakeLists.txt) = f5440d21c7e6f8ce8f1007300060208416a3b291
+SHA1 (patch-reformatter_CMakeLists.txt) = 0130cfd5e578197e4a000f90cc2d81aaf2e108ab
 SHA1 (patch-src_CMakeLists.txt) = 6999cdcb8450ec3abd1c81b8a8ab3cab8c9d008e
+SHA1 (patch-verify_CMakeLists.txt) = 2522309edb55a3a19c3ad3949865da98ec785d03

Added files:

Index: pkgsrc/devel/yajl/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/devel/yajl/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Aug 11 08:49:19 2025
+++ pkgsrc/devel/yajl/patches/patch-CMakeLists.txt      Mon Aug 11 08:49:18 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/08/11 08:49:18 wiz Exp $
+
+https://github.com/lloyd/yajl/pull/256
+
+--- CMakeLists.txt.orig        2014-03-19 04:58:29.000000000 +0000
++++ CMakeLists.txt
+@@ -12,7 +12,7 @@
+ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0...3.10)
+ 
+ PROJECT(YetAnotherJSONParser C)
+ 
Index: pkgsrc/devel/yajl/patches/patch-reformatter_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/yajl/patches/patch-reformatter_CMakeLists.txt:1.1
--- /dev/null   Mon Aug 11 08:49:19 2025
+++ pkgsrc/devel/yajl/patches/patch-reformatter_CMakeLists.txt  Mon Aug 11 08:49:18 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-reformatter_CMakeLists.txt,v 1.1 2025/08/11 08:49:18 wiz Exp $
+
+https://github.com/lloyd/yajl/pull/256
+
+--- reformatter/CMakeLists.txt.orig    2014-03-19 04:58:29.000000000 +0000
++++ reformatter/CMakeLists.txt
+@@ -35,9 +35,7 @@ IF (NOT WIN32)
+ ENDIF (NOT WIN32)
+ 
+ # copy the binary into the output directory
+-GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
+-
+ ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD
+-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
++    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_reformat> ${binDir})
+ 
+ INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin)
Index: pkgsrc/devel/yajl/patches/patch-verify_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/yajl/patches/patch-verify_CMakeLists.txt:1.1
--- /dev/null   Mon Aug 11 08:49:19 2025
+++ pkgsrc/devel/yajl/patches/patch-verify_CMakeLists.txt       Mon Aug 11 08:49:18 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-verify_CMakeLists.txt,v 1.1 2025/08/11 08:49:18 wiz Exp $
+
+https://github.com/lloyd/yajl/pull/256
+
+--- verify/CMakeLists.txt.orig 2014-03-19 04:58:29.000000000 +0000
++++ verify/CMakeLists.txt
+@@ -29,9 +29,7 @@ ADD_EXECUTABLE(json_verify ${SRCS})
+ TARGET_LINK_LIBRARIES(json_verify yajl_s)
+ 
+ # copy in the binary
+-GET_TARGET_PROPERTY(binPath json_verify LOCATION)
+-
+ ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD
+-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})
++    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:json_verify> ${binDir})
+ 
+ INSTALL(TARGETS json_verify RUNTIME DESTINATION bin)