[arch-commits] Commit in ftjam/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Sunday, August 16, 2009 @ 16:18:01
  Author: jgc
Revision: 49903

Resolve conflict

Modified:
  ftjam/repos/extra-x86_64/	(properties)
  ftjam/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)


Property changes on: ftjam/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ftjam/trunk:1
   + /ftjam/trunk:1-49902

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-16 20:15:08 UTC (rev 49902)
+++ extra-x86_64/PKGBUILD	2009-08-16 20:18:01 UTC (rev 49903)
@@ -4,7 +4,7 @@
 
 pkgname=ftjam
 pkgver=2.5.3rc2
-pkgrel=1
+pkgrel=2
 pkgdesc='FT Jam - an enhanced version of the Jam build tool'
 arch=('i686' 'x86_64')
 url="http://freetype.org/jam/"
@@ -14,15 +14,17 @@
 conflicts=('jam')
 replaces=('jam')
 #source=(http://downloads.sourceforge.net/freetype/$pkgname-$pkgver.tar.bz2 \
-source=(http://david.freetype.org/jam/$pkgname-$pkgver.tar.bz2 \
+source=(http://david.freetype.org/jam/${pkgname}-${pkgver}.tar.bz2
         license.txt)
 md5sums=('911cc4191b3e7213905d107962b4529b'
          '2addc259114b4f50a870fa04881e1200')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 ../license.txt $startdir/pkg/usr/share/licenses/jam/license.txt
+  make DESTDIR="${pkgdir}" install || return 1
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }