Mon Oct 14 00:05:51 PDT 2013

2 files changed, 8 insertions, 35 deletions

diff --git a/extra/fontconfig/29-replace-bitmap-fonts.conf b/extra/fontconfig/29-replace-bitmap-fonts.conf
deleted file mode 100644
index 391ffef94..000000000
--- a/extra/fontconfig/29-replace-bitmap-fonts.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <!-- Prefer Microsoft versions of PostScript fonts, as these typically render a lot better on-screen 
-       30-metric-aliases.conf will then also add the free clones of these fonts -->
-  <alias binding="same">
-    <family>Helvetica</family>
-    <prefer><family>Arial</family></prefer>
-  </alias>
-  <alias binding="same">
-    <family>Times</family>
-    <prefer><family>Times New Roman</family></prefer>
-  </alias>
-  <alias binding="same">
-    <family>Courier</family>
-    <prefer><family>Courier New</family></prefer>
-  </alias>
-</fontconfig>
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index 5d709fcd9..f2b9b1c86 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193795 2013-09-01 09:03:59Z andyrtr $
+# $Id: PKGBUILD 196411 2013-10-13 09:02:29Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.10.95
+pkgver=2.11.0
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
@@ -11,16 +11,14 @@ license=('custom')
 depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-        29-replace-bitmap-fonts.conf)
-sha256sums=('abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b'
-            '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6')
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2)
+sha256sums=('cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467')
 
   # a nice page to test font matching:
   # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
   libtoolize -f
@@ -38,19 +36,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make -k check
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
-  ln -s ../conf.avail/29-replace-bitmap-fonts.conf \
-    "$pkgdir/etc/fonts/conf.d/29-replace-bitmap-fonts.conf"
-
-  #Install license
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }