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

[Ronald van Haren]

    Date: Thursday, October 16, 2008 @ 10:47:35
  Author: ronald
Revision: 15648

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

........
  r15647 | ronald | 2008-10-16 16:46:37 +0200 (Thu, 16 Oct 2008) | 1 line
  
  upgpkg: gnuplot 4.2.4-1
........

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

-----------------+
 PKGBUILD        |   43 ++++++++++++++++++++++++-------------------
 gnuplot.install |   16 +++++++++++++---
 2 files changed, 37 insertions(+), 22 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-16 14:46:37 UTC (rev 15647)
+++ extra-x86_64/PKGBUILD	2008-10-16 14:47:35 UTC (rev 15648)
@@ -3,18 +3,18 @@
 # Contributor: damir <damir at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
-pkgname=gnuplot
-pkgver=4.2.3
-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=('gd' 'wxgtk' 'cairo')
-makedepends=('texinfo' 'emacs')
-install=gnuplot.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('6b6d22662df5101b308c465a722c43ce')
+pkgname=gnuplot 
+pkgver=4.2.4 
+pkgrel=1 
+pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
+arch=('i686' 'x86_64') 
+url="http://www.gnuplot.info" 
+license=('custom') 
+depends=('gd' 'wxgtk' 'cairo') 
+makedepends=('texinfo' 'emacs') 
+install=gnuplot.install 
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") 
+md5sums=('3cde3b9232a2d81715bbaf75e1c87ecc')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -25,18 +25,23 @@
               --datadir=/usr/share \
               --with-readline=gnu
   make pkglibexecdir=/usr/bin || return 1
-  make prefix=$startdir/pkg/usr libexecdir=$startdir/pkg/usr/bin \
-       mandir=$startdir/pkg/usr/share/man \
-       infodir=$startdir/pkg/usr/share/info \
-       pkglibexecdir=$startdir/pkg/usr/bin \
-       GIHDIR=$startdir/pkg/usr/share/gnuplot \
-       TEXMFLOCAL=$startdir/pkg/usr/share/texmf-dist \
-       datadir=$startdir/pkg/usr/share install
+  make prefix=$pkgdir/usr libexecdir=$startdir/pkg/usr/bin \
+	 mandir=$startdir/pkg/usr/share/man \
+  	infodir=$startdir/pkg/usr/share/info \
+  	pkglibexecdir=$startdir/pkg/usr/bin \
+  	GIHDIR=$startdir/pkg/usr/share/gnuplot \
+  	TEXMFLOCAL=$startdir/pkg/usr/share/texmf-dist \
+  	datadir=$startdir/pkg/usr/share install || return 1
 
   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
+
+# info file
+  cd $pkgdir/usr/share/info
+  rm -f dir
+  gzip * || return 1
 }
 
 

Modified: extra-x86_64/gnuplot.install
===================================================================
--- extra-x86_64/gnuplot.install	2008-10-16 14:46:37 UTC (rev 15647)
+++ extra-x86_64/gnuplot.install	2008-10-16 14:47:35 UTC (rev 15648)
@@ -1,3 +1,6 @@
+info_dir=/usr/share/info
+info_files=(gnuplot.info)
+
 post_install() {
 cat << EOF
 ==> To add the gnuplot mode in Emacs, add the content of /usr/share/emacs/site-lisp/dotemacs to your ~/.emacs file.
@@ -8,6 +11,11 @@
     mktexlsr
   fi
 
+for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+
+
 }
 
 post_upgrade() {
@@ -19,8 +27,10 @@
     echo "Updating TeX tree..."
     mktexlsr
   fi
+
+ for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+
 }
 
-op=$1
-shift
-$op $*