detect maxima-5.15.x, bump rev.

4 files changed, 32 insertions, 4 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 443ac132458..541829577ae 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2008/04/21 20:04:43 drochner Exp $
+# $NetBSD: Makefile,v 1.76 2008/04/22 10:41:04 tnn Exp $
 
 DISTNAME=		TeXmacs-1.0.6.14-src
 PKGNAME=		${DISTNAME:S/-src//}
+PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.texmacs.org/pub/TeXmacs/targz/
 MASTER_SITES+=		http://www.texmacs.org/Download/ftp/targz/
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo
index 9cabb215ad1..7346efee08f 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2008/04/21 20:04:43 drochner Exp $
+$NetBSD: distinfo,v 1.52 2008/04/22 10:41:04 tnn Exp $
 
 SHA1 (TeXmacs-1.0.6.14-src.tar.gz) = bab1a969be883608f5ffbaef9994d6b86c43226e
 RMD160 (TeXmacs-1.0.6.14-src.tar.gz) = 1558176e93527367907cc461fe6075d4c508e23a
@@ -9,5 +9,6 @@ SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8
 SHA1 (patch-ad) = f36da65f9e9a808a4a8af4a41af0b4388f2c18fd
 SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f
 SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b
-SHA1 (patch-ai) = d0d6e92c98c97a36e05cb9f9d267a91bd939d599
+SHA1 (patch-ai) = 7b68ab900373e21d9e45c6236609824fa46574ed
 SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15
+SHA1 (patch-ak) = 114cd8f2cd27d49365bec6bd9fc920a323bf0e31
diff --git a/editors/TeXmacs/patches/patch-ai b/editors/TeXmacs/patches/patch-ai
index 7bce7a86ba8..4da91848158 100644
--- a/editors/TeXmacs/patches/patch-ai
+++ b/editors/TeXmacs/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.7 2008/04/21 20:04:43 drochner Exp $
+$NetBSD: patch-ai,v 1.8 2008/04/22 10:41:04 tnn Exp $
 
 --- plugins/maxima/bin/maxima_detect.orig	2008-03-19 18:16:36.000000000 +0100
 +++ plugins/maxima/bin/maxima_detect
@@ -16,3 +16,16 @@ $NetBSD: patch-ai,v 1.7 2008/04/21 20:04:43 drochner Exp $
    then
      if [ "$1" ]
      then
+@@ -63,9 +63,10 @@ version 5.10
+ version 5.11
+ version 5.12
+ version 5.13
+-version 5.14" >/dev/null
++version 5.14
++version 5.15" >/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 or 5.14
++          # 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 or 5.15
+           maxima -d | grep -F 'maxima-htmldir=' | sed -e \
+           's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
+         else
diff --git a/editors/TeXmacs/patches/patch-ak b/editors/TeXmacs/patches/patch-ak
new file mode 100644
index 00000000000..08b38a0721d
--- /dev/null
+++ b/editors/TeXmacs/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.5 2008/04/22 10:41:04 tnn Exp $
+
+--- plugins/maxima/bin/tm_maxima.orig	2008-03-19 18:16:36.000000000 +0100
++++ plugins/maxima/bin/tm_maxima
+@@ -17,7 +17,7 @@ case $1 in
+   5.9.1) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";;
+   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.* | 5.14.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
++  5.11.* | 5.12.* | 5.13.* | 5.14.* | 5.15.*) 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 -`";;
+   *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5"