[arch-commits] Commit in ddd/repos (4 files)

[Eric Bélanger]

    Date: Tuesday, November 11, 2008 @ 22:44:50
  Author: eric
Revision: 18942

Merged revisions 18941 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/ddd/trunk

........
  r18941 | eric | 2008-11-11 22:44:19 -0500 (Tue, 11 Nov 2008) | 2 lines
  
  upgpkg: ddd 3.3.11-5
      Rebuilt against libxaw 1.0.5 (close FS#12074), Added info file support, Added ChangeLog
........

Added:
  ddd/repos/extra-x86_64/ChangeLog
    (from rev 18941, ddd/trunk/ChangeLog)
Modified:
  ddd/repos/extra-x86_64/	(properties)
  ddd/repos/extra-x86_64/PKGBUILD
  ddd/repos/extra-x86_64/ddd.install

-------------+
 ChangeLog   |    6 ++++++
 PKGBUILD    |   17 ++++++++++-------
 ddd.install |   23 +++++++++++------------
 3 files changed, 27 insertions(+), 19 deletions(-)


Property changes on: ddd/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /ddd/trunk:1-9512
   + /ddd/trunk:1-18941

Copied: ddd/repos/extra-x86_64/ChangeLog (from rev 18941, ddd/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2008-11-12 03:44:50 UTC (rev 18942)
@@ -0,0 +1,6 @@
+2008-11-11  Eric Belanger  <eric at archlinux.org>
+
+	* ddd 3.3.11-5
+	* Rebuilt against libxaw 1.0.5 (close FS#12074)
+	* Added info file support
+	* Added ChangeLog

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-12 03:44:19 UTC (rev 18941)
+++ extra-x86_64/PKGBUILD	2008-11-12 03:44:50 UTC (rev 18942)
@@ -4,20 +4,23 @@
 
 pkgname=ddd
 pkgver=3.3.11
-pkgrel=4
+pkgrel=5
 pkgdesc="A graphical front-end for command-line debuggers such as GDB, JDB, pydb, perl debugger..."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/ddd/"
 license=('GPL' 'LGPL')
-depends=('ncurses' 'lesstif' 'libxaw' 'libelf' 'libxext')
+depends=('gcc-libs' 'ncurses' 'lesstif' 'libxaw>=1.0.5' 'libelf' 'libxext')
+optdepends=('gdb: to use the Gnu debugger' 'jdk: to use the Java debugger' 'pydb: to use the Python debugger' 'perl: to use the Perl debugger')
 install=$pkgname.install
-source=(http://ftp.gnu.org/gnu/ddd/$pkgname-$pkgver.tar.gz)
+source=(http://ftp.gnu.org/gnu/ddd/${pkgname}-${pkgver}.tar.gz)
 md5sums=('f19437ebfdb5f2667d6de30f700dd319')
+sha1sums=('c302c37bdcccaad22e235177f5962dec424b1de3')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  rm ${pkgdir}/usr/share/info/dir
+  make DESTDIR=${pkgdir} install || return 1
+  rm ${pkgdir}/usr/share/info/dir || return 1
+  gzip ${pkgdir}/usr/share/info/* || return 1
 }

Modified: extra-x86_64/ddd.install
===================================================================
--- extra-x86_64/ddd.install	2008-11-12 03:44:19 UTC (rev 18941)
+++ extra-x86_64/ddd.install	2008-11-12 03:44:50 UTC (rev 18942)
@@ -1,19 +1,18 @@
+infodir=/usr/share/info
+filelist=(ddd.info-6.gz ddd.info.gz ddd.info-3.gz ddd.info-1.gz ddd.info-9.gz ddd-themes.info-2.gz ddd.info-4.gz ddd.info-8.gz ddd-themes.info-1.gz ddd.info-11.gz ddd.info-5.gz ddd-themes.info.gz ddd.info-10.gz ddd-themes.info-3.gz ddd.info-2.gz ddd.info-7.gz)
+
 post_install() {
-cat << EOF
-==> To use ddd, a command-line debugger is required.
-==> To use a specific debugger, see man page. 
-==> Available debuggers are:
-==> Gnu debugger: pacman -S gdb
-==> Java debugger: pacman -S jdk
-==> Python debugger: pacman -S pydb
-==> Perl debugger: pacman -S perl
-EOF
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
 }
 
 post_upgrade() {
   post_install $1
 }
 
-op=$1
-shift
-$op $*
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}