[arch-commits] Commit in xorg-fonts-type1/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Sunday, July 6, 2008 @ 16:58:41
  Author: jgc
Revision: 4417

Merged revisions 2-4416 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xorg-fonts-type1/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r4404 | jgc | 2008-07-06 20:43:30 +0000 (Sun, 06 Jul 2008) | 1 line
  
  upgpkg: xorg-fonts-type1 7.3-1
........

Modified:
  xorg-fonts-type1/repos/extra-x86_64/	(properties)
  xorg-fonts-type1/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)


Property changes on: xorg-fonts-type1/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-fonts-type1/trunk:1
   + /xorg-fonts-type1/trunk:1-4416

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-06 20:56:40 UTC (rev 4416)
+++ extra-x86_64/PKGBUILD	2008-07-06 20:58:41 UTC (rev 4417)
@@ -2,10 +2,11 @@
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-fonts-type1
-pkgver=1.0.1
+pkgver=7.3
 pkgrel=1
 pkgdesc="X.org Type1 fonts"
 arch=(i686 x86_64)
+license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
 install=xfonts.install
@@ -13,22 +14,24 @@
         ${url}/releases/individual/font/font-bh-type1-1.0.0.tar.bz2
         ${url}/releases/individual/font/font-bitstream-type1-1.0.0.tar.bz2
         ${url}/releases/individual/font/font-ibm-type1-1.0.0.tar.bz2
-        ${url}/releases/individual/font/font-xfree86-type1-1.0.0.tar.bz2)
+        ${url}/releases/individual/font/font-xfree86-type1-1.0.1.tar.bz2)
 md5sums=('aa7ff4bd20b961afda9c15d103b972a5' '46588b22678e440741d6220bc3945cbf'\
          '6610475e2e231242f8f2122a709c3695' '8e8733051371e2b51123376b49f5d3ea'\
-         'e66f36a6d68203cc4cf7b56ebbb192dd')
+         'd7e965776c7f0c30b0f09742176fb77a')
 
 build() {
   cd ${startdir}/src
-  for dir in font-*-type1-1.0.0 font-*-type1-1.0.1; do
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  for dir in font-*-type1-1.?.?; do
     pushd ${dir}
       ./configure --prefix=/usr \
                   --with-mapfiles=/usr/share/fonts/util \
 		  --with-fontdir=/usr/share/fonts/Type1
       make || return 1
       make DESTDIR=${startdir}/pkg install || return 1
+      lic=`echo $dir | awk -F '-' '{ print $2 }'`
+      install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/${lic}
     popd
   done
   rm -f ${startdir}/pkg/usr/share/fonts/Type1/fonts.*
 }
-