Update to 1.0.0.15, provided by Julio Merino in pkg/18123 (with minor

fixes by me).
Changes:
* Automatic generation of preamble instead of using the TeXmacs.sty file
  (1.0.0.15).
* Widget factory for menus moved to the Scheme interface (1.0.0.15).
* Circulating variants for certain environments (1.0.0.15).
* New menu look and feel (1.0.0.14).
* Some changes to the LaTeX to TeXmacs converter (1.0.0.14).
* We started implementing a TeXmacs to Html converter (1.0.0.14).
* Correction of a severe bug which disabled the keyboard on certain systems
  (1.0.0.13).
* Better support of the numeric keypad and dead accents (1.0.0.13).
* Complete change of the keyboard behaviour (1.0.0.12).
* Automatic detection and configuration of modifier keys (1.0.0.12).
* Automatic translation of menus in the documentation (1.0.0.12).
* Guile/Scheme scripts inside documents (1.0.0.12).
* Wildcard system for keyboard shortcuts (1.0.0.11).
* Keyboard shortcuts in the menus are determined automatically (1.0.0.11).
* Further reorganization of the menus (1.0.0.11).
* Support for grey menu items, checkmarks and ... in menus (1.0.0.11).
* Automatic determination of keyboard shortcuts in menus (1.0.0.11).
* Widgets are now attached to the current display at creation time (1.0.0.11).
* Improved reduce and axiom interfaces (1.0.0.11).
* We replaced the gencc preprocessor by the more standard template system of
  C++ (1.0.0.10).

4 files changed, 58 insertions, 41 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 3bc47aff539..3a5ef025cf6 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2002/07/20 01:20:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/06 11:59:38 wiz Exp $
 
-DISTNAME=	TeXmacs-1.0.0.9-src
+DISTNAME=	TeXmacs-1.0.0.15-src
 PKGNAME=	${DISTNAME:S/-src//}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.texmacs.org/pub/TeXmacs/targz/
@@ -10,22 +10,22 @@ HOMEPAGE=	http://www.texmacs.org
 COMMENT=	GNU TeXmacs (free scientific text editor)
 
 DEPENDS+=	teTeX>=1.0:../../print/teTeX
-DEPENDS+=	guile>=1.4:../../lang/guile
 BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 
 ALL_TARGET=	TEXMACS
 
-MANCOMPRESSED=	yes
-GNU_CONFIGURE=	yes
+USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
+USE_X11BASE=	yes
+GNU_CONFIGURE=	yes
+MANCOMPRESSED=	yes
 
 LDFLAGS+=	-Wl,-R${LOCALBASE}/libexec/${PKGNAME}/lib
 
 pre-configure:
-	cd ${WRKSRC} && autoconf;
+	( cd ${WRKSRC} && autoconf )
 	${RM} ${WRKSRC}/misc/scripts/tm_axiom
 
-.include "../../mk/x11.buildlink.mk"
+.include "../../lang/guile/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/editors/TeXmacs/PLIST b/editors/TeXmacs/PLIST
index 95c88813958..ee3ec9a0d4e 100644
--- a/editors/TeXmacs/PLIST
+++ b/editors/TeXmacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/20 01:20:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/09/06 11:59:38 wiz Exp $
 bin/fig2ps
 bin/texmacs
 include/TeXmacs.h
@@ -13,14 +13,6 @@ libexec/${PKGNAME}/bin/tm_maxima
 libexec/${PKGNAME}/bin/tm_mupad
 libexec/${PKGNAME}/bin/tm_mupad_help
 libexec/${PKGNAME}/bin/tm_reduce
-libexec/${PKGNAME}/lib/libbasic.so
-libexec/${PKGNAME}/lib/libconvert.so
-libexec/${PKGNAME}/lib/libedit.so
-libexec/${PKGNAME}/lib/libglue.so
-libexec/${PKGNAME}/lib/libresource.so
-libexec/${PKGNAME}/lib/libserver.so
-libexec/${PKGNAME}/lib/libtypeset.so
-libexec/${PKGNAME}/lib/libwindow.so
 man/man1/fig2ps.1
 man/man1/texmacs.1
 share/${PKGNAME}/LICENSE
@@ -29,6 +21,7 @@ share/${PKGNAME}/doc/dvi/texmacs.tex
 share/${PKGNAME}/doc/english/help/about.tex
 share/${PKGNAME}/doc/english/help/advanced.tex
 share/${PKGNAME}/doc/english/help/compatibility.tex
+share/${PKGNAME}/doc/english/help/configure.tex
 share/${PKGNAME}/doc/english/help/interface.tex
 share/${PKGNAME}/doc/english/help/introduction.tex
 share/${PKGNAME}/doc/english/help/itf_customize.tex
@@ -52,7 +45,6 @@ share/${PKGNAME}/doc/english/source/basic.tex
 share/${PKGNAME}/doc/english/source/boxes.tex
 share/${PKGNAME}/doc/english/source/buffer.tex
 share/${PKGNAME}/doc/english/source/bugs.tex
-share/${PKGNAME}/doc/english/source/compiler.tex
 share/${PKGNAME}/doc/english/source/convert.tex
 share/${PKGNAME}/doc/english/source/data.tex
 share/${PKGNAME}/doc/english/source/fonts.tex
@@ -66,6 +58,7 @@ share/${PKGNAME}/doc/english/startup/upgrade-2.tex
 share/${PKGNAME}/doc/english/startup/upgrade-3.tex
 share/${PKGNAME}/doc/english/startup/upgrade-4.tex
 share/${PKGNAME}/doc/english/startup/upgrade-5.tex
+share/${PKGNAME}/doc/english/startup/upgrade-6.tex
 share/${PKGNAME}/doc/romanian/help/introduction.tm
 share/${PKGNAME}/doc/romanian/help/keyboard.tm
 share/${PKGNAME}/doc/romanian/help/styles.tm
@@ -431,8 +424,12 @@ share/${PKGNAME}/packages/standard/std-math.ts
 share/${PKGNAME}/packages/standard/std-symbol.ts
 share/${PKGNAME}/packages/test/algo.ts
 share/${PKGNAME}/progs/boot/base.scm
+share/${PKGNAME}/progs/boot/david.scm
+share/${PKGNAME}/progs/boot/debug.scm
 share/${PKGNAME}/progs/boot/fold.scm
 share/${PKGNAME}/progs/boot/general.scm
+share/${PKGNAME}/progs/boot/hybrid.scm
+share/${PKGNAME}/progs/boot/menu.scm
 share/${PKGNAME}/progs/boot/modify.scm
 share/${PKGNAME}/progs/boot/preferences.scm
 share/${PKGNAME}/progs/boot/style.scm
@@ -452,13 +449,15 @@ share/${PKGNAME}/progs/cas/qcl.scm
 share/${PKGNAME}/progs/cas/reduce.scm
 share/${PKGNAME}/progs/cas/scilab.scm
 share/${PKGNAME}/progs/cas/yacas.scm
-share/${PKGNAME}/progs/convert/htmlout.scm
-share/${PKGNAME}/progs/convert/htmltest.scm
-share/${PKGNAME}/progs/convert/output.scm
-share/${PKGNAME}/progs/convert/texout.scm
-share/${PKGNAME}/progs/convert/textest.scm
-share/${PKGNAME}/progs/convert/tmpre.scm
-share/${PKGNAME}/progs/convert/tmtex.scm
+share/${PKGNAME}/progs/convert/tmhtml/htmlout.scm
+share/${PKGNAME}/progs/convert/tmhtml/htmltest.scm
+share/${PKGNAME}/progs/convert/tmhtml/tmhtml.scm
+share/${PKGNAME}/progs/convert/tmtex/texout.scm
+share/${PKGNAME}/progs/convert/tmtex/textest.scm
+share/${PKGNAME}/progs/convert/tmtex/tmtex-preamble.scm
+share/${PKGNAME}/progs/convert/tmtex/tmtex.scm
+share/${PKGNAME}/progs/convert/tools/output.scm
+share/${PKGNAME}/progs/convert/tools/tmpre.scm
 share/${PKGNAME}/progs/fonts/adobe-fonts.scm
 share/${PKGNAME}/progs/fonts/cm-fonts.scm
 share/${PKGNAME}/progs/fonts/ec-fonts.scm
@@ -468,19 +467,29 @@ share/${PKGNAME}/progs/fonts/misc-fonts.scm
 share/${PKGNAME}/progs/fonts/x-fonts.scm
 share/${PKGNAME}/progs/init-buffer.scm
 share/${PKGNAME}/progs/init-texmacs.scm
-share/${PKGNAME}/progs/keyboard/accents.scm
-share/${PKGNAME}/progs/keyboard/emacs.scm
-share/${PKGNAME}/progs/keyboard/keymaps.scm
+share/${PKGNAME}/progs/keyboard/circulate.scm
+share/${PKGNAME}/progs/keyboard/kbd-emacs.scm
+share/${PKGNAME}/progs/keyboard/kbd-general.scm
+share/${PKGNAME}/progs/keyboard/kbd-math.scm
+share/${PKGNAME}/progs/keyboard/kbd-old.scm
+share/${PKGNAME}/progs/keyboard/kbd-preamble.scm
+share/${PKGNAME}/progs/keyboard/kbd-table.scm
+share/${PKGNAME}/progs/keyboard/kbd-text.scm
 share/${PKGNAME}/progs/keyboard/latex.scm
 share/${PKGNAME}/progs/keyboard/russian/cp1251.scm
 share/${PKGNAME}/progs/keyboard/russian/jcuken.scm
 share/${PKGNAME}/progs/keyboard/russian/koi8.scm
 share/${PKGNAME}/progs/keyboard/russian/translit.scm
 share/${PKGNAME}/progs/keyboard/russian/yawerty.scm
-share/${PKGNAME}/progs/keyboard/shorthands.scm
+share/${PKGNAME}/progs/keyboard/wildcards.scm
+share/${PKGNAME}/progs/menu/basic-menus.scm
+share/${PKGNAME}/progs/menu/format-menu.scm
 share/${PKGNAME}/progs/menu/icon-menu.scm
+share/${PKGNAME}/progs/menu/insert-menu.scm
 share/${PKGNAME}/progs/menu/main-menu.scm
-share/${PKGNAME}/progs/menu/symbol-menu.scm
+share/${PKGNAME}/progs/menu/mathematics-menu.scm
+share/${PKGNAME}/progs/menu/table-menu.scm
+share/${PKGNAME}/progs/menu/text-menu.scm
 share/${PKGNAME}/styles/article.ts
 share/${PKGNAME}/styles/book.ts
 share/${PKGNAME}/styles/documentation/browser.ts
@@ -517,6 +526,13 @@ share/${PKGNAME}/texts/tutorial/overview.tm
 @dirrm share/${PKGNAME}/progs/fonts
 @exec ${MKDIR} %D/share/${PKGNAME}/progs/examples
 @dirrm share/${PKGNAME}/progs/examples
+@dirrm share/${PKGNAME}/progs/convert/tools
+@dirrm share/${PKGNAME}/progs/convert/tmtex
+@dirrm share/${PKGNAME}/progs/convert/tmhtml
+@exec ${MKDIR} %D/share/${PKGNAME}/progs/convert/textm
+@dirrm share/${PKGNAME}/progs/convert/textm
+@exec ${MKDIR} %D/share/${PKGNAME}/progs/convert/htmltm
+@dirrm share/${PKGNAME}/progs/convert/htmltm
 @dirrm share/${PKGNAME}/progs/convert
 @dirrm share/${PKGNAME}/progs/cas
 @dirrm share/${PKGNAME}/progs/boot
@@ -583,6 +599,7 @@ share/${PKGNAME}/texts/tutorial/overview.tm
 @dirrm share/${PKGNAME}/doc/dvi
 @dirrm share/${PKGNAME}/doc
 @dirrm share/${PKGNAME}
+@exec ${MKDIR} %D/libexec/${PKGNAME}/lib
 @dirrm libexec/${PKGNAME}/lib
 @dirrm libexec/${PKGNAME}/bin
 @dirrm libexec/${PKGNAME}
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo
index 3c354e2a251..66f807528a4 100644
--- a/editors/TeXmacs/distinfo
+++ b/editors/TeXmacs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/07/20 01:20:06 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/09/06 11:59:39 wiz Exp $
 
-SHA1 (TeXmacs-1.0.0.9-src.tar.gz) = 6eb8f680c4ad1171bc3c3f27a8d30c9a621fd621
-Size (TeXmacs-1.0.0.9-src.tar.gz) = 1592094 bytes
-SHA1 (patch-aa) = 986663798e72d6bcebf67a146503ce6904f13c5d
+SHA1 (TeXmacs-1.0.0.15-src.tar.gz) = a47fcb7ad8e556d25a99b04ce6bd600670951068
+Size (TeXmacs-1.0.0.15-src.tar.gz) = 1594113 bytes
+SHA1 (patch-aa) = 04304eae8e64e9683d8d45f0ae71c0c560dc0ed3
diff --git a/editors/TeXmacs/patches/patch-aa b/editors/TeXmacs/patches/patch-aa
index 07e10c8cb7d..9c9d7bedb6f 100644
--- a/editors/TeXmacs/patches/patch-aa
+++ b/editors/TeXmacs/patches/patch-aa
@@ -1,11 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/27 09:53:44 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/06 11:59:39 wiz Exp $
 
---- configure.in.orig	Thu Apr 25 22:14:51 2002
-+++ configure.in	Thu Apr 25 22:15:25 2002
-@@ -271,12 +271,12 @@
-     AC_MSG_RESULT(final setup for an unsupported host)
-     CONFIG_OS="unknown"
-     CONFIG_CX="$X_CFLAGS"
+--- configure.in.orig	Fri Aug 30 14:17:59 2002
++++ configure.in	Fri Aug 30 14:18:36 2002
+@@ -405,12 +405,12 @@
+     CONFIG_CXXOPTIMIZE="-O2"
      CONFIG_LFLAGS=""
      CONFIG_LSTATIC="-static"
 -    CONFIG_LSHARED="-shared"
@@ -17,3 +15,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/27 09:53:44 rh Exp $
 -    CONFIG_BSHARED="-Wl,-Bdynamic"
 +    CONFIG_BSHARED="-Wl,-Bdynamic ${LDFLAGS}"
      CONFIG_BPATH="-Wl,-rpath,"
+     CONFIG_BX="$X_LIBS -lXext -lX11"
+     CONFIG_WORD_LENGTH="4"