diff options
Diffstat (limited to 'shells/zsh/files')
-rw-r--r-- | shells/zsh/files/patch-aa | 19 | ||||
-rw-r--r-- | shells/zsh/files/patch-ab | 28 | ||||
-rw-r--r-- | shells/zsh/files/patch-ac | 100 | ||||
-rw-r--r-- | shells/zsh/files/patch-ad | 162 |
4 files changed, 171 insertions, 138 deletions
diff --git a/shells/zsh/files/patch-aa b/shells/zsh/files/patch-aa deleted file mode 100644 index 28109c3ca0d8..000000000000 --- a/shells/zsh/files/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -*** Src/Makefile.in.orig Tue Jul 9 11:00:39 1996 ---- Src/Makefile.in Tue Jul 9 11:00:46 1996 -*************** -*** 138,144 **** - # install binary, creating install directory if necessary - install.bin: zsh - $(top_srcdir)/mkinstalldirs $(bindir) -! -if [ -f $(bindir)/zsh ]; then mv $(bindir)/zsh $(bindir)/zsh.old; fi - $(INSTALL_PROGRAM) zsh $(bindir)/zsh - -if [ -f $(bindir)/zsh-$(VERSION) ]; then rm -f $(bindir)/zsh-$(VERSION); fi - ln $(bindir)/zsh $(bindir)/zsh-$(VERSION) ---- 138,144 ---- - # install binary, creating install directory if necessary - install.bin: zsh - $(top_srcdir)/mkinstalldirs $(bindir) -! -if [ -f $(bindir)/zsh ]; then mv -f $(bindir)/zsh $(bindir)/zsh.old; fi - $(INSTALL_PROGRAM) zsh $(bindir)/zsh - -if [ -f $(bindir)/zsh-$(VERSION) ]; then rm -f $(bindir)/zsh-$(VERSION); fi - ln $(bindir)/zsh $(bindir)/zsh-$(VERSION) diff --git a/shells/zsh/files/patch-ab b/shells/zsh/files/patch-ab index 1c11069e06fe..0899f82e9386 100644 --- a/shells/zsh/files/patch-ab +++ b/shells/zsh/files/patch-ab @@ -1,21 +1,11 @@ ---- Doc/Makefile.in.orig Wed Jul 14 20:59:48 1999 -+++ Doc/Makefile.in Fri Sep 10 22:27:01 1999 -@@ -91,7 +91,8 @@ - everything: all zsh_us.ps zsh_a4.ps zsh_toc.html +--- Doc/Makefile.in.orig Thu Apr 20 04:03:42 2000 ++++ Doc/Makefile.in Sat Apr 29 00:04:52 2000 +@@ -37,7 +37,7 @@ - zsh.info: zsh.texi -- @$(MAKEINFO) -I$(srcdir) $(srcdir)/zsh.texi || { \ -+ @rm -f zsh.info -+ @$(MAKEINFO) --no-split -I$(srcdir) $(srcdir)/zsh.texi || { \ - echo Info documentation cannot be compiled without $(MAKEINFO). ; \ - echo You can find precompiled info files in zsh-doc.tar.gz. ; } - -@@ -125,7 +126,7 @@ - # install info pages, creating install directory if necessary - install.info: zsh.info - $(top_srcdir)/mkinstalldirs $(infodir) -- for file in zsh.info zsh.info-[1-9]*; do \ -+ for file in zsh.info*; do \ - [ -f "$$file" ] && $(INSTALL_DATA) $$file $(infodir) ; \ - done + @DEFS_MK@ +-MAKEINFO = makeinfo ++MAKEINFO = makeinfo --no-split + TEXI2DVI = texi2dvi + DVIPS = dvips + TEXI2HTML = texi2html -expandinfo -split_chapter diff --git a/shells/zsh/files/patch-ac b/shells/zsh/files/patch-ac deleted file mode 100644 index 90e273ac638e..000000000000 --- a/shells/zsh/files/patch-ac +++ /dev/null @@ -1,100 +0,0 @@ -*** Doc/zsh.texi.orig Fri Sep 3 16:44:37 1999 ---- Doc/zsh.texi Sun Feb 13 12:02:35 2000 -*************** -*** 2,7 **** ---- 2,11 ---- - @c %**start of header - @setfilename zsh.info - @settitle zsh -+ @dircategory Shells -+ @direntry -+ * Zsh: (zsh). The Z shell. -+ @end direntry - @c %**end of header - - @ifinfo -*************** -*** 834,840 **** - A character may be @dfn{quoted} (that is, made to stand for itself) by - preceding it with a @code{\}. @code{\} followed by a newline is - ignored. All characters enclosed between a pair of single quotes -! (@t{@value{dsq}}) are quoted, except the first character of @code{histchars} - (@code{!} by default). A single quote cannot appear within single - quotes. Inside double quotes (@code{""}), parameter and command - substitution occurs, and @code{\} quotes the characters @code{\}, ---- 838,844 ---- - A character may be @dfn{quoted} (that is, made to stand for itself) by - preceding it with a @code{\}. @code{\} followed by a newline is - ignored. All characters enclosed between a pair of single quotes -! (@t{'}@t{'}) are quoted, except the first character of @code{histchars} - (@code{!} by default). A single quote cannot appear within single - quotes. Inside double quotes (@code{""}), parameter and command - substitution occurs, and @code{\} quotes the characters @code{\}, -*************** -*** 1622,1628 **** - @code{histchars} parameter which is @code{!} by default and may occur - anywhere on the command line; history substitutions do not nest. The - @code{!} can be escaped with @code{\} or can be enclosed between a pair of -! single quotes (@t{@value{dsq}}) - to suppress its special meaning. Double quotes will not work for this. - - @noindent ---- 1626,1632 ---- - @code{histchars} parameter which is @code{!} by default and may occur - anywhere on the command line; history substitutions do not nest. The - @code{!} can be escaped with @code{\} or can be enclosed between a pair of -! single quotes (@t{'}@t{'}) - to suppress its special meaning. Double quotes will not work for this. - - @noindent -*************** -*** 5183,5189 **** - @cindex rc, quoting style - @cindex quoting style, rc - @pindex RC_QUOTES -! Allow the character sequence @t{@value{dsq}} to signify a single quote within - singly quoted strings. - - @item RCS (+f) ---- 5187,5193 ---- - @cindex rc, quoting style - @cindex quoting style, rc - @pindex RC_QUOTES -! Allow the character sequence @t{'}@t{'} to signify a single quote within - singly quoted strings. - - @item RCS (+f) -*************** -*** 7008,7014 **** - use is - - @example -! compctl -D -f + -H 0 @value{dsq} -X '(No file found; using history)' - @end example - - which forces completion to look back in the history list for a word if no ---- 7012,7018 ---- - use is - - @example -! compctl -D -f + -H 0 @t{'}@t{'} -X '(No file found; using history)' - @end example - - which forces completion to look back in the history list for a word if no -*************** -*** 7071,7077 **** - name completion performed on the first word in the range. For example, - - @example -! compctl -x 'r[-exec,;]' -l @value{dsq} -- find - @end example - - completes arguments between @code{-exec} and the following @code{;} (or the ---- 7075,7081 ---- - name completion performed on the first word in the range. For example, - - @example -! compctl -x 'r[-exec,;]' -l @t{'}@t{'} -- find - @end example - - completes arguments between @code{-exec} and the following @code{;} (or the diff --git a/shells/zsh/files/patch-ad b/shells/zsh/files/patch-ad new file mode 100644 index 000000000000..c40ea35d768b --- /dev/null +++ b/shells/zsh/files/patch-ad @@ -0,0 +1,162 @@ +--- Completion/Unix/Command/_mount.orig Sun Jun 3 22:30:24 2001 ++++ Completion/Unix/Command/_mount Sun Jun 3 22:30:32 2001 +@@ -365,6 +365,52 @@ + 'onerror[set behaviour on error]:behaviour on error:(panic lock umount repair)' + ) + ;; ++ freebsd*) ++ _fs_any=( ++ '(sync)async[do all I/O asynchronously]' ++ 'current[use current options on already mounted file system]' ++ 'force[force R/W mount of unclean filesystem]' ++ 'fstab[use options listed in /etc/fstab]' ++ 'noasync[do I/O synchronously]' ++ 'noatime[don'"'"'t update access time]' ++ 'noauto[can only be mounted explicitly]' ++ 'noclusterr[disable read clustering]' ++ 'noclusterw[disable write clustering]' ++ 'nodev[don'"'"'t interpret devices]' ++ 'noexec[don'"'"'t allow execution of binaries]' ++ 'nosuid[ignore suid and sgid bits]' ++ 'nosymfollow[don'"'"'t follow symlinks]' ++ 'rdonly[mount file system read-only]' ++ '(async)sync[do all I/O synchronously]' ++ 'suiddir[allow suid bits on directories]' ++ 'update[change status of already mounted filesystem]' ++ 'union[cause the namespace at the mount point to appear as the union of the mounted filesystem and the existing directory]' ++ ) ++ _fs_iso9660=( ++ 'extatt[enable use of extended attributes]' ++ 'gens[don'"'"'t strip version number on files]' ++ 'joliet[don'"'"'t use any Joliet extensions]' ++ 'rrip[don'"'"'t use any Rockridge extensions]' ++ 'strictjoliet[relax checking for Supplementary Volume Descriptor Flags field which is set to a wrong value on some Joliet formatted disks]' ++ ) ++ _fs_std=( ++ 'nodev[don'"'"'t interpret devices]' ++ 'noexec[don'"'"'t allow execution of binaries]' ++ 'nosuid[ignore suid and sgid bits]' ++ 'rdonly[mount file system read-only]' ++ 'union[cause the namespace at the mount point to appear as the union of the mounted filesystem and the existing directory]' ++ ) ++ _fs_devfs=( "$_fs_std[@]" ) ++ _fs_fdesc=( "$_fs_std[@]" ) ++ _fs_kernfs=( "$_fs_std[@]" ) ++ _fs_linprocfs=( "$_fs_std[@]" ) ++ _fs_procfs=( "$_fs_std[@]" ) ++ _fs_msdos=( ++ 'shortnames[]' ++ 'longnames[]' ++ 'nowin95[]' ++ ) ++ ;; + esac + fi + +@@ -475,6 +521,25 @@ + deffs=hsfs + typeops=-F + ;; ++ freebsd*) ++ args=( -s ++ '-a[mount all filesystems in fstab]' ++ '-d[cause everything to be done except for the actual system call]' ++ '-f[forced mount]' ++ '-o[specify file system options]:file system option:->fsopt' ++ '-p[print mounted file systems]' ++ '-r[mount readonly]' ++ '-t[specify file system type]:file system type:->fstype' ++ '-u[change status of already mounted filesystem]' ++ '-v[verbose mode]' ++ '-w[mount read/write]' ++ ':dev or dir:->devordir' ++ ':mount point:_files -/' ++ ) ++ fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdos nfs ++ ntfs null nwfs portal procfs std ufs umap union ) ++ deffs=ufs ++ ;; + *) + # Default for all other systems. Dunno. + +@@ -517,6 +582,17 @@ + '-v[verbose]' + ) + ;; ++ freebsd*) ++ args=( ++ '-a[unmount all mounted file systems]' ++ '-A[unmount all mounted file systems except the root]' ++ '-f[force unmount]' ++ '-h[unmount all filesystems associated with host]:hostnames:_hosts' ++ '-t[unmount all filesystems of specified type]:file system type:->fstype' ++ '-v[verbose mode]' ++ '*:dev or dir:->udevordir' ++ ) ++ ;; + *) + args=( \ + '-h[show help]' +@@ -553,20 +629,55 @@ + if (( $+opt_args[-a] )); then + _message "no device or directory with option \`-a'" + else +- _alternative \ +- 'devices:device:{compadd "$expl[@]" /dev/*}' \ +- 'directories:mount point:_files -/' && ret=0 ++ local dev_tmp mp_tmp mline ++ ++ case "$OSTYPE" in ++ freebsd*) ++ while read mline; do ++ case $mline[(w)1] in ++ \#* ) ++ ;; ++ proc) ++ ;; ++ *) ++ [[ $mline[(w)3] == swap ]] || \ ++ dev_tmp=( $dev_tmp $mline[(w)1] ) \ ++ mp_tmp=( $mp_tmp $mline[(w)2] ) ++ ;; ++ esac ++ done < /etc/fstab ++ ++ _alternative \ ++ 'devices:device:compadd -a dev_tmp' \ ++ 'directories:mount point:compadd -a mp_tmp' && ret=0 ++ ;; ++ *) ++ _alternative \ ++ 'devices:device:{compadd "$expl[@]" /dev/*}' \ ++ 'directories:mount point:_files -/' && ret=0 ++ ;; ++ esac + fi + ;; + udevordir) + if (( $+opt_args[-a] )); then + _message "no device or directory with option \`-a'" + else +- local dev_tmp mp_tmp ++ local dev_tmp mp_tmp mline + +- tmp=( "${(@f)$(< /etc/mtab)}" ) +- dev_tmp=( "${(@)${(@)tmp%% *}:#none}" ) +- mp_tmp=( "${(@)${(@)tmp#* }%% *}" ) ++ case "$OSTYPE" in ++ freebsd*) ++ /sbin/mount | while read mline; do ++ dev_tmp=( $dev_tmp $mline[(w)1] ) ++ mp_tmp=( $mp_tmp $mline[(w)3] ) ++ done ++ ;; ++ *) ++ tmp=( "${(@f)$(< /etc/mtab)}" ) ++ dev_tmp=( "${(@)${(@)tmp%% *}:#none}" ) ++ mp_tmp=( "${(@)${(@)tmp#* }%% *}" ) ++ ;; ++ esac + + _alternative \ + 'devices:device:compadd -a dev_tmp' \ |