From nobody Thu Jun 6 19:07:47 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VwDP04qYSz5LPr2; Thu, 06 Jun 2024 19:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VwDP01v27z4bLV; Thu, 6 Jun 2024 19:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717700868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaeKnI4aUH3HnSjvEa+BKCllGDvMKHcRy2ARRC5Im+Q=; b=KfJbAztpeCAGUlj6NWoTQ8dJ5U3uFaxsSHvoordY9ptbGzSDIb64ymQc0Fc9E2ktHygYBV dzimUP+ALiBjLZuQbye7Atr8XgzaQERODMpkgXv8JKXJoB+xThSLpPWuRqx/+W4EYpgeH5 HuKUwa1f6nKpXf7Q3r4F2JEb+NBNz3qSsaezU6fKxOqgsr5q7UM2f/6i9x6Ifm0Gk5iBPO 9hcKdSnNUoue9lzcooCr+VWQVLnGTYqHKAUKccyYt9zOwlkSStbqvhDo5x3l6SRfHPmjR0 Rtgl/YVl4ER2P4p0FgePBQtb5yq/V2EFO897SjaPuqamvOkse0quNUZNBqgmUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717700868; a=rsa-sha256; cv=none; b=uyQY7ipeWPcRtWxJH90nary/w8Lc+1jaYcmyDtsC3RRhkIqz0Az+VSpihs176PUTTRwyJU V1+nkASt7sxj3/VtiMsx3Kg5nOp+g+rcko5HTeS70sTzBW+5oW3f2yGwum2TrT6au1yeoG EWeO4CrUL62fN4nLzAoNRq+H5F7PaT3unNXKmdpc+KR1Ems4a3mqgPxCiREaNQuYf73CyS 2o9KcIuDCVcu3i/HHEF6WIVpiroyz0ohIP1g2If9xDhfn0p0meUD4rkP4hdIElFGwonUWv Y0Dnjpma/gWn+Y811E4aVPJRi6GgyBzXn1HkKkhSZv5gOKCtl/xpn1oSGXb+Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717700868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaeKnI4aUH3HnSjvEa+BKCllGDvMKHcRy2ARRC5Im+Q=; b=pc4UO76ExfGYuQ/fRS7SuLmS3CGQGlsHznyCEKj18ycEESA7Cfh82oGrXyVoFuaRoWY5Da vlXxG4ov28pPGns3agHc2+cycZLYDlsHv+v5FIBcu20pzwclhC9nASXytgqPRRk4fb8ChU Wf17gVTh3lQv20BBhloljeyreHH7jpCZhQl0oMRhW6IyS58DPnvicVguWJemFs6s5RLRoN QFMXRFx1fGOl7v12OTdD3NqX38U6VlPAE6GAhn48BMNeCayO4BByFgFoazF1pnSSUm5vAu sZzEyBLYEoTm7B2kPRWfU0TivjCY7rKk9pP8x7C4mA2PEzksfNohwz6/wINI8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VwDP00rBDzxTN; Thu, 6 Jun 2024 19:07:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 456J7lTn076887; Thu, 6 Jun 2024 19:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 456J7ljO076884; Thu, 6 Jun 2024 19:07:47 GMT (envelope-from git) Date: Thu, 6 Jun 2024 19:07:47 GMT Message-Id: <202406061907.456J7ljO076884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 0bed524c23d9 - main - devel/libcjson: Improve port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bed524c23d91ef3d22daeb75d406ceba89bd457 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bed524c23d91ef3d22daeb75d406ceba89bd457 commit 0bed524c23d91ef3d22daeb75d406ceba89bd457 Author: Daniel Engberg AuthorDate: 2024-06-05 19:17:14 +0000 Commit: Daniel Engberg 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 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