aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrozin <grozin@32389bae-6d03-0410-99cf-db05cde120eb>2008-04-29 19:06:22 +0000
committergrozin <grozin@32389bae-6d03-0410-99cf-db05cde120eb>2008-04-29 19:06:22 +0000
commitbcf8d4018fab0a1258f8d48c1e0047828c9ebc28 (patch)
treeb180d14ba088d8d92346010e3d0b83b3c6fd75ef /app-office/texmacs/files
parentCall eautoreconf in every required directory by hand as AC_CONFIG_SUBDIRS isn... (diff)
downloadsci-bcf8d4018fab0a1258f8d48c1e0047828c9ebc28.tar.gz
sci-bcf8d4018fab0a1258f8d48c1e0047828c9ebc28.tar.bz2
sci-bcf8d4018fab0a1258f8d48c1e0047828c9ebc28.zip
maxima-5.15.0 and related stuff
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1031 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'app-office/texmacs/files')
-rw-r--r--app-office/texmacs/files/texmacs-1.0.6.14-r1.patch (renamed from app-office/texmacs/files/texmacs-1.0.6.14.patch)55
-rw-r--r--app-office/texmacs/files/texmacs-maxima-5.14.0.patch24
2 files changed, 26 insertions, 53 deletions
diff --git a/app-office/texmacs/files/texmacs-1.0.6.14.patch b/app-office/texmacs/files/texmacs-1.0.6.14-r1.patch
index 50c1355f9..1372cda9e 100644
--- a/app-office/texmacs/files/texmacs-1.0.6.14.patch
+++ b/app-office/texmacs/files/texmacs-1.0.6.14-r1.patch
@@ -1,38 +1,34 @@
-diff --recursive -U2 TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect
+diff -U2 --recursive TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect
--- TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect 2008-03-19 23:16:36.000000000 +0600
-+++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect 2008-03-22 10:12:13.000000000 +0600
-@@ -37,4 +37,30 @@
++++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect 2008-04-30 09:18:08.000000000 +0700
+@@ -37,4 +37,26 @@
}
+# maximum version
+V1=0; V2=0; V3=0
+
+max_ver() {
-+ if [ -z "$1" ]; then
-+ return
-+ fi
-+
-+ if [ $1 -gt $V1 ]
-+ then V1=$1; V2=$2; V3=$3
-+ elif [ $1 -eq $V1 ]
-+ then
-+ if [ $2 -gt $V2 ]
-+ then V2=$2; V3=$3
-+ elif [ $2 -eq $V2 ]
++ while [ -n "$1" ]; do
++ if [ $1 -gt $V1 ]
++ then V1=$1; V2=$2; V3=$3
++ elif [ $1 -eq $V1 ]
+ then
-+ if [ $3 -gt $V3 ]
-+ then V3=$3
++ if [ $2 -gt $V2 ]
++ then V2=$2; V3=$3
++ elif [ $2 -eq $V2 ]
++ then
++ if [ $3 -gt $V3 ]
++ then V3=$3
++ fi
+ fi
+ fi
-+ fi
-+
-+ shift; shift; shift
-+ max_ver $@
++ shift; shift; shift
++ done
+}
+
if [ $OSTYPE = "cygwin" ] ; then EXT='.bat'; else EXT=''; fi
MAXIMA=`which maxima$EXT 2>/dev/null`
-@@ -57,16 +83,28 @@
+@@ -57,16 +79,28 @@
if [ "$1" ]
then
- if $MAXIMA --list-avail | grep -F "version 5.9.1
@@ -65,27 +61,28 @@ diff --recursive -U2 TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect
+ if [ $GOOD = yes ]
then
- # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14
-+ # 5.9.1 or later
- maxima -d | grep -F 'maxima-htmldir=' | sed -e \
+- maxima -d | grep -F 'maxima-htmldir=' | sed -e \
- 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
-+ 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
++ # 5.9.1 or later
++ maxima -d | grep -F 'maxima-htmldir=' |\
++ sed -e 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
else
# 5.9.0
-@@ -74,6 +112,9 @@
+@@ -74,6 +108,9 @@
fi
else
- maxima --list-avail | sed -e '1d' -e 's/version /"/' \
- -e 's/, lisp / /' -e 's/$/"/' -e '2s/^/(/' -e '$s/$/)/'
+ echo '('
+ maxima --list-avail |\
-+ grep '^version [a-z0-9\.]\+, lisp [a-z]\+$' |\
-+ sed -e 's/^version \([a-z0-9\.]\+\), lisp \([a-z]\+\)$/"\1 \2"/'
++ grep '^version [a-z0-9\.]\+, lisp [a-zA-Z0-9]\+$' |\
++ sed -e 's/^version \([a-z0-9\.]\+\), lisp \([a-zA_Z0-9]\+\)$/"\1 \2"/'
+ echo ')'
fi
else
-diff --recursive -U2 TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima
+diff -U2 --recursive TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima
--- TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/tm_maxima 2008-03-19 23:16:36.000000000 +0600
-+++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima 2008-03-22 10:12:13.000000000 +0600
++++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima 2008-04-30 09:15:19.000000000 +0700
@@ -5,4 +5,5 @@
case $1 in
diff --git a/app-office/texmacs/files/texmacs-maxima-5.14.0.patch b/app-office/texmacs/files/texmacs-maxima-5.14.0.patch
deleted file mode 100644
index 0281cf9bf..000000000
--- a/app-office/texmacs/files/texmacs-maxima-5.14.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -U2 --recursive TeXmacs-1.0.6.12-src-orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6.12-src/plugins/maxima/bin/maxima_detect
---- TeXmacs-1.0.6.12-src-orig/plugins/maxima/bin/maxima_detect 2007-11-05 15:21:32.000000000 +0600
-+++ TeXmacs-1.0.6.12-src/plugins/maxima/bin/maxima_detect 2008-01-09 04:43:10.000000000 +0600
-@@ -63,7 +63,8 @@
- version 5.11
- version 5.12
--version 5.13" >/dev/null
-+version 5.13
-+version 5.14" >/dev/null
- then
-- # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13
-+ # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14
- maxima -d | grep -F 'maxima-htmldir=' | sed -e \
- 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
-diff -U2 --recursive TeXmacs-1.0.6.12-src-orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6.12-src/plugins/maxima/bin/tm_maxima
---- TeXmacs-1.0.6.12-src-orig/plugins/maxima/bin/tm_maxima 2007-11-05 15:21:32.000000000 +0600
-+++ TeXmacs-1.0.6.12-src/plugins/maxima/bin/tm_maxima 2008-01-09 04:43:10.000000000 +0600
-@@ -18,5 +18,5 @@
- 5.9.1.1* | 5.9.2* | 5.9.3*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";;
- 5.10.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.10.0.lisp";;
-- 5.11.* | 5.12.* | 5.13.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
-+ 5.11.* | 5.12.* | 5.13.* | 5.14.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
- cygwin)
- exec maxima.bat -p "`echo $TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp|cygpath --windows -f -`";;