[Bug 253145] shells/elvish: Update Elvish to v0.15.0

Mon Feb 1 16:05:01 UTC 2021

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=253145

--- Comment #5 from Adam Jimerson <vendion at gmail.com> ---
(In reply to Fernando Apesteguía from comment #3)

> Please confirm this change passes QA (portlint, poudriere at least).

I did run my changes through `portlint` and ran `poudriere testport` on my
changes
before rolling this diff and both came back fine.

> Q/A:  Makefile: [22]: use a tab (not space) after a variable name

As for this when I run portlint with those changes it comes back that
everything is okay.

diff --git a/shells/elvish/Makefile b/shells/elvish/Makefile
index f3b679debea4..f6d8386e7896 100644
--- a/shells/elvish/Makefile
+++ b/shells/elvish/Makefile
@@ -2,11 +2,11 @@

 PORTNAME= elvish
 DISTVERSIONPREFIX= v
-DISTVERSION= 0.14.1
+DISTVERSION= 0.15.0
 CATEGORIES= shells

 MAINTAINER= vendion at gmail.com
-COMMENT= Friendly Interactive Shell and Expressive Programming Language
+COMMENT= Elvish = Expressive Programming Language + Versatile Interactive
Shell

 LICENSE= BSD2CLAUSE
 LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -14,20 +14,24 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
 USES= go:modules
 USE_GITHUB= yes
 GH_ACCOUNT= elves
-GH_TUPLE= \
- BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
- etcd-io:bbolt:v1.3.4:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
- golang:sys:85ca7c5b95cd:golang_sys/vendor/golang.org/x/sys \
- kr:pty:v1.1.4:kr_pty/vendor/github.com/kr/pty \
- mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-
xiaq:persistent:a1d9ac4077fc:xiaq_persistent/vendor/github.com/xiaq/persistent
-

-GO_BUILDFLAGS= -ldflags="-s -w -X
github.com/elves/elvish/pkg/buildinfo.Version=${DISTVERSIONPREFIX}${DISTVERSION}"
\
+GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_BUILDFLAGS= -ldflags="-s -w -X
github.com/elves/elvish/pkg/buildinfo.Version=${DISTVERSIONPREFIX}${DISTVERSION}
-X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" \
  -gcflags="all=-trimpath=${GO_WRKSRC}" \
  -asmflags="all=-trimpath=${GO_WRKSRC}"
-GO_TESTFLAGS= -race
-
+GO_TESTFLAGS=   -race
 PLIST_FILES= bin/elvish

+GH_TUPLE=
BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
+ creack:pty:v1.1.11:creack_pty/vendor/github.com/creack/pty \
+ etcd-io:bbolt:v1.3.5:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
+ golang:sys:c12d262b63d8:golang_sys/vendor/golang.org/x/sys \
+ mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+
xiaq:persistent:3175cfb92e14:xiaq_persistent/vendor/github.com/xiaq/persistent
+
+do-tests:
+ @(cd ${WRKSRC}) ; \
+ ${GO_ENV} ${GO_CMD} test -race ${GO_TESTTARGET} ; \
+ )
+
 .include <bsd.port.mk>
diff --git a/shells/elvish/distinfo b/shells/elvish/distinfo
index 148b6d691368..894a48bf6a31 100644
--- a/shells/elvish/distinfo
+++ b/shells/elvish/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1597667743
-SHA256 (elves-elvish-v0.14.1_GH0.tar.gz) =
8a8113c0a1325785b212ed59410869bdea30ca2cb7400f95ebb3fbc8689eb6d8
-SIZE (elves-elvish-v0.14.1_GH0.tar.gz) = 575753
+TIMESTAMP = 1612047801
+SHA256 (elves-elvish-v0.15.0_GH0.tar.gz) =
761739307c68fcbc51fd46c052c0a20ae848a30dba1ce3fbb6d27f99672f58e0
+SIZE (elves-elvish-v0.15.0_GH0.tar.gz) = 603715
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) =
6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
-SHA256 (etcd-io-bbolt-v1.3.4_GH0.tar.gz) =
536029610c6cd08e4a9fe2e1b0857ae539b0736850132cbbe1c18f0fbed8a4da
-SIZE (etcd-io-bbolt-v1.3.4_GH0.tar.gz) = 95404
-SHA256 (golang-sys-85ca7c5b95cd_GH0.tar.gz) =
06a5cbc446381df9653d4b410239720eea6b27461597de88f3e621664c811294
-SIZE (golang-sys-85ca7c5b95cd_GH0.tar.gz) = 1047239
-SHA256 (kr-pty-v1.1.4_GH0.tar.gz) =
f69af477ac2df39246ab64f4bf61767015d493a98a74d5f4da40131f0fe6af7a
-SIZE (kr-pty-v1.1.4_GH0.tar.gz) = 5819
+SHA256 (creack-pty-v1.1.11_GH0.tar.gz) =
ee903119251fdf7d90dae890fec40015c5b6049daa68ec8d8750c3ebceaaf5ed
+SIZE (creack-pty-v1.1.11_GH0.tar.gz) = 8396
+SHA256 (etcd-io-bbolt-v1.3.5_GH0.tar.gz) =
63fed2e9bbdcc2aa279c2a7ea4a59c39bc21616ec2c96abff0020872beb3dbad
+SIZE (etcd-io-bbolt-v1.3.5_GH0.tar.gz) = 96494
+SHA256 (golang-sys-c12d262b63d8_GH0.tar.gz) =
57663347583aec8dca1fa3f24af9fdf6612e5db0fd65bcef26a79509548c8d40
+SIZE (golang-sys-c12d262b63d8_GH0.tar.gz) = 1060884
 SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) =
addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
 SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
-SHA256 (xiaq-persistent-a1d9ac4077fc_GH0.tar.gz) =
43f431d16d4bef10b1fc6e72f61b3f60f3f0198f8384befba9742b582d2a61aa
-SIZE (xiaq-persistent-a1d9ac4077fc_GH0.tar.gz) = 19502
+SHA256 (xiaq-persistent-3175cfb92e14_GH0.tar.gz) =
c481b2ba3bb0ad0dc7dc6d0d3179a55f7770c59b83ea54962cc37da5f5864611
+SIZE (xiaq-persistent-3175cfb92e14_GH0.tar.gz) = 19394
diff --git a/shells/elvish/pkg-descr b/shells/elvish/pkg-descr
index e18e2c4ed0bd..d2f74952bb82 100644
--- a/shells/elvish/pkg-descr
+++ b/shells/elvish/pkg-descr
@@ -1,4 +1,4 @@
-Elvish is a friendly interactive shell and an expressive programming language.
-It runs on Linux, BSDs, macOS and Windows.
+Elvish is an expressive programming language and a versatile interactive
shell,
+combined into one seamless package. It runs on Linux, BSDs, macOS and Windows.

 WWW: https://elv.sh/
[/u/h/v/p/freebsd-ports]─[⎇ master]─> patch < /home/vendion/elvish.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/shells/elvish/Makefile b/shells/elvish/Makefile
|index f3b679debea4..f6d8386e7896 100644
|--- a/shells/elvish/Makefile
|+++ b/shells/elvish/Makefile
--------------------------
Patching file shells/elvish/Makefile using Plan A...
Hunk #1 succeeded at 2.
Hunk #2 succeeded at 14.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/shells/elvish/distinfo b/shells/elvish/distinfo
|index 148b6d691368..894a48bf6a31 100644
|--- a/shells/elvish/distinfo
|+++ b/shells/elvish/distinfo
--------------------------
Patching file shells/elvish/distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/shells/elvish/pkg-descr b/shells/elvish/pkg-descr
|index e18e2c4ed0bd..d2f74952bb82 100644
|--- a/shells/elvish/pkg-descr
|+++ b/shells/elvish/pkg-descr
--------------------------
Patching file shells/elvish/pkg-descr using Plan A...
Hunk #1 succeeded at 1.
done
[/u/h/v/p/freebsd-ports]─[⎇ master]─[●]─> cd shells/elvish/
[/u/h/v/p/f/s/elvish]─[⎇ master]─[●]─> ls
distinfo        distinfo.orig   Makefile        Makefile.orig   pkg-descr      
pkg-descr.orig
[/u/h/v/p/f/s/elvish]─[⎇ master]─[●]─> portlint
looks fine.

Let me see if I can reroll my diff to correct the tab vs space issue. Looking
at 
https://docs.freebsd.org/en/books/porters-handbook/testing-portlint.html it
seems
that the `-C` flag is recommended but not the default behaivor for portlint? If
that
is the case I'll update my script that runs runs `portfmt` and `portlint`.

As for this isuse:

> GH_TUPLE immediately after GH_ACCOUNT

Appoliges for that, let me correct this and resubmit my patch.

-- 
You are receiving this mail because:
You are the assignee for the bug.
