git: 92ac6c157ebb - main - devel/jwt-cpp: Use release assets and other fixes

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Xavier Beaudouin <kiwi_at_FreeBSD.org>
Date: Mon, 15 Sep 2025 11:43:45 UTC
The branch main has been updated by kiwi:

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

commit 92ac6c157ebbe4dba1bdf412f4ea8e25885eaaf2
Author:     Xavier Beaudouin <kiwi@FreeBSD.org>
AuthorDate: 2025-09-15 11:40:47 +0000
Commit:     Xavier Beaudouin <kiwi@FreeBSD.org>
CommitDate: 2025-09-15 11:43:28 +0000

    devel/jwt-cpp: Use release assets and other fixes
    
    After the nice suggestion from @diizzy and @mat, this port
    will use the release assets instead.
    LICENSE_FILE has been added and remove the picojson.h install.
    
    Approved by:    0mp (mentor)
    Approved by:    diizzy
    Differential Revision:  https://reviews.freebsd.org/D50656
---
 devel/jwt-cpp/Makefile                             | 29 +++++++++-------------
 devel/jwt-cpp/distinfo                             |  6 ++---
 devel/jwt-cpp/files/patch-CMakeLists.txt           | 11 ++++++++
 devel/jwt-cpp/files/patch-include_jwt-cpp_jwt.h    | 11 ++++++++
 ...include_jwt-cpp_traits_kazuho-picojson_traits.h | 11 ++++++++
 devel/jwt-cpp/pkg-plist                            |  1 -
 6 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/devel/jwt-cpp/Makefile b/devel/jwt-cpp/Makefile
index 1c1ce76e3975..edb98c663344 100644
--- a/devel/jwt-cpp/Makefile
+++ b/devel/jwt-cpp/Makefile
@@ -1,32 +1,27 @@
 PORTNAME=	jwt-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/Thalhammer/jwt-cpp/releases/download/${DISTVERSIONFULL}/
 
 MAINTAINER=	kiwi@FreeBSD.org
-COMMENT=	C++ library for jwt
+COMMENT=	Header only library for creating and validating JSON web tokens in C++
 WWW=		https://thalhammer.github.io/jwt-cpp/
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	nlohmann-json>=3.11:devel/nlohmann-json \
-		jsoncpp>=1.9:devel/jsoncpp
+BUILD_DEPENDS=	${LOCALBASE}/include/picojson.h:devel/picojson
+RUN_DEPENDS=	${LOCALBASE}/include/picojson.h:devel/picojson
 
-USES=		cmake pkgconfig
+USES=		cmake pkgconfig:both
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	Thalhammer
-
-CMAKE_ARGS+=	-DJWT_CMAKE_FILES_INSTALL_DIR=${PREFIX}/lib/cmake/jwt-cpp
-
-CMAKE_ON=	JWT_ENABLE_COVERAGE \
-		JWT_ENABLE_FUZZING \
-		JWT_EXTERNAL_NLOHMANN_JSON
-
-CMAKE_OFF=	JWT_BUILD_EXAMPLES \
-		JWT_BUILD_TESTS \
-		JWT_BUILD_DOCS \
+CMAKE_ARGS=	-DJWT_CMAKE_FILES_INSTALL_DIR:STRING="lib/cmake/${PORTNAME}"
+CMAKE_ON=	DISABLE_JWP_CPP_PICOJSON \
+		JWT_DISABLE_PICOJSON \
 		JWT_EXTERNAL_PICOJSON
+CMAKE_OFF=	JWT_BUILD_EXAMPLES
 
+NO_WRKSUBDIR=	yes
 .include <bsd.port.mk>
diff --git a/devel/jwt-cpp/distinfo b/devel/jwt-cpp/distinfo
index d6d2d5b80740..ab682877fda6 100644
--- a/devel/jwt-cpp/distinfo
+++ b/devel/jwt-cpp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747916819
-SHA256 (Thalhammer-jwt-cpp-v0.7.1_GH0.tar.gz) = e52f247d5e62fac5da6191170998271a70ce27f747f2ce8fde9b09f96a5375a4
-SIZE (Thalhammer-jwt-cpp-v0.7.1_GH0.tar.gz) = 159954
+TIMESTAMP = 1748508874
+SHA256 (jwt-cpp-v0.7.1.tar.gz) = d45894f57437ce45233cfe0e07383c4e1f32f969edfd8df8347e177b13bf74e5
+SIZE (jwt-cpp-v0.7.1.tar.gz) = 159645
diff --git a/devel/jwt-cpp/files/patch-CMakeLists.txt b/devel/jwt-cpp/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..d954df695994
--- /dev/null
+++ b/devel/jwt-cpp/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2025-09-15 06:53:07 UTC
++++ CMakeLists.txt
+@@ -132,7 +132,7 @@ if(NOT JWT_DISABLE_PICOJSON AND JWT_EXTERNAL_PICOJSON)
+ endif()
+ 
+ if(NOT JWT_DISABLE_PICOJSON AND JWT_EXTERNAL_PICOJSON)
+-  target_link_libraries(jwt-cpp INTERFACE picojson::picojson>)
++  target_link_libraries(jwt-cpp INTERFACE picojson::picojson)
+ endif()
+ 
+ # Hunter needs relative paths so the files are placed correctly
diff --git a/devel/jwt-cpp/files/patch-include_jwt-cpp_jwt.h b/devel/jwt-cpp/files/patch-include_jwt-cpp_jwt.h
new file mode 100644
index 000000000000..45c61649b98e
--- /dev/null
+++ b/devel/jwt-cpp/files/patch-include_jwt-cpp_jwt.h
@@ -0,0 +1,11 @@
+--- include/jwt-cpp/jwt.h.orig	2025-09-15 07:23:21 UTC
++++ include/jwt-cpp/jwt.h
+@@ -5,7 +5,7 @@
+ #ifndef PICOJSON_USE_INT64
+ #define PICOJSON_USE_INT64
+ #endif
+-#include "picojson/picojson.h"
++#include "picojson.h"
+ #endif
+ 
+ #ifndef JWT_DISABLE_BASE64
diff --git a/devel/jwt-cpp/files/patch-include_jwt-cpp_traits_kazuho-picojson_traits.h b/devel/jwt-cpp/files/patch-include_jwt-cpp_traits_kazuho-picojson_traits.h
new file mode 100644
index 000000000000..0965c3a7ed8b
--- /dev/null
+++ b/devel/jwt-cpp/files/patch-include_jwt-cpp_traits_kazuho-picojson_traits.h
@@ -0,0 +1,11 @@
+--- include/jwt-cpp/traits/kazuho-picojson/traits.h.orig	2025-09-15 07:42:35 UTC
++++ include/jwt-cpp/traits/kazuho-picojson/traits.h
+@@ -4,7 +4,7 @@
+ #ifndef PICOJSON_USE_INT64
+ #define PICOJSON_USE_INT64
+ #endif
+-#include "picojson/picojson.h"
++#include "picojson.h"
+ 
+ #ifndef JWT_DISABLE_PICOJSON
+ #define JWT_DISABLE_PICOJSON
diff --git a/devel/jwt-cpp/pkg-plist b/devel/jwt-cpp/pkg-plist
index fea36643a986..8261bd63aaa1 100644
--- a/devel/jwt-cpp/pkg-plist
+++ b/devel/jwt-cpp/pkg-plist
@@ -11,7 +11,6 @@ include/jwt-cpp/traits/nlohmann-json/defaults.h
 include/jwt-cpp/traits/nlohmann-json/traits.h
 include/jwt-cpp/traits/open-source-parsers-jsoncpp/defaults.h
 include/jwt-cpp/traits/open-source-parsers-jsoncpp/traits.h
-include/picojson/picojson.h
 lib/cmake/jwt-cpp/jwt-cpp-config-version.cmake
 lib/cmake/jwt-cpp/jwt-cpp-config.cmake
 lib/cmake/jwt-cpp/jwt-cpp-targets.cmake