Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 05 Apr 2026 17:24:09 +0000
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c600c27fc49f - main - devel/tinycbor: Update to 7.0
Message-ID:  <69d29ab9.1c9ef.3c1453f4@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by sunpoet:

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

commit c600c27fc49f0d7f3965daac927d9699ac1b96f7
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2026-04-05 16:53:00 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2026-04-05 17:18:08 +0000

    devel/tinycbor: Update to 7.0
    
    Changes:        https://github.com/intel/tinycbor/releases
---
 devel/tinycbor/Makefile                       | 24 +++++++++++-------------
 devel/tinycbor/distinfo                       |  8 +++-----
 devel/tinycbor/files/patch-Makefile           | 20 --------------------
 devel/tinycbor/files/patch-Makefile.configure | 11 -----------
 devel/tinycbor/pkg-plist                      |  9 ++++++---
 5 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/devel/tinycbor/Makefile b/devel/tinycbor/Makefile
index f6cdce53be96..8f1eec2fa4bc 100644
--- a/devel/tinycbor/Makefile
+++ b/devel/tinycbor/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	tinycbor
-PORTVERSION=	0.6.1
+PORTVERSION=	7.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	devel
 
-PATCH_SITES=	https://github.com/intel/tinycbor/commit/
-PATCHFILES=	628dee0d65f857d62ab1a6e1af9b9224d7df8fad.diff:-p1
-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Concise Binary Object Representation (CBOR) library
 WWW=		https://github.com/intel/tinycbor
@@ -16,23 +12,25 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcjson.so:devel/libcjson
 
-USES=		gmake localbase:ldflags
+USES=		cmake:testing localbase:ldflags pkgconfig
 
-INSTALL_TARGET=	install-strip
-MAKE_ARGS=	SOVERSION=${PORTVERSION:R:R}
+CMAKE_OFF=	WITH_FREESTANDING
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		BUILD_TOOLS \
+		WITH_CBOR2JSON \
+		WITH_FLOATING_POINT \
+		WITH_VALGRIND
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 GH_ACCOUNT=	intel
 USE_GITHUB=	yes
 
-post-patch:
-	@${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/VERSION
+OPTIONS_DEFINE=	EXAMPLES
 
-do-configure:
-	@cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} configure
+EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/tools/json2cbor/json2cbor ${STAGEDIR}${PREFIX}/bin/json2cbor
 
 .include <bsd.port.mk>
diff --git a/devel/tinycbor/distinfo b/devel/tinycbor/distinfo
index 849069591cad..4172aa9421b4 100644
--- a/devel/tinycbor/distinfo
+++ b/devel/tinycbor/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1742841518
-SHA256 (intel-tinycbor-v0.6.1_GH0.tar.gz) = 0f9944496d1143935e9c996bc6233ca0dd5451299def33ef400a409942f8f34b
-SIZE (intel-tinycbor-v0.6.1_GH0.tar.gz) = 102247
-SHA256 (628dee0d65f857d62ab1a6e1af9b9224d7df8fad.diff) = 2caa569059ed2f8bdb17b3f00e39b5b9d222e40f1ecd01c6954f0825dcbaa214
-SIZE (628dee0d65f857d62ab1a6e1af9b9224d7df8fad.diff) = 537
+TIMESTAMP = 1773966722
+SHA256 (intel-tinycbor-v7.0_GH0.tar.gz) = 8b1b76001b9f987677f2ea7aa814fba1f810ff6cbbffa62ea3bac612c55b1a56
+SIZE (intel-tinycbor-v7.0_GH0.tar.gz) = 102505
diff --git a/devel/tinycbor/files/patch-Makefile b/devel/tinycbor/files/patch-Makefile
deleted file mode 100644
index 10725831cc63..000000000000
--- a/devel/tinycbor/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2025-03-15 17:43:45 UTC
-+++ Makefile
-@@ -130,7 +130,7 @@ lib/libtinycbor.a: $(TINYCBOR_SOURCES:.c=.o)
- 	@$(MKDIR) -p lib
- 	$(AR) cqs $@ $^
- 
--lib/libtinycbor.so: $(TINYCBOR_SOURCES:.c=.pic.o)
-+lib/libtinycbor.so: $(TINYCBOR_SOURCES:.c=.o)
- 	@$(MKDIR) -p lib
- 	$(CC) -shared -Wl,-soname,libtinycbor.so.$(SOVERSION) -o lib/libtinycbor.so.$(VERSION) $(LDFLAGS) $^ $(LDLIBS)
- 	cd lib ; ln -sf libtinycbor.so.$(VERSION) libtinycbor.so ; ln -sf libtinycbor.so.$(VERSION) libtinycbor.so.$(SOVERSION)
-@@ -234,7 +234,7 @@ endif
- 
- %.o: %.c
- 	@test -d $(@D) || $(MKDIR) $(@D)
--	$(CC) $(cflags) $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $<
-+	$(CC) $(cflags) -fPIC $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $<
- %.pic.o: %.c
- 	@test -d $(@D) || $(MKDIR) $(@D)
- 	$(CC) $(cflags) -fPIC $($(basename $(notdir $@))_CCFLAGS) -c -o $@ $<
diff --git a/devel/tinycbor/files/patch-Makefile.configure b/devel/tinycbor/files/patch-Makefile.configure
deleted file mode 100644
index 15a7d452df1a..000000000000
--- a/devel/tinycbor/files/patch-Makefile.configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.configure.orig	2025-03-12 01:32:15 UTC
-+++ Makefile.configure
-@@ -20,7 +20,7 @@ PROGRAM-system-cjson = $(PROGRAM-cjson)
- PROGRAM-cjson += int main() { double d = NAN; return cJSON_False; }
- CCFLAGS-cjson = -I. -I$(dir $(MAKEFILE))src
- PROGRAM-system-cjson = $(PROGRAM-cjson)
--CCFLAGS-system-cjson = -I. -lcjson
-+CCFLAGS-system-cjson = -I$(LOCALBASE)/include -L$(LOCALBASE)/lib -lcjson
- 
- sink:
- 	@echo >&2 Please run from the top-level Makefile.
diff --git a/devel/tinycbor/pkg-plist b/devel/tinycbor/pkg-plist
index a9e86ca68bad..cb27fd6a3250 100644
--- a/devel/tinycbor/pkg-plist
+++ b/devel/tinycbor/pkg-plist
@@ -1,10 +1,13 @@
 bin/cbordump
 bin/json2cbor
 include/tinycbor/cbor.h
-include/tinycbor/cborjson.h
+include/tinycbor/tinycbor-export.h
 include/tinycbor/tinycbor-version.h
-lib/libtinycbor.a
+lib/cmake/tinycbor/TinyCBOR-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/tinycbor/TinyCBOR-targets.cmake
+lib/cmake/tinycbor/tinycbor-config-version.cmake
+lib/cmake/tinycbor/tinycbor-config.cmake
 lib/libtinycbor.so
 lib/libtinycbor.so.0
-lib/libtinycbor.so.%%PORTVERSION%%
+lib/libtinycbor.so.0.%%PORTVERSION%%
 libdata/pkgconfig/tinycbor.pc


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d29ab9.1c9ef.3c1453f4>