git: 1d61daa91239 - main - graphics/tippecanoe: Update to tippecanoe 2.26.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 05 Jun 2023 08:47:34 UTC
The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d61daa912396e4f5d31d130fe9600540ba6644b commit 1d61daa912396e4f5d31d130fe9600540ba6644b Author: Darcy Buskermolen <darcy@dbitech.ca> AuthorDate: 2023-06-03 16:54:06 +0000 Commit: Matthew Seaman <matthew@FreeBSD.org> CommitDate: 2023-06-05 08:47:22 +0000 graphics/tippecanoe: Update to tippecanoe 2.26.1 Maintainer update to Version 2.26.1 Add bash to BUILD_DEPENDS Suppress clang16 build failure on i386: non-constant-expression cannot be narrowed from type 'uint64_t' Changes: https://github.com/felt/tippecanoe/releases/tag/2.26.1 PR: 271789 --- graphics/tippecanoe/Makefile | 11 +++++++++-- graphics/tippecanoe/distinfo | 6 +++--- graphics/tippecanoe/files/patch-Makefile | 11 ----------- graphics/tippecanoe/files/patch-main.cpp | 11 ----------- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/graphics/tippecanoe/Makefile b/graphics/tippecanoe/Makefile index b9769100e6e9..9b059606ee0d 100644 --- a/graphics/tippecanoe/Makefile +++ b/graphics/tippecanoe/Makefile @@ -1,5 +1,5 @@ PORTNAME= tippecanoe -DISTVERSION= 2.6.3 +DISTVERSION= 2.26.1 CATEGORIES= graphics MAINTAINER= darcy@dbitech.ca @@ -10,6 +10,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +BUILD_DEPENDS= bash:shells/bash USES= gmake USE_GITHUB= yes @@ -17,9 +18,15 @@ USE_GITHUB= yes GH_ACCOUNT= felt PLIST_FILES= bin/tile-join bin/tippecanoe bin/tippecanoe-decode \ - bin/tippecanoe-enumerate bin/tippecanoe-json-tool \ + bin/tippecanoe-enumerate bin/tippecanoe-json-tool \ man/man1/tippecanoe.1.gz +# Suppress a clang-16 error on 32-bit arch: +# non-constant-expression cannot be narrowed from type 'uint64_t' +.if ${ARCH} == i386 +CXXFLAGS+= -Wno-narrowing +.endif + do-install: .for file in tile-join tippecanoe tippecanoe-decode tippecanoe-enumerate tippecanoe-json-tool ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${STAGEDIR$}${PREFIX}/bin diff --git a/graphics/tippecanoe/distinfo b/graphics/tippecanoe/distinfo index 267f0163d958..88eba5e97e4e 100644 --- a/graphics/tippecanoe/distinfo +++ b/graphics/tippecanoe/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664625361 -SHA256 (felt-tippecanoe-2.6.3_GH0.tar.gz) = 83389045ba5bd1b1e9ec71276331ae394bd9ac70626e78c2a4c73563b79e4300 -SIZE (felt-tippecanoe-2.6.3_GH0.tar.gz) = 17326509 +TIMESTAMP = 1685722069 +SHA256 (felt-tippecanoe-2.26.1_GH0.tar.gz) = 2b4ff69b76f5d4ec207ffcfedf1da163d3b403275a05b1d741bdd4746b728df7 +SIZE (felt-tippecanoe-2.26.1_GH0.tar.gz) = 20256693 diff --git a/graphics/tippecanoe/files/patch-Makefile b/graphics/tippecanoe/files/patch-Makefile deleted file mode 100644 index 1ffd57cee0f8..000000000000 --- a/graphics/tippecanoe/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2022-09-27 16:15:54 UTC -+++ Makefile -@@ -1,7 +1,7 @@ - PREFIX ?= /usr/local - MANDIR ?= $(PREFIX)/share/man/man1/ - BUILDTYPE ?= Release --SHELL = /bin/bash -+SHELL = /bin/sh - - # inherit from env if set - CC := $(CC) diff --git a/graphics/tippecanoe/files/patch-main.cpp b/graphics/tippecanoe/files/patch-main.cpp deleted file mode 100644 index 6000fc22a4dc..000000000000 --- a/graphics/tippecanoe/files/patch-main.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- main.cpp.orig 2022-09-27 16:15:54 UTC -+++ main.cpp -@@ -34,7 +34,7 @@ - #include <map> - #include <cmath> - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - #include <sys/types.h> - #include <sys/sysctl.h> - #include <sys/param.h>