[pkgsrc/trunk]: pkgsrc/editors/TeXmacs TeXmacs: Upgrade to 1.99.11

[kamil <kamil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/77f48015fccc
branches:  trunk
changeset: 416671:77f48015fccc
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Mon Oct 28 15:10:00 2019 +0000

description:
TeXmacs: Upgrade to 1.99.11

Switch from qt4 to qt5.
Switch to CMake.

Add hacks to build with guile1.8.

CHANGELOG
=========

Several bug fixes (1.99.11).

Repositories for Debian and Ubuntu (1.99.11).

Many bug fixes (1.99.10).

Redesigned web site (1.99.10).

Extended Css stylability when exporting to Html (1.99.10).

New TeXmacs videos on web site (1.99.10).

Drag and drop for images (1.99.10).

Unification of beamer and poster styles, work in progress (1.99.10).

Automatic retrieval of artwork from texmacs.org (1.99.10).

New background patterns and pictures (1.99.10).

Experimental pattern effects (1.99.10).

Experimental Sparkle support under MacOS (1.99.10).

Experimental and partial support for Git as a versioning tool (1.99.10).

Experimantal Graph plug-in for graphs drawn by various external tools (1.99.10).

User interface for new features in educational styles (1.99.10).

Many bug fixes (1.99.9).

Similar spell checking widgets as for search and replace (1.99.9).

Improved educational styles (1.99.9).

Multiple choice lists (1.99.9).

A unified Graph plugin for Graphviz, Asymptote (1.99.9).

Import improvements from the FriCAS project (1.99.9).

Fixes and documentation for the Sage plugin (1.99.9).

Several bug fixes (1.99.8).

Support of binary packages for various GNU/Linux distributions, constructed using Suse OpenBuild services (1.99.8).

Several new algorithms for micro typography: roots, mathematical accents, etc. (1.99.7).

New style for posters (1.99.7).

Support for new ACM styles (1.99.7).

Various bug fixes (1.99.7).

New page breaker with better support for floating objects and footnotes (1.99.6).

Improved native Pdf generation based on Hummus (1.99.6).

Several new algorithms for micro typography: subscripts, superscripts, etc. (1.99.6).

Improved support for TeX Gyre fonts (1.99.6).

Various bug fixes (1.99.6).

diffstat:

 editors/TeXmacs/Makefile                                         |   75 +-
 editors/TeXmacs/PLIST                                            |  729 ++++++++-
 editors/TeXmacs/distinfo                                         |   22 +-
 editors/TeXmacs/patches/patch-aa                                 |   17 -
 editors/TeXmacs/patches/patch-ab                                 |   48 -
 editors/TeXmacs/patches/patch-ac                                 |   13 -
 editors/TeXmacs/patches/patch-ad                                 |   14 -
 editors/TeXmacs/patches/patch-ae                                 |   16 -
 editors/TeXmacs/patches/patch-aj                                 |   40 -
 editors/TeXmacs/patches/patch-al                                 |   14 -
 editors/TeXmacs/patches/patch-cmake_FindGuile.cmake              |   21 +
 editors/TeXmacs/patches/patch-misc_CMakeLists.txt                |   22 +
 editors/TeXmacs/patches/patch-src_Plugins_Qt_QTMSockets.cpp      |   12 -
 editors/TeXmacs/patches/patch-src_System_Link_socket__server.cpp |   13 -
 editors/TeXmacs/patches/patch-src_makefile.in                    |   13 -
 15 files changed, 692 insertions(+), 377 deletions(-)

diffs (truncated from 1816 to 300 lines):

diff -r 272a80ab5a9e -r 77f48015fccc editors/TeXmacs/Makefile
--- a/editors/TeXmacs/Makefile  Mon Oct 28 14:38:41 2019 +0000
+++ b/editors/TeXmacs/Makefile  Mon Oct 28 15:10:00 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.128 2019/08/11 13:20:53 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2019/10/28 15:10:00 kamil Exp $
 #
 # changelog at http://www.texmacs.org/tmweb/about/changes.en.html
 
-DISTNAME=              TeXmacs-1.99.5-src
+DISTNAME=              TeXmacs-1.99.11-src
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           14
 CATEGORIES=            editors
 MASTER_SITES=          ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/
 MASTER_SITES+=         http://www.texmacs.org/Download/ftp/tmftp/source/
@@ -15,81 +14,53 @@
 
 DEPENDS+=              ps2pkm>=1.5:../../fonts/ps2pkm
 
-BUILD_TARGET=          TEXMACS
+#BUILD_TARGET=         TEXMACS
 
+USE_CMAKE=             yes
 USE_TOOLS+=            gmake perl:run pkg-config bash
 USE_LANGUAGES=         c c++
-GNU_CONFIGURE=         yes
-CONFIGURE_ENV+=                ac_cv_path_RCC=${QTDIR}/bin/rcc
-# XXX workaround for bug in configure
-CONFIGURE_ARGS+=       --datadir=${PREFIX}/share
-CONFIGURE_ARGS+=       --with-qt=${QTDIR}
-BUILD_MAKE_FLAGS+=     QT_QTDIR=${QTDIR}
-
-# in 1.99.5 this fails with
-# ./configure: 4562: Syntax error: Bad substitution
-CONFIG_SHELL=          ${BASH}
 
 REPLACE_PYTHON=                plugins/python/bin/tm_python
 REPLACE_PYTHON+=       plugins/sage/bin/tm_sage
 REPLACE_PYTHON+=       plugins/mathematica/bin/realpath.py
 
+REPLACE_BASH+=         plugins/dratex/bin/tm_dratex
+REPLACE_BASH+=         plugins/eukleides/bin/tm_eukleides
+REPLACE_BASH+=         plugins/eukleides/bin/tm_eukleides.old
+REPLACE_BASH+=         plugins/mupad/bin/tm_mupad_help
+REPLACE_BASH+=         plugins/texgraph/bin/tm_texgraph
+
+REPLACE_PERL+=         plugins/feynmf/bin/bbox_add.pl
+
 SUBST_CLASSES+=                init
 SUBST_STAGE.init=      pre-configure
 SUBST_FILES.init=      plugins/python/progs/init-python.scm
 SUBST_VARS.init=       PYTHONBIN
 
-REPLACE_SH+=           plugins/asymptote/bin/tm_asy
-REPLACE_SH+=           plugins/dratex/bin/tm_dratex
-REPLACE_SH+=           plugins/eukleides/bin/tm_eukleides
-REPLACE_SH+=           plugins/eukleides/bin/tm_eukleides.old
-REPLACE_SH+=           plugins/gnuplot/bin/tm_gnuplot
-REPLACE_SH+=           plugins/lisp/bin/tm_lisp
-REPLACE_SH+=           plugins/lush/bin/tm_lush
-REPLACE_SH+=           plugins/matlab/bin/tm_matlab
-REPLACE_SH+=           plugins/maxima/bin/maxima_detect
-REPLACE_SH+=           plugins/maxima/bin/tm_maxima
-REPLACE_SH+=           plugins/mupad/bin/tm_mupad
-REPLACE_SH+=           plugins/mupad/bin/tm_mupad_help
-REPLACE_SH+=           plugins/octave/bin/tm_octave
-REPLACE_SH+=           plugins/reduce/bin/tm_reduce
-REPLACE_SH+=           plugins/texgraph/bin/tm_texgraph
-REPLACE_SH+=           plugins/xypic/bin/tm_xypic
-REPLACE_SH+=           misc/admin/sign_update
-REPLACE_SH+=           misc/scripts/gs
+SUBST_CLASSES+=                guile
+SUBST_STAGE.guile=     pre-configure
+SUBST_FILES.guile=     cmake/FindGuile.cmake
+SUBST_VARS.guile=      PREFIX
 
-REPLACE_PERL+=         plugins/asymptote/bin/perl-tm_asy
-REPLACE_PERL+=         plugins/asymptote/bin/tm_asy2
-REPLACE_PERL+=         plugins/feynmf/bin/bbox_add.pl
-
-SUBST_CLASSES+=                linkpath
-SUBST_SED.linkpath+=   -e "s,-lguile,-L${PREFIX}/guile/1.8/lib -lguile,g"
-SUBST_FILES.linkpath+= configure
-SUBST_MESSAGE.linkpath=        Search for guile library in proper directory.
-SUBST_STAGE.linkpath=  pre-configure
-
-SUBST_CLASSES+=                bash
+SUBST_CLASSES+=        bash
 SUBST_SED.bash+=       -e "s,/bin/bash,${PREFIX}/bin/bash,"
-SUBST_FILES.bash+=     src/makefile.in src/Texmacs/Texmacs/texmacs.cpp Makefile.in
+SUBST_FILES.bash+=     src/Texmacs/Texmacs/texmacs.cpp
 SUBST_MESSAGE.bash=    Fixing hardcoded bash path.
 SUBST_STAGE.bash=      pre-configure
 
-pre-build:
-       find ${WRKSRC} -name ._* -exec rm {} \;
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/guile/1.8/lib/
 
-# do not install backup files
+# do not install cmake files
 post-install:
-       ${RM} ${DESTDIR}${PREFIX}/share/TeXmacs/plugins/python/progs/init-python.scm.orig
+       ${FIND} ${DESTDIR} -name cmake_install.cmake -type f | ${XARGS} ${RM} -f
+       ${FIND} ${DESTDIR} -name CMakeFiles -type d | ${XARGS} ${RM} -rf
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
-# as of 1.99.5
-# configure: error: TeXmacs is incompatible with Guile 2.
-#.include "../../lang/guile20/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../print/ghostscript/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 272a80ab5a9e -r 77f48015fccc editors/TeXmacs/PLIST
--- a/editors/TeXmacs/PLIST     Mon Oct 28 14:38:41 2019 +0000
+++ b/editors/TeXmacs/PLIST     Mon Oct 28 15:10:00 2019 +0000
@@ -1,53 +1,19 @@
-@comment $NetBSD: PLIST,v 1.44 2016/07/16 21:13:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.45 2019/10/28 15:10:00 kamil Exp $
 bin/fig2ps
 bin/texmacs
+bin/tm_gs
 include/TeXmacs.h
-libexec/TeXmacs/bin/add_to_insert_menu.sci
-libexec/TeXmacs/bin/bbox_add.pl
-libexec/TeXmacs/bin/init-scilab.sce
-libexec/TeXmacs/bin/maxima_detect
-libexec/TeXmacs/bin/perl-tm_asy
-libexec/TeXmacs/bin/plotout.sci
-libexec/TeXmacs/bin/populates_demo_menu.sci
-libexec/TeXmacs/bin/r_install
-libexec/TeXmacs/bin/realpath
-libexec/TeXmacs/bin/realpath.py
-libexec/TeXmacs/bin/rm_from_insert_menu.sci
-libexec/TeXmacs/bin/scilab-demo.sce
-libexec/TeXmacs/bin/texmacs.bin
-libexec/TeXmacs/bin/tm_asy
-libexec/TeXmacs/bin/tm_asy2
-libexec/TeXmacs/bin/tm_axiom
-libexec/TeXmacs/bin/tm_dratex
-libexec/TeXmacs/bin/tm_eukleides
-libexec/TeXmacs/bin/tm_eukleides.old
-libexec/TeXmacs/bin/tm_feynmf
-libexec/TeXmacs/bin/tm_gnuplot
-libexec/TeXmacs/bin/tm_graphviz
-libexec/TeXmacs/bin/tm_gs
-libexec/TeXmacs/bin/tm_lisp
-libexec/TeXmacs/bin/tm_lush
-libexec/TeXmacs/bin/tm_maple
-libexec/TeXmacs/bin/tm_maple_5
-libexec/TeXmacs/bin/tm_mathematica
-libexec/TeXmacs/bin/tm_matlab
-libexec/TeXmacs/bin/tm_maxima
-libexec/TeXmacs/bin/tm_mupad
-libexec/TeXmacs/bin/tm_mupad_help
-libexec/TeXmacs/bin/tm_octave
-libexec/TeXmacs/bin/tm_octave.bat
-libexec/TeXmacs/bin/tm_python
-libexec/TeXmacs/bin/tm_python.bat
-libexec/TeXmacs/bin/tm_r
-libexec/TeXmacs/bin/tm_reduce
-libexec/TeXmacs/bin/tm_sage
-libexec/TeXmacs/bin/tm_shell
-libexec/TeXmacs/bin/tm_texgraph
-libexec/TeXmacs/bin/tm_xypic
-libexec/TeXmacs/bin/tmstree.sci
+lib/texmacs/TeXmacs/bin/texmacs.bin
 man/man1/fig2ps.1
 man/man1/texmacs.1
+share/TeXmacs/CMakeLists.txt
+share/TeXmacs/COPYING
+share/TeXmacs/INSTALL
 share/TeXmacs/LICENSE
+share/TeXmacs/Makefile
+share/TeXmacs/README
+share/TeXmacs/SVNREV
+share/TeXmacs/TEX_FONTS
 share/TeXmacs/doc/about/about-summary.de.tm
 share/TeXmacs/doc/about/about-summary.en.tm
 share/TeXmacs/doc/about/about-summary.es.tm
@@ -299,7 +265,7 @@
 share/TeXmacs/doc/about/welcome/welcome.es.tm
 share/TeXmacs/doc/about/welcome/welcome.fr.tm
 share/TeXmacs/doc/about/welcome/welcome.it.tm
-share/TeXmacs/doc/about/welcome/welcome.zh.tm
+share/TeXmacs/doc/about/welcome/welcome.zh.tmml
 share/TeXmacs/doc/devel/format/basics/basics.de.tm
 share/TeXmacs/doc/devel/format/basics/basics.en.tm
 share/TeXmacs/doc/devel/format/basics/basics.zh.tm
@@ -784,6 +750,7 @@
 share/TeXmacs/doc/main/editing/man-versioning.fr.tm
 share/TeXmacs/doc/main/editing/man-versioning.zh.tm
 share/TeXmacs/doc/main/faq/faq.en.tm
+share/TeXmacs/doc/main/faq/faq.zh.tm
 share/TeXmacs/doc/main/graphics/man-graphics-edit.en.tm
 share/TeXmacs/doc/main/graphics/man-graphics-edit.zh.tm
 share/TeXmacs/doc/main/graphics/man-graphics-group.en.tm
@@ -917,8 +884,9 @@
 share/TeXmacs/doc/main/man-manual.es.tm
 share/TeXmacs/doc/main/man-manual.fr.tm
 share/TeXmacs/doc/main/man-manual.it.tm
+share/TeXmacs/doc/main/man-manual.pl.tm
 share/TeXmacs/doc/main/man-manual.pt.tm
-share/TeXmacs/doc/main/man-manual.zh.tm
+share/TeXmacs/doc/main/man-manual.zh.tmml
 share/TeXmacs/doc/main/man-reference.de.tm
 share/TeXmacs/doc/main/man-reference.en.tm
 share/TeXmacs/doc/main/man-reference.zh.tm
@@ -927,7 +895,9 @@
 share/TeXmacs/doc/main/man-user-manual.es.tm
 share/TeXmacs/doc/main/man-user-manual.fr.tm
 share/TeXmacs/doc/main/man-user-manual.it.tm
+share/TeXmacs/doc/main/man-user-manual.pl.tm
 share/TeXmacs/doc/main/man-user-manual.pt.tm
+share/TeXmacs/doc/main/man-user-manual.zh.tm
 share/TeXmacs/doc/main/math/keyboard/man-big.de.tm
 share/TeXmacs/doc/main/math/keyboard/man-big.en.tm
 share/TeXmacs/doc/main/math/keyboard/man-big.es.tm
@@ -981,9 +951,11 @@
 share/TeXmacs/doc/main/math/semantics/man-customized-semantics.en.tm
 share/TeXmacs/doc/main/math/semantics/man-customized-semantics.zh.tm
 share/TeXmacs/doc/main/math/semantics/man-semantics-symbols.en.tm
+share/TeXmacs/doc/main/math/semantics/man-semantics-symbols.zh.tm
 share/TeXmacs/doc/main/math/semantics/man-semantics.en.tm
 share/TeXmacs/doc/main/math/semantics/man-semantics.zh.tm
 share/TeXmacs/doc/main/math/semantics/man-syntax-correction.en.tm
+share/TeXmacs/doc/main/math/semantics/man-syntax-correction.zh.tm
 share/TeXmacs/doc/main/scheme/man-files.de.tm
 share/TeXmacs/doc/main/scheme/man-files.en.tm
 share/TeXmacs/doc/main/scheme/man-files.es.tm
@@ -1030,7 +1002,7 @@
 share/TeXmacs/doc/main/start/man-conventions.it.tm
 share/TeXmacs/doc/main/start/man-conventions.pl.tm
 share/TeXmacs/doc/main/start/man-conventions.pt.tm
-share/TeXmacs/doc/main/start/man-conventions.zh.tm
+share/TeXmacs/doc/main/start/man-conventions.zh.tmml
 share/TeXmacs/doc/main/start/man-files.de.tm
 share/TeXmacs/doc/main/start/man-files.en.tm
 share/TeXmacs/doc/main/start/man-files.es.tm
@@ -1038,7 +1010,7 @@
 share/TeXmacs/doc/main/start/man-files.it.tm
 share/TeXmacs/doc/main/start/man-files.pl.tm
 share/TeXmacs/doc/main/start/man-files.pt.tm
-share/TeXmacs/doc/main/start/man-files.zh.tm
+share/TeXmacs/doc/main/start/man-files.zh.tmml
 share/TeXmacs/doc/main/start/man-getting-started.de.tm
 share/TeXmacs/doc/main/start/man-getting-started.en.tm
 share/TeXmacs/doc/main/start/man-getting-started.es.tm
@@ -1046,7 +1018,7 @@
 share/TeXmacs/doc/main/start/man-getting-started.it.tm
 share/TeXmacs/doc/main/start/man-getting-started.pl.tm
 share/TeXmacs/doc/main/start/man-getting-started.pt.tm
-share/TeXmacs/doc/main/start/man-getting-started.zh.tm
+share/TeXmacs/doc/main/start/man-getting-started.zh.tmml
 share/TeXmacs/doc/main/start/man-print.de.tm
 share/TeXmacs/doc/main/start/man-print.en.tm
 share/TeXmacs/doc/main/start/man-print.es.tm
@@ -1054,7 +1026,7 @@
 share/TeXmacs/doc/main/start/man-print.it.tm
 share/TeXmacs/doc/main/start/man-print.pl.tm
 share/TeXmacs/doc/main/start/man-print.pt.tm
-share/TeXmacs/doc/main/start/man-print.zh.tm
+share/TeXmacs/doc/main/start/man-print.zh.tmml
 share/TeXmacs/doc/main/start/man-setup.de.tm
 share/TeXmacs/doc/main/start/man-setup.en.tm
 share/TeXmacs/doc/main/start/man-setup.es.tm
@@ -1062,7 +1034,7 @@
 share/TeXmacs/doc/main/start/man-setup.it.tm
 share/TeXmacs/doc/main/start/man-setup.pl.tm
 share/TeXmacs/doc/main/start/man-setup.pt.tm
-share/TeXmacs/doc/main/start/man-setup.zh.tm
+share/TeXmacs/doc/main/start/man-setup.zh.tmml
 share/TeXmacs/doc/main/styles/env/env-base-dtd.de.tm
 share/TeXmacs/doc/main/styles/env/env-base-dtd.en.tm
 share/TeXmacs/doc/main/styles/env/env-dtd.de.tm
@@ -1232,7 +1204,7 @@
 share/TeXmacs/doc/main/table/man-advanced-features.it.tm
 share/TeXmacs/doc/main/table/man-advanced-features.pl.tm
 share/TeXmacs/doc/main/table/man-advanced-features.pt.tm
-share/TeXmacs/doc/main/table/man-advanced-features.zh.tm
+share/TeXmacs/doc/main/table/man-advanced-features.zh.tmml
 share/TeXmacs/doc/main/table/man-alignment.de.tm
 share/TeXmacs/doc/main/table/man-alignment.en.tm
 share/TeXmacs/doc/main/table/man-alignment.es.tm
@@ -1240,7 +1212,7 @@
 share/TeXmacs/doc/main/table/man-alignment.it.tm
 share/TeXmacs/doc/main/table/man-alignment.pl.tm
 share/TeXmacs/doc/main/table/man-alignment.pt.tm
-share/TeXmacs/doc/main/table/man-alignment.zh.tm
+share/TeXmacs/doc/main/table/man-alignment.zh.tmml
 share/TeXmacs/doc/main/table/man-create-table.de.tm
 share/TeXmacs/doc/main/table/man-create-table.en.tm
 share/TeXmacs/doc/main/table/man-create-table.es.tm
@@ -1248,7 +1220,7 @@