From 02289ff862bbb5c5ddec0473085046156d3a849a Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sat, 9 May 2015 16:19:22 -0500
Subject: xorg-fonts-100dpi-1.0.3-2.parabola2: rebuild

---
 libre/xorg-fonts-100dpi/PKGBUILD       | 28 ++++++++++++++++++----------
 libre/xorg-fonts-100dpi/xfonts.install |  2 +-
 2 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'libre/xorg-fonts-100dpi')

diff --git a/libre/xorg-fonts-100dpi/PKGBUILD b/libre/xorg-fonts-100dpi/PKGBUILD
index f4a3d5226..cce9f6a75 100644
--- a/libre/xorg-fonts-100dpi/PKGBUILD
+++ b/libre/xorg-fonts-100dpi/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
 pkgname=xorg-fonts-100dpi
 pkgver=1.0.3
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc="X.org 100dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
@@ -16,24 +16,32 @@ replaces=('xorg-fonts-100dpi-libre')
 install=xfonts.install
 source=(${url}/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2
         ${url}/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2)
+md5sums=('1347c3031b74c9e91dc4dfa53b12f143'
+         '6b223a54b15ecbd5a1bc52312ad790d8')
 
 build() {
   cd "${srcdir}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-
   for dir in font-*-100dpi*; do
     if [ -d "${dir}" ]; then
       pushd ${dir}
       ./configure --prefix=/usr \
           --with-fontdir=/usr/share/fonts/100dpi
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-  
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" || return 1
+      make
       popd
     fi
   done
-  rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.*
 }
-md5sums=('1347c3031b74c9e91dc4dfa53b12f143'
-         '6b223a54b15ecbd5a1bc52312ad790d8')
+
+package() {
+  cd "${srcdir}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  for dir in font-*-100dpi*; do
+    if [ -d "${dir}" ]; then
+      pushd ${dir}
+      make DESTDIR="${pkgdir}" install
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}"
+      popd
+    fi
+  done
+  rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.*
+}
\ No newline at end of file
diff --git a/libre/xorg-fonts-100dpi/xfonts.install b/libre/xorg-fonts-100dpi/xfonts.install
index 5c5e8a2b4..d8fac18a8 100644
--- a/libre/xorg-fonts-100dpi/xfonts.install
+++ b/libre/xorg-fonts-100dpi/xfonts.install
@@ -1,6 +1,6 @@
 post_install() {
   echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
+  fc-cache -s
   mkfontscale /usr/share/fonts/100dpi
   mkfontdir /usr/share/fonts/100dpi
   echo "done."
-- 
cgit v1.2.3