From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 15 03:30:05 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D1111065672 for ; Tue, 15 Dec 2009 03:30:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 067EC8FC1B for ; Tue, 15 Dec 2009 03:30:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nBF3U4Gk043932 for ; Tue, 15 Dec 2009 03:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nBF3U4cC043929; Tue, 15 Dec 2009 03:30:04 GMT (envelope-from gnats) Resent-Date: Tue, 15 Dec 2009 03:30:04 GMT Resent-Message-Id: <200912150330.nBF3U4cC043929@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Sean C. Farley" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77E2210656A3; Tue, 15 Dec 2009 03:23:19 +0000 (UTC) (envelope-from sean-freebsd@farley.org) Received: from mail.farley.org (mail.farley.org [IPv6:2001:470:1f0f:20:2::11]) by mx1.freebsd.org (Postfix) with ESMTP id 2C0B38FC19; Tue, 15 Dec 2009 03:23:19 +0000 (UTC) Received: from thor.farley.org (root@thor.farley.org [IPv6:2001:470:1f0f:20:1::5]) by mail.farley.org (8.14.3/8.14.3) with ESMTP id nBF3NH7A029897; Mon, 14 Dec 2009 21:23:17 -0600 (CST) (envelope-from sean-freebsd@mail.farley.org) Received: from thor.farley.org (localhost [127.0.0.1]) by thor.farley.org (8.14.3/8.14.3) with ESMTP id nBF3NHPu037248; Mon, 14 Dec 2009 21:23:17 -0600 (CST) (envelope-from sean-freebsd@thor.farley.org) Received: (from root@localhost) by thor.farley.org (8.14.3/8.14.3/Submit) id nBF3NHUP037247; Mon, 14 Dec 2009 21:23:17 -0600 (CST) (envelope-from sean-freebsd) Message-Id: <200912150323.nBF3NHUP037247@thor.farley.org> Date: Mon, 14 Dec 2009 21:23:17 -0600 (CST) From: "Sean C. Farley" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: des@FreeBSD.org Subject: ports/141472: [PATCH] shells/zsh: add linsysfs to (u)mount -t completion X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2009 03:30:05 -0000 >Number: 141472 >Category: ports >Synopsis: [PATCH] shells/zsh: add linsysfs to (u)mount -t completion >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Dec 15 03:30:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sean C. Farley >Release: FreeBSD 8.0-STABLE amd64 >Organization: >Environment: System: FreeBSD thor.farley.org 8.0-STABLE FreeBSD 8.0-STABLE #1 r200414: Fri Dec 11 12:58:51 CST >Description: This adds linsysfs to the list of file system types available to mount and umount when completing after a '-t' on the command-line. Removed a few warnings output by portlint concerning whitespace and use of echo in the Makefile. Please double-check my choice of ECHO_MSG as opposed to ECHO_CMD. Port maintainer (des@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- zsh-4.3.10_2.patch begins here --- 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) + ;; --- zsh-4.3.10_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: