[arch-commits] Commit in cmatrix/repos (3 files)

[Eric Bélanger]

    Date: Saturday, October 3, 2009 @ 15:02:27
  Author: eric
Revision: 53888

Merged revisions 53886 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/cmatrix/trunk

........
  r53886 | eric | 2009-10-03 14:53:50 -0400 (Sat, 03 Oct 2009) | 2 lines
  
  upgpkg: cmatrix 1.2a-5
      added fontconfig depends (close FS#13927), FHS man pages, cleaned up install scriptlet
........

Modified:
  cmatrix/repos/extra-i686/	(properties)
  cmatrix/repos/extra-i686/PKGBUILD
  cmatrix/repos/extra-i686/cmatrix.install

-----------------+
 PKGBUILD        |   18 +++++++++---------
 cmatrix.install |   19 -------------------
 2 files changed, 9 insertions(+), 28 deletions(-)


Property changes on: cmatrix/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /cmatrix/trunk:1-22251
   + /cmatrix/trunk:1-53887

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-03 18:54:48 UTC (rev 53887)
+++ extra-i686/PKGBUILD	2009-10-03 19:02:27 UTC (rev 53888)
@@ -1,27 +1,27 @@
 # $Id$
-# Maintainer: eric <eric at archlinux.org>
 # Contributor: john
 
 pkgname=cmatrix
 pkgver=1.2a
-pkgrel=4
+pkgrel=5
 pkgdesc="Let you see the matrix code in your console"
 arch=('i686' 'x86_64')
 url="http://www.asty.org/cmatrix/"
 license=('GPL')
-depends=('ncurses')
+depends=('ncurses' 'fontconfig')
 install=$pkgname.install
 source=(http://www.asty.org/cmatrix/dist/$pkgname-$pkgver.tar.gz)
 md5sums=('ebfb5733104a258173a9ccf2669968a1')
+sha1sums=('ca078c10322a47e327f07a44c9a42b52eab5ad93')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
   
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install || return 1
   
-  install -Dm644 mtx.pcf $pkgdir/usr/share/fonts/misc/mtx.pcf
-  install -Dm644 matrix.fnt $pkgdir/usr/share/kbd/consolefonts/matrix.fnt
-  install -m644 matrix.psf.gz $pkgdir/usr/share/kbd/consolefonts
+  install -Dm644 mtx.pcf "$pkgdir/usr/share/fonts/misc/mtx.pcf" || return 1
+  install -Dm644 matrix.fnt "$pkgdir/usr/share/kbd/consolefonts/matrix.fnt" || return 1
+  install -m644 matrix.psf.gz "$pkgdir/usr/share/kbd/consolefonts" || return 1
 }

Modified: extra-i686/cmatrix.install
===================================================================
--- extra-i686/cmatrix.install	2009-10-03 18:54:48 UTC (rev 53887)
+++ extra-i686/cmatrix.install	2009-10-03 19:02:27 UTC (rev 53888)
@@ -1,22 +1,3 @@
-# arg 1:  the new package version
 post_install() {
-  /bin/true
   fc-cache
-  echo "The Matrix has you..."
 }
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-
-$op $*