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

[Jan de Groot]

    Date: Tuesday, August 18, 2009 @ 05:02:05
  Author: jgc
Revision: 49982

Merged revisions 356,49902 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ftjam/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49902 | jgc | 2009-08-16 22:15:08 +0200 (Sun, 16 Aug 2009) | 2 lines
  
  upgpkg: ftjam 2.5.3rc2-2
      Rebuild to get rid of .FILELIST
........

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

----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-18 08:58:15 UTC (rev 49981)
+++ extra-i686/PKGBUILD	2009-08-18 09:02:05 UTC (rev 49982)
@@ -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
+build() {
+  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
 }