make this work with maxima-5.20, bump PKGREVISION

4 files changed, 14 insertions, 13 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 6da473d7bc0..f5453e231dd 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2009/12/15 21:41:00 joerg Exp $
+# $NetBSD: Makefile,v 1.84 2009/12/21 12:17:51 drochner Exp $
 
 DISTNAME=		TeXmacs-1.0.6.15-src
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		3
+PKGREVISION=		4
 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 5f20ad1ac7e..713678ecbd1 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2009/08/13 17:27:59 drochner Exp $
+$NetBSD: distinfo,v 1.58 2009/12/21 12:17:51 drochner Exp $
 
 SHA1 (TeXmacs-1.0.6.15-src.tar.gz) = bd11a9176c7a3627322a374cd27d5eecfcd2527f
 RMD160 (TeXmacs-1.0.6.15-src.tar.gz) = 97388fd96f110bd97ff5386e50b37530c24822ee
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8
 SHA1 (patch-ad) = f36da65f9e9a808a4a8af4a41af0b4388f2c18fd
 SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f
 SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b
-SHA1 (patch-ai) = 4095c6712fbced70c89f4eb90b675366defc8899
+SHA1 (patch-ai) = fc6549f5bea8990673d29b138fa06ba74776ed50
 SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15
-SHA1 (patch-ak) = 5f84f452968cdb34bb13a83cd73aa195bb304321
+SHA1 (patch-ak) = 6647634aaf0e3f40f7cd160a5beff16078f6d377
 SHA1 (patch-al) = f7deed3d692af322aebe1a4068dfd3bde9e87a0a
diff --git a/editors/TeXmacs/patches/patch-ai b/editors/TeXmacs/patches/patch-ai
index b7c295a89d9..20ca3ce9474 100644
--- a/editors/TeXmacs/patches/patch-ai
+++ b/editors/TeXmacs/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.11 2009/08/13 17:27:59 drochner Exp $
+$NetBSD: patch-ai,v 1.12 2009/12/21 12:17:51 drochner Exp $
 
---- plugins/maxima/bin/maxima_detect.orig	2008-08-22 09:38:00.000000000 +0200
+--- plugins/maxima/bin/maxima_detect.orig	2008-08-22 07:38:00.000000000 +0000
 +++ plugins/maxima/bin/maxima_detect
 @@ -36,11 +36,11 @@ find_old_help()
    fi
@@ -16,7 +16,7 @@ $NetBSD: patch-ai,v 1.11 2009/08/13 17:27:59 drochner Exp $
    then
      if [ "$1" ]
      then
-@@ -63,9 +63,14 @@ version 5.10
+@@ -63,9 +63,15 @@ version 5.10
  version 5.11
  version 5.12
  version 5.13
@@ -26,10 +26,11 @@ $NetBSD: patch-ai,v 1.11 2009/08/13 17:27:59 drochner Exp $
 +version 5.16
 +version 5.17
 +version 5.18
-+version 5.19" >/dev/null
++version 5.19
++version 5.20" >/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 or 5.16 or 5.17 or 5.18 or 5.19
++          # 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 or 5.16 or 5.17 or 5.18 or 5.19 or 5.20
            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
index 86bd270e5c0..bef76e08857 100644
--- a/editors/TeXmacs/patches/patch-ak
+++ b/editors/TeXmacs/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.8 2009/08/13 17:27:59 drochner Exp $
+$NetBSD: patch-ak,v 1.9 2009/12/21 12:17:51 drochner Exp $
 
---- plugins/maxima/bin/tm_maxima.orig	2008-08-22 09:38:00.000000000 +0200
+--- plugins/maxima/bin/tm_maxima.orig	2008-08-22 07:38:00.000000000 +0000
 +++ 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.* | 5.16.* | 5.17.* | 5.18.* | 5.19.*) 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.* | 5.16.* | 5.17.* | 5.18.* | 5.19.* | 5.20.*) 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"