[arch-commits] Commit in gdb/repos (3 files)

[Allan McRae]

    Date: Wednesday, October 7, 2009 @ 10:35:52
  Author: allan
Revision: 54259

Merged revisions 13990,54257 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gdb/trunk

........
  r13990 | eric | 2008-10-01 11:05:27 +1000 (Wed, 01 Oct 2008) | 1 line
  
  added texinfo depends
........
  r54257 | allan | 2009-10-08 00:29:15 +1000 (Thu, 08 Oct 2009) | 2 lines
  
  upgpkg: gdb 7.0-1
      upstream update
........

Modified:
  gdb/repos/extra-x86_64/	(properties)
  gdb/repos/extra-x86_64/PKGBUILD
  gdb/repos/extra-x86_64/gdb.install

-------------+
 PKGBUILD    |   30 ++++++++++++++++--------------
 gdb.install |    4 ++--
 2 files changed, 18 insertions(+), 16 deletions(-)


Property changes on: gdb/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gdb/trunk:1-10674
   + /gdb/trunk:1-54258

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-07 14:30:17 UTC (rev 54258)
+++ extra-x86_64/PKGBUILD	2009-10-07 14:35:52 UTC (rev 54259)
@@ -1,27 +1,29 @@
 # $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
+
 pkgname=gdb
-pkgver=6.8
-pkgrel=3
+pkgver=7.0
+pkgrel=1
 pkgdesc="The GNU Debugger"
-arch=(i686 x86_64)
-url="http://sources.redhat.com/gdb/"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/gdb/"
+license=('GPL3')
 depends=('ncurses' 'expat')
+makedepends=('texinfo')
 options=('!libtool')
-license=('GPL3')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('c9da266b884fb8fa54df786dfaadbc7a')
+md5sums=('3386a7b69c010785c920ffc1e9cb890a')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-nls --mandir=/usr/share/man \
-      --infodir=/usr/share/info
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-nls
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  rm -f ${pkgdir}/usr/share/info/dir
+  make DESTDIR=${pkgdir} install || return 1
+
   # resolve conflicts with binutils
-  rm -f ${startdir}/pkg/usr/include/{bfd,dis-asm,symcat,ansidecl,bfdlink}.h
-  rm -f ${startdir}/pkg/usr/lib/{libiberty,libbfd,libopcodes}.a
-  rm -f ${startdir}/pkg/usr/share/info/{bfd.info,configure.info,standards.info}
+  rm -f ${pkgdir}/usr/include/{bfd,dis-asm,symcat,ansidecl,bfdlink}.h
+  rm -f ${pkgdir}/usr/lib/{libiberty,libbfd,libopcodes}.a
+  rm -f ${pkgdir}/usr/share/info/{bfd.info,configure.info,standards.info}
 }

Modified: extra-x86_64/gdb.install
===================================================================
--- extra-x86_64/gdb.install	2009-10-07 14:30:17 UTC (rev 54258)
+++ extra-x86_64/gdb.install	2009-10-07 14:35:52 UTC (rev 54259)
@@ -3,7 +3,7 @@
 
 post_install() {
   for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -13,6 +13,6 @@
 
 pre_remove() {
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }