Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c783ace129537210d283906e761a2701a4deebd2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c783ace129537210d283906e761a2701a4deebd2)
  • Date: Wed, 22 Aug 2007 15:52:14 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

latex/pgf/DETAILS | 12 ++++++------
latex/pgf/HISTORY | 3 +++
utils/gnuplot/BUILD | 6 ++++++
utils/gnuplot/DEPENDS | 11 ++++++++---
utils/gnuplot/DETAILS | 5 +++++
utils/gnuplot/FINAL | 3 +++
utils/gnuplot/HISTORY | 4 ++++
utils/gnuplot/INSTALL | 6 ++++--
utils/gnuplot/POST_REMOVE | 3 +++
utils/gnuplot/PREPARE | 4 +++-
utils/gnuplot/PRE_BUILD | 9 +++++++++
11 files changed, 54 insertions(+), 12 deletions(-)

New commits:
commit 9715cd0f654beba2a94f9df300edc71de2f147bd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/gnuplot: added optional support for a lua terminal

commit 5bab3957726cd3e242a3a97d2148c59e11e08cc5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

latex/pgf: updated to 1.18

diff --git a/latex/pgf/DETAILS b/latex/pgf/DETAILS
index e31b68c..cc75d71 100755
--- a/latex/pgf/DETAILS
+++ b/latex/pgf/DETAILS
@@ -1,10 +1,10 @@
SPELL=pgf
- VERSION=1.01
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://dfn.dl.sourceforge.net/sourceforge/latex-beamer/${SOURCE}
-
SOURCE_HASH=sha512:9bdc414e0a54bf4cc9a882adc7f19e63286ba13c4caba5ba6f1cec1a9a137b3484c9e867de1251b0148e9725808f98f95f034199d4d26a30bd91b3b5b6a32747
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://latex-beamer.sourceforge.net";
+ VERSION=1.18
+ SOURCE="${SPELL}.zip"
+ SOURCE_URL[0]=$CTAN_URL/graphics/pgf.zip
+
SOURCE_HASH=sha512:aea841e7f8d2652ad9438d9f1105e9a2441ec7fc49227aa285f4c2a681b32582377544913153f2946b1946241180cf03e103a7394624e01d45e58d2f09993fb4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+
WEB_SITE=http://www.ctan.org/tex-archive/help/Catalogue/entries/pgf.html
LICENSE[0]=GPL
GATHER_DOCS="off"
ENTERED=20070427
diff --git a/latex/pgf/HISTORY b/latex/pgf/HISTORY
index 5bbc5bc..ed21d84 100644
--- a/latex/pgf/HISTORY
+++ b/latex/pgf/HISTORY
@@ -1,3 +1,6 @@
+2007-08-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated to 1.18
+
2007-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: GATHER_DOCS=off

diff --git a/utils/gnuplot/BUILD b/utils/gnuplot/BUILD
index f139554..9d7ca3d 100755
--- a/utils/gnuplot/BUILD
+++ b/utils/gnuplot/BUILD
@@ -1,4 +1,10 @@
if [[ $GNUPLOT_SCM == "y" ]]; then
./prepare
fi &&
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ LIBS="-llua $LIBS"
+ cd $SOURCE_DIRECTORY/gnuplot_lua_terminal &&
+ lua gnuplot.lua style &&
+ cd $SOURCE_DIRECTORY
+fi &&
default_build
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index 1cdd743..cc4f4bc 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -19,11 +19,16 @@ optional_depends svgalib \
"--with-linux-vga" \
"--without-linux-vga" \
"Linux SVGA console driver?" &&
-
-optional_depends tetex \
+if [[ $GNUPLOT_LUA == "n" ]]; then
+ optional_depends tetex \
"--with-tutorial" \
"--without-tutorial" \
- "build LaTeX tutorial?" &&
+ "build LaTeX tutorial?"
+else
+ depends tetex &&
+ depends lua &&
+ depends pgf
+fi &&

. $GRIMOIRE/is_depends_enabled.function &&
if is_depends_enabled $SPELL wxgtk; then
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index 2918f0b..a09bed5 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -17,6 +17,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:37656d4aa08782e36c4505e5e815e0801ddc08db7625ee6938012652f098881729a487fd4f9fca11663e4c398675a56f73a52d06d3b91b909ceb238749d61882
fi
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ SOURCE2=${SPELL}_lua_terminal.tgz
+ SOURCE2_URL[0]=http://peter.affenbande.org/$SPELL/$SOURCE2
+ SOURCE2_IGNORE=unversioned
+fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210
LICENSE[0]=PD
diff --git a/utils/gnuplot/FINAL b/utils/gnuplot/FINAL
new file mode 100755
index 0000000..ab6596a
--- /dev/null
+++ b/utils/gnuplot/FINAL
@@ -0,0 +1,3 @@
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ texhash
+fi
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index e8fb7cb..8f018b5 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,7 @@
+2007-08-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, FINAL, INSTALL, POST_REMOVE, PREPARE,
+ PRE_BUILD: added optional support for a lua terminal
+
2007-03-17 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: removed alpha build fix, it's upstream now

diff --git a/utils/gnuplot/INSTALL b/utils/gnuplot/INSTALL
index 0f158d7..d7097b7 100755
--- a/utils/gnuplot/INSTALL
+++ b/utils/gnuplot/INSTALL
@@ -1,2 +1,4 @@
-make install-strip
-
+make install-strip &&
+mkdir -p ${INSTALL_ROOT}/usr/share/texmf/tex/generic/gnuplot-lua-tikz &&
+cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/*.sty \
+ $INSTALL_ROOT/usr/share/texmf/tex/generic/gnuplot-lua-tikz
diff --git a/utils/gnuplot/POST_REMOVE b/utils/gnuplot/POST_REMOVE
new file mode 100755
index 0000000..ab6596a
--- /dev/null
+++ b/utils/gnuplot/POST_REMOVE
@@ -0,0 +1,3 @@
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ texhash
+fi
diff --git a/utils/gnuplot/PREPARE b/utils/gnuplot/PREPARE
index 8f59be9..6528253 100755
--- a/utils/gnuplot/PREPARE
+++ b/utils/gnuplot/PREPARE
@@ -3,5 +3,7 @@ config_query GNUPLOT_SCM "Do you want to use the development
version from CVS?"
if [[ $GNUPLOT_SCM == "y" ]]; then
config_query GNUPLOT_AUTOUPDATE \
"Automatically update on every system update?" n
-fi
+fi &&
+
+config_query GNUPLOT_LUA "Do you want to enable the lua terminal (3rd party
addon)?" n

diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD
new file mode 100755
index 0000000..6c01f68
--- /dev/null
+++ b/utils/gnuplot/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+if [[ $GNUPLOT_LUA == "y" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ unpack_file 2 &&
+ cp $SOURCE_DIRECTORY/gnuplot_lua_terminal/lua.trm \
+ $SOURCE_DIRECTORY/term &&
+ echo '#include "lua.trm"' >> $SOURCE_DIRECTORY/src/term.h &&
+ sedit 's/^LIBS = /LIBS = -llua /' $SOURCE_DIRECTORY/src/Makefile.in
+fi



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c783ace129537210d283906e761a2701a4deebd2), Florian Franzmann, 08/22/2007

Archive powered by MHonArc 2.6.24.

Top of Page