[arch-commits] Commit in ftjam/trunk (PKGBUILD license.txt)

[Eric Bélanger]

    Date: Sunday, September 4, 2011 @ 14:48:29
  Author: eric
Revision: 136987

upgpkg: ftjam 2.5.3rc2-3

Rebuild against latest toolchain, Remove conflicts and replaces arrays, Clean up PKGBUILD

Modified:
  ftjam/trunk/PKGBUILD
  ftjam/trunk/license.txt

-------------+
 PKGBUILD    |   21 ++++++++++-----------
 license.txt |    1 -
 2 files changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-04 17:03:38 UTC (rev 136986)
+++ PKGBUILD	2011-09-04 18:48:29 UTC (rev 136987)
@@ -4,27 +4,26 @@
 
 pkgname=ftjam
 pkgver=2.5.3rc2
-pkgrel=2
+pkgrel=3
 pkgdesc='FT Jam - an enhanced version of the Jam build tool'
 arch=('i686' 'x86_64')
 url="http://freetype.org/jam/"
 license=('custom')
 depends=('glibc')
 provides=('jam')
-conflicts=('jam')
-replaces=('jam')
 #source=(http://downloads.sourceforge.net/freetype/$pkgname-$pkgver.tar.bz2 \
-source=(http://david.freetype.org/jam/${pkgname}-${pkgver}.tar.bz2
-        license.txt)
+source=(http://david.freetype.org/jam/${pkgname}-${pkgver}.tar.bz2 license.txt)
 md5sums=('911cc4191b3e7213905d107962b4529b'
-         '2addc259114b4f50a870fa04881e1200')
+         'ef8ff7da77fe60e25d1e3e740600f1f0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+}
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
 }

Modified: license.txt
===================================================================
--- license.txt	2011-09-04 17:03:38 UTC (rev 136986)
+++ license.txt	2011-09-04 18:48:29 UTC (rev 136987)
@@ -5,4 +5,3 @@
 are clearly marked.
 
 ALL WARRANTIES ARE HEREBY DISCLAIMED.
-           
\ No newline at end of file