[Midnightbsd-cvs] mports: shells/zsh: Update to 4.3.6.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Jun 30 00:34:48 EDT 2008
Log Message:
-----------
Update to 4.3.6. Add license.
Modified Files:
--------------
mports/shells/zsh:
Makefile (r1.8 -> r1.9)
distinfo (r1.2 -> r1.3)
pkg-plist (r1.2 -> r1.3)
Added Files:
-----------
mports/shells/zsh/files:
patch-Completion-Unix-Command-_locate (r1.1)
patch-Completion-Unix-Command-_mount (r1.1)
patch-Src_Zle_compresult.c (r1.1)
patch-ncurses (r1.1)
Removed Files:
-------------
mports/shells/zsh/files:
patch-Completion-X-Command-_acroread
patch-Config_installfns.sh
patch-Src::utils.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/shells/zsh/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L shells/zsh/pkg-plist -L shells/zsh/pkg-plist -u -r1.2 -r1.3
--- shells/zsh/pkg-plist
+++ shells/zsh/pkg-plist
@@ -1,4 +1,4 @@
- at comment $FreeBSD: ports/shells/zsh/pkg-plist,v 1.38 2007/07/30 16:21:41 garga Exp $
+ at comment $FreeBSD: ports/shells/zsh/pkg-plist,v 1.39 2008/05/02 21:13:47 des 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
@@ -14,6 +14,7 @@
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complete.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complist.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/computil.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/curses.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/datetime.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/deltochar.so
%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/example.so
@@ -26,6 +27,7 @@
%%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/regex.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
@@ -42,7 +44,6 @@
%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh/net
%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh
%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%
-%%NO_STATIC%%lib/zsh/libzsh-%%ZSH_VER%%.so
%%NO_STATIC%%@dirrm lib/zsh
@exec mkdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
@unexec rmdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
@@ -51,6 +52,7 @@
%%ZSH_FNDIR%%/Calendar/calendar_add
%%ZSH_FNDIR%%/Calendar/calendar_edit
%%ZSH_FNDIR%%/Calendar/calendar_lockfiles
+%%ZSH_FNDIR%%/Calendar/calendar_parse
%%ZSH_FNDIR%%/Calendar/calendar_read
%%ZSH_FNDIR%%/Calendar/calendar_scandate
%%ZSH_FNDIR%%/Calendar/calendar_show
@@ -69,8 +71,8 @@
%%ZSH_FNDIR%%/Completion/AIX/_volume_groups
%%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/_cvsup
%%ZSH_FNDIR%%/Completion/BSD/_kld
%%ZSH_FNDIR%%/Completion/BSD/_portlint
%%ZSH_FNDIR%%/Completion/BSD/_portsnap
@@ -88,6 +90,7 @@
%%ZSH_FNDIR%%/Completion/Base/_complete
%%ZSH_FNDIR%%/Completion/Base/_complete_debug
%%ZSH_FNDIR%%/Completion/Base/_complete_help
+%%ZSH_FNDIR%%/Completion/Base/_complete_help_generic
%%ZSH_FNDIR%%/Completion/Base/_complete_tag
%%ZSH_FNDIR%%/Completion/Base/_correct
%%ZSH_FNDIR%%/Completion/Base/_correct_filename
@@ -170,24 +173,32 @@
%%ZSH_FNDIR%%/Completion/Debian/_debfoster
%%ZSH_FNDIR%%/Completion/Debian/_debsign
%%ZSH_FNDIR%%/Completion/Debian/_dlocate
+%%ZSH_FNDIR%%/Completion/Debian/_dpatch-edit-patch
%%ZSH_FNDIR%%/Completion/Debian/_dpkg
+%%ZSH_FNDIR%%/Completion/Debian/_dpkg-buildpackage
%%ZSH_FNDIR%%/Completion/Debian/_dpkg-cross
+%%ZSH_FNDIR%%/Completion/Debian/_dpkg-repack
%%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/_lighttpd
%%ZSH_FNDIR%%/Completion/Debian/_linda
%%ZSH_FNDIR%%/Completion/Debian/_lintian
%%ZSH_FNDIR%%/Completion/Debian/_madison
%%ZSH_FNDIR%%/Completion/Debian/_make-kpkg
+%%ZSH_FNDIR%%/Completion/Debian/_members
%%ZSH_FNDIR%%/Completion/Debian/_mergechanges
%%ZSH_FNDIR%%/Completion/Debian/_module-assistant
%%ZSH_FNDIR%%/Completion/Debian/_piuparts
+%%ZSH_FNDIR%%/Completion/Debian/_reprepro
%%ZSH_FNDIR%%/Completion/Debian/_schroot
+%%ZSH_FNDIR%%/Completion/Debian/_svn-buildpackage
%%ZSH_FNDIR%%/Completion/Debian/_toolchain-source
%%ZSH_FNDIR%%/Completion/Debian/_update-alternatives
%%ZSH_FNDIR%%/Completion/Debian/_update-rc.d
%%ZSH_FNDIR%%/Completion/Debian/_uscan
+%%ZSH_FNDIR%%/Completion/Debian/_vim-addons
%%ZSH_FNDIR%%/Completion/Debian/_wajig
%%ZSH_FNDIR%%/Completion/Debian/_wanna-build
%%ZSH_FNDIR%%/Completion/Linux/_acpi
@@ -200,6 +211,7 @@
%%ZSH_FNDIR%%/Completion/Linux/_iptables
%%ZSH_FNDIR%%/Completion/Linux/_iwconfig
%%ZSH_FNDIR%%/Completion/Linux/_losetup
+%%ZSH_FNDIR%%/Completion/Linux/_lsusb
%%ZSH_FNDIR%%/Completion/Linux/_mii-tool
%%ZSH_FNDIR%%/Completion/Linux/_modutils
%%ZSH_FNDIR%%/Completion/Linux/_mondo
@@ -236,9 +248,11 @@
%%ZSH_FNDIR%%/Completion/Unix/_bzip2
%%ZSH_FNDIR%%/Completion/Unix/_bzr
%%ZSH_FNDIR%%/Completion/Unix/_cal
+%%ZSH_FNDIR%%/Completion/Unix/_calendar
%%ZSH_FNDIR%%/Completion/Unix/_canonical_paths
%%ZSH_FNDIR%%/Completion/Unix/_ccal
%%ZSH_FNDIR%%/Completion/Unix/_cdcd
+%%ZSH_FNDIR%%/Completion/Unix/_cdrdao
%%ZSH_FNDIR%%/Completion/Unix/_cdrecord
%%ZSH_FNDIR%%/Completion/Unix/_chkconfig
%%ZSH_FNDIR%%/Completion/Unix/_chmod
@@ -252,6 +266,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_cplay
%%ZSH_FNDIR%%/Completion/Unix/_cssh
%%ZSH_FNDIR%%/Completion/Unix/_ctags_tags
+%%ZSH_FNDIR%%/Completion/Unix/_cut
%%ZSH_FNDIR%%/Completion/Unix/_cvs
%%ZSH_FNDIR%%/Completion/Unix/_darcs
%%ZSH_FNDIR%%/Completion/Unix/_date
@@ -264,6 +279,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_diffstat
%%ZSH_FNDIR%%/Completion/Unix/_dir_list
%%ZSH_FNDIR%%/Completion/Unix/_directories
+%%ZSH_FNDIR%%/Completion/Unix/_dmidecode
%%ZSH_FNDIR%%/Completion/Unix/_domains
%%ZSH_FNDIR%%/Completion/Unix/_du
%%ZSH_FNDIR%%/Completion/Unix/_dvi
@@ -287,6 +303,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_fuser
%%ZSH_FNDIR%%/Completion/Unix/_gcc
%%ZSH_FNDIR%%/Completion/Unix/_gdb
+%%ZSH_FNDIR%%/Completion/Unix/_genisoimage
%%ZSH_FNDIR%%/Completion/Unix/_getconf
%%ZSH_FNDIR%%/Completion/Unix/_getent
%%ZSH_FNDIR%%/Completion/Unix/_getmail
@@ -301,10 +318,13 @@
%%ZSH_FNDIR%%/Completion/Unix/_grep
%%ZSH_FNDIR%%/Completion/Unix/_groff
%%ZSH_FNDIR%%/Completion/Unix/_groups
+%%ZSH_FNDIR%%/Completion/Unix/_growisofs
%%ZSH_FNDIR%%/Completion/Unix/_gs
+%%ZSH_FNDIR%%/Completion/Unix/_guilt
%%ZSH_FNDIR%%/Completion/Unix/_gzip
%%ZSH_FNDIR%%/Completion/Unix/_hosts
%%ZSH_FNDIR%%/Completion/Unix/_iconv
+%%ZSH_FNDIR%%/Completion/Unix/_id
%%ZSH_FNDIR%%/Completion/Unix/_ifconfig
%%ZSH_FNDIR%%/Completion/Unix/_imagemagick
%%ZSH_FNDIR%%/Completion/Unix/_init_d
@@ -318,6 +338,8 @@
%%ZSH_FNDIR%%/Completion/Unix/_knock
%%ZSH_FNDIR%%/Completion/Unix/_kvno
%%ZSH_FNDIR%%/Completion/Unix/_last
+%%ZSH_FNDIR%%/Completion/Unix/_ld_debug
+%%ZSH_FNDIR%%/Completion/Unix/_ldd
%%ZSH_FNDIR%%/Completion/Unix/_less
%%ZSH_FNDIR%%/Completion/Unix/_links
%%ZSH_FNDIR%%/Completion/Unix/_list_files
@@ -334,6 +356,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_mailboxes
%%ZSH_FNDIR%%/Completion/Unix/_make
%%ZSH_FNDIR%%/Completion/Unix/_man
+%%ZSH_FNDIR%%/Completion/Unix/_md5sum
%%ZSH_FNDIR%%/Completion/Unix/_mencal
%%ZSH_FNDIR%%/Completion/Unix/_mercurial
%%ZSH_FNDIR%%/Completion/Unix/_metaflac
@@ -361,6 +384,7 @@
%%ZSH_FNDIR%%/Completion/Unix/_other_accounts
%%ZSH_FNDIR%%/Completion/Unix/_pack
%%ZSH_FNDIR%%/Completion/Unix/_patch
+%%ZSH_FNDIR%%/Completion/Unix/_path_commands
%%ZSH_FNDIR%%/Completion/Unix/_path_files
%%ZSH_FNDIR%%/Completion/Unix/_pax
%%ZSH_FNDIR%%/Completion/Unix/_pbm
@@ -390,11 +414,13 @@
%%ZSH_FNDIR%%/Completion/Unix/_quilt
%%ZSH_FNDIR%%/Completion/Unix/_raggle
%%ZSH_FNDIR%%/Completion/Unix/_rake
+%%ZSH_FNDIR%%/Completion/Unix/_ranlib
%%ZSH_FNDIR%%/Completion/Unix/_rar
%%ZSH_FNDIR%%/Completion/Unix/_rcs
%%ZSH_FNDIR%%/Completion/Unix/_renice
-%%ZSH_FNDIR%%/Completion/Unix/_rlogin
%%ZSH_FNDIR%%/Completion/Unix/_ri
+%%ZSH_FNDIR%%/Completion/Unix/_rlogin
+%%ZSH_FNDIR%%/Completion/Unix/_rrdtool
%%ZSH_FNDIR%%/Completion/Unix/_rsync
%%ZSH_FNDIR%%/Completion/Unix/_rubber
%%ZSH_FNDIR%%/Completion/Unix/_ruby
@@ -441,8 +467,10 @@
%%ZSH_FNDIR%%/Completion/Unix/_tracepath
%%ZSH_FNDIR%%/Completion/Unix/_twisted
%%ZSH_FNDIR%%/Completion/Unix/_unace
+%%ZSH_FNDIR%%/Completion/Unix/_uname
%%ZSH_FNDIR%%/Completion/Unix/_unexpand
%%ZSH_FNDIR%%/Completion/Unix/_uniq
+%%ZSH_FNDIR%%/Completion/Unix/_units
%%ZSH_FNDIR%%/Completion/Unix/_urls
%%ZSH_FNDIR%%/Completion/Unix/_user_admin
%%ZSH_FNDIR%%/Completion/Unix/_user_at_host
@@ -478,8 +506,8 @@
%%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/_urxvt
%%ZSH_FNDIR%%/Completion/X/_vnc
%%ZSH_FNDIR%%/Completion/X/_x_arguments
%%ZSH_FNDIR%%/Completion/X/_x_borderwidth
@@ -506,6 +534,7 @@
%%ZSH_FNDIR%%/Completion/X/_xloadimage
%%ZSH_FNDIR%%/Completion/X/_xmodmap
%%ZSH_FNDIR%%/Completion/X/_xpdf
+%%ZSH_FNDIR%%/Completion/X/_xrandr
%%ZSH_FNDIR%%/Completion/X/_xscreensaver
%%ZSH_FNDIR%%/Completion/X/_xset
%%ZSH_FNDIR%%/Completion/X/_xt_arguments
@@ -527,6 +556,7 @@
%%ZSH_FNDIR%%/Completion/Zsh/_compdef
%%ZSH_FNDIR%%/Completion/Zsh/_condition
%%ZSH_FNDIR%%/Completion/Zsh/_default
+%%ZSH_FNDIR%%/Completion/Zsh/_delimiters
%%ZSH_FNDIR%%/Completion/Zsh/_directory_stack
%%ZSH_FNDIR%%/Completion/Zsh/_dirs
%%ZSH_FNDIR%%/Completion/Zsh/_disable
@@ -539,7 +569,10 @@
%%ZSH_FNDIR%%/Completion/Zsh/_file_descriptors
%%ZSH_FNDIR%%/Completion/Zsh/_first
%%ZSH_FNDIR%%/Completion/Zsh/_functions
+%%ZSH_FNDIR%%/Completion/Zsh/_globqual_delims
+%%ZSH_FNDIR%%/Completion/Zsh/_globquals
%%ZSH_FNDIR%%/Completion/Zsh/_hash
+%%ZSH_FNDIR%%/Completion/Zsh/_history_modifiers
%%ZSH_FNDIR%%/Completion/Zsh/_in_vared
%%ZSH_FNDIR%%/Completion/Zsh/_jobs
%%ZSH_FNDIR%%/Completion/Zsh/_jobs_bg
@@ -609,7 +642,12 @@
%%ZSH_FNDIR%%/Misc/promptnl
%%ZSH_FNDIR%%/Misc/relative
%%ZSH_FNDIR%%/Misc/run-help
+%%ZSH_FNDIR%%/Misc/run-help-git
+%%ZSH_FNDIR%%/Misc/run-help-svk
+%%ZSH_FNDIR%%/Misc/run-help-svn
+%%ZSH_FNDIR%%/Misc/sticky-note
%%ZSH_FNDIR%%/Misc/tetris
+%%ZSH_FNDIR%%/Misc/xtermctl
%%ZSH_FNDIR%%/Misc/zargs
%%ZSH_FNDIR%%/Misc/zcalc
%%ZSH_FNDIR%%/Misc/zed
@@ -631,6 +669,7 @@
%%ZSH_FNDIR%%/Prompts/prompt_off_setup
%%ZSH_FNDIR%%/Prompts/prompt_oliver_setup
%%ZSH_FNDIR%%/Prompts/prompt_redhat_setup
+%%ZSH_FNDIR%%/Prompts/prompt_special_chars
%%ZSH_FNDIR%%/Prompts/prompt_suse_setup
%%ZSH_FNDIR%%/Prompts/prompt_walters_setup
%%ZSH_FNDIR%%/Prompts/prompt_zefram_setup
@@ -706,8 +745,8 @@
%%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/match-words-by-style
%%ZSH_FNDIR%%/Zle/modify-current-argument
%%ZSH_FNDIR%%/Zle/narrow-to-region
%%ZSH_FNDIR%%/Zle/narrow-to-region-invisible
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/shells/zsh/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L shells/zsh/Makefile -L shells/zsh/Makefile -u -r1.8 -r1.9
--- shells/zsh/Makefile
+++ shells/zsh/Makefile
@@ -21,35 +21,20 @@
# NOTE: does NOT have to be inside ${PREFIX} tree
PORTNAME= zsh
-PORTVERSION= 4.3.4
+PORTVERSION= 4.3.6
CATEGORIES= shells
-MASTER_SITES= SF \
- http://www.zsh.org/pub/ \
- ftp://ftp.zsh.org/zsh/ \
- http://mirrors.dotsrc.org/zsh/ \
- ftp://mirrors.dotsrc.org/zsh/ \
- ftp://ftp.funet.fi/pub/unix/shells/zsh/ \
- ftp://nephtys.lip6.fr/pub/unix/shells/zsh/ \
- ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
- http://www.cs.elte.hu/pub/zsh/ \
- ftp://ftp.cs.elte.hu/pub/zsh/ \
- ftp://ftp.kfki.hu/pub/packages/zsh/ \
- ftp://ftp.math.technion.ac.il/pub/zsh/ \
- ftp://ftp.demon.nl/pub/mirrors/zsh/ \
- ftp://ftp.kappa.ro/pub/mirrors/ftp.zsh.org/pub/zsh/ \
- ftp://ftp.lysator.liu.se/pub/unix/zsh/ \
- ftp://sunsite.org.uk/package/zsh/ \
- http://zsh.open-mirror.com/
-DISTNAME= ${PORTNAME}-${ZSH_VER}
+MASTER_SITES= SF
.if !defined(NOPORTDOCS)
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-doc${EXTRACT_SUFX}
.endif
MAINTAINER?= ports at MidnightBSD.org
COMMENT= The Z shell
+LICENSE= other
ZSH_VER= ${PORTVERSION}
+USE_AUTOTOOLS= autoconf:261 autoheader:261
USE_BZIP2= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
@@ -58,7 +43,7 @@
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 \
+CONFIGURE_ARGS= --with-term-lib="ncursesw ncurses" --with-tcsetpgrp \
--enable-etcdir=${ZSH_ETCDIR} \
--enable-fndir=${ZSH_FNDIR} --enable-function-subdirs \
--enable-site-fndir=${ZSH_SITEFNDIR}
@@ -115,6 +100,8 @@
.if !defined(WITHOUT_ZSH_MULTIBYTE)
CONFIGURE_ARGS+= --enable-multibyte
+.else
+CONFIGURE_ARGS+= --disable-multibyte
.endif
EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/shells/zsh/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L shells/zsh/distinfo -L shells/zsh/distinfo -u -r1.2 -r1.3
--- shells/zsh/distinfo
+++ shells/zsh/distinfo
@@ -1,6 +1,6 @@
-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
+MD5 (zsh-4.3.6.tar.bz2) = 16f399af1081ad3c303a794c9c7dc47e
+SHA256 (zsh-4.3.6.tar.bz2) = 5a253d107533ff60ab9edb74de9425f2ca93bc5a3ddb5c1b5bfd488a794dc873
+SIZE (zsh-4.3.6.tar.bz2) = 2527972
+MD5 (zsh-4.3.6-doc.tar.bz2) = cab29228a90f58b1431a66ab24a0a0c2
+SHA256 (zsh-4.3.6-doc.tar.bz2) = a82cf4e55d6bcf1ea40c23ef5f99002d504c441a8f6d14af0ed4d574c6ffbcc6
+SIZE (zsh-4.3.6-doc.tar.bz2) = 2473544
--- /dev/null
+++ shells/zsh/files/patch-Src_Zle_compresult.c
@@ -0,0 +1,28 @@
+--- Src/Zle/compresult.c.orig 2008-05-07 10:19:11.000000000 -0300
++++ Src/Zle/compresult.c 2008-05-07 10:19:35.000000000 -0300
+@@ -1188,6 +1188,12 @@
+ {
+ int was_meta;
+
++ /* Just list the matches if the list was requested. */
++ if (lst == COMP_LIST_COMPLETE) {
++ showinglist = -2;
++ return;
++ }
++
+ /* Already metafied when called from domenuselect already */
+ if (zlemetaline == NULL) {
+ was_meta = 0;
+@@ -1195,12 +1201,6 @@
+ } else
+ was_meta = 1;
+
+- /* Just list the matches if the list was requested. */
+- if (lst == COMP_LIST_COMPLETE) {
+- showinglist = -2;
+- return;
+- }
+-
+ /* Otherwise go to the next match in the array... */
+ do {
+ if (!*++(minfo.cur)) {
--- shells/zsh/files/patch-Completion-X-Command-_acroread
+++ /dev/null
@@ -1,17 +0,0 @@
---- Completion/X/Command/_acroread.orig Mon Mar 19 10:02:50 2007
-+++ Completion/X/Command/_acroread Tue Jul 24 15:39:18 2007
-@@ -16,12 +16,12 @@
-
- # Try extracting the version number directly from the executable.
- # (This will fail if the executable is a wrapper script for acroread.)
-- _acroread_version=${${(M)${(f)"$(<$cmdfile)"}:#ver=*}##ver=}
-+ _acroread_version=${${${(Mf)"$(<$commands[$words[1]])"}:#ver=*}##ver=}
-
- if [[ -z $_acroread_version ]]; then
- local acropath=${${(s. .)${${(f)"$($words[1] -help 2>&1)"}[1]}}[2]}
- if [[ -r $acropath ]]; then
-- _acroread_version=${${(M)${(f)"$(<$acropath)"}:#ver=*}##ver=}
-+ _acroread_version=${${${(Mf)"$(<$acropath)"}:#ver=*}##ver=}
- fi
- fi
- fi
--- /dev/null
+++ shells/zsh/files/patch-Completion-Unix-Command-_locate
@@ -0,0 +1,11 @@
+--- Completion/Unix/Command/_locate.orig 2006-09-27 09:50:25.000000000 -0500
++++ Completion/Unix/Command/_locate 2007-08-20 22:08:08.000000000 -0500
+@@ -11,7 +11,7 @@
+ ;;
+
+ (locate)
+- input="$(_call_program locate $words[1] -V)"
++ input="$(_call_program locate $words[1] -V 2>&1)"
+ case $input in
+ (*mlocate*)
+ ltype=mlocate
--- shells/zsh/files/patch-Src::utils.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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 *);
-
- /**/
- 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
-
--- /dev/null
+++ shells/zsh/files/patch-ncurses
@@ -0,0 +1,60 @@
+--- configure.ac.orig 2008-03-28 12:49:32.000000000 +0100
++++ configure.ac 2008-05-05 09:47:30.860369561 +0200
+@@ -669,20 +669,20 @@
+ termcap_curses_order="$ncursesw_test tinfo termcap $ncurses_test curses" ;;
+ esac])dnl
+
+-AH_TEMPLATE([ZSH_CURSES_NEEDS_XOPEN],
+-[Define if the curses libraries need _XOPEN_SOURCE_EXTENDED defined])
+-AC_CACHE_CHECK(if the curses library needs _XOPEN_SOURCE_EXTENDED,
+-zsh_cv_curses_needs_xopen,
++AH_TEMPLATE([ZSH_NO_XOPEN],
++[Define if _XOPEN_SOURCE_EXTENDED should not be defined to avoid clashes])
++AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined,
++zsh_cv_no_xopen,
+-[case "$host_os" in
+- *openbsd*)
+- zsh_cv_curses_needs_xopen=no
++[[case "$host_os" in
++ *openbsd*|*freebsd5*|*freebsd6.[012]*)
++ zsh_cv_no_xopen=yes
+ ;;
+ *)
+- zsh_cv_curses_needs_xopen=yes
++ zsh_cv_no_xopen=no
+ ;;
+-esac])
++esac]])
+-if test x$zsh_cv_curses_needs_xopen = xyes; then
+- AC_DEFINE(ZSH_CURSES_NEEDS_XOPEN)
++if test x$zsh_cv_no_xopen = xyes; then
++ AC_DEFINE(ZSH_NO_XOPEN)
+ fi
+
+ dnl Check for tigetflag (terminfo) before tgetent (termcap).
+--- Src/system.h.orig 2007-12-14 13:43:33.000000000 +0100
++++ Src/system.h 2008-05-05 09:50:17.333164563 +0200
+@@ -52,9 +52,20 @@
+ # undef HAVE_SYS_UTSNAME_H
+ #endif
+
+-#if defined(ZSH_CURSES_SOURCE) && defined(ZSH_CURSES_NEEDS_XOPEN)
+-#define _XOPEN_SOURCE_EXTENDED 1
+-#endif
++#ifndef ZSH_NO_XOPEN
++# ifdef ZSH_CURSES_SOURCE
++# define _XOPEN_SOURCE_EXTENDED 1
++# else
++# ifdef MULTIBYTE_SUPPORT
++/*
++ * Needed for wcwidth() which is part of XSI.
++ * Various other uses of the interface mean we can't get away with just
++ * _XOPEN_SOURCE.
++ */
++# define _XOPEN_SOURCE_EXTENDED 1
++# endif /* MULTIBYTE_SUPPORT */
++# endif /* ZSH_CURSES_SOURCE */
++#endif /* ZSH_NO_XOPEN */
+
+ /*
+ * Solaris by default zeroes all elements of the tm structure in
--- shells/zsh/files/patch-Config_installfns.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- Config/installfns.sh.orig Mon Mar 20 08:06:24 2006
-+++ Config/installfns.sh Thu Jul 26 11:10:23 2007
-@@ -45,10 +45,9 @@
- esac
- fi
- test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir || exit 1
-+ $INSTALL_DATA $sdir_top/$file $instdir || exit 1
- if test -x $sdir_top/$file; then
-- $INSTALL_PROGRAM $sdir_top/$file $instdir || exit 1
-- else
-- $INSTALL_DATA $sdir_top/$file $instdir || exit 1
-+ chmod +x $instdir/`echo $file | sed -e 's%^.*/%%'`
- fi
- fi
- done
--- /dev/null
+++ shells/zsh/files/patch-Completion-Unix-Command-_mount
@@ -0,0 +1,13 @@
+--- Completion/Unix/Command/_mount.orig 2006-05-28 13:46:56.000000000 -0500
++++ Completion/Unix/Command/_mount 2007-08-20 21:22:22.000000000 -0500
+@@ -859,8 +859,8 @@
+ ;;
+ *)
+ /sbin/mount | while read mline; do
+- mp_tmp+=( $mline[(w)1] )
+- dev_tmp+=( $mline[(w)3] )
++ dev_tmp+=( $mline[(w)1] )
++ mp_tmp+=( $mline[(w)3] )
+ done
+ ;;
+ esac
More information about the Midnightbsd-cvs
mailing list