devel/picojson: Update to latest commit and import upstream PR #159

* Update to latest commit as consumers of picojson expects installed version to be based of master branch * Import upstream PR #159 to make it easier for consumers to find picojson PR: 287277 Reported by: kiwi Approved by: maintainer timeout, 2+ weeks
2 days ago · b125360a0b
6 changed files with 101 additions and 6 deletions
--- a/devel/picojson/Makefile
+++ b/devel/picojson/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	picojson
-DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.0
+DISTVERSION=	1.3.1.20210117
 CATEGORIES=	devel

 MAINTAINER=	james.wright@digital-chaos.com
@ -10,16 +9,22 @@ WWW=		https://github.com/kazuho/picojson
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

+USES=		cmake
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	kazuho
+GH_TAGNAME=	288074e

 NO_ARCH=	yes
 NO_BUILD=	yes
-TEST_TARGET=	check

 OPTIONS_DEFINE=	EXAMPLES
 OPTIONS_SUB=	yes

+post-patch:
+	@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \
+	    ${PATCH_WRKSRC}/CMakeLists.txt
+
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
--- a/devel/picojson/distinfo
+++ b/devel/picojson/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1555165118
-SHA256 (kazuho-picojson-v1.3.0_GH0.tar.gz) = 056805ca2691798f5545935a14bb477f2e1d827c9fb862e6e449dbea22801c7d
-SIZE (kazuho-picojson-v1.3.0_GH0.tar.gz) = 14695
+TIMESTAMP = 1748979730
+SHA256 (kazuho-picojson-1.3.1.20210117-288074e_GH0.tar.gz) = 7a8dd8c30cab56fce201d6c5833b4fa21d02e896bbbe4b8dc222fd3e4d7d516e
+SIZE (kazuho-picojson-1.3.1.20210117-288074e_GH0.tar.gz) = 15093
--- a/devel/picojson/files/patch-CMakeLists.txt
+++ b/devel/picojson/files/patch-CMakeLists.txt
@ -0,0 +1,68 @@
+--- CMakeLists.txt.orig	2025-06-03 19:41:04 UTC
+++ CMakeLists.txt
+@@ -0,0 +1,65 @@
+cmake_minimum_required(VERSION 3.16)
+project(picojson
+    VERSION %%DISTVERSION%%
+    LANGUAGES CXX
+)
+
+include(GNUInstallDirs)
+
+set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}"
+    CACHE PATH "Location of header files"
+)
+
+add_library(picojson INTERFACE)
+add_library(picojson::picojson ALIAS picojson)
+target_include_directories(picojson INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+install(FILES picojson.h
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/"
+)
+
+if(NOT WIN32)
+    # Install pkg-config file
+    set(prefix "${CMAKE_INSTALL_PREFIX}")
+    set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+    set(version ${PROJECT_VERSION})
+    configure_file(picojson.pc.in
+        "${CMAKE_CURRENT_BINARY_DIR}/picojson.pc"
+        NEWLINE_STYLE UNIX
+        @ONLY
+    )
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/picojson.pc"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig"
+    )
+endif()
+
+install(TARGETS picojson EXPORT picojson-targets
+    INCLUDES DESTINATION include
+)
+
+set(config_package_location ${CMAKE_INSTALL_LIBDIR}/cmake/picojson)
+install(EXPORT picojson-targets
+    FILE picojson-targets.cmake
+    NAMESPACE picojson::
+    DESTINATION ${config_package_location}
+)
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(picojson-config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/picojson-config.cmake
+    INSTALL_DESTINATION ${config_package_location}
+    PATH_VARS INCLUDE_INSTALL_DIR
+)
+write_basic_package_version_file(
+    "${CMAKE_CURRENT_BINARY_DIR}/picojson-config-version.cmake"
+    VERSION ${PROJECT_VERSION}
+    COMPATIBILITY SameMajorVersion
+    ARCH_INDEPENDENT
+)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/picojson-config.cmake
+              ${CMAKE_CURRENT_BINARY_DIR}/picojson-config-version.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/picojson
+)
--- a/devel/picojson/files/patch-picojson-config.cmake.in
+++ b/devel/picojson/files/patch-picojson-config.cmake.in
@ -0,0 +1,8 @@
+--- picojson-config.cmake.in.orig	2025-06-03 19:41:13 UTC
+++ picojson-config.cmake.in
+@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/picojson-targets.cmake")
+
+check_required_components(picojson)
--- a/devel/picojson/files/patch-picojson.pc.in
+++ b/devel/picojson/files/patch-picojson.pc.in
@ -0,0 +1,10 @@
+--- picojson.pc.in.orig	2025-06-03 19:41:23 UTC
+++ picojson.pc.in
+@@ -0,0 +1,7 @@
+prefix=@prefix@
+includedir=@includedir@
+
+Name: picojson
+Description: Tiny JSON parser / serializer for C++
+Version: @version@
+Cflags: -I${includedir}
--- a/devel/picojson/pkg-plist
+++ b/devel/picojson/pkg-plist
@ -1,4 +1,8 @@
 include/picojson.h
+lib/cmake/picojson/picojson-config-version.cmake
+lib/cmake/picojson/picojson-config.cmake
+lib/cmake/picojson/picojson-targets.cmake
+libdata/pkgconfig/picojson.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/github-issues.cc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iostream.cc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/streaming.cc