Bump zsh to 5.7.1 (5.7 had a bug in vcs_info). Tests pass (just the
usual failure in D07) and it's running fine here.
Switch to CONFIGURE_STYLE=gnu since there are no autoconf patches
(reverting a change from 2004). The generated configure does indeed
match what we'd generate.
Drop PORTHOME and TEST_FLAGS; the rationale from
shells/zsh/stable/Makefile 1.8 in 2001 was "allow target regress w/o
being root." The tests run fine without these variables now.
Util/reporter and Util/check-tmux-state are not installed as can be
check with a quick grep against PLIST. Doc/zsh.texi isn't used to
generate docs as thankfully upstream provides generated docs. The
remainder of EXTFILES are all in Functions and intended to be
autoloaded. I think EXTFILES and pre-configure can be dropped, but the
commit message in 1.67 isn't clear on why they were added.
I'm unable to send emails from mutt for some reason, so the diff is
attached as well in case gmail munges things.
diff --git Makefile Makefile
index 69b739e9334..098479dc707 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.6.2
+V= 5.7.1
DISTNAME= zsh-$V
CATEGORIES= shells
@@ -23,8 +23,7 @@ WANTLIB= c curses iconv m pcre
LIB_DEPENDS= converters/libiconv \
devel/pcre
-AUTOCONF_VERSION=2.69
-CONFIGURE_STYLE=autoconf
+CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -39,25 +38,16 @@ CONFIGURE_ARGS= --enable-zsh-mem \
SUBST_VARS= V
-# required for regression tests
-PORTHOME= ${WRKDIR}
-TEST_FLAGS= INSTALL_PROGRAM="install -c -s -m 555" \
- INSTALL_DATA="install -c -m 444" \
- INSTALL="install -c" \
- TMPPREFIX=${WRKBUILD}/tmp \
- TERM=xterm
-
-EXTFILES= Functions/Misc/checkmail Functions/Misc/run-help \
- Functions/Misc/run-help-ip Functions/Misc/sticky-note \
- Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
- Functions/Calendar/calendar_add Functions/Example/cat \
- Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
- Util/reporter Util/check-tmux-state Doc/zsh.texi
+EXTFILES= Calendar/calendar_add Example/cat Example/zless \
+ Misc/checkmail Misc/run-help \
+ Misc/run-help-ip \
+ Misc/sticky-note Misc/zcalc \
+ Misc/zed Misc/zkbd
pre-configure:
.for i in ${EXTFILES}
sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
- ${WRKSRC}/${i}
+ ${WRKSRC}/Functions/${i}
.endfor
.include <bsd.port.mk>
diff --git distinfo distinfo
index 9e74544bf66..94271329f48 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.6.2.tar.xz) = pQvWbAVX6OyjuPok6F0N5TPnddeiLfBC2pBIhiN1Lp4=
-SIZE (zsh-5.6.2.tar.xz) = 3077368
+SHA256 (zsh-5.7.1.tar.xz) = cmApLCwdSDstUP6/pQVRdr1RKzKogzsRYXe/XwHnfug=
+SIZE (zsh-5.7.1.tar.xz) = 3126308
diff --git pkg/PLIST pkg/PLIST
index c9376e94025..b8574c2abbd 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -19,6 +19,7 @@ lib/zsh/${V}/zsh/files.so
lib/zsh/${V}/zsh/langinfo.so
lib/zsh/${V}/zsh/mapfile.so
lib/zsh/${V}/zsh/mathfunc.so
+lib/zsh/${V}/zsh/nearcolor.so
lib/zsh/${V}/zsh/net/
lib/zsh/${V}/zsh/net/socket.so
lib/zsh/${V}/zsh/net/tcp.so
@@ -238,6 +239,7 @@ share/zsh/${V}/functions/Completion/Darwin/_scutil
share/zsh/${V}/functions/Completion/Darwin/_softwareupdate
share/zsh/${V}/functions/Completion/Darwin/_sw_vers
share/zsh/${V}/functions/Completion/Darwin/_system_profiler
+share/zsh/${V}/functions/Completion/Darwin/_xcode-select
share/zsh/${V}/functions/Completion/Debian/
share/zsh/${V}/functions/Completion/Debian/_a2utils
share/zsh/${V}/functions/Completion/Debian/_apt
@@ -336,6 +338,7 @@ share/zsh/${V}/functions/Completion/Linux/_pkgtool
share/zsh/${V}/functions/Completion/Linux/_qdbus
share/zsh/${V}/functions/Completion/Linux/_rpmbuild
share/zsh/${V}/functions/Completion/Linux/_schedtool
+share/zsh/${V}/functions/Completion/Linux/_setsid
share/zsh/${V}/functions/Completion/Linux/_ss
share/zsh/${V}/functions/Completion/Linux/_sshfs
share/zsh/${V}/functions/Completion/Linux/_strace
@@ -399,6 +402,8 @@ share/zsh/${V}/functions/Completion/Unix/_arch_archives
share/zsh/${V}/functions/Completion/Unix/_arch_namespace
share/zsh/${V}/functions/Completion/Unix/_arp
share/zsh/${V}/functions/Completion/Unix/_arping
+share/zsh/${V}/functions/Completion/Unix/_asciidoctor
+share/zsh/${V}/functions/Completion/Unix/_asciinema
share/zsh/${V}/functions/Completion/Unix/_at
share/zsh/${V}/functions/Completion/Unix/_attr
share/zsh/${V}/functions/Completion/Unix/_augeas
@@ -439,6 +444,7 @@ share/zsh/${V}/functions/Completion/Unix/_cmdstring
share/zsh/${V}/functions/Completion/Unix/_cmp
share/zsh/${V}/functions/Completion/Unix/_column
share/zsh/${V}/functions/Completion/Unix/_comm
+share/zsh/${V}/functions/Completion/Unix/_composer
share/zsh/${V}/functions/Completion/Unix/_compress
share/zsh/${V}/functions/Completion/Unix/_configure
share/zsh/${V}/functions/Completion/Unix/_cowsay
@@ -477,6 +483,7 @@ share/zsh/${V}/functions/Completion/Unix/_dmidecode
share/zsh/${V}/functions/Completion/Unix/_dns_types
share/zsh/${V}/functions/Completion/Unix/_doas
share/zsh/${V}/functions/Completion/Unix/_domains
+share/zsh/${V}/functions/Completion/Unix/_dos2unix
share/zsh/${V}/functions/Completion/Unix/_drill
share/zsh/${V}/functions/Completion/Unix/_dsh
share/zsh/${V}/functions/Completion/Unix/_dtruss
@@ -546,6 +553,7 @@ share/zsh/${V}/functions/Completion/Unix/_have_glob_qual
share/zsh/${V}/functions/Completion/Unix/_head
share/zsh/${V}/functions/Completion/Unix/_hexdump
share/zsh/${V}/functions/Completion/Unix/_hg
+share/zsh/${V}/functions/Completion/Unix/_host
share/zsh/${V}/functions/Completion/Unix/_hostname
share/zsh/${V}/functions/Completion/Unix/_hosts
share/zsh/${V}/functions/Completion/Unix/_iconv
@@ -558,6 +566,7 @@ share/zsh/${V}/functions/Completion/Unix/_initctl
share/zsh/${V}/functions/Completion/Unix/_install
share/zsh/${V}/functions/Completion/Unix/_iostat
share/zsh/${V}/functions/Completion/Unix/_ip
+share/zsh/${V}/functions/Completion/Unix/_ipsec
share/zsh/${V}/functions/Completion/Unix/_irssi
share/zsh/${V}/functions/Completion/Unix/_ispell
share/zsh/${V}/functions/Completion/Unix/_java
@@ -602,6 +611,8 @@ share/zsh/${V}/functions/Completion/Unix/_mencal
share/zsh/${V}/functions/Completion/Unix/_mh
share/zsh/${V}/functions/Completion/Unix/_mime_types
share/zsh/${V}/functions/Completion/Unix/_mkdir
+share/zsh/${V}/functions/Completion/Unix/_mkfifo
+share/zsh/${V}/functions/Completion/Unix/_mknod
share/zsh/${V}/functions/Completion/Unix/_mktemp
share/zsh/${V}/functions/Completion/Unix/_module
share/zsh/${V}/functions/Completion/Unix/_monotone
@@ -715,6 +726,7 @@ share/zsh/${V}/functions/Completion/Unix/_setfacl
share/zsh/${V}/functions/Completion/Unix/_sh
share/zsh/${V}/functions/Completion/Unix/_shasum
share/zsh/${V}/functions/Completion/Unix/_showmount
+share/zsh/${V}/functions/Completion/Unix/_shred
share/zsh/${V}/functions/Completion/Unix/_shuf
share/zsh/${V}/functions/Completion/Unix/_shutdown
share/zsh/${V}/functions/Completion/Unix/_signals
@@ -740,6 +752,7 @@ share/zsh/${V}/functions/Completion/Unix/_subversion
share/zsh/${V}/functions/Completion/Unix/_sudo
share/zsh/${V}/functions/Completion/Unix/_surfraw
share/zsh/${V}/functions/Completion/Unix/_swaks
+share/zsh/${V}/functions/Completion/Unix/_swanctl
share/zsh/${V}/functions/Completion/Unix/_swift
share/zsh/${V}/functions/Completion/Unix/_sys_calls
share/zsh/${V}/functions/Completion/Unix/_sysctl
@@ -774,6 +787,7 @@ share/zsh/${V}/functions/Completion/Unix/_tput
share/zsh/${V}/functions/Completion/Unix/_tr
share/zsh/${V}/functions/Completion/Unix/_tree
share/zsh/${V}/functions/Completion/Unix/_truss
+share/zsh/${V}/functions/Completion/Unix/_tty
share/zsh/${V}/functions/Completion/Unix/_ttys
share/zsh/${V}/functions/Completion/Unix/_twidge
share/zsh/${V}/functions/Completion/Unix/_twisted
@@ -793,6 +807,7 @@ share/zsh/${V}/functions/Completion/Unix/_users_on
share/zsh/${V}/functions/Completion/Unix/_uzbl
share/zsh/${V}/functions/Completion/Unix/_vcsh
share/zsh/${V}/functions/Completion/Unix/_vim
+share/zsh/${V}/functions/Completion/Unix/_visudo
share/zsh/${V}/functions/Completion/Unix/_vmstat
share/zsh/${V}/functions/Completion/Unix/_vorbis
share/zsh/${V}/functions/Completion/Unix/_vpnc
@@ -920,6 +935,7 @@ share/zsh/${V}/functions/Completion/Zsh/_echoti
share/zsh/${V}/functions/Completion/Zsh/_emulate
share/zsh/${V}/functions/Completion/Zsh/_enable
share/zsh/${V}/functions/Completion/Zsh/_equal
+share/zsh/${V}/functions/Completion/Zsh/_exec
share/zsh/${V}/functions/Completion/Zsh/_fc
share/zsh/${V}/functions/Completion/Zsh/_file_descriptors
share/zsh/${V}/functions/Completion/Zsh/_first
diff --git Makefile Makefile
index 69b739e9334..098479dc707 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.6.2
+V= 5.7.1
DISTNAME= zsh-$V
CATEGORIES= shells
@@ -23,8 +23,7 @@ WANTLIB= c curses iconv m pcre
LIB_DEPENDS= converters/libiconv \
devel/pcre
-AUTOCONF_VERSION=2.69
-CONFIGURE_STYLE=autoconf
+CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -39,25 +38,16 @@ CONFIGURE_ARGS= --enable-zsh-mem \
SUBST_VARS= V
-# required for regression tests
-PORTHOME= ${WRKDIR}
-TEST_FLAGS= INSTALL_PROGRAM="install -c -s -m 555" \
- INSTALL_DATA="install -c -m 444" \
- INSTALL="install -c" \
- TMPPREFIX=${WRKBUILD}/tmp \
- TERM=xterm
-
-EXTFILES= Functions/Misc/checkmail Functions/Misc/run-help \
- Functions/Misc/run-help-ip Functions/Misc/sticky-note \
- Functions/Misc/zcalc Functions/Misc/zed Functions/Misc/zkbd \
- Functions/Calendar/calendar_add Functions/Example/cat \
- Functions/Example/zless Test/ztst.zsh Test/runtests.zsh \
- Util/reporter Util/check-tmux-state Doc/zsh.texi
+EXTFILES= Calendar/calendar_add Example/cat Example/zless \
+ Misc/checkmail Misc/run-help \
+ Misc/run-help-ip \
+ Misc/sticky-note Misc/zcalc \
+ Misc/zed Misc/zkbd
pre-configure:
.for i in ${EXTFILES}
sed -i -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g" \
- ${WRKSRC}/${i}
+ ${WRKSRC}/Functions/${i}
.endfor
.include <bsd.port.mk>
diff --git distinfo distinfo
index 9e74544bf66..94271329f48 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.6.2.tar.xz) = pQvWbAVX6OyjuPok6F0N5TPnddeiLfBC2pBIhiN1Lp4=
-SIZE (zsh-5.6.2.tar.xz) = 3077368
+SHA256 (zsh-5.7.1.tar.xz) = cmApLCwdSDstUP6/pQVRdr1RKzKogzsRYXe/XwHnfug=
+SIZE (zsh-5.7.1.tar.xz) = 3126308
diff --git pkg/PLIST pkg/PLIST
index c9376e94025..b8574c2abbd 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -19,6 +19,7 @@ lib/zsh/${V}/zsh/files.so
lib/zsh/${V}/zsh/langinfo.so
lib/zsh/${V}/zsh/mapfile.so
lib/zsh/${V}/zsh/mathfunc.so
+lib/zsh/${V}/zsh/nearcolor.so
lib/zsh/${V}/zsh/net/
lib/zsh/${V}/zsh/net/socket.so
lib/zsh/${V}/zsh/net/tcp.so
@@ -238,6 +239,7 @@ share/zsh/${V}/functions/Completion/Darwin/_scutil
share/zsh/${V}/functions/Completion/Darwin/_softwareupdate
share/zsh/${V}/functions/Completion/Darwin/_sw_vers
share/zsh/${V}/functions/Completion/Darwin/_system_profiler
+share/zsh/${V}/functions/Completion/Darwin/_xcode-select
share/zsh/${V}/functions/Completion/Debian/
share/zsh/${V}/functions/Completion/Debian/_a2utils
share/zsh/${V}/functions/Completion/Debian/_apt
@@ -336,6 +338,7 @@ share/zsh/${V}/functions/Completion/Linux/_pkgtool
share/zsh/${V}/functions/Completion/Linux/_qdbus
share/zsh/${V}/functions/Completion/Linux/_rpmbuild
share/zsh/${V}/functions/Completion/Linux/_schedtool
+share/zsh/${V}/functions/Completion/Linux/_setsid
share/zsh/${V}/functions/Completion/Linux/_ss
share/zsh/${V}/functions/Completion/Linux/_sshfs
share/zsh/${V}/functions/Completion/Linux/_strace
@@ -399,6 +402,8 @@ share/zsh/${V}/functions/Completion/Unix/_arch_archives
share/zsh/${V}/functions/Completion/Unix/_arch_namespace
share/zsh/${V}/functions/Completion/Unix/_arp
share/zsh/${V}/functions/Completion/Unix/_arping
+share/zsh/${V}/functions/Completion/Unix/_asciidoctor
+share/zsh/${V}/functions/Completion/Unix/_asciinema
share/zsh/${V}/functions/Completion/Unix/_at
share/zsh/${V}/functions/Completion/Unix/_attr
share/zsh/${V}/functions/Completion/Unix/_augeas
@@ -439,6 +444,7 @@ share/zsh/${V}/functions/Completion/Unix/_cmdstring
share/zsh/${V}/functions/Completion/Unix/_cmp
share/zsh/${V}/functions/Completion/Unix/_column
share/zsh/${V}/functions/Completion/Unix/_comm
+share/zsh/${V}/functions/Completion/Unix/_composer
share/zsh/${V}/functions/Completion/Unix/_compress
share/zsh/${V}/functions/Completion/Unix/_configure
share/zsh/${V}/functions/Completion/Unix/_cowsay
@@ -477,6 +483,7 @@ share/zsh/${V}/functions/Completion/Unix/_dmidecode
share/zsh/${V}/functions/Completion/Unix/_dns_types
share/zsh/${V}/functions/Completion/Unix/_doas
share/zsh/${V}/functions/Completion/Unix/_domains
+share/zsh/${V}/functions/Completion/Unix/_dos2unix
share/zsh/${V}/functions/Completion/Unix/_drill
share/zsh/${V}/functions/Completion/Unix/_dsh
share/zsh/${V}/functions/Completion/Unix/_dtruss
@@ -546,6 +553,7 @@ share/zsh/${V}/functions/Completion/Unix/_have_glob_qual
share/zsh/${V}/functions/Completion/Unix/_head
share/zsh/${V}/functions/Completion/Unix/_hexdump
share/zsh/${V}/functions/Completion/Unix/_hg
+share/zsh/${V}/functions/Completion/Unix/_host
share/zsh/${V}/functions/Completion/Unix/_hostname
share/zsh/${V}/functions/Completion/Unix/_hosts
share/zsh/${V}/functions/Completion/Unix/_iconv
@@ -558,6 +566,7 @@ share/zsh/${V}/functions/Completion/Unix/_initctl
share/zsh/${V}/functions/Completion/Unix/_install
share/zsh/${V}/functions/Completion/Unix/_iostat
share/zsh/${V}/functions/Completion/Unix/_ip
+share/zsh/${V}/functions/Completion/Unix/_ipsec
share/zsh/${V}/functions/Completion/Unix/_irssi
share/zsh/${V}/functions/Completion/Unix/_ispell
share/zsh/${V}/functions/Completion/Unix/_java
@@ -602,6 +611,8 @@ share/zsh/${V}/functions/Completion/Unix/_mencal
share/zsh/${V}/functions/Completion/Unix/_mh
share/zsh/${V}/functions/Completion/Unix/_mime_types
share/zsh/${V}/functions/Completion/Unix/_mkdir
+share/zsh/${V}/functions/Completion/Unix/_mkfifo
+share/zsh/${V}/functions/Completion/Unix/_mknod
share/zsh/${V}/functions/Completion/Unix/_mktemp
share/zsh/${V}/functions/Completion/Unix/_module
share/zsh/${V}/functions/Completion/Unix/_monotone
@@ -715,6 +726,7 @@ share/zsh/${V}/functions/Completion/Unix/_setfacl
share/zsh/${V}/functions/Completion/Unix/_sh
share/zsh/${V}/functions/Completion/Unix/_shasum
share/zsh/${V}/functions/Completion/Unix/_showmount
+share/zsh/${V}/functions/Completion/Unix/_shred
share/zsh/${V}/functions/Completion/Unix/_shuf
share/zsh/${V}/functions/Completion/Unix/_shutdown
share/zsh/${V}/functions/Completion/Unix/_signals
@@ -740,6 +752,7 @@ share/zsh/${V}/functions/Completion/Unix/_subversion
share/zsh/${V}/functions/Completion/Unix/_sudo
share/zsh/${V}/functions/Completion/Unix/_surfraw
share/zsh/${V}/functions/Completion/Unix/_swaks
+share/zsh/${V}/functions/Completion/Unix/_swanctl
share/zsh/${V}/functions/Completion/Unix/_swift
share/zsh/${V}/functions/Completion/Unix/_sys_calls
share/zsh/${V}/functions/Completion/Unix/_sysctl
@@ -774,6 +787,7 @@ share/zsh/${V}/functions/Completion/Unix/_tput
share/zsh/${V}/functions/Completion/Unix/_tr
share/zsh/${V}/functions/Completion/Unix/_tree
share/zsh/${V}/functions/Completion/Unix/_truss
+share/zsh/${V}/functions/Completion/Unix/_tty
share/zsh/${V}/functions/Completion/Unix/_ttys
share/zsh/${V}/functions/Completion/Unix/_twidge
share/zsh/${V}/functions/Completion/Unix/_twisted
@@ -793,6 +807,7 @@ share/zsh/${V}/functions/Completion/Unix/_users_on
share/zsh/${V}/functions/Completion/Unix/_uzbl
share/zsh/${V}/functions/Completion/Unix/_vcsh
share/zsh/${V}/functions/Completion/Unix/_vim
+share/zsh/${V}/functions/Completion/Unix/_visudo
share/zsh/${V}/functions/Completion/Unix/_vmstat
share/zsh/${V}/functions/Completion/Unix/_vorbis
share/zsh/${V}/functions/Completion/Unix/_vpnc
@@ -920,6 +935,7 @@ share/zsh/${V}/functions/Completion/Zsh/_echoti
share/zsh/${V}/functions/Completion/Zsh/_emulate
share/zsh/${V}/functions/Completion/Zsh/_enable
share/zsh/${V}/functions/Completion/Zsh/_equal
+share/zsh/${V}/functions/Completion/Zsh/_exec
share/zsh/${V}/functions/Completion/Zsh/_fc
share/zsh/${V}/functions/Completion/Zsh/_file_descriptors
share/zsh/${V}/functions/Completion/Zsh/_first
