update to 1.0.6.15

changes:
-Improved Scheme mode
-Improved appearance of Wikipedia mathematical pages
-Added plug-in for drawing Feynman diagrams
pkgsrc change: make it work with maxima-5.17

6 files changed, 43 insertions, 75 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 1951de921ac..170215ff816 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2009/02/09 22:56:23 joerg Exp $
+# $NetBSD: Makefile,v 1.79 2009/02/11 17:53:40 drochner Exp $
 
-DISTNAME=		TeXmacs-1.0.6.14-src
+DISTNAME=		TeXmacs-1.0.6.15-src
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		3
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.texmacs.org/pub/TeXmacs/targz/
 MASTER_SITES+=		http://www.texmacs.org/Download/ftp/targz/
@@ -18,6 +17,8 @@ BUILD_TARGET=		TEXMACS
 USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
+# XXX workaround for bug in configure
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 TEX_ACCEPTED=		teTeX3
 
 PYTHON_PATCH_SCRIPTS=	plugins/python/bin/tm_python
diff --git a/editors/TeXmacs/PLIST b/editors/TeXmacs/PLIST
index f940d23a651..8c15aae6544 100644
--- a/editors/TeXmacs/PLIST
+++ b/editors/TeXmacs/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.38 2008/01/04 15:26:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.39 2009/02/11 17:53:40 drochner Exp $
 bin/fig2ps
 bin/texmacs
 include/TeXmacs.h
+libexec/TeXmacs/bin/bbox_add.pl
 libexec/TeXmacs/bin/maxima_detect
 libexec/TeXmacs/bin/maxima_filter
 libexec/TeXmacs/bin/r_install
@@ -11,6 +12,7 @@ libexec/TeXmacs/bin/texmacs.bin
 libexec/TeXmacs/bin/tm_axiom
 libexec/TeXmacs/bin/tm_dratex
 libexec/TeXmacs/bin/tm_eukleides
+libexec/TeXmacs/bin/tm_feynmf
 libexec/TeXmacs/bin/tm_gnuplot
 libexec/TeXmacs/bin/tm_graphviz
 libexec/TeXmacs/bin/tm_gs
@@ -1873,7 +1875,9 @@ share/TeXmacs/packages/environment/env.ts
 share/TeXmacs/packages/example/allouche.ts
 share/TeXmacs/packages/example/alt-colors.ts
 share/TeXmacs/packages/example/bpr.ts
+share/TeXmacs/packages/example/doxygen.ts
 share/TeXmacs/packages/example/framed-envs.ts
+share/TeXmacs/packages/example/presentation.ts
 share/TeXmacs/packages/example/vdh.ts
 share/TeXmacs/packages/gui/gui-brushed.ts
 share/TeXmacs/packages/gui/gui-form.ts
@@ -1924,6 +1928,9 @@ share/TeXmacs/plugins/dratex/latex/AlDraTex.sty
 share/TeXmacs/plugins/dratex/latex/DraTex.sty
 share/TeXmacs/plugins/dratex/progs/init-dratex.scm
 share/TeXmacs/plugins/eukleides/progs/init-eukleides.scm
+share/TeXmacs/plugins/feynmf/doc/feynmf-plugin_tutorial.tm
+share/TeXmacs/plugins/feynmf/progs/init-feynmf.scm
+share/TeXmacs/plugins/feynmf/share/feynmf-styles
 share/TeXmacs/plugins/giac/packages/session/giac.ts
 share/TeXmacs/plugins/giac/progs/giac-input.scm
 share/TeXmacs/plugins/giac/progs/giac-menus.scm
@@ -2189,6 +2196,8 @@ share/TeXmacs/progs/math/format-math-menu.scm
 share/TeXmacs/progs/math/math-edit.scm
 share/TeXmacs/progs/math/math-kbd.scm
 share/TeXmacs/progs/math/math-menu.scm
+share/TeXmacs/progs/prog/program-edit.scm
+share/TeXmacs/progs/prog/scheme-edit.scm
 share/TeXmacs/progs/remote/chat-edit.scm
 share/TeXmacs/progs/remote/chat-menu.scm
 share/TeXmacs/progs/remote/client.scm
@@ -2246,6 +2255,7 @@ share/TeXmacs/progs/utils/edit/variants.scm
 share/TeXmacs/progs/utils/library/cursor.scm
 share/TeXmacs/progs/utils/library/length.scm
 share/TeXmacs/progs/utils/library/tree.scm
+share/TeXmacs/progs/utils/misc/doxygen.scm
 share/TeXmacs/progs/utils/misc/markup-funcs.scm
 share/TeXmacs/progs/utils/misc/tm-keywords.scm
 share/TeXmacs/progs/utils/plugins/plugin-cmd.scm
@@ -2306,6 +2316,7 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/progs/table
 @dirrm share/TeXmacs/progs/source
 @dirrm share/TeXmacs/progs/remote
+@dirrm share/TeXmacs/progs/prog
 @dirrm share/TeXmacs/progs/math
 @dirrm share/TeXmacs/progs/link
 @dirrm share/TeXmacs/progs/kernel/texmacs
@@ -2333,7 +2344,6 @@ 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
@@ -2420,6 +2430,10 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/plugins/giac/packages/session
 @dirrm share/TeXmacs/plugins/giac/packages
 @dirrm share/TeXmacs/plugins/giac
+@dirrm share/TeXmacs/plugins/feynmf/share
+@dirrm share/TeXmacs/plugins/feynmf/progs
+@dirrm share/TeXmacs/plugins/feynmf/doc
+@dirrm share/TeXmacs/plugins/feynmf
 @dirrm share/TeXmacs/plugins/eukleides/progs
 @dirrm share/TeXmacs/plugins/eukleides
 @dirrm share/TeXmacs/plugins/dratex/progs
@@ -2595,8 +2609,6 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/doc/devel/style
 @dirrm share/TeXmacs/doc/devel/source
 @dirrm share/TeXmacs/doc/devel/scheme/utils
-@exec ${MKDIR} %D/share/TeXmacs/doc/devel/scheme/process
-@dirrm share/TeXmacs/doc/devel/scheme/process
 @dirrm share/TeXmacs/doc/devel/scheme/overview
 @dirrm share/TeXmacs/doc/devel/scheme/graphics
 @dirrm share/TeXmacs/doc/devel/scheme/edit
@@ -2605,10 +2617,6 @@ share/TeXmacs/texts/test/overview.tm
 @dirrm share/TeXmacs/doc/devel/interface
 @dirrm share/TeXmacs/doc/devel/format/stylesheet
 @dirrm share/TeXmacs/doc/devel/format/regular
-@exec ${MKDIR} %D/share/TeXmacs/doc/devel/format/primitives
-@dirrm share/TeXmacs/doc/devel/format/primitives
-@exec ${MKDIR} %D/share/TeXmacs/doc/devel/format/language
-@dirrm share/TeXmacs/doc/devel/format/language
 @dirrm share/TeXmacs/doc/devel/format/environment
 @dirrm share/TeXmacs/doc/devel/format/basics
 @dirrm share/TeXmacs/doc/devel/format
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo
index 5b7c186cf3f..09000454555 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.54 2008/08/26 18:20:09 ahoka Exp $
+$NetBSD: distinfo,v 1.55 2009/02/11 17:53:40 drochner Exp $
 
-SHA1 (TeXmacs-1.0.6.14-src.tar.gz) = bab1a969be883608f5ffbaef9994d6b86c43226e
-RMD160 (TeXmacs-1.0.6.14-src.tar.gz) = 1558176e93527367907cc461fe6075d4c508e23a
-Size (TeXmacs-1.0.6.14-src.tar.gz) = 4313953 bytes
+SHA1 (TeXmacs-1.0.6.15-src.tar.gz) = d27addd9d6362584049daa2b957e83b59bef4882
+RMD160 (TeXmacs-1.0.6.15-src.tar.gz) = ec00eff9131a55fe7c1fe70dac46f68aa8203136
+Size (TeXmacs-1.0.6.15-src.tar.gz) = 4455900 bytes
 SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99
-SHA1 (patch-ab) = e2d3dff7ce46ff0a827c6d6e9320060b21d6bd71
+SHA1 (patch-ab) = 100b2801c5821cb7f34d0c85cb87e68319ba6839
 SHA1 (patch-ac) = 21810d4f9d5e6525a86ec2d0c347dcfd1c9e31c8
 SHA1 (patch-ad) = f36da65f9e9a808a4a8af4a41af0b4388f2c18fd
 SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f
 SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b
-SHA1 (patch-ai) = b882b7b7689ae3c855f628c76a9b81c2dfc60257
+SHA1 (patch-ai) = 5eefbec68ec6500104b9391dfcdfab1e3d78a5dc
 SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15
-SHA1 (patch-ak) = 395caa96658b53f85597f56491daa20ad61195d0
+SHA1 (patch-ak) = 02ee80b3f889743f0b14dd4c706fc626b686b2ba
 SHA1 (patch-al) = f7deed3d692af322aebe1a4068dfd3bde9e87a0a
diff --git a/editors/TeXmacs/patches/patch-ab b/editors/TeXmacs/patches/patch-ab
index 03c3bb74ef7..47e6f8cceb1 100644
--- a/editors/TeXmacs/patches/patch-ab
+++ b/editors/TeXmacs/patches/patch-ab
@@ -1,50 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2006/09/19 22:03:54 joerg Exp $
+$NetBSD: patch-ab,v 1.11 2009/02/11 17:53:40 drochner Exp $
 
---- configure.orig	2006-08-06 16:31:00.000000000 +0000
+--- configure.orig	2008-08-16 18:30:28.000000000 +0200
 +++ configure
-@@ -4237,38 +4237,13 @@ else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.  */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char $ac_func ();
--char (*f) ();
- 
--#ifdef F77_DUMMY_MAIN
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int F77_DUMMY_MAIN() { return 1; }
--#endif
-+#include <sys/time.h>
-+
- int
- main ()
- {
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
--#else
--f = $ac_func;
--#endif
--
--  ;
--  return 0;
-+  return gettimeofday(NULL, NULL);
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
-@@ -5959,9 +5934,9 @@ echo "$as_me: WARNING: unable to link st
+@@ -7513,9 +7513,9 @@ echo "$as_me: WARNING: unable to link st
        fi
     fi
  fi
diff --git a/editors/TeXmacs/patches/patch-ai b/editors/TeXmacs/patches/patch-ai
index f5e5fe804c9..2261dbd25a5 100644
--- a/editors/TeXmacs/patches/patch-ai
+++ b/editors/TeXmacs/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.9 2008/08/26 18:20:09 ahoka Exp $
+$NetBSD: patch-ai,v 1.10 2009/02/11 17:53:40 drochner Exp $
 
---- plugins/maxima/bin/maxima_detect.orig	2008-03-19 20:16:36.000000000 +0300
-+++ plugins/maxima/bin/maxima_detect	2008-08-25 19:13:56.000000000 +0400
-@@ -36,11 +36,11 @@
+--- plugins/maxima/bin/maxima_detect.orig	2008-08-16 18:30:29.000000000 +0200
++++ plugins/maxima/bin/maxima_detect
+@@ -36,11 +36,11 @@ find_old_help()
    fi
  }
  
@@ -16,17 +16,18 @@ $NetBSD: patch-ai,v 1.9 2008/08/26 18:20:09 ahoka Exp $
    then
      if [ "$1" ]
      then
-@@ -63,9 +63,11 @@
+@@ -63,9 +63,12 @@ version 5.10
  version 5.11
  version 5.12
  version 5.13
 -version 5.14" >/dev/null
 +version 5.14
 +version 5.15
-+version 5.16.3" >/dev/null
++version 5.16
++version 5.17" >/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
++          # 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
            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 1108e364eca..26665ae9f3f 100644
--- a/editors/TeXmacs/patches/patch-ak
+++ b/editors/TeXmacs/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.6 2008/08/26 18:20:09 ahoka Exp $
+$NetBSD: patch-ak,v 1.7 2009/02/11 17:53:40 drochner Exp $
 
---- plugins/maxima/bin/tm_maxima.orig	2008-03-19 20:16:36.000000000 +0300
-+++ plugins/maxima/bin/tm_maxima	2008-08-25 19:20:41.000000000 +0400
-@@ -17,7 +17,7 @@
+--- plugins/maxima/bin/tm_maxima.orig	2008-08-16 18:30:29.000000000 +0200
++++ 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.*) 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.*) 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"