-update to 1.0.6.12

 changes:
 -Complete abstraction of the graphical user interface should make
  porting easier
 -Improved signal handling for pipe communications
-patch to support maxima-5.14

5 files changed, 26 insertions, 27 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 76d9211b298..e9fe49f332b 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2008/01/04 15:01:32 ghen Exp $
+# $NetBSD: Makefile,v 1.73 2008/01/04 15:26:17 drochner Exp $
 
-DISTNAME=		TeXmacs-1.0.6.11-src
+DISTNAME=		TeXmacs-1.0.6.12-src
 PKGNAME=		${DISTNAME:S/-src//}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.texmacs.org/pub/TeXmacs/targz/
diff --git a/editors/TeXmacs/PLIST b/editors/TeXmacs/PLIST
index 96ac5e25eca..f940d23a651 100644
--- a/editors/TeXmacs/PLIST
+++ b/editors/TeXmacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2007/09/05 16:40:34 drochner Exp $
+@comment $NetBSD: PLIST,v 1.38 2008/01/04 15:26:17 drochner Exp $
 bin/fig2ps
 bin/texmacs
 include/TeXmacs.h
@@ -2132,7 +2132,6 @@ share/TeXmacs/progs/generic/generic-kbd.scm
 share/TeXmacs/progs/generic/insert-menu.scm
 share/TeXmacs/progs/graphics/graphics-edit.scm
 share/TeXmacs/progs/graphics/graphics-env.scm
-share/TeXmacs/progs/graphics/graphics-env.scm.orig
 share/TeXmacs/progs/graphics/graphics-group.scm
 share/TeXmacs/progs/graphics/graphics-kbd.scm
 share/TeXmacs/progs/graphics/graphics-main.scm
@@ -2334,6 +2333,7 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/plugins/yacas
 @dirrm share/TeXmacs/plugins/xypic/progs
 @dirrm share/TeXmacs/plugins/xypic
+@dirrm share/TeXmacs/plugins/tools
 @dirrm share/TeXmacs/plugins/shell/progs
 @dirrm share/TeXmacs/plugins/shell
 @dirrm share/TeXmacs/plugins/scilab/progs
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo
index 7bb54ddc40f..a1760f7da8b 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.49 2007/09/05 16:40:35 drochner Exp $
+$NetBSD: distinfo,v 1.50 2008/01/04 15:26:17 drochner Exp $
 
-SHA1 (TeXmacs-1.0.6.11-src.tar.gz) = 7f1a79b7299f2d2188e07c9be3c83b89eda19938
-RMD160 (TeXmacs-1.0.6.11-src.tar.gz) = c5512c675fbfad49abe289fc9a88b31c3c13d8b5
-Size (TeXmacs-1.0.6.11-src.tar.gz) = 4218252 bytes
+SHA1 (TeXmacs-1.0.6.12-src.tar.gz) = 3fbddeb824703c61b5d4a193c4097f68305f9063
+RMD160 (TeXmacs-1.0.6.12-src.tar.gz) = c1d53d8e20f0d701f1e2fb602753d7d85ae7fb53
+Size (TeXmacs-1.0.6.12-src.tar.gz) = 4215464 bytes
 SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99
 SHA1 (patch-ab) = e2d3dff7ce46ff0a827c6d6e9320060b21d6bd71
 SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8
 SHA1 (patch-ad) = f36da65f9e9a808a4a8af4a41af0b4388f2c18fd
 SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f
 SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b
-SHA1 (patch-ai) = aa6bf19dc18ee2656ba5588d8542680b5a2f1d98
+SHA1 (patch-ai) = 3cfbf70742468329149b69dba4b5a82279770ced
 SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15
-SHA1 (patch-ak) = 9a575968adc0948a921aabf3f494ffa5450162a4
+SHA1 (patch-ak) = 1972bbf64c24f6c6feeedb18f2ed9351d30bdecd
diff --git a/editors/TeXmacs/patches/patch-ai b/editors/TeXmacs/patches/patch-ai
index b1bbf344ac2..8ce5627ca30 100644
--- a/editors/TeXmacs/patches/patch-ai
+++ b/editors/TeXmacs/patches/patch-ai
@@ -1,32 +1,31 @@
-$NetBSD: patch-ai,v 1.5 2007/09/05 16:40:35 drochner Exp $
+$NetBSD: patch-ai,v 1.6 2008/01/04 15:26:17 drochner Exp $
 
---- plugins/maxima/bin/maxima_detect.orig	2007-09-03 16:47:53.000000000 +0200
+--- plugins/maxima/bin/maxima_detect.orig	2007-11-05 10:21:32.000000000 +0100
 +++ plugins/maxima/bin/maxima_detect
 @@ -36,11 +36,11 @@ find_old_help()
    fi
  }
  
--if [ $OSTYPE == "cygwin" ] ; then EXT='.bat'; else EXT=''; fi
--MAXIMA=`type -p maxima$EXT 2>/dev/null`
+-if [ $OSTYPE = "cygwin" ] ; then EXT='.bat'; else EXT=''; fi
 +if [ x$OSTYPE = x"cygwin" ] ; then EXT='.bat'; else EXT=''; fi
-+MAXIMA=`which maxima$EXT`
+ MAXIMA=`which maxima$EXT 2>/dev/null`
  if [ $? -eq 0 ]
  then
--  if [ $OSTYPE == "cygwin" ]
+-  if [ $OSTYPE = "cygwin" ]
 +  if [ x$OSTYPE = x"cygwin" ]
    then
      if [ "$1" ]
      then
-@@ -61,9 +61,10 @@ version 5.9.2
- version 5.9.3
+@@ -62,9 +62,10 @@ version 5.9.3
  version 5.10
  version 5.11
--version 5.12" >/dev/null
-+version 5.12
-+version 5.13" >/dev/null
+ 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
-+          # 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
++          # 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"|'
          else
diff --git a/editors/TeXmacs/patches/patch-ak b/editors/TeXmacs/patches/patch-ak
index 1003d71f1f8..c8729d56f9d 100644
--- a/editors/TeXmacs/patches/patch-ak
+++ b/editors/TeXmacs/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.2 2007/09/05 16:40:35 drochner Exp $
+$NetBSD: patch-ak,v 1.3 2008/01/04 15:26:17 drochner Exp $
 
---- plugins/maxima/bin/tm_maxima.orig	2007-09-03 16:47:53.000000000 +0200
+--- plugins/maxima/bin/tm_maxima.orig	2008-01-04 11:38:35.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.*) 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";;
+-  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 -`";;
    *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5"