[Midnightbsd-cvs] CVS Commit: shells/zsh: Update to zsh 4.3.4.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Aug 5 12:49:26 EDT 2007
Log Message:
-----------
Update to zsh 4.3.4.
Update sites.
Switch to Options
Modified Files:
--------------
mports/shells/zsh:
Makefile (r1.6 -> r1.7)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/shells/zsh/files:
extra-patch-bsdtar (r1.1 -> r1.2)
patch-Src::utils.c (r1.1 -> r1.2)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/shells/zsh/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lshells/zsh/pkg-plist -Lshells/zsh/pkg-plist -u -r1.1 -r1.2
--- shells/zsh/pkg-plist
+++ shells/zsh/pkg-plist
@@ -1,4 +1,4 @@
- at comment $FreeBSD: ports/shells/zsh/pkg-plist,v 1.37 2006/05/01 08:38:01 sergei Exp $
+ at comment $FreeBSD: ports/shells/zsh/pkg-plist,v 1.38 2007/07/30 16:21:41 garga Exp $
bin/zsh
@exec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
@unexec echo "Updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
@@ -7,7 +7,7 @@
@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
bin/zsh-%%ZSH_VER%%
@exec mkdir %%ZSH_ETCDIR%% 2> /dev/null || true
- at unexec rmdir %%ZSH_ETCDIR%% 2> /dev/null || true
+ at dirrmtry %%ZSH_ETCDIR%%
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/compctl.so
@@ -25,6 +25,7 @@
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/net/tcp.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/newuser.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so
+%%PCRE%%%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/pcre.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/rlimits.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/sched.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/stat.so
@@ -43,68 +44,18 @@
%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%
%%NO_STATIC%%lib/zsh/libzsh-%%ZSH_VER%%.so
%%NO_STATIC%%@dirrm lib/zsh
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/LICENCE
-%%PORTDOCS%%%%DOCSDIR%%/META-FAQ
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/completion-style-guide
-%%PORTDOCS%%%%DOCSDIR%%/zsh.dvi
-%%PORTDOCS%%%%DOCSDIR%%/zsh.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_1.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_10.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_11.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_12.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_13.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_14.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_15.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_16.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_17.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_18.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_19.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_2.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_20.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_21.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_22.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_23.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_24.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_25.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_26.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_27.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_28.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_29.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_3.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_30.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_31.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_32.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_33.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_34.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_35.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_36.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_37.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_38.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_39.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_4.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_40.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_41.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_42.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_43.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_44.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_45.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_5.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_6.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_7.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_8.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_9.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_toc.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/zlogin
-%%EXAMPLESDIR%%/zshenv
-%%EXAMPLESDIR%%/zshrc
- at dirrm %%EXAMPLESDIR%%
@exec mkdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
@unexec rmdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
+%%ZSH_FNDIR%%/Calendar/age
+%%ZSH_FNDIR%%/Calendar/calendar
+%%ZSH_FNDIR%%/Calendar/calendar_add
+%%ZSH_FNDIR%%/Calendar/calendar_edit
+%%ZSH_FNDIR%%/Calendar/calendar_lockfiles
+%%ZSH_FNDIR%%/Calendar/calendar_read
+%%ZSH_FNDIR%%/Calendar/calendar_scandate
+%%ZSH_FNDIR%%/Calendar/calendar_show
+%%ZSH_FNDIR%%/Calendar/calendar_showdate
+%%ZSH_FNDIR%%/Calendar/calendar_sort
%%ZSH_FNDIR%%/Completion/AIX/_floppy
%%ZSH_FNDIR%%/Completion/AIX/_logical_volumes
%%ZSH_FNDIR%%/Completion/AIX/_lscfg
@@ -119,7 +70,10 @@
%%ZSH_FNDIR%%/Completion/BSD/_bsd_pkg
%%ZSH_FNDIR%%/Completion/BSD/_chflags
%%ZSH_FNDIR%%/Completion/BSD/_cvsup
+%%ZSH_FNDIR%%/Completion/BSD/_csup
%%ZSH_FNDIR%%/Completion/BSD/_kld
+%%ZSH_FNDIR%%/Completion/BSD/_portlint
+%%ZSH_FNDIR%%/Completion/BSD/_portsnap
%%ZSH_FNDIR%%/Completion/Base/_all_labels
%%ZSH_FNDIR%%/Completion/Base/_all_matches
%%ZSH_FNDIR%%/Completion/Base/_alternative
@@ -165,6 +119,7 @@
%%ZSH_FNDIR%%/Completion/Base/_prefix
%%ZSH_FNDIR%%/Completion/Base/_read_comp
%%ZSH_FNDIR%%/Completion/Base/_regex_arguments
+%%ZSH_FNDIR%%/Completion/Base/_regex_words
%%ZSH_FNDIR%%/Completion/Base/_requested
%%ZSH_FNDIR%%/Completion/Base/_retrieve_cache
%%ZSH_FNDIR%%/Completion/Base/_sep_parts
@@ -196,14 +151,19 @@
%%ZSH_FNDIR%%/Completion/Darwin/_qtplay
%%ZSH_FNDIR%%/Completion/Darwin/_retrieve_mac_apps
%%ZSH_FNDIR%%/Completion/Darwin/_softwareupdate
+%%ZSH_FNDIR%%/Completion/Debian/_a2utils
%%ZSH_FNDIR%%/Completion/Debian/_apt
+%%ZSH_FNDIR%%/Completion/Debian/_apt-file
%%ZSH_FNDIR%%/Completion/Debian/_apt-move
%%ZSH_FNDIR%%/Completion/Debian/_apt-show-versions
%%ZSH_FNDIR%%/Completion/Debian/_aptitude
%%ZSH_FNDIR%%/Completion/Debian/_auto-apt
%%ZSH_FNDIR%%/Completion/Debian/_bts
%%ZSH_FNDIR%%/Completion/Debian/_bug
+%%ZSH_FNDIR%%/Completion/Debian/_cdbs-edit-patch
+%%ZSH_FNDIR%%/Completion/Debian/_dak
%%ZSH_FNDIR%%/Completion/Debian/_dchroot
+%%ZSH_FNDIR%%/Completion/Debian/_dchroot-dsa
%%ZSH_FNDIR%%/Completion/Debian/_deb_packages
%%ZSH_FNDIR%%/Completion/Debian/_debchange
%%ZSH_FNDIR%%/Completion/Debian/_debdiff
@@ -215,6 +175,7 @@
%%ZSH_FNDIR%%/Completion/Debian/_dpkg_source
%%ZSH_FNDIR%%/Completion/Debian/_dput
%%ZSH_FNDIR%%/Completion/Debian/_dupload
+%%ZSH_FNDIR%%/Completion/Debian/_invoke-rc.d
%%ZSH_FNDIR%%/Completion/Debian/_linda
%%ZSH_FNDIR%%/Completion/Debian/_lintian
%%ZSH_FNDIR%%/Completion/Debian/_madison
@@ -230,7 +191,11 @@
%%ZSH_FNDIR%%/Completion/Debian/_wajig
%%ZSH_FNDIR%%/Completion/Debian/_wanna-build
%%ZSH_FNDIR%%/Completion/Linux/_acpi
+%%ZSH_FNDIR%%/Completion/Linux/_acpitool
+%%ZSH_FNDIR%%/Completion/Linux/_analyseplugin
%%ZSH_FNDIR%%/Completion/Linux/_brctl
+%%ZSH_FNDIR%%/Completion/Linux/_fuse_arguments
+%%ZSH_FNDIR%%/Completion/Linux/_fuse_values
%%ZSH_FNDIR%%/Completion/Linux/_fusermount
%%ZSH_FNDIR%%/Completion/Linux/_iptables
%%ZSH_FNDIR%%/Completion/Linux/_iwconfig
@@ -245,8 +210,10 @@
%%ZSH_FNDIR%%/Completion/Linux/_tune2fs
%%ZSH_FNDIR%%/Completion/Linux/_uml
%%ZSH_FNDIR%%/Completion/Linux/_valgrind
+%%ZSH_FNDIR%%/Completion/Linux/_vserver
+%%ZSH_FNDIR%%/Completion/Linux/_wakeup_capable_devices
%%ZSH_FNDIR%%/Completion/Linux/_yast
-%%ZSH_FNDIR%%/Completion/Mandrake/_urpmi
+%%ZSH_FNDIR%%/Completion/Mandriva/_urpmi
%%ZSH_FNDIR%%/Completion/Redhat/_rpm
%%ZSH_FNDIR%%/Completion/Redhat/_service
%%ZSH_FNDIR%%/Completion/Redhat/_yum
@@ -262,23 +229,28 @@
%%ZSH_FNDIR%%/Completion/Unix/_arping
%%ZSH_FNDIR%%/Completion/Unix/_attr
%%ZSH_FNDIR%%/Completion/Unix/_baz
+%%ZSH_FNDIR%%/Completion/Unix/_bind_addresses
%%ZSH_FNDIR%%/Completion/Unix/_bison
%%ZSH_FNDIR%%/Completion/Unix/_bittorrent
%%ZSH_FNDIR%%/Completion/Unix/_bogofilter
%%ZSH_FNDIR%%/Completion/Unix/_bzip2
%%ZSH_FNDIR%%/Completion/Unix/_bzr
%%ZSH_FNDIR%%/Completion/Unix/_cal
+%%ZSH_FNDIR%%/Completion/Unix/_canonical_paths
%%ZSH_FNDIR%%/Completion/Unix/_ccal
%%ZSH_FNDIR%%/Completion/Unix/_cdcd
%%ZSH_FNDIR%%/Completion/Unix/_cdrecord
%%ZSH_FNDIR%%/Completion/Unix/_chkconfig
%%ZSH_FNDIR%%/Completion/Unix/_chmod
%%ZSH_FNDIR%%/Completion/Unix/_chown
+%%ZSH_FNDIR%%/Completion/Unix/_comm
%%ZSH_FNDIR%%/Completion/Unix/_compress
%%ZSH_FNDIR%%/Completion/Unix/_configure
+%%ZSH_FNDIR%%/Completion/Unix/_cowsay
%%ZSH_FNDIR%%/Completion/Unix/_cp
%%ZSH_FNDIR%%/Completion/Unix/_cpio
%%ZSH_FNDIR%%/Completion/Unix/_cplay
+%%ZSH_FNDIR%%/Completion/Unix/_cssh
%%ZSH_FNDIR%%/Completion/Unix/_ctags_tags
%%ZSH_FNDIR%%/Completion/Unix/_cvs
%%ZSH_FNDIR%%/Completion/Unix/_darcs
@@ -300,6 +272,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_elm
%%ZSH_FNDIR%%/Completion/Unix/_email_addresses
%%ZSH_FNDIR%%/Completion/Unix/_enscript
+%%ZSH_FNDIR%%/Completion/Unix/_env
%%ZSH_FNDIR%%/Completion/Unix/_fakeroot
%%ZSH_FNDIR%%/Completion/Unix/_fetchmail
%%ZSH_FNDIR%%/Completion/Unix/_figlet
@@ -316,6 +289,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_gdb
%%ZSH_FNDIR%%/Completion/Unix/_getconf
%%ZSH_FNDIR%%/Completion/Unix/_getent
+%%ZSH_FNDIR%%/Completion/Unix/_getmail
%%ZSH_FNDIR%%/Completion/Unix/_git
%%ZSH_FNDIR%%/Completion/Unix/_global
%%ZSH_FNDIR%%/Completion/Unix/_global_tags
@@ -334,6 +308,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_ifconfig
%%ZSH_FNDIR%%/Completion/Unix/_imagemagick
%%ZSH_FNDIR%%/Completion/Unix/_init_d
+%%ZSH_FNDIR%%/Completion/Unix/_ip
%%ZSH_FNDIR%%/Completion/Unix/_irssi
%%ZSH_FNDIR%%/Completion/Unix/_ispell
%%ZSH_FNDIR%%/Completion/Unix/_java
@@ -345,8 +320,10 @@
%%ZSH_FNDIR%%/Completion/Unix/_last
%%ZSH_FNDIR%%/Completion/Unix/_less
%%ZSH_FNDIR%%/Completion/Unix/_links
+%%ZSH_FNDIR%%/Completion/Unix/_list_files
%%ZSH_FNDIR%%/Completion/Unix/_loadkeys
%%ZSH_FNDIR%%/Completion/Unix/_locales
+%%ZSH_FNDIR%%/Completion/Unix/_locate
%%ZSH_FNDIR%%/Completion/Unix/_look
%%ZSH_FNDIR%%/Completion/Unix/_lp
%%ZSH_FNDIR%%/Completion/Unix/_ls
@@ -358,8 +335,13 @@
%%ZSH_FNDIR%%/Completion/Unix/_make
%%ZSH_FNDIR%%/Completion/Unix/_man
%%ZSH_FNDIR%%/Completion/Unix/_mencal
+%%ZSH_FNDIR%%/Completion/Unix/_mercurial
+%%ZSH_FNDIR%%/Completion/Unix/_metaflac
%%ZSH_FNDIR%%/Completion/Unix/_mh
%%ZSH_FNDIR%%/Completion/Unix/_mime_types
+%%ZSH_FNDIR%%/Completion/Unix/_mkdir
+%%ZSH_FNDIR%%/Completion/Unix/_module
+%%ZSH_FNDIR%%/Completion/Unix/_monotone
%%ZSH_FNDIR%%/Completion/Unix/_mount
%%ZSH_FNDIR%%/Completion/Unix/_mpc
%%ZSH_FNDIR%%/Completion/Unix/_mt
@@ -380,6 +362,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_pack
%%ZSH_FNDIR%%/Completion/Unix/_patch
%%ZSH_FNDIR%%/Completion/Unix/_path_files
+%%ZSH_FNDIR%%/Completion/Unix/_pax
%%ZSH_FNDIR%%/Completion/Unix/_pbm
%%ZSH_FNDIR%%/Completion/Unix/_pdf
%%ZSH_FNDIR%%/Completion/Unix/_perforce
@@ -392,6 +375,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_pine
%%ZSH_FNDIR%%/Completion/Unix/_ping
%%ZSH_FNDIR%%/Completion/Unix/_pkg-config
+%%ZSH_FNDIR%%/Completion/Unix/_pon
%%ZSH_FNDIR%%/Completion/Unix/_ports
%%ZSH_FNDIR%%/Completion/Unix/_postfix
%%ZSH_FNDIR%%/Completion/Unix/_prcs
@@ -402,6 +386,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_psutils
%%ZSH_FNDIR%%/Completion/Unix/_pump
%%ZSH_FNDIR%%/Completion/Unix/_python
+%%ZSH_FNDIR%%/Completion/Unix/_qemu
%%ZSH_FNDIR%%/Completion/Unix/_quilt
%%ZSH_FNDIR%%/Completion/Unix/_raggle
%%ZSH_FNDIR%%/Completion/Unix/_rake
@@ -409,6 +394,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_rcs
%%ZSH_FNDIR%%/Completion/Unix/_renice
%%ZSH_FNDIR%%/Completion/Unix/_rlogin
+%%ZSH_FNDIR%%/Completion/Unix/_ri
%%ZSH_FNDIR%%/Completion/Unix/_rsync
%%ZSH_FNDIR%%/Completion/Unix/_rubber
%%ZSH_FNDIR%%/Completion/Unix/_ruby
@@ -421,9 +407,11 @@
%%ZSH_FNDIR%%/Completion/Unix/_sh
%%ZSH_FNDIR%%/Completion/Unix/_showmount
%%ZSH_FNDIR%%/Completion/Unix/_signals
+%%ZSH_FNDIR%%/Completion/Unix/_sisu
%%ZSH_FNDIR%%/Completion/Unix/_slrn
%%ZSH_FNDIR%%/Completion/Unix/_socket
%%ZSH_FNDIR%%/Completion/Unix/_spamassassin
+%%ZSH_FNDIR%%/Completion/Unix/_sqsh
%%ZSH_FNDIR%%/Completion/Unix/_ssh
%%ZSH_FNDIR%%/Completion/Unix/_strip
%%ZSH_FNDIR%%/Completion/Unix/_stty
@@ -434,6 +422,8 @@
%%ZSH_FNDIR%%/Completion/Unix/_sysctl
%%ZSH_FNDIR%%/Completion/Unix/_tar
%%ZSH_FNDIR%%/Completion/Unix/_tar_archive
+%%ZSH_FNDIR%%/Completion/Unix/_tardy
+%%ZSH_FNDIR%%/Completion/Unix/_tcptraceroute
%%ZSH_FNDIR%%/Completion/Unix/_telnet
%%ZSH_FNDIR%%/Completion/Unix/_terminals
%%ZSH_FNDIR%%/Completion/Unix/_tex
@@ -445,7 +435,10 @@
%%ZSH_FNDIR%%/Completion/Unix/_time_zone
%%ZSH_FNDIR%%/Completion/Unix/_tin
%%ZSH_FNDIR%%/Completion/Unix/_tla
+%%ZSH_FNDIR%%/Completion/Unix/_todo.sh
+%%ZSH_FNDIR%%/Completion/Unix/_toilet
%%ZSH_FNDIR%%/Completion/Unix/_totd
+%%ZSH_FNDIR%%/Completion/Unix/_tracepath
%%ZSH_FNDIR%%/Completion/Unix/_twisted
%%ZSH_FNDIR%%/Completion/Unix/_unace
%%ZSH_FNDIR%%/Completion/Unix/_unexpand
@@ -457,6 +450,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_users_on
%%ZSH_FNDIR%%/Completion/Unix/_vim
%%ZSH_FNDIR%%/Completion/Unix/_vorbis
+%%ZSH_FNDIR%%/Completion/Unix/_vorbiscomment
%%ZSH_FNDIR%%/Completion/Unix/_vux
%%ZSH_FNDIR%%/Completion/Unix/_w3m
%%ZSH_FNDIR%%/Completion/Unix/_webbrowser
@@ -466,6 +460,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_wiggle
%%ZSH_FNDIR%%/Completion/Unix/_xargs
%%ZSH_FNDIR%%/Completion/Unix/_xmlsoft
+%%ZSH_FNDIR%%/Completion/Unix/_yafc
%%ZSH_FNDIR%%/Completion/Unix/_yodl
%%ZSH_FNDIR%%/Completion/Unix/_yp
%%ZSH_FNDIR%%/Completion/Unix/_zcat
@@ -479,10 +474,12 @@
%%ZSH_FNDIR%%/Completion/X/_kfmclient
%%ZSH_FNDIR%%/Completion/X/_mozilla
%%ZSH_FNDIR%%/Completion/X/_mplayer
+%%ZSH_FNDIR%%/Completion/X/_nautilus
%%ZSH_FNDIR%%/Completion/X/_nedit
%%ZSH_FNDIR%%/Completion/X/_netscape
%%ZSH_FNDIR%%/Completion/X/_qiv
%%ZSH_FNDIR%%/Completion/X/_urxvt
+%%ZSH_FNDIR%%/Completion/X/_setxkbmap
%%ZSH_FNDIR%%/Completion/X/_vnc
%%ZSH_FNDIR%%/Completion/X/_x_arguments
%%ZSH_FNDIR%%/Completion/X/_x_borderwidth
@@ -600,6 +597,7 @@
%%ZSH_FNDIR%%/MIME/pick-web-browser
%%ZSH_FNDIR%%/MIME/zsh-mime-handler
%%ZSH_FNDIR%%/MIME/zsh-mime-setup
+%%ZSH_FNDIR%%/Misc/add-zsh-hook
%%ZSH_FNDIR%%/Misc/allopt
%%ZSH_FNDIR%%/Misc/checkmail
%%ZSH_FNDIR%%/Misc/colors
@@ -616,6 +614,7 @@
%%ZSH_FNDIR%%/Misc/zcalc
%%ZSH_FNDIR%%/Misc/zed
%%ZSH_FNDIR%%/Misc/zkbd
+%%ZSH_FNDIR%%/Misc/zmathfuncdef
%%ZSH_FNDIR%%/Misc/zmv
%%ZSH_FNDIR%%/Misc/zrecompile
%%ZSH_FNDIR%%/Misc/zstyle+
@@ -696,6 +695,7 @@
%%ZSH_FNDIR%%/Zle/down-line-or-beginning-search
%%ZSH_FNDIR%%/Zle/edit-command-line
%%ZSH_FNDIR%%/Zle/forward-word-match
+%%ZSH_FNDIR%%/Zle/history-beginning-search-menu
%%ZSH_FNDIR%%/Zle/history-pattern-search
%%ZSH_FNDIR%%/Zle/history-search-end
%%ZSH_FNDIR%%/Zle/incarg
@@ -704,16 +704,21 @@
%%ZSH_FNDIR%%/Zle/insert-files
%%ZSH_FNDIR%%/Zle/insert-unicode-char
%%ZSH_FNDIR%%/Zle/keeper
+%%ZSH_FNDIR%%/Zle/keymap+widget
%%ZSH_FNDIR%%/Zle/kill-word-match
%%ZSH_FNDIR%%/Zle/match-words-by-style
+%%ZSH_FNDIR%%/Zle/match-word-context
+%%ZSH_FNDIR%%/Zle/modify-current-argument
%%ZSH_FNDIR%%/Zle/narrow-to-region
%%ZSH_FNDIR%%/Zle/narrow-to-region-invisible
%%ZSH_FNDIR%%/Zle/predict-on
%%ZSH_FNDIR%%/Zle/quote-and-complete-word
%%ZSH_FNDIR%%/Zle/read-from-minibuffer
%%ZSH_FNDIR%%/Zle/replace-string
+%%ZSH_FNDIR%%/Zle/replace-string-again
%%ZSH_FNDIR%%/Zle/select-word-style
%%ZSH_FNDIR%%/Zle/smart-insert-last-word
+%%ZSH_FNDIR%%/Zle/split-shell-arguments
%%ZSH_FNDIR%%/Zle/transpose-words-match
%%ZSH_FNDIR%%/Zle/up-case-word-match
%%ZSH_FNDIR%%/Zle/up-line-or-beginning-search
@@ -721,6 +726,7 @@
%%ZSH_FNDIR%%/Zle/which-command
%%ZSH_FNDIR%%/Zle/zed-set-file-name
%%DATADIR%%/%%ZSH_VER%%/scripts/newuser
+ at dirrm %%ZSH_FNDIR%%/Calendar
@dirrm %%ZSH_FNDIR%%/Completion/AIX
@dirrm %%ZSH_FNDIR%%/Completion/BSD
@dirrm %%ZSH_FNDIR%%/Completion/Base
@@ -728,7 +734,7 @@
@dirrm %%ZSH_FNDIR%%/Completion/Darwin
@dirrm %%ZSH_FNDIR%%/Completion/Debian
@dirrm %%ZSH_FNDIR%%/Completion/Linux
- at dirrm %%ZSH_FNDIR%%/Completion/Mandrake
+ at dirrm %%ZSH_FNDIR%%/Completion/Mandriva
@dirrm %%ZSH_FNDIR%%/Completion/Redhat
@dirrm %%ZSH_FNDIR%%/Completion/Unix
@dirrm %%ZSH_FNDIR%%/Completion/X
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/shells/zsh/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lshells/zsh/Makefile -Lshells/zsh/Makefile -u -r1.6 -r1.7
--- shells/zsh/Makefile
+++ shells/zsh/Makefile
@@ -7,14 +7,8 @@
#
# The following compile-time options are available:
-# NOSHARED=yes compile a static version of zsh
+# NO_SHARED=yes compile a static version of zsh
# (default: use dynamically loadable modules)
-# WITHOUT_ZSH_MEM=yes disable zsh-mem and zsh-secure-free options
-# (default: on)
-# WITHOUT_ZSH_MAILDIR=yes disable support for Maildirs in MAIL and MAILPATH
-# (default: on)
-# WITHOUT_ZSH_MULTIBYTE=yes disable multibyte character support
-# (default: on)
# ZSH_ETCDIR=<dir> directory for zsh system-wide configuration files:
# zshenv, zlogin, zprofile, zshrc, zlogout.
# e.g. use this to put config files inside ${PREFIX}
@@ -28,12 +22,11 @@
# NOTE: does NOT have to be inside ${PREFIX} tree
PORTNAME= zsh
-PORTVERSION= 4.3.2
+PORTVERSION= 4.3.4
CATEGORIES= shells
-MASTER_SITES= \
+MASTER_SITES= SF \
http://www.zsh.org/pub/ \
- ftp://ftp.zsh.org/pub/ \
- ftp://sunsite.dk/pub/unix/shells/zsh/ \
+ ftp://ftp.zsh.org/zsh/ \
http://mirrors.dotsrc.org/zsh/ \
ftp://mirrors.dotsrc.org/zsh/ \
ftp://ftp.funet.fi/pub/unix/shells/zsh/ \
@@ -54,57 +47,74 @@
.endif
MAINTAINER?= ports at MidnightBSD.org
-COMMENT?= The Z shell
+COMMENT= The Z shell
ZSH_VER= ${PORTVERSION}
-# Conflicts with shells/zsh-devel as it installs files into the same locations
-CONFLICTS= zsh-devel-[0-9]* zsh-4.1.*
USE_BZIP2= yes
+USE_ICONV= yes
GNU_CONFIGURE= yes
+USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd6.0
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-curses-terminfo --with-tcsetpgrp \
--enable-etcdir=${ZSH_ETCDIR} \
--enable-fndir=${ZSH_FNDIR} --enable-function-subdirs \
--enable-site-fndir=${ZSH_SITEFNDIR}
-.if !defined(WITHOUT_ZSH_MEM)
-CONFIGURE_ARGS+= --enable-zsh-mem --enable-zsh-secure-free
-.endif
-
-.if !defined(WITHOUT_ZSH_MAILDIR)
-CONFIGURE_ARGS+= --enable-maildir-support
-.endif
-
-.if defined(NOSHARED)
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -static"
-CONFIGURE_ARGS+= --disable-dynamic
-PLIST_SUB+= NO_STATIC="@comment "
-.else
-CONFIGURE_ARGS+= --enable-dynamic
-PLIST_SUB+= NO_STATIC=""
-.endif
+OPTIONS= ZSH_MEM "Enable zsh-mem and zsh-secure-free options" on \
+ ZSH_MAILDIR "Enable support for Maildirs in MAIL(PATH)" on \
+ ZSH_MULTIBYTE "Enable multibyte character support" on \
+ ZSH_PCRE "Enable PCRE support" off
# These variables can be overriden by user
ZSH_ETCDIR?= /etc
ZSH_FNDIR?= ${DATADIR}/${ZSH_VER}/functions
ZSH_SITEFNDIR?= ${DATADIR}/site-functions
-PLIST_SUB+= ZSH_VER="${ZSH_VER}" ZSH_ETCDIR="${ZSH_ETCDIR}" \
+PLIST_SUB+= ZSH_VER="${ZSH_VER}" ZSHETCDIR="${ZSH_ETCDIR}" \
ZSH_FNDIR="${ZSH_FNDIR:S!${PREFIX}/!!}" \
- ZSH_SITEFNDIR="${ZSH_SITEFNDIR:S!${PREFIX}/!!}"
+ ZSH_SITEFNDIR="${ZSH_SITEFNDIR}"
MAN1= zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \
zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 \
zshparam.1 zshroadmap.1 zshtcpsys.1 zshzftpsys.1 zshzle.1 \
- zshall.1
+ zshall.1 zshcalsys.1
DOCS= LICENCE META-FAQ README Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ \
Etc/completion-style-guide Doc/zsh*.html Doc/zsh.dvi
EXAMPLES= zlogin zshenv zshrc
+SHELLS= /etc/shells
.include <bsd.port.pre.mk>
+.if defined(WITH_ZSH_PCRE)
+CONFIGURE_ARGS+= --enable-pcre
+LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
+PLIST_SUB+= PCRE=""
+.else
+CONFIGURE_ARGS+= --disable-pcre
+PLIST_SUB+= PCRE="@comment "
+.endif
+
+.if defined(WITH_ZSH_MEM)
+CONFIGURE_ARGS+= --enable-zsh-mem --enable-zsh-secure-free
+.endif
+
+.if defined(WITH_ZSH_MAILDIR)
+CONFIGURE_ARGS+= --enable-maildir-support
+.endif
+
+.if defined(NO_SHARED)
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -static"
+CONFIGURE_ARGS+= --disable-dynamic
+PLIST_SUB+= NO_STATIC="@comment "
+.else
+CONFIGURE_ARGS+= --enable-dynamic
+PLIST_SUB+= NO_STATIC=""
+.endif
+
.if !defined(WITHOUT_ZSH_MULTIBYTE)
CONFIGURE_ARGS+= --enable-multibyte
.endif
@@ -112,12 +122,11 @@
EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar
post-patch:
- ${REINPLACE_CMD} -e "s,link=dynamic,link=either," \
+ @${SED} -i "" -e "s,link=dynamic,link=either," \
${WRKSRC}/Src/Modules/*.mdd
- ${REINPLACE_CMD} -e "s,/etc/,${LOCALBASE}/etc/," \
+ @${SED} -i "" -e "s,/etc/,${LOCALBASE}/etc/," \
${WRKSRC}/Functions/MIME/zsh-mime-setup
- ${RM} -f ${WRKSRC}/Functions/MIME/zsh-mime-setup.bak
- ${RM} -f ${WRKSRC}/Completion/Unix/Type/_tar_archive.orig
+ @${FIND} ${WRKSRC}/Completion -type f -iname '*.orig' -delete
post-build:
# Fix ".so" macro problem by using "soelim" command.
@@ -129,7 +138,6 @@
@${MKDIR} ${PREFIX}/info
makeinfo --no-split --output=${WRKSRC}/Doc/zsh.info \
${WRKSRC}/Doc/zsh.texi
-
INFO= zsh
.endif
@@ -144,5 +152,10 @@
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/Doc/zsh.info ${PREFIX}/info/zsh.info
.endif
+ @${ECHO_MSG} "Updating ${SHELLS}"
+ @${CP} ${SHELLS} ${SHELLS}.bak
+ @(${GREP} -v ${PREFIX}/bin/zsh ${SHELLS}.bak; \
+ ${ECHO_CMD} ${PREFIX}/bin/zsh) > ${SHELLS}
+ @${RM} ${SHELLS}.bak
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/shells/zsh/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lshells/zsh/distinfo -Lshells/zsh/distinfo -u -r1.1 -r1.2
--- shells/zsh/distinfo
+++ shells/zsh/distinfo
@@ -1,6 +1,6 @@
-MD5 (zsh-4.3.2.tar.bz2) = e13fc4bb338fbb27ef7508a474310c8f
-SHA256 (zsh-4.3.2.tar.bz2) = ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3
-SIZE (zsh-4.3.2.tar.bz2) = 2263544
-MD5 (zsh-4.3.2-doc.tar.bz2) = 69d1ab9d179d7d16eb0251a0a60e0457
-SHA256 (zsh-4.3.2-doc.tar.bz2) = f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f
-SIZE (zsh-4.3.2-doc.tar.bz2) = 2207375
+MD5 (zsh-4.3.4.tar.bz2) = 8410a30e4f5c6160790bc3afc096424f
+SHA256 (zsh-4.3.4.tar.bz2) = 6fa0e22cb0da3a02c115425097002f2b4bb56e412db6c821ca111e088cbfdec6
+SIZE (zsh-4.3.4.tar.bz2) = 2374851
+MD5 (zsh-4.3.4-doc.tar.bz2) = 1a4ab09a9d75c5ae8585ad645406f27d
+SHA256 (zsh-4.3.4-doc.tar.bz2) = e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777
+SIZE (zsh-4.3.4-doc.tar.bz2) = 2358063
Index: patch-Src::utils.c
===================================================================
RCS file: /home/cvs/mports/shells/zsh/files/patch-Src::utils.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lshells/zsh/files/patch-Src::utils.c -Lshells/zsh/files/patch-Src::utils.c -u -r1.1 -r1.2
--- shells/zsh/files/patch-Src::utils.c
+++ shells/zsh/files/patch-Src::utils.c
@@ -1,8 +1,23 @@
---- Src/utils.c.orig Wed Dec 4 19:39:01 2002
-+++ Src/utils.c Wed Dec 4 19:39:18 2002
-@@ -1093,4 +1093,5 @@
- * is unique, for use as a temporary file. */
-
+--- Src/utils.c.orig Tue Apr 17 10:57:15 2007
++++ Src/utils.c Wed Jul 25 15:13:58 2007
+@@ -1092,6 +1092,7 @@
+ time_t lastmailcheck;
+
+ /* the last time we checked the people in the WATCH variable */
+extern char *_mktemp(char *);
+
/**/
- mod_export char *
+ time_t lastwatch;
+@@ -4569,11 +4570,11 @@
+ int count;
+ #else
+ unsigned int wval;
++ size_t count;
+ # if defined(HAVE_NL_LANGINFO) && defined(CODESET) && defined(HAVE_ICONV)
+ iconv_t cd;
+ char inbuf[4];
+ size_t inbytes, outbytes;
+- size_t count;
+ # endif
+ #endif
+
Index: extra-patch-bsdtar
===================================================================
RCS file: /home/cvs/mports/shells/zsh/files/extra-patch-bsdtar,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lshells/zsh/files/extra-patch-bsdtar -Lshells/zsh/files/extra-patch-bsdtar -u -r1.1 -r1.2
--- shells/zsh/files/extra-patch-bsdtar
+++ shells/zsh/files/extra-patch-bsdtar
@@ -1,6 +1,6 @@
---- Completion/Unix/Type/_tar_archive Mon Jul 4 17:16:10 2005
-+++ Completion/Unix/Type/_tar_archive Tue Jul 5 20:44:52 2005
-@@ -14,13 +14,8 @@
+--- Completion/Unix/Type/_tar_archive.orig Fri Aug 4 08:41:07 2006
++++ Completion/Unix/Type/_tar_archive Tue Jul 24 15:34:29 2007
+@@ -14,15 +14,8 @@
_description files expl 'archive file'
if [[ "$1" = *[urtx]* ]]; then
@@ -8,10 +8,12 @@
- _files "$expl[@]" -g '*.((tar|TAR).(gz|GZ|Z)|tgz)(-.)'
- elif [[ "$1" = *[Ijy]* ]]; then
- _files "$expl[@]" -g '*.(tar|TAR).bz2(-.)'
+- elif [[ "$_cmd_variant[$service]" == gnu ]]; then
+- _files "$expl[@]" -g '*.((tar|TAR)(.gz|.GZ|.Z|.bz2|)|tgz)(-.)'
- else
- _files "$expl[@]" -g '*.(tar|TAR)(-.)'
- fi
-+# bsdtar/libarchive handle these automagically
++ # bsdtar/libarchive handle these automagically
+ _files "$expl[@]" -g '*.((tar|TAR|iso|ISO|cpio).(|(gz|GZ|Z|bz2))|tgz|tbz|jar|zip)(-.)'
else
_files "$expl[@]"
More information about the Midnightbsd-cvs
mailing list