[arch-commits] Commit in xorg-font-utils/repos (extra-x86_64 extra-x86_64/PKGBUILD)

Jan de Groot jgc at archlinux.org
Fri Sep 4 18:05:07 UTC 2009


    Date: Friday, September 4, 2009 @ 14:05:07
  Author: jgc
Revision: 51067

Merged revisions 51065 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-font-utils/trunk

........
  r51065 | jgc | 2009-09-04 20:04:53 +0200 (Fri, 04 Sep 2009) | 2 lines
  
  upgpkg: xorg-font-utils 7.4-3
      Update font-util
........

Modified:
  xorg-font-utils/repos/extra-x86_64/	(properties)
  xorg-font-utils/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   52 ++++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 24 deletions(-)


Property changes on: xorg-font-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-font-utils/trunk:1-36703
   + /xorg-font-utils/trunk:1-51065

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-04 18:04:59 UTC (rev 51066)
+++ extra-x86_64/PKGBUILD	2009-09-04 18:05:07 UTC (rev 51067)
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-font-utils
 pkgver=7.4
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org font utilities"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -18,14 +18,18 @@
         ${url}/releases/individual/app/fonttosfnt-1.0.4.tar.bz2
         ${url}/releases/individual/app/mkfontdir-1.0.4.tar.bz2
         ${url}/releases/individual/app/mkfontscale-1.0.6.tar.bz2
-        ${url}/releases/individual/font/font-util-1.0.1.tar.bz2
-	http://people.redhat.com/yshao/ttmkfdir2.20021109.tar.bz2
-	ttmkfdir.patch
-	gcc-4.3.patch)
-md5sums=('9685fab33d39954ab8a0d22e0969d5a4' '07607b26fce3bdc2b204ff3bc43d3ac3'\
-         '35394bf3f746a57fba624dba52fdbba3' '0d0752af232054b720febcc1b2fd6c57'\
-         'b81535f78fe05732931f02841e5ca37b' '79e0401393c9728865aa73bb2bd68dd4'\
-         '099278628ad63631e872bc5590bade74' '92ef5f77a467cc188f8dec87b0fdb664')
+        ${url}/releases/individual/font/font-util-1.0.2.tar.bz2
+        http://people.redhat.com/yshao/ttmkfdir2.20021109.tar.bz2
+        ttmkfdir.patch
+        gcc-4.3.patch)
+md5sums=('9685fab33d39954ab8a0d22e0969d5a4'
+         '07607b26fce3bdc2b204ff3bc43d3ac3'
+         '35394bf3f746a57fba624dba52fdbba3'
+         '0d0752af232054b720febcc1b2fd6c57'
+         'fe5a7df765d297623663477edce70b7c'
+         '79e0401393c9728865aa73bb2bd68dd4'
+         '099278628ad63631e872bc5590bade74'
+         '92ef5f77a467cc188f8dec87b0fdb664')
 
 build() {
   cd "${srcdir}"
@@ -33,21 +37,21 @@
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-        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 || 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
+      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 || 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




More information about the arch-commits mailing list