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

[Jan de Groot]

    Date: Tuesday, August 18, 2009 @ 05:03:53
  Author: jgc
Revision: 49983

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

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sat, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r49906 | jgc | 2009-08-16 22:46:24 +0200 (Sun, 16 Aug 2009) | 1 line
  
  upgpkg: gcombust 0.1.55-4
........

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

----------+
 PKGBUILD |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-18 09:02:05 UTC (rev 49982)
+++ extra-i686/PKGBUILD	2009-08-18 09:03:53 UTC (rev 49983)
@@ -4,20 +4,23 @@
 
 pkgname=gcombust
 pkgver=0.1.55
-pkgrel=3
-arch=(i686)
+pkgrel=4
+arch=(i686 x86_64)
 license=('GPL')
 pkgdesc="gtk+ frontend for mkisofs, mkhybrid, cdrecord, and cdlabelgen"
-url="http://www.abo.fi/~jmunsin/gcombust/"
+url="http://users.abo.fi/jmunsin/gcombust/"
 depends=('gtk' 'cdrkit' 'cdlabelgen')
-source=(http://www.abo.fi/~jmunsin/gcombust/${pkgname}-${pkgver}.tar.gz
+options=(!makeflags)
+source=(http://users.abo.fi/jmunsin/gcombust/${pkgname}-${pkgver}.tar.gz
         gcc4.1-compile.patch)
-md5sums=('25ddecef7f8556f0fac82d9d4927e8eb' 'ef324b9a8c97297ef41127e7053bb726')
+md5sums=('25ddecef7f8556f0fac82d9d4927e8eb'
+         'ef324b9a8c97297ef41127e7053bb726')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/gcc4.1-compile.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/gcc4.1-compile.patch" || return 1
+  cp /usr/share/automake-*/config.{guess,sub} . || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }