From nobody Wed Nov 06 15:18:39 2024 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 4Xk83z3hJGz5chdJ; Wed, 06 Nov 2024 15:18:39 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xk83z21lGz4H9K; Wed, 6 Nov 2024 15:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730906319; 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=N1Q36r+nTK6E38FWIIQWQJJVA0HjCToFu3ZsfhXgHgE=; b=CBrTVBk2pSshlaDLq+M56yEDa5UJKk1aVPqvCF+377tnoDgcgd7EfqaakGu0gKYfc2J278 AAkdE3sGzCiYVVl06oN277ryugkLbX8E+AZw6U3HS6tarf3NGrq2e7LCkQLKFScj6HeIBd ZSg4gbeQ6JPpLz491m26Nbk5k1YLMTf2XHqaI1kJ+I5Y1JTGVYXvWFU+SjMvq01iDanV9h hDRNEKTieEm0aH2hIYIZroo1uI/V09koFSA2PCpwnm7T8YCnF8ZstvbOtaoj5L0ZfcQUqV 0Ba8TlfMzEeFxr0MnkBEMXcaYS83aeO+GojFyHd8f//y1CDPlC9w2tDJWQbyOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730906319; 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=N1Q36r+nTK6E38FWIIQWQJJVA0HjCToFu3ZsfhXgHgE=; b=yG2sFdwDTH1MAcAe7dWh040VtYCVCHnz8yZSse5LxUnZhCIxYoKEOVykCNbVTJzIWYlxpY ze6+JpVbXO86OPd6X6xBrFHca3UuHqR3bMb9PFW7kLXm+/tgm/f+tInDZwqSvPHgi2cqVV f58PFYL15PoP0NUbQa4HOcI0tlSj0McNtdtkKlPgSSMz5sBdSNsSn07bFIsSMJGsyx4XaB Pa/SE+KraEX1iaB1iFimmb2KvXEVL/OhgsbYxEYJ2d3rJKyasnl5etDluCeJgwEr8HvKOc ND1TfUbxCLqv/slm3IBguocVfm0gW14g2mIgOF23tyiuyD4n56LgZcQuMOVsRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730906319; a=rsa-sha256; cv=none; b=i5aoyABohBnN+gDh5plOwuc41wrHuSXBbD0bJ9wTO0uJXMlVaBgvmtd71ZMvw157Cfu+nD l0Vy8sdJ5PSa6+OIun1VVtgBWki2oJtCzXC+q2AzCj52wzi/K59beJbSwRBWMBC7ZiCHfz F+JeVYOdMPwPzDfMyGi09Sg0yKm13B4k9Wj8nWgXgEh+UlPiKJCraz7qRUW23Fz6+7cbBI cVhAi07GTl2teM4cMP4kKt+VqQqf4XdTW8WG/PqHIFSppvc7XGeTWy961DIOYzlrNRGsP2 9jitdo0FBlOEbghkC8nZiJfR9qIWlYHucDgXdIijsMIwPCuIzlvcCSLIpIQz+w== 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 4Xk83z1cqyz14t3; Wed, 6 Nov 2024 15:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A6FIdlI045084; Wed, 6 Nov 2024 15:18:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6FIdBq045081; Wed, 6 Nov 2024 15:18:39 GMT (envelope-from git) Date: Wed, 6 Nov 2024 15:18:39 GMT Message-Id: <202411061518.4A6FIdBq045081@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 1955155ac2df - main - databases/imposm3: fix build on arm64, riscv64 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1955155ac2df53b15a650e1da2f640b4a1db080b Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=1955155ac2df53b15a650e1da2f640b4a1db080b commit 1955155ac2df53b15a650e1da2f640b4a1db080b Author: Robert Clausecker AuthorDate: 2024-11-06 12:18:54 +0000 Commit: Robert Clausecker CommitDate: 2024-11-06 15:14:32 +0000 databases/imposm3: fix build on arm64, riscv64 Bump golang.org/x/sys dependency to a version new enough to support aarch64-freebsd and riscv64-freebsd. Approved by: portmgr (build fix blanket) MFH: 2024Q4 --- databases/imposm3/Makefile | 8 ++++- databases/imposm3/distinfo | 4 ++- databases/imposm3/files/patch-go.mod | 28 +++++++++++++++ databases/imposm3/files/patch-go.sum | 13 +++++++ databases/imposm3/files/patch-vendor_modules.txt | 44 ++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 2 deletions(-) diff --git a/databases/imposm3/Makefile b/databases/imposm3/Makefile index 58705c51d880..ae34b89f74e3 100644 --- a/databases/imposm3/Makefile +++ b/databases/imposm3/Makefile @@ -1,7 +1,7 @@ PORTNAME= imposm3 DISTVERSIONPREFIX= v DISTVERSION= 0.11.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= databases geography MAINTAINER= darcy@dbitech.ca @@ -15,6 +15,8 @@ LIB_DEPENDS= libgeos.so:graphics/geos \ libleveldb.so:databases/leveldb USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.26.0:sys GO_MODULE= github.com/omniscale/imposm3 GO_TARGET= ./cmd/imposm GO_BUILDFLAGS= -ldflags "\ @@ -25,6 +27,10 @@ PLIST_FILES= bin/imposm PORTEXAMPLES= example-mapping.json example-mapping.yml OPTIONS_DEFINE= EXAMPLES +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}) diff --git a/databases/imposm3/distinfo b/databases/imposm3/distinfo index bf2a56fa976b..bb4d7162be2e 100644 --- a/databases/imposm3/distinfo +++ b/databases/imposm3/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1675057218 +TIMESTAMP = 1730895212 SHA256 (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.mod) = 9aa4a2a81d8d8bdce8b45ad927017112d345d37ba85954c942dd49422c78a9da SIZE (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.mod) = 589 SHA256 (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.zip) = 1887daa48293a460bb64cae3800162329d7e7d455f1421bd3c8bffbc39544cec SIZE (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.zip) = 834723 +SHA256 (go/databases_imposm3/imposm3-v0.11.1/golang-sys-v0.26.0_GH0.tar.gz) = 584b9e1f84f2edfddedc60727a0296b053688fb30c4097490942981283c683e4 +SIZE (go/databases_imposm3/imposm3-v0.11.1/golang-sys-v0.26.0_GH0.tar.gz) = 1508756 diff --git a/databases/imposm3/files/patch-go.mod b/databases/imposm3/files/patch-go.mod new file mode 100644 index 000000000000..23a415f2e199 --- /dev/null +++ b/databases/imposm3/files/patch-go.mod @@ -0,0 +1,28 @@ +--- go.mod.orig 2024-11-06 12:16:45 UTC ++++ go.mod +@@ -1,17 +1,20 @@ module github.com/omniscale/imposm3 + module github.com/omniscale/imposm3 + +-go 1.12 ++go 1.17 + + require ( +- github.com/fsnotify/fsnotify v1.4.7 // indirect + github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 + github.com/jmhodges/levigo v0.0.0-20161115193449-c42d9e0ca023 +- github.com/kr/pretty v0.1.0 // indirect + github.com/lib/pq v1.8.0 + github.com/omniscale/go-osm v0.2.1 + github.com/pkg/errors v0.8.0 +- golang.org/x/sys v0.0.0-20171114162044-bf42f188b9bc // indirect ++ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 ++) ++ ++require ( ++ github.com/fsnotify/fsnotify v1.4.7 // indirect ++ github.com/kr/pretty v0.1.0 // indirect ++ golang.org/x/sys v0.26.0 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect + gopkg.in/fsnotify.v1 v1.4.2 // indirect +- gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 + ) diff --git a/databases/imposm3/files/patch-go.sum b/databases/imposm3/files/patch-go.sum new file mode 100644 index 000000000000..ea0b3abe7abb --- /dev/null +++ b/databases/imposm3/files/patch-go.sum @@ -0,0 +1,13 @@ +--- go.sum.orig 2024-11-06 12:16:42 UTC ++++ go.sum +@@ -15,8 +15,8 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2h + github.com/omniscale/go-osm v0.2.1/go.mod h1:JRbRitKdvYZcmq+6PhI81NP9b5B7sJSvxN9jCc4XGEc= + github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= + github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +-golang.org/x/sys v0.0.0-20171114162044-bf42f188b9bc h1:pt5pMsz4A/sZRT17MOvX/nidmCt7n6ILLJBkNh5QqC8= +-golang.org/x/sys v0.0.0-20171114162044-bf42f188b9bc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= ++golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/fsnotify.v1 v1.4.2 h1:AwZiD/bIUttYJ+n/k1UwlSUsM+VSE6id7UAnSKqQ+Tc= diff --git a/databases/imposm3/files/patch-vendor_modules.txt b/databases/imposm3/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..f99485acd29b --- /dev/null +++ b/databases/imposm3/files/patch-vendor_modules.txt @@ -0,0 +1,44 @@ +--- vendor/modules.txt.orig 2024-11-06 12:17:08 UTC ++++ vendor/modules.txt +@@ -1,15 +1,23 @@ ++# github.com/fsnotify/fsnotify v1.4.7 ++## explicit + # github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 ++## explicit + github.com/gogo/protobuf/gogoproto + github.com/gogo/protobuf/proto + github.com/gogo/protobuf/protoc-gen-gogo/descriptor + # github.com/jmhodges/levigo v0.0.0-20161115193449-c42d9e0ca023 ++## explicit + github.com/jmhodges/levigo ++# github.com/kr/pretty v0.1.0 ++## explicit + # github.com/lib/pq v1.8.0 ++## explicit; go 1.13 + github.com/lib/pq + github.com/lib/pq/hstore + github.com/lib/pq/oid + github.com/lib/pq/scram + # github.com/omniscale/go-osm v0.2.1 ++## explicit + github.com/omniscale/go-osm + github.com/omniscale/go-osm/parser/diff + github.com/omniscale/go-osm/parser/pbf +@@ -19,10 +27,16 @@ github.com/omniscale/go-osm/state + github.com/omniscale/go-osm/replication/internal/source + github.com/omniscale/go-osm/state + # github.com/pkg/errors v0.8.0 ++## explicit + github.com/pkg/errors +-# golang.org/x/sys v0.0.0-20171114162044-bf42f188b9bc ++# golang.org/x/sys v0.26.0 ++## explicit; go 1.18 + golang.org/x/sys/unix ++# gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 ++## explicit + # gopkg.in/fsnotify.v1 v1.4.2 ++## explicit + gopkg.in/fsnotify.v1 + # gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 ++## explicit + gopkg.in/yaml.v2