git: 2b661526f570 - main - net/frp: fix build on riscv64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Mar 2023 11:27:25 UTC
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b661526f5709fcd7ebb3720273c7c1cb635c079 commit 2b661526f5709fcd7ebb3720273c7c1cb635c079 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-03-25 11:13:14 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-03-27 11:24:58 +0000 net/frp: fix build on riscv64 Bump golang.org/x/{net,sys,text} dependencies to versions new enough to support riscv64-freebsd. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) --- net/frp/Makefile | 12 +++++++++++- net/frp/distinfo | 8 +++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/net/frp/Makefile b/net/frp/Makefile index 74fdadc89efc..1534f3bf1a73 100644 --- a/net/frp/Makefile +++ b/net/frp/Makefile @@ -1,7 +1,7 @@ PORTNAME= frp DISTVERSIONPREFIX= v DISTVERSION= 0.45.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -12,6 +12,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:net:v0.8.0:net \ + golang:sys:v0.6.0:sys \ + golang:text:v0.8.0:text GO_MODULE= github.com/fatedier/frp GO_TARGET= ./cmd/frpc ./cmd/frps @@ -20,6 +24,12 @@ USER= nobody SUB_LIST= USER=${USER} USE_RC_SUBR= ${PORTNAME}s +pre-patch: +.for m in net sys test + ${RM} -r ${WRKSRC}/vendor/golang.org/x/$m + ${LN} -s ${WRKDIR}/$m-* ${WRKSRC}/vendor/golang.org/x/$m +.endfor + post-install: ${INSTALL_DATA} ${WRKSRC}/conf/frps.ini ${STAGEDIR}${PREFIX}/etc/frps.ini.sample diff --git a/net/frp/distinfo b/net/frp/distinfo index 886610711d32..e4ae5a0a614d 100644 --- a/net/frp/distinfo +++ b/net/frp/distinfo @@ -1,5 +1,11 @@ -TIMESTAMP = 1666974352 +TIMESTAMP = 1679742375 SHA256 (go/net_frp/frp-v0.45.0/v0.45.0.mod) = 2e0af530bd1fd1479667cf35feae544d645f3eb475db42fa3c36cab8fe05d0c2 SIZE (go/net_frp/frp-v0.45.0/v0.45.0.mod) = 2933 SHA256 (go/net_frp/frp-v0.45.0/v0.45.0.zip) = 8c353832727a71bc5fd0f5ef4b9a2d92fe081ffc7e3f5ceac2ec2cf43761c6d0 SIZE (go/net_frp/frp-v0.45.0/v0.45.0.zip) = 1411497 +SHA256 (go/net_frp/frp-v0.45.0/golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831 +SIZE (go/net_frp/frp-v0.45.0/golang-net-v0.8.0_GH0.tar.gz) = 1244302 +SHA256 (go/net_frp/frp-v0.45.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/net_frp/frp-v0.45.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 +SHA256 (go/net_frp/frp-v0.45.0/golang-text-v0.8.0_GH0.tar.gz) = aeaec799a8e0b02523c80fed03383da04bf1b9c9ef431ed4d34b70488fbeaa64 +SIZE (go/net_frp/frp-v0.45.0/golang-text-v0.8.0_GH0.tar.gz) = 8359526