Attachment 101827 Details for Bug 141472 – zsh-4.3.10_2.patch

[patch] zsh-4.3.10_2.patch

zsh-4.3.10_2.patch (text/plain), 5.83 KB, created by Sean Farley on 2009-12-15 03:30:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sean Farley

Created: 2009-12-15 03:30:04 UTC

Size: 5.83 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/shells/zsh.orig/Makefile /usr/ports/shells/zsh/Makefile
>--- /usr/ports/shells/zsh.orig/Makefile	2009-08-21 19:35:10.000000000 -0500
>+++ /usr/ports/shells/zsh/Makefile	2009-12-14 21:18:19.000000000 -0600
>@@ -33,8 +33,8 @@
> 		--enable-function-subdirs
> 
> EXTRA_PATCHES=	${FILESDIR}/extra-patch-bsdtar
>-EXTRA_COMPLETION_FILES= _fstat _procstat _sockstat
>-EXTRA_COMPLETION_DIR= Completion/BSD/Command
>+EXTRA_COMPLETION_FILES=	_fstat _procstat _sockstat
>+EXTRA_COMPLETION_DIR=	Completion/BSD/Command
> 
> OPTIONS=	ZSH_GDBM	"Enable GDBM support (GPL)" off \
> 		ZSH_MEM		"Enable zsh-mem and zsh-secure-free options" on \
>@@ -103,13 +103,13 @@
> 	@${SED} -i "" -e "s,/etc/,${LOCALBASE}/etc/," \
> 		${WRKSRC}/Functions/MIME/zsh-mime-setup
> .ifdef EXTRA_COMPLETION_FILES
>-	@echo "===>  Installing extra completion files"
>+	@${ECHO_MSG} "===>  Installing extra completion files"
> .for COMPFILE in ${EXTRA_COMPLETION_FILES}
> 	@(if [ -f ${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ] ; then \
>-		echo "${EXTRA_COMPLETION_DIR}/${COMPFILE} already exists" ; \
>+		${ECHO_MSG} "${EXTRA_COMPLETION_DIR}/${COMPFILE} already exists" ; \
> 		exit 1 ; \
> 	else \
>-		echo ${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \
>+		${ECHO_MSG} ${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \
> 		${CP} ${FILESDIR}/${COMPFILE} \
> 			${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \
> 	fi)
>diff -ruN --exclude=CVS /usr/ports/shells/zsh.orig/files/patch-Completion-Unix-Command-_mount /usr/ports/shells/zsh/files/patch-Completion-Unix-Command-_mount
>--- /usr/ports/shells/zsh.orig/files/patch-Completion-Unix-Command-_mount	2009-06-15 10:03:19.000000000 -0500
>+++ /usr/ports/shells/zsh/files/patch-Completion-Unix-Command-_mount	2009-12-14 20:55:08.000000000 -0600
>@@ -1,6 +1,6 @@
>---- Completion/Unix/Command/_mount
>-+++ Completion/Unix/Command/_mount
>-@@ -41,10 +41,10 @@ fi
>+--- Completion/Unix/Command/_mount.orig	2008-01-22 04:13:35.000000000 -0600
>++++ Completion/Unix/Command/_mount	2009-12-14 20:51:52.000000000 -0600
>+@@ -41,10 +41,11 @@ fi
>  
>  local curcontext="$curcontext" state line expl suf ret=1
>  local args deffs=iso9660 tmp typeops=-t _nfs_access _fs_nfs _nfs_ufs \
>@@ -11,11 +11,12 @@
> +_fs_ufs _fs_efs _fs_cd9660 _fs_iso9660 _fs_cachefs _fs_s5fs _fs_tmpfs _fs_pcfs \
> +_fs_hsfs _fs_advfs _fs_cdfs _fs_affs _fs_ext2 _fs_fat _fs_ext3 _fs_msdos \
> +_fs_msdosfs _fs_umsdos _fs_vfat _fs_hpfs _fs_ntfs _fs_reiserfs _fs_smbfs \
>-+_fs_xfs _fs_std _fs_devfs _fs_fdesc _fs_kernfs _fs_linprocfs _fs_procfs
>++_fs_xfs _fs_std _fs_devfs _fs_fdesc _fs_kernfs _fs_linprocfs _fs_linsysfs \
>++_fs_procfs
>  
>  typeset -A opt_args
>  
>-@@ -527,7 +527,7 @@ if (( ! $+_fs_any )); then
>+@@ -527,7 +528,7 @@ if (( ! $+_fs_any )); then
>        'swidth[specify stripe width]:size'
>      )
>      ;;
>@@ -24,7 +25,7 @@
>      _fs_any=(
>        '(sync)async[do all I/O asynchronously]'
>        'current[use current options on already mounted file system]'
>-@@ -548,12 +548,12 @@ if (( ! $+_fs_any )); then
>+@@ -548,12 +549,12 @@ if (( ! $+_fs_any )); then
>        '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]'
>      )
>@@ -43,7 +44,13 @@
>      )
>      _fs_std=(
>        "nodev[don't interpret devices]"
>-@@ -571,7 +571,13 @@ if (( ! $+_fs_any )); then
>+@@ -566,12 +567,19 @@ if (( ! $+_fs_any )); then
>+     _fs_fdesc=( "$_fs_std[@]" )
>+     _fs_kernfs=( "$_fs_std[@]" )
>+     _fs_linprocfs=( "$_fs_std[@]" )
>++    _fs_linsysfs=( "$_fs_std[@]" )
>+     _fs_procfs=( "$_fs_std[@]" )
>+     _fs_msdos=(
>        'shortnames[]'
>        'longnames[]'
>        'nowin95[]'
>@@ -57,7 +64,7 @@
>      ;;
>    esac
>  fi
>-@@ -682,7 +688,7 @@ if [[ "$service" = mount ]]; then
>+@@ -682,7 +690,7 @@ if [[ "$service" = mount ]]; then
>      deffs=hsfs
>      typeops=-F
>      ;;
>@@ -66,7 +73,7 @@
>      args=( -s
>        '(:)-a[mount all filesystems in fstab]'
>        '-d[cause everything to be done except for the actual system call]'      
>-@@ -757,7 +763,7 @@ else
>+@@ -757,7 +765,7 @@ else
>  	'*:dev or dir:->udevordir'
>        )
>      ;;
>@@ -75,7 +82,7 @@
>        args=(
>  	'(*)-a[unmount all mounted file systems]'
>  	'-A[unmount all mounted file systems except the root]'
>-@@ -819,7 +825,28 @@ devordir)
>+@@ -819,7 +827,28 @@ devordir)
>    fi
>  
>    case "$OSTYPE" in
>@@ -105,7 +112,7 @@
>      while read mline; do 
>        case $mline[(w)1] in
>  	\#* )
>-@@ -833,6 +860,16 @@ devordir)
>+@@ -833,6 +862,16 @@ devordir)
>  	  ;;
>        esac
>      done < /etc/fstab
>@@ -122,7 +129,7 @@
>  
>      _alternative \
>        'hosts:host:_hosts -S :' \
>-@@ -859,6 +896,12 @@ udevordir)
>+@@ -859,6 +898,12 @@ udevordir)
>      dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
>      mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
>      ;;
>diff -ruN --exclude=CVS /usr/ports/shells/zsh.orig/files/patch-Completion-Unix-Type-_file_systems /usr/ports/shells/zsh/files/patch-Completion-Unix-Type-_file_systems
>--- /usr/ports/shells/zsh.orig/files/patch-Completion-Unix-Type-_file_systems	2009-06-15 10:03:19.000000000 -0500
>+++ /usr/ports/shells/zsh/files/patch-Completion-Unix-Type-_file_systems	2009-12-14 20:53:19.000000000 -0600
>@@ -1,6 +1,6 @@
>---- Completion/Unix/Type/_file_systems
>-+++ Completion/Unix/Type/_file_systems
>-@@ -16,10 +16,15 @@ case $OSTYPE in
>+--- Completion/Unix/Type/_file_systems.orig	2007-09-27 07:00:03.000000000 -0500
>++++ Completion/Unix/Type/_file_systems	2009-12-14 20:52:07.000000000 -0600
>+@@ -16,10 +16,15 @@
>    ;;
>    osf*) fss=( advfs ufs nfs mfs cdfs ) ;;
>    solaris*) fss=( ufs nfs hsfs s5fs pcfs cachefs tmpfs ) ;;
>@@ -10,7 +10,7 @@
>            ntfs null nwfs portal procfs std udf ufs umap union )
>    ;;
> +  freebsd*)
>-+    fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdosfs nfs
>++    fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs linsysfs mfs msdosfs nfs
> +    ntfs nullfs nwfs portal procfs smbfs std udf ufs umap unionfs 
> +    reiserfs xfs)
> +  ;;

Actions: View | Diff

Attachments on bug 141472: 101827