From 86dff1cbf35303644b981f497d446bbffcd804df Mon Sep 17 00:00:00 2001 From: uebayasi Date: Fri, 21 Sep 2007 05:24:43 +0000 Subject: Update zsh-current to 4.3.4. Several fixes of multi-byte character support. Patch from Chris Ross, thanks. --- shells/zsh-current/Makefile | 6 ++-- shells/zsh-current/PLIST | 64 ++++++++++++++++++++++++++++++++++++- shells/zsh-current/distinfo | 15 +++++---- shells/zsh-current/patches/patch-ab | 12 +++---- shells/zsh-current/patches/patch-ae | 13 ++++---- shells/zsh-current/patches/patch-af | 12 +++++++ shells/zsh-current/patches/patch-ag | 12 +++++++ shells/zsh-current/patches/patch-ah | 13 ++++++++ 8 files changed, 124 insertions(+), 23 deletions(-) create mode 100644 shells/zsh-current/patches/patch-af create mode 100644 shells/zsh-current/patches/patch-ag create mode 100644 shells/zsh-current/patches/patch-ah (limited to 'shells/zsh-current') diff --git a/shells/zsh-current/Makefile b/shells/zsh-current/Makefile index f21ed200f59..8701b773b6d 100644 --- a/shells/zsh-current/Makefile +++ b/shells/zsh-current/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2007/08/07 18:54:31 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2007/09/21 05:24:43 uebayasi Exp $ .include "../../shells/zsh/Makefile.common" -ZSH_VERSION= 4.3.2 +ZSH_VERSION= 4.3.4 ZSH_MAINTAINER= uebayasi@NetBSD.org -PKGREVISION= 1 - .include "../../mk/bsd.pkg.mk" diff --git a/shells/zsh-current/PLIST b/shells/zsh-current/PLIST index e250edabdb8..922b353fa3f 100644 --- a/shells/zsh-current/PLIST +++ b/shells/zsh-current/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.7 2006/04/07 15:28:50 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2007/09/21 05:24:43 uebayasi Exp $ bin/${PKGNAME} bin/zsh info/zsh.info man/man1/zsh.1 man/man1/zshall.1 man/man1/zshbuiltins.1 +man/man1/zshcalsys.1 man/man1/zshcompctl.1 man/man1/zshcompsys.1 man/man1/zshcompwid.1 @@ -23,20 +24,24 @@ share/doc/zsh/FAQ share/doc/zsh/FEATURES share/doc/zsh/NEWS share/zsh/${PKGVERSION}/functions/_a2ps +share/zsh/${PKGVERSION}/functions/_a2utils share/zsh/${PKGVERSION}/functions/_aap share/zsh/${PKGVERSION}/functions/_acpi +share/zsh/${PKGVERSION}/functions/_acpitool share/zsh/${PKGVERSION}/functions/_acroread share/zsh/${PKGVERSION}/functions/_alias share/zsh/${PKGVERSION}/functions/_aliases share/zsh/${PKGVERSION}/functions/_all_labels share/zsh/${PKGVERSION}/functions/_all_matches share/zsh/${PKGVERSION}/functions/_alternative +share/zsh/${PKGVERSION}/functions/_analyseplugin share/zsh/${PKGVERSION}/functions/_ant share/zsh/${PKGVERSION}/functions/_antiword share/zsh/${PKGVERSION}/functions/_apachectl share/zsh/${PKGVERSION}/functions/_apm share/zsh/${PKGVERSION}/functions/_approximate share/zsh/${PKGVERSION}/functions/_apt +share/zsh/${PKGVERSION}/functions/_apt-file share/zsh/${PKGVERSION}/functions/_apt-move share/zsh/${PKGVERSION}/functions/_apt-show-versions share/zsh/${PKGVERSION}/functions/_aptitude @@ -53,6 +58,7 @@ share/zsh/${PKGVERSION}/functions/_auto-apt share/zsh/${PKGVERSION}/functions/_autocd share/zsh/${PKGVERSION}/functions/_bash_completions share/zsh/${PKGVERSION}/functions/_baz +share/zsh/${PKGVERSION}/functions/_bind_addresses share/zsh/${PKGVERSION}/functions/_bindkey share/zsh/${PKGVERSION}/functions/_bison share/zsh/${PKGVERSION}/functions/_bittorrent @@ -69,8 +75,10 @@ share/zsh/${PKGVERSION}/functions/_cache_invalid share/zsh/${PKGVERSION}/functions/_cal share/zsh/${PKGVERSION}/functions/_call_function share/zsh/${PKGVERSION}/functions/_call_program +share/zsh/${PKGVERSION}/functions/_canonical_paths share/zsh/${PKGVERSION}/functions/_ccal share/zsh/${PKGVERSION}/functions/_cd +share/zsh/${PKGVERSION}/functions/_cdbs-edit-patch share/zsh/${PKGVERSION}/functions/_cdcd share/zsh/${PKGVERSION}/functions/_cdrecord share/zsh/${PKGVERSION}/functions/_chflags @@ -78,6 +86,7 @@ share/zsh/${PKGVERSION}/functions/_chkconfig share/zsh/${PKGVERSION}/functions/_chmod share/zsh/${PKGVERSION}/functions/_chown share/zsh/${PKGVERSION}/functions/_combination +share/zsh/${PKGVERSION}/functions/_comm share/zsh/${PKGVERSION}/functions/_command share/zsh/${PKGVERSION}/functions/_command_names share/zsh/${PKGVERSION}/functions/_compdef @@ -91,9 +100,11 @@ share/zsh/${PKGVERSION}/functions/_configure share/zsh/${PKGVERSION}/functions/_correct share/zsh/${PKGVERSION}/functions/_correct_filename share/zsh/${PKGVERSION}/functions/_correct_word +share/zsh/${PKGVERSION}/functions/_cowsay share/zsh/${PKGVERSION}/functions/_cp share/zsh/${PKGVERSION}/functions/_cpio share/zsh/${PKGVERSION}/functions/_cplay +share/zsh/${PKGVERSION}/functions/_cssh share/zsh/${PKGVERSION}/functions/_ctags_tags share/zsh/${PKGVERSION}/functions/_cvs share/zsh/${PKGVERSION}/functions/_cvsup @@ -102,9 +113,11 @@ share/zsh/${PKGVERSION}/functions/_cygpath share/zsh/${PKGVERSION}/functions/_cygrunsrv share/zsh/${PKGVERSION}/functions/_cygserver share/zsh/${PKGVERSION}/functions/_cygstart +share/zsh/${PKGVERSION}/functions/_dak share/zsh/${PKGVERSION}/functions/_darcs share/zsh/${PKGVERSION}/functions/_date share/zsh/${PKGVERSION}/functions/_dchroot +share/zsh/${PKGVERSION}/functions/_dchroot-dsa share/zsh/${PKGVERSION}/functions/_dcop share/zsh/${PKGVERSION}/functions/_dd share/zsh/${PKGVERSION}/functions/_deb_packages @@ -147,6 +160,7 @@ share/zsh/${PKGVERSION}/functions/_email_addresses share/zsh/${PKGVERSION}/functions/_emulate share/zsh/${PKGVERSION}/functions/_enable share/zsh/${PKGVERSION}/functions/_enscript +share/zsh/${PKGVERSION}/functions/_env share/zsh/${PKGVERSION}/functions/_equal share/zsh/${PKGVERSION}/functions/_expand share/zsh/${PKGVERSION}/functions/_expand_alias @@ -168,6 +182,8 @@ share/zsh/${PKGVERSION}/functions/_floppy share/zsh/${PKGVERSION}/functions/_fortune share/zsh/${PKGVERSION}/functions/_fsh share/zsh/${PKGVERSION}/functions/_functions +share/zsh/${PKGVERSION}/functions/_fuse_arguments +share/zsh/${PKGVERSION}/functions/_fuse_values share/zsh/${PKGVERSION}/functions/_fuser share/zsh/${PKGVERSION}/functions/_fusermount share/zsh/${PKGVERSION}/functions/_gcc @@ -177,6 +193,7 @@ share/zsh/${PKGVERSION}/functions/_getclip share/zsh/${PKGVERSION}/functions/_getconf share/zsh/${PKGVERSION}/functions/_getent share/zsh/${PKGVERSION}/functions/_getfacl +share/zsh/${PKGVERSION}/functions/_getmail share/zsh/${PKGVERSION}/functions/_git share/zsh/${PKGVERSION}/functions/_global share/zsh/${PKGVERSION}/functions/_global_tags @@ -205,6 +222,8 @@ share/zsh/${PKGVERSION}/functions/_ignored share/zsh/${PKGVERSION}/functions/_imagemagick share/zsh/${PKGVERSION}/functions/_in_vared share/zsh/${PKGVERSION}/functions/_init_d +share/zsh/${PKGVERSION}/functions/_invoke-rc.d +share/zsh/${PKGVERSION}/functions/_ip share/zsh/${PKGVERSION}/functions/_iptables share/zsh/${PKGVERSION}/functions/_irssi share/zsh/${PKGVERSION}/functions/_ispell @@ -230,8 +249,10 @@ share/zsh/${PKGVERSION}/functions/_linda share/zsh/${PKGVERSION}/functions/_links share/zsh/${PKGVERSION}/functions/_lintian share/zsh/${PKGVERSION}/functions/_list +share/zsh/${PKGVERSION}/functions/_list_files share/zsh/${PKGVERSION}/functions/_loadkeys share/zsh/${PKGVERSION}/functions/_locales +share/zsh/${PKGVERSION}/functions/_locate share/zsh/${PKGVERSION}/functions/_logical_volumes share/zsh/${PKGVERSION}/functions/_look share/zsh/${PKGVERSION}/functions/_losetup @@ -258,17 +279,22 @@ share/zsh/${PKGVERSION}/functions/_match share/zsh/${PKGVERSION}/functions/_math share/zsh/${PKGVERSION}/functions/_mencal share/zsh/${PKGVERSION}/functions/_menu +share/zsh/${PKGVERSION}/functions/_mercurial share/zsh/${PKGVERSION}/functions/_mere share/zsh/${PKGVERSION}/functions/_mergechanges share/zsh/${PKGVERSION}/functions/_message +share/zsh/${PKGVERSION}/functions/_metaflac share/zsh/${PKGVERSION}/functions/_mh share/zsh/${PKGVERSION}/functions/_mii-tool share/zsh/${PKGVERSION}/functions/_mime_types +share/zsh/${PKGVERSION}/functions/_mkdir share/zsh/${PKGVERSION}/functions/_mkshortcut share/zsh/${PKGVERSION}/functions/_mkzsh +share/zsh/${PKGVERSION}/functions/_module share/zsh/${PKGVERSION}/functions/_module-assistant share/zsh/${PKGVERSION}/functions/_modutils share/zsh/${PKGVERSION}/functions/_mondo +share/zsh/${PKGVERSION}/functions/_monotone share/zsh/${PKGVERSION}/functions/_most_recent_file share/zsh/${PKGVERSION}/functions/_mount share/zsh/${PKGVERSION}/functions/_mozilla @@ -282,6 +308,7 @@ share/zsh/${PKGVERSION}/functions/_mutt share/zsh/${PKGVERSION}/functions/_my_accounts share/zsh/${PKGVERSION}/functions/_mysql_utils share/zsh/${PKGVERSION}/functions/_mysqldiff +share/zsh/${PKGVERSION}/functions/_nautilus share/zsh/${PKGVERSION}/functions/_ncftp share/zsh/${PKGVERSION}/functions/_nedit share/zsh/${PKGVERSION}/functions/_net_interfaces @@ -307,6 +334,7 @@ share/zsh/${PKGVERSION}/functions/_parameter share/zsh/${PKGVERSION}/functions/_parameters share/zsh/${PKGVERSION}/functions/_patch share/zsh/${PKGVERSION}/functions/_path_files +share/zsh/${PKGVERSION}/functions/_pax share/zsh/${PKGVERSION}/functions/_pbm share/zsh/${PKGVERSION}/functions/_pdf share/zsh/${PKGVERSION}/functions/_perforce @@ -323,6 +351,7 @@ share/zsh/${PKGVERSION}/functions/_ping share/zsh/${PKGVERSION}/functions/_piuparts share/zsh/${PKGVERSION}/functions/_pkg-config share/zsh/${PKGVERSION}/functions/_pkgtool +share/zsh/${PKGVERSION}/functions/_pon share/zsh/${PKGVERSION}/functions/_ports share/zsh/${PKGVERSION}/functions/_postfix share/zsh/${PKGVERSION}/functions/_prcs @@ -339,6 +368,7 @@ share/zsh/${PKGVERSION}/functions/_psutils share/zsh/${PKGVERSION}/functions/_pump share/zsh/${PKGVERSION}/functions/_putclip share/zsh/${PKGVERSION}/functions/_python +share/zsh/${PKGVERSION}/functions/_qemu share/zsh/${PKGVERSION}/functions/_qiv share/zsh/${PKGVERSION}/functions/_qtplay share/zsh/${PKGVERSION}/functions/_quilt @@ -350,10 +380,12 @@ share/zsh/${PKGVERSION}/functions/_read share/zsh/${PKGVERSION}/functions/_read_comp share/zsh/${PKGVERSION}/functions/_redirect share/zsh/${PKGVERSION}/functions/_regex_arguments +share/zsh/${PKGVERSION}/functions/_regex_words share/zsh/${PKGVERSION}/functions/_renice share/zsh/${PKGVERSION}/functions/_requested share/zsh/${PKGVERSION}/functions/_retrieve_cache share/zsh/${PKGVERSION}/functions/_retrieve_mac_apps +share/zsh/${PKGVERSION}/functions/_ri share/zsh/${PKGVERSION}/functions/_rlogin share/zsh/${PKGVERSION}/functions/_rpm share/zsh/${PKGVERSION}/functions/_rsync @@ -373,15 +405,18 @@ share/zsh/${PKGVERSION}/functions/_set share/zsh/${PKGVERSION}/functions/_set_command share/zsh/${PKGVERSION}/functions/_setopt share/zsh/${PKGVERSION}/functions/_setup +share/zsh/${PKGVERSION}/functions/_setxkbmap share/zsh/${PKGVERSION}/functions/_sh share/zsh/${PKGVERSION}/functions/_showmount share/zsh/${PKGVERSION}/functions/_signals +share/zsh/${PKGVERSION}/functions/_sisu share/zsh/${PKGVERSION}/functions/_slrn share/zsh/${PKGVERSION}/functions/_smit share/zsh/${PKGVERSION}/functions/_socket share/zsh/${PKGVERSION}/functions/_softwareupdate share/zsh/${PKGVERSION}/functions/_source share/zsh/${PKGVERSION}/functions/_spamassassin +share/zsh/${PKGVERSION}/functions/_sqsh share/zsh/${PKGVERSION}/functions/_ssh share/zsh/${PKGVERSION}/functions/_sshfs share/zsh/${PKGVERSION}/functions/_stat @@ -399,6 +434,8 @@ share/zsh/${PKGVERSION}/functions/_sysctl share/zsh/${PKGVERSION}/functions/_tags share/zsh/${PKGVERSION}/functions/_tar share/zsh/${PKGVERSION}/functions/_tar_archive +share/zsh/${PKGVERSION}/functions/_tardy +share/zsh/${PKGVERSION}/functions/_tcptraceroute share/zsh/${PKGVERSION}/functions/_telnet share/zsh/${PKGVERSION}/functions/_terminals share/zsh/${PKGVERSION}/functions/_tex @@ -411,10 +448,13 @@ share/zsh/${PKGVERSION}/functions/_tilde_files share/zsh/${PKGVERSION}/functions/_time_zone share/zsh/${PKGVERSION}/functions/_tin share/zsh/${PKGVERSION}/functions/_tla +share/zsh/${PKGVERSION}/functions/_todo.sh +share/zsh/${PKGVERSION}/functions/_toilet share/zsh/${PKGVERSION}/functions/_toolchain-source share/zsh/${PKGVERSION}/functions/_totd share/zsh/${PKGVERSION}/functions/_tpb share/zsh/${PKGVERSION}/functions/_tpconfig +share/zsh/${PKGVERSION}/functions/_tracepath share/zsh/${PKGVERSION}/functions/_trap share/zsh/${PKGVERSION}/functions/_ttyctl share/zsh/${PKGVERSION}/functions/_tune2fs @@ -446,10 +486,13 @@ share/zsh/${PKGVERSION}/functions/_vim share/zsh/${PKGVERSION}/functions/_vnc share/zsh/${PKGVERSION}/functions/_volume_groups share/zsh/${PKGVERSION}/functions/_vorbis +share/zsh/${PKGVERSION}/functions/_vorbiscomment +share/zsh/${PKGVERSION}/functions/_vserver share/zsh/${PKGVERSION}/functions/_vux share/zsh/${PKGVERSION}/functions/_w3m share/zsh/${PKGVERSION}/functions/_wait share/zsh/${PKGVERSION}/functions/_wajig +share/zsh/${PKGVERSION}/functions/_wakeup_capable_devices share/zsh/${PKGVERSION}/functions/_wanna-build share/zsh/${PKGVERSION}/functions/_wanted share/zsh/${PKGVERSION}/functions/_webbrowser @@ -492,6 +535,7 @@ share/zsh/${PKGVERSION}/functions/_xt_session_id share/zsh/${PKGVERSION}/functions/_xterm share/zsh/${PKGVERSION}/functions/_xv share/zsh/${PKGVERSION}/functions/_xwit +share/zsh/${PKGVERSION}/functions/_yafc share/zsh/${PKGVERSION}/functions/_yast share/zsh/${PKGVERSION}/functions/_yodl share/zsh/${PKGVERSION}/functions/_yp @@ -507,10 +551,21 @@ share/zsh/${PKGVERSION}/functions/_zmodload share/zsh/${PKGVERSION}/functions/_zmv share/zsh/${PKGVERSION}/functions/_zpty share/zsh/${PKGVERSION}/functions/_zstyle +share/zsh/${PKGVERSION}/functions/add-zsh-hook +share/zsh/${PKGVERSION}/functions/age share/zsh/${PKGVERSION}/functions/allopt share/zsh/${PKGVERSION}/functions/backward-kill-word-match share/zsh/${PKGVERSION}/functions/backward-word-match share/zsh/${PKGVERSION}/functions/bashcompinit +share/zsh/${PKGVERSION}/functions/calendar +share/zsh/${PKGVERSION}/functions/calendar_add +share/zsh/${PKGVERSION}/functions/calendar_edit +share/zsh/${PKGVERSION}/functions/calendar_lockfiles +share/zsh/${PKGVERSION}/functions/calendar_read +share/zsh/${PKGVERSION}/functions/calendar_scandate +share/zsh/${PKGVERSION}/functions/calendar_show +share/zsh/${PKGVERSION}/functions/calendar_showdate +share/zsh/${PKGVERSION}/functions/calendar_sort share/zsh/${PKGVERSION}/functions/capitalize-word-match share/zsh/${PKGVERSION}/functions/catch share/zsh/${PKGVERSION}/functions/checkmail @@ -529,6 +584,7 @@ share/zsh/${PKGVERSION}/functions/edit-command-line share/zsh/${PKGVERSION}/functions/forward-word-match share/zsh/${PKGVERSION}/functions/getjobs share/zsh/${PKGVERSION}/functions/harden +share/zsh/${PKGVERSION}/functions/history-beginning-search-menu share/zsh/${PKGVERSION}/functions/history-pattern-search share/zsh/${PKGVERSION}/functions/history-search-end share/zsh/${PKGVERSION}/functions/incarg @@ -538,9 +594,12 @@ share/zsh/${PKGVERSION}/functions/insert-files share/zsh/${PKGVERSION}/functions/insert-unicode-char share/zsh/${PKGVERSION}/functions/is-at-least share/zsh/${PKGVERSION}/functions/keeper +share/zsh/${PKGVERSION}/functions/keymap+widget share/zsh/${PKGVERSION}/functions/kill-word-match +share/zsh/${PKGVERSION}/functions/match-word-context share/zsh/${PKGVERSION}/functions/match-words-by-style share/zsh/${PKGVERSION}/functions/mere +share/zsh/${PKGVERSION}/functions/modify-current-argument share/zsh/${PKGVERSION}/functions/narrow-to-region share/zsh/${PKGVERSION}/functions/narrow-to-region-invisible share/zsh/${PKGVERSION}/functions/nslookup @@ -567,9 +626,11 @@ share/zsh/${PKGVERSION}/functions/quote-and-complete-word share/zsh/${PKGVERSION}/functions/read-from-minibuffer share/zsh/${PKGVERSION}/functions/relative share/zsh/${PKGVERSION}/functions/replace-string +share/zsh/${PKGVERSION}/functions/replace-string-again share/zsh/${PKGVERSION}/functions/run-help share/zsh/${PKGVERSION}/functions/select-word-style share/zsh/${PKGVERSION}/functions/smart-insert-last-word +share/zsh/${PKGVERSION}/functions/split-shell-arguments share/zsh/${PKGVERSION}/functions/tetris share/zsh/${PKGVERSION}/functions/throw share/zsh/${PKGVERSION}/functions/transpose-words-match @@ -582,6 +643,7 @@ share/zsh/${PKGVERSION}/functions/zcalc share/zsh/${PKGVERSION}/functions/zed share/zsh/${PKGVERSION}/functions/zed-set-file-name share/zsh/${PKGVERSION}/functions/zkbd +share/zsh/${PKGVERSION}/functions/zmathfuncdef share/zsh/${PKGVERSION}/functions/zmv share/zsh/${PKGVERSION}/functions/zrecompile share/zsh/${PKGVERSION}/functions/zsh-mime-handler diff --git a/shells/zsh-current/distinfo b/shells/zsh-current/distinfo index 407d64ec843..fcb26a52029 100644 --- a/shells/zsh-current/distinfo +++ b/shells/zsh-current/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.9 2006/04/07 15:28:50 jlam Exp $ +$NetBSD: distinfo,v 1.10 2007/09/21 05:24:43 uebayasi Exp $ -SHA1 (zsh-4.3.2.tar.bz2) = a6dd50c7578812bdb30f4cb65c8ac280c86dbfc3 -RMD160 (zsh-4.3.2.tar.bz2) = 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e -Size (zsh-4.3.2.tar.bz2) = 2263544 bytes -SHA1 (patch-ab) = 6ffe8b8b82d04bb27c5e4fb43b75f7f8de64f7c9 +SHA1 (zsh-4.3.4.tar.bz2) = 6bd905c4bf61bf3df5e5bb78f64be68366ad7517 +RMD160 (zsh-4.3.4.tar.bz2) = 2fe0fcf6371d2072c3b7eeae0392c7ef3665457c +Size (zsh-4.3.4.tar.bz2) = 2374851 bytes +SHA1 (patch-ab) = d515a447f4aa773b88f923be090ac65d48993505 SHA1 (patch-ac) = 95e15527e75685cbc140066efeec12127a4863ce -SHA1 (patch-ae) = dbf50ba5bb5141ea4583c02963d7e114e402d022 +SHA1 (patch-ae) = 84b514b907f666780dec5b484dc19e15ef9f1fe0 +SHA1 (patch-af) = ca2680c96b38ca9feb87500b36a67757b9f9584c +SHA1 (patch-ag) = de7a4c6df025130e1c19e5eeedd8206b0606c99d +SHA1 (patch-ah) = 2c4899eed3b46e406b0cce3eec867f53de91257a diff --git a/shells/zsh-current/patches/patch-ab b/shells/zsh-current/patches/patch-ab index 0b2d544727e..87bbc4ca16b 100644 --- a/shells/zsh-current/patches/patch-ab +++ b/shells/zsh-current/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2006/03/11 13:20:15 uebayasi Exp $ +$NetBSD: patch-ab,v 1.2 2007/09/21 05:24:43 uebayasi Exp $ ---- Src/zsh.h.orig 2006-01-17 19:40:06.000000000 +0900 -+++ Src/zsh.h -@@ -1690,6 +1690,7 @@ struct ttyinfo { +--- Src/zsh.h.orig 2007-03-30 05:33:15.000000000 -0400 ++++ Src/zsh.h 2007-04-28 14:52:11.000000000 -0400 +@@ -1754,6 +1754,7 @@ #endif }; @@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.1 2006/03/11 13:20:15 uebayasi Exp $ /* defines for whether tabs expand to spaces */ #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H) #define SGTTYFLAG shttyinfo.tio.c_oflag -@@ -1705,6 +1706,7 @@ struct ttyinfo { - #define SGTABTYPE XTABS +@@ -1771,6 +1772,7 @@ + # endif # endif # endif +#endif diff --git a/shells/zsh-current/patches/patch-ae b/shells/zsh-current/patches/patch-ae index 857b6cfd4bc..2767f6d87d0 100644 --- a/shells/zsh-current/patches/patch-ae +++ b/shells/zsh-current/patches/patch-ae @@ -1,13 +1,14 @@ -$NetBSD: patch-ae,v 1.1 2006/03/11 13:20:15 uebayasi Exp $ +$NetBSD: patch-ae,v 1.2 2007/09/21 05:24:43 uebayasi Exp $ ---- Src/mkmakemod.sh.orig 2005-08-09 18:55:18.000000000 +0900 -+++ Src/mkmakemod.sh -@@ -112,8 +112,7 @@ if $first_stage; then +--- Src/mkmakemod.sh.orig 2006-05-27 13:49:53.000000000 -0400 ++++ Src/mkmakemod.sh 2007-04-28 15:00:56.000000000 -0400 +@@ -112,9 +112,7 @@ module_list="${bin_mods}${dyn_mods}" - # check both 2.13 and 2.50 syntax + # check 2.13, 2.50, and 2.60 syntaxes - if grep '%@D@%D%' config.status >/dev/null || -- grep ',@D@,D,' config.status >/dev/null; then +- grep ',@D@,D,' config.status >/dev/null || +- grep ',@D@,|#_!!_#|D,' config.status >/dev/null; then + if grep '^#[ \t]*define[ \t][ \t]*DYNAMIC[ \t]' config.h >/dev/null; then is_dynamic=true else diff --git a/shells/zsh-current/patches/patch-af b/shells/zsh-current/patches/patch-af new file mode 100644 index 00000000000..071c767541e --- /dev/null +++ b/shells/zsh-current/patches/patch-af @@ -0,0 +1,12 @@ +$NetBSD: patch-af,v 1.1 2007/09/21 05:24:43 uebayasi Exp $ + +--- Config/defs.mk.in.orig 2007-01-16 01:36:41.000000000 +0900 ++++ Config/defs.mk.in 2007-09-20 11:53:37.000000000 +0900 +@@ -77,6 +77,7 @@ + + # install utility + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ + + # variables used in determining what to install diff --git a/shells/zsh-current/patches/patch-ag b/shells/zsh-current/patches/patch-ag new file mode 100644 index 00000000000..f9770ed6303 --- /dev/null +++ b/shells/zsh-current/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.1 2007/09/21 05:24:43 uebayasi Exp $ + +--- Makefile.in.orig 2006-09-17 00:53:03.000000000 +0900 ++++ Makefile.in 2007-09-20 11:52:46.000000000 +0900 +@@ -88,6 +88,7 @@ + FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \ + INSTALL_DATA="$(INSTALL_DATA)" \ + INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \ ++ INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \ + DESTDIR="$(DESTDIR)" VERSION="$(VERSION)" \ + $(SHELL) $(sdir_top)/Config/installfns.sh || exit 1; \ + fi; \ diff --git a/shells/zsh-current/patches/patch-ah b/shells/zsh-current/patches/patch-ah new file mode 100644 index 00000000000..7a05b17ae63 --- /dev/null +++ b/shells/zsh-current/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2007/09/21 05:24:43 uebayasi Exp $ + +--- Config/installfns.sh.orig 2006-03-20 20:06:24.000000000 +0900 ++++ Config/installfns.sh 2007-09-20 11:50:26.000000000 +0900 +@@ -46,7 +46,7 @@ + fi + test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir || exit 1 + if test -x $sdir_top/$file; then +- $INSTALL_PROGRAM $sdir_top/$file $instdir || exit 1 ++ $INSTALL_SCRIPT $sdir_top/$file $instdir || exit 1 + else + $INSTALL_DATA $sdir_top/$file $instdir || exit 1 + fi -- cgit v1.2.3