Index: branches/2019Q4/editors/thoteditor/Makefile
===================================================================
--- branches/2019Q4/editors/thoteditor/Makefile	(revision 513566)
+++ branches/2019Q4/editors/thoteditor/Makefile	(revision 513567)
@@ -1,52 +1,51 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	thoteditor
 PORTVERSION=	2.1e
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors www
 MASTER_SITES=	ftp://ftp.inrialpes.fr/pub/opera/sources/thot/ \
 		ftp://ftp.ruhr-uni-bochum.de/local/jk.collection/thot/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Structured document editor, offering a graphical WYSIWYG interface
 
-BROKEN=		/usr/bin/ld: cannot find -lXp
-
 THOT_SUBDIR=	Target
-USES=		gmake motif
+USES=		gmake motif xorg
+USE_XORG=	ice sm x11 xext xt
 WRKSRC=		${WRKDIR}/Thot/${THOT_SUBDIR}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-thot --enable-plugin --without-insure --without-amaya \
 		--disable-java --disable-intr --disable-jit --disable-math \
 		--disable-ilu
 ALL_TARGET=	all schemas
 SUB_FILES=	thoteditor
 MAKE_JOBS_UNSAFE=	yes
 
 post-extract:
 	@${MKDIR} ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} 's|-g -O|${CFLAGS}|' \
 		${WRKDIR}/Thot/configure
 	@${REINPLACE_CMD} 's|%%MOTIFLIB%%|${MOTIFLIB}|' \
 		${WRKDIR}/Thot/thot/Makefile.in
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \
 		${WRKDIR}/Thot/thotlib/base/registry.c
 	@${REINPLACE_CMD} 's|/usr/wsrc/|/usr/tmp/|' \
 		${WRKDIR}/Thot/thotlib/include/sysdep.h
 
 do-configure:
 	(cd ${WRKSRC};../configure ${CONFIGURE_ARGS})
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/thot/doc
 	${INSTALL_SCRIPT} ${WRKDIR}/thoteditor ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/Thot/tools/cextract-1.7/cextract.man \
 		${STAGEDIR}${PREFIX}/man/man1/cextract.1
 	${INSTALL_MAN} ${WRKDIR}/Thot/tools/cextract-1.7/cextrc.5 \
 		${STAGEDIR}${PREFIX}/man/man5
 
 .include <bsd.port.mk>
Index: branches/2019Q4/editors/thoteditor/files/patch-thot-Makefile.in
===================================================================
--- branches/2019Q4/editors/thoteditor/files/patch-thot-Makefile.in	(revision 513566)
+++ branches/2019Q4/editors/thoteditor/files/patch-thot-Makefile.in	(revision 513567)
@@ -1,70 +1,70 @@
 --- ../thot/Makefile.in.orig	1997-11-19 11:41:49.000000000 +0100
 +++ ../thot/Makefile.in	2014-05-08 10:28:49.671753071 +0200
 @@ -14,7 +14,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%% -lXm -lXp -lXm $(X_LIBS) -lXt -lXext $(X_PRE_LIBS) \
++          %%MOTIFLIB%% -lXm -lXm $(X_LIBS) -lXt -lXext $(X_PRE_LIBS) \
  	  -lX11 $(X_EXTRA_LIBS) @LIBS@ @EXTRA_LIBS@ -lm
  
  prefix = @prefix@
 @@ -27,6 +27,7 @@
  CONFIGFILES= \
      XKeysymDB  thot.ini  thot.color  thot.pattern  thot.keyboard \
      fr-thotdialogue  en-appdialogue  en-compildialogue  en-corrdialogue \
 +    en-cssmessage \
      en-drawdialogue  en-grmdialogue  en-inddialogue  en-itfdialogue \
      en-libdialogue  en-printdialogue  en-prsdialogue  en-strdialogue \
      en-thotdialogue  en-thotmessage  en-thotversion  en-transdialogue \
 @@ -54,31 +55,33 @@
  	$(RM) *.o EDITORAPP.c EDITOR.A
  
  install : all
 -	@(if test ! -d $(datadir) ; then $(MKDIR) $(datadir) ; fi)
 -	@(if test ! -d $(datadir)/thot ; then $(MKDIR) $(datadir)/thot ; fi)
 -	@(if test ! -d $(datadir)/thot/config ; then $(MKDIR) $(datadir)/thot/config ; fi)
 -	@(if test ! -d $(datadir)/thot/fonts ; then $(MKDIR) $(datadir)/thot/fonts ; fi)
 -	@(if test ! -d $(datadir)/thot/dicopar ; then $(MKDIR) $(datadir)/thot/dicopar ; fi)
 -	@(if test ! -d $(datadir)/thot/applis ; then $(MKDIR) $(datadir)/thot/applis ; fi)
 -	@(if test ! -d $(datadir)/thot/applis/bin ; then $(MKDIR) $(datadir)/thot/applis/bin ; fi)
 -	@(if test ! -d $(datadir)/schemas ; then $(MKDIR) $(datadir)/schemas ; fi)
 -	$(INSTALL_BIN) ../bin/thot $(datadir)/thot/applis/bin
 -	$(INSTALL_BIN) ../bin/print $(datadir)/thot/applis/bin
 +	(if test ! -d $(DESTDIR)$(datadir) ; then $(MKDIR) $(DESTDIR)$(datadir) ; fi)
 +	(if test ! -d $(DESTDIR)$(datadir)/thot ; then $(MKDIR) $(DESTDIR)$(datadir)/thot ; fi)
 +	(if test ! -d $(DESTDIR)$(datadir)/thot/config ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/config ; fi)
 +	(if test ! -d $(DESTDIR)$(datadir)/thot/fonts ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/fonts ; fi)
 +	(if test ! -d $(DESTDIR)$(datadir)/thot/dicopar ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/dicopar ; fi)
 +	(if test ! -d $(DESTDIR)$(datadir)/thot/applis ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis ; fi)
 +	(if test ! -d $(DESTDIR)$(datadir)/thot/applis/bin ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/applis/bin ; fi)
 +	(if test ! -d $(DESTDIR)$(datadir)/thot/schemas ; then $(MKDIR) $(DESTDIR)$(datadir)/thot/schemas ; fi)
 +	$(BSD_INSTALL_PROGRAM) ../bin/thot $(DESTDIR)$(datadir)/thot/applis/bin
 +	$(BSD_INSTALL_PROGRAM) ../bin/print $(DESTDIR)$(datadir)/thot/applis/bin
 +	$(INSTALL_DATA) EDITOR.h $(DESTDIR)$(datadir)/thot/schemas
 +	$(INSTALL_DATA) ExtCss.h $(DESTDIR)$(datadir)/thot/schemas
  	(for i in $(SCHEMAS) ; do \
  	  for file in `$(ECHO) $(THOTDIR)/schemas/$$i` ; do \
 -	    $(INSTALL_DATA) $$file $(datadir)/thot/schemas ; \
 +	    $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/schemas ; \
  	  done ; done)
  	(for i in $(CONFIGFILES) ; do \
 -	  for file in `$(ECHO) $(THOTDIR)/thot/config/$$i` ; do \
 -	    $(INSTALL_DATA) $$file $(datadir)/thot/config ; \
 +	  for file in `$(ECHO) $(THOTDIR)/config/$$i` ; do \
 +	    $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/config ; \
  	  done ; done)
  	(for i in $(DICOFILES) ; do \
 -	  for file in `$(ECHO) $(THOTDIR)/thot/dicopar/$$i` ; do \
 -	    $(INSTALL_DATA) $$file $(datadir)/thot/dicopar ; \
 +	  for file in `$(ECHO) $(THOTDIR)/dicopar/$$i` ; do \
 +	    $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/dicopar ; \
  	  done ; done)
  	(for i in $(FONTSFILES) ; do \
 -	  for file in `$(ECHO) $(THOTDIR)/thot/fonts/$$i` ; do \
 -	    $(INSTALL_DATA) $$file $(datadir)/thot/fonts ; \
 +	  for file in `$(ECHO) $(THOTDIR)/fonts/$$i` ; do \
 +	    $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/thot/fonts ; \
  	  done ; done)
  
  uninstall :
Index: branches/2019Q4
===================================================================
--- branches/2019Q4	(revision 513566)
+++ branches/2019Q4	(revision 513567)

Property changes on: branches/2019Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r513561