lyx: update to 2.3.2

Second Maintenance Release in 2.3.x Series: LyX 2.3.2 released.
December 14, 2018

LyX 2.3.2 is the result of on-going efforts to make our stable version more
reliable and more stable. One main fix involves a crash with external viewers
on Windows. We have also fixed a number of problems with the output of right-
to-left languages, thanks to the involvement of users. There was also an
infinite loop bug connected with the separation of environments that has been
fixed. But, for the most part, the fixes here are incremental.

First Maintenance Release in 2.3.x Series: LyX 2.3.1 released.
September 16, 2018

LyX 2.3.1 is the result of on-going efforts to make our stable version more
reliable and more stable. We have fixed a number of bugs and added some new
features. Perhaps the most important of these is that Jean-Marc Lasgouttes
re-wrote the document painting mechanism.
This makes LyX snappier, especially on repeated events.

All python scripts distributed with LyX should now be compatible with both
python 2.x and python 3.x.

New Stable Series: LyX 2.3.0 released.
March 16, 2018

LyX 2.3.0 is the culmination of two years of hard work. An overview
of the new features can be found here:
  https://wiki.lyx.org/LyX/NewInLyX23

9 files changed, 120 insertions, 157 deletions

diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile
index f2d43efd7eb..9e08b10e9c4 100644
--- a/editors/lyx/Makefile
+++ b/editors/lyx/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.72 2018/12/30 15:55:56 rhialto Exp $
+# $NetBSD: Makefile,v 1.73 2019/02/07 10:42:48 markd Exp $
 
-DISTNAME=		lyx-2.2.2
-PKGREVISION=		10
+DISTNAME=		lyx-2.3.2
 CATEGORIES=		editors
-MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/
-MASTER_SITES+=		ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.2.x/
-MASTER_SITES+=		ftp://ftp.lip6.fr/pub/lyx/stable/2.2.x/
-MASTER_SITES+=		ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.2.x/
+MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/
+MASTER_SITES+=		ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.3.x/
+MASTER_SITES+=		ftp://ftp.lip6.fr/pub/lyx/stable/2.3.x/
+MASTER_SITES+=		ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.3.x/
 EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		reed@reedmedia.net
@@ -69,13 +68,13 @@ CXXFLAGS.Linux+=	-fpermissive
 LDFLAGS.SunOS+=		-liconv
 
 CONFIGURE_ARGS+=	--without-included-mythes
-# XXX Uncomment this after updating LyX to latest:
-#CONFIGURE_ARGS+=	--without-included-boost
+CONFIGURE_ARGS+=	--without-included-boost
 
-CONFIGURE_ARGS+=	--with-extra-prefix=${BUILDLINK_PREFIX.qt4-libs} \
-			--with-qt4-dir=${QTDIR:Q} \
-			--with-qt4-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include \
-			--with-qt4-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib
+CONFIGURE_ARGS+=	--with-extra-prefix=${BUILDLINK_PREFIX.qt5-qtbase} \
+			--with-qt-dir=${QTDIR:Q} \
+			--with-qt-includes=${BUILDLINK_PREFIX.qt5-qtbase}/qt5/include \
+			--with-qt-libraries=${BUILDLINK_PREFIX.qt5-qtbase}/qt5/lib \
+			--enable-qt5
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -115,54 +114,10 @@ REPLACE_PYTHON=	development/autotests/keytest.py \
 			development/tools/generate_symbols_list.py \
 			development/tools/unicodesymbols.py \
 			lib/configure.py \
-			lib/lyx2lyx/LyX.py \
-			lib/lyx2lyx/generate_encoding_info.py \
+			lib/lyx2lyx/*.py \
 			lib/lyx2lyx/lyx2lyx \
-			lib/lyx2lyx/lyx2lyx_lang.py \
-			lib/lyx2lyx/lyx2lyx_tools.py \
-			lib/lyx2lyx/lyx2lyx_version.py \
-			lib/lyx2lyx/lyx_0_06.py \
-			lib/lyx2lyx/lyx_0_08.py \
-			lib/lyx2lyx/lyx_0_10.py \
-			lib/lyx2lyx/lyx_0_12.py \
-			lib/lyx2lyx/lyx_1_0.py \
-			lib/lyx2lyx/lyx_1_1.py \
-			lib/lyx2lyx/lyx_1_1_5.py \
-			lib/lyx2lyx/lyx_1_1_6_0.py \
-			lib/lyx2lyx/lyx_1_1_6_3.py \
-			lib/lyx2lyx/lyx_1_2.py \
-			lib/lyx2lyx/lyx_1_3.py \
-			lib/lyx2lyx/lyx_1_4.py \
-			lib/lyx2lyx/lyx_1_5.py \
-			lib/lyx2lyx/lyx_1_6.py \
-			lib/lyx2lyx/lyx_2_0.py \
-			lib/lyx2lyx/lyx_2_1.py \
-			lib/lyx2lyx/parser_tools.py \
-			lib/lyx2lyx/profiling.py \
-			lib/lyx2lyx/test_parser_tools.py \
-			lib/lyx2lyx/unicode_symbols.py \
-			lib/scripts/TeXFiles.py \
-			lib/scripts/clean_dvi.py \
-			lib/scripts/convertDefault.py \
-			lib/scripts/csv2lyx.py \
-			lib/scripts/date.py \
-			lib/scripts/ext_copy.py \
-			lib/scripts/fen2ascii.py \
-			lib/scripts/fig2pdftex.py \
-			lib/scripts/fig2pstex.py \
-			lib/scripts/fig_copy.py \
-			lib/scripts/html2latexwrapper.py \
-			lib/scripts/include_bib.py \
-			lib/scripts/layout2layout.py \
-			lib/scripts/legacy_lyxpreview2ppm.py \
+			lib/scripts/*.py \
 			lib/scripts/listerrors \
-			lib/scripts/lyxpak.py \
-			lib/scripts/lyxpreview2bitmap.py \
-			lib/scripts/lyxpreview_tools.py \
-			lib/scripts/prefs2prefs.py \
-			lib/scripts/prefs2prefs_lfuns.py \
-			lib/scripts/prefs2prefs_prefs.py \
-			lib/scripts/tex_copy.py \
 			po/lyx_pot.py \
 			po/postats.py \
 			src/tex2lyx/test/runtests.py
@@ -182,10 +137,11 @@ SUBST_SED.python+=	-e 's,command("python -tt,command("${PYTHONBIN} -tt,'
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../textproc/aspell/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../textproc/mythes/buildlink3.mk"
-#.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/editors/lyx/PLIST b/editors/lyx/PLIST
index 07e54f4e4af..21aa1acb69e 100644
--- a/editors/lyx/PLIST
+++ b/editors/lyx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2018/06/03 02:28:07 youri Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/02/07 10:42:48 markd Exp $
 ${BIN_DIR}/lyx
 ${BIN_DIR}/lyxclient
 ${BIN_DIR}/tex2lyx
@@ -9,9 +9,7 @@ ${PLIST.x11}share/applications/lyx.desktop
 ${PLIST.x11}share/icons/hicolor/48x48/apps/lyx.png
 ${PLIST.x11}share/icons/hicolor/scalable/apps/lyx.svg
 share/locale/ar/LC_MESSAGES/${LYX}.mo
-share/locale/ca/LC_MESSAGES/${LYX}.mo
 share/locale/cs/LC_MESSAGES/${LYX}.mo
-share/locale/da/LC_MESSAGES/${LYX}.mo
 share/locale/de/LC_MESSAGES/${LYX}.mo
 share/locale/el/LC_MESSAGES/${LYX}.mo
 share/locale/en/LC_MESSAGES/${LYX}.mo
@@ -19,7 +17,6 @@ share/locale/es/LC_MESSAGES/${LYX}.mo
 share/locale/eu/LC_MESSAGES/${LYX}.mo
 share/locale/fi/LC_MESSAGES/${LYX}.mo
 share/locale/fr/LC_MESSAGES/${LYX}.mo
-share/locale/gl/LC_MESSAGES/${LYX}.mo
 share/locale/he/LC_MESSAGES/${LYX}.mo
 share/locale/hu/LC_MESSAGES/${LYX}.mo
 share/locale/ia/LC_MESSAGES/${LYX}.mo
@@ -27,15 +24,12 @@ share/locale/id/LC_MESSAGES/${LYX}.mo
 share/locale/it/LC_MESSAGES/${LYX}.mo
 share/locale/ja/LC_MESSAGES/${LYX}.mo
 share/locale/nb/LC_MESSAGES/${LYX}.mo
-share/locale/nl/LC_MESSAGES/${LYX}.mo
 share/locale/nn/LC_MESSAGES/${LYX}.mo
 share/locale/pl/LC_MESSAGES/${LYX}.mo
 share/locale/pt_BR/LC_MESSAGES/${LYX}.mo
 share/locale/pt_PT/LC_MESSAGES/${LYX}.mo
-share/locale/ro/LC_MESSAGES/${LYX}.mo
 share/locale/ru/LC_MESSAGES/${LYX}.mo
 share/locale/sk/LC_MESSAGES/${LYX}.mo
-share/locale/sr/LC_MESSAGES/${LYX}.mo
 share/locale/sv/LC_MESSAGES/${LYX}.mo
 share/locale/tr/LC_MESSAGES/${LYX}.mo
 share/locale/uk/LC_MESSAGES/${LYX}.mo
@@ -60,6 +54,11 @@ ${SHARE_DIR}/bind/sciword.bind
 ${SHARE_DIR}/bind/site.bind
 ${SHARE_DIR}/bind/xemacs.bind
 ${SHARE_DIR}/chkconfig.ltx
+${SHARE_DIR}/citeengines/basic.citeengine
+${SHARE_DIR}/citeengines/biblatex-natbib.citeengine
+${SHARE_DIR}/citeengines/biblatex.citeengine
+${SHARE_DIR}/citeengines/jurabib.citeengine
+${SHARE_DIR}/citeengines/natbib.citeengine
 ${SHARE_DIR}/commands/default.def
 ${SHARE_DIR}/configure.py
 ${SHARE_DIR}/doc/Additional.lyx
@@ -78,9 +77,14 @@ ${SHARE_DIR}/doc/Shortcuts.lyx
 ${SHARE_DIR}/doc/SpecialParagraphShape.tex
 ${SHARE_DIR}/doc/Tutorial.lyx
 ${SHARE_DIR}/doc/UserGuide.lyx
+${SHARE_DIR}/doc/ar/Intro.lyx
+${SHARE_DIR}/doc/ar/Shortcuts.lyx
+${SHARE_DIR}/doc/ar/Tutorial.lyx
 ${SHARE_DIR}/doc/biblio/LyXDocs.bib
 ${SHARE_DIR}/doc/biblio/alphadin.bst
 ${SHARE_DIR}/doc/ca/Intro.lyx
+${SHARE_DIR}/doc/clipart/2D-intensity-plot.pdf
+${SHARE_DIR}/doc/clipart/3D-structure-distort.pdf
 ${SHARE_DIR}/doc/clipart/Abstract.pdf
 ${SHARE_DIR}/doc/clipart/BoxInsetDefault.png
 ${SHARE_DIR}/doc/clipart/ChangesToolbar.png
@@ -95,6 +99,7 @@ ${SHARE_DIR}/doc/clipart/MacroToolbar.png
 ${SHARE_DIR}/doc/clipart/SVG-Drawing.svg
 ${SHARE_DIR}/doc/clipart/SpaceMarker.png
 ${SHARE_DIR}/doc/clipart/StandardToolbar.png
+${SHARE_DIR}/doc/clipart/Star-structure.pdf
 ${SHARE_DIR}/doc/clipart/ToolbarEnvBox.png
 ${SHARE_DIR}/doc/clipart/ViewToolbar.png
 ${SHARE_DIR}/doc/clipart/endnotes.pdf
@@ -109,6 +114,7 @@ ${SHARE_DIR}/doc/clipart/platypus.eps
 ${SHARE_DIR}/doc/clipart/reference.png
 ${SHARE_DIR}/doc/clipart/with_fntright.pdf
 ${SHARE_DIR}/doc/clipart/without_fntright.pdf
+${SHARE_DIR}/doc/clipart/workaround.png
 ${SHARE_DIR}/doc/cs/Tutorial.lyx
 ${SHARE_DIR}/doc/da/Intro.lyx
 ${SHARE_DIR}/doc/de/Additional.lyx
@@ -133,7 +139,6 @@ ${SHARE_DIR}/doc/de/clipart/LyXNotiz.png
 ${SHARE_DIR}/doc/de/clipart/Marke.png
 ${SHARE_DIR}/doc/de/clipart/Querverweis.png
 ${SHARE_DIR}/doc/de/clipart/StandardBox.png
-${SHARE_DIR}/doc/de/clipart/Unterdokument.png
 ${SHARE_DIR}/doc/de/clipart/Zusammenfassung.pdf
 ${SHARE_DIR}/doc/el/Intro.lyx
 ${SHARE_DIR}/doc/es/Additional.lyx
@@ -206,6 +211,7 @@ ${SHARE_DIR}/doc/ja/Additional.lyx
 ${SHARE_DIR}/doc/ja/Customization.lyx
 ${SHARE_DIR}/doc/ja/DummyDocument1.lyx
 ${SHARE_DIR}/doc/ja/DummyDocument2.lyx
+${SHARE_DIR}/doc/ja/DummyTextDocument.txt
 ${SHARE_DIR}/doc/ja/EmbeddedObjects.lyx
 ${SHARE_DIR}/doc/ja/Formula-numbering.lyx
 ${SHARE_DIR}/doc/ja/Intro.lyx
@@ -239,6 +245,7 @@ ${SHARE_DIR}/doc/pt/Tutorial.lyx
 ${SHARE_DIR}/doc/ro/Intro.lyx
 ${SHARE_DIR}/doc/ru/Intro.lyx
 ${SHARE_DIR}/doc/ru/Tutorial.lyx
+${SHARE_DIR}/doc/ru/clipart/ToolbarEnvBox.png
 ${SHARE_DIR}/doc/sk/Intro.lyx
 ${SHARE_DIR}/doc/sk/Tutorial.lyx
 ${SHARE_DIR}/doc/sl/Intro.lyx
@@ -247,7 +254,7 @@ ${SHARE_DIR}/doc/sv/Intro.lyx
 ${SHARE_DIR}/doc/sv/Shortcuts.lyx
 ${SHARE_DIR}/doc/sv/Tutorial.lyx
 ${SHARE_DIR}/doc/uk/Intro.lyx
-${SHARE_DIR}/doc/uk/clipart/Footnote.png
+${SHARE_DIR}/doc/uk/clipart/footnote.png
 ${SHARE_DIR}/doc/zh_CN/Intro.lyx
 ${SHARE_DIR}/doc/zh_CN/Tutorial.lyx
 ${SHARE_DIR}/encodings
@@ -262,13 +269,13 @@ ${SHARE_DIR}/examples/Literate.lyx
 ${SHARE_DIR}/examples/MultilingualCaptions.lyx
 ${SHARE_DIR}/examples/PDF-comment.lyx
 ${SHARE_DIR}/examples/PDF-form.lyx
-${SHARE_DIR}/examples/R-S-statements.lyx
 ${SHARE_DIR}/examples/aa_sample.lyx
 ${SHARE_DIR}/examples/aas_sample.lyx
 ${SHARE_DIR}/examples/achemso.lyx
 ${SHARE_DIR}/examples/addressExample.adr
 ${SHARE_DIR}/examples/amsart-test.lyx
 ${SHARE_DIR}/examples/amsbook-test.lyx
+${SHARE_DIR}/examples/ar/splash.lyx
 ${SHARE_DIR}/examples/beamer-article.lyx
 ${SHARE_DIR}/examples/beamer-g4-mask.jpg
 ${SHARE_DIR}/examples/beamer-g4.jpg
@@ -286,7 +293,6 @@ ${SHARE_DIR}/examples/beamerlyxexample1.lyx
 ${SHARE_DIR}/examples/beamerposter.lyx
 ${SHARE_DIR}/examples/biblioExample.bib
 ${SHARE_DIR}/examples/ca/ItemizeBullets.lyx
-${SHARE_DIR}/examples/ca/mathed.lyx
 ${SHARE_DIR}/examples/ca/splash.lyx
 ${SHARE_DIR}/examples/chess-article.lyx
 ${SHARE_DIR}/examples/chessgame.lyx
@@ -302,6 +308,7 @@ ${SHARE_DIR}/examples/de/ItemizeBullets.lyx
 ${SHARE_DIR}/examples/de/Lebenslauf.lyx
 ${SHARE_DIR}/examples/de/MultilingualCaptions.lyx
 ${SHARE_DIR}/examples/de/PDF-comment.lyx
+${SHARE_DIR}/examples/de/PDF-form.lyx
 ${SHARE_DIR}/examples/de/beamer-article.lyx
 ${SHARE_DIR}/examples/de/beamer.lyx
 ${SHARE_DIR}/examples/de/beispiel_gelyxt.lyx
@@ -342,18 +349,21 @@ ${SHARE_DIR}/examples/fr/MultilingualCaptions.lyx
 ${SHARE_DIR}/examples/fr/PDF-comment.lyx
 ${SHARE_DIR}/examples/fr/beamer-article.lyx
 ${SHARE_DIR}/examples/fr/beamer.lyx
-${SHARE_DIR}/examples/fr/exemple-powerdot.lyx
 ${SHARE_DIR}/examples/fr/exemple_brut.lyx
 ${SHARE_DIR}/examples/fr/exemple_lyxifie.lyx
 ${SHARE_DIR}/examples/fr/linguistics.lyx
+${SHARE_DIR}/examples/fr/powerdot.lyx
 ${SHARE_DIR}/examples/fr/seminar.lyx
 ${SHARE_DIR}/examples/fr/simplecv.lyx
 ${SHARE_DIR}/examples/fr/splash.lyx
+${SHARE_DIR}/examples/fr/xyfigure.lyx
 ${SHARE_DIR}/examples/fr/xyfigure.png
 ${SHARE_DIR}/examples/fr/xypic.lyx
 ${SHARE_DIR}/examples/gl/exemplo_bruto.lyx
 ${SHARE_DIR}/examples/gl/exemplo_lyxificado.lyx
 ${SHARE_DIR}/examples/gl/splash.lyx
+${SHARE_DIR}/examples/gnuplot-example.gp
+${SHARE_DIR}/examples/gnuplot.lyx
 ${SHARE_DIR}/examples/he/example_lyxified.lyx
 ${SHARE_DIR}/examples/he/example_raw.lyx
 ${SHARE_DIR}/examples/he/splash.lyx
@@ -370,7 +380,6 @@ ${SHARE_DIR}/examples/it/splash.lyx
 ${SHARE_DIR}/examples/ja/Braille.lyx
 ${SHARE_DIR}/examples/ja/FeynmanDiagrams.lyx
 ${SHARE_DIR}/examples/ja/MultilingualCaptions.lyx
-${SHARE_DIR}/examples/ja/R-S-statements.lyx
 ${SHARE_DIR}/examples/ja/beamer.lyx
 ${SHARE_DIR}/examples/ja/knitr.lyx
 ${SHARE_DIR}/examples/ja/lilypond.lyx
@@ -387,6 +396,8 @@ ${SHARE_DIR}/examples/linguistics.lyx
 ${SHARE_DIR}/examples/listerrors.lyx
 ${SHARE_DIR}/examples/localization_test.lyx
 ${SHARE_DIR}/examples/longsheet.gnumeric
+${SHARE_DIR}/examples/minted-filelisting.lyx
+${SHARE_DIR}/examples/minted-listings.lyx
 ${SHARE_DIR}/examples/modernCV.lyx
 ${SHARE_DIR}/examples/nb/eksempel_lyxet.lyx
 ${SHARE_DIR}/examples/nb/eksempel_txt.lyx
@@ -398,11 +409,13 @@ ${SHARE_DIR}/examples/nl/voorbeeld_verlyxt.lyx
 ${SHARE_DIR}/examples/noweb2lyx.lyx
 ${SHARE_DIR}/examples/paralist.lyx
 ${SHARE_DIR}/examples/pl/splash.lyx
-${SHARE_DIR}/examples/powerdot-example.lyx
+${SHARE_DIR}/examples/powerdot.lyx
 ${SHARE_DIR}/examples/pt_BR/splash.lyx
 ${SHARE_DIR}/examples/pt_PT/splash.lyx
 ${SHARE_DIR}/examples/recipebook.lyx
 ${SHARE_DIR}/examples/ro/splash.lyx
+${SHARE_DIR}/examples/ru/example_lyxified.lyx
+${SHARE_DIR}/examples/ru/example_raw.lyx
 ${SHARE_DIR}/examples/ru/splash.lyx
 ${SHARE_DIR}/examples/script_form.lyx
 ${SHARE_DIR}/examples/seminar.lyx
@@ -462,7 +475,6 @@ ${SHARE_DIR}/examples/varwidth-floats-side-by-side.lyx
 ${SHARE_DIR}/examples/xyfigure.lyx
 ${SHARE_DIR}/examples/xyfigure.png
 ${SHARE_DIR}/examples/xypic.lyx
-${SHARE_DIR}/external_templates
 ${SHARE_DIR}/fonts/BaKoMaFontLicense.txt
 ${SHARE_DIR}/fonts/ReadmeBaKoMa4LyX.txt
 ${SHARE_DIR}/fonts/cmex10.ttf
@@ -684,6 +696,7 @@ ${SHARE_DIR}/images/classic/textstyle-apply.png
 ${SHARE_DIR}/images/classic/thesaurus-entry.png
 ${SHARE_DIR}/images/classic/toolbar-toggle_math.png
 ${SHARE_DIR}/images/classic/toolbar-toggle_math_panels.png
+${SHARE_DIR}/images/classic/toolbar-toggle_review.png
 ${SHARE_DIR}/images/classic/toolbar-toggle_table.png
 ${SHARE_DIR}/images/classic/undo.png
 ${SHARE_DIR}/images/classic/unknown.png
@@ -723,6 +736,7 @@ ${SHARE_DIR}/images/dialog-toggle_toc.svgz
 ${SHARE_DIR}/images/down.svgz
 ${SHARE_DIR}/images/editclear.svgz
 ${SHARE_DIR}/images/emblem-readonly.svgz
+${SHARE_DIR}/images/emblem-shellescape.svgz
 ${SHARE_DIR}/images/ert-insert.svgz
 ${SHARE_DIR}/images/file-open.svgz
 ${SHARE_DIR}/images/float-insert_figure.svgz
@@ -1404,6 +1418,7 @@ ${SHARE_DIR}/images/math/mathbb_Q.svgz
 ${SHARE_DIR}/images/math/mathbb_R.svgz
 ${SHARE_DIR}/images/math/mathbb_Z.svgz
 ${SHARE_DIR}/images/math/mathbf.svgz
+${SHARE_DIR}/images/math/mathbin.svgz
 ${SHARE_DIR}/images/math/mathcal.svgz
 ${SHARE_DIR}/images/math/mathcal_F.svgz
 ${SHARE_DIR}/images/math/mathcal_H.svgz
@@ -1415,7 +1430,10 @@ ${SHARE_DIR}/images/math/mathdollar.svgz
 ${SHARE_DIR}/images/math/mathfrak.svgz
 ${SHARE_DIR}/images/math/mathit.svgz
 ${SHARE_DIR}/images/math/mathllap.svgz
+${SHARE_DIR}/images/math/mathop.svgz
+${SHARE_DIR}/images/math/mathord.svgz
 ${SHARE_DIR}/images/math/mathparagraph.svgz
+${SHARE_DIR}/images/math/mathrel.svgz
 ${SHARE_DIR}/images/math/mathring.svgz
 ${SHARE_DIR}/images/math/mathrlap.svgz
 ${SHARE_DIR}/images/math/mathrm.svgz
@@ -2006,6 +2024,7 @@ ${SHARE_DIR}/images/oxygen/textstyle-apply.svgz
 ${SHARE_DIR}/images/oxygen/thesaurus-entry.svgz
 ${SHARE_DIR}/images/oxygen/toolbar-toggle_math.svgz
 ${SHARE_DIR}/images/oxygen/toolbar-toggle_math_panels.svgz
+${SHARE_DIR}/images/oxygen/toolbar-toggle_review.svgz
 ${SHARE_DIR}/images/oxygen/toolbar-toggle_table.svgz
 ${SHARE_DIR}/images/oxygen/undo.svgz
 ${SHARE_DIR}/images/oxygen/unknown.svgz
@@ -2074,6 +2093,7 @@ ${SHARE_DIR}/images/textstyle-apply.svgz
 ${SHARE_DIR}/images/thesaurus-entry.svgz
 ${SHARE_DIR}/images/toolbar-toggle_math.svgz
 ${SHARE_DIR}/images/toolbar-toggle_math_panels.svgz
+${SHARE_DIR}/images/toolbar-toggle_review.svgz
 ${SHARE_DIR}/images/toolbar-toggle_table.svgz
 ${SHARE_DIR}/images/undo.svgz
 ${SHARE_DIR}/images/unknown.svgz
@@ -2148,6 +2168,7 @@ ${SHARE_DIR}/layouts/achemso.layout
 ${SHARE_DIR}/layouts/acm-sigs-alt.layout
 ${SHARE_DIR}/layouts/acm-sigs.inc
 ${SHARE_DIR}/layouts/acm-sigs.layout
+${SHARE_DIR}/layouts/acmart.layout
 ${SHARE_DIR}/layouts/acmsiggraph-0-92.layout
 ${SHARE_DIR}/layouts/acmsiggraph.layout
 ${SHARE_DIR}/layouts/agu-dtd.layout
@@ -2168,13 +2189,16 @@ ${SHARE_DIR}/layouts/apa6.layout
 ${SHARE_DIR}/layouts/arab-article.layout
 ${SHARE_DIR}/layouts/article-beamer.layout
 ${SHARE_DIR}/layouts/article.layout
-${SHARE_DIR}/layouts/basic.module
 ${SHARE_DIR}/layouts/beamer.layout
 ${SHARE_DIR}/layouts/beamerposter.layout
 ${SHARE_DIR}/layouts/bicaption.module
 ${SHARE_DIR}/layouts/book.layout
 ${SHARE_DIR}/layouts/braille.module
 ${SHARE_DIR}/layouts/broadway.layout
+${SHARE_DIR}/layouts/bxjsarticle.layout
+${SHARE_DIR}/layouts/bxjsbook.layout
+${SHARE_DIR}/layouts/bxjsreport.layout
+${SHARE_DIR}/layouts/bxjsslide.layout
 ${SHARE_DIR}/layouts/changebars.module
 ${SHARE_DIR}/layouts/chess.layout
 ${SHARE_DIR}/layouts/cl2emult.layout
@@ -2242,7 +2266,6 @@ ${SHARE_DIR}/layouts/jreport.layout
 ${SHARE_DIR}/layouts/jsarticle.layout
 ${SHARE_DIR}/layouts/jsbook.layout
 ${SHARE_DIR}/layouts/jss.layout
-${SHARE_DIR}/layouts/jurabib.module
 ${SHARE_DIR}/layouts/kluwer.layout
 ${SHARE_DIR}/layouts/knitr.module
 ${SHARE_DIR}/layouts/latex8.layout
@@ -2262,7 +2285,6 @@ ${SHARE_DIR}/layouts/multicol.module
 ${SHARE_DIR}/layouts/mwart.layout
 ${SHARE_DIR}/layouts/mwbk.layout
 ${SHARE_DIR}/layouts/mwrep.layout
-${SHARE_DIR}/layouts/natbib.module
 ${SHARE_DIR}/layouts/natbibapa.module
 ${SHARE_DIR}/layouts/noweb.module
 ${SHARE_DIR}/layouts/numarticle.inc
@@ -2302,6 +2324,7 @@ ${SHARE_DIR}/layouts/stdciteformats.inc
 ${SHARE_DIR}/layouts/stdclass.inc
 ${SHARE_DIR}/layouts/stdcounters.inc
 ${SHARE_DIR}/layouts/stdcustom.inc
+${SHARE_DIR}/layouts/stdfloatnames.inc
 ${SHARE_DIR}/layouts/stdfloats.inc
 ${SHARE_DIR}/layouts/stdinsets.inc
 ${SHARE_DIR}/layouts/stdlayouts.inc
@@ -2313,6 +2336,7 @@ ${SHARE_DIR}/layouts/stdsections.inc
 ${SHARE_DIR}/layouts/stdstarsections.inc
 ${SHARE_DIR}/layouts/stdstruct.inc
 ${SHARE_DIR}/layouts/stdtitle.inc
+${SHARE_DIR}/layouts/subequations.module
 ${SHARE_DIR}/layouts/svcommon.inc
 ${SHARE_DIR}/layouts/svglobal.layout
 ${SHARE_DIR}/layouts/svglobal3.layout
@@ -2327,7 +2351,10 @@ ${SHARE_DIR}/layouts/tbook.layout
 ${SHARE_DIR}/layouts/tcolorbox.module
 ${SHARE_DIR}/layouts/theorems-ams-bytype.inc
 ${SHARE_DIR}/layouts/theorems-ams-bytype.module
+${SHARE_DIR}/layouts/theorems-ams-chap-bytype.inc
+${SHARE_DIR}/layouts/theorems-ams-chap-bytype.module
 ${SHARE_DIR}/layouts/theorems-ams-extended-bytype.module
+${SHARE_DIR}/layouts/theorems-ams-extended-chap-bytype.module
 ${SHARE_DIR}/layouts/theorems-ams-extended.module
 ${SHARE_DIR}/layouts/theorems-ams.inc
 ${SHARE_DIR}/layouts/theorems-ams.module
@@ -2422,6 +2449,9 @@ ${SHARE_DIR}/lyx2lyx/lyx_2_1.pyo
 ${SHARE_DIR}/lyx2lyx/lyx_2_2.py
 ${SHARE_DIR}/lyx2lyx/lyx_2_2.pyc
 ${SHARE_DIR}/lyx2lyx/lyx_2_2.pyo
+${SHARE_DIR}/lyx2lyx/lyx_2_3.py
+${SHARE_DIR}/lyx2lyx/lyx_2_3.pyc
+${SHARE_DIR}/lyx2lyx/lyx_2_3.pyo
 ${SHARE_DIR}/lyx2lyx/parser_tools.py
 ${SHARE_DIR}/lyx2lyx/parser_tools.pyc
 ${SHARE_DIR}/lyx2lyx/parser_tools.pyo
@@ -2440,12 +2470,12 @@ ${SHARE_DIR}/scripts/clean_dvi.py
 ${SHARE_DIR}/scripts/convertDefault.py
 ${SHARE_DIR}/scripts/convert_pdf.py
 ${SHARE_DIR}/scripts/csv2lyx.py
-${SHARE_DIR}/scripts/date.py
 ${SHARE_DIR}/scripts/ext_copy.py
 ${SHARE_DIR}/scripts/fen2ascii.py
 ${SHARE_DIR}/scripts/fig2pdftex.py
 ${SHARE_DIR}/scripts/fig2pstex.py
 ${SHARE_DIR}/scripts/fig_copy.py
+${SHARE_DIR}/scripts/gnuplot2pdf.py
 ${SHARE_DIR}/scripts/html2latexwrapper.py
 ${SHARE_DIR}/scripts/include_bib.py
 ${SHARE_DIR}/scripts/layout2layout.py
@@ -2457,17 +2487,16 @@ ${SHARE_DIR}/scripts/lyxpreview2bitmap.py
 ${SHARE_DIR}/scripts/lyxpreview_tools.py
 ${SHARE_DIR}/scripts/lyxstangle.R
 ${SHARE_DIR}/scripts/lyxsweave.R
+${SHARE_DIR}/scripts/prefTest.pl.in
 ${SHARE_DIR}/scripts/prefs2prefs.py
 ${SHARE_DIR}/scripts/prefs2prefs_lfuns.py
 ${SHARE_DIR}/scripts/prefs2prefs_prefs.py
+${SHARE_DIR}/scripts/svg2pdftex.py
+${SHARE_DIR}/scripts/svg2pstex.py
 ${SHARE_DIR}/scripts/tex_copy.py
 ${SHARE_DIR}/symbols
 ${SHARE_DIR}/syntax.default
-${SHARE_DIR}/templates/ACM-SIGS.lyx
-${SHARE_DIR}/templates/ACM-siggraph.lyx
-${SHARE_DIR}/templates/ACM-sigplan.lyx
 ${SHARE_DIR}/templates/AEA.lyx
-${SHARE_DIR}/templates/AGUTeX.lyx
 ${SHARE_DIR}/templates/APA.lyx
 ${SHARE_DIR}/templates/APA6.lyx
 ${SHARE_DIR}/templates/DocBook_article.lyx
@@ -2487,6 +2516,7 @@ ${SHARE_DIR}/templates/README.new_templates
 ${SHARE_DIR}/templates/RJournal.lyx
 ${SHARE_DIR}/templates/aa.lyx
 ${SHARE_DIR}/templates/aastex6.lyx
+${SHARE_DIR}/templates/acmart.lyx
 ${SHARE_DIR}/templates/beamer-conference-ornate-20min.lyx
 ${SHARE_DIR}/templates/ctex.lyx
 ${SHARE_DIR}/templates/de_beamer-conference-ornate-20min.lyx
@@ -2496,8 +2526,6 @@ ${SHARE_DIR}/templates/elsarticle.lyx
 ${SHARE_DIR}/templates/es_beamer-conference-ornate-20min.lyx
 ${SHARE_DIR}/templates/fr_beamer-conference-ornate-20min.lyx
 ${SHARE_DIR}/templates/frletter.lyx
-${SHARE_DIR}/templates/g-brief-de.lyx
-${SHARE_DIR}/templates/g-brief-en.lyx
 ${SHARE_DIR}/templates/g-brief2.lyx
 ${SHARE_DIR}/templates/hollywood.lyx
 ${SHARE_DIR}/templates/ja_beamer-conference-ornate-20min.lyx
@@ -2505,6 +2533,12 @@ ${SHARE_DIR}/templates/kluwer.lyx
 ${SHARE_DIR}/templates/koma-letter2.lyx
 ${SHARE_DIR}/templates/letter.lyx
 ${SHARE_DIR}/templates/lettre.lyx
+${SHARE_DIR}/templates/obsolete/ACM-SIGS.lyx
+${SHARE_DIR}/templates/obsolete/ACM-siggraph.lyx
+${SHARE_DIR}/templates/obsolete/ACM-sigplan.lyx
+${SHARE_DIR}/templates/obsolete/AGUTeX.lyx
+${SHARE_DIR}/templates/obsolete/g-brief-de.lyx
+${SHARE_DIR}/templates/obsolete/g-brief-en.lyx
 ${SHARE_DIR}/templates/poster-a0poster-colored.lyx
 ${SHARE_DIR}/templates/poster-a0poster-simple.lyx
 ${SHARE_DIR}/templates/poster-beamerposter.lyx
@@ -2523,3 +2557,12 @@ ${SHARE_DIR}/ui/stdcontext.inc
 ${SHARE_DIR}/ui/stdmenus.inc
 ${SHARE_DIR}/ui/stdtoolbars.inc
 ${SHARE_DIR}/unicodesymbols
+${SHARE_DIR}/xtemplates/chess.xtemplate
+${SHARE_DIR}/xtemplates/dia.xtemplate
+${SHARE_DIR}/xtemplates/gnumeric.xtemplate
+${SHARE_DIR}/xtemplates/inkscape.xtemplate
+${SHARE_DIR}/xtemplates/lilypond.xtemplate
+${SHARE_DIR}/xtemplates/pdfpages.xtemplate
+${SHARE_DIR}/xtemplates/raster_image.xtemplate
+${SHARE_DIR}/xtemplates/vector_graphics.xtemplate
+${SHARE_DIR}/xtemplates/xfig.xtemplate
diff --git a/editors/lyx/distinfo b/editors/lyx/distinfo
index 61ff7e63739..ed827ca31e0 100644
--- a/editors/lyx/distinfo
+++ b/editors/lyx/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.16 2016/12/02 19:07:16 maya Exp $
+$NetBSD: distinfo,v 1.17 2019/02/07 10:42:48 markd Exp $
 
-SHA1 (lyx-2.2.2.tar.xz) = 30f6f24f81a8990261b1dfd9a6196dfe1459abda
-RMD160 (lyx-2.2.2.tar.xz) = c3e4d309038aebb8225b62e7cf1e6cf04258f5ff
-SHA512 (lyx-2.2.2.tar.xz) = 5057a06f0c37cb2beadb92414eec495ba0619f6c8a9fb5372a9feb90fe0d8bf850de5c94bbf618c8e27bd64404ae6687c48ee24aa6e1bd35580eb3b77d71d45e
-Size (lyx-2.2.2.tar.xz) = 15490148 bytes
+SHA1 (lyx-2.3.2.tar.xz) = 6bbc0b43cdd52b818aa96788f7ade31843a4f0ad
+RMD160 (lyx-2.3.2.tar.xz) = 369d5f0be707436ccafe0d454db95de0a4744449
+SHA512 (lyx-2.3.2.tar.xz) = c1d660f9fbf20ba67fd07e15cc7e37934bde82e6f07b4a2c0da33f3a783bc6d88482f12df7a2824aa57970b4c0bd7631f934ccecce9ed2757be8427d3e67c951
+Size (lyx-2.3.2.tar.xz) = 15791748 bytes
 SHA1 (patch-configure) = d68e3329353f2fa0ffdf9633ff0b31649f0114c7
 SHA1 (patch-development_MacOSX_Makefile.in) = 086dddfcd7b2ca498e87b0d3e90a211aca2f64fe
-SHA1 (patch-src_WordList.cpp) = d747efcd6ca4d7015a5c6860a8844ac79a65672a
-SHA1 (patch-src_mathed_InsetMath.h) = c178b1436c7a969e29b328dde1a800e9ccb7af0e
-SHA1 (patch-src_mathed_MathData.h) = fcd51f36aa2aae29f75e041d7adb1d88baa370a5
-SHA1 (patch-src_support_strfwd.h) = 39bebff1a10e4509c5499f60bc2028ab5e66a671
-SHA1 (patch-src_support_unicode.cpp) = 71bdc1b929a3c90bed84d6de5aa0734e548c67de
+SHA1 (patch-src_support_FileName.cpp) = f940c9e526c3ef34a6d3b1099aec8d41543529ef
+SHA1 (patch-src_support_strfwd.h) = 3ebd71772539d6a2cd327c1127fa9ef66cb15b41
diff --git a/editors/lyx/patches/patch-src_WordList.cpp b/editors/lyx/patches/patch-src_WordList.cpp
deleted file mode 100644
index fddd12b9dc4..00000000000
--- a/editors/lyx/patches/patch-src_WordList.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_WordList.cpp,v 1.1 2012/03/10 20:55:47 markd Exp $
-
-Fix build with gcc 4.6
-
---- src/WordList.cpp.orig	2008-04-30 08:26:40.000000000 +0000
-+++ src/WordList.cpp
-@@ -9,6 +9,7 @@
-  */
- 
- #include <config.h>
-+#include <cstddef>
- 
- #include "WordList.h"
- 
diff --git a/editors/lyx/patches/patch-src_mathed_InsetMath.h b/editors/lyx/patches/patch-src_mathed_InsetMath.h
deleted file mode 100644
index a56288780f3..00000000000
--- a/editors/lyx/patches/patch-src_mathed_InsetMath.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_mathed_InsetMath.h,v 1.1 2012/03/10 20:55:47 markd Exp $
-
-Fix build with gcc 4.6
-
---- src/mathed/InsetMath.h.orig	2010-12-29 15:36:35.000000000 +0000
-+++ src/mathed/InsetMath.h
-@@ -13,6 +13,7 @@
- #ifndef MATH_INSET_H
- #define MATH_INSET_H
- 
-+#include <cstddef>
- #include "MathData.h"
- 
- #include "insets/Inset.h"
diff --git a/editors/lyx/patches/patch-src_mathed_MathData.h b/editors/lyx/patches/patch-src_mathed_MathData.h
deleted file mode 100644
index 916516a971f..00000000000
--- a/editors/lyx/patches/patch-src_mathed_MathData.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_mathed_MathData.h,v 1.1 2012/03/10 20:55:47 markd Exp $
-
-Fix build with gcc 4.6
-
---- src/mathed/MathData.h.orig	2010-01-20 02:10:29.000000000 +0000
-+++ src/mathed/MathData.h
-@@ -15,6 +15,7 @@
- #ifndef MATH_DATA_H
- #define MATH_DATA_H
- 
-+#include <cstddef>
- #include "Dimension.h"
- #include "MathAtom.h"
- 
diff --git a/editors/lyx/patches/patch-src_support_FileName.cpp b/editors/lyx/patches/patch-src_support_FileName.cpp
new file mode 100644
index 00000000000..d2dcb3a0c72
--- /dev/null
+++ b/editors/lyx/patches/patch-src_support_FileName.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_support_FileName.cpp,v 1.1 2019/02/07 10:42:48 markd Exp $
+
+Changeset 3a123b90.
+Fix build with boost 1.69 (bug 11349).
+
+--- src/support/FileName.cpp.orig	2018-12-09 20:04:52.000000000 +0000
++++ src/support/FileName.cpp
+@@ -67,15 +67,6 @@
+ using namespace std;
+ using namespace lyx::support;
+ 
+-// OK, this is ugly, but it is the only workaround I found to compile
+-// with gcc (any version) on a system which uses a non-GNU toolchain.
+-// The problem is that gcc uses a weak symbol for a particular
+-// instantiation and that the system linker usually does not
+-// understand those weak symbols (seen on HP-UX, tru64, AIX and
+-// others). Thus we force an explicit instanciation of this particular
+-// template (JMarc)
+-template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
+-
+ namespace lyx {
+ namespace support {
+ 
diff --git a/editors/lyx/patches/patch-src_support_strfwd.h b/editors/lyx/patches/patch-src_support_strfwd.h
index 36c93a07fb6..bd0b87e36ae 100644
--- a/editors/lyx/patches/patch-src_support_strfwd.h
+++ b/editors/lyx/patches/patch-src_support_strfwd.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_support_strfwd.h,v 1.2 2015/01/10 18:13:22 rumko Exp $
+$NetBSD: patch-src_support_strfwd.h,v 1.3 2019/02/07 10:42:48 markd Exp $
 
---- src/support/strfwd.h.orig	2014-11-15 18:11:26.000000000 +0000
+--- src/support/strfwd.h.orig	2018-12-09 20:04:52.000000000 +0000
 +++ src/support/strfwd.h
-@@ -41,28 +41,8 @@ namespace lyx { typedef boost::uint32_t 
+@@ -42,28 +42,8 @@ namespace lyx { typedef boost::uint32_t 
  #include <string>
  #else
  
@@ -27,7 +27,7 @@ $NetBSD: patch-src_support_strfwd.h,v 1.2 2015/01/10 18:13:22 rumko Exp $
 -typedef basic_ostream<char, char_traits<char> > ostream;
 -typedef basic_ostringstream<char, char_traits<char>, allocator<char> > ostringstream;
 -
--} // namepace std
+-} // namespace std
 +#include <string>
 +#include <iostream>
  
diff --git a/editors/lyx/patches/patch-src_support_unicode.cpp b/editors/lyx/patches/patch-src_support_unicode.cpp
deleted file mode 100644
index c0b69795031..00000000000
--- a/editors/lyx/patches/patch-src_support_unicode.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_support_unicode.cpp,v 1.1 2012/03/10 20:55:47 markd Exp $
-
-Fix build with gcc 4.6
-
---- src/support/unicode.cpp.orig	2009-05-19 20:30:43.000000000 +0000
-+++ src/support/unicode.cpp
-@@ -11,6 +11,7 @@
-  */
- 
- #include <config.h>
-+#include <cstddef>
- 
- #include "support/unicode.h"
- #include "support/debug.h"