From nobody Sat Dec 11 07:31:27 2021 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 A77DB18D2A66; Sat, 11 Dec 2021 07:31:27 +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 4J9zwb1z4Nz3QBm; Sat, 11 Dec 2021 07:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 24CCB204D; Sat, 11 Dec 2021 07:31:27 +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 1BB7VRIa088946; Sat, 11 Dec 2021 07:31:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BB7VRWJ088945; Sat, 11 Dec 2021 07:31:27 GMT (envelope-from git) Date: Sat, 11 Dec 2021 07:31:27 GMT Message-Id: <202112110731.1BB7VRWJ088945@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 78aba5668d7b - main - devel/soft-serve: Update to 0.1.2 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: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78aba5668d7bf9d553629e8d131ea9593b8db312 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639207887; 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=ZAsapBIKT3W2R/ciuG0fzrT4bEK7KMS6su/VNkhZP1w=; b=FmHspz2MXLoSKRITwkYcLhzP+fEPboKsfq+71vn3D3z3cBMy4jjijFt8GdfWIYN4iX14jI WeMQrwBVRKPt8tDEK3tw7Gpea9BC89LpRJCXk1j7iDEdCb6yayaLnPd1KnmMM6Rn83TCG/ Dpo2yH6UahPHK/U5I+Wy88C35UAP4UYSu4cgumlB/rUiaNyoEZH8GYMVb2Ty4KzbuQhaRJ JeH2Pep5dUGBWGvbo2M4WMnqYZsdjTtOTMUobHNDxBGgxELRMtrUOAn/K+oGkxbEH4H0KZ TMfTPsjzGy/vH+hmsFmlvqpFRsRsPoumcuNQ9y+BFIX7CbKIEu4GO93nu8lM6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639207887; a=rsa-sha256; cv=none; b=MNK3yAkZe61f0ilp3L4Uu+C2YieHNxM40oKEU76rineiHK6AGa7a5eT1XPiIEPPMBSPMQb YHT744yDnTgCgAH/RAk6UmDYjn6oGrKWq9uokx1HipIie0cG/560snIXKrbc6h8OfjKkrP TXmVKixHZJy0ku4/3VXjswPKsj3gSAB0KfRyknNmJuP/mrLb+NvPoUjQ7OrcNZFErIZ1a5 HzTPy0WkZBDf4Eu+uPxLNDAkt5WqA1dcK54uprQHTka1PaAVhpVQ5mgjAdz0xpy8ygV6z9 HVQ9nkRgEMaGebU6ei+JmTc7wthWZ1NpH/C6LREq7s3VO+01M3iDFfm9vURCoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=78aba5668d7bf9d553629e8d131ea9593b8db312 commit 78aba5668d7bf9d553629e8d131ea9593b8db312 Author: Ashish SHUKLA AuthorDate: 2021-12-11 07:05:10 +0000 Commit: Ashish SHUKLA 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 + +# 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 + } +