[email protected] writes:
> update to zsh-5.0.2, some minor new features and bug fixes.
attached a new diff with some minor tweaks:
-> remove useless .orig diles, so zap comment markers in PLIST.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile 11 Mar 2013 11:41:29 -0000 1.68
+++ Makefile 13 Aug 2013 16:51:15 -0000
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.0.0
+V= 5.0.2
DISTNAME= zsh-$V
CATEGORIES= shells
@@ -51,6 +51,7 @@ pre-configure:
.for i in ${EXTFILES}
perl -pi -e "s,/bin/zsh,${TRUEPREFIX}/bin/zsh,g"
${WRKSRC}/Functions/${i}
.endfor
+ @find ${WRKSRC} -name "*.orig" -exec rm -f {} \;
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/$V/scripts/
Index: distinfo
===================================================================
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo 24 Sep 2012 19:33:50 -0000 1.17
+++ distinfo 13 Aug 2013 16:51:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.0.0.tar.gz) = g1GU6oOr2BK1/bHSv6ZCfExOledxxKdekAYDevjv0mQ=
-SIZE (zsh-5.0.0.tar.gz) = 3795376
+SHA256 (zsh-5.0.2.tar.gz) = rcDHiBUyQZeXcTt8UDvMVnTIj5OhkeJvcAtCwRoagW4=
+SIZE (zsh-5.0.2.tar.gz) = 3823234
Index: patches/patch-Completion_Unix_Command__find
===================================================================
RCS file: /cvs/ports/shells/zsh/patches/patch-Completion_Unix_Command__find,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Completion_Unix_Command__find
--- patches/patch-Completion_Unix_Command__find 8 Feb 2008 04:55:08 -0000
1.2
+++ patches/patch-Completion_Unix_Command__find 13 Aug 2013 16:51:15 -0000
@@ -1,24 +1,29 @@
-$OpenBSD: patch-Completion_Unix_Command__find,v 1.2 2008/02/08 04:55:08 okan
Exp $
---- Completion/Unix/Command/_find.orig Thu Dec 13 15:04:47 2007
-+++ Completion/Unix/Command/_find Thu Dec 13 15:13:49 2007
-@@ -1,71 +1,40 @@
+$OpenBSD$
+--- Completion/Unix/Command/_find.orig Sun Aug 11 04:52:54 2013
++++ Completion/Unix/Command/_find Sun Aug 11 04:53:00 2013
+@@ -1,82 +1,39 @@
-#compdef find
+#compdef find (OpenBSD)
+# Sebastian Stark <[email protected]>
_arguments \
+- '(- *)-help' '(-)--help' \
+- '(- *)-version' '(-)--version' \
+- '(-L -P)-H[only follow symlinks when resolving command-line arguments]' \
+- '(-H -P)-L[follow symlinks]' \
+- '(-H -L)-P[never follow symlinks]' \
+- '-D[print diagnostics]:deb option:(help tree search stat rates opt exec)' \
+- '-O+[enable query optimisation]:level:(1 2 3)' \
- '*-daystart' \
-- '*-depth' \
+- '*-d' '*-depth' \
- '*-follow' \
-- '*-help' \
-- '*-ignore_readdir_race' \
-- '*-maxdepth:maximum search depth:' \
-- '*-mindepth:minimum search depth:' \
+- '(-noignore_readdir_race)-ignore_readdir_race' \
+- '*-maxdepth:maximum search depth' \
+- '*-mindepth:minimum search depth' \
- '*-mount' \
-- '*-noignore_readdir_race' \
+- '(-ignore_readdir_race)-noignore_readdir_race' \
- '*-noleaf' \
-- '*-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep
posix-extended)' \
-- '*-version' \
+- '-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep
posix-extended)' \
- '*-warn' \
- '*-nowarn' \
- '*-xdev' \
@@ -37,6 +42,7 @@ $OpenBSD: patch-Completion_Unix_Command_
- '*-used:access after inode change (days):' \
+ '*-ctime:inode change time (minutes)' \
'*-empty' \
+- '*-executable' \
- '*-false' \
- '*-fstype:file system type:_file_systems' \
- '*-gid:numeric group ID:' \
@@ -71,6 +77,8 @@ $OpenBSD: patch-Completion_Unix_Command_
'*-nouser' \
'*-nogroup' \
- '*-perm:file permission bits:' \
+- '*-readable' \
+- '*-writable' \
- '*-size:file size:' \
- '*-samefile:same inode as:_files' \
- '*-true' \
@@ -81,7 +89,7 @@ $OpenBSD: patch-Completion_Unix_Command_
- '*-execdir:program: _command_names -e:*\;::program arguments: _normal' \
'*-ok:program: _command_names -e:*\;::program arguments: _normal' \
- '*-okdir:program: _command_names -e:*\;::program arguments: _normal' \
- '*-fls:output file:_files' \
+- '*-fls:output file:_files' \
- '*-fprint:output file:_files' \
- '*-fprint0:output file:_files' \
- '*-fprintf:output file:_files:output format:' \
@@ -93,6 +101,9 @@ $OpenBSD: patch-Completion_Unix_Command_
'*-prune' \
- '*-quit' \
- '*-ls' \
+- '*-and' '*-a' \
+- '*-or' '*-o' \
+- '*-not' \
+ '*-size:file size:' \
+ '*-type:file type:((b\:block\ special\ file c\:character\ special\ file
d\:directory p\:named\ pipe f\:normal\ file l\:symbolic\ link s\:socket))' \
+ '*-user:user:_users' \
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/shells/zsh/pkg/PFRAG.shared,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PFRAG.shared
--- pkg/PFRAG.shared 3 Jun 2009 14:35:48 -0000 1.9
+++ pkg/PFRAG.shared 13 Aug 2013 16:51:15 -0000
@@ -36,86 +36,3 @@ lib/zsh/${V}/zsh/zprof.so
lib/zsh/${V}/zsh/zpty.so
lib/zsh/${V}/zsh/zselect.so
lib/zsh/${V}/zsh/zutil.so
-share/zsh/${V}/functions/VCS_INFO_adjust
-share/zsh/${V}/functions/VCS_INFO_bydir_detect
-share/zsh/${V}/functions/VCS_INFO_check_com
-share/zsh/${V}/functions/VCS_INFO_detect_bzr
-share/zsh/${V}/functions/VCS_INFO_detect_cdv
-share/zsh/${V}/functions/VCS_INFO_detect_cvs
-share/zsh/${V}/functions/VCS_INFO_detect_darcs
-share/zsh/${V}/functions/VCS_INFO_detect_git
-share/zsh/${V}/functions/VCS_INFO_detect_hg
-share/zsh/${V}/functions/VCS_INFO_detect_mtn
-share/zsh/${V}/functions/VCS_INFO_detect_p4
-share/zsh/${V}/functions/VCS_INFO_detect_svk
-share/zsh/${V}/functions/VCS_INFO_detect_svn
-share/zsh/${V}/functions/VCS_INFO_detect_tla
-share/zsh/${V}/functions/VCS_INFO_formats
-share/zsh/${V}/functions/VCS_INFO_get_cmd
-share/zsh/${V}/functions/VCS_INFO_get_data_bzr
-share/zsh/${V}/functions/VCS_INFO_get_data_cdv
-share/zsh/${V}/functions/VCS_INFO_get_data_cvs
-share/zsh/${V}/functions/VCS_INFO_get_data_darcs
-share/zsh/${V}/functions/VCS_INFO_get_data_git
-share/zsh/${V}/functions/VCS_INFO_get_data_hg
-share/zsh/${V}/functions/VCS_INFO_get_data_mtn
-share/zsh/${V}/functions/VCS_INFO_get_data_p4
-share/zsh/${V}/functions/VCS_INFO_get_data_svk
-share/zsh/${V}/functions/VCS_INFO_get_data_svn
-share/zsh/${V}/functions/VCS_INFO_get_data_tla
-share/zsh/${V}/functions/VCS_INFO_maxexports
-share/zsh/${V}/functions/VCS_INFO_nvcsformats
-share/zsh/${V}/functions/VCS_INFO_realpath
-share/zsh/${V}/functions/VCS_INFO_reposub
-share/zsh/${V}/functions/VCS_INFO_set
-share/zsh/${V}/functions/tcp_alias
-share/zsh/${V}/functions/tcp_close
-share/zsh/${V}/functions/tcp_command
-share/zsh/${V}/functions/tcp_expect
-share/zsh/${V}/functions/tcp_fd_handler
-share/zsh/${V}/functions/tcp_log
-share/zsh/${V}/functions/tcp_open
-share/zsh/${V}/functions/tcp_output
-share/zsh/${V}/functions/tcp_point
-share/zsh/${V}/functions/tcp_proxy
-share/zsh/${V}/functions/tcp_read
-share/zsh/${V}/functions/tcp_rename
-share/zsh/${V}/functions/tcp_send
-share/zsh/${V}/functions/tcp_sess
-share/zsh/${V}/functions/tcp_shoot
-share/zsh/${V}/functions/tcp_spam
-share/zsh/${V}/functions/tcp_talk
-share/zsh/${V}/functions/tcp_wait
-share/zsh/${V}/functions/zfanon
-share/zsh/${V}/functions/zfautocheck
-share/zsh/${V}/functions/zfcd
-share/zsh/${V}/functions/zfcd_match
-share/zsh/${V}/functions/zfcget
-share/zsh/${V}/functions/zfclose
-share/zsh/${V}/functions/zfcput
-share/zsh/${V}/functions/zfdir
-share/zsh/${V}/functions/zffcache
-share/zsh/${V}/functions/zfgcp
-share/zsh/${V}/functions/zfget
-share/zsh/${V}/functions/zfget_match
-share/zsh/${V}/functions/zfgoto
-share/zsh/${V}/functions/zfhere
-share/zsh/${V}/functions/zfinit
-share/zsh/${V}/functions/zfls
-share/zsh/${V}/functions/zfmark
-share/zsh/${V}/functions/zfopen
-share/zsh/${V}/functions/zfparams
-share/zsh/${V}/functions/zfpcp
-share/zsh/${V}/functions/zfput
-share/zsh/${V}/functions/zfrglob
-share/zsh/${V}/functions/zfrtime
-share/zsh/${V}/functions/zfsession
-share/zsh/${V}/functions/zfstat
-share/zsh/${V}/functions/zftp_chpwd
-share/zsh/${V}/functions/zftp_progress
-share/zsh/${V}/functions/zftransfer
-share/zsh/${V}/functions/zftype
-share/zsh/${V}/functions/zfuget
-share/zsh/${V}/functions/zfuput
-share/zsh/${V}/functions/zsh-newuser-install
-share/zsh/${V}/scripts/newuser
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 PLIST
--- pkg/PLIST 24 Sep 2012 19:33:50 -0000 1.36
+++ pkg/PLIST 13 Aug 2013 16:51:15 -0000
@@ -2,7 +2,7 @@
@pkgpath shells/zsh,-main
@shell bin/zsh
%%SHARED%%
-@bin bin/zsh-${V}
+@bin bin/${FULLPKGNAME}
@info info/zsh.info
@man man/man1/zsh.1
@man man/man1/zshall.1
@@ -24,10 +24,42 @@
share/zsh/
share/zsh/${V}/
share/zsh/${V}/functions/
+share/zsh/${V}/functions/VCS_INFO_adjust
+share/zsh/${V}/functions/VCS_INFO_bydir_detect
+share/zsh/${V}/functions/VCS_INFO_check_com
+share/zsh/${V}/functions/VCS_INFO_detect_bzr
+share/zsh/${V}/functions/VCS_INFO_detect_cdv
+share/zsh/${V}/functions/VCS_INFO_detect_cvs
+share/zsh/${V}/functions/VCS_INFO_detect_darcs
share/zsh/${V}/functions/VCS_INFO_detect_fossil
+share/zsh/${V}/functions/VCS_INFO_detect_git
+share/zsh/${V}/functions/VCS_INFO_detect_hg
+share/zsh/${V}/functions/VCS_INFO_detect_mtn
+share/zsh/${V}/functions/VCS_INFO_detect_p4
+share/zsh/${V}/functions/VCS_INFO_detect_svk
+share/zsh/${V}/functions/VCS_INFO_detect_svn
+share/zsh/${V}/functions/VCS_INFO_detect_tla
+share/zsh/${V}/functions/VCS_INFO_formats
+share/zsh/${V}/functions/VCS_INFO_get_cmd
+share/zsh/${V}/functions/VCS_INFO_get_data_bzr
+share/zsh/${V}/functions/VCS_INFO_get_data_cdv
+share/zsh/${V}/functions/VCS_INFO_get_data_cvs
+share/zsh/${V}/functions/VCS_INFO_get_data_darcs
share/zsh/${V}/functions/VCS_INFO_get_data_fossil
+share/zsh/${V}/functions/VCS_INFO_get_data_git
+share/zsh/${V}/functions/VCS_INFO_get_data_hg
+share/zsh/${V}/functions/VCS_INFO_get_data_mtn
+share/zsh/${V}/functions/VCS_INFO_get_data_p4
+share/zsh/${V}/functions/VCS_INFO_get_data_svk
+share/zsh/${V}/functions/VCS_INFO_get_data_svn
+share/zsh/${V}/functions/VCS_INFO_get_data_tla
share/zsh/${V}/functions/VCS_INFO_hook
+share/zsh/${V}/functions/VCS_INFO_maxexports
+share/zsh/${V}/functions/VCS_INFO_nvcsformats
share/zsh/${V}/functions/VCS_INFO_quilt
+share/zsh/${V}/functions/VCS_INFO_realpath
+share/zsh/${V}/functions/VCS_INFO_reposub
+share/zsh/${V}/functions/VCS_INFO_set
share/zsh/${V}/functions/_SuSEconfig
share/zsh/${V}/functions/_a2ps
share/zsh/${V}/functions/_a2utils
@@ -78,7 +110,7 @@ share/zsh/${V}/functions/_bogofilter
share/zsh/${V}/functions/_brace_parameter
share/zsh/${V}/functions/_brctl
share/zsh/${V}/functions/_bsd_pkg
-@comment share/zsh/${V}/functions/_bsd_pkg.orig
+share/zsh/${V}/functions/_btrfs
share/zsh/${V}/functions/_bts
share/zsh/${V}/functions/_bug
share/zsh/${V}/functions/_builtin
@@ -102,6 +134,7 @@ share/zsh/${V}/functions/_chkconfig
share/zsh/${V}/functions/_chmod
share/zsh/${V}/functions/_chown
share/zsh/${V}/functions/_chrt
+share/zsh/${V}/functions/_clay
share/zsh/${V}/functions/_combination
share/zsh/${V}/functions/_comm
share/zsh/${V}/functions/_command
@@ -138,6 +171,7 @@ share/zsh/${V}/functions/_cygstart
share/zsh/${V}/functions/_dak
share/zsh/${V}/functions/_darcs
share/zsh/${V}/functions/_date
+share/zsh/${V}/functions/_dbus
share/zsh/${V}/functions/_dchroot
share/zsh/${V}/functions/_dchroot-dsa
share/zsh/${V}/functions/_dcop
@@ -159,7 +193,6 @@ share/zsh/${V}/functions/_dict
share/zsh/${V}/functions/_dict_words
share/zsh/${V}/functions/_diff
share/zsh/${V}/functions/_diff_options
-@comment share/zsh/${V}/functions/_diff_options.orig
share/zsh/${V}/functions/_diffstat
share/zsh/${V}/functions/_dir_list
share/zsh/${V}/functions/_directories
@@ -213,7 +246,6 @@ share/zsh/${V}/functions/_file_descripto
share/zsh/${V}/functions/_file_systems
share/zsh/${V}/functions/_files
share/zsh/${V}/functions/_find
-@comment share/zsh/${V}/functions/_find.orig
share/zsh/${V}/functions/_finger
share/zsh/${V}/functions/_fink
share/zsh/${V}/functions/_first
@@ -315,6 +347,7 @@ share/zsh/${V}/functions/_last
share/zsh/${V}/functions/_ld_debug
share/zsh/${V}/functions/_ldd
share/zsh/${V}/functions/_less
+share/zsh/${V}/functions/_lha
share/zsh/${V}/functions/_lighttpd
share/zsh/${V}/functions/_limit
share/zsh/${V}/functions/_limits
@@ -398,6 +431,7 @@ share/zsh/${V}/functions/_newsgroups
share/zsh/${V}/functions/_next_label
share/zsh/${V}/functions/_next_tags
share/zsh/${V}/functions/_nice
+share/zsh/${V}/functions/_nkf
share/zsh/${V}/functions/_nm
share/zsh/${V}/functions/_nmap
share/zsh/${V}/functions/_nmcli
@@ -434,7 +468,6 @@ share/zsh/${V}/functions/_perldoc
share/zsh/${V}/functions/_pfctl
share/zsh/${V}/functions/_pfexec
share/zsh/${V}/functions/_pgrep
-@comment share/zsh/${V}/functions/_pgrep.orig
share/zsh/${V}/functions/_php
share/zsh/${V}/functions/_physical_volumes
share/zsh/${V}/functions/_pick_variant
@@ -583,7 +616,6 @@ share/zsh/${V}/functions/_time_zone
share/zsh/${V}/functions/_tin
share/zsh/${V}/functions/_tla
share/zsh/${V}/functions/_tmux
-@comment share/zsh/${V}/functions/_tmux.orig
share/zsh/${V}/functions/_todo.sh
share/zsh/${V}/functions/_toilet
share/zsh/${V}/functions/_toolchain-source
@@ -687,6 +719,7 @@ share/zsh/${V}/functions/_xt_session_id
share/zsh/${V}/functions/_xterm
share/zsh/${V}/functions/_xv
share/zsh/${V}/functions/_xwit
+share/zsh/${V}/functions/_xz
share/zsh/${V}/functions/_yafc
share/zsh/${V}/functions/_yast
share/zsh/${V}/functions/_yast2
@@ -815,6 +848,24 @@ share/zsh/${V}/functions/send-invisible
share/zsh/${V}/functions/smart-insert-last-word
share/zsh/${V}/functions/split-shell-arguments
share/zsh/${V}/functions/sticky-note
+share/zsh/${V}/functions/tcp_alias
+share/zsh/${V}/functions/tcp_close
+share/zsh/${V}/functions/tcp_command
+share/zsh/${V}/functions/tcp_expect
+share/zsh/${V}/functions/tcp_fd_handler
+share/zsh/${V}/functions/tcp_log
+share/zsh/${V}/functions/tcp_open
+share/zsh/${V}/functions/tcp_output
+share/zsh/${V}/functions/tcp_point
+share/zsh/${V}/functions/tcp_proxy
+share/zsh/${V}/functions/tcp_read
+share/zsh/${V}/functions/tcp_rename
+share/zsh/${V}/functions/tcp_send
+share/zsh/${V}/functions/tcp_sess
+share/zsh/${V}/functions/tcp_shoot
+share/zsh/${V}/functions/tcp_spam
+share/zsh/${V}/functions/tcp_talk
+share/zsh/${V}/functions/tcp_wait
share/zsh/${V}/functions/tetris
share/zsh/${V}/functions/throw
share/zsh/${V}/functions/transpose-lines
@@ -834,6 +885,37 @@ share/zsh/${V}/functions/zargs
share/zsh/${V}/functions/zcalc
share/zsh/${V}/functions/zed
share/zsh/${V}/functions/zed-set-file-name
+share/zsh/${V}/functions/zfanon
+share/zsh/${V}/functions/zfautocheck
+share/zsh/${V}/functions/zfcd
+share/zsh/${V}/functions/zfcd_match
+share/zsh/${V}/functions/zfcget
+share/zsh/${V}/functions/zfclose
+share/zsh/${V}/functions/zfcput
+share/zsh/${V}/functions/zfdir
+share/zsh/${V}/functions/zffcache
+share/zsh/${V}/functions/zfgcp
+share/zsh/${V}/functions/zfget
+share/zsh/${V}/functions/zfget_match
+share/zsh/${V}/functions/zfgoto
+share/zsh/${V}/functions/zfhere
+share/zsh/${V}/functions/zfinit
+share/zsh/${V}/functions/zfls
+share/zsh/${V}/functions/zfmark
+share/zsh/${V}/functions/zfopen
+share/zsh/${V}/functions/zfparams
+share/zsh/${V}/functions/zfpcp
+share/zsh/${V}/functions/zfput
+share/zsh/${V}/functions/zfrglob
+share/zsh/${V}/functions/zfrtime
+share/zsh/${V}/functions/zfsession
+share/zsh/${V}/functions/zfstat
+share/zsh/${V}/functions/zftp_chpwd
+share/zsh/${V}/functions/zftp_progress
+share/zsh/${V}/functions/zftransfer
+share/zsh/${V}/functions/zftype
+share/zsh/${V}/functions/zfuget
+share/zsh/${V}/functions/zfuput
share/zsh/${V}/functions/zkbd
share/zsh/${V}/functions/zmathfuncdef
share/zsh/${V}/functions/zmv
@@ -841,8 +923,10 @@ share/zsh/${V}/functions/zrecompile
share/zsh/${V}/functions/zsh-mime-contexts
share/zsh/${V}/functions/zsh-mime-handler
share/zsh/${V}/functions/zsh-mime-setup
+share/zsh/${V}/functions/zsh-newuser-install
share/zsh/${V}/functions/zsh_directory_name_cdr
share/zsh/${V}/functions/zstyle+
share/zsh/${V}/functions/ztodo
share/zsh/${V}/scripts/
+share/zsh/${V}/scripts/newuser
share/zsh/site-functions/