From f8162555c34f8d8a1e5806018449f0c9a1ec3d81 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 6 Aug 2012 21:20:22 -0500
Subject: fontconfig 2.8

---
 abs/core/fontconfig/PKGBUILD | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/abs/core/fontconfig/PKGBUILD b/abs/core/fontconfig/PKGBUILD
index ff2130a..7f6a2ca 100644
--- a/abs/core/fontconfig/PKGBUILD
+++ b/abs/core/fontconfig/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 59983 2009-11-29 20:25:27Z jgc $
+# $Id: PKGBUILD 150857 2012-02-23 13:01:06Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=fontconfig
 pkgver=2.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
 url="http://www.fontconfig.org/release/"
 license=('custom')
-depends=('expat>=2.0.1' 'freetype2>=2.3.11')
+depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/${pkgname}-${pkgver}.tar.gz
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
         29-replace-bitmap-fonts.conf
         30-urw-aliases.patch)
 md5sums=('77e15a92006ddc2adbb06f840d591c0e'
@@ -18,18 +18,22 @@ md5sums=('77e15a92006ddc2adbb06f840d591c0e'
          '51bc6cb633b50f3c28793361738aac5b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/30-urw-aliases.patch" || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/30-urw-aliases.patch"
   # enable Position Independent Code for prelinking
-  export CFLAGS="${CFLAGS} -fPIC"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m644 "${srcdir}/29-replace-bitmap-fonts.conf" \
-      "${pkgdir}/etc/fonts/conf.avail" || return 1
-  rm -f ${pkgdir}/etc/fonts/conf.d/*.conf
+  export CFLAGS="$CFLAGS -fPIC"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" \
+      "$pkgdir/etc/fonts/conf.avail"
+  rm -f "$pkgdir"/etc/fonts/conf.d/*.conf
 
   #Install license
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
 }
-- 
cgit v0.12