[arch-commits] Commit in graphite/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Saturday, September 10, 2011 @ 10:58:39
  Author: pierre
Revision: 137742

upgpkg: graphite 2.3.1-2

rebuild old package; cleanup

Modified:
  graphite/trunk/PKGBUILD

----------+
 PKGBUILD |   35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-10 14:49:04 UTC (rev 137741)
+++ PKGBUILD	2011-09-10 14:58:39 UTC (rev 137742)
@@ -1,39 +1,30 @@
 # $Id$
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 
-# build twice that pango-graphite can pickup the new libgraphite dependency - take care when .so names happen!
-
 pkgbase=graphite
 pkgname=('libgraphite' 'pango-graphite')
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://graphite.sil.org/"
 makedepends=('pango' 'gcc-libs')
 options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz)
+source=("http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz")
 md5sums=('d35724900f6a4105550293686688bbb3')
 
 build() {
   cd "${srcdir}/silgraphite-${pkgver}"
-  pushd engine
-    ./configure --prefix=/usr --disable-static
-  make || return 1
-  popd
-  
-  pushd wrappers/pangographite
   ./configure --prefix=/usr --disable-static
-  make || return 1
-  popd  
+  make
 }
 
 package_libgraphite() {
- pkgdesc="SILGraphite - a \"smart font\" rendering engine - the libs and headers"
- license=('custom_SIL Dual license')
- depends=('gcc-libs')
+  pkgdesc='SILGraphite - a "smart font" rendering engine - the libs and headers'
+  license=('custom_SIL Dual license')
+  depends=('gcc-libs')
 
   cd "${srcdir}/silgraphite-${pkgver}"/engine
-  make DESTDIR="$pkgdir/" install || return 1
+  make DESTDIR="$pkgdir/" install
 
   # licenses
   mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
@@ -41,11 +32,11 @@
 }
 
 package_pango-graphite() {
- pkgdesc="SILGraphite support for pango"
- license=('LGPL')
- depends=('pango' 'libgraphite')
- install=pango-graphite.install
+  pkgdesc="SILGraphite support for pango"
+  license=('LGPL')
+  depends=('pango' 'libgraphite')
+  install=pango-graphite.install
  
   cd "${srcdir}/silgraphite-${pkgver}"/wrappers/pangographite
-  make DESTDIR="$pkgdir/" install || return 1
-}
\ No newline at end of file
+  make DESTDIR="$pkgdir/" install
+}