2 files changed, 18 insertions, 28 deletions
diff --git a/abs/core/xorg-fonts-encodings/PKGBUILD b/abs/core/xorg-fonts-encodings/PKGBUILD
index c465a74..992e3ac 100644
--- a/abs/core/xorg-fonts-encodings/PKGBUILD
+++ b/abs/core/xorg-fonts-encodings/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 57486 2009-10-31 18:28:17Z jgc $
+# $Id: PKGBUILD 152267 2012-03-06 08:39:49Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-fonts-encodings
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=3
 pkgdesc="X.org font encoding files"
 arch=(any)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('xorg-font-utils')
-install=xorg-fonts-encodings.install
+makedepends=('xorg-mkfontscale' 'xorg-util-macros' 'xorg-font-util')
+groups=('xorg-fonts' 'xorg')
+options=(!makeflags)
 source=(${url}/releases/individual/font/encodings-${pkgver}.tar.bz2)
-md5sums=('29637480e7ce12546668631067c19ced')
+sha1sums=('24ace2470403f85a0d393769204029bd8247992a')
 
 build() {
   cd "${srcdir}/encodings-${pkgver}"
-  ./configure --prefix=/usr \
-      --with-encodingsdir=/usr/share/fonts/encodings || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
 }
+
 package() {
   cd "${srcdir}/encodings-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
+  # regenerate encodngs file not to include non-compressed versions
+  cd $pkgdir/usr/share/fonts/encodings/large
+  mkfontscale -b -s -l -n -r -p /usr/share/fonts/encodings/large -e . .
+  cd $pkgdir/usr/share/fonts/encodings/
+  mkfontscale -b -s -l -n -r -p /usr/share/fonts/encodings -e . -e large .
 }
diff --git a/abs/core/xorg-fonts-encodings/xorg-fonts-encodings.install b/abs/core/xorg-fonts-encodings/xorg-fonts-encodings.install
deleted file mode 100644
index 37eac40..0000000
--- a/abs/core/xorg-fonts-encodings/xorg-fonts-encodings.install
+++ /dev/null
@@ -1,16 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo -n "Regenerating font encodings... "
-  pushd usr/share/fonts/encodings &>/dev/null
-  mkfontscale -n -e "/usr/share/fonts/encodings" -e "/usr/share/fonts/encodings/large"
-  popd &>/dev/null
-  echo "done."
-}
-
-post_upgrade() {
-  post_install
-}
-
-op=$1
-shift
-$op $*