[arch-commits] Commit in gnuplot/repos (10 files)
Eric Bélanger
eric at nymeria.archlinux.org
Thu Mar 21 20:41:26 UTC 2013
Date: Thursday, March 21, 2013 @ 21:41:25
Author: eric
Revision: 180427
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnuplot/repos/extra-i686/PKGBUILD
(from rev 180426, gnuplot/trunk/PKGBUILD)
gnuplot/repos/extra-i686/gnuplot-doc2texi-el.patch
(from rev 180426, gnuplot/trunk/gnuplot-doc2texi-el.patch)
gnuplot/repos/extra-i686/gnuplot.install
(from rev 180426, gnuplot/trunk/gnuplot.install)
gnuplot/repos/extra-x86_64/PKGBUILD
(from rev 180426, gnuplot/trunk/PKGBUILD)
gnuplot/repos/extra-x86_64/gnuplot-doc2texi-el.patch
(from rev 180426, gnuplot/trunk/gnuplot-doc2texi-el.patch)
gnuplot/repos/extra-x86_64/gnuplot.install
(from rev 180426, gnuplot/trunk/gnuplot.install)
Deleted:
gnuplot/repos/extra-i686/PKGBUILD
gnuplot/repos/extra-i686/gnuplot.install
gnuplot/repos/extra-x86_64/PKGBUILD
gnuplot/repos/extra-x86_64/gnuplot.install
----------------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++++++++
/gnuplot.install | 70 +++++++++++++++++++++
extra-i686/PKGBUILD | 53 ----------------
extra-i686/gnuplot-doc2texi-el.patch | 13 ++++
extra-i686/gnuplot.install | 35 ----------
extra-x86_64/PKGBUILD | 53 ----------------
extra-x86_64/gnuplot-doc2texi-el.patch | 13 ++++
extra-x86_64/gnuplot.install | 35 ----------
8 files changed, 196 insertions(+), 176 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-03-21 20:40:38 UTC (rev 180426)
+++ extra-i686/PKGBUILD 2013-03-21 20:41:25 UTC (rev 180427)
@@ -1,53 +0,0 @@
-# $Id$
-# 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.6.1
-pkgrel=2
-pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others"
-arch=('i686' 'x86_64')
-url="http://www.gnuplot.info"
-license=('custom')
-depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua')
-makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
-install=gnuplot.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('1ea21a628223159b0297ae65fe8293afd5aab3c0')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- # fix default source location; use the GDFONTPATH variable to modify at runtime
- sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
-
- sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
- -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
- src/variable.c
-
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --libexecdir=/usr/bin \
- --with-gihdir=/usr/share/gnuplot \
- --datadir=/usr/share \
- --with-readline=gnu \
- --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot
- make pkglibexecdir=/usr/bin
-}
-
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr libexecdir=$pkgdir/usr/bin \
- mandir=$pkgdir/usr/share/man \
- infodir=$pkgdir/usr/share/info \
- pkglibexecdir=$pkgdir/usr/bin \
- GIHDIR=$pkgdir/usr/share/gnuplot \
- datadir=$pkgdir/usr/share install
-
- install -Dm644 lisp/dotemacs $pkgdir/usr/share/emacs/site-lisp/dotemacs
- install -Dm644 Copyright $pkgdir/usr/share/licenses/$pkgname/Copyright
-
- rm -f $pkgdir/usr/share/texmf-dist/ls-R
-}
Copied: gnuplot/repos/extra-i686/PKGBUILD (from rev 180426, gnuplot/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-03-21 20:41:25 UTC (rev 180427)
@@ -0,0 +1,50 @@
+# $Id$
+# 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.6.2
+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=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua')
+makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
+options=('!makeflags')
+install=gnuplot.install
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+ gnuplot-doc2texi-el.patch)
+sha1sums=('88748d4bc9bd41ba8a267a35b6e5b7427cd997cd'
+ '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix default source location; use the GDFONTPATH variable to modify at runtime
+ sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
+
+ sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
+ -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
+ src/variable.c
+
+ (cd docs; patch -p0 -i "$srcdir/gnuplot-doc2texi-el.patch")
+
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/bin \
+ --with-gihdir=/usr/share/gnuplot \
+ --with-readline=gnu
+ make
+}
+
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install
+
+ install -Dm644 lisp/dotemacs "$pkgdir/usr/share/emacs/site-lisp/dotemacs"
+ install -Dm644 Copyright "$pkgdir/usr/share/licenses/$pkgname/Copyright"
+
+ rm -f "$pkgdir/usr/share/texmf-dist/ls-R"
+}
Copied: gnuplot/repos/extra-i686/gnuplot-doc2texi-el.patch (from rev 180426, gnuplot/trunk/gnuplot-doc2texi-el.patch)
===================================================================
--- extra-i686/gnuplot-doc2texi-el.patch (rev 0)
+++ extra-i686/gnuplot-doc2texi-el.patch 2013-03-21 20:41:25 UTC (rev 180427)
@@ -0,0 +1,13 @@
+Index: doc2texi.el
+===================================================================
+RCS file: /cvsroot/gnuplot/gnuplot/docs/doc2texi.el,v
+retrieving revision 1.32
+diff -r1.32 doc2texi.el
+518c518
+< (replace-match (concat "4 " node) nil nil))
+---
+> (replace-match (concat "3 " node) nil nil))
+521c521
+< (replace-match "5 " nil nil))
+---
+> (replace-match "4 " nil nil))
Deleted: extra-i686/gnuplot.install
===================================================================
--- extra-i686/gnuplot.install 2013-03-21 20:40:38 UTC (rev 180426)
+++ extra-i686/gnuplot.install 2013-03-21 20:41:25 UTC (rev 180427)
@@ -1,35 +0,0 @@
-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.
-EOF
-
- if [ -f /usr/bin/mktexlsr ]; then
- echo "Updating TeX tree..."
- mktexlsr
- fi
-
-for f in ${info_files[@]}; do
- install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for f in ${info_files[@]}; do
- install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
- done
-}
-
-post_remove() {
- if [ -f /usr/bin/mktexlsr ]; then
- echo "Updating TeX tree..."
- mktexlsr
- fi
-}
-
Copied: gnuplot/repos/extra-i686/gnuplot.install (from rev 180426, gnuplot/trunk/gnuplot.install)
===================================================================
--- extra-i686/gnuplot.install (rev 0)
+++ extra-i686/gnuplot.install 2013-03-21 20:41:25 UTC (rev 180427)
@@ -0,0 +1,35 @@
+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.
+EOF
+
+ if [ -f /usr/bin/mktexlsr ]; then
+ echo "Updating TeX tree..."
+ mktexlsr
+ fi
+
+for f in ${info_files[@]}; do
+ install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for f in ${info_files[@]}; do
+ install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
+
+post_remove() {
+ if [ -f /usr/bin/mktexlsr ]; then
+ echo "Updating TeX tree..."
+ mktexlsr
+ fi
+}
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-03-21 20:40:38 UTC (rev 180426)
+++ extra-x86_64/PKGBUILD 2013-03-21 20:41:25 UTC (rev 180427)
@@ -1,53 +0,0 @@
-# $Id$
-# 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.6.1
-pkgrel=2
-pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others"
-arch=('i686' 'x86_64')
-url="http://www.gnuplot.info"
-license=('custom')
-depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua')
-makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
-install=gnuplot.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('1ea21a628223159b0297ae65fe8293afd5aab3c0')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- # fix default source location; use the GDFONTPATH variable to modify at runtime
- sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
-
- sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
- -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
- src/variable.c
-
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --libexecdir=/usr/bin \
- --with-gihdir=/usr/share/gnuplot \
- --datadir=/usr/share \
- --with-readline=gnu \
- --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot
- make pkglibexecdir=/usr/bin
-}
-
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make prefix=$pkgdir/usr libexecdir=$pkgdir/usr/bin \
- mandir=$pkgdir/usr/share/man \
- infodir=$pkgdir/usr/share/info \
- pkglibexecdir=$pkgdir/usr/bin \
- GIHDIR=$pkgdir/usr/share/gnuplot \
- datadir=$pkgdir/usr/share install
-
- install -Dm644 lisp/dotemacs $pkgdir/usr/share/emacs/site-lisp/dotemacs
- install -Dm644 Copyright $pkgdir/usr/share/licenses/$pkgname/Copyright
-
- rm -f $pkgdir/usr/share/texmf-dist/ls-R
-}
Copied: gnuplot/repos/extra-x86_64/PKGBUILD (from rev 180426, gnuplot/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-03-21 20:41:25 UTC (rev 180427)
@@ -0,0 +1,50 @@
+# $Id$
+# 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.6.2
+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=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua')
+makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
+options=('!makeflags')
+install=gnuplot.install
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+ gnuplot-doc2texi-el.patch)
+sha1sums=('88748d4bc9bd41ba8a267a35b6e5b7427cd997cd'
+ '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # fix default source location; use the GDFONTPATH variable to modify at runtime
+ sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
+
+ sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
+ -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
+ src/variable.c
+
+ (cd docs; patch -p0 -i "$srcdir/gnuplot-doc2texi-el.patch")
+
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/bin \
+ --with-gihdir=/usr/share/gnuplot \
+ --with-readline=gnu
+ make
+}
+
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install
+
+ install -Dm644 lisp/dotemacs "$pkgdir/usr/share/emacs/site-lisp/dotemacs"
+ install -Dm644 Copyright "$pkgdir/usr/share/licenses/$pkgname/Copyright"
+
+ rm -f "$pkgdir/usr/share/texmf-dist/ls-R"
+}
Copied: gnuplot/repos/extra-x86_64/gnuplot-doc2texi-el.patch (from rev 180426, gnuplot/trunk/gnuplot-doc2texi-el.patch)
===================================================================
--- extra-x86_64/gnuplot-doc2texi-el.patch (rev 0)
+++ extra-x86_64/gnuplot-doc2texi-el.patch 2013-03-21 20:41:25 UTC (rev 180427)
@@ -0,0 +1,13 @@
+Index: doc2texi.el
+===================================================================
+RCS file: /cvsroot/gnuplot/gnuplot/docs/doc2texi.el,v
+retrieving revision 1.32
+diff -r1.32 doc2texi.el
+518c518
+< (replace-match (concat "4 " node) nil nil))
+---
+> (replace-match (concat "3 " node) nil nil))
+521c521
+< (replace-match "5 " nil nil))
+---
+> (replace-match "4 " nil nil))
Deleted: extra-x86_64/gnuplot.install
===================================================================
--- extra-x86_64/gnuplot.install 2013-03-21 20:40:38 UTC (rev 180426)
+++ extra-x86_64/gnuplot.install 2013-03-21 20:41:25 UTC (rev 180427)
@@ -1,35 +0,0 @@
-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.
-EOF
-
- if [ -f /usr/bin/mktexlsr ]; then
- echo "Updating TeX tree..."
- mktexlsr
- fi
-
-for f in ${info_files[@]}; do
- install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for f in ${info_files[@]}; do
- install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
- done
-}
-
-post_remove() {
- if [ -f /usr/bin/mktexlsr ]; then
- echo "Updating TeX tree..."
- mktexlsr
- fi
-}
-
Copied: gnuplot/repos/extra-x86_64/gnuplot.install (from rev 180426, gnuplot/trunk/gnuplot.install)
===================================================================
--- extra-x86_64/gnuplot.install (rev 0)
+++ extra-x86_64/gnuplot.install 2013-03-21 20:41:25 UTC (rev 180427)
@@ -0,0 +1,35 @@
+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.
+EOF
+
+ if [ -f /usr/bin/mktexlsr ]; then
+ echo "Updating TeX tree..."
+ mktexlsr
+ fi
+
+for f in ${info_files[@]}; do
+ install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for f in ${info_files[@]}; do
+ install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
+
+post_remove() {
+ if [ -f /usr/bin/mktexlsr ]; then
+ echo "Updating TeX tree..."
+ mktexlsr
+ fi
+}
+
More information about the arch-commits
mailing list