git: a98db1c47550 - main - devel/tinycbor: Update to 0.6.1

The branch main has been updated by sunpoet:

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

commit a98db1c47550e01048fc8ded5d7ba89d33ded118
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-03-19 03:36:56 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-03-19 03:36:56 +0000

    devel/tinycbor: Update to 0.6.1
    
    - Backport upstream patch to fix memory leak
    
    Changes:        https://github.com/intel/tinycbor/releases
    Reference:      https://github.com/intel/tinycbor/commit/628dee0d65f857d62ab1a6e1af9b9224d7df8fad
---
 devel/tinycbor/Makefile                       | 13 +++++++----
 devel/tinycbor/distinfo                       |  6 ++---
 devel/tinycbor/files/patch-Makefile           | 33 ++++++++++++++-------------
 devel/tinycbor/files/patch-Makefile.configure | 10 ++++----
 4 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/devel/tinycbor/Makefile b/devel/tinycbor/Makefile
index 6319f1472ee5..d6df0174754e 100644
--- a/devel/tinycbor/Makefile
+++ b/devel/tinycbor/Makefile
@@ -1,8 +1,11 @@
 PORTNAME=	tinycbor
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
+PATCHTSITES=	https://github.com/intel/tinycbor/commit/
+PATCH_FILES=	628dee0d65f857d62ab1a6e1af9b9224d7df8fad.diff:-p1
+
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Concise Binary Object Representation (CBOR) library
 WWW=		https://github.com/intel/tinycbor
@@ -12,22 +15,24 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcjson.so:devel/libcjson
 
-USES=		gmake localbase pathfix
+USES=		gmake localbase:ldflags pathfix
 
 INSTALL_TARGET=	install-strip
 MAKE_ARGS=	SOVERSION=${PORTVERSION:R:R}
+PATHFIX_MAKEFILEIN=	Makefile
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 GH_ACCOUNT=	intel
 USE_GITHUB=	yes
 
+post-patch:
+	@${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/VERSION
+
 do-configure:
 	@cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} configure
 
 post-install:
-	${LN} -fs libtinycbor.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so
-	${LN} -fs libtinycbor.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so.${PORTVERSION:R:R}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so
 
 .include <bsd.port.mk>
diff --git a/devel/tinycbor/distinfo b/devel/tinycbor/distinfo
index e07790403e6b..871a06d3b7a0 100644
--- a/devel/tinycbor/distinfo
+++ b/devel/tinycbor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637072896
-SHA256 (intel-tinycbor-v0.6.0_GH0.tar.gz) = 512e2c9fce74f60ef9ed3af59161e905f9e19f30a52e433fc55f39f4c70d27e4
-SIZE (intel-tinycbor-v0.6.0_GH0.tar.gz) = 97160
+TIMESTAMP = 1742070254
+SHA256 (intel-tinycbor-v0.6.1_GH0.tar.gz) = 0f9944496d1143935e9c996bc6233ca0dd5451299def33ef400a409942f8f34b
+SIZE (intel-tinycbor-v0.6.1_GH0.tar.gz) = 102247
diff --git a/devel/tinycbor/files/patch-Makefile b/devel/tinycbor/files/patch-Makefile
index 1fe01b68706b..10725831cc63 100644
--- a/devel/tinycbor/files/patch-Makefile
+++ b/devel/tinycbor/files/patch-Makefile
@@ -1,19 +1,20 @@
---- Makefile.orig	2021-09-03 20:08:25 UTC
+--- Makefile.orig	2025-03-15 17:43:45 UTC
 +++ Makefile
-@@ -114,7 +114,7 @@ ifneq ($(cjson-pass)$(system-cjson-pass),)
-   JSON2CBOR_SOURCES = tools/json2cbor/json2cbor.c
-   INSTALL_TARGETS += $(bindir)/json2cbor
-   ifeq ($(system-cjson-pass),1)
--    LDFLAGS_CJSON = -lcjson
-+    LDFLAGS_CJSON = -I$(LOCALBASE)/include -L$(LOCALBASE)/lib -lcjson
-   else
-     JSON2CBOR_SOURCES += src/cjson/cJSON.c
-     json2cbor_CCFLAGS = -I$(SRCDIR)src/cjson
-@@ -238,7 +238,6 @@ tag: distcheck
- cflags := $(CPPFLAGS) -I$(SRCDIR)src
- cflags += -std=gnu99 $(CFLAGS) \
- 	-Werror=incompatible-pointer-types \
--	-Werror=implicit-function-declaration \
- 	-Werror=int-conversion
+@@ -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
index fd655c44f18c..15a7d452df1a 100644
--- a/devel/tinycbor/files/patch-Makefile.configure
+++ b/devel/tinycbor/files/patch-Makefile.configure
@@ -1,10 +1,10 @@
---- Makefile.configure.orig	2021-09-03 20:08:25 UTC
+--- Makefile.configure.orig	2025-03-12 01:32:15 UTC
 +++ Makefile.configure
-@@ -19,7 +19,7 @@ PROGRAM-cjson += \#include <cjson/cJSON.h>\n
- PROGRAM-cjson += int main() { return cJSON_False; }
- CCFLAGS-cjson = -I$(dir $(MAKEFILE))src
+@@ -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 = -lcjson
+-CCFLAGS-system-cjson = -I. -lcjson
 +CCFLAGS-system-cjson = -I$(LOCALBASE)/include -L$(LOCALBASE)/lib -lcjson
  
  sink: