Attachment #101827 for bug #141472

View | Details | Raw Unified | Return to bug 141472
Collapse All | Expand All




		--enable-function-subdirs

EXTRA_PATCHES=	${FILESDIR}/extra-patch-bsdtar
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 \

	@${SED} -i "" -e "s,/etc/,${LOCALBASE}/etc/," \
		${WRKSRC}/Functions/MIME/zsh-mime-setup
.ifdef EXTRA_COMPLETION_FILES
	@${ECHO_MSG} "===>  Installing extra completion files"
.for COMPFILE in ${EXTRA_COMPLETION_FILES}
	@(if [ -f ${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ] ; then \
		${ECHO_MSG} "${EXTRA_COMPLETION_DIR}/${COMPFILE} already exists" ; \
		exit 1 ; \
	else \
		${ECHO_MSG} ${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \
		${CP} ${FILESDIR}/${COMPFILE} \
			${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \
	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 \

+_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_linsysfs \
+_fs_procfs
 
 typeset -A opt_args
 
@@ -527,7 +528,7 @@ if (( ! $+_fs_any )); then
       'swidth[specify stripe width]:size'
     )
     ;;

     _fs_any=(
       '(sync)async[do all I/O asynchronously]'
       'current[use current options on already mounted file system]'
@@ -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]'
     )

     )
     _fs_std=(
       "nodev[don't interpret devices]"
@@ -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[]'

     ;;
   esac
 fi
@@ -682,7 +690,7 @@ if [[ "$service" = mount ]]; then
     deffs=hsfs
     typeops=-F
     ;;

     args=( -s
       '(:)-a[mount all filesystems in fstab]'
       '-d[cause everything to be done except for the actual system call]'      
@@ -757,7 +765,7 @@ else
 	'*:dev or dir:->udevordir'
       )
     ;;

       args=(
 	'(*)-a[unmount all mounted file systems]'
 	'-A[unmount all mounted file systems except the root]'
@@ -819,7 +827,28 @@ devordir)
   fi
 
   case "$OSTYPE" in

     while read mline; do 
       case $mline[(w)1] in
 	\#* )
@@ -833,6 +862,16 @@ devordir)
 	  ;;
       esac
     done < /etc/fstab

 
     _alternative \
       'hosts:host:_hosts -S :' \
@@ -859,6 +898,12 @@ udevordir)
     dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
     mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
     ;;

Lines 1-6 Link Here

(-)/usr/ports/shells/zsh/files/patch-Completion-Unix-Type-_file_systems (-4 / +4 lines)
1	--- Completion/Unix/Type/_file_systems	1	--- Completion/Unix/Type/_file_systems.orig 2007-09-27 07:00:03.000000000 -0500
2	+++ Completion/Unix/Type/_file_systems	2	+++ Completion/Unix/Type/_file_systems 2009-12-14 20:52:07.000000000 -0600
3	@@ -16,10 +16,15 @@ case $OSTYPE in	3	@@ -16,10 +16,15 @@
4	;;	4	;;
5	osf*) fss=( advfs ufs nfs mfs cdfs ) ;;	5	osf*) fss=( advfs ufs nfs mfs cdfs ) ;;
6	solaris*) fss=( ufs nfs hsfs s5fs pcfs cachefs tmpfs ) ;;	6	solaris*) fss=( ufs nfs hsfs s5fs pcfs cachefs tmpfs ) ;;
Lines 10-16 Link Here
10	ntfs null nwfs portal procfs std udf ufs umap union )	10	ntfs null nwfs portal procfs std udf ufs umap union )
11	;;	11	;;
12	+ freebsd*)	12	+ freebsd*)
13	+ fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdosfs nfs	13	+ fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs linsysfs mfs msdosfs nfs
14	+ ntfs nullfs nwfs portal procfs smbfs std udf ufs umap unionfs	14	+ ntfs nullfs nwfs portal procfs smbfs std udf ufs umap unionfs
15	+ reiserfs xfs)	15	+ reiserfs xfs)
16	+ ;;	16	+ ;;

Return to bug 141472

Lines 33-40 Link Here

(-)/usr/ports/shells/zsh/Makefile (-5 / +5 lines)
33	--enable-function-subdirs	33	--enable-function-subdirs
34		34
35	EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar	35	EXTRA_PATCHES= ${FILESDIR}/extra-patch-bsdtar
36	EXTRA_COMPLETION_FILES= _fstat _procstat _sockstat	36	EXTRA_COMPLETION_FILES= _fstat _procstat _sockstat
37	EXTRA_COMPLETION_DIR= Completion/BSD/Command	37	EXTRA_COMPLETION_DIR= Completion/BSD/Command
38		38
39	OPTIONS= ZSH_GDBM "Enable GDBM support (GPL)" off \	39	OPTIONS= ZSH_GDBM "Enable GDBM support (GPL)" off \
40	ZSH_MEM "Enable zsh-mem and zsh-secure-free options" on \	40	ZSH_MEM "Enable zsh-mem and zsh-secure-free options" on \
Lines 103-115 Link Here
103	@${SED} -i "" -e "s,/etc/,${LOCALBASE}/etc/," \	103	@${SED} -i "" -e "s,/etc/,${LOCALBASE}/etc/," \
104	${WRKSRC}/Functions/MIME/zsh-mime-setup	104	${WRKSRC}/Functions/MIME/zsh-mime-setup
105	.ifdef EXTRA_COMPLETION_FILES	105	.ifdef EXTRA_COMPLETION_FILES
106	@echo "===> Installing extra completion files"	106	@${ECHO_MSG} "===> Installing extra completion files"
107	.for COMPFILE in ${EXTRA_COMPLETION_FILES}	107	.for COMPFILE in ${EXTRA_COMPLETION_FILES}
108	@(if [ -f ${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ] ; then \	108	@(if [ -f ${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ] ; then \
109	echo "${EXTRA_COMPLETION_DIR}/${COMPFILE} already exists" ; \	109	${ECHO_MSG} "${EXTRA_COMPLETION_DIR}/${COMPFILE} already exists" ; \
110	exit 1 ; \	110	exit 1 ; \
111	else \	111	else \
112	echo ${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \	112	${ECHO_MSG} ${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \
113	${CP} ${FILESDIR}/${COMPFILE} \	113	${CP} ${FILESDIR}/${COMPFILE} \
114	${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \	114	${WRKSRC}/${EXTRA_COMPLETION_DIR}/${COMPFILE} ; \
115	fi)	115	fi)

Lines 1-6 Link Here

(-)/usr/ports/shells/zsh/files/patch-Completion-Unix-Command-_mount (-12 / +19 lines)
1	--- Completion/Unix/Command/_mount	1	--- Completion/Unix/Command/_mount.orig 2008-01-22 04:13:35.000000000 -0600
2	+++ Completion/Unix/Command/_mount	2	+++ Completion/Unix/Command/_mount 2009-12-14 20:51:52.000000000 -0600
3	@@ -41,10 +41,10 @@ fi	3	@@ -41,10 +41,11 @@ fi
4		4
5	local curcontext="$curcontext" state line expl suf ret=1	5	local curcontext="$curcontext" state line expl suf ret=1
6	local args deffs=iso9660 tmp typeops=-t _nfs_access _fs_nfs _nfs_ufs \	6	local args deffs=iso9660 tmp typeops=-t _nfs_access _fs_nfs _nfs_ufs \
Lines 11-21 Link Here
11	+_fs_ufs _fs_efs _fs_cd9660 _fs_iso9660 _fs_cachefs _fs_s5fs _fs_tmpfs _fs_pcfs \	11	+_fs_ufs _fs_efs _fs_cd9660 _fs_iso9660 _fs_cachefs _fs_s5fs _fs_tmpfs _fs_pcfs \
12	+_fs_hsfs _fs_advfs _fs_cdfs _fs_affs _fs_ext2 _fs_fat _fs_ext3 _fs_msdos \	12	+_fs_hsfs _fs_advfs _fs_cdfs _fs_affs _fs_ext2 _fs_fat _fs_ext3 _fs_msdos \
13	+_fs_msdosfs _fs_umsdos _fs_vfat _fs_hpfs _fs_ntfs _fs_reiserfs _fs_smbfs \	13	+_fs_msdosfs _fs_umsdos _fs_vfat _fs_hpfs _fs_ntfs _fs_reiserfs _fs_smbfs \
14	+_fs_xfs _fs_std _fs_devfs _fs_fdesc _fs_kernfs _fs_linprocfs _fs_procfs	14	+_fs_xfs _fs_std _fs_devfs _fs_fdesc _fs_kernfs _fs_linprocfs _fs_linsysfs \
		15	+_fs_procfs
15		16
16	typeset -A opt_args	17	typeset -A opt_args
17		18
18	@@ -527,7 +527,7 @@ if (( ! $+_fs_any )); then	19	@@ -527,7 +528,7 @@ if (( ! $+_fs_any )); then
19	'swidth[specify stripe width]:size'	20	'swidth[specify stripe width]:size'
20	)	21	)
21	;;	22	;;
Lines 24-30 Link Here
24	_fs_any=(	25	_fs_any=(
25	'(sync)async[do all I/O asynchronously]'	26	'(sync)async[do all I/O asynchronously]'
26	'current[use current options on already mounted file system]'	27	'current[use current options on already mounted file system]'
27	@@ -548,12 +548,12 @@ if (( ! $+_fs_any )); then	28	@@ -548,12 +549,12 @@ if (( ! $+_fs_any )); then
28	'update[change status of already mounted filesystem]'	29	'update[change status of already mounted filesystem]'
29	'union[cause the namespace at the mount point to appear as the union of the mounted filesystem and the existing directory]'	30	'union[cause the namespace at the mount point to appear as the union of the mounted filesystem and the existing directory]'
30	)	31	)
Lines 43-49 Link Here
43	)	44	)
44	_fs_std=(	45	_fs_std=(
45	"nodev[don't interpret devices]"	46	"nodev[don't interpret devices]"
46	@@ -571,7 +571,13 @@ if (( ! $+_fs_any )); then	47	@@ -566,12 +567,19 @@ if (( ! $+_fs_any )); then
		48	_fs_fdesc=( "$_fs_std[@]" )
		49	_fs_kernfs=( "$_fs_std[@]" )
		50	_fs_linprocfs=( "$_fs_std[@]" )
		51	+ _fs_linsysfs=( "$_fs_std[@]" )
		52	_fs_procfs=( "$_fs_std[@]" )
		53	_fs_msdos=(
47	'shortnames[]'	54	'shortnames[]'
48	'longnames[]'	55	'longnames[]'
49	'nowin95[]'	56	'nowin95[]'
Lines 57-63 Link Here
57	;;	64	;;
58	esac	65	esac
59	fi	66	fi
60	@@ -682,7 +688,7 @@ if [[ "$service" = mount ]]; then	67	@@ -682,7 +690,7 @@ if [[ "$service" = mount ]]; then
61	deffs=hsfs	68	deffs=hsfs
62	typeops=-F	69	typeops=-F
63	;;	70	;;
Lines 66-72 Link Here
66	args=( -s	73	args=( -s
67	'(:)-a[mount all filesystems in fstab]'	74	'(:)-a[mount all filesystems in fstab]'
68	'-d[cause everything to be done except for the actual system call]'	75	'-d[cause everything to be done except for the actual system call]'
69	@@ -757,7 +763,7 @@ else	76	@@ -757,7 +765,7 @@ else
70	'*:dev or dir:->udevordir'	77	'*:dev or dir:->udevordir'
71	)	78	)
72	;;	79	;;
Lines 75-81 Link Here
75	args=(	82	args=(
76	'(*)-a[unmount all mounted file systems]'	83	'(*)-a[unmount all mounted file systems]'
77	'-A[unmount all mounted file systems except the root]'	84	'-A[unmount all mounted file systems except the root]'
78	@@ -819,7 +825,28 @@ devordir)	85	@@ -819,7 +827,28 @@ devordir)
79	fi	86	fi
80		87
81	case "$OSTYPE" in	88	case "$OSTYPE" in
Lines 105-111 Link Here
105	while read mline; do	112	while read mline; do
106	case $mline[(w)1] in	113	case $mline[(w)1] in
107	\#* )	114	\#* )
108	@@ -833,6 +860,16 @@ devordir)	115	@@ -833,6 +862,16 @@ devordir)
109	;;	116	;;
110	esac	117	esac
111	done < /etc/fstab	118	done < /etc/fstab
Lines 122-128 Link Here
122		129
123	_alternative \	130	_alternative \
124	'hosts:host:_hosts -S :' \	131	'hosts:host:_hosts -S :' \
125	@@ -859,6 +896,12 @@ udevordir)	132	@@ -859,6 +898,12 @@ udevordir)
126	dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )	133	dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
127	mp_tmp=( "${(@)${(@)tmp#* }%% *}" )	134	mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
128	;;	135	;;