git: deb995b311c1 - main - devel/tinycbor: Update to 0.6.0

The branch main has been updated by sunpoet:

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

commit deb995b311c149e7d417483f8f9a696578e9e204
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2021-11-21 18:19:07 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2021-11-21 18:19:07 +0000

    devel/tinycbor: Update to 0.6.0
    
    Changes:        https://github.com/intel/tinycbor/releases
---
 devel/tinycbor/Makefile                       |  2 +-
 devel/tinycbor/distinfo                       |  6 +++---
 devel/tinycbor/files/patch-Makefile           | 14 +++++++++++---
 devel/tinycbor/files/patch-Makefile.configure |  6 +++---
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/devel/tinycbor/Makefile b/devel/tinycbor/Makefile
index cddacf5c4cf8..e8de82505083 100644
--- a/devel/tinycbor/Makefile
+++ b/devel/tinycbor/Makefile
@@ -1,7 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	tinycbor
-PORTVERSION=	0.5.4
+PORTVERSION=	0.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
diff --git a/devel/tinycbor/distinfo b/devel/tinycbor/distinfo
index b264879b6324..e07790403e6b 100644
--- a/devel/tinycbor/distinfo
+++ b/devel/tinycbor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632036864
-SHA256 (intel-tinycbor-v0.5.4_GH0.tar.gz) = e63668a71fd6d7abf1727dc31682ec7f107599a3c024a445c3e5da6af9328983
-SIZE (intel-tinycbor-v0.5.4_GH0.tar.gz) = 89970
+TIMESTAMP = 1637072896
+SHA256 (intel-tinycbor-v0.6.0_GH0.tar.gz) = 512e2c9fce74f60ef9ed3af59161e905f9e19f30a52e433fc55f39f4c70d27e4
+SIZE (intel-tinycbor-v0.6.0_GH0.tar.gz) = 97160
diff --git a/devel/tinycbor/files/patch-Makefile b/devel/tinycbor/files/patch-Makefile
index 61d5e03a53b6..1fe01b68706b 100644
--- a/devel/tinycbor/files/patch-Makefile
+++ b/devel/tinycbor/files/patch-Makefile
@@ -1,11 +1,19 @@
---- Makefile.orig	2018-01-30 22:21:35 UTC
+--- Makefile.orig	2021-09-03 20:08:25 UTC
 +++ Makefile
-@@ -103,7 +103,7 @@ ifneq ($(cjson-pass)$(system-cjson-pass)
+@@ -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 = -L$(LOCALBASE)/lib -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
+ %.o: %.c
+ 	@test -d $(@D) || $(MKDIR) $(@D)
diff --git a/devel/tinycbor/files/patch-Makefile.configure b/devel/tinycbor/files/patch-Makefile.configure
index a7727e18a013..fd655c44f18c 100644
--- a/devel/tinycbor/files/patch-Makefile.configure
+++ b/devel/tinycbor/files/patch-Makefile.configure
@@ -1,8 +1,8 @@
---- Makefile.configure.orig	2018-01-30 22:21:35 UTC
+--- Makefile.configure.orig	2021-09-03 20:08:25 UTC
 +++ Makefile.configure
-@@ -14,7 +14,7 @@ PROGRAM-cjson += \#include <cjson/cJSON.
+@@ -19,7 +19,7 @@ PROGRAM-cjson += \#include <cjson/cJSON.h>\n
  PROGRAM-cjson += int main() { return cJSON_False; }
- CCFLAGS-cjson = -I$(dir $(MAKEFILE))src/cjson
+ CCFLAGS-cjson = -I$(dir $(MAKEFILE))src
  PROGRAM-system-cjson = $(PROGRAM-cjson)
 -CCFLAGS-system-cjson = -lcjson
 +CCFLAGS-system-cjson = -I$(LOCALBASE)/include -L$(LOCALBASE)/lib -lcjson