[arch-commits] Commit in pdksh/trunk (PKGBUILD pdksh.install)

[Eric Bélanger]

    Date: Thursday, June 23, 2011 @ 23:30:58
  Author: eric
Revision: 128476

upgpkg: pdksh 5.2.14-6
Rebuilt against latest toolchain, PKGBUILD cleanup

Modified:
  pdksh/trunk/PKGBUILD
  pdksh/trunk/pdksh.install

---------------+
 PKGBUILD      |   26 +++++++++++++++-----------
 pdksh.install |    2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-24 03:12:43 UTC (rev 128475)
+++ PKGBUILD	2011-06-24 03:30:58 UTC (rev 128476)
@@ -4,24 +4,28 @@
 
 pkgname=pdksh
 pkgver=5.2.14
-pkgrel=5
+pkgrel=6
 pkgdesc="A public domain clone of the AT&T Korn shell"
 arch=('i686' 'x86_64')
 url="http://www.cs.mun.ca/~michael/pdksh/"
 license=('custom')
 depends=('glibc')
-install=$pkgname.install
-source=(ftp://ftp.cs.mun.ca/pub/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-$pkgver.patch usr_ksh.sh)
+install=pdksh.install
+#ftp://ftp.cs.mun.ca/pub/$pkgname/$pkgname-$pkgver.tar.gz
+source=(http://www.cs.mun.ca/~michael/pdksh/files/$pkgname-$pkgver.tar.gz pdksh-5.2.14.patch usr_ksh.sh)
 md5sums=('871106b3bd937e1afba9f2ef7c43aef3' 'f11d1e711627d21a547c09e344e30dd3'\
          '56084a657ecafd5dd0813a6056036712')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../$pkgname-$pkgver.patch || return 1
-  ./configure --prefix=/ --mandir=/usr/share/man || return 1
-  make || return 1
-  make prefix=$pkgdir mandir=$pkgdir/usr/share/man/man1 install || return 1
-  install -D -m 755 ${srcdir}/usr_ksh.sh ${pkgdir}/usr/bin/ksh || return 1
-  install -D -m644 LEGAL $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i ../$pkgname-$pkgver.patch
+  ./configure --prefix=/ --mandir=/usr/share/man
+  make
 }
-# vim: ts=2 sw=2 et ft=sh
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make prefix="$pkgdir" mandir="$pkgdir/usr/share/man/man1" install
+  install -D -m 755 "${srcdir}/usr_ksh.sh" "${pkgdir}/usr/bin/ksh"
+  install -D -m644 LEGAL "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Modified: pdksh.install
===================================================================
--- pdksh.install	2011-06-24 03:12:43 UTC (rev 128475)
+++ pdksh.install	2011-06-24 03:30:58 UTC (rev 128476)
@@ -1,5 +1,5 @@
 post_install() {
-  if [ ! "`grep /bin/ksh etc/shells`" ]; then
+  if [ ! "$(grep /bin/ksh etc/shells)" ]; then
     echo "updating /etc/shells... done."
     sed -i "s|/bin/bash|/bin/bash\n/bin/ksh|" etc/shells
   else