[arch-commits] Commit in font-bitstream-speedo/trunk (PKGBUILD xfonts.install)

[Jan de Groot]

    Date: Sunday, August 16, 2009 @ 15:19:19
  Author: jgc
Revision: 49865

Switch to -any

Modified:
  font-bitstream-speedo/trunk/PKGBUILD
  font-bitstream-speedo/trunk/xfonts.install

----------------+
 PKGBUILD       |   17 +++++++++--------
 xfonts.install |    9 ++-------
 2 files changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-16 19:15:47 UTC (rev 49864)
+++ PKGBUILD	2009-08-16 19:19:19 UTC (rev 49865)
@@ -4,9 +4,9 @@
 
 pkgname=font-bitstream-speedo
 pkgver=1.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Bitstream Speedo fonts"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
@@ -16,12 +16,13 @@
 sha1sums=('e7d654b7844d3343f15bfb4807253d385fcdda49')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
-              --with-mapfiles=/usr/share/fonts/util \
-	      --with-fontdir=/usr/share/fonts/speedo
+      --with-mapfiles=/usr/share/fonts/util \
+      --with-fontdir=/usr/share/fonts/speedo || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  rm ${startdir}/pkg/usr/share/fonts/*/fonts.*
-  install -D -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+  make DESTDIR="${pkgdir}" install || return 1
+  rm -f "${pkgdir}/usr/share/fonts/speedo"/fonts.*
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }

Modified: xfonts.install
===================================================================
--- xfonts.install	2009-08-16 19:15:47 UTC (rev 49864)
+++ xfonts.install	2009-08-16 19:19:19 UTC (rev 49865)
@@ -7,14 +7,9 @@
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+  post_install
 }
-
-op=$1
-shift
-
-$op $*