[arch-commits] Commit in gnuplot/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Ronald van Haren]

    Date: Friday, September 19, 2008 @ 07:32:30
  Author: ronald
Revision: 12742

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

........
  r12741 | ronald | 2008-09-19 13:31:30 +0200 (Fri, 19 Sep 2008) | 1 line
  
  upgpkg: gnuplot 4.2.3-3
........

Modified:
  gnuplot/repos/extra-x86_64/	(properties)
  gnuplot/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


Property changes on: gnuplot/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gnuplot/trunk:1-9756
   + /gnuplot/trunk:1-12741

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-19 11:31:30 UTC (rev 12741)
+++ extra-x86_64/PKGBUILD	2008-09-19 11:32:30 UTC (rev 12742)
@@ -1,22 +1,23 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=gnuplot
 pkgver=4.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others"
 arch=('i686' 'x86_64')
 url="http://www.gnuplot.info"
 license=('custom')
-depends=('libpng' 'libx11' 'gd' 'wxgtk' 'ncurses>=5.6-7')
-makedepends=('texinfo')
+depends=('gd' 'wxgtk' 'cairo')
+makedepends=('texinfo' 'emacs')
 install=gnuplot.install
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('6b6d22662df5101b308c465a722c43ce')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --mandir=/usr/share/man \
               --infodir=/usr/share/info \
               --libexecdir=/usr/bin \
@@ -32,11 +33,10 @@
        TEXMFLOCAL=$startdir/pkg/usr/share/texmf-dist \
        datadir=$startdir/pkg/usr/share install
 
-  install -D -m644 lisp/dotemacs $startdir/pkg/usr/share/emacs/site-lisp/dotemacs
-  install -D -m644 Copyright $startdir/pkg/usr/share/licenses/$pkgname/Copyright
+  install -Dm644 lisp/dotemacs $pkgdir/usr/share/emacs/site-lisp/dotemacs || return 1
+  install -Dm644 Copyright $pkgdir/usr/share/licenses/$pkgname/Copyright || return 1
 
   rm -f $startdir/pkg/usr/share/texmf-dist/ls-R
-  rm -f $pkgdir/usr/share/info/dir
 }