Hi,
update of sysutils/fzf port for the latest version 0.49.0
Changelog: https://github.com/junegunn/fzf/releases/tag/0.49.0
- update Makefile, distinfo and modules.inc for this version
- add a specific do-test step in Makefile => 'make test' OK with it
- remove files for shells completion in 'do-install' and pkg/PLIST => now
embedded directly in the fzf binary (see
https://github.com/junegunn/fzf/releases/tag/0.48.0); update also pkg/README..
Build and tests OK on current/amd64 with Go 1.22.1.
Tests welcome and please commit if OK.
Laurent
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/fzf/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 28 Feb 2024 12:32:17 -0000 1.24
+++ Makefile 4 Apr 2024 15:56:32 -0000
@@ -1,9 +1,9 @@
COMMENT = command-line fuzzy finder
-MODGO_MODNAME = github.com/junegunn/fzf
-MODGO_VERSION = v0.0.0-20240201091300-3c0a6304756e
+MODGO_MODNAME = github.com/junegunn/fzf
+MODGO_VERSION = v0.0.0-20240317073535-d579e335b5aa
-V = 0.46.1
+V = 0.49.0
DISTNAME = fzf-${V}
CATEGORIES = sysutils
@@ -27,19 +27,8 @@ MODGO_LDFLAGS += -X main.revision=""
# for patch to apply
WRKDIST = ${WRKSRC}
-# Note that unlike zsh and fish, bash has no well-defined site functions
-# directory from which to autoload stuff.
-#
-# Note also that the completion files referenced here are not defining words to
-# complete, but rather overriding what happens when the user requests
-# completion via typing **<tab>.
-ZSH_SITE = ${PREFIX}/share/zsh/site-functions
-FISH_SITE = ${PREFIX}/share/fish/functions
-BASH_SITE = ${PREFIX}/share/fzf/bash
VIMFILES = ${PREFIX}/share/vim/vimfiles
-VIM_PLUGIN = ${VIMFILES}/plugin
-VIM_DOC = ${VIMFILES}/doc
-SUBST_VARS += BASH_SITE FISH_SITE VIMFILES
+SUBST_VARS += VIMFILES
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/go/bin/* ${PREFIX}/bin
@@ -47,24 +36,17 @@ do-install:
${INSTALL_MAN_DIR} ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/man/man1/*.1 ${PREFIX}/man/man1
- ${INSTALL_DATA_DIR} ${ZSH_SITE}
- ${INSTALL_DATA} ${WRKSRC}/shell/key-bindings.zsh \
- ${ZSH_SITE}/_fzf_key_bindings
- ${INSTALL_DATA} ${WRKSRC}/shell/completion.zsh \
- ${ZSH_SITE}/_fzf_completion
-
- ${INSTALL_DATA_DIR} ${FISH_SITE}
- ${INSTALL_DATA} ${WRKSRC}/shell/key-bindings.fish \
- ${FISH_SITE}/fzf-key-bindings.fish
-
- ${INSTALL_DATA_DIR} ${BASH_SITE}
- ${INSTALL_DATA} ${WRKSRC}/shell/key-bindings.bash ${BASH_SITE}
- ${INSTALL_DATA} ${WRKSRC}/shell/completion.bash ${BASH_SITE}
-
- ${INSTALL_DATA_DIR} ${VIM_PLUGIN}
- ${INSTALL_DATA_DIR} ${VIM_DOC}
- ${INSTALL_DATA} ${WRKSRC}/plugin/fzf.vim ${VIM_PLUGIN}/fzf.vim
- ${INSTALL_DATA} ${WRKSRC}/doc/fzf.txt ${VIM_DOC}/fzf.txt
+ ${INSTALL_DATA_DIR} ${VIMFILES}/plugin
+ ${INSTALL_DATA_DIR} ${VIMFILES}/doc
+ ${INSTALL_DATA} ${WRKSRC}/plugin/fzf.vim ${VIMFILES}/plugin/fzf.vim
+ ${INSTALL_DATA} ${WRKSRC}/doc/fzf.txt ${VIMFILES}/doc/fzf.txt
+
+do-test:
+ cd ${WRKSRC} && ${MODGO_TEST_CMD} \
+ github.com/junegunn/fzf/src \
+ github.com/junegunn/fzf/src/algo \
+ github.com/junegunn/fzf/src/tui \
+ github.com/junegunn/fzf/src/util
.include "modules.inc"
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/fzf/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 28 Feb 2024 12:32:17 -0000 1.17
+++ distinfo 4 Apr 2024 15:56:32 -0000
@@ -1,22 +1,22 @@
-SHA256 (fzf-0.46.1.zip) = ypM5O784UKbRvrNb7o4Vl6jRdsjxOIEPhoXlxTOBsv8=
+SHA256 (fzf-0.49.0.zip) = FB+qCm2XJ9LMp3k6hh9vB89DvKuHzcJFTmVVkjjqbCY=
+SHA256 (go_modules/github.com/charlievieth/fastwalk/@v/v1.0.2.mod) = p4RFHuqGqGogAAE3Y9NCpvc5eDGX4o9Weiius6DV8gg=
+SHA256 (go_modules/github.com/charlievieth/fastwalk/@v/v1.0.2.zip) = noUbEDjU3WXwihLfSK9Y5XIQgNlAV1Uqh2Nm0PGEpzY=
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.7.0.mod) = DmKjdtCo+lggVXLWq9HOVqx4DkCLF47l3r+Zj6B+e7s=
-SHA256 (go_modules/github.com/gdamore/tcell/v2/@v/v2.7.0.zip) = bQ/s1uwT5X2lqH37/oqgzlyimdDi6AVZlJsAz8weAGg=
+SHA256 (go_modules/github.com/gdamore/tcell/v2/@v/v2.7.4.mod) = mLlZxQfyuis0l6WxSUImtebIZ1DoJQQVuES6DsblTC0=
+SHA256 (go_modules/github.com/gdamore/tcell/v2/@v/v2.7.4.zip) = FtMb/URG0d4EGzzXqY0OWn/vlwjmbXiPSlVRffhk+8Y=
SHA256 (go_modules/github.com/lucasb-eyer/go-colorful/@v/v1.2.0.mod) = hPnDjpiEqwE8g3yxau4TlQDT1cbMqwJDmIHbLs8o9mA=
SHA256 (go_modules/github.com/lucasb-eyer/go-colorful/@v/v1.2.0.zip) = eNXQ4HN/D1S77Xe236hH2MhxvtJmip3EQyjHw0Ea2hA=
-SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.17.mod) = cUdm7ILWfbiVreiva4BUrUMMPOpeFbOoiPI+0vPhuGM=
-SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.17.zip) = 7YqYSnkx1hi2d7b9a8yTxYu1fme0swBcQBKohRtJQow=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.20.mod) = Huq+8bTZjbc8bCBzKJFjZJvJoERVKsqGudWS/oTqocg=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.20.zip) = 8tX4nKRRV34XRkubtZbcDQ7OzsteqmNiLEG1fNC3uMw=
SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.mod) = IWyT0ZMQYSyB1cdBAkmJ+DiX0jM8Op+We1ixMXWH9Rk=
SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.zip) = 2XxPBmehSVdWnJMqjiSI8cQ3V7TczjE4l6oAHwfRSbA=
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.3.mod) = oeF0iQ/J8lJFAhH63rU3VvnPWrexlpd2X5+yVfgeqJg=
-SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.6.mod) = oeF0iQ/J8lJFAhH63rU3VvnPWrexlpd2X5+yVfgeqJg=
-SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.6.zip) = 7KYABlvloerTdHjmRa0H1w2tr08G9oGCfYEVgxZTiyM=
-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/rivo/uniseg/@v/v0.4.7.mod) = oeF0iQ/J8lJFAhH63rU3VvnPWrexlpd2X5+yVfgeqJg=
+SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.4.7.zip) = uZXkqgzB5XecxhE4rJJcuMHpY+QMgOS5PuhVOBLrt5I=
SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 7n/kRmIDoB06wZrcE0zeyZvG3nGZLCjz3Zp0SAv/BgM=
SHA256 (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = u0GmArF0NF/aOSyK2D/MkyF8KFx2NplndjC+kP63peM=
SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0=
@@ -31,26 +31,24 @@ SHA256 (go_modules/golang.org/x/net/@v/v
SHA256 (go_modules/golang.org/x/net/@v/v0.6.0.mod) = Qex26iFy8+4wMeOPmlNZOaWE1rs170gIVP3LjCAmcBs=
SHA256 (go_modules/golang.org/x/net/@v/v0.6.0.zip) = f/L1Cx86WIM/hn0WRkIVaakdjBmgmZeTxa95sQwWuLg=
SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
-SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20220601150217-0de741cfad7f.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20220722155255-886fb9371eb4.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
SHA256 (go_modules/golang.org/x/sync/@v/v0.1.0.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
-SHA256 (go_modules/golang.org/x/sync/@v/v0.5.0.mod) = cA5dsA3SaqGaF9zl/FUkNtYPaMVgbIW4IfJMPWByoVE=
-SHA256 (go_modules/golang.org/x/sync/@v/v0.5.0.zip) = nglMZbFTiBQ3ziMLLSSScZ0GPIkkAJYxyQJa3RMFaSI=
+SHA256 (go_modules/golang.org/x/sync/@v/v0.1.0.zip) = 9RC+xgCeGYgtGZU+cnMTfTTfhsZZSTRdcvEjolXC7NI=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
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.15.0.mod) = 0iezJfYh9OvijTm6dz6pm4cPOTt8CcNFksNlsW3VYN4=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.16.0.mod) = 0iezJfYh9OvijTm6dz6pm4cPOTt8CcNFksNlsW3VYN4=
-SHA256 (go_modules/golang.org/x/sys/@v/v0.16.0.zip) = AXWAkTT8EuBA6kJ+knA2aSEn8okbcuIk5RU9pUOvYEo=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.17.0.mod) = 0iezJfYh9OvijTm6dz6pm4cPOTt8CcNFksNlsW3VYN4=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.18.0.mod) = 0iezJfYh9OvijTm6dz6pm4cPOTt8CcNFksNlsW3VYN4=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.18.0.zip) = luOxaxWn0ZPJ2yl020yr7SmzerS7CfY+36RBGZ3m/fg=
SHA256 (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
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.15.0.mod) = S4aXb4xO+4e7y+woPL+zlaKBd7S4uDQgtJ2Vco63ovg=
-SHA256 (go_modules/golang.org/x/term/@v/v0.16.0.mod) = oJmj8AGbJyfIlA2n7wcu6AEea0DBeTJPuFN6UGNgRrc=
-SHA256 (go_modules/golang.org/x/term/@v/v0.16.0.zip) = g+9K+dNJBl0KBVWbAzvzhM/CsrC2b8K98qCUvQ/EhY8=
+SHA256 (go_modules/golang.org/x/term/@v/v0.17.0.mod) = 2+oCJUqsLPP9D3LHxgLlQ8X7rS0A2vwvgZwoqTUlgZk=
+SHA256 (go_modules/golang.org/x/term/@v/v0.18.0.mod) = g8LUm6V+PVvzArifuftB8QhV0RS/cRhMwzuCUXc0Sug=
+SHA256 (go_modules/golang.org/x/term/@v/v0.18.0.zip) = YGUvfdL6QYXGKGe8qj+lblmwf1txCD2PcquILSUTVaY=
SHA256 (go_modules/golang.org/x/term/@v/v0.5.0.mod) = DW9YIoqtwaZSjmdV2gGFFlZuOuXFIB963hdz9W+o2TQ=
SHA256 (go_modules/golang.org/x/text/@v/v0.14.0.mod) = lxV58X6avFkmq3YhT1M71RfPSSXIhSQ6xHVaGgp8ae8=
SHA256 (go_modules/golang.org/x/text/@v/v0.14.0.zip) = uYFIl+DgnNV2p6AT8GbH21N6PVONLg9g8Mrum8Gz9K8=
@@ -65,25 +63,25 @@ SHA256 (go_modules/golang.org/x/tools/@v
SHA256 (go_modules/golang.org/x/tools/@v/v0.6.0.zip) = minIkEwqzUtlgl6RbL2vQXCG81u2jFSvmmKDoOE0HoU=
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.46.1.zip) = 304366
+SIZE (fzf-0.49.0.zip) = 308283
+SIZE (go_modules/github.com/charlievieth/fastwalk/@v/v1.0.2.mod) = 49
+SIZE (go_modules/github.com/charlievieth/fastwalk/@v/v1.0.2.zip) = 50673
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.7.0.mod) = 298
-SIZE (go_modules/github.com/gdamore/tcell/v2/@v/v2.7.0.zip) = 261435
+SIZE (go_modules/github.com/gdamore/tcell/v2/@v/v2.7.4.mod) = 298
+SIZE (go_modules/github.com/gdamore/tcell/v2/@v/v2.7.4.zip) = 263274
SIZE (go_modules/github.com/lucasb-eyer/go-colorful/@v/v1.2.0.mod) = 51
SIZE (go_modules/github.com/lucasb-eyer/go-colorful/@v/v1.2.0.zip) = 958042
-SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.17.mod) = 104
-SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.17.zip) = 8935
+SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.20.mod) = 76
+SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.20.zip) = 8936
SIZE (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.mod) = 84
SIZE (go_modules/github.com/mattn/go-runewidth/@v/v0.0.15.zip) = 21768
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.3.mod) = 39
-SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.6.mod) = 39
-SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.6.zip) = 481969
-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/rivo/uniseg/@v/v0.4.7.mod) = 39
+SIZE (go_modules/github.com/rivo/uniseg/@v/v0.4.7.zip) = 481951
SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.mod) = 41
SIZE (go_modules/github.com/yuin/goldmark/@v/v1.4.13.zip) = 229017
SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = 88
@@ -98,26 +96,24 @@ SIZE (go_modules/golang.org/x/net/@v/v0.
SIZE (go_modules/golang.org/x/net/@v/v0.6.0.mod) = 123
SIZE (go_modules/golang.org/x/net/@v/v0.6.0.zip) = 1555103
SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = 25
-SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20220601150217-0de741cfad7f.mod) = 25
SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20220722155255-886fb9371eb4.mod) = 25
SIZE (go_modules/golang.org/x/sync/@v/v0.1.0.mod) = 25
-SIZE (go_modules/golang.org/x/sync/@v/v0.5.0.mod) = 34
-SIZE (go_modules/golang.org/x/sync/@v/v0.5.0.zip) = 26308
+SIZE (go_modules/golang.org/x/sync/@v/v0.1.0.zip) = 27781
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = 24
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod) = 33
SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210615035016-665e8c7367d1.mod) = 33
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.15.0.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.16.0.mod) = 33
-SIZE (go_modules/golang.org/x/sys/@v/v0.16.0.zip) = 1902594
+SIZE (go_modules/golang.org/x/sys/@v/v0.17.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.18.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.18.0.zip) = 1907063
SIZE (go_modules/golang.org/x/sys/@v/v0.5.0.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.6.0.mod) = 33
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.15.0.mod) = 68
-SIZE (go_modules/golang.org/x/term/@v/v0.16.0.mod) = 68
-SIZE (go_modules/golang.org/x/term/@v/v0.16.0.zip) = 19883
+SIZE (go_modules/golang.org/x/term/@v/v0.17.0.mod) = 68
+SIZE (go_modules/golang.org/x/term/@v/v0.18.0.mod) = 68
+SIZE (go_modules/golang.org/x/term/@v/v0.18.0.zip) = 19883
SIZE (go_modules/golang.org/x/term/@v/v0.5.0.mod) = 67
SIZE (go_modules/golang.org/x/text/@v/v0.14.0.mod) = 197
SIZE (go_modules/golang.org/x/text/@v/v0.14.0.zip) = 9235236
Index: modules.inc
===================================================================
RCS file: /cvs/ports/sysutils/fzf/modules.inc,v
retrieving revision 1.7
diff -u -p -r1.7 modules.inc
--- modules.inc 28 Feb 2024 12:32:17 -0000 1.7
+++ modules.inc 4 Apr 2024 15:56:32 -0000
@@ -1,19 +1,19 @@
MODGO_MODULES = \
+ github.com/charlievieth/fastwalk v1.0.2 \
github.com/gdamore/encoding v1.0.0 \
- github.com/gdamore/tcell/v2 v2.7.0 \
+ github.com/gdamore/tcell/v2 v2.7.4 \
github.com/lucasb-eyer/go-colorful v1.2.0 \
- github.com/mattn/go-isatty v0.0.17 \
+ github.com/mattn/go-isatty v0.0.20 \
github.com/mattn/go-runewidth v0.0.15 \
github.com/mattn/go-shellwords v1.0.12 \
- github.com/rivo/uniseg v0.4.6 \
- github.com/saracen/walker v0.1.3 \
+ github.com/rivo/uniseg v0.4.7 \
github.com/yuin/goldmark v1.4.13 \
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 \
golang.org/x/mod v0.8.0 \
golang.org/x/net v0.6.0 \
- golang.org/x/sync v0.5.0 \
- golang.org/x/sys v0.16.0 \
- golang.org/x/term v0.16.0 \
+ golang.org/x/sync v0.1.0 \
+ golang.org/x/sys v0.18.0 \
+ golang.org/x/term v0.18.0 \
golang.org/x/text v0.14.0 \
golang.org/x/tools v0.6.0 \
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
@@ -27,20 +27,18 @@ MODGO_MODFILES = \
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 \
golang.org/x/net v0.0.0-20220722155237-a158d28d115b \
golang.org/x/sync v0.0.0-20190423024810-112230192c58 \
- golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f \
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 \
- golang.org/x/sync v0.1.0 \
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a \
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 \
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/sys v0.15.0 \
+ golang.org/x/sys v0.17.0 \
golang.org/x/sys v0.5.0 \
+ golang.org/x/sys v0.6.0 \
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 \
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 \
- golang.org/x/term v0.15.0 \
+ golang.org/x/term v0.17.0 \
golang.org/x/term v0.5.0 \
golang.org/x/text v0.3.0 \
golang.org/x/text v0.3.3 \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/fzf/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 19 Nov 2023 10:59:12 -0000 1.5
+++ pkg/PLIST 4 Apr 2024 15:56:32 -0000
@@ -4,20 +4,9 @@ bin/fzf-tmux
@man man/man1/fzf-tmux.1
@man man/man1/fzf.1
share/doc/pkg-readmes/${PKGSTEM}
-share/fish/
-share/fish/functions/
-share/fish/functions/fzf-key-bindings.fish
-share/fzf/
-share/fzf/bash/
-share/fzf/bash/completion.bash
-share/fzf/bash/key-bindings.bash
share/vim/
share/vim/vimfiles/
share/vim/vimfiles/doc/
share/vim/vimfiles/doc/fzf.txt
share/vim/vimfiles/plugin/
share/vim/vimfiles/plugin/fzf.vim
-share/zsh/
-share/zsh/site-functions/
-share/zsh/site-functions/_fzf_completion
-share/zsh/site-functions/_fzf_key_bindings
Index: pkg/README
===================================================================
RCS file: /cvs/ports/sysutils/fzf/pkg/README,v
retrieving revision 1.6
diff -u -p -r1.6 README
--- pkg/README 25 Oct 2022 19:37:08 -0000 1.6
+++ pkg/README 4 Apr 2024 15:56:32 -0000
@@ -5,19 +5,20 @@
Shell Integration
=================
+For fzf version 0.48.0 and above, shell integration scripts are now embedded in
+the fzf binary.
+
shells/zsh
----------
To enable all support, add this to your ~/.zshrc:
```
-autoload _fzf_key_bindings _fzf_completion
-_fzf_key_bindings
-_fzf_completion
+eval "$(fzf --zsh)"
```
-_fzf_key_bindings causes zsh to use fzf for things like CTRL+r and CTRL+t,
-whereas _fzf_completion makes zsh use fzf for **<tab> completion.
+Key bindings causes zsh to use fzf for things like CTRL+r and CTRL+t, whereas
+completion makes zsh use fzf for **<tab> completion.
shells/bash
-----------
@@ -25,11 +26,10 @@ shells/bash
To enable all support, add this to your ~/.bashrc:
```
-source ${BASH_SITE}/key-bindings.bash
-source ${BASH_SITE}/completion.bash
+eval "$(fzf --bash)"
```
-These two files have the same roles as their zsh counterparts.
+These integrations have the same roles as their zsh counterparts.
shells/fish
-----------
@@ -39,8 +39,7 @@ the shell config, so we have to source i
~/.config/fish/config.fish:
```
-source ${FISH_SITE}/fzf-key-bindings.fish
-fzf_key_bindings
+fzf --fish | source
```
There is no **<tab> completion support for fish.
