xorg-font-utils: update to latest

3 files changed, 48 insertions, 41 deletions

diff --git a/abs/core/xorg-font-utils/PKGBUILD b/abs/core/xorg-font-utils/PKGBUILD
index a97db44..0297214 100644
--- a/abs/core/xorg-font-utils/PKGBUILD
+++ b/abs/core/xorg-font-utils/PKGBUILD
@@ -1,54 +1,58 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 57485 2009-10-31 18:25:03Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
 pkgname=xorg-font-utils
-pkgver=1.0.3
-pkgrel=3
+pkgver=7.5
+pkgrel=2
 pkgdesc="X.Org font utilities"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-options=('!libtool')
-depends=('libxfont' 'libfontenc' 'xproto')
-makedepends=('pkgconfig')
+license=('custom')
+depends=('gcc-libs' 'sh' 'libxfont>=1.4.1' 'libfontenc>=1.0.5' 'xproto>=7.0.15')
+makedepends=('pkgconfig' 'bigreqsproto>=1.1.0')
 replaces=('font-util')
 provides=('font-util')
 conflicts=('font-util')
 install=xorg-font-utils.install
-source=(${url}/releases/individual/app/bdftopcf-1.0.1.tar.bz2
-        ${url}/releases/individual/app/fonttosfnt-1.0.3.tar.bz2
-        ${url}/releases/individual/app/mkfontdir-1.0.3.tar.bz2
-        ${url}/releases/individual/app/mkfontscale-1.0.3.tar.bz2
-        ${url}/releases/individual/font/font-util-1.0.1.tar.bz2
-	http://people.redhat.com/yshao/ttmkfdir2.20021109.tar.bz2
-	ttmkfdir.patch
-	ttmkfdir_gcc43.patch)
+source=(${url}/releases/individual/app/bdftopcf-1.0.2.tar.bz2
+        ${url}/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
+        ${url}/releases/individual/app/mkfontdir-1.0.5.tar.bz2
+        ${url}/releases/individual/app/mkfontscale-1.0.7.tar.bz2
+        ${url}/releases/individual/font/font-util-1.1.1.tar.bz2
+        http://people.redhat.com/yshao/ttmkfdir2.20021109.tar.bz2
+        ttmkfdir.patch
+        gcc-4.3.patch)
+md5sums=('148f20d28caaa69bbe7dcca7c2674fb6'
+         '07607b26fce3bdc2b204ff3bc43d3ac3'
+         '9365ac66d19186eaf030482d312fca06'
+         '96ca346f185c0ab48e42bf5bb0375da5'
+         '5c735ae6916b65186f3c876d76c27ce3'
+         '79e0401393c9728865aa73bb2bd68dd4'
+         '099278628ad63631e872bc5590bade74'
+         '92ef5f77a467cc188f8dec87b0fdb664')
 
 build() {
-  cd ${startdir}/src
+  cd "${srcdir}"
 
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-        if [ "${i}" = "ttmkfdir2" ]; then
-	  patch -Np0 -i ${startdir}/src/ttmkfdir.patch || return 1
-	  patch -Np1 -i ${startdir}/src/ttmkfdir_gcc43.patch || return 1
-	  make || return 1
-	  mkdir -p ${startdir}/pkg/usr/bin
-	  install -m755 ttmkfdir ${startdir}/pkg/usr/bin/ || return 1
-	else
-	  ./configure --prefix=/usr --with-mapdir=/usr/share/fonts/util
-          make || return 1
-          make DESTDIR=${startdir}/pkg install || return 1
-	fi
+      if [ "${i}" = "ttmkfdir2" ]; then
+        patch -Np0 -i "${srcdir}/ttmkfdir.patch" || return 1
+        patch -Np1 -i "${srcdir}/gcc-4.3.patch" || return 1
+        make || return 1
+        install -m755 -d "${pkgdir}/usr/bin"
+        install -m755 ttmkfdir "${pkgdir}/usr/bin/" || return 1
+        install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+        echo "Unknown license" > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.ttmkfdir2" || return 1
+	    else
+        ./configure --prefix=/usr --mandir=/usr/share/man \
+            --with-mapdir=/usr/share/fonts/util --with-fontrootdir=/usr/share/fonts || return 1
+        make || return 1
+        make DESTDIR="${pkgdir}" install || return 1
+        install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*} || return 1
+      fi
       popd
     fi
   done
 }
-md5sums=('9685fab33d39954ab8a0d22e0969d5a4'
-         'b0ebd86029571239b9d7b0c61191b591'
-         '4d0f89a23f77e22f1671a77bf0898955'
-         '1d608771aca9695b828cec1e34178fd1'
-         'b81535f78fe05732931f02841e5ca37b'
-         '79e0401393c9728865aa73bb2bd68dd4'
-         '099278628ad63631e872bc5590bade74'
-	 '43cd6303d38dbbf36ba91d3a08430bb4')
diff --git a/abs/core/xorg-font-utils/gcc-4.3.patch b/abs/core/xorg-font-utils/gcc-4.3.patch
new file mode 100644
index 0000000..817df3a
--- /dev/null
+++ b/abs/core/xorg-font-utils/gcc-4.3.patch
@@ -0,0 +1,8 @@
+--- ttmkfdir2/directory.cpp.orig	2008-12-05 10:45:28.000000000 +0100
++++ ttmkfdir2/directory.cpp	2008-12-05 10:45:38.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <cctype>
++#include <cstring>
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/abs/core/xorg-font-utils/xorg-font-utils.install b/abs/core/xorg-font-utils/xorg-font-utils.install
index a291dc6..067a3a2 100644
--- a/abs/core/xorg-font-utils/xorg-font-utils.install
+++ b/abs/core/xorg-font-utils/xorg-font-utils.install
@@ -1,8 +1,3 @@
-# arg 1:  the new package version
 post_install() {
   ldconfig -r .
 }
-
-op=$1
-shift
-$op $*