Pull in upstream fix for bug 1289597. Brought to our attention by Kevin

Neaton in joyent/pkgsrc#471. Bump PKGREVISION.
jsonn · Mar 14, 2017 · 87061d5 · 87061d5
1 parent dd0f1dd
commit 87061d5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2013/05/10 12:04:00 imil Exp $
+# $NetBSD: Makefile,v 1.9 2017/03/14 14:51:28 jperkin Exp $
 #
 # Note to packagers:
 # packages installing additional completion files should drop
 # them into ${DESTDIR}${PREFIX}/share/bash-completion.d
 # with the name of the package as file name.
 
 DISTNAME=	bash-completion-2.1
+PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	http://bash-completion.alioth.debian.org/files/
 

diff --git a/shells/bash-completion/distinfo b/shells/bash-completion/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/02 23:00:34 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/03/14 14:51:28 jperkin Exp $
 
 SHA1 (bash-completion-2.1.tar.gz) = fad16b1cdae2b40d6814f786990e0e50ab2d537a
 RMD160 (bash-completion-2.1.tar.gz) = a2d42658f2f6a77563614a4a733c95c57bb42cfc
 SHA512 (bash-completion-2.1.tar.gz) = f123b76dd14ca41d8f7f9ca50c11a4cffb5dc82908533820a023d4f76106f3aa879f293786a0d99c0ac0b31cf53e776341c16dbabdb2bb53c1c032b014ad5abf
 Size (bash-completion-2.1.tar.gz) = 341139 bytes
-SHA1 (patch-bash__completion) = 6edb8da01fe6252cc2fabb397736e32c00e5a1a6
+SHA1 (patch-bash__completion) = 2ed0ae51e241b8ca6c7b1a68cede69109cddfe5e
 SHA1 (patch-completions_man) = 336d45f3567c6e69736e5cd41230874cdcb0ca56
diff --git a/shells/bash-completion/patches/patch-bash__completion b/shells/bash-completion/patches/patch-bash__completion
@@ -1,9 +1,19 @@
-$NetBSD: patch-bash__completion,v 1.1 2013/05/10 12:01:51 imil Exp $
+$NetBSD: patch-bash__completion,v 1.2 2017/03/14 14:51:28 jperkin Exp $
 
 Added pkgsrc and pkg_install completions
+Pull in upstream fix for bug 1289597.
 
 --- bash_completion.orig	2013-04-05 10:55:51.000000000 +0000
 +++ bash_completion
+@@ -707,7 +707,7 @@ _init_completion()
+         fi
+     done
+
+-    [[ $cword -eq 0 ]] && return 1
++    [[ $cword -le 0 ]] && return 1
+     prev=${words[cword-1]}
+
+     [[ ${split-} ]] && _split_longopt && split=true
 @@ -1365,6 +1365,34 @@ _terms()
      extract patch configure build install reinstall deinstall clean
      clean-depends kernel buildworld' make