[arch-commits] CVS update of extra/system/bash-completion (2 files)

[Travis Willard]

    Date: Tuesday, September 18, 2007 @ 00:09:04
  Author: travis
    Path: /home/cvs-extra/extra/system/bash-completion

   Added: readonly_vars.patch (1.1)
Modified: PKGBUILD (1.38 -> 1.39)

upgpkg: bash-completion 20060301-7
Fixes for most recent bash patchlevel


---------------------+
 PKGBUILD            |   18 ++++++++++++------
 readonly_vars.patch |   24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 6 deletions(-)


Index: extra/system/bash-completion/PKGBUILD
diff -u extra/system/bash-completion/PKGBUILD:1.38 extra/system/bash-completion/PKGBUILD:1.39
--- extra/system/bash-completion/PKGBUILD:1.38	Thu May 25 12:02:23 2006
+++ extra/system/bash-completion/PKGBUILD	Tue Sep 18 00:09:03 2007
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD,v 1.38 2006/05/25 16:02:23 aaron Exp $
+# $Id: PKGBUILD,v 1.39 2007/09/18 04:09:03 travis Exp $
 # Maintainer: aurelien <aurelien at archlinux.org>
 # Contributor: Aurelien Foret <orelien at chez.com>
 # ArchLinux support script: Manolis Tzanidakis <mtzanidakis at freemail.gr>
 
 pkgname=bash-completion
 pkgver=20060301
-pkgrel=6
+pkgrel=7
 pkgdesc="Programmable completion indefinitely extends the type of completion built in bash"
 arch=(i686 x86_64)
 url='http://www.caliban.org/bash/'
+license=('GPL')
 depends=('bash')
 source=(http://www.caliban.org/files/bash/$pkgname-$pkgver.tar.gz bash_completion.sh archlinux\
-        archlinux_fixes.patch xine.extra)
-md5sums=('9bca1cf97e8f8c73e3ef560cc9dead21' 'f7386d73b862ae1dd04afb4f1fa1dd3a'\
-         '66f615893de8cdd6b79712432311279e' '3b25ed10950e10a60f3696cdecec9ef1'\
-         '0f11e49170b37deeb0848b7a337d05b3')
+        archlinux_fixes.patch xine.extra readonly_vars.patch)
+md5sums=('9bca1cf97e8f8c73e3ef560cc9dead21'
+         'f7386d73b862ae1dd04afb4f1fa1dd3a'
+         '66f615893de8cdd6b79712432311279e'
+         '3b25ed10950e10a60f3696cdecec9ef1'
+         '0f11e49170b37deeb0848b7a337d05b3'
+         '00bfa3fd00e8ea0d8a22cbb75dd43f12')
 
 build()
 {
   cd $startdir/src/bash_completion
   patch -up1 -i ../archlinux_fixes.patch
+  patch -Np0 -i ../readonly_vars.patch
   install -D -m755 bash_completion $startdir/pkg/etc/bash_completion
   install -D -m755 ../bash_completion.sh $startdir/pkg/etc/profile.d/bash_completion.sh
   mkdir -p $startdir/pkg/etc/bash_completion.d
   install -m644 {contrib/*,../archlinux} $startdir/pkg/etc/bash_completion.d
 }
+
Index: extra/system/bash-completion/readonly_vars.patch
diff -u /dev/null extra/system/bash-completion/readonly_vars.patch:1.1
--- /dev/null	Tue Sep 18 00:09:04 2007
+++ extra/system/bash-completion/readonly_vars.patch	Tue Sep 18 00:09:03 2007
@@ -0,0 +1,24 @@
+--- /etc/bash_completion	2006-05-25 11:59:31.000000000 -0400
++++ bash_completion	2007-09-17 23:39:01.000000000 -0400
+@@ -29,13 +29,17 @@
+ 
+ # Alter the following to reflect the location of this file.
+ #
++(readonly -p | grep " BASH_COMPLETION=" 2>&1 >/dev/null) || 
+ {
+-  # These declarations must go within braces in order to be able to silence
+-  # readonly variable errors.
+   BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}"
++  readonly BASH_COMPLETION
++}
++
++(readonly -p | grep " BASH_COMPLETION_DIR=" 2>&1 >/dev/null) ||
++{
+   BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}"
+-} 2>/dev/null || :
+-readonly BASH_COMPLETION BASH_COMPLETION_DIR
++  readonly BASH_COMPLETION_DIR
++}
+ 
+ # Set a couple of useful vars
+ #