1 files changed, 43 insertions, 22 deletions
diff --git a/abs/core/fontconfig/PKGBUILD b/abs/core/fontconfig/PKGBUILD
index ff2130a..f698618 100644
--- a/abs/core/fontconfig/PKGBUILD
+++ b/abs/core/fontconfig/PKGBUILD
@@ -1,35 +1,56 @@
-# $Id: PKGBUILD 59983 2009-11-29 20:25:27Z jgc $
+# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+
 pkgname=fontconfig
-pkgver=2.8.0
-pkgrel=1
+pkgver=2.10.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
-        29-replace-bitmap-fonts.conf
-        30-urw-aliases.patch)
-md5sums=('77e15a92006ddc2adbb06f840d591c0e'
-         'f6b67e8cc79197ed6abd4701911e83da'
-         '51bc6cb633b50f3c28793361738aac5b')
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
+        29-replace-bitmap-fonts.conf)
+md5sums=('c94e380eea42f2f23ca9537035ef1899'
+         'f6b67e8cc79197ed6abd4701911e83da')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/30-urw-aliases.patch" || return 1
-  # 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
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
+  libtoolize -f
+  autoreconf -f
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-templatedir=/etc/fonts/conf.avail \
+    --with-xmldir=/etc/fonts \
+    --localstatedir=/var \
+    --disable-static \
+    --with-default-fonts=/usr/share/fonts \
+    --with-add-fonts=/usr/share/fonts
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # not upstream, not in FC and not in Gentoo, this should probably go upstream
+  # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back
+  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
+  pushd $pkgdir/etc/fonts/conf.d
+  ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf .
+  popd
 
   #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"
 }