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

[Allan McRae]

    Date: Tuesday, September 13, 2011 @ 00:14:57
  Author: allan
Revision: 137950

upgpkg: font-bh-ttf 1.0.1-2

rebuild of old package, only update system font cache

Modified:
  font-bh-ttf/trunk/PKGBUILD
  font-bh-ttf/trunk/xfonts.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-13 03:04:32 UTC (rev 137949)
+++ PKGBUILD	2011-09-13 04:14:57 UTC (rev 137950)
@@ -3,9 +3,9 @@
 
 pkgname=font-bh-ttf
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Luxi Truetype fonts"
-arch=(any)
+arch=('any')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
@@ -16,11 +16,14 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
-      --with-mapfiles=/usr/share/fonts/util \
-      --with-fontdir=/usr/share/fonts/TTF || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --with-fontdir=/usr/share/fonts/TTF
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   rm "${pkgdir}/usr/share/fonts/"*/fonts.*
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }

Modified: xfonts.install
===================================================================
--- xfonts.install	2011-09-13 03:04:32 UTC (rev 137949)
+++ xfonts.install	2011-09-13 04:14:57 UTC (rev 137950)
@@ -1,6 +1,6 @@
 post_install() {
   echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
+  fc-cache -f -s > /dev/null
   mkfontscale /usr/share/fonts/TTF
   mkfontdir /usr/share/fonts/TTF
   echo "done."