[arch-commits] Commit in font-misc-ethiopic (4 files)

[Jan de Groot]

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

Switch to any architecture

Modified:
  font-misc-ethiopic/trunk/PKGBUILD
  font-misc-ethiopic/trunk/xfonts.install
Deleted:
  font-misc-ethiopic/repos/extra-i686/
  font-misc-ethiopic/repos/extra-x86_64/

----------------+
 PKGBUILD       |   29 +++++++++++++++++------------
 xfonts.install |    9 ++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2009-08-16 19:25:18 UTC (rev 49869)
+++ trunk/PKGBUILD	2009-08-16 19:25:19 UTC (rev 49870)
@@ -4,24 +4,29 @@
 
 pkgname=font-misc-ethiopic
 pkgver=1.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org Misc Ethiopic fonts"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://xorg.freedesktop.org/"
 license=('MIT')
 depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
 install=xfonts.install
-source=(http://xorg.freedesktop.org/releases/individual/font/${pkgname}-${pkgver}.tar.bz2 LICENSE)
-md5sums=('0b271fc617087d77560bdca20c0cdbb0' '059abd0312fb05b4ae583a5d0b8df49e')
-sha1sums=('d598b873ea897574b86167a36b4c151f84d22d68' '1015aac496f1270a076b07e021f3e2ec8fbe028a')
+source=(http://xorg.freedesktop.org/releases/individual/font/${pkgname}-${pkgver}.tar.bz2
+        LICENSE)
+md5sums=('0b271fc617087d77560bdca20c0cdbb0'
+         '059abd0312fb05b4ae583a5d0b8df49e')
+sha1sums=('d598b873ea897574b86167a36b4c151f84d22d68'
+          '1015aac496f1270a076b07e021f3e2ec8fbe028a')
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
-              --with-mapfiles=/usr/share/fonts/util \
-	      --with-ttf-fontdir=/usr/share/fonts/TTF \
-	      --with-otf-fontdir=/usr/share/fonts/OTF
+      --with-mapfiles=/usr/share/fonts/util \
+      --with-ttf-fontdir=/usr/share/fonts/TTF \
+      --with-otf-fontdir=/usr/share/fonts/OTF || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  rm -f ${startdir}/pkg/usr/share/fonts/*/fonts.*
-  install -D -m644 ../LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE
+  make DESTDIR="${pkgdir}" install || return 1
+  rm -f "${pkgdir}/usr/share/fonts"/*/fonts.*
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }

Modified: trunk/xfonts.install
===================================================================
--- trunk/xfonts.install	2009-08-16 19:25:18 UTC (rev 49869)
+++ trunk/xfonts.install	2009-08-16 19:25:19 UTC (rev 49870)
@@ -7,14 +7,9 @@
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  post_install $1
+  post_install
 }
-
-op=$1
-shift
-
-$op $*