Date: Wed, 3 Aug 2022 20:31:45 GMT From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 19e947300d02 - main - devel/soft-serve: Update to 0.3.3 Message-ID: <202208032031.273KVjSQ039581@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=19e947300d025a2d0974320aecc5d13561ad2702 commit 19e947300d025a2d0974320aecc5d13561ad2702 Author: Ashish SHUKLA <ashish@FreeBSD.org> AuthorDate: 2022-08-03 20:03:14 +0000 Commit: Ashish SHUKLA <ashish@FreeBSD.org> CommitDate: 2022-08-03 20:31:37 +0000 devel/soft-serve: Update to 0.3.3 - Update rc.d script due to change in command-line options - Purge 32-bit platform patch as it's not applicable anymore --- devel/soft-serve/Makefile | 27 ++++++------- devel/soft-serve/distinfo | 44 ++++++++++++---------- ...om_charmbracelet_bubbletea_cancelreader__bsd.go | 17 --------- devel/soft-serve/files/soft-serve.in | 2 +- 4 files changed, 38 insertions(+), 52 deletions(-) diff --git a/devel/soft-serve/Makefile b/devel/soft-serve/Makefile index 01c65f4caa78..ef6a36c9bba6 100644 --- a/devel/soft-serve/Makefile +++ b/devel/soft-serve/Makefile @@ -1,7 +1,6 @@ PORTNAME= soft-serve DISTVERSIONPREFIX= v -DISTVERSION= 0.3.2 -PORTREVISION= 1 +DISTVERSION= 0.3.3 CATEGORIES= devel MAINTAINER= ashish@FreeBSD.org @@ -24,11 +23,11 @@ GH_TUPLE= Microsoft:go-winio:v0.5.1:microsoft_go_winio/vendor/github.com/Microso aymerick:douceur:v0.2.0:aymerick_douceur/vendor/github.com/aymerick/douceur \ caarlos0:env:v6.9.1:caarlos0_env_v6/vendor/github.com/caarlos0/env/v6 \ caarlos0:sshmarshal:v0.1.0:caarlos0_sshmarshal/vendor/github.com/caarlos0/sshmarshal \ - charmbracelet:bubbles:88562515cf7b:charmbracelet_bubbles/vendor/github.com/charmbracelet/bubbles \ - charmbracelet:bubbletea:v0.20.0:charmbracelet_bubbletea/vendor/github.com/charmbracelet/bubbletea \ + charmbracelet:bubbles:v0.11.0:charmbracelet_bubbles/vendor/github.com/charmbracelet/bubbles \ + charmbracelet:bubbletea:v0.22.0:charmbracelet_bubbletea/vendor/github.com/charmbracelet/bubbletea \ charmbracelet:glamour:v0.4.0:charmbracelet_glamour/vendor/github.com/charmbracelet/glamour \ charmbracelet:keygen:v0.3.0:charmbracelet_keygen/vendor/github.com/charmbracelet/keygen \ - charmbracelet:lipgloss:v0.4.0:charmbracelet_lipgloss/vendor/github.com/charmbracelet/lipgloss \ + charmbracelet:lipgloss:v0.5.0:charmbracelet_lipgloss/vendor/github.com/charmbracelet/lipgloss \ charmbracelet:wish:v0.5.0:charmbracelet_wish/vendor/github.com/charmbracelet/wish \ containerd:console:v1.0.3:containerd_console/vendor/github.com/containerd/console \ dlclark:regexp2:v1.4.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \ @@ -39,13 +38,13 @@ GH_TUPLE= Microsoft:go-winio:v0.5.1:microsoft_go_winio/vendor/github.com/Microso go-git:go-billy:v5.3.1:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \ go-git:go-git:b4368b2a2ca4:go_git_go_git_v5/vendor/github.com/go-git/go-git/v5 \ go-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \ - go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \ + go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \ gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \ - gogs:git-module:v1.6.0:gogs_git_module/vendor/github.com/gogs/git-module \ + gogs:git-module:v1.6.1:gogs_git_module/vendor/github.com/gogs/git-module \ golang:crypto:efcb8507fb70:golang_crypto/vendor/golang.org/x/crypto \ golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \ golang:net:cd36cc0744dd:golang_net/vendor/golang.org/x/net \ - golang:sys:5a964db01320:golang_sys/vendor/golang.org/x/sys \ + golang:sys:3681064d5158:golang_sys/vendor/golang.org/x/sys \ golang:term:03fcf44c2211:golang_term/vendor/golang.org/x/term \ gorilla:css:v1.0.0:gorilla_css/vendor/github.com/gorilla/css \ imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \ @@ -60,15 +59,18 @@ GH_TUPLE= Microsoft:go-winio:v0.5.1:microsoft_go_winio/vendor/github.com/Microso microcosm-cc:bluemonday:v1.0.17:microcosm_cc_bluemonday/vendor/github.com/microcosm-cc/bluemonday \ mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ muesli:ansi:c9f0611b6c70:muesli_ansi/vendor/github.com/muesli/ansi \ + muesli:cancelreader:v0.2.1:muesli_cancelreader/vendor/github.com/muesli/cancelreader \ + muesli:mango-cobra:v1.2.0:muesli_mango_cobra/vendor/github.com/muesli/mango-cobra \ + muesli:mango-pflag:v0.1.0:muesli_mango_pflag/vendor/github.com/muesli/mango-pflag \ muesli:mango:v0.1.0:muesli_mango/vendor/github.com/muesli/mango \ muesli:reflow:v0.3.0:muesli_reflow/vendor/github.com/muesli/reflow \ muesli:roff:v0.1.0:muesli_roff/vendor/github.com/muesli/roff \ - muesli:termenv:44cd13922739:muesli_termenv/vendor/github.com/muesli/termenv \ + muesli:termenv:v0.12.0:muesli_termenv/vendor/github.com/muesli/termenv \ olekukonko:tablewriter:v0.0.5:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \ rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \ sahilm:fuzzy:v0.1.0:sahilm_fuzzy/vendor/github.com/sahilm/fuzzy \ sergi:go-diff:v1.1.0:sergi_go_diff/vendor/github.com/sergi/go-diff \ - spf13:cobra:v1.4.0:spf13_cobra/vendor/github.com/spf13/cobra \ + spf13:cobra:v1.5.0:spf13_cobra/vendor/github.com/spf13/cobra \ spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \ xanzy:ssh-agent:v0.3.1:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \ yuin:goldmark-emoji:v1.0.1:yuin_goldmark_emoji/vendor/github.com/yuin/goldmark-emoji \ @@ -94,11 +96,6 @@ PLIST_FILES= ${DOCSDIR_REL}/README.md \ .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 adfb38f6994f..43962f0c4021 100644 --- a/devel/soft-serve/distinfo +++ b/devel/soft-serve/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1655449539 -SHA256 (charmbracelet-soft-serve-v0.3.2_GH0.tar.gz) = e81d557ed3b51979560a393330359b998b8ba1155884a9a406eb568aef9e7408 -SIZE (charmbracelet-soft-serve-v0.3.2_GH0.tar.gz) = 48380 +TIMESTAMP = 1659556965 +SHA256 (charmbracelet-soft-serve-v0.3.3_GH0.tar.gz) = eb6bf671a1e5ecbedc9736516f6d65027968480c6d502e72644ed2cca42f9a1f +SIZE (charmbracelet-soft-serve-v0.3.3_GH0.tar.gz) = 49260 SHA256 (Microsoft-go-winio-v0.5.1_GH0.tar.gz) = 7d68437cf732590f4c3002d8a1b446f3f584387c3538bdd4862ebff5b0b8dda9 SIZE (Microsoft-go-winio-v0.5.1_GH0.tar.gz) = 91153 SHA256 (ProtonMail-go-crypto-70ae35bab23f_GH0.tar.gz) = 2c219269633c8fb5d061b7ed67ae71f8c52eacaebf9d226fd88b96a294cbce53 @@ -19,16 +19,16 @@ SHA256 (caarlos0-env-v6.9.1_GH0.tar.gz) = cf036161dd0de2e707bfc2d0dd7cda3247258b SIZE (caarlos0-env-v6.9.1_GH0.tar.gz) = 17363 SHA256 (caarlos0-sshmarshal-v0.1.0_GH0.tar.gz) = f6135450c494da7d3f79b25fa9d9294368fdd769910201c69b968bed305c2b8a SIZE (caarlos0-sshmarshal-v0.1.0_GH0.tar.gz) = 11934 -SHA256 (charmbracelet-bubbles-88562515cf7b_GH0.tar.gz) = 4b08eaf7025eec950ecb6c36bdd61dde6c709aeddf9dcc2ae711cec43cdbae5a -SIZE (charmbracelet-bubbles-88562515cf7b_GH0.tar.gz) = 35832 -SHA256 (charmbracelet-bubbletea-v0.20.0_GH0.tar.gz) = 6f25c09eee16d858bde223f01e491d4781caef10241b3d99ff7eb4263c3cfe68 -SIZE (charmbracelet-bubbletea-v0.20.0_GH0.tar.gz) = 65966 +SHA256 (charmbracelet-bubbles-v0.11.0_GH0.tar.gz) = 05236d144e58eb937fd8a1581d8cb46d17b31db4bee324d81879abe7ddd61255 +SIZE (charmbracelet-bubbles-v0.11.0_GH0.tar.gz) = 35493 +SHA256 (charmbracelet-bubbletea-v0.22.0_GH0.tar.gz) = 1600ab35e22d1b823a2c154c616cf2dba4b04153888d6ef2a89b1a84d4dcfc0f +SIZE (charmbracelet-bubbletea-v0.22.0_GH0.tar.gz) = 70481 SHA256 (charmbracelet-glamour-v0.4.0_GH0.tar.gz) = 7d1e5dc8b76a6a7d049f26cece0a266851af8a010d00c7e3c068d74a0d7fda2b SIZE (charmbracelet-glamour-v0.4.0_GH0.tar.gz) = 534481 SHA256 (charmbracelet-keygen-v0.3.0_GH0.tar.gz) = 78227863998b69cc7af59018f07d59ce52d53aa36a5de770ccdaf6826405befd SIZE (charmbracelet-keygen-v0.3.0_GH0.tar.gz) = 11381 -SHA256 (charmbracelet-lipgloss-v0.4.0_GH0.tar.gz) = c2f5ad6afcd9e4f3c21b523c5c8ecf077451029ac7e7b36ae6e8c2ce54eba194 -SIZE (charmbracelet-lipgloss-v0.4.0_GH0.tar.gz) = 26872 +SHA256 (charmbracelet-lipgloss-v0.5.0_GH0.tar.gz) = 44b91523053226f939f2d08ec091343203c6eafb77efcecbd1742c461fbd7551 +SIZE (charmbracelet-lipgloss-v0.5.0_GH0.tar.gz) = 27283 SHA256 (charmbracelet-wish-v0.5.0_GH0.tar.gz) = 3dce4aaf0570da6580a04c4b7bd256998efc0f5bb7a6926d166ca7b3991278a4 SIZE (charmbracelet-wish-v0.5.0_GH0.tar.gz) = 35606 SHA256 (containerd-console-v1.0.3_GH0.tar.gz) = 61bc166fd91d4639870a2395ce7a89cb4585d343c521fcd397bef66324772f91 @@ -49,20 +49,20 @@ SHA256 (go-git-go-git-b4368b2a2ca4_GH0.tar.gz) = e6ba75f456355f1203cb176556c3f9a SIZE (go-git-go-git-b4368b2a2ca4_GH0.tar.gz) = 464092 SHA256 (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 4712c4ceae321433d8c1d9ebc6afd154d7932c849129ded48b1c4a51c21275e8 SIZE (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 3769 -SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04 -SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898 +SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5 +SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173 SHA256 (gobwas-glob-v0.2.3_GH0.tar.gz) = 325026fc78bcebcf31151b6e060f4e1c3321b04ded3dab63b63610b323c10850 SIZE (gobwas-glob-v0.2.3_GH0.tar.gz) = 25962 -SHA256 (gogs-git-module-v1.6.0_GH0.tar.gz) = 11290a37de254a4dfb76fc010e2cc9e3de036cb50ffa9dd4112c4cf14a3819d7 -SIZE (gogs-git-module-v1.6.0_GH0.tar.gz) = 49874 +SHA256 (gogs-git-module-v1.6.1_GH0.tar.gz) = 9dc4503809c0412d9b10e2d1d2f953450a0bb75b299bd1000a42158a156c5064 +SIZE (gogs-git-module-v1.6.1_GH0.tar.gz) = 50623 SHA256 (golang-crypto-efcb8507fb70_GH0.tar.gz) = f4b0d66f80d7a2327fd90bf294f3ad1b81fce75aa4d45af9d8dcada7a73bf4e6 SIZE (golang-crypto-efcb8507fb70_GH0.tar.gz) = 1628012 SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394 SIZE (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 26101 SHA256 (golang-net-cd36cc0744dd_GH0.tar.gz) = ec4567caa40e6a703e0881443623d13a812136dc2fc13935e129835fb5336076 SIZE (golang-net-cd36cc0744dd_GH0.tar.gz) = 1228759 -SHA256 (golang-sys-5a964db01320_GH0.tar.gz) = ab75cf42cf98e0805ae507a9e4852324f7ea88cac4baaf3053e2ec90c3f56cf0 -SIZE (golang-sys-5a964db01320_GH0.tar.gz) = 1256823 +SHA256 (golang-sys-3681064d5158_GH0.tar.gz) = c084b1b6a081b78986c7364ec483397d6c128aa447ab672aa132fda309bd4db7 +SIZE (golang-sys-3681064d5158_GH0.tar.gz) = 1258557 SHA256 (golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d90072357524ee557d7df106b426def02a8e5f3 SIZE (golang-term-03fcf44c2211_GH0.tar.gz) = 14972 SHA256 (gorilla-css-v1.0.0_GH0.tar.gz) = 9decf83063b85bcd5392f645fac322e986b5fc596b3e44c3be02ee5939106f4c @@ -91,14 +91,20 @@ SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b6 SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362 SHA256 (muesli-ansi-c9f0611b6c70_GH0.tar.gz) = 4abe461febbb907fbce2eb7c2059488b7b95c9b20edb1ae7c8c4505a64460c29 SIZE (muesli-ansi-c9f0611b6c70_GH0.tar.gz) = 5131 +SHA256 (muesli-cancelreader-v0.2.1_GH0.tar.gz) = 06f55ace8bba4ad796f07838b05d8f72685fccfae245a19a0862e90d4d58f726 +SIZE (muesli-cancelreader-v0.2.1_GH0.tar.gz) = 9422 +SHA256 (muesli-mango-cobra-v1.2.0_GH0.tar.gz) = b3ffda6be154fe7e7ac1c3d1c1f9fb543d2def738c9454d7866a0759f4a6502e +SIZE (muesli-mango-cobra-v1.2.0_GH0.tar.gz) = 4872 +SHA256 (muesli-mango-pflag-v0.1.0_GH0.tar.gz) = 401388ad1f0e75c26b748884362f29866f8e5f796a2f7dd2bb0793ac4067458d +SIZE (muesli-mango-pflag-v0.1.0_GH0.tar.gz) = 3858 SHA256 (muesli-mango-v0.1.0_GH0.tar.gz) = 358228555e484bf7bafeb8d46f49461ea99752e874e4b074bdcb13a6ec6141c8 SIZE (muesli-mango-v0.1.0_GH0.tar.gz) = 35558 SHA256 (muesli-reflow-v0.3.0_GH0.tar.gz) = f797b8c25d447e314ad92b155433562446c683924171be1698ad44f24c79f651 SIZE (muesli-reflow-v0.3.0_GH0.tar.gz) = 21245 SHA256 (muesli-roff-v0.1.0_GH0.tar.gz) = cfc5290374b43e2a3197f39701ec6fee32b79a67f47c5102c7430eba88a9826c SIZE (muesli-roff-v0.1.0_GH0.tar.gz) = 4925 -SHA256 (muesli-termenv-44cd13922739_GH0.tar.gz) = 6ea80ef74dcf5fab19d0a3c8c2b38542ea4bb3621f82cc3db042860b15606234 -SIZE (muesli-termenv-44cd13922739_GH0.tar.gz) = 412112 +SHA256 (muesli-termenv-v0.12.0_GH0.tar.gz) = 2361bbc46d79de427ede90090ad9c16f478ff60d5fd7ba14feaaff23737344e6 +SIZE (muesli-termenv-v0.12.0_GH0.tar.gz) = 412157 SHA256 (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 14a1294a8267facc9bc99a230b8871517e6db284ccc7e39030313befa124677f SIZE (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 19568 SHA256 (rivo-uniseg-v0.2.0_GH0.tar.gz) = 3ad738b5c9162ede110d75b23564b6e40e52dd9150ebbced402f4f70be106197 @@ -107,8 +113,8 @@ SHA256 (sahilm-fuzzy-v0.1.0_GH0.tar.gz) = c3746896798d2cee59991f452f1d634f95eb79 SIZE (sahilm-fuzzy-v0.1.0_GH0.tar.gz) = 3353310 SHA256 (sergi-go-diff-v1.1.0_GH0.tar.gz) = 3d4362670655e970366d555418f3c8d179c217c0499ef5573ab7176352229451 SIZE (sergi-go-diff-v1.1.0_GH0.tar.gz) = 43552 -SHA256 (spf13-cobra-v1.4.0_GH0.tar.gz) = de32a9d3f94c55ddc433aa4eefe05fc85ae621d182114b6e628258753fc03148 -SIZE (spf13-cobra-v1.4.0_GH0.tar.gz) = 94547 +SHA256 (spf13-cobra-v1.5.0_GH0.tar.gz) = 9a51279077b94bcdbab226401e75c3596bc5beeaf8b087ef84ffee3417151cf3 +SIZE (spf13-cobra-v1.5.0_GH0.tar.gz) = 104858 SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808 SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796 SHA256 (xanzy-ssh-agent-v0.3.1_GH0.tar.gz) = 6c2fb46ae13198250d56d4b26cc8fedd46834bfb2a2e653116b012fdbb1c0227 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 deleted file mode 100644 index f523365feb6b..000000000000 --- a/devel/soft-serve/files/extrapatch-vendor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go +++ /dev/null @@ -1,17 +0,0 @@ ---- vendor/github.com/charmbracelet/bubbletea/cancelreader_bsd.go.orig 2022-01-07 18:25:29 UTC -+++ vendor/github.com/charmbracelet/bubbletea/cancelreader_bsd.go -@@ -134,11 +134,11 @@ func (r *kqueueCancelReader) wait() error { - break - } - -- ident := uint64(events[0].Ident) -+ ident := uint32(events[0].Ident) - switch 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 - } - diff --git a/devel/soft-serve/files/soft-serve.in b/devel/soft-serve/files/soft-serve.in index e131c1ea1912..573fff20502c 100644 --- a/devel/soft-serve/files/soft-serve.in +++ b/devel/soft-serve/files/soft-serve.in @@ -87,7 +87,7 @@ soft_serve_start() { "SOFT_SERVE_INITIAL_ADMIN_KEY=${soft_serve_initial_admin_key}" \ "PATH=%%LOCALBASE%%/bin:${PATH}" \ "USER=${soft_serve_user}" \ - $command + $command serve } run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208032031.273KVjSQ039581>