Date: Thu, 6 Jun 2024 19:07:47 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0bed524c23d9 - main - devel/libcjson: Improve port Message-ID: <202406061907.456J7ljO076884@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bed524c23d91ef3d22daeb75d406ceba89bd457 commit 0bed524c23d91ef3d22daeb75d406ceba89bd457 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2024-06-05 19:17:14 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2024-06-06 19:05:47 +0000 devel/libcjson: Improve port * Rework Makefile to follow Porters Handbook more closely * Fix issues reported by DEVELOPER=yes * Adjust CMAKE args to be readable and there's no need to list every possible option * Compile to c89 standard as other distros and upstream [1] * Drop static libs, nothing in tree uses them 1: https://github.com/DaveGamble/cJSON/blob/v1.7.18/CMakeLists.txt#L22 https://github.com/DaveGamble/cJSON/pull/836 PR: 279133 Approved by: portmgr (maintainer timeout, 2+ weeks) --- devel/libcjson/Makefile | 25 +++++++++++++++---------- devel/libcjson/distinfo | 2 +- devel/libcjson/pkg-plist | 6 ++---- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/devel/libcjson/Makefile b/devel/libcjson/Makefile index 2f5f4624cb1b..4e8f9d454f91 100644 --- a/devel/libcjson/Makefile +++ b/devel/libcjson/Makefile @@ -1,6 +1,7 @@ PORTNAME= libcjson -PORTVERSION= 1.7.18 DISTVERSIONPREFIX= v +DISTVERSION= 1.7.18 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= sunpoet@FreeBSD.org @@ -10,17 +11,21 @@ WWW= https://github.com/DaveGamble/cJSON LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake:testing compiler:c11 pathfix - -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= PORTVERSION=${PORTVERSION} +USES= cmake:testing pathfix +USE_LDCONFIG= yes +USE_GITHUB= yes GH_ACCOUNT= DaveGamble GH_PROJECT= cJSON -USE_GITHUB= yes + +USE_CSTD= c89 + +PLIST_SUB= DISTVERSION=${DISTVERSION} + +CMAKE_TESTING_ON= ENABLE_CJSON_TEST + +CMAKE_OFF= ENABLE_CJSON_TEST \ + ENABLE_CUSTOM_COMPILER_FLAGS +CMAKE_ON= ENABLE_CJSON_UTILS .include <bsd.port.mk> diff --git a/devel/libcjson/distinfo b/devel/libcjson/distinfo index 0842dd750e7a..d93604aea0d5 100644 --- a/devel/libcjson/distinfo +++ b/devel/libcjson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715842516 +TIMESTAMP = 1716050739 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 7fdf27debf85..d9f6ef6fd604 100644 --- a/devel/libcjson/pkg-plist +++ b/devel/libcjson/pkg-plist @@ -6,13 +6,11 @@ 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.%%PORTVERSION%% -lib/libcjson_utils.a +lib/libcjson.so.%%DISTVERSION%% lib/libcjson_utils.so lib/libcjson_utils.so.1 -lib/libcjson_utils.so.%%PORTVERSION%% +lib/libcjson_utils.so.%%DISTVERSION%% libdata/pkgconfig/libcjson.pc libdata/pkgconfig/libcjson_utils.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406061907.456J7ljO076884>