Thu Jul 17 03:55:04 UTC 2014

5 files changed, 56 insertions, 58 deletions

diff --git a/core/diffutils/PKGBUILD b/core/diffutils/PKGBUILD
index 0ed2f9049..04430dc81 100644
--- a/core/diffutils/PKGBUILD
+++ b/core/diffutils/PKGBUILD
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD 180850 2013-03-27 01:10:49Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 216930 2014-07-16 17:04:50Z seblu $
+# Mainainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=diffutils
 pkgver=3.3
-pkgrel=1
-pkgdesc="Utility programs used for creating patch files"
+pkgrel=2
+pkgdesc='Utility programs used for creating patch files'
 arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/diffutils"
+url='http://www.gnu.org/software/diffutils'
 license=('GPL3')
 groups=('base')
-depends=('glibc' 'sh')
+depends=('glibc' 'bash')
 install=diffutils.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
 md5sums=('99180208ec2a82ce71f55b0d7389f1b3'
          '203a2f2101dfcc09cdac655be353fd78')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD
index 5d7b9f06a..5d352ba5a 100644
--- a/core/patch/PKGBUILD
+++ b/core/patch/PKGBUILD
@@ -1,43 +1,46 @@
-# $Id: PKGBUILD 174021 2013-01-01 15:15:16Z foutrelis $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 216931 2014-07-16 17:04:51Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=patch
 pkgver=2.7.1
-pkgrel=2
-pkgdesc="A utility to apply patch files to original sources"
+pkgrel=3
+pkgdesc='A utility to apply patch files to original sources'
 arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/patch/patch.html"
+url='http://www.gnu.org/software/patch/patch.html'
 license=('GPL')
 groups=('base-devel')
-depends=('glibc')
+depends=('glibc' 'attr')
 makedepends=('ed')
 optdepends=('ed: for patch -e functionality')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        patch-2.7.1-initialize-data-structures-early-enough.patch)
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+        'patch-2.7.1-initialize-data-structures-early-enough.patch')
 md5sums=('e9ae5393426d3ad783a300a338c09b72'
-         'b12189e0de3cb2af25268441647ec517'
+         'SKIP'
          'dc6367a7cd49933d4006c246789e98da')
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
+prepare() {
   # Fix segfault on non-numeric strip-count
   # (also segfaults on nonexistent directory passed to -d)
   # http://savannah.gnu.org/bugs/?37500
-  patch -Np1 -i \
-    $srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch
+  patch -Np1 -d $pkgname-$pkgver < patch-2.7.1-initialize-data-structures-early-enough.patch
+}
 
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/patch/patch-2.6.1-get-arg.patch b/core/patch/patch-2.6.1-get-arg.patch
deleted file mode 100644
index 45f3bc8a5..000000000
--- a/core/patch/patch-2.6.1-get-arg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c
---- patch-2.6.1/src/patch.c.get-arg	2010-07-27 18:05:26.217150510 +0100
-+++ patch-2.6.1/src/patch.c	2010-07-27 18:05:47.464150892 +0100
-@@ -558,7 +558,7 @@ static struct option const longopts[] =
-   {"remove-empty-files", no_argument, NULL, 'E'},
-   {"force", no_argument, NULL, 'f'},
-   {"fuzz", required_argument, NULL, 'F'},
--  {"get", no_argument, NULL, 'g'},
-+  {"get", required_argument, NULL, 'g'},
-   {"input", required_argument, NULL, 'i'},
-   {"ignore-whitespace", no_argument, NULL, 'l'},
- #ifdef ENABLE_MERGE
diff --git a/core/which/PKGBUILD b/core/which/PKGBUILD
index 481f51316..64f240be0 100644
--- a/core/which/PKGBUILD
+++ b/core/which/PKGBUILD
@@ -1,27 +1,31 @@
-# $Id: PKGBUILD 176251 2013-01-28 00:29:29Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 216932 2014-07-16 17:04:52Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=which
 pkgver=2.20
-pkgrel=6
-pkgdesc="A utility to show the full path of commands"
+pkgrel=7
+pkgdesc='A utility to show the full path of commands'
 arch=('i686' 'x86_64')
-url="http://www.xs4all.nl/~carlo17/which"
+url='http://savannah.gnu.org/projects/which'
 license=('GPL3')
 groups=('base' 'base-devel')
-depends=('glibc' 'sh')
+depends=('glibc' 'bash')
 install=which.install
-source=(http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('95be0501a466e515422cde4af46b2744')
+source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('95be0501a466e515422cde4af46b2744'
+         'SKIP')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/which/which.install b/core/which/which.install
index 167e2506e..fdc5accba 100644
--- a/core/which/which.install
+++ b/core/which/which.install
@@ -2,19 +2,19 @@ infodir=/usr/share/info
 filelist=(which.info)
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file.gz" "$infodir/dir" 2>/dev/null
   done
 }
 
 post_upgrade() {
-  post_install $1
+  post_install "$1"
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info --delete "$infodir/$file" "$infodir/dir" 2>/dev/null
   done
 }