update to 1.0.6.6

changes:
-Clean mathematical types and routines for graphics
-Detection of intersections in graphical mode
-Several bug fixes

4 files changed, 14 insertions, 80 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 2936f3e63d3..8f577f89b55 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2006/10/23 09:42:23 drochner Exp $
+# $NetBSD: Makefile,v 1.63 2006/11/09 21:01:45 drochner Exp $
 
-DISTNAME=		TeXmacs-1.0.6.5-src
+DISTNAME=		TeXmacs-1.0.6.6-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/PLIST b/editors/TeXmacs/PLIST
index 1252fa02b3d..0a6ff15b693 100644
--- a/editors/TeXmacs/PLIST
+++ b/editors/TeXmacs/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.31 2006/10/23 09:42:23 drochner Exp $
+@comment $NetBSD: PLIST,v 1.32 2006/11/09 21:01:45 drochner Exp $
 bin/fig2ps
 bin/texmacs
 include/TeXmacs.h
 libexec/TeXmacs/bin/maxima_detect
 libexec/TeXmacs/bin/maxima_filter
+libexec/TeXmacs/bin/r_install
 libexec/TeXmacs/bin/realpath
 libexec/TeXmacs/bin/realpath.py
 libexec/TeXmacs/bin/texmacs.bin
@@ -1977,15 +1978,8 @@ share/TeXmacs/plugins/qcl/progs/init-qcl.scm
 share/TeXmacs/plugins/qcl/progs/qcl-input.scm
 share/TeXmacs/plugins/r/progs/init-r.scm
 share/TeXmacs/plugins/r/progs/r-input.scm
-share/TeXmacs/plugins/r/r/TeXmacs/CONTENTS
 share/TeXmacs/plugins/r/r/TeXmacs/DESCRIPTION
-share/TeXmacs/plugins/r/r/TeXmacs/INDEX
-share/TeXmacs/plugins/r/r/TeXmacs/Meta/Rd.rds
-share/TeXmacs/plugins/r/r/TeXmacs/Meta/data.rds
-share/TeXmacs/plugins/r/r/TeXmacs/Meta/demo.rds
-share/TeXmacs/plugins/r/r/TeXmacs/R-ex/TeXmacsView.R
-share/TeXmacs/plugins/r/r/TeXmacs/R-ex/v.R
-share/TeXmacs/plugins/r/r/TeXmacs/R/TeXmacs
+share/TeXmacs/plugins/r/r/TeXmacs/R/TeXmacs.R
 share/TeXmacs/plugins/r/r/TeXmacs/demo/00Index
 share/TeXmacs/plugins/r/r/TeXmacs/demo/T.Hershey.R
 share/TeXmacs/plugins/r/r/TeXmacs/demo/T.Japanese.R
@@ -1996,14 +1990,6 @@ share/TeXmacs/plugins/r/r/TeXmacs/demo/T.nlm.R
 share/TeXmacs/plugins/r/r/TeXmacs/demo/T.persp.R
 share/TeXmacs/plugins/r/r/TeXmacs/demo/T.plotmath.R
 share/TeXmacs/plugins/r/r/TeXmacs/demo/T.recursion.R
-share/TeXmacs/plugins/r/r/TeXmacs/help/AnIndex
-share/TeXmacs/plugins/r/r/TeXmacs/help/TeXmacsView
-share/TeXmacs/plugins/r/r/TeXmacs/help/v
-share/TeXmacs/plugins/r/r/TeXmacs/html/00Index.html
-share/TeXmacs/plugins/r/r/TeXmacs/html/TeXmacsView.html
-share/TeXmacs/plugins/r/r/TeXmacs/html/v.html
-share/TeXmacs/plugins/r/r/TeXmacs/latex/TeXmacsView.tex
-share/TeXmacs/plugins/r/r/TeXmacs/latex/v.tex
 share/TeXmacs/plugins/r/r/TeXmacs/man/TeXmacs.Rd
 share/TeXmacs/plugins/reduce/install/README
 share/TeXmacs/plugins/reduce/install/reducerc
@@ -2235,45 +2221,24 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/styles/elsevier
 @dirrm share/TeXmacs/styles/documentation
 @dirrm share/TeXmacs/styles
-@exec ${MKDIR} %D/share/TeXmacs/progs/utils/remote
-@dirrm share/TeXmacs/progs/utils/remote
 @dirrm share/TeXmacs/progs/utils/plugins
 @dirrm share/TeXmacs/progs/utils/misc
 @dirrm share/TeXmacs/progs/utils/library
 @dirrm share/TeXmacs/progs/utils/edit
-@exec ${MKDIR} %D/share/TeXmacs/progs/utils/cursor
-@dirrm share/TeXmacs/progs/utils/cursor
 @dirrm share/TeXmacs/progs/utils/cas
 @dirrm share/TeXmacs/progs/utils/base
 @dirrm share/TeXmacs/progs/utils
 @dirrm share/TeXmacs/progs/text/cyrillic
 @dirrm share/TeXmacs/progs/text
-@exec ${MKDIR} %D/share/TeXmacs/progs/texmacs/tools
-@dirrm share/TeXmacs/progs/texmacs/tools
 @dirrm share/TeXmacs/progs/texmacs/texmacs
-@exec ${MKDIR} %D/share/TeXmacs/progs/texmacs/plugin
-@dirrm share/TeXmacs/progs/texmacs/plugin
 @dirrm share/TeXmacs/progs/texmacs/menus
-@exec ${MKDIR} %D/share/TeXmacs/progs/texmacs/library
-@dirrm share/TeXmacs/progs/texmacs/library
-@exec ${MKDIR} %D/share/TeXmacs/progs/texmacs/keyboard/cyrillic
-@dirrm share/TeXmacs/progs/texmacs/keyboard/cyrillic
 @dirrm share/TeXmacs/progs/texmacs/keyboard
-@exec ${MKDIR} %D/share/TeXmacs/progs/texmacs/edit
-@dirrm share/TeXmacs/progs/texmacs/edit
 @dirrm share/TeXmacs/progs/texmacs
 @dirrm share/TeXmacs/progs/table
 @dirrm share/TeXmacs/progs/source
 @dirrm share/TeXmacs/progs/remote
-@exec ${MKDIR} %D/share/TeXmacs/progs/menus
-@dirrm share/TeXmacs/progs/menus
 @dirrm share/TeXmacs/progs/math
 @dirrm share/TeXmacs/progs/link
-@exec ${MKDIR} %D/share/TeXmacs/progs/keyboard/cyrillic
-@dirrm share/TeXmacs/progs/keyboard/cyrillic
-@dirrm share/TeXmacs/progs/keyboard
-@exec ${MKDIR} %D/share/TeXmacs/progs/kernel/tools
-@dirrm share/TeXmacs/progs/kernel/tools
 @dirrm share/TeXmacs/progs/kernel/texmacs
 @dirrm share/TeXmacs/progs/kernel/regexp
 @dirrm share/TeXmacs/progs/kernel/library
@@ -2285,9 +2250,6 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/progs/generic
 @dirrm share/TeXmacs/progs/fonts
 @dirrm share/TeXmacs/progs/dynamic
-@exec ${MKDIR} %D/share/TeXmacs/progs/drd/latex
-@dirrm share/TeXmacs/progs/drd/latex
-@dirrm share/TeXmacs/progs/drd
 @dirrm share/TeXmacs/progs/doc
 @dirrm share/TeXmacs/progs/convert/tools
 @dirrm share/TeXmacs/progs/convert/tmml
@@ -2296,8 +2258,6 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/progs/convert/latex
 @dirrm share/TeXmacs/progs/convert/images
 @dirrm share/TeXmacs/progs/convert/html
-@exec ${MKDIR} %D/share/TeXmacs/progs/convert/doc
-@dirrm share/TeXmacs/progs/convert/doc
 @dirrm share/TeXmacs/progs/convert
 @dirrm share/TeXmacs/progs
 @dirrm share/TeXmacs/plugins/yacas/progs
@@ -2312,13 +2272,8 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/plugins/reduce/install
 @dirrm share/TeXmacs/plugins/reduce
 @dirrm share/TeXmacs/plugins/r/r/TeXmacs/man
-@dirrm share/TeXmacs/plugins/r/r/TeXmacs/latex
-@dirrm share/TeXmacs/plugins/r/r/TeXmacs/html
-@dirrm share/TeXmacs/plugins/r/r/TeXmacs/help
 @dirrm share/TeXmacs/plugins/r/r/TeXmacs/demo
-@dirrm share/TeXmacs/plugins/r/r/TeXmacs/R-ex
 @dirrm share/TeXmacs/plugins/r/r/TeXmacs/R
-@dirrm share/TeXmacs/plugins/r/r/TeXmacs/Meta
 @dirrm share/TeXmacs/plugins/r/r/TeXmacs
 @dirrm share/TeXmacs/plugins/r/r
 @dirrm share/TeXmacs/plugins/r/progs
@@ -2327,16 +2282,6 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/plugins/qcl
 @dirrm share/TeXmacs/plugins/python/progs
 @dirrm share/TeXmacs/plugins/python
-@exec ${MKDIR} %D/share/TeXmacs/plugins/proclus/progs
-@dirrm share/TeXmacs/plugins/proclus/progs
-@exec ${MKDIR} %D/share/TeXmacs/plugins/proclus/packages/proclus
-@dirrm share/TeXmacs/plugins/proclus/packages/proclus
-@dirrm share/TeXmacs/plugins/proclus/packages
-@exec ${MKDIR} %D/share/TeXmacs/plugins/proclus/langs/natural/dic
-@dirrm share/TeXmacs/plugins/proclus/langs/natural/dic
-@dirrm share/TeXmacs/plugins/proclus/langs/natural
-@dirrm share/TeXmacs/plugins/proclus/langs
-@dirrm share/TeXmacs/plugins/proclus
 @dirrm share/TeXmacs/plugins/pari/progs
 @dirrm share/TeXmacs/plugins/pari/packages/session
 @dirrm share/TeXmacs/plugins/pari/packages
@@ -2420,14 +2365,8 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/packages/utilities
 @dirrm share/TeXmacs/packages/test
 @dirrm share/TeXmacs/packages/standard
-@exec ${MKDIR} %D/share/TeXmacs/packages/section/mathematics
-@dirrm share/TeXmacs/packages/section/mathematics
 @dirrm share/TeXmacs/packages/section
 @dirrm share/TeXmacs/packages/program
-@exec ${MKDIR} %D/share/TeXmacs/packages/number
-@dirrm share/TeXmacs/packages/number
-@exec ${MKDIR} %D/share/TeXmacs/packages/header/mathematics
-@dirrm share/TeXmacs/packages/header/mathematics
 @dirrm share/TeXmacs/packages/header
 @dirrm share/TeXmacs/packages/example
 @dirrm share/TeXmacs/packages/environment
@@ -2458,8 +2397,6 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/fonts/tfm/la
 @dirrm share/TeXmacs/fonts/tfm/ec
 @dirrm share/TeXmacs/fonts/tfm
-@exec ${MKDIR} %D/share/TeXmacs/fonts/pk
-@dirrm share/TeXmacs/fonts/pk
 @dirrm share/TeXmacs/fonts/enc
 @dirrm share/TeXmacs/fonts
 @dirrm share/TeXmacs/examples/texts
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo
index 3d40c3a1085..b92550b0720 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.40 2006/10/23 09:42:23 drochner Exp $
+$NetBSD: distinfo,v 1.41 2006/11/09 21:01:45 drochner Exp $
 
-SHA1 (TeXmacs-1.0.6.5-src.tar.gz) = 7f8d8e7f67ef7cffddc53cd39419ea04422fe3c6
-RMD160 (TeXmacs-1.0.6.5-src.tar.gz) = 4d83e98072cee30e06119d401cc01c942c4cb5b9
-Size (TeXmacs-1.0.6.5-src.tar.gz) = 3782401 bytes
+SHA1 (TeXmacs-1.0.6.6-src.tar.gz) = 07df6d2a624c43a1b39d770c7ac3c390311876e9
+RMD160 (TeXmacs-1.0.6.6-src.tar.gz) = 587d671fb0732a3cd80e0452a039518c2a4a7b4e
+Size (TeXmacs-1.0.6.6-src.tar.gz) = 3789730 bytes
 SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99
 SHA1 (patch-ab) = e2d3dff7ce46ff0a827c6d6e9320060b21d6bd71
 SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8
 SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f
 SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b
 SHA1 (patch-ai) = 10c6e74b4b1b9b38a5da071f0ad00780ae8aa419
-SHA1 (patch-aj) = 0c3c75066f25c118869157a03d6f9fbf9695276d
+SHA1 (patch-aj) = ae3b832cc76a2883ccb9a184d330c10428ef3a21
diff --git a/editors/TeXmacs/patches/patch-aj b/editors/TeXmacs/patches/patch-aj
index b31b8f80486..2d1eb44c968 100644
--- a/editors/TeXmacs/patches/patch-aj
+++ b/editors/TeXmacs/patches/patch-aj
@@ -1,13 +1,11 @@
-$NetBSD: patch-aj,v 1.1 2006/10/23 09:42:23 drochner Exp $
+$NetBSD: patch-aj,v 1.2 2006/11/09 21:01:45 drochner Exp $
 
---- plugins/maxima/bin/tm_maxima.orig	2006-10-21 21:37:11.000000000 +0200
+--- plugins/maxima/bin/tm_maxima.orig	2006-08-21 15:08:44.000000000 +0200
 +++ plugins/maxima/bin/tm_maxima
-@@ -18,7 +18,8 @@ case $1 in
-   5.9.0) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.0.lisp" \
+@@ -19,6 +19,7 @@ case $1 in
        | maxima_filter;;
    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.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.9.1.1* | 5.9.2* | 5.9.3* | 5.10) 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";;
    cygwin)
      CYGWIN_ROOT="C:\cygwin"