git: d359c85b99ed - main - devel/libcjson: Revert 0bed524c23d91ef3d22daeb75d406ceba89bd457

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Thu, 06 Jun 2024 20:43:27 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d359c85b99ed173ea8b038b282cb8ebeb58a1400

commit d359c85b99ed173ea8b038b282cb8ebeb58a1400
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-06-06 20:40:27 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-06-06 20:40:27 +0000

    devel/libcjson: Revert 0bed524c23d91ef3d22daeb75d406ceba89bd457
    
    - Bump PORTREVISION for package change
---
 devel/libcjson/Makefile  | 26 +++++++++++---------------
 devel/libcjson/distinfo  |  2 +-
 devel/libcjson/pkg-plist |  6 ++++--
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/devel/libcjson/Makefile b/devel/libcjson/Makefile
index 4e8f9d454f91..eb14031b0f4e 100644
--- a/devel/libcjson/Makefile
+++ b/devel/libcjson/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libcjson
+PORTVERSION=	1.7.18
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -11,21 +11,17 @@ WWW=		https://github.com/DaveGamble/cJSON
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:testing pathfix
-USE_LDCONFIG=	yes
+USES=		cmake:testing compiler:c11 pathfix
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	DaveGamble
-GH_PROJECT=	cJSON
-
-USE_CSTD=	c89
+CMAKE_OFF=	CJSON_OVERRIDE_BUILD_SHARED_LIBS ENABLE_CJSON_TEST ENABLE_CUSTOM_COMPILER_FLAGS ENABLE_HIDDEN_SYMBOLS ENABLE_SAFE_STACK ENABLE_SANITIZERS
+CMAKE_ON=	BUILD_SHARED_AND_STATIC_LIBS BUILD_SHARED_LIBS CJSON_BUILD_SHARED_LIBS ENABLE_CJSON_UNINSTALL ENABLE_CJSON_UTILS ENABLE_CJSON_VERSION_SO ENABLE_LOCALES ENABLE_PUBLIC_SYMBOLS ENABLE_TARGET_EXPORT
+CMAKE_TESTING_ON=	ENABLE_CJSON_TEST ENABLE_SAFE_STACK
+USE_CSTD=	c11
 
-PLIST_SUB=	DISTVERSION=${DISTVERSION}
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-CMAKE_TESTING_ON=	ENABLE_CJSON_TEST
-
-CMAKE_OFF=	ENABLE_CJSON_TEST \
-		ENABLE_CUSTOM_COMPILER_FLAGS
-CMAKE_ON=	ENABLE_CJSON_UTILS
+GH_ACCOUNT=	DaveGamble
+GH_PROJECT=	cJSON
+USE_GITHUB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libcjson/distinfo b/devel/libcjson/distinfo
index d93604aea0d5..0842dd750e7a 100644
--- a/devel/libcjson/distinfo
+++ b/devel/libcjson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716050739
+TIMESTAMP = 1715842516
 SHA256 (DaveGamble-cJSON-v1.7.18_GH0.tar.gz) = 3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5
 SIZE (DaveGamble-cJSON-v1.7.18_GH0.tar.gz) = 354726
diff --git a/devel/libcjson/pkg-plist b/devel/libcjson/pkg-plist
index d9f6ef6fd604..7fdf27debf85 100644
--- a/devel/libcjson/pkg-plist
+++ b/devel/libcjson/pkg-plist
@@ -6,11 +6,13 @@ lib/cmake/cJSON/cjson-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/cJSON/cjson.cmake
 lib/cmake/cJSON/cjson_utils-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/cJSON/cjson_utils.cmake
+lib/libcjson.a
 lib/libcjson.so
 lib/libcjson.so.1
-lib/libcjson.so.%%DISTVERSION%%
+lib/libcjson.so.%%PORTVERSION%%
+lib/libcjson_utils.a
 lib/libcjson_utils.so
 lib/libcjson_utils.so.1
-lib/libcjson_utils.so.%%DISTVERSION%%
+lib/libcjson_utils.so.%%PORTVERSION%%
 libdata/pkgconfig/libcjson.pc
 libdata/pkgconfig/libcjson_utils.pc