From nobody Mon Jun 05 08:47:34 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QZS0l1M86z4bNpm; Mon, 5 Jun 2023 08:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QZS0k6kT5z443B; Mon, 5 Jun 2023 08:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685954854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t76O+NT2+qmklvVArhbyBSZmMEcfN7oqIeUzI07bLzo=; b=qMJ2JLoZsyqRDJ8MeaDeT0UP9SDR0dp+3QKXRDJ1Zla1GlNaJWAddzDY0QuRNEgt0igkkk y9pA+bU8R1yyIKBEu8/25Sz9465WNswQgXiQzIyNogIeJyWcpE1AIIEh5lGMviaPIZvyZz bAW7aT0tTeAULegjoaeap2kq05UeD/9CpHmRiLYptbDvfM5x4EdhMztK8z/Dhk2cIBr2zm bgowI3ju6mBAY9QPdLmbnRQnurvE88z5+4vDs7jEcx8uPLDEPthIRBKCDJLJ4g7Gl2ZUyA RL5B8dsnoG5ncb5AlSsLzvkxFECw78OVb7H4ArFNhFJAudV1mxWqIqY8/rsUEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685954854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t76O+NT2+qmklvVArhbyBSZmMEcfN7oqIeUzI07bLzo=; b=wEfT4OQJxu9ZAPERhclqe+aUPwBQUEHY1EEiR8eLTfG5wJEPo85JdKuoA5ONuTdk+afqGZ pKhJpd3F2SwmtnDRsKpcrujXPQbwSavLblhpFqhsUfZznvzzliy8K3iwzxytDF67PMqOyr JR/F3qsmqpqaY+33RogEmHF+o03NLj8wfBs56fYw+rZAk4xgEZonnAsG5KcUum7MEw5UCb jap9qS/EldxGZ38lxblWzCSUfdwBS43/cnIJwMY4k1YrUQu4WHN0mPZzzYb4b6hB0aZQcu tF8mUrZ612J1nP/hdnzwfljFwb23cydj3q+0oFokp3tUq8BEnyKEw9GkTTmjJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685954854; a=rsa-sha256; cv=none; b=c9UWw7taSncEJO/ND33VgTj9nQAhBKRvqozY6Y4ycaewitZds4O+Wg15epe778iw5eZqjR ZOZ/vTS1XdgQFhGNEGJi0iIDcjrcQgLI1O1+UD1ZAuRpwV7BrK2978yE8xIqPlZ2gwKaBY dWyRE4+OBGWJEyMWQMCWCqgGAoILIWK8O37nqC8uzSp7ZOqHN4aAbU4w4gMaDREe2GwWtK jlZ7vkWT709HOP89QFsC2peooeYsb187MjOedPyK0R5sWi/x9bh8ZFLr+A4n6jl+2gjJy5 J7esyEsGkfKYh9FitoUewH7xaIJSZ/a5fR1pCWOn5C4j0S73gP3kFYtV+K+7LA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QZS0k5gqVzhLp; Mon, 5 Jun 2023 08:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3558lYpn042070; Mon, 5 Jun 2023 08:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3558lYsL042069; Mon, 5 Jun 2023 08:47:34 GMT (envelope-from git) Date: Mon, 5 Jun 2023 08:47:34 GMT Message-Id: <202306050847.3558lYsL042069@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: 1d61daa91239 - main - graphics/tippecanoe: Update to tippecanoe 2.26.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d61daa912396e4f5d31d130fe9600540ba6644b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d61daa912396e4f5d31d130fe9600540ba6644b commit 1d61daa912396e4f5d31d130fe9600540ba6644b Author: Darcy Buskermolen AuthorDate: 2023-06-03 16:54:06 +0000 Commit: Matthew Seaman 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 - #include - --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - #include - #include - #include