[arch-commits] Commit in gnuplot/repos (10 files)
Ronald van Haren
ronald at archlinux.org
Sat Mar 31 08:57:52 UTC 2012
Date: Saturday, March 31, 2012 @ 04:57:52
Author: ronald
Revision: 154928
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnuplot/repos/extra-i686/PKGBUILD
(from rev 154927, gnuplot/trunk/PKGBUILD)
gnuplot/repos/extra-i686/gnuplot.install
(from rev 154927, gnuplot/trunk/gnuplot.install)
gnuplot/repos/extra-x86_64/PKGBUILD
(from rev 154927, gnuplot/trunk/PKGBUILD)
gnuplot/repos/extra-x86_64/gnuplot.install
(from rev 154927, gnuplot/trunk/gnuplot.install)
Deleted:
gnuplot/repos/extra-i686/PKGBUILD
gnuplot/repos/extra-i686/gnuplot.install
gnuplot/repos/extra-i686/lua_tikz.patch
gnuplot/repos/extra-x86_64/PKGBUILD
gnuplot/repos/extra-x86_64/gnuplot.install
gnuplot/repos/extra-x86_64/lua_tikz.patch
------------------------------+
extra-i686/PKGBUILD | 111 +++++++++++++++++++----------------------
extra-i686/gnuplot.install | 70 ++++++++++++-------------
extra-i686/lua_tikz.patch | 10 ---
extra-x86_64/PKGBUILD | 111 +++++++++++++++++++----------------------
extra-x86_64/gnuplot.install | 70 ++++++++++++-------------
extra-x86_64/lua_tikz.patch | 10 ---
6 files changed, 176 insertions(+), 206 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-03-31 08:57:16 UTC (rev 154927)
+++ extra-i686/PKGBUILD 2012-03-31 08:57:52 UTC (rev 154928)
@@ -1,58 +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.4.4
-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"
- "lua_tikz.patch")
-sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31'
- 'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- # upstram patch to fix lua/tikz terminal
- patch -Np0 -i ${srcdir}/lua_tikz.patch
-
- # 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 154927, gnuplot/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-31 08:57:52 UTC (rev 154928)
@@ -0,0 +1,53 @@
+# $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.0
+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')
+install=gnuplot.install
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2')
+
+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
+}
Deleted: extra-i686/gnuplot.install
===================================================================
--- extra-i686/gnuplot.install 2012-03-31 08:57:16 UTC (rev 154927)
+++ extra-i686/gnuplot.install 2012-03-31 08:57:52 UTC (rev 154928)
@@ -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 154927, gnuplot/trunk/gnuplot.install)
===================================================================
--- extra-i686/gnuplot.install (rev 0)
+++ extra-i686/gnuplot.install 2012-03-31 08:57:52 UTC (rev 154928)
@@ -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-i686/lua_tikz.patch
===================================================================
--- extra-i686/lua_tikz.patch 2012-03-31 08:57:16 UTC (rev 154927)
+++ extra-i686/lua_tikz.patch 2012-03-31 08:57:52 UTC (rev 154928)
@@ -1,10 +0,0 @@
---- term/lua/gnuplot-tikz-444.lua Sun Nov 13 00:57:15 2011
-+++ term/lua/gnuplot-tikz.lua Fri Nov 25 01:11:38 2011
-@@ -251,6 +251,7 @@
- gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))
- gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",
- term.gp_version, term.gp_patchlevel,
-+ _VERSION,
- string.sub(term.lua_term_revision,7,-3),
- pgf.REVISION,os.date()))
- if font ~= "" then
\ No newline at end of file
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-03-31 08:57:16 UTC (rev 154927)
+++ extra-x86_64/PKGBUILD 2012-03-31 08:57:52 UTC (rev 154928)
@@ -1,58 +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.4.4
-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"
- "lua_tikz.patch")
-sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31'
- 'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- # upstram patch to fix lua/tikz terminal
- patch -Np0 -i ${srcdir}/lua_tikz.patch
-
- # 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 154927, gnuplot/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-31 08:57:52 UTC (rev 154928)
@@ -0,0 +1,53 @@
+# $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.0
+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')
+install=gnuplot.install
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2')
+
+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
+}
Deleted: extra-x86_64/gnuplot.install
===================================================================
--- extra-x86_64/gnuplot.install 2012-03-31 08:57:16 UTC (rev 154927)
+++ extra-x86_64/gnuplot.install 2012-03-31 08:57:52 UTC (rev 154928)
@@ -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 154927, gnuplot/trunk/gnuplot.install)
===================================================================
--- extra-x86_64/gnuplot.install (rev 0)
+++ extra-x86_64/gnuplot.install 2012-03-31 08:57:52 UTC (rev 154928)
@@ -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/lua_tikz.patch
===================================================================
--- extra-x86_64/lua_tikz.patch 2012-03-31 08:57:16 UTC (rev 154927)
+++ extra-x86_64/lua_tikz.patch 2012-03-31 08:57:52 UTC (rev 154928)
@@ -1,10 +0,0 @@
---- term/lua/gnuplot-tikz-444.lua Sun Nov 13 00:57:15 2011
-+++ term/lua/gnuplot-tikz.lua Fri Nov 25 01:11:38 2011
-@@ -251,6 +251,7 @@
- gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))
- gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",
- term.gp_version, term.gp_patchlevel,
-+ _VERSION,
- string.sub(term.lua_term_revision,7,-3),
- pgf.REVISION,os.date()))
- if font ~= "" then
\ No newline at end of file
More information about the arch-commits
mailing list