git: 78aba5668d7b - main - devel/soft-serve: Update to 0.1.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 11 Dec 2021 07:31:27 UTC
The branch main has been updated by ashish:
URL: https://cgit.FreeBSD.org/ports/commit/?id=78aba5668d7bf9d553629e8d131ea9593b8db312
commit 78aba5668d7bf9d553629e8d131ea9593b8db312
Author: Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2021-12-11 07:05:10 +0000
Commit: Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2021-12-11 07:31:16 +0000
devel/soft-serve: Update to 0.1.2
- Also add a patch to fix building on 32-bit platforms[1]
Reported-by: pkg-fallout[1]
---
devel/soft-serve/Makefile | 9 ++++++++-
devel/soft-serve/distinfo | 6 +++---
...github.com_charmbracelet_bubbletea_cancelreader__bsd.go | 14 ++++++++++++++
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/devel/soft-serve/Makefile b/devel/soft-serve/Makefile
index 9080749789cd..f00801af4d89 100644
--- a/devel/soft-serve/Makefile
+++ b/devel/soft-serve/Makefile
@@ -1,6 +1,6 @@
PORTNAME= soft-serve
DISTVERSIONPREFIX= v
-DISTVERSION= 0.1.1
+DISTVERSION= 0.1.2
CATEGORIES= devel
MAINTAINER= ashish@FreeBSD.org
@@ -81,6 +81,13 @@ GROUPS= git
PLIST_FILES= ${DOCSDIR_REL}/README.md \
bin/${PORTNAME}
+.include <bsd.port.options.mk>
+
+# Patch for 32-bit platforms
+.if ${ARCH} == i386 || ${ARCH} == armv7 || ${ARCH} == armv6
+EXTRA_PATCHES+= ${FILESDIR}/extrapatch-vendor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go
+.endif
+
post-install:
${MV} ${STAGEDIR}${PREFIX}/bin/soft ${STAGEDIR}${PREFIX}/bin/soft-serve
${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/soft-serve/distinfo b/devel/soft-serve/distinfo
index 8f0f3dae647d..fb4f551a94d4 100644
--- a/devel/soft-serve/distinfo
+++ b/devel/soft-serve/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1639141381
-SHA256 (charmbracelet-soft-serve-v0.1.1_GH0.tar.gz) = 9c354c1c7620969a41af882f2ea03cddbefffd0edda5ccc70f57b75ad879d424
-SIZE (charmbracelet-soft-serve-v0.1.1_GH0.tar.gz) = 26459
+TIMESTAMP = 1639206184
+SHA256 (charmbracelet-soft-serve-v0.1.2_GH0.tar.gz) = 04599719f9582b6572ca79662f6da28cca689f922b5f28baa3e96edd65dae7b6
+SIZE (charmbracelet-soft-serve-v0.1.2_GH0.tar.gz) = 27235
SHA256 (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 0cb82f4cdba942af6b545695d694e91b9d9d56bd38555c81744235d7c6f6485d
SIZE (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 85568
SHA256 (ProtonMail-go-crypto-04723f9f07d7_GH0.tar.gz) = 09ca24a9956ebb6a8564ef17ab6b0eab6387938ac608a0c429f75360d3b176f5
diff --git a/devel/soft-serve/files/extrapatch-vendor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go b/devel/soft-serve/files/extrapatch-vendor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go
new file mode 100644
index 000000000000..877f7fcf2958
--- /dev/null
+++ b/devel/soft-serve/files/extrapatch-vendor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go
@@ -0,0 +1,14 @@
+--- vendor/github.com/charmbracelet/bubbletea/cancelreader_bsd.go.orig 2021-12-11 06:31:30 UTC
++++ vendor/github.com/charmbracelet/bubbletea/cancelreader_bsd.go
+@@ -134,9 +134,9 @@ func (r *kqueueCancelReader) wait() error {
+ }
+
+ switch events[0].Ident {
+- case uint64(r.file.Fd()):
++ case uint32(r.file.Fd()):
+ return nil
+- case uint64(r.cancelSignalReader.Fd()):
++ case uint32(r.cancelSignalReader.Fd()):
+ return errCanceled
+ }
+