Le 2023-04-09 09:35, Stuart Henderson a écrit :
On 2023/04/09 08:28, Laurent Cheylus wrote:
I removed patches/patch-shell_completion_bash (no more necessary with
fix
upstream, see my first message), not included in my CVS diff.
cvs rm [...]
cvs di -uNp
Thanks for these tips.
Attached a new version of my patch with unnecessary patch removed.
Laurent
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/fzf/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile 20 Feb 2023 22:03:42 -0000 1.18
+++ Makefile 9 Apr 2023 15:15:42 -0000
@@ -1,9 +1,9 @@
COMMENT = command-line fuzzy finder
MODGO_MODNAME = github.com/junegunn/fzf
-MODGO_VERSION = v0.0.0-20230215142442-352ea072269d
+MODGO_VERSION = v0.0.0-20230402143337-20230402d087
-V = 0.38.0
+V = 0.39.0
DISTNAME = fzf-${V}
CATEGORIES = sysutils
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/fzf/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 20 Feb 2023 22:03:42 -0000 1.11
+++ distinfo 9 Apr 2023 15:15:42 -0000
@@ -1,4 +1,4 @@
-SHA256 (fzf-0.38.0.zip) = 85D9ETJJ4MuCNC79v1PQwwYstswayeICJdk0q3RrOfQ=
+SHA256 (fzf-0.39.0.zip) = qo8oqzyi0g7OF/lMsTCo/28dEPxnjCHglxtVyDa+Lm8=
SHA256 (go_modules/github.com/gdamore/encoding/@v/v1.0.0.mod) = pJgRJVFfDy3yU8LeOjrBlwx0Q+W2adlH6HTnezaBtuU=
SHA256 (go_modules/github.com/gdamore/encoding/@v/v1.0.0.zip) = Y4qYMuL2LRGNfFEdhr2uFiKlHzMd5IoB2Sn9JOvmoqY=
SHA256 (go_modules/github.com/gdamore/tcell/v2/@v/v2.5.4.mod) = 4zhutrVn0oD6CGHqAr93IkVDVuXmzBVThvjmX/RGQ5E=
@@ -12,8 +12,8 @@ SHA256 (go_modules/github.com/mattn/go-r
SHA256 (go_modules/github.com/mattn/go-shellwords/@v/v1.0.12.mod) = Kb//Fv9Xt9raZOanSAbZMVSazOYctwxFijidCZwtDsI=
SHA256 (go_modules/github.com/mattn/go-shellwords/@v/v1.0.12.zip) = bTXD7ckuR6BpiHiNaDwa04lxm1XvGdWn8jmrRwi22hE=
SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.2.0.mod) = bHMYonqNVHOo62YedfsAUoF24O/FkxDtJ3yhO9EqU/E=
-SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.2.mod) = oeF0iQ/J8lJFAhH63rU3VvnPWrexlpd2X5+yVfgeqJg=
-SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.2.zip) = SYh8XlSwRdfPiNRbj+kniIMM9MgAuM+rimqnB0b9S38=
+SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.4.mod) = oeF0iQ/J8lJFAhH63rU3VvnPWrexlpd2X5+yVfgeqJg=
+SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.4.zip) = dAzVgDEE763yd6DzUZ8OrZfjIdvZCc7uvXyLaza0R1Q=
SHA256 (go_modules/github.com/saracen/walker/@v/v0.1.3.mod) = 0kway39am7ME90XPLfJq9bVJOMxXYxgsir8ISkd4zUc=
SHA256 (go_modules/github.com/saracen/walker/@v/v0.1.3.zip) = lFe2CuCa3V2nRgsynUdvWFq/HUuLBO1ZukCSSQxhG10=
SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM=
@@ -37,10 +37,12 @@ SHA256 (go_modules/golang.org/x/sys/@v/v
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220811171246-fbc7d0a398ab.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220811171246-fbc7d0a398ab.zip) = Xr00+vNM+3gk7W0S6V55PIVkzMmJr5+ceZhCLDbsmDg=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.zip) = jBWGDjhQ486lpxhrt5uM+Y9RPZrFSYCZ073f1Jxt/D8=
SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = TLqxT3cGdxsnHZlaGzzBMf5aJGqtx+5tG6bwvYlHgfo=
SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = dAeU4pFPXMh+JWVsWEMiKyxlZlghIF9FYyoEd8jT95s=
-SHA256 (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.zip) = Ot9xOvpJ/iZYD/5K2x9PsvSSHJRTAapan7bTQDH6MM0=
+SHA256 (go_modules/golang.org/x/term/@v/v0.6.0.mod) = ZDWbnGU3CEePAgcpiFBE/z2ABxhtnUQRJf6HSBfnEgE=
+SHA256 (go_modules/golang.org/x/term/@v/v0.6.0.zip) = NpkIStEQSmoKAnoIceZ5hzBNc6arsncMj35c49fB0xQ=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.mod) = NoedWG/YAB6E2oeHGQoR5PeHSeKoHf6Lm2kxiZ//Mc8=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.3.mod) = +7eojtFAUV55Dsp6EP/TGcl4axHGpsfln4D3+ze7RUI=
SHA256 (go_modules/golang.org/x/text/@v/v0.3.7.mod) = xF1mkIlCe8RjXQexhfm5aAMy0cSMdbPEnLcVuBoEpbA=
@@ -52,7 +54,7 @@ SHA256 (go_modules/golang.org/x/tools/@v
SHA256 (go_modules/golang.org/x/tools/@v/v0.1.12.zip) = SxIuDkcDvEAUyxz4wBT8+T6n1y8B2nlJk2U0b1TLuFE=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U=
SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.zip) = xOnwY8/tVGyQ8AqWV96sT5FaiZT4y+bb0/GOeeuDAs8=
-SIZE (fzf-0.38.0.zip) = 276043
+SIZE (fzf-0.39.0.zip) = 279046
SIZE (go_modules/github.com/gdamore/encoding/@v/v1.0.0.mod) = 77
SIZE (go_modules/github.com/gdamore/encoding/@v/v1.0.0.zip) = 19867
SIZE (go_modules/github.com/gdamore/tcell/v2/@v/v2.5.4.mod) = 308
@@ -66,8 +68,8 @@ SIZE (go_modules/github.com/mattn/go-run
SIZE (go_modules/github.com/mattn/go-shellwords/@v/v1.0.12.mod) = 47
SIZE (go_modules/github.com/mattn/go-shellwords/@v/v1.0.12.zip) = 9134
SIZE (go_modules/github.com/rivo/uniseg/@v/v0.2.0.mod) = 39
-SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.2.mod) = 39
-SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.2.zip) = 475618
+SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.4.mod) = 39
+SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.4.zip) = 476937
SIZE (go_modules/github.com/saracen/walker/@v/v0.1.3.mod) = 104
SIZE (go_modules/github.com/saracen/walker/@v/v0.1.3.zip) = 17973
SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 41
@@ -91,10 +93,12 @@ SIZE (go_modules/golang.org/x/sys/@v/v0.
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220722155257-8c9f86f7a55f.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220811171246-fbc7d0a398ab.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220811171246-fbc7d0a398ab.zip) = 1814667
+SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.zip) = 1892073
SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod) = 95
SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.mod) = 95
-SIZE (go_modules/golang.org/x/term/@v/v0.0.0-20210927222741-03fcf44c2211.zip) = 21653
+SIZE (go_modules/golang.org/x/term/@v/v0.6.0.mod) = 67
+SIZE (go_modules/golang.org/x/term/@v/v0.6.0.zip) = 19924
SIZE (go_modules/golang.org/x/text/@v/v0.3.0.mod) = 25
SIZE (go_modules/golang.org/x/text/@v/v0.3.3.mod) = 97
SIZE (go_modules/golang.org/x/text/@v/v0.3.7.mod) = 97
Index: modules.inc
===================================================================
RCS file: /cvs/ports/sysutils/fzf/modules.inc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 modules.inc
--- modules.inc 18 Jan 2023 14:30:45 -0000 1.2
+++ modules.inc 9 Apr 2023 15:15:42 -0000
@@ -5,15 +5,15 @@ MODGO_MODULES = \
github.com/mattn/go-isatty v0.0.17 \
github.com/mattn/go-runewidth v0.0.14 \
github.com/mattn/go-shellwords v1.0.12 \
- github.com/rivo/uniseg v0.4.2 \
+ github.com/rivo/uniseg v0.4.4 \
github.com/saracen/walker v0.1.3 \
github.com/yuin/goldmark v1.4.13 \
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 \
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 \
golang.org/x/net v0.0.0-20220722155237-a158d28d115b \
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 \
- golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab \
- golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 \
+ golang.org/x/sys v0.6.0 \
+ golang.org/x/term v0.6.0 \
golang.org/x/text v0.5.0 \
golang.org/x/tools v0.1.12 \
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
@@ -30,7 +30,9 @@ MODGO_MODFILES = \
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 \
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a \
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f \
+ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab \
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 \
+ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 \
golang.org/x/text v0.3.0 \
golang.org/x/text v0.3.3 \
golang.org/x/text v0.3.7 \
Index: patches/patch-shell_completion_bash
===================================================================
RCS file: patches/patch-shell_completion_bash
diff -N patches/patch-shell_completion_bash
--- patches/patch-shell_completion_bash 25 Oct 2022 19:37:08 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: shell/completion.bash
---- shell/completion.bash.orig
-+++ shell/completion.bash
-@@ -269,7 +269,7 @@ _fzf_complete_kill() {
-
- _fzf_proc_completion() {
- _fzf_complete -m --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <(
-- command ps -ef | sed 1d
-+ command ps -auwx | sed 1d
- )
- }
-
