5 files changed, 213 insertions, 82 deletions

diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index 665914387219..00a75e48abaa 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -3,18 +3,21 @@
 # Date created:		1 Aug 1997
 # Whom:			Pedro Giffuni (orig)
 #
-# $Id: Makefile,v 1.5 1999/01/30 01:48:43 fenner Exp $
+# $Id: Makefile,v 1.6 1999/02/03 11:11:42 asami Exp $
 #
 
 DISTNAME=	Thot
-PKGNAME=	thoteditor-2.1b
+PKGNAME=	thoteditor-2.1e
 CATEGORIES=	editors www
-MASTER_SITES=	ftp://ftp.ruhr-uni-bochum.de/local/jk.collection/thot/ \
+MASTER_SITES=	ftp://ftp.inrialpes.fr/pub/opera/sources/thot/ \
+		${MASTER_SITE_SUNSITE} \
+		ftp://ftp.ruhr-uni-bochum.de/local/jk.collection/thot/ \
 		ftp://ftp.uni-stuttgart.de/pub/comm/infosystems/www/clients/amaya/thot/ \
 		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/editors/opera.inrialpes.fr/sources/thot/ \
 		ftp://ftp.agix.net/pub/infosystems/www/clients/amaya/thot/
-DISTFILES=	thot-src-2.1b.tar.gz		\
-		thoteditor-src-2.1b.tar.gz
+MASTER_SITE_SUBDIR=	apps/editors/X/thot
+DISTFILES=	thot-src-2.1e.tar.gz		\
+		thoteditor-src-2.1e.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/editors/thoteditor/distinfo b/editors/thoteditor/distinfo
index 118abc7d879b..6cc3baf507d5 100644
--- a/editors/thoteditor/distinfo
+++ b/editors/thoteditor/distinfo
@@ -1,2 +1,2 @@
-MD5 (thot-src-2.1b.tar.gz) = bface09ac6eab190c6f709a1e5aeb89b
-MD5 (thoteditor-src-2.1b.tar.gz) = ce17416303e30cdf97ebbe4aee84be79
+MD5 (thot-src-2.1e.tar.gz) = 846bb18d7c4163ba5427c4509640b96a
+MD5 (thoteditor-src-2.1e.tar.gz) = bc2e0ceed36f7e0b85c81229554ca774
diff --git a/editors/thoteditor/files/patch-ab b/editors/thoteditor/files/patch-ab
new file mode 100644
index 000000000000..a6d105d81f97
--- /dev/null
+++ b/editors/thoteditor/files/patch-ab
@@ -0,0 +1,11 @@
+--- thot/Makefile.in.orig	Fri May 16 07:00:19 1997
++++ thot/Makefile.in	Fri Feb 12 15:11:54 1999
+@@ -13,7 +13,7 @@
+           -I@top_srcdir@/drawlib -I@top_srcdir@/drawlib/f
+ LDFLAGS = @LDFLAGS@ -L../indexlib -L../drawlib -L../tablelib -L../thotlib -L..
+ LIBS	= -lThotIndex -lThotDraw -lThotTable -lThotEditor @IMGLIBS@ \
+-          $(MOTIF_LIBRARIES) -lXm $(X_LIBS) -lXt -lXext $(X_PRE_LIBS) \
++          ${MOTIFLIB} $(X_LIBS) -lXp -lXt -lXext $(X_PRE_LIBS) \
+ 	  -lX11 $(X_EXTRA_LIBS) @LIBS@ @EXTRA_LIBS@ -lm
+ 
+ prefix = @prefix@
diff --git a/editors/thoteditor/files/patch-ac b/editors/thoteditor/files/patch-ac
new file mode 100644
index 000000000000..9069c68f8293
--- /dev/null
+++ b/editors/thoteditor/files/patch-ac
@@ -0,0 +1,11 @@
+--- makes/Makefile.template.orig	Tue May  6 23:55:03 1997
++++ makes/Makefile.template	Fri Feb 12 15:06:58 1999
+@@ -56,7 +56,7 @@
+ # MOTIFLIBS : how to grab Motif at link time.
+ #             X11R6 probably need -lSM -lICE
+ #
+-MOTIFLIBS = -L/usr/X11/lib -lXm -lXt			# generic
++MOTIFLIBS = ${MOTIFLIB} -L/usr/X11/lib -lXt -lXp			# generic
+ #MOTIFLIBS = -L/usr/X11R6/lib -lXm -lXt -lSM -lICE	# Linux
+ #MOTIFLIBS = -L/usr/dt/lib -L/usr/openwin/lib -lXm -lXt	# Solaris
+ #MOTIFLIBS = -L/usr/X11/lib -lXm -lXt			# SunOs
diff --git a/editors/thoteditor/pkg-plist b/editors/thoteditor/pkg-plist
index 0b14202577fc..15d31230c0d9 100644
--- a/editors/thoteditor/pkg-plist
+++ b/editors/thoteditor/pkg-plist
@@ -92,127 +92,233 @@ share/thot/fonts/icones.ff
 share/thot/fonts/icones.pcf
 share/thot/fonts/icones1.fb
 share/thot/fonts/icones11.fb
+share/thot/schemas/Makefile
+share/thot/schemas/Text_ASCII.inc
+share/thot/schemas/Text_SGML.inc
 share/thot/schemas/Arbre2.S
+share/thot/schemas/Draw2.S
+share/thot/schemas/Draw3.S
+share/thot/schemas/Expose.S
+share/thot/schemas/ExtIndex.S
+share/thot/schemas/Feuille.S
+share/thot/schemas/Fichier.S
+share/thot/schemas/Lettre.S
+share/thot/schemas/Math.S
+share/thot/schemas/Palette.S
+share/thot/schemas/Paragraphe.S
+share/thot/schemas/Rapport.S
+share/thot/schemas/RefBib.S
+share/thot/schemas/Table.S
 share/thot/schemas/Arbre2.STR
-share/thot/schemas/Arbre2.conf
-share/thot/schemas/Arbre2.en
-share/thot/schemas/Arbre2.fr
+share/thot/schemas/Draw2.STR
+share/thot/schemas/Draw3.STR
+share/thot/schemas/Expose.STR
+share/thot/schemas/ExtIndex.STR
+share/thot/schemas/Feuille.STR
+share/thot/schemas/Fichier.STR
+share/thot/schemas/Lettre.STR
+share/thot/schemas/Math.STR
+share/thot/schemas/Palette.STR
+share/thot/schemas/Paragraphe.STR
+share/thot/schemas/Rapport.STR
+share/thot/schemas/RefBib.STR
+share/thot/schemas/Table.STR
+share/thot/schemas/Arbre2P.P
+share/thot/schemas/Draw2P.P
+share/thot/schemas/Draw3P.P
+share/thot/schemas/ExposeP.P
+share/thot/schemas/ExtIndexP.P
+share/thot/schemas/FeuilleP.P
+share/thot/schemas/FichierP.P
+share/thot/schemas/LettreP.P
+share/thot/schemas/MathP.P
+share/thot/schemas/PaletteP.P
+share/thot/schemas/ParagrLTP.P
+share/thot/schemas/ParagraphP.P
+share/thot/schemas/RapportP.P
+share/thot/schemas/RefBibP.P
+share/thot/schemas/TableP.P
+share/thot/schemas/Arbre2P.PRS
+share/thot/schemas/Draw2P.PRS
+share/thot/schemas/Draw3P.PRS
+share/thot/schemas/ExposePFS.PRS
+share/thot/schemas/ExposePI.PRS
+share/thot/schemas/ExposePIN.PRS
+share/thot/schemas/ExposePINUS.PRS
+share/thot/schemas/ExposePIUS.PRS
+share/thot/schemas/ExposePP.PRS
+share/thot/schemas/ExposePPUS.PRS
+share/thot/schemas/ExtIndexPP.PRS
+share/thot/schemas/ExtIndexPPE.PRS
+share/thot/schemas/ExtIndexPPEUS.PRS
+share/thot/schemas/ExtIndexPPEnoref.PRS
+share/thot/schemas/ExtIndexPPEnorefUS.PRS
+share/thot/schemas/ExtIndexPPUS.PRS
+share/thot/schemas/FeuillePI.PRS
+share/thot/schemas/FeuillePIUS.PRS
+share/thot/schemas/FeuillePP.PRS
+share/thot/schemas/FeuillePPUS.PRS
+share/thot/schemas/FichierP.PRS
+share/thot/schemas/LettreP.PRS
+share/thot/schemas/LettrePE.PRS
+share/thot/schemas/LettrePP.PRS
+share/thot/schemas/LettrePP1.PRS
+share/thot/schemas/LettrePP1E.PRS
+share/thot/schemas/LettrePP1EUS.PRS
+share/thot/schemas/LettrePP1US.PRS
+share/thot/schemas/LettrePPE.PRS
+share/thot/schemas/LettrePPEUS.PRS
+share/thot/schemas/LettrePPUS.PRS
+share/thot/schemas/MathP.PRS
+share/thot/schemas/PaletteP.PRS
+share/thot/schemas/ParagrLTP.PRS
+share/thot/schemas/ParagraphP.PRS
+share/thot/schemas/ParagraphPD.PRS
+share/thot/schemas/RapportP.PRS
+share/thot/schemas/RapportPE.PRS
+share/thot/schemas/RapportPP.PRS
+share/thot/schemas/RapportPPB.PRS
+share/thot/schemas/RapportPPBC.PRS
+share/thot/schemas/RapportPPBCUS.PRS
+share/thot/schemas/RapportPPBE.PRS
+share/thot/schemas/RapportPPBEUS.PRS
+share/thot/schemas/RapportPPBUS.PRS
+share/thot/schemas/RapportPPE.PRS
+share/thot/schemas/RapportPPEUS.PRS
+share/thot/schemas/RapportPPR.PRS
+share/thot/schemas/RapportPPRUS.PRS
+share/thot/schemas/RapportPPUS.PRS
+share/thot/schemas/RefBibP.PRS
+share/thot/schemas/RefBibP1.PRS
+share/thot/schemas/RefBibPCle.PRS
+share/thot/schemas/RefBibPE.PRS
+share/thot/schemas/RefBibPE1.PRS
+share/thot/schemas/RefBibPECle.PRS
+share/thot/schemas/TableP.PRS
+share/thot/schemas/TablePS.PRS
 share/thot/schemas/Arbre2A.T
 share/thot/schemas/Arbre2H.T
-share/thot/schemas/Arbre2P.P
 share/thot/schemas/Arbre2T.T
-share/thot/schemas/Draw2.S
-share/thot/schemas/Draw2.conf
-share/thot/schemas/Draw2.en
-share/thot/schemas/Draw2.fr
 share/thot/schemas/Draw2A.T
 share/thot/schemas/Draw2H.T
-share/thot/schemas/Draw2P.P
 share/thot/schemas/Draw2T.T
 share/thot/schemas/Draw2T1.T
-share/thot/schemas/Draw3.S
-share/thot/schemas/Draw3.STR
-share/thot/schemas/Draw3.conf
-share/thot/schemas/Draw3.en
-share/thot/schemas/Draw3.fr
 share/thot/schemas/Draw3A.T
+share/thot/schemas/MathH.T
 share/thot/schemas/Draw3H.T
-share/thot/schemas/Draw3P.P
-share/thot/schemas/Draw3P.PRS
 share/thot/schemas/Draw3T.T
 share/thot/schemas/Draw3T1.T
-share/thot/schemas/Expose.S
-share/thot/schemas/Expose.conf
-share/thot/schemas/Expose.en
-share/thot/schemas/Expose.fr
 share/thot/schemas/ExposeA.T
 share/thot/schemas/ExposeH.T
 share/thot/schemas/ExposeH1.T
-share/thot/schemas/ExposeP.P
-share/thot/schemas/ExtIndex.S
-share/thot/schemas/ExtIndex.conf
-share/thot/schemas/ExtIndex.en
-share/thot/schemas/ExtIndex.fr
 share/thot/schemas/ExtIndexH.T
-share/thot/schemas/ExtIndexP.P
-share/thot/schemas/Feuille.S
-share/thot/schemas/Feuille.conf
-share/thot/schemas/Feuille.en
-share/thot/schemas/Feuille.fr
 share/thot/schemas/FeuilleA.T
 share/thot/schemas/FeuilleH.T
-share/thot/schemas/FeuilleP.P
-share/thot/schemas/Fichier.S
-share/thot/schemas/Fichier.conf
-share/thot/schemas/Fichier.en
-share/thot/schemas/Fichier.fr
 share/thot/schemas/FichierA.T
 share/thot/schemas/FichierH.T
-share/thot/schemas/FichierP.P
 share/thot/schemas/FichierT.T
-share/thot/schemas/Lettre.S
-share/thot/schemas/Lettre.conf
-share/thot/schemas/Lettre.en
-share/thot/schemas/Lettre.fr
 share/thot/schemas/LettreA.T
-share/thot/schemas/LettreP.P
-share/thot/schemas/Makefile
-share/thot/schemas/Math.S
-share/thot/schemas/Math.conf
-share/thot/schemas/Math.en
-share/thot/schemas/Math.fr
-share/thot/schemas/MathH.T
-share/thot/schemas/MathP.P
 share/thot/schemas/MathT.T
-share/thot/schemas/Palette.S
-share/thot/schemas/Palette.STR
-share/thot/schemas/Palette.conf
-share/thot/schemas/PaletteP.P
-share/thot/schemas/PaletteP.PRS
-share/thot/schemas/ParagrLTP.P
 share/thot/schemas/ParagraphA.T
 share/thot/schemas/ParagraphH.T
-share/thot/schemas/ParagraphP.P
 share/thot/schemas/ParagraphT.T
 share/thot/schemas/ParagraphW.T
-share/thot/schemas/Paragraphe.S
-share/thot/schemas/Paragraphe.conf
-share/thot/schemas/Paragraphe.en
-share/thot/schemas/Paragraphe.fr
-share/thot/schemas/Rapport.S
-share/thot/schemas/Rapport.conf
-share/thot/schemas/Rapport.en
-share/thot/schemas/Rapport.fr
 share/thot/schemas/RapportA.T
 share/thot/schemas/RapportH.T
-share/thot/schemas/RapportP.P
 share/thot/schemas/RapportT.T
 share/thot/schemas/RapportWA.T
-share/thot/schemas/RefBib.S
-share/thot/schemas/RefBib.en
-share/thot/schemas/RefBib.fr
 share/thot/schemas/RefBibA.T
 share/thot/schemas/RefBibB.T
 share/thot/schemas/RefBibBH.T
 share/thot/schemas/RefBibH.T
-share/thot/schemas/RefBibP.P
 share/thot/schemas/RefBibT.T
 share/thot/schemas/RefBibT1.T
 share/thot/schemas/RefBibWA.T
 share/thot/schemas/RefBibWM.T
-share/thot/schemas/Table.S
-share/thot/schemas/Table.conf
-share/thot/schemas/Table.en
-share/thot/schemas/Table.fr
 share/thot/schemas/TableA.T
 share/thot/schemas/TableH.T
-share/thot/schemas/TableP.P
 share/thot/schemas/TableT.T
-share/thot/schemas/Text_ASCII.inc
-share/thot/schemas/Text_SGML.inc
+share/thot/schemas/Arbre2A.TRA
+share/thot/schemas/Arbre2H.TRA
+share/thot/schemas/Arbre2T.TRA
+share/thot/schemas/Draw2A.TRA
+share/thot/schemas/Draw2H.TRA
+share/thot/schemas/Draw2T.TRA
+share/thot/schemas/Draw2T1.TRA
+share/thot/schemas/ExposeA.TRA
+share/thot/schemas/ExposeH.TRA
+share/thot/schemas/ExposeH1.TRA
+share/thot/schemas/ExtIndexH.TRA
+share/thot/schemas/FeuilleA.TRA
+share/thot/schemas/FeuilleH.TRA
+share/thot/schemas/FichierA.TRA
+share/thot/schemas/FichierH.TRA
+share/thot/schemas/FichierT.TRA
+share/thot/schemas/LettreA.TRA
+share/thot/schemas/MathH.TRA
+share/thot/schemas/MathT.TRA
+share/thot/schemas/ParagraphA.TRA
+share/thot/schemas/ParagraphH.TRA
+share/thot/schemas/ParagraphT.TRA
+share/thot/schemas/ParagraphW.TRA
+share/thot/schemas/RapportA.TRA
+share/thot/schemas/RapportH.TRA
+share/thot/schemas/RapportHM.TRA
+share/thot/schemas/RapportT.TRA
+share/thot/schemas/RefBibA.TRA
+share/thot/schemas/RefBibB.TRA
+share/thot/schemas/RefBibBH.TRA
+share/thot/schemas/RefBibH.TRA
+share/thot/schemas/RefBibT.TRA
+share/thot/schemas/RefBibT1.TRA
+share/thot/schemas/RefBibWA.TRA
+share/thot/schemas/RefBibWM.TRA
+share/thot/schemas/TableA.TRA
+share/thot/schemas/TableH.TRA
+share/thot/schemas/TableT.TRA
+share/thot/schemas/Arbre2.conf
+share/thot/schemas/Draw2.conf
+share/thot/schemas/Draw3.conf
+share/thot/schemas/Expose.conf
+share/thot/schemas/ExtIndex.conf
+share/thot/schemas/Feuille.conf
+share/thot/schemas/Fichier.conf
+share/thot/schemas/Lettre.conf
+share/thot/schemas/Math.conf
+share/thot/schemas/Palette.conf
+share/thot/schemas/Paragraphe.conf
+share/thot/schemas/Rapport.conf
+share/thot/schemas/Table.conf
+share/thot/schemas/Arbre2.fr
+share/thot/schemas/Draw2.fr
+share/thot/schemas/Draw3.fr
+share/thot/schemas/Expose.fr
+share/thot/schemas/ExtIndex.fr
+share/thot/schemas/Feuille.fr
+share/thot/schemas/Fichier.fr
+share/thot/schemas/Lettre.fr
+share/thot/schemas/Math.fr
+share/thot/schemas/Paragraphe.fr
+share/thot/schemas/Rapport.fr
+share/thot/schemas/RefBib.fr
+share/thot/schemas/Table.fr
+share/thot/schemas/Arbre2.en
+share/thot/schemas/Draw2.en
+share/thot/schemas/Draw3.en
+share/thot/schemas/Expose.en
+share/thot/schemas/ExtIndex.en
+share/thot/schemas/Feuille.en
+share/thot/schemas/Fichier.en
+share/thot/schemas/Lettre.en
+share/thot/schemas/Math.en
+share/thot/schemas/Paragraphe.en
+share/thot/schemas/Rapport.en
+share/thot/schemas/RefBib.en
+share/thot/schemas/Table.en
 @dirrm share/thot/schemas
 @dirrm share/thot/fonts
 @dirrm share/thot/doc
 @exec mkdir -p %D/share/thot/doc
 @dirrm share/thot/dicopar
 @dirrm share/thot/config
+@dirrm share/thot