make the maxima plugin work with 5.13, bump PKGREVISION

4 files changed, 33 insertions, 6 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index ada393547c0..576f7429b9d 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2007/08/09 19:16:24 drochner Exp $
+# $NetBSD: Makefile,v 1.69 2007/08/31 10:05:58 drochner Exp $
 
 DISTNAME=		TeXmacs-1.0.6.10-src
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		1
+PKGREVISION=		2
 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 7e5781b974e..ae3cffe9da0 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2007/08/30 13:46:03 joerg Exp $
+$NetBSD: distinfo,v 1.48 2007/08/31 10:05:58 drochner Exp $
 
 SHA1 (TeXmacs-1.0.6.10-src.tar.gz) = 0774bded87ff0fa373e048aeac91f171db95e151
 RMD160 (TeXmacs-1.0.6.10-src.tar.gz) = 11ce6db065e6d7a060fecdd10e726320f88a11e6
@@ -9,5 +9,6 @@ SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8
 SHA1 (patch-ad) = f36da65f9e9a808a4a8af4a41af0b4388f2c18fd
 SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f
 SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b
-SHA1 (patch-ai) = 10c6e74b4b1b9b38a5da071f0ad00780ae8aa419
+SHA1 (patch-ai) = 449ff206e58168d1dba21ffcc2504262074d7321
 SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15
+SHA1 (patch-ak) = 6dd838bd84f01247cf56d6e4fcf24a7251268564
diff --git a/editors/TeXmacs/patches/patch-ai b/editors/TeXmacs/patches/patch-ai
index cbf8777cd03..b64a93b98e6 100644
--- a/editors/TeXmacs/patches/patch-ai
+++ b/editors/TeXmacs/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.3 2006/08/11 18:05:12 drochner Exp $
+$NetBSD: patch-ai,v 1.4 2007/08/31 10:05:59 drochner Exp $
 
---- plugins/maxima/bin/maxima_detect.orig	2006-08-06 18:31:00.000000000 +0200
+--- plugins/maxima/bin/maxima_detect.orig	2007-05-15 19:54:34.000000000 +0200
 +++ plugins/maxima/bin/maxima_detect
 @@ -40,7 +40,7 @@ PATH="/cygdrive/c/Program Files/Maxima-5
  PATH="/cygdrive/c/Program Files/Maxima-5.9.3/bin:$PATH"
@@ -11,3 +11,16 @@ $NetBSD: patch-ai,v 1.3 2006/08/11 18:05:12 drochner Exp $
  if [ $? -eq 0 ]
  then
    if [ -f "/usr/bin/cygwin1.dll" ]
+@@ -64,9 +64,10 @@ version 5.9.2
+ version 5.9.3
+ version 5.10
+ version 5.11
+-version 5.12" >/dev/null
++version 5.12
++version 5.13" >/dev/null
+         then
+-          # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12
++          # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13
+           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..f9d2272b1bc
--- /dev/null
+++ b/editors/TeXmacs/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2007/08/31 10:05:59 drochner Exp $
+
+--- plugins/maxima/bin/tm_maxima.orig	2007-08-31 11:50:20.000000000 +0200
++++ plugins/maxima/bin/tm_maxima
+@@ -20,7 +20,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.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
++  5.11.* | 5.12.* | 5.13.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
+   cygwin)
+     CYGWIN_ROOT="C:\cygwin"
+     CYGWIN_TEXMACS_HOME=`echo $TEXMACS_HOME_PATH | sed 's|/|\\\\|g'`