Update from 1.3.7 to 1.4.0.

Informed by:	James Ian

15 files changed, 625 insertions, 390 deletions

diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 0e13075cd42e..1d757499c868 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.7
+PORTVERSION=	1.4.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://planetmirror.com/pub/lyx/stable/ \
@@ -16,10 +16,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 CONFLICTS=	cjk-lyx-*
 
@@ -38,7 +36,7 @@ CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
-MAN1=		lyx.1 reLyX.1
+MAN1=		lyx.1 tex2lyx.1 lyxclient.1
 USE_REINPLACE=	yes
 
 post-configure:
diff --git a/print/lyx-devel/distinfo b/print/lyx-devel/distinfo
index dd91bb763f3d..c480da2c57f7 100644
--- a/print/lyx-devel/distinfo
+++ b/print/lyx-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (lyx-1.3.7.tar.bz2) = cef9a2fca128c32ffa04c214d02cde04
-SHA256 (lyx-1.3.7.tar.bz2) = d56e5b3c436634e79689b4305d7c1e429d787ff686d6209e3dc278b7afab5b20
-SIZE (lyx-1.3.7.tar.bz2) = 5893780
+MD5 (lyx-1.4.0.tar.bz2) = 5ab37471339ff7dbc8f0c43282746cb0
+SHA256 (lyx-1.4.0.tar.bz2) = 09eeb2acc4676b5c400d841d3225f20c1475e16554f86a3958ddbf7c5ad0d2a6
+SIZE (lyx-1.4.0.tar.bz2) = 6736577
diff --git a/print/lyx-devel/pkg-plist b/print/lyx-devel/pkg-plist
index 32fa4710411d..88a2fcdce116 100644
--- a/print/lyx-devel/pkg-plist
+++ b/print/lyx-devel/pkg-plist
@@ -1,6 +1,6 @@
 bin/lyx
-bin/noweb2lyx
-bin/reLyX
+bin/tex2lyx
+bin/lyxclient
 share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
@@ -9,15 +9,15 @@ share/locale/fi/LC_MESSAGES/lyx.mo
 share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
 share/locale/it/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/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
+share/locale/tr/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -46,7 +46,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/Intro.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx.in
-%%DATADIR%%/doc/LyXConfig.lyx.in
 %%DATADIR%%/doc/Reference.lyx
 %%DATADIR%%/doc/TOC.lyx
 %%DATADIR%%/doc/Tutorial.lyx
@@ -91,11 +90,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/it_Tutorial.lyx
 %%DATADIR%%/doc/it_UserGuide.lyx
 %%DATADIR%%/doc/mobius.eps
+%%DATADIR%%/doc/nb_Intro.lyx
+%%DATADIR%%/doc/nb_TOC.lyx
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
-%%DATADIR%%/doc/no_Intro.lyx
-%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -123,7 +122,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/Foils.lyx
 %%DATADIR%%/examples/ItemizeBullets.lyx
 %%DATADIR%%/examples/Literate.lyx
-%%DATADIR%%/examples/de_Minipage.lyx
 %%DATADIR%%/examples/Minipage.lyx
 %%DATADIR%%/examples/TableExamples.lyx
 %%DATADIR%%/examples/aa_sample.lyx
@@ -136,8 +134,16 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/currency.lyx
 %%DATADIR%%/examples/cv.lyx
 %%DATADIR%%/examples/da_splash.lyx
+%%DATADIR%%/examples/de_ItemizeBullets.lyx
+%%DATADIR%%/examples/de_Lebenslauf.lyx
+%%DATADIR%%/examples/de_Minipage.lyx
+%%DATADIR%%/examples/de_TableExamples.lyx
+%%DATADIR%%/examples/de_Waehrungen.lyx
 %%DATADIR%%/examples/de_beispiel_gelyxt.lyx
 %%DATADIR%%/examples/de_beispiel_roh.lyx
+%%DATADIR%%/examples/de_decimal.lyx
+%%DATADIR%%/examples/de_mathed.lyx
+%%DATADIR%%/examples/de_multicol.lyx
 %%DATADIR%%/examples/de_splash.lyx
 %%DATADIR%%/examples/decimal.lyx
 %%DATADIR%%/examples/docbook_article.lyx
@@ -191,46 +197,69 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/sl_splash.lyx
 %%DATADIR%%/examples/splash.lyx
 %%DATADIR%%/external_templates
-%%DATADIR%%/help/Bibtex.hlp
-%%DATADIR%%/help/Texinfo.hlp
 %%DATADIR%%/images/amssymb.xpm
 %%DATADIR%%/images/banner.ppm
+%%DATADIR%%/images/bookmark-goto.xpm
+%%DATADIR%%/images/bookmark-save.xpm
+%%DATADIR%%/images/break-line.xpm
 %%DATADIR%%/images/buffer-close.xpm
-%%DATADIR%%/images/buffer-export_ascii.xpm
+%%DATADIR%%/images/buffer-export_dvi.xpm
 %%DATADIR%%/images/buffer-export_latex.xpm
+%%DATADIR%%/images/buffer-export_ps.xpm
+%%DATADIR%%/images/buffer-export_text.xpm
 %%DATADIR%%/images/buffer-new.xpm
-%%DATADIR%%/images/buffer-print.xpm
+%%DATADIR%%/images/buffer-reload.xpm
 %%DATADIR%%/images/buffer-update_dvi.xpm
 %%DATADIR%%/images/buffer-update_ps.xpm
 %%DATADIR%%/images/buffer-view_dvi.xpm
 %%DATADIR%%/images/buffer-view_ps.xpm
+%%DATADIR%%/images/buffer-write-as.xpm
 %%DATADIR%%/images/buffer-write.xpm
 %%DATADIR%%/images/build-program.xpm
-%%DATADIR%%/images/citation-insert.xpm
 %%DATADIR%%/images/copy.xpm
 %%DATADIR%%/images/cut.xpm
 %%DATADIR%%/images/depth-decrement.xpm
 %%DATADIR%%/images/depth-increment.xpm
+%%DATADIR%%/images/dialog-preferences.xpm
+%%DATADIR%%/images/dialog-show-new-inset_citation.xpm
+%%DATADIR%%/images/dialog-show-new-inset_graphics.xpm
+%%DATADIR%%/images/dialog-show-new-inset_include.xpm
+%%DATADIR%%/images/dialog-show-new-inset_ref.xpm
+%%DATADIR%%/images/dialog-show_character.xpm
+%%DATADIR%%/images/dialog-show_findreplace.xpm
+%%DATADIR%%/images/dialog-show_mathpanel.xpm
+%%DATADIR%%/images/dialog-show_print.xpm
+%%DATADIR%%/images/dialog-show_spellchecker.xpm
 %%DATADIR%%/images/down.xpm
 %%DATADIR%%/images/ert-insert.xpm
 %%DATADIR%%/images/file-open.xpm
-%%DATADIR%%/images/find-replace.xpm
+%%DATADIR%%/images/float-insert_figure.xpm
+%%DATADIR%%/images/float-insert_table.xpm
 %%DATADIR%%/images/font-bold.xpm
 %%DATADIR%%/images/font-emph.xpm
-%%DATADIR%%/images/font-free.xpm
+%%DATADIR%%/images/font-free-apply.xpm
 %%DATADIR%%/images/font-noun.xpm
 %%DATADIR%%/images/font-sans.xpm
 %%DATADIR%%/images/footnote-insert.xpm
-%%DATADIR%%/images/graphics-insert.xpm
 %%DATADIR%%/images/index-insert.xpm
 %%DATADIR%%/images/label-insert.xpm
-%%DATADIR%%/images/layout.xpm
+%%DATADIR%%/images/layout-document.xpm
+%%DATADIR%%/images/layout-paragraph.xpm
+%%DATADIR%%/images/layout_Description.xpm
+%%DATADIR%%/images/layout_Enumerate.xpm
+%%DATADIR%%/images/layout_Itemize.xpm
+%%DATADIR%%/images/layout_List.xpm
 %%DATADIR%%/images/layout_LyX-Code.xpm
 %%DATADIR%%/images/layout_Scrap.xpm
 %%DATADIR%%/images/layout_Section.xpm
 %%DATADIR%%/images/lyx-quit.xpm
 %%DATADIR%%/images/lyx.xpm
 %%DATADIR%%/images/marginalnote-insert.xpm
+%%DATADIR%%/images/math-display.xpm
+%%DATADIR%%/images/math-matrix.xpm
+%%DATADIR%%/images/math-mode.xpm
+%%DATADIR%%/images/math-subscript.xpm
+%%DATADIR%%/images/math-superscript.xpm
 %%DATADIR%%/images/math/Bbbk.xpm
 %%DATADIR%%/images/math/Finv.xpm
 %%DATADIR%%/images/math/Game.xpm
@@ -292,6 +321,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/bumpeq2.xpm
 %%DATADIR%%/images/math/cap.xpm
 %%DATADIR%%/images/math/cap2.xpm
+%%DATADIR%%/images/math/cases.xpm
 %%DATADIR%%/images/math/cdot.xpm
 %%DATADIR%%/images/math/cdots.xpm
 %%DATADIR%%/images/math/centerdot.xpm
@@ -398,8 +428,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lambda2.xpm
 %%DATADIR%%/images/math/langle.xpm
 %%DATADIR%%/images/math/lbrace.xpm
+%%DATADIR%%/images/math/lbrace_rbrace.xpm
 %%DATADIR%%/images/math/lbracket.xpm
+%%DATADIR%%/images/math/lbracket_rbracket.xpm
 %%DATADIR%%/images/math/lceil.xpm
+%%DATADIR%%/images/math/lceil_rceil.xpm
 %%DATADIR%%/images/math/ldots.xpm
 %%DATADIR%%/images/math/leftarrow.xpm
 %%DATADIR%%/images/math/leftarrow2.xpm
@@ -423,6 +456,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lessgtr.xpm
 %%DATADIR%%/images/math/lesssim.xpm
 %%DATADIR%%/images/math/lfloor.xpm
+%%DATADIR%%/images/math/lfloor_rfloor.xpm
 %%DATADIR%%/images/math/ll.xpm
 %%DATADIR%%/images/math/llcorner.xpm
 %%DATADIR%%/images/math/lll.xpm
@@ -441,6 +475,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/looparrowright.xpm
 %%DATADIR%%/images/math/lozenge.xpm
 %%DATADIR%%/images/math/lparen.xpm
+%%DATADIR%%/images/math/lparen_rparen.xpm
 %%DATADIR%%/images/math/lrcorner.xpm
 %%DATADIR%%/images/math/ltimes.xpm
 %%DATADIR%%/images/math/lvertneqq.xpm
@@ -559,6 +594,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/rightsquigarrow.xpm
 %%DATADIR%%/images/math/rightthreetimes.xpm
 %%DATADIR%%/images/math/risingdotseq.xpm
+%%DATADIR%%/images/math/root.xpm
 %%DATADIR%%/images/math/rparen.xpm
 %%DATADIR%%/images/math/rtimes.xpm
 %%DATADIR%%/images/math/searrow.xpm
@@ -609,8 +645,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/surd.xpm
 %%DATADIR%%/images/math/swarrow.xpm
 %%DATADIR%%/images/math/tau.xpm
-%%DATADIR%%/images/math/textrm_0.xpm
-%%DATADIR%%/images/math/textrm_A.xpm
+%%DATADIR%%/images/math/textrm_AA.xpm
+%%DATADIR%%/images/math/textrm_Oe.xpm
 %%DATADIR%%/images/math/therefore.xpm
 %%DATADIR%%/images/math/theta.xpm
 %%DATADIR%%/images/math/theta2.xpm
@@ -676,11 +712,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/xi.xpm
 %%DATADIR%%/images/math/xi2.xpm
 %%DATADIR%%/images/math/zeta.xpm
-%%DATADIR%%/images/math-mode.xpm
-%%DATADIR%%/images/math-panel.xpm
-%%DATADIR%%/images/math-subscript.xpm
-%%DATADIR%%/images/math-superscript.xpm
-%%DATADIR%%/images/melt.xpm
+%%DATADIR%%/images/note-insert.xpm
 %%DATADIR%%/images/paste.xpm
 %%DATADIR%%/images/psnfss1.xpm
 %%DATADIR%%/images/psnfss2.xpm
@@ -688,10 +720,33 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/psnfss4.xpm
 %%DATADIR%%/images/redo.xpm
 %%DATADIR%%/images/standard.xpm
+%%DATADIR%%/images/tabular-feature_align-center.xpm
+%%DATADIR%%/images/tabular-feature_align-left.xpm
+%%DATADIR%%/images/tabular-feature_align-right.xpm
+%%DATADIR%%/images/tabular-feature_append-column.xpm
+%%DATADIR%%/images/tabular-feature_append-row.xpm
+%%DATADIR%%/images/tabular-feature_delete-column.xpm
+%%DATADIR%%/images/tabular-feature_delete-row.xpm
+%%DATADIR%%/images/tabular-feature_multicolumn.xpm
+%%DATADIR%%/images/tabular-feature_set-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_set-longtabular.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-cell.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-tabular.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-bottom.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-left.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-right.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-top.xpm
+%%DATADIR%%/images/tabular-feature_unset-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_valign-bottom.xpm
+%%DATADIR%%/images/tabular-feature_valign-middle.xpm
+%%DATADIR%%/images/tabular-feature_valign-top.xpm
 %%DATADIR%%/images/tabular-insert.xpm
+%%DATADIR%%/images/thesaurus-entry.xpm
+%%DATADIR%%/images/toc-view.xpm
 %%DATADIR%%/images/undo.xpm
 %%DATADIR%%/images/unknown.xpm
 %%DATADIR%%/images/up.xpm
+%%DATADIR%%/images/url-insert.xpm
 %%DATADIR%%/kbd/american-2.kmap
 %%DATADIR%%/kbd/american.kmap
 %%DATADIR%%/kbd/arabic.kmap
@@ -750,6 +805,12 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agu-dtd.layout
+%%DATADIR%%/layouts/agu_stdclass.inc
+%%DATADIR%%/layouts/agu_stdcounters.inc
+%%DATADIR%%/layouts/agu_stdlists.inc
+%%DATADIR%%/layouts/agu_stdsections.inc
+%%DATADIR%%/layouts/agu_stdtitle.inc
 %%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
@@ -768,6 +829,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cl2emult.layout
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
+%%DATADIR%%/layouts/db_stdcharstyles.inc
 %%DATADIR%%/layouts/db_stdclass.inc
 %%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
@@ -814,7 +876,9 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/mwart.layout
 %%DATADIR%%/layouts/mwbk.layout
 %%DATADIR%%/layouts/mwrep.layout
-%%DATADIR%%/layouts/obsolete.inc
+%%DATADIR%%/layouts/numarticle.inc
+%%DATADIR%%/layouts/numreport.inc
+%%DATADIR%%/layouts/numrevtex.inc
 %%DATADIR%%/layouts/paper.layout
 %%DATADIR%%/layouts/report.layout
 %%DATADIR%%/layouts/revtex.layout
@@ -824,7 +888,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/scrclass.inc
 %%DATADIR%%/layouts/scrlettr.layout
 %%DATADIR%%/layouts/scrlttr2.layout
-%%DATADIR%%/layouts/scrmacros.inc
 %%DATADIR%%/layouts/scrreprt.layout
 %%DATADIR%%/layouts/seminar.layout
 %%DATADIR%%/layouts/siamltex.layout
@@ -844,70 +907,68 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/svjog.layout
 %%DATADIR%%/layouts/svjour.inc
 %%DATADIR%%/layouts/svprobth.layout
-%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/LyX.py
 %%DATADIR%%/lyx2lyx/LyX.pyc
-%%DATADIR%%/lyx2lyx/error.pyc
+%%DATADIR%%/lyx2lyx/LyX.pyo
+%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/lyx_0_12.py
 %%DATADIR%%/lyx2lyx/lyx_0_12.pyc
+%%DATADIR%%/lyx2lyx/lyx_0_12.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_0.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_1.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_4.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_5.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_2.py
 %%DATADIR%%/lyx2lyx/lyx_1_2.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_2.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_3.py
 %%DATADIR%%/lyx2lyx/lyx_1_3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_4.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_216.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_217.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_218.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_220.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_4.pyo
 %%DATADIR%%/lyx2lyx/parser_tools.py
 %%DATADIR%%/lyx2lyx/parser_tools.pyc
+%%DATADIR%%/lyx2lyx/parser_tools.pyo
 %%DATADIR%%/lyx2lyx/profiling.py
+%%DATADIR%%/lyx2lyx/profiling.pyc
+%%DATADIR%%/lyx2lyx/profiling.pyo
 %%DATADIR%%/lyxrc.defaults
 %%DATADIR%%/lyxrc.example
 %%DATADIR%%/packages.lst
-%%DATADIR%%/reLyX/BUGS
-%%DATADIR%%/reLyX/BasicLyX.pm
-%%DATADIR%%/reLyX/CHANGES
-%%DATADIR%%/reLyX/CleanTeX.pm
-%%DATADIR%%/reLyX/LastLyX.pm
-%%DATADIR%%/reLyX/MakePreamble.pm
-%%DATADIR%%/reLyX/README
-%%DATADIR%%/reLyX/ReadCommands.pm
-%%DATADIR%%/reLyX/RelyxFigure.pm
-%%DATADIR%%/reLyX/RelyxTable.pm
-%%DATADIR%%/reLyX/Text/TeX.pm
-%%DATADIR%%/reLyX/Verbatim.pm
-%%DATADIR%%/reLyX/reLyX.pod
-%%DATADIR%%/reLyX/reLyXmain.pl
-%%DATADIR%%/reLyX/syntax.default
 %%DATADIR%%/scripts/TeXFiles.sh
 %%DATADIR%%/scripts/convertDefault.sh
 %%DATADIR%%/scripts/fen2ascii.py
-%%DATADIR%%/scripts/fig2pstex.py
-%%DATADIR%%/scripts/general_command_wrapper.py
+%%DATADIR%%/scripts/fig2pdftex.sh
+%%DATADIR%%/scripts/fig2pstex.sh
+%%DATADIR%%/scripts/fig_copy.sh
+%%DATADIR%%/scripts/layout2layout.py
+%%DATADIR%%/scripts/legacy_lyxpreview2ppm.py
 %%DATADIR%%/scripts/listerrors
-%%DATADIR%%/scripts/lyxpreview2ppm.py
-%%DATADIR%%/scripts/pic2ascii.py
-%%DATADIR%%/scripts/pic2png_eps.py
-%%DATADIR%%/scripts/pic2png_eps.sh
+%%DATADIR%%/scripts/lyxpreview2bitmap.py
+%%DATADIR%%/scripts/lyxpreview_tools.py
+%%DATADIR%%/scripts/tex_copy.py
 %%DATADIR%%/symbols
+%%DATADIR%%/syntax.default
 %%DATADIR%%/templates/IEEEtran.lyx
+%%DATADIR%%/templates/README.new_templates
 %%DATADIR%%/templates/aa.lyx
 %%DATADIR%%/templates/aastex.lyx
+%%DATADIR%%/templates/agu_article.lyx
 %%DATADIR%%/templates/dinbrief.lyx
 %%DATADIR%%/templates/docbook_article.lyx
 %%DATADIR%%/templates/elsart.lyx
@@ -930,31 +991,19 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/tex/lyxskak.sty
 %%DATADIR%%/tex/revtex.cls
 %%DATADIR%%/textclass.lst
+%%DATADIR%%/ui/classic.ui
 %%DATADIR%%/ui/default.ui
-%%PSRES%%%%DATADIR%%/xfonts/PSres.upr
-%%DATADIR%%/xfonts/cmex10.pfb
-%%DATADIR%%/xfonts/cmmi10.pfb
-%%DATADIR%%/xfonts/cmr10.pfb
-%%DATADIR%%/xfonts/cmsy10.pfb
-%%DATADIR%%/xfonts/eufm10.pfb
-%%DATADIR%%/xfonts/fonts.dir
-%%DATADIR%%/xfonts/fonts.scale
-%%DATADIR%%/xfonts/msam10.pfb
-%%DATADIR%%/xfonts/msbm10.pfb
-%%DATADIR%%/xfonts/wasy10.pfb
-@dirrm %%DATADIR%%/xfonts
+%%DATADIR%%/ui/stdmenus.ui
+%%DATADIR%%/ui/stdtoolbars.ui
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/tex
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/reLyX/Text
-@dirrm %%DATADIR%%/reLyX
 @dirrm %%DATADIR%%/lyx2lyx
 @dirrm %%DATADIR%%/layouts
 @dirrm %%DATADIR%%/kbd
 @dirrm %%DATADIR%%/images/math
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/clipart
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 0e13075cd42e..1d757499c868 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.7
+PORTVERSION=	1.4.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://planetmirror.com/pub/lyx/stable/ \
@@ -16,10 +16,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 CONFLICTS=	cjk-lyx-*
 
@@ -38,7 +36,7 @@ CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
-MAN1=		lyx.1 reLyX.1
+MAN1=		lyx.1 tex2lyx.1 lyxclient.1
 USE_REINPLACE=	yes
 
 post-configure:
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index dd91bb763f3d..c480da2c57f7 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,3 +1,3 @@
-MD5 (lyx-1.3.7.tar.bz2) = cef9a2fca128c32ffa04c214d02cde04
-SHA256 (lyx-1.3.7.tar.bz2) = d56e5b3c436634e79689b4305d7c1e429d787ff686d6209e3dc278b7afab5b20
-SIZE (lyx-1.3.7.tar.bz2) = 5893780
+MD5 (lyx-1.4.0.tar.bz2) = 5ab37471339ff7dbc8f0c43282746cb0
+SHA256 (lyx-1.4.0.tar.bz2) = 09eeb2acc4676b5c400d841d3225f20c1475e16554f86a3958ddbf7c5ad0d2a6
+SIZE (lyx-1.4.0.tar.bz2) = 6736577
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 32fa4710411d..88a2fcdce116 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -1,6 +1,6 @@
 bin/lyx
-bin/noweb2lyx
-bin/reLyX
+bin/tex2lyx
+bin/lyxclient
 share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
@@ -9,15 +9,15 @@ share/locale/fi/LC_MESSAGES/lyx.mo
 share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
 share/locale/it/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/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
+share/locale/tr/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -46,7 +46,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/Intro.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx.in
-%%DATADIR%%/doc/LyXConfig.lyx.in
 %%DATADIR%%/doc/Reference.lyx
 %%DATADIR%%/doc/TOC.lyx
 %%DATADIR%%/doc/Tutorial.lyx
@@ -91,11 +90,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/it_Tutorial.lyx
 %%DATADIR%%/doc/it_UserGuide.lyx
 %%DATADIR%%/doc/mobius.eps
+%%DATADIR%%/doc/nb_Intro.lyx
+%%DATADIR%%/doc/nb_TOC.lyx
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
-%%DATADIR%%/doc/no_Intro.lyx
-%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -123,7 +122,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/Foils.lyx
 %%DATADIR%%/examples/ItemizeBullets.lyx
 %%DATADIR%%/examples/Literate.lyx
-%%DATADIR%%/examples/de_Minipage.lyx
 %%DATADIR%%/examples/Minipage.lyx
 %%DATADIR%%/examples/TableExamples.lyx
 %%DATADIR%%/examples/aa_sample.lyx
@@ -136,8 +134,16 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/currency.lyx
 %%DATADIR%%/examples/cv.lyx
 %%DATADIR%%/examples/da_splash.lyx
+%%DATADIR%%/examples/de_ItemizeBullets.lyx
+%%DATADIR%%/examples/de_Lebenslauf.lyx
+%%DATADIR%%/examples/de_Minipage.lyx
+%%DATADIR%%/examples/de_TableExamples.lyx
+%%DATADIR%%/examples/de_Waehrungen.lyx
 %%DATADIR%%/examples/de_beispiel_gelyxt.lyx
 %%DATADIR%%/examples/de_beispiel_roh.lyx
+%%DATADIR%%/examples/de_decimal.lyx
+%%DATADIR%%/examples/de_mathed.lyx
+%%DATADIR%%/examples/de_multicol.lyx
 %%DATADIR%%/examples/de_splash.lyx
 %%DATADIR%%/examples/decimal.lyx
 %%DATADIR%%/examples/docbook_article.lyx
@@ -191,46 +197,69 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/sl_splash.lyx
 %%DATADIR%%/examples/splash.lyx
 %%DATADIR%%/external_templates
-%%DATADIR%%/help/Bibtex.hlp
-%%DATADIR%%/help/Texinfo.hlp
 %%DATADIR%%/images/amssymb.xpm
 %%DATADIR%%/images/banner.ppm
+%%DATADIR%%/images/bookmark-goto.xpm
+%%DATADIR%%/images/bookmark-save.xpm
+%%DATADIR%%/images/break-line.xpm
 %%DATADIR%%/images/buffer-close.xpm
-%%DATADIR%%/images/buffer-export_ascii.xpm
+%%DATADIR%%/images/buffer-export_dvi.xpm
 %%DATADIR%%/images/buffer-export_latex.xpm
+%%DATADIR%%/images/buffer-export_ps.xpm
+%%DATADIR%%/images/buffer-export_text.xpm
 %%DATADIR%%/images/buffer-new.xpm
-%%DATADIR%%/images/buffer-print.xpm
+%%DATADIR%%/images/buffer-reload.xpm
 %%DATADIR%%/images/buffer-update_dvi.xpm
 %%DATADIR%%/images/buffer-update_ps.xpm
 %%DATADIR%%/images/buffer-view_dvi.xpm
 %%DATADIR%%/images/buffer-view_ps.xpm
+%%DATADIR%%/images/buffer-write-as.xpm
 %%DATADIR%%/images/buffer-write.xpm
 %%DATADIR%%/images/build-program.xpm
-%%DATADIR%%/images/citation-insert.xpm
 %%DATADIR%%/images/copy.xpm
 %%DATADIR%%/images/cut.xpm
 %%DATADIR%%/images/depth-decrement.xpm
 %%DATADIR%%/images/depth-increment.xpm
+%%DATADIR%%/images/dialog-preferences.xpm
+%%DATADIR%%/images/dialog-show-new-inset_citation.xpm
+%%DATADIR%%/images/dialog-show-new-inset_graphics.xpm
+%%DATADIR%%/images/dialog-show-new-inset_include.xpm
+%%DATADIR%%/images/dialog-show-new-inset_ref.xpm
+%%DATADIR%%/images/dialog-show_character.xpm
+%%DATADIR%%/images/dialog-show_findreplace.xpm
+%%DATADIR%%/images/dialog-show_mathpanel.xpm
+%%DATADIR%%/images/dialog-show_print.xpm
+%%DATADIR%%/images/dialog-show_spellchecker.xpm
 %%DATADIR%%/images/down.xpm
 %%DATADIR%%/images/ert-insert.xpm
 %%DATADIR%%/images/file-open.xpm
-%%DATADIR%%/images/find-replace.xpm
+%%DATADIR%%/images/float-insert_figure.xpm
+%%DATADIR%%/images/float-insert_table.xpm
 %%DATADIR%%/images/font-bold.xpm
 %%DATADIR%%/images/font-emph.xpm
-%%DATADIR%%/images/font-free.xpm
+%%DATADIR%%/images/font-free-apply.xpm
 %%DATADIR%%/images/font-noun.xpm
 %%DATADIR%%/images/font-sans.xpm
 %%DATADIR%%/images/footnote-insert.xpm
-%%DATADIR%%/images/graphics-insert.xpm
 %%DATADIR%%/images/index-insert.xpm
 %%DATADIR%%/images/label-insert.xpm
-%%DATADIR%%/images/layout.xpm
+%%DATADIR%%/images/layout-document.xpm
+%%DATADIR%%/images/layout-paragraph.xpm
+%%DATADIR%%/images/layout_Description.xpm
+%%DATADIR%%/images/layout_Enumerate.xpm
+%%DATADIR%%/images/layout_Itemize.xpm
+%%DATADIR%%/images/layout_List.xpm
 %%DATADIR%%/images/layout_LyX-Code.xpm
 %%DATADIR%%/images/layout_Scrap.xpm
 %%DATADIR%%/images/layout_Section.xpm
 %%DATADIR%%/images/lyx-quit.xpm
 %%DATADIR%%/images/lyx.xpm
 %%DATADIR%%/images/marginalnote-insert.xpm
+%%DATADIR%%/images/math-display.xpm
+%%DATADIR%%/images/math-matrix.xpm
+%%DATADIR%%/images/math-mode.xpm
+%%DATADIR%%/images/math-subscript.xpm
+%%DATADIR%%/images/math-superscript.xpm
 %%DATADIR%%/images/math/Bbbk.xpm
 %%DATADIR%%/images/math/Finv.xpm
 %%DATADIR%%/images/math/Game.xpm
@@ -292,6 +321,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/bumpeq2.xpm
 %%DATADIR%%/images/math/cap.xpm
 %%DATADIR%%/images/math/cap2.xpm
+%%DATADIR%%/images/math/cases.xpm
 %%DATADIR%%/images/math/cdot.xpm
 %%DATADIR%%/images/math/cdots.xpm
 %%DATADIR%%/images/math/centerdot.xpm
@@ -398,8 +428,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lambda2.xpm
 %%DATADIR%%/images/math/langle.xpm
 %%DATADIR%%/images/math/lbrace.xpm
+%%DATADIR%%/images/math/lbrace_rbrace.xpm
 %%DATADIR%%/images/math/lbracket.xpm
+%%DATADIR%%/images/math/lbracket_rbracket.xpm
 %%DATADIR%%/images/math/lceil.xpm
+%%DATADIR%%/images/math/lceil_rceil.xpm
 %%DATADIR%%/images/math/ldots.xpm
 %%DATADIR%%/images/math/leftarrow.xpm
 %%DATADIR%%/images/math/leftarrow2.xpm
@@ -423,6 +456,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lessgtr.xpm
 %%DATADIR%%/images/math/lesssim.xpm
 %%DATADIR%%/images/math/lfloor.xpm
+%%DATADIR%%/images/math/lfloor_rfloor.xpm
 %%DATADIR%%/images/math/ll.xpm
 %%DATADIR%%/images/math/llcorner.xpm
 %%DATADIR%%/images/math/lll.xpm
@@ -441,6 +475,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/looparrowright.xpm
 %%DATADIR%%/images/math/lozenge.xpm
 %%DATADIR%%/images/math/lparen.xpm
+%%DATADIR%%/images/math/lparen_rparen.xpm
 %%DATADIR%%/images/math/lrcorner.xpm
 %%DATADIR%%/images/math/ltimes.xpm
 %%DATADIR%%/images/math/lvertneqq.xpm
@@ -559,6 +594,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/rightsquigarrow.xpm
 %%DATADIR%%/images/math/rightthreetimes.xpm
 %%DATADIR%%/images/math/risingdotseq.xpm
+%%DATADIR%%/images/math/root.xpm
 %%DATADIR%%/images/math/rparen.xpm
 %%DATADIR%%/images/math/rtimes.xpm
 %%DATADIR%%/images/math/searrow.xpm
@@ -609,8 +645,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/surd.xpm
 %%DATADIR%%/images/math/swarrow.xpm
 %%DATADIR%%/images/math/tau.xpm
-%%DATADIR%%/images/math/textrm_0.xpm
-%%DATADIR%%/images/math/textrm_A.xpm
+%%DATADIR%%/images/math/textrm_AA.xpm
+%%DATADIR%%/images/math/textrm_Oe.xpm
 %%DATADIR%%/images/math/therefore.xpm
 %%DATADIR%%/images/math/theta.xpm
 %%DATADIR%%/images/math/theta2.xpm
@@ -676,11 +712,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/xi.xpm
 %%DATADIR%%/images/math/xi2.xpm
 %%DATADIR%%/images/math/zeta.xpm
-%%DATADIR%%/images/math-mode.xpm
-%%DATADIR%%/images/math-panel.xpm
-%%DATADIR%%/images/math-subscript.xpm
-%%DATADIR%%/images/math-superscript.xpm
-%%DATADIR%%/images/melt.xpm
+%%DATADIR%%/images/note-insert.xpm
 %%DATADIR%%/images/paste.xpm
 %%DATADIR%%/images/psnfss1.xpm
 %%DATADIR%%/images/psnfss2.xpm
@@ -688,10 +720,33 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/psnfss4.xpm
 %%DATADIR%%/images/redo.xpm
 %%DATADIR%%/images/standard.xpm
+%%DATADIR%%/images/tabular-feature_align-center.xpm
+%%DATADIR%%/images/tabular-feature_align-left.xpm
+%%DATADIR%%/images/tabular-feature_align-right.xpm
+%%DATADIR%%/images/tabular-feature_append-column.xpm
+%%DATADIR%%/images/tabular-feature_append-row.xpm
+%%DATADIR%%/images/tabular-feature_delete-column.xpm
+%%DATADIR%%/images/tabular-feature_delete-row.xpm
+%%DATADIR%%/images/tabular-feature_multicolumn.xpm
+%%DATADIR%%/images/tabular-feature_set-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_set-longtabular.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-cell.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-tabular.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-bottom.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-left.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-right.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-top.xpm
+%%DATADIR%%/images/tabular-feature_unset-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_valign-bottom.xpm
+%%DATADIR%%/images/tabular-feature_valign-middle.xpm
+%%DATADIR%%/images/tabular-feature_valign-top.xpm
 %%DATADIR%%/images/tabular-insert.xpm
+%%DATADIR%%/images/thesaurus-entry.xpm
+%%DATADIR%%/images/toc-view.xpm
 %%DATADIR%%/images/undo.xpm
 %%DATADIR%%/images/unknown.xpm
 %%DATADIR%%/images/up.xpm
+%%DATADIR%%/images/url-insert.xpm
 %%DATADIR%%/kbd/american-2.kmap
 %%DATADIR%%/kbd/american.kmap
 %%DATADIR%%/kbd/arabic.kmap
@@ -750,6 +805,12 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agu-dtd.layout
+%%DATADIR%%/layouts/agu_stdclass.inc
+%%DATADIR%%/layouts/agu_stdcounters.inc
+%%DATADIR%%/layouts/agu_stdlists.inc
+%%DATADIR%%/layouts/agu_stdsections.inc
+%%DATADIR%%/layouts/agu_stdtitle.inc
 %%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
@@ -768,6 +829,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cl2emult.layout
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
+%%DATADIR%%/layouts/db_stdcharstyles.inc
 %%DATADIR%%/layouts/db_stdclass.inc
 %%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
@@ -814,7 +876,9 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/mwart.layout
 %%DATADIR%%/layouts/mwbk.layout
 %%DATADIR%%/layouts/mwrep.layout
-%%DATADIR%%/layouts/obsolete.inc
+%%DATADIR%%/layouts/numarticle.inc
+%%DATADIR%%/layouts/numreport.inc
+%%DATADIR%%/layouts/numrevtex.inc
 %%DATADIR%%/layouts/paper.layout
 %%DATADIR%%/layouts/report.layout
 %%DATADIR%%/layouts/revtex.layout
@@ -824,7 +888,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/scrclass.inc
 %%DATADIR%%/layouts/scrlettr.layout
 %%DATADIR%%/layouts/scrlttr2.layout
-%%DATADIR%%/layouts/scrmacros.inc
 %%DATADIR%%/layouts/scrreprt.layout
 %%DATADIR%%/layouts/seminar.layout
 %%DATADIR%%/layouts/siamltex.layout
@@ -844,70 +907,68 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/svjog.layout
 %%DATADIR%%/layouts/svjour.inc
 %%DATADIR%%/layouts/svprobth.layout
-%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/LyX.py
 %%DATADIR%%/lyx2lyx/LyX.pyc
-%%DATADIR%%/lyx2lyx/error.pyc
+%%DATADIR%%/lyx2lyx/LyX.pyo
+%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/lyx_0_12.py
 %%DATADIR%%/lyx2lyx/lyx_0_12.pyc
+%%DATADIR%%/lyx2lyx/lyx_0_12.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_0.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_1.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_4.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_5.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_2.py
 %%DATADIR%%/lyx2lyx/lyx_1_2.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_2.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_3.py
 %%DATADIR%%/lyx2lyx/lyx_1_3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_4.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_216.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_217.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_218.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_220.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_4.pyo
 %%DATADIR%%/lyx2lyx/parser_tools.py
 %%DATADIR%%/lyx2lyx/parser_tools.pyc
+%%DATADIR%%/lyx2lyx/parser_tools.pyo
 %%DATADIR%%/lyx2lyx/profiling.py
+%%DATADIR%%/lyx2lyx/profiling.pyc
+%%DATADIR%%/lyx2lyx/profiling.pyo
 %%DATADIR%%/lyxrc.defaults
 %%DATADIR%%/lyxrc.example
 %%DATADIR%%/packages.lst
-%%DATADIR%%/reLyX/BUGS
-%%DATADIR%%/reLyX/BasicLyX.pm
-%%DATADIR%%/reLyX/CHANGES
-%%DATADIR%%/reLyX/CleanTeX.pm
-%%DATADIR%%/reLyX/LastLyX.pm
-%%DATADIR%%/reLyX/MakePreamble.pm
-%%DATADIR%%/reLyX/README
-%%DATADIR%%/reLyX/ReadCommands.pm
-%%DATADIR%%/reLyX/RelyxFigure.pm
-%%DATADIR%%/reLyX/RelyxTable.pm
-%%DATADIR%%/reLyX/Text/TeX.pm
-%%DATADIR%%/reLyX/Verbatim.pm
-%%DATADIR%%/reLyX/reLyX.pod
-%%DATADIR%%/reLyX/reLyXmain.pl
-%%DATADIR%%/reLyX/syntax.default
 %%DATADIR%%/scripts/TeXFiles.sh
 %%DATADIR%%/scripts/convertDefault.sh
 %%DATADIR%%/scripts/fen2ascii.py
-%%DATADIR%%/scripts/fig2pstex.py
-%%DATADIR%%/scripts/general_command_wrapper.py
+%%DATADIR%%/scripts/fig2pdftex.sh
+%%DATADIR%%/scripts/fig2pstex.sh
+%%DATADIR%%/scripts/fig_copy.sh
+%%DATADIR%%/scripts/layout2layout.py
+%%DATADIR%%/scripts/legacy_lyxpreview2ppm.py
 %%DATADIR%%/scripts/listerrors
-%%DATADIR%%/scripts/lyxpreview2ppm.py
-%%DATADIR%%/scripts/pic2ascii.py
-%%DATADIR%%/scripts/pic2png_eps.py
-%%DATADIR%%/scripts/pic2png_eps.sh
+%%DATADIR%%/scripts/lyxpreview2bitmap.py
+%%DATADIR%%/scripts/lyxpreview_tools.py
+%%DATADIR%%/scripts/tex_copy.py
 %%DATADIR%%/symbols
+%%DATADIR%%/syntax.default
 %%DATADIR%%/templates/IEEEtran.lyx
+%%DATADIR%%/templates/README.new_templates
 %%DATADIR%%/templates/aa.lyx
 %%DATADIR%%/templates/aastex.lyx
+%%DATADIR%%/templates/agu_article.lyx
 %%DATADIR%%/templates/dinbrief.lyx
 %%DATADIR%%/templates/docbook_article.lyx
 %%DATADIR%%/templates/elsart.lyx
@@ -930,31 +991,19 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/tex/lyxskak.sty
 %%DATADIR%%/tex/revtex.cls
 %%DATADIR%%/textclass.lst
+%%DATADIR%%/ui/classic.ui
 %%DATADIR%%/ui/default.ui
-%%PSRES%%%%DATADIR%%/xfonts/PSres.upr
-%%DATADIR%%/xfonts/cmex10.pfb
-%%DATADIR%%/xfonts/cmmi10.pfb
-%%DATADIR%%/xfonts/cmr10.pfb
-%%DATADIR%%/xfonts/cmsy10.pfb
-%%DATADIR%%/xfonts/eufm10.pfb
-%%DATADIR%%/xfonts/fonts.dir
-%%DATADIR%%/xfonts/fonts.scale
-%%DATADIR%%/xfonts/msam10.pfb
-%%DATADIR%%/xfonts/msbm10.pfb
-%%DATADIR%%/xfonts/wasy10.pfb
-@dirrm %%DATADIR%%/xfonts
+%%DATADIR%%/ui/stdmenus.ui
+%%DATADIR%%/ui/stdtoolbars.ui
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/tex
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/reLyX/Text
-@dirrm %%DATADIR%%/reLyX
 @dirrm %%DATADIR%%/lyx2lyx
 @dirrm %%DATADIR%%/layouts
 @dirrm %%DATADIR%%/kbd
 @dirrm %%DATADIR%%/images/math
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/clipart
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 0e13075cd42e..1d757499c868 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.7
+PORTVERSION=	1.4.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://planetmirror.com/pub/lyx/stable/ \
@@ -16,10 +16,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 CONFLICTS=	cjk-lyx-*
 
@@ -38,7 +36,7 @@ CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
-MAN1=		lyx.1 reLyX.1
+MAN1=		lyx.1 tex2lyx.1 lyxclient.1
 USE_REINPLACE=	yes
 
 post-configure:
diff --git a/print/lyx14/distinfo b/print/lyx14/distinfo
index dd91bb763f3d..c480da2c57f7 100644
--- a/print/lyx14/distinfo
+++ b/print/lyx14/distinfo
@@ -1,3 +1,3 @@
-MD5 (lyx-1.3.7.tar.bz2) = cef9a2fca128c32ffa04c214d02cde04
-SHA256 (lyx-1.3.7.tar.bz2) = d56e5b3c436634e79689b4305d7c1e429d787ff686d6209e3dc278b7afab5b20
-SIZE (lyx-1.3.7.tar.bz2) = 5893780
+MD5 (lyx-1.4.0.tar.bz2) = 5ab37471339ff7dbc8f0c43282746cb0
+SHA256 (lyx-1.4.0.tar.bz2) = 09eeb2acc4676b5c400d841d3225f20c1475e16554f86a3958ddbf7c5ad0d2a6
+SIZE (lyx-1.4.0.tar.bz2) = 6736577
diff --git a/print/lyx14/pkg-plist b/print/lyx14/pkg-plist
index 32fa4710411d..88a2fcdce116 100644
--- a/print/lyx14/pkg-plist
+++ b/print/lyx14/pkg-plist
@@ -1,6 +1,6 @@
 bin/lyx
-bin/noweb2lyx
-bin/reLyX
+bin/tex2lyx
+bin/lyxclient
 share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
@@ -9,15 +9,15 @@ share/locale/fi/LC_MESSAGES/lyx.mo
 share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
 share/locale/it/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/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
+share/locale/tr/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -46,7 +46,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/Intro.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx.in
-%%DATADIR%%/doc/LyXConfig.lyx.in
 %%DATADIR%%/doc/Reference.lyx
 %%DATADIR%%/doc/TOC.lyx
 %%DATADIR%%/doc/Tutorial.lyx
@@ -91,11 +90,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/it_Tutorial.lyx
 %%DATADIR%%/doc/it_UserGuide.lyx
 %%DATADIR%%/doc/mobius.eps
+%%DATADIR%%/doc/nb_Intro.lyx
+%%DATADIR%%/doc/nb_TOC.lyx
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
-%%DATADIR%%/doc/no_Intro.lyx
-%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -123,7 +122,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/Foils.lyx
 %%DATADIR%%/examples/ItemizeBullets.lyx
 %%DATADIR%%/examples/Literate.lyx
-%%DATADIR%%/examples/de_Minipage.lyx
 %%DATADIR%%/examples/Minipage.lyx
 %%DATADIR%%/examples/TableExamples.lyx
 %%DATADIR%%/examples/aa_sample.lyx
@@ -136,8 +134,16 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/currency.lyx
 %%DATADIR%%/examples/cv.lyx
 %%DATADIR%%/examples/da_splash.lyx
+%%DATADIR%%/examples/de_ItemizeBullets.lyx
+%%DATADIR%%/examples/de_Lebenslauf.lyx
+%%DATADIR%%/examples/de_Minipage.lyx
+%%DATADIR%%/examples/de_TableExamples.lyx
+%%DATADIR%%/examples/de_Waehrungen.lyx
 %%DATADIR%%/examples/de_beispiel_gelyxt.lyx
 %%DATADIR%%/examples/de_beispiel_roh.lyx
+%%DATADIR%%/examples/de_decimal.lyx
+%%DATADIR%%/examples/de_mathed.lyx
+%%DATADIR%%/examples/de_multicol.lyx
 %%DATADIR%%/examples/de_splash.lyx
 %%DATADIR%%/examples/decimal.lyx
 %%DATADIR%%/examples/docbook_article.lyx
@@ -191,46 +197,69 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/sl_splash.lyx
 %%DATADIR%%/examples/splash.lyx
 %%DATADIR%%/external_templates
-%%DATADIR%%/help/Bibtex.hlp
-%%DATADIR%%/help/Texinfo.hlp
 %%DATADIR%%/images/amssymb.xpm
 %%DATADIR%%/images/banner.ppm
+%%DATADIR%%/images/bookmark-goto.xpm
+%%DATADIR%%/images/bookmark-save.xpm
+%%DATADIR%%/images/break-line.xpm
 %%DATADIR%%/images/buffer-close.xpm
-%%DATADIR%%/images/buffer-export_ascii.xpm
+%%DATADIR%%/images/buffer-export_dvi.xpm
 %%DATADIR%%/images/buffer-export_latex.xpm
+%%DATADIR%%/images/buffer-export_ps.xpm
+%%DATADIR%%/images/buffer-export_text.xpm
 %%DATADIR%%/images/buffer-new.xpm
-%%DATADIR%%/images/buffer-print.xpm
+%%DATADIR%%/images/buffer-reload.xpm
 %%DATADIR%%/images/buffer-update_dvi.xpm
 %%DATADIR%%/images/buffer-update_ps.xpm
 %%DATADIR%%/images/buffer-view_dvi.xpm
 %%DATADIR%%/images/buffer-view_ps.xpm
+%%DATADIR%%/images/buffer-write-as.xpm
 %%DATADIR%%/images/buffer-write.xpm
 %%DATADIR%%/images/build-program.xpm
-%%DATADIR%%/images/citation-insert.xpm
 %%DATADIR%%/images/copy.xpm
 %%DATADIR%%/images/cut.xpm
 %%DATADIR%%/images/depth-decrement.xpm
 %%DATADIR%%/images/depth-increment.xpm
+%%DATADIR%%/images/dialog-preferences.xpm
+%%DATADIR%%/images/dialog-show-new-inset_citation.xpm
+%%DATADIR%%/images/dialog-show-new-inset_graphics.xpm
+%%DATADIR%%/images/dialog-show-new-inset_include.xpm
+%%DATADIR%%/images/dialog-show-new-inset_ref.xpm
+%%DATADIR%%/images/dialog-show_character.xpm
+%%DATADIR%%/images/dialog-show_findreplace.xpm
+%%DATADIR%%/images/dialog-show_mathpanel.xpm
+%%DATADIR%%/images/dialog-show_print.xpm
+%%DATADIR%%/images/dialog-show_spellchecker.xpm
 %%DATADIR%%/images/down.xpm
 %%DATADIR%%/images/ert-insert.xpm
 %%DATADIR%%/images/file-open.xpm
-%%DATADIR%%/images/find-replace.xpm
+%%DATADIR%%/images/float-insert_figure.xpm
+%%DATADIR%%/images/float-insert_table.xpm
 %%DATADIR%%/images/font-bold.xpm
 %%DATADIR%%/images/font-emph.xpm
-%%DATADIR%%/images/font-free.xpm
+%%DATADIR%%/images/font-free-apply.xpm
 %%DATADIR%%/images/font-noun.xpm
 %%DATADIR%%/images/font-sans.xpm
 %%DATADIR%%/images/footnote-insert.xpm
-%%DATADIR%%/images/graphics-insert.xpm
 %%DATADIR%%/images/index-insert.xpm
 %%DATADIR%%/images/label-insert.xpm
-%%DATADIR%%/images/layout.xpm
+%%DATADIR%%/images/layout-document.xpm
+%%DATADIR%%/images/layout-paragraph.xpm
+%%DATADIR%%/images/layout_Description.xpm
+%%DATADIR%%/images/layout_Enumerate.xpm
+%%DATADIR%%/images/layout_Itemize.xpm
+%%DATADIR%%/images/layout_List.xpm
 %%DATADIR%%/images/layout_LyX-Code.xpm
 %%DATADIR%%/images/layout_Scrap.xpm
 %%DATADIR%%/images/layout_Section.xpm
 %%DATADIR%%/images/lyx-quit.xpm
 %%DATADIR%%/images/lyx.xpm
 %%DATADIR%%/images/marginalnote-insert.xpm
+%%DATADIR%%/images/math-display.xpm
+%%DATADIR%%/images/math-matrix.xpm
+%%DATADIR%%/images/math-mode.xpm
+%%DATADIR%%/images/math-subscript.xpm
+%%DATADIR%%/images/math-superscript.xpm
 %%DATADIR%%/images/math/Bbbk.xpm
 %%DATADIR%%/images/math/Finv.xpm
 %%DATADIR%%/images/math/Game.xpm
@@ -292,6 +321,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/bumpeq2.xpm
 %%DATADIR%%/images/math/cap.xpm
 %%DATADIR%%/images/math/cap2.xpm
+%%DATADIR%%/images/math/cases.xpm
 %%DATADIR%%/images/math/cdot.xpm
 %%DATADIR%%/images/math/cdots.xpm
 %%DATADIR%%/images/math/centerdot.xpm
@@ -398,8 +428,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lambda2.xpm
 %%DATADIR%%/images/math/langle.xpm
 %%DATADIR%%/images/math/lbrace.xpm
+%%DATADIR%%/images/math/lbrace_rbrace.xpm
 %%DATADIR%%/images/math/lbracket.xpm
+%%DATADIR%%/images/math/lbracket_rbracket.xpm
 %%DATADIR%%/images/math/lceil.xpm
+%%DATADIR%%/images/math/lceil_rceil.xpm
 %%DATADIR%%/images/math/ldots.xpm
 %%DATADIR%%/images/math/leftarrow.xpm
 %%DATADIR%%/images/math/leftarrow2.xpm
@@ -423,6 +456,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lessgtr.xpm
 %%DATADIR%%/images/math/lesssim.xpm
 %%DATADIR%%/images/math/lfloor.xpm
+%%DATADIR%%/images/math/lfloor_rfloor.xpm
 %%DATADIR%%/images/math/ll.xpm
 %%DATADIR%%/images/math/llcorner.xpm
 %%DATADIR%%/images/math/lll.xpm
@@ -441,6 +475,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/looparrowright.xpm
 %%DATADIR%%/images/math/lozenge.xpm
 %%DATADIR%%/images/math/lparen.xpm
+%%DATADIR%%/images/math/lparen_rparen.xpm
 %%DATADIR%%/images/math/lrcorner.xpm
 %%DATADIR%%/images/math/ltimes.xpm
 %%DATADIR%%/images/math/lvertneqq.xpm
@@ -559,6 +594,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/rightsquigarrow.xpm
 %%DATADIR%%/images/math/rightthreetimes.xpm
 %%DATADIR%%/images/math/risingdotseq.xpm
+%%DATADIR%%/images/math/root.xpm
 %%DATADIR%%/images/math/rparen.xpm
 %%DATADIR%%/images/math/rtimes.xpm
 %%DATADIR%%/images/math/searrow.xpm
@@ -609,8 +645,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/surd.xpm
 %%DATADIR%%/images/math/swarrow.xpm
 %%DATADIR%%/images/math/tau.xpm
-%%DATADIR%%/images/math/textrm_0.xpm
-%%DATADIR%%/images/math/textrm_A.xpm
+%%DATADIR%%/images/math/textrm_AA.xpm
+%%DATADIR%%/images/math/textrm_Oe.xpm
 %%DATADIR%%/images/math/therefore.xpm
 %%DATADIR%%/images/math/theta.xpm
 %%DATADIR%%/images/math/theta2.xpm
@@ -676,11 +712,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/xi.xpm
 %%DATADIR%%/images/math/xi2.xpm
 %%DATADIR%%/images/math/zeta.xpm
-%%DATADIR%%/images/math-mode.xpm
-%%DATADIR%%/images/math-panel.xpm
-%%DATADIR%%/images/math-subscript.xpm
-%%DATADIR%%/images/math-superscript.xpm
-%%DATADIR%%/images/melt.xpm
+%%DATADIR%%/images/note-insert.xpm
 %%DATADIR%%/images/paste.xpm
 %%DATADIR%%/images/psnfss1.xpm
 %%DATADIR%%/images/psnfss2.xpm
@@ -688,10 +720,33 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/psnfss4.xpm
 %%DATADIR%%/images/redo.xpm
 %%DATADIR%%/images/standard.xpm
+%%DATADIR%%/images/tabular-feature_align-center.xpm
+%%DATADIR%%/images/tabular-feature_align-left.xpm
+%%DATADIR%%/images/tabular-feature_align-right.xpm
+%%DATADIR%%/images/tabular-feature_append-column.xpm
+%%DATADIR%%/images/tabular-feature_append-row.xpm
+%%DATADIR%%/images/tabular-feature_delete-column.xpm
+%%DATADIR%%/images/tabular-feature_delete-row.xpm
+%%DATADIR%%/images/tabular-feature_multicolumn.xpm
+%%DATADIR%%/images/tabular-feature_set-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_set-longtabular.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-cell.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-tabular.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-bottom.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-left.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-right.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-top.xpm
+%%DATADIR%%/images/tabular-feature_unset-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_valign-bottom.xpm
+%%DATADIR%%/images/tabular-feature_valign-middle.xpm
+%%DATADIR%%/images/tabular-feature_valign-top.xpm
 %%DATADIR%%/images/tabular-insert.xpm
+%%DATADIR%%/images/thesaurus-entry.xpm
+%%DATADIR%%/images/toc-view.xpm
 %%DATADIR%%/images/undo.xpm
 %%DATADIR%%/images/unknown.xpm
 %%DATADIR%%/images/up.xpm
+%%DATADIR%%/images/url-insert.xpm
 %%DATADIR%%/kbd/american-2.kmap
 %%DATADIR%%/kbd/american.kmap
 %%DATADIR%%/kbd/arabic.kmap
@@ -750,6 +805,12 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agu-dtd.layout
+%%DATADIR%%/layouts/agu_stdclass.inc
+%%DATADIR%%/layouts/agu_stdcounters.inc
+%%DATADIR%%/layouts/agu_stdlists.inc
+%%DATADIR%%/layouts/agu_stdsections.inc
+%%DATADIR%%/layouts/agu_stdtitle.inc
 %%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
@@ -768,6 +829,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cl2emult.layout
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
+%%DATADIR%%/layouts/db_stdcharstyles.inc
 %%DATADIR%%/layouts/db_stdclass.inc
 %%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
@@ -814,7 +876,9 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/mwart.layout
 %%DATADIR%%/layouts/mwbk.layout
 %%DATADIR%%/layouts/mwrep.layout
-%%DATADIR%%/layouts/obsolete.inc
+%%DATADIR%%/layouts/numarticle.inc
+%%DATADIR%%/layouts/numreport.inc
+%%DATADIR%%/layouts/numrevtex.inc
 %%DATADIR%%/layouts/paper.layout
 %%DATADIR%%/layouts/report.layout
 %%DATADIR%%/layouts/revtex.layout
@@ -824,7 +888,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/scrclass.inc
 %%DATADIR%%/layouts/scrlettr.layout
 %%DATADIR%%/layouts/scrlttr2.layout
-%%DATADIR%%/layouts/scrmacros.inc
 %%DATADIR%%/layouts/scrreprt.layout
 %%DATADIR%%/layouts/seminar.layout
 %%DATADIR%%/layouts/siamltex.layout
@@ -844,70 +907,68 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/svjog.layout
 %%DATADIR%%/layouts/svjour.inc
 %%DATADIR%%/layouts/svprobth.layout
-%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/LyX.py
 %%DATADIR%%/lyx2lyx/LyX.pyc
-%%DATADIR%%/lyx2lyx/error.pyc
+%%DATADIR%%/lyx2lyx/LyX.pyo
+%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/lyx_0_12.py
 %%DATADIR%%/lyx2lyx/lyx_0_12.pyc
+%%DATADIR%%/lyx2lyx/lyx_0_12.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_0.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_1.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_4.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_5.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_2.py
 %%DATADIR%%/lyx2lyx/lyx_1_2.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_2.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_3.py
 %%DATADIR%%/lyx2lyx/lyx_1_3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_4.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_216.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_217.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_218.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_220.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_4.pyo
 %%DATADIR%%/lyx2lyx/parser_tools.py
 %%DATADIR%%/lyx2lyx/parser_tools.pyc
+%%DATADIR%%/lyx2lyx/parser_tools.pyo
 %%DATADIR%%/lyx2lyx/profiling.py
+%%DATADIR%%/lyx2lyx/profiling.pyc
+%%DATADIR%%/lyx2lyx/profiling.pyo
 %%DATADIR%%/lyxrc.defaults
 %%DATADIR%%/lyxrc.example
 %%DATADIR%%/packages.lst
-%%DATADIR%%/reLyX/BUGS
-%%DATADIR%%/reLyX/BasicLyX.pm
-%%DATADIR%%/reLyX/CHANGES
-%%DATADIR%%/reLyX/CleanTeX.pm
-%%DATADIR%%/reLyX/LastLyX.pm
-%%DATADIR%%/reLyX/MakePreamble.pm
-%%DATADIR%%/reLyX/README
-%%DATADIR%%/reLyX/ReadCommands.pm
-%%DATADIR%%/reLyX/RelyxFigure.pm
-%%DATADIR%%/reLyX/RelyxTable.pm
-%%DATADIR%%/reLyX/Text/TeX.pm
-%%DATADIR%%/reLyX/Verbatim.pm
-%%DATADIR%%/reLyX/reLyX.pod
-%%DATADIR%%/reLyX/reLyXmain.pl
-%%DATADIR%%/reLyX/syntax.default
 %%DATADIR%%/scripts/TeXFiles.sh
 %%DATADIR%%/scripts/convertDefault.sh
 %%DATADIR%%/scripts/fen2ascii.py
-%%DATADIR%%/scripts/fig2pstex.py
-%%DATADIR%%/scripts/general_command_wrapper.py
+%%DATADIR%%/scripts/fig2pdftex.sh
+%%DATADIR%%/scripts/fig2pstex.sh
+%%DATADIR%%/scripts/fig_copy.sh
+%%DATADIR%%/scripts/layout2layout.py
+%%DATADIR%%/scripts/legacy_lyxpreview2ppm.py
 %%DATADIR%%/scripts/listerrors
-%%DATADIR%%/scripts/lyxpreview2ppm.py
-%%DATADIR%%/scripts/pic2ascii.py
-%%DATADIR%%/scripts/pic2png_eps.py
-%%DATADIR%%/scripts/pic2png_eps.sh
+%%DATADIR%%/scripts/lyxpreview2bitmap.py
+%%DATADIR%%/scripts/lyxpreview_tools.py
+%%DATADIR%%/scripts/tex_copy.py
 %%DATADIR%%/symbols
+%%DATADIR%%/syntax.default
 %%DATADIR%%/templates/IEEEtran.lyx
+%%DATADIR%%/templates/README.new_templates
 %%DATADIR%%/templates/aa.lyx
 %%DATADIR%%/templates/aastex.lyx
+%%DATADIR%%/templates/agu_article.lyx
 %%DATADIR%%/templates/dinbrief.lyx
 %%DATADIR%%/templates/docbook_article.lyx
 %%DATADIR%%/templates/elsart.lyx
@@ -930,31 +991,19 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/tex/lyxskak.sty
 %%DATADIR%%/tex/revtex.cls
 %%DATADIR%%/textclass.lst
+%%DATADIR%%/ui/classic.ui
 %%DATADIR%%/ui/default.ui
-%%PSRES%%%%DATADIR%%/xfonts/PSres.upr
-%%DATADIR%%/xfonts/cmex10.pfb
-%%DATADIR%%/xfonts/cmmi10.pfb
-%%DATADIR%%/xfonts/cmr10.pfb
-%%DATADIR%%/xfonts/cmsy10.pfb
-%%DATADIR%%/xfonts/eufm10.pfb
-%%DATADIR%%/xfonts/fonts.dir
-%%DATADIR%%/xfonts/fonts.scale
-%%DATADIR%%/xfonts/msam10.pfb
-%%DATADIR%%/xfonts/msbm10.pfb
-%%DATADIR%%/xfonts/wasy10.pfb
-@dirrm %%DATADIR%%/xfonts
+%%DATADIR%%/ui/stdmenus.ui
+%%DATADIR%%/ui/stdtoolbars.ui
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/tex
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/reLyX/Text
-@dirrm %%DATADIR%%/reLyX
 @dirrm %%DATADIR%%/lyx2lyx
 @dirrm %%DATADIR%%/layouts
 @dirrm %%DATADIR%%/kbd
 @dirrm %%DATADIR%%/images/math
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/clipart
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 0e13075cd42e..1d757499c868 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.7
+PORTVERSION=	1.4.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://planetmirror.com/pub/lyx/stable/ \
@@ -16,10 +16,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 CONFLICTS=	cjk-lyx-*
 
@@ -38,7 +36,7 @@ CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
-MAN1=		lyx.1 reLyX.1
+MAN1=		lyx.1 tex2lyx.1 lyxclient.1
 USE_REINPLACE=	yes
 
 post-configure:
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index dd91bb763f3d..c480da2c57f7 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -1,3 +1,3 @@
-MD5 (lyx-1.3.7.tar.bz2) = cef9a2fca128c32ffa04c214d02cde04
-SHA256 (lyx-1.3.7.tar.bz2) = d56e5b3c436634e79689b4305d7c1e429d787ff686d6209e3dc278b7afab5b20
-SIZE (lyx-1.3.7.tar.bz2) = 5893780
+MD5 (lyx-1.4.0.tar.bz2) = 5ab37471339ff7dbc8f0c43282746cb0
+SHA256 (lyx-1.4.0.tar.bz2) = 09eeb2acc4676b5c400d841d3225f20c1475e16554f86a3958ddbf7c5ad0d2a6
+SIZE (lyx-1.4.0.tar.bz2) = 6736577
diff --git a/print/lyx15/pkg-plist b/print/lyx15/pkg-plist
index 32fa4710411d..88a2fcdce116 100644
--- a/print/lyx15/pkg-plist
+++ b/print/lyx15/pkg-plist
@@ -1,6 +1,6 @@
 bin/lyx
-bin/noweb2lyx
-bin/reLyX
+bin/tex2lyx
+bin/lyxclient
 share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
@@ -9,15 +9,15 @@ share/locale/fi/LC_MESSAGES/lyx.mo
 share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
 share/locale/it/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/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
+share/locale/tr/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -46,7 +46,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/Intro.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx.in
-%%DATADIR%%/doc/LyXConfig.lyx.in
 %%DATADIR%%/doc/Reference.lyx
 %%DATADIR%%/doc/TOC.lyx
 %%DATADIR%%/doc/Tutorial.lyx
@@ -91,11 +90,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/it_Tutorial.lyx
 %%DATADIR%%/doc/it_UserGuide.lyx
 %%DATADIR%%/doc/mobius.eps
+%%DATADIR%%/doc/nb_Intro.lyx
+%%DATADIR%%/doc/nb_TOC.lyx
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
-%%DATADIR%%/doc/no_Intro.lyx
-%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -123,7 +122,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/Foils.lyx
 %%DATADIR%%/examples/ItemizeBullets.lyx
 %%DATADIR%%/examples/Literate.lyx
-%%DATADIR%%/examples/de_Minipage.lyx
 %%DATADIR%%/examples/Minipage.lyx
 %%DATADIR%%/examples/TableExamples.lyx
 %%DATADIR%%/examples/aa_sample.lyx
@@ -136,8 +134,16 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/currency.lyx
 %%DATADIR%%/examples/cv.lyx
 %%DATADIR%%/examples/da_splash.lyx
+%%DATADIR%%/examples/de_ItemizeBullets.lyx
+%%DATADIR%%/examples/de_Lebenslauf.lyx
+%%DATADIR%%/examples/de_Minipage.lyx
+%%DATADIR%%/examples/de_TableExamples.lyx
+%%DATADIR%%/examples/de_Waehrungen.lyx
 %%DATADIR%%/examples/de_beispiel_gelyxt.lyx
 %%DATADIR%%/examples/de_beispiel_roh.lyx
+%%DATADIR%%/examples/de_decimal.lyx
+%%DATADIR%%/examples/de_mathed.lyx
+%%DATADIR%%/examples/de_multicol.lyx
 %%DATADIR%%/examples/de_splash.lyx
 %%DATADIR%%/examples/decimal.lyx
 %%DATADIR%%/examples/docbook_article.lyx
@@ -191,46 +197,69 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/sl_splash.lyx
 %%DATADIR%%/examples/splash.lyx
 %%DATADIR%%/external_templates
-%%DATADIR%%/help/Bibtex.hlp
-%%DATADIR%%/help/Texinfo.hlp
 %%DATADIR%%/images/amssymb.xpm
 %%DATADIR%%/images/banner.ppm
+%%DATADIR%%/images/bookmark-goto.xpm
+%%DATADIR%%/images/bookmark-save.xpm
+%%DATADIR%%/images/break-line.xpm
 %%DATADIR%%/images/buffer-close.xpm
-%%DATADIR%%/images/buffer-export_ascii.xpm
+%%DATADIR%%/images/buffer-export_dvi.xpm
 %%DATADIR%%/images/buffer-export_latex.xpm
+%%DATADIR%%/images/buffer-export_ps.xpm
+%%DATADIR%%/images/buffer-export_text.xpm
 %%DATADIR%%/images/buffer-new.xpm
-%%DATADIR%%/images/buffer-print.xpm
+%%DATADIR%%/images/buffer-reload.xpm
 %%DATADIR%%/images/buffer-update_dvi.xpm
 %%DATADIR%%/images/buffer-update_ps.xpm
 %%DATADIR%%/images/buffer-view_dvi.xpm
 %%DATADIR%%/images/buffer-view_ps.xpm
+%%DATADIR%%/images/buffer-write-as.xpm
 %%DATADIR%%/images/buffer-write.xpm
 %%DATADIR%%/images/build-program.xpm
-%%DATADIR%%/images/citation-insert.xpm
 %%DATADIR%%/images/copy.xpm
 %%DATADIR%%/images/cut.xpm
 %%DATADIR%%/images/depth-decrement.xpm
 %%DATADIR%%/images/depth-increment.xpm
+%%DATADIR%%/images/dialog-preferences.xpm
+%%DATADIR%%/images/dialog-show-new-inset_citation.xpm
+%%DATADIR%%/images/dialog-show-new-inset_graphics.xpm
+%%DATADIR%%/images/dialog-show-new-inset_include.xpm
+%%DATADIR%%/images/dialog-show-new-inset_ref.xpm
+%%DATADIR%%/images/dialog-show_character.xpm
+%%DATADIR%%/images/dialog-show_findreplace.xpm
+%%DATADIR%%/images/dialog-show_mathpanel.xpm
+%%DATADIR%%/images/dialog-show_print.xpm
+%%DATADIR%%/images/dialog-show_spellchecker.xpm
 %%DATADIR%%/images/down.xpm
 %%DATADIR%%/images/ert-insert.xpm
 %%DATADIR%%/images/file-open.xpm
-%%DATADIR%%/images/find-replace.xpm
+%%DATADIR%%/images/float-insert_figure.xpm
+%%DATADIR%%/images/float-insert_table.xpm
 %%DATADIR%%/images/font-bold.xpm
 %%DATADIR%%/images/font-emph.xpm
-%%DATADIR%%/images/font-free.xpm
+%%DATADIR%%/images/font-free-apply.xpm
 %%DATADIR%%/images/font-noun.xpm
 %%DATADIR%%/images/font-sans.xpm
 %%DATADIR%%/images/footnote-insert.xpm
-%%DATADIR%%/images/graphics-insert.xpm
 %%DATADIR%%/images/index-insert.xpm
 %%DATADIR%%/images/label-insert.xpm
-%%DATADIR%%/images/layout.xpm
+%%DATADIR%%/images/layout-document.xpm
+%%DATADIR%%/images/layout-paragraph.xpm
+%%DATADIR%%/images/layout_Description.xpm
+%%DATADIR%%/images/layout_Enumerate.xpm
+%%DATADIR%%/images/layout_Itemize.xpm
+%%DATADIR%%/images/layout_List.xpm
 %%DATADIR%%/images/layout_LyX-Code.xpm
 %%DATADIR%%/images/layout_Scrap.xpm
 %%DATADIR%%/images/layout_Section.xpm
 %%DATADIR%%/images/lyx-quit.xpm
 %%DATADIR%%/images/lyx.xpm
 %%DATADIR%%/images/marginalnote-insert.xpm
+%%DATADIR%%/images/math-display.xpm
+%%DATADIR%%/images/math-matrix.xpm
+%%DATADIR%%/images/math-mode.xpm
+%%DATADIR%%/images/math-subscript.xpm
+%%DATADIR%%/images/math-superscript.xpm
 %%DATADIR%%/images/math/Bbbk.xpm
 %%DATADIR%%/images/math/Finv.xpm
 %%DATADIR%%/images/math/Game.xpm
@@ -292,6 +321,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/bumpeq2.xpm
 %%DATADIR%%/images/math/cap.xpm
 %%DATADIR%%/images/math/cap2.xpm
+%%DATADIR%%/images/math/cases.xpm
 %%DATADIR%%/images/math/cdot.xpm
 %%DATADIR%%/images/math/cdots.xpm
 %%DATADIR%%/images/math/centerdot.xpm
@@ -398,8 +428,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lambda2.xpm
 %%DATADIR%%/images/math/langle.xpm
 %%DATADIR%%/images/math/lbrace.xpm
+%%DATADIR%%/images/math/lbrace_rbrace.xpm
 %%DATADIR%%/images/math/lbracket.xpm
+%%DATADIR%%/images/math/lbracket_rbracket.xpm
 %%DATADIR%%/images/math/lceil.xpm
+%%DATADIR%%/images/math/lceil_rceil.xpm
 %%DATADIR%%/images/math/ldots.xpm
 %%DATADIR%%/images/math/leftarrow.xpm
 %%DATADIR%%/images/math/leftarrow2.xpm
@@ -423,6 +456,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lessgtr.xpm
 %%DATADIR%%/images/math/lesssim.xpm
 %%DATADIR%%/images/math/lfloor.xpm
+%%DATADIR%%/images/math/lfloor_rfloor.xpm
 %%DATADIR%%/images/math/ll.xpm
 %%DATADIR%%/images/math/llcorner.xpm
 %%DATADIR%%/images/math/lll.xpm
@@ -441,6 +475,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/looparrowright.xpm
 %%DATADIR%%/images/math/lozenge.xpm
 %%DATADIR%%/images/math/lparen.xpm
+%%DATADIR%%/images/math/lparen_rparen.xpm
 %%DATADIR%%/images/math/lrcorner.xpm
 %%DATADIR%%/images/math/ltimes.xpm
 %%DATADIR%%/images/math/lvertneqq.xpm
@@ -559,6 +594,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/rightsquigarrow.xpm
 %%DATADIR%%/images/math/rightthreetimes.xpm
 %%DATADIR%%/images/math/risingdotseq.xpm
+%%DATADIR%%/images/math/root.xpm
 %%DATADIR%%/images/math/rparen.xpm
 %%DATADIR%%/images/math/rtimes.xpm
 %%DATADIR%%/images/math/searrow.xpm
@@ -609,8 +645,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/surd.xpm
 %%DATADIR%%/images/math/swarrow.xpm
 %%DATADIR%%/images/math/tau.xpm
-%%DATADIR%%/images/math/textrm_0.xpm
-%%DATADIR%%/images/math/textrm_A.xpm
+%%DATADIR%%/images/math/textrm_AA.xpm
+%%DATADIR%%/images/math/textrm_Oe.xpm
 %%DATADIR%%/images/math/therefore.xpm
 %%DATADIR%%/images/math/theta.xpm
 %%DATADIR%%/images/math/theta2.xpm
@@ -676,11 +712,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/xi.xpm
 %%DATADIR%%/images/math/xi2.xpm
 %%DATADIR%%/images/math/zeta.xpm
-%%DATADIR%%/images/math-mode.xpm
-%%DATADIR%%/images/math-panel.xpm
-%%DATADIR%%/images/math-subscript.xpm
-%%DATADIR%%/images/math-superscript.xpm
-%%DATADIR%%/images/melt.xpm
+%%DATADIR%%/images/note-insert.xpm
 %%DATADIR%%/images/paste.xpm
 %%DATADIR%%/images/psnfss1.xpm
 %%DATADIR%%/images/psnfss2.xpm
@@ -688,10 +720,33 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/psnfss4.xpm
 %%DATADIR%%/images/redo.xpm
 %%DATADIR%%/images/standard.xpm
+%%DATADIR%%/images/tabular-feature_align-center.xpm
+%%DATADIR%%/images/tabular-feature_align-left.xpm
+%%DATADIR%%/images/tabular-feature_align-right.xpm
+%%DATADIR%%/images/tabular-feature_append-column.xpm
+%%DATADIR%%/images/tabular-feature_append-row.xpm
+%%DATADIR%%/images/tabular-feature_delete-column.xpm
+%%DATADIR%%/images/tabular-feature_delete-row.xpm
+%%DATADIR%%/images/tabular-feature_multicolumn.xpm
+%%DATADIR%%/images/tabular-feature_set-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_set-longtabular.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-cell.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-tabular.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-bottom.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-left.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-right.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-top.xpm
+%%DATADIR%%/images/tabular-feature_unset-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_valign-bottom.xpm
+%%DATADIR%%/images/tabular-feature_valign-middle.xpm
+%%DATADIR%%/images/tabular-feature_valign-top.xpm
 %%DATADIR%%/images/tabular-insert.xpm
+%%DATADIR%%/images/thesaurus-entry.xpm
+%%DATADIR%%/images/toc-view.xpm
 %%DATADIR%%/images/undo.xpm
 %%DATADIR%%/images/unknown.xpm
 %%DATADIR%%/images/up.xpm
+%%DATADIR%%/images/url-insert.xpm
 %%DATADIR%%/kbd/american-2.kmap
 %%DATADIR%%/kbd/american.kmap
 %%DATADIR%%/kbd/arabic.kmap
@@ -750,6 +805,12 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agu-dtd.layout
+%%DATADIR%%/layouts/agu_stdclass.inc
+%%DATADIR%%/layouts/agu_stdcounters.inc
+%%DATADIR%%/layouts/agu_stdlists.inc
+%%DATADIR%%/layouts/agu_stdsections.inc
+%%DATADIR%%/layouts/agu_stdtitle.inc
 %%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
@@ -768,6 +829,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cl2emult.layout
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
+%%DATADIR%%/layouts/db_stdcharstyles.inc
 %%DATADIR%%/layouts/db_stdclass.inc
 %%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
@@ -814,7 +876,9 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/mwart.layout
 %%DATADIR%%/layouts/mwbk.layout
 %%DATADIR%%/layouts/mwrep.layout
-%%DATADIR%%/layouts/obsolete.inc
+%%DATADIR%%/layouts/numarticle.inc
+%%DATADIR%%/layouts/numreport.inc
+%%DATADIR%%/layouts/numrevtex.inc
 %%DATADIR%%/layouts/paper.layout
 %%DATADIR%%/layouts/report.layout
 %%DATADIR%%/layouts/revtex.layout
@@ -824,7 +888,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/scrclass.inc
 %%DATADIR%%/layouts/scrlettr.layout
 %%DATADIR%%/layouts/scrlttr2.layout
-%%DATADIR%%/layouts/scrmacros.inc
 %%DATADIR%%/layouts/scrreprt.layout
 %%DATADIR%%/layouts/seminar.layout
 %%DATADIR%%/layouts/siamltex.layout
@@ -844,70 +907,68 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/svjog.layout
 %%DATADIR%%/layouts/svjour.inc
 %%DATADIR%%/layouts/svprobth.layout
-%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/LyX.py
 %%DATADIR%%/lyx2lyx/LyX.pyc
-%%DATADIR%%/lyx2lyx/error.pyc
+%%DATADIR%%/lyx2lyx/LyX.pyo
+%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/lyx_0_12.py
 %%DATADIR%%/lyx2lyx/lyx_0_12.pyc
+%%DATADIR%%/lyx2lyx/lyx_0_12.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_0.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_1.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_4.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_5.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_2.py
 %%DATADIR%%/lyx2lyx/lyx_1_2.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_2.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_3.py
 %%DATADIR%%/lyx2lyx/lyx_1_3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_4.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_216.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_217.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_218.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_220.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_4.pyo
 %%DATADIR%%/lyx2lyx/parser_tools.py
 %%DATADIR%%/lyx2lyx/parser_tools.pyc
+%%DATADIR%%/lyx2lyx/parser_tools.pyo
 %%DATADIR%%/lyx2lyx/profiling.py
+%%DATADIR%%/lyx2lyx/profiling.pyc
+%%DATADIR%%/lyx2lyx/profiling.pyo
 %%DATADIR%%/lyxrc.defaults
 %%DATADIR%%/lyxrc.example
 %%DATADIR%%/packages.lst
-%%DATADIR%%/reLyX/BUGS
-%%DATADIR%%/reLyX/BasicLyX.pm
-%%DATADIR%%/reLyX/CHANGES
-%%DATADIR%%/reLyX/CleanTeX.pm
-%%DATADIR%%/reLyX/LastLyX.pm
-%%DATADIR%%/reLyX/MakePreamble.pm
-%%DATADIR%%/reLyX/README
-%%DATADIR%%/reLyX/ReadCommands.pm
-%%DATADIR%%/reLyX/RelyxFigure.pm
-%%DATADIR%%/reLyX/RelyxTable.pm
-%%DATADIR%%/reLyX/Text/TeX.pm
-%%DATADIR%%/reLyX/Verbatim.pm
-%%DATADIR%%/reLyX/reLyX.pod
-%%DATADIR%%/reLyX/reLyXmain.pl
-%%DATADIR%%/reLyX/syntax.default
 %%DATADIR%%/scripts/TeXFiles.sh
 %%DATADIR%%/scripts/convertDefault.sh
 %%DATADIR%%/scripts/fen2ascii.py
-%%DATADIR%%/scripts/fig2pstex.py
-%%DATADIR%%/scripts/general_command_wrapper.py
+%%DATADIR%%/scripts/fig2pdftex.sh
+%%DATADIR%%/scripts/fig2pstex.sh
+%%DATADIR%%/scripts/fig_copy.sh
+%%DATADIR%%/scripts/layout2layout.py
+%%DATADIR%%/scripts/legacy_lyxpreview2ppm.py
 %%DATADIR%%/scripts/listerrors
-%%DATADIR%%/scripts/lyxpreview2ppm.py
-%%DATADIR%%/scripts/pic2ascii.py
-%%DATADIR%%/scripts/pic2png_eps.py
-%%DATADIR%%/scripts/pic2png_eps.sh
+%%DATADIR%%/scripts/lyxpreview2bitmap.py
+%%DATADIR%%/scripts/lyxpreview_tools.py
+%%DATADIR%%/scripts/tex_copy.py
 %%DATADIR%%/symbols
+%%DATADIR%%/syntax.default
 %%DATADIR%%/templates/IEEEtran.lyx
+%%DATADIR%%/templates/README.new_templates
 %%DATADIR%%/templates/aa.lyx
 %%DATADIR%%/templates/aastex.lyx
+%%DATADIR%%/templates/agu_article.lyx
 %%DATADIR%%/templates/dinbrief.lyx
 %%DATADIR%%/templates/docbook_article.lyx
 %%DATADIR%%/templates/elsart.lyx
@@ -930,31 +991,19 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/tex/lyxskak.sty
 %%DATADIR%%/tex/revtex.cls
 %%DATADIR%%/textclass.lst
+%%DATADIR%%/ui/classic.ui
 %%DATADIR%%/ui/default.ui
-%%PSRES%%%%DATADIR%%/xfonts/PSres.upr
-%%DATADIR%%/xfonts/cmex10.pfb
-%%DATADIR%%/xfonts/cmmi10.pfb
-%%DATADIR%%/xfonts/cmr10.pfb
-%%DATADIR%%/xfonts/cmsy10.pfb
-%%DATADIR%%/xfonts/eufm10.pfb
-%%DATADIR%%/xfonts/fonts.dir
-%%DATADIR%%/xfonts/fonts.scale
-%%DATADIR%%/xfonts/msam10.pfb
-%%DATADIR%%/xfonts/msbm10.pfb
-%%DATADIR%%/xfonts/wasy10.pfb
-@dirrm %%DATADIR%%/xfonts
+%%DATADIR%%/ui/stdmenus.ui
+%%DATADIR%%/ui/stdtoolbars.ui
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/tex
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/reLyX/Text
-@dirrm %%DATADIR%%/reLyX
 @dirrm %%DATADIR%%/lyx2lyx
 @dirrm %%DATADIR%%/layouts
 @dirrm %%DATADIR%%/kbd
 @dirrm %%DATADIR%%/images/math
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/clipart
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 0e13075cd42e..1d757499c868 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.7
+PORTVERSION=	1.4.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://planetmirror.com/pub/lyx/stable/ \
@@ -16,10 +16,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 CONFLICTS=	cjk-lyx-*
 
@@ -38,7 +36,7 @@ CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
-MAN1=		lyx.1 reLyX.1
+MAN1=		lyx.1 tex2lyx.1 lyxclient.1
 USE_REINPLACE=	yes
 
 post-configure:
diff --git a/print/lyx16/distinfo b/print/lyx16/distinfo
index dd91bb763f3d..c480da2c57f7 100644
--- a/print/lyx16/distinfo
+++ b/print/lyx16/distinfo
@@ -1,3 +1,3 @@
-MD5 (lyx-1.3.7.tar.bz2) = cef9a2fca128c32ffa04c214d02cde04
-SHA256 (lyx-1.3.7.tar.bz2) = d56e5b3c436634e79689b4305d7c1e429d787ff686d6209e3dc278b7afab5b20
-SIZE (lyx-1.3.7.tar.bz2) = 5893780
+MD5 (lyx-1.4.0.tar.bz2) = 5ab37471339ff7dbc8f0c43282746cb0
+SHA256 (lyx-1.4.0.tar.bz2) = 09eeb2acc4676b5c400d841d3225f20c1475e16554f86a3958ddbf7c5ad0d2a6
+SIZE (lyx-1.4.0.tar.bz2) = 6736577
diff --git a/print/lyx16/pkg-plist b/print/lyx16/pkg-plist
index 32fa4710411d..88a2fcdce116 100644
--- a/print/lyx16/pkg-plist
+++ b/print/lyx16/pkg-plist
@@ -1,6 +1,6 @@
 bin/lyx
-bin/noweb2lyx
-bin/reLyX
+bin/tex2lyx
+bin/lyxclient
 share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
@@ -9,15 +9,15 @@ share/locale/fi/LC_MESSAGES/lyx.mo
 share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
 share/locale/it/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/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
+share/locale/tr/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -46,7 +46,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/Intro.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx
 %%DATADIR%%/doc/LaTeXConfig.lyx.in
-%%DATADIR%%/doc/LyXConfig.lyx.in
 %%DATADIR%%/doc/Reference.lyx
 %%DATADIR%%/doc/TOC.lyx
 %%DATADIR%%/doc/Tutorial.lyx
@@ -91,11 +90,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/it_Tutorial.lyx
 %%DATADIR%%/doc/it_UserGuide.lyx
 %%DATADIR%%/doc/mobius.eps
+%%DATADIR%%/doc/nb_Intro.lyx
+%%DATADIR%%/doc/nb_TOC.lyx
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
-%%DATADIR%%/doc/no_Intro.lyx
-%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -123,7 +122,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/Foils.lyx
 %%DATADIR%%/examples/ItemizeBullets.lyx
 %%DATADIR%%/examples/Literate.lyx
-%%DATADIR%%/examples/de_Minipage.lyx
 %%DATADIR%%/examples/Minipage.lyx
 %%DATADIR%%/examples/TableExamples.lyx
 %%DATADIR%%/examples/aa_sample.lyx
@@ -136,8 +134,16 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/currency.lyx
 %%DATADIR%%/examples/cv.lyx
 %%DATADIR%%/examples/da_splash.lyx
+%%DATADIR%%/examples/de_ItemizeBullets.lyx
+%%DATADIR%%/examples/de_Lebenslauf.lyx
+%%DATADIR%%/examples/de_Minipage.lyx
+%%DATADIR%%/examples/de_TableExamples.lyx
+%%DATADIR%%/examples/de_Waehrungen.lyx
 %%DATADIR%%/examples/de_beispiel_gelyxt.lyx
 %%DATADIR%%/examples/de_beispiel_roh.lyx
+%%DATADIR%%/examples/de_decimal.lyx
+%%DATADIR%%/examples/de_mathed.lyx
+%%DATADIR%%/examples/de_multicol.lyx
 %%DATADIR%%/examples/de_splash.lyx
 %%DATADIR%%/examples/decimal.lyx
 %%DATADIR%%/examples/docbook_article.lyx
@@ -191,46 +197,69 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/sl_splash.lyx
 %%DATADIR%%/examples/splash.lyx
 %%DATADIR%%/external_templates
-%%DATADIR%%/help/Bibtex.hlp
-%%DATADIR%%/help/Texinfo.hlp
 %%DATADIR%%/images/amssymb.xpm
 %%DATADIR%%/images/banner.ppm
+%%DATADIR%%/images/bookmark-goto.xpm
+%%DATADIR%%/images/bookmark-save.xpm
+%%DATADIR%%/images/break-line.xpm
 %%DATADIR%%/images/buffer-close.xpm
-%%DATADIR%%/images/buffer-export_ascii.xpm
+%%DATADIR%%/images/buffer-export_dvi.xpm
 %%DATADIR%%/images/buffer-export_latex.xpm
+%%DATADIR%%/images/buffer-export_ps.xpm
+%%DATADIR%%/images/buffer-export_text.xpm
 %%DATADIR%%/images/buffer-new.xpm
-%%DATADIR%%/images/buffer-print.xpm
+%%DATADIR%%/images/buffer-reload.xpm
 %%DATADIR%%/images/buffer-update_dvi.xpm
 %%DATADIR%%/images/buffer-update_ps.xpm
 %%DATADIR%%/images/buffer-view_dvi.xpm
 %%DATADIR%%/images/buffer-view_ps.xpm
+%%DATADIR%%/images/buffer-write-as.xpm
 %%DATADIR%%/images/buffer-write.xpm
 %%DATADIR%%/images/build-program.xpm
-%%DATADIR%%/images/citation-insert.xpm
 %%DATADIR%%/images/copy.xpm
 %%DATADIR%%/images/cut.xpm
 %%DATADIR%%/images/depth-decrement.xpm
 %%DATADIR%%/images/depth-increment.xpm
+%%DATADIR%%/images/dialog-preferences.xpm
+%%DATADIR%%/images/dialog-show-new-inset_citation.xpm
+%%DATADIR%%/images/dialog-show-new-inset_graphics.xpm
+%%DATADIR%%/images/dialog-show-new-inset_include.xpm
+%%DATADIR%%/images/dialog-show-new-inset_ref.xpm
+%%DATADIR%%/images/dialog-show_character.xpm
+%%DATADIR%%/images/dialog-show_findreplace.xpm
+%%DATADIR%%/images/dialog-show_mathpanel.xpm
+%%DATADIR%%/images/dialog-show_print.xpm
+%%DATADIR%%/images/dialog-show_spellchecker.xpm
 %%DATADIR%%/images/down.xpm
 %%DATADIR%%/images/ert-insert.xpm
 %%DATADIR%%/images/file-open.xpm
-%%DATADIR%%/images/find-replace.xpm
+%%DATADIR%%/images/float-insert_figure.xpm
+%%DATADIR%%/images/float-insert_table.xpm
 %%DATADIR%%/images/font-bold.xpm
 %%DATADIR%%/images/font-emph.xpm
-%%DATADIR%%/images/font-free.xpm
+%%DATADIR%%/images/font-free-apply.xpm
 %%DATADIR%%/images/font-noun.xpm
 %%DATADIR%%/images/font-sans.xpm
 %%DATADIR%%/images/footnote-insert.xpm
-%%DATADIR%%/images/graphics-insert.xpm
 %%DATADIR%%/images/index-insert.xpm
 %%DATADIR%%/images/label-insert.xpm
-%%DATADIR%%/images/layout.xpm
+%%DATADIR%%/images/layout-document.xpm
+%%DATADIR%%/images/layout-paragraph.xpm
+%%DATADIR%%/images/layout_Description.xpm
+%%DATADIR%%/images/layout_Enumerate.xpm
+%%DATADIR%%/images/layout_Itemize.xpm
+%%DATADIR%%/images/layout_List.xpm
 %%DATADIR%%/images/layout_LyX-Code.xpm
 %%DATADIR%%/images/layout_Scrap.xpm
 %%DATADIR%%/images/layout_Section.xpm
 %%DATADIR%%/images/lyx-quit.xpm
 %%DATADIR%%/images/lyx.xpm
 %%DATADIR%%/images/marginalnote-insert.xpm
+%%DATADIR%%/images/math-display.xpm
+%%DATADIR%%/images/math-matrix.xpm
+%%DATADIR%%/images/math-mode.xpm
+%%DATADIR%%/images/math-subscript.xpm
+%%DATADIR%%/images/math-superscript.xpm
 %%DATADIR%%/images/math/Bbbk.xpm
 %%DATADIR%%/images/math/Finv.xpm
 %%DATADIR%%/images/math/Game.xpm
@@ -292,6 +321,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/bumpeq2.xpm
 %%DATADIR%%/images/math/cap.xpm
 %%DATADIR%%/images/math/cap2.xpm
+%%DATADIR%%/images/math/cases.xpm
 %%DATADIR%%/images/math/cdot.xpm
 %%DATADIR%%/images/math/cdots.xpm
 %%DATADIR%%/images/math/centerdot.xpm
@@ -398,8 +428,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lambda2.xpm
 %%DATADIR%%/images/math/langle.xpm
 %%DATADIR%%/images/math/lbrace.xpm
+%%DATADIR%%/images/math/lbrace_rbrace.xpm
 %%DATADIR%%/images/math/lbracket.xpm
+%%DATADIR%%/images/math/lbracket_rbracket.xpm
 %%DATADIR%%/images/math/lceil.xpm
+%%DATADIR%%/images/math/lceil_rceil.xpm
 %%DATADIR%%/images/math/ldots.xpm
 %%DATADIR%%/images/math/leftarrow.xpm
 %%DATADIR%%/images/math/leftarrow2.xpm
@@ -423,6 +456,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/lessgtr.xpm
 %%DATADIR%%/images/math/lesssim.xpm
 %%DATADIR%%/images/math/lfloor.xpm
+%%DATADIR%%/images/math/lfloor_rfloor.xpm
 %%DATADIR%%/images/math/ll.xpm
 %%DATADIR%%/images/math/llcorner.xpm
 %%DATADIR%%/images/math/lll.xpm
@@ -441,6 +475,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/looparrowright.xpm
 %%DATADIR%%/images/math/lozenge.xpm
 %%DATADIR%%/images/math/lparen.xpm
+%%DATADIR%%/images/math/lparen_rparen.xpm
 %%DATADIR%%/images/math/lrcorner.xpm
 %%DATADIR%%/images/math/ltimes.xpm
 %%DATADIR%%/images/math/lvertneqq.xpm
@@ -559,6 +594,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/rightsquigarrow.xpm
 %%DATADIR%%/images/math/rightthreetimes.xpm
 %%DATADIR%%/images/math/risingdotseq.xpm
+%%DATADIR%%/images/math/root.xpm
 %%DATADIR%%/images/math/rparen.xpm
 %%DATADIR%%/images/math/rtimes.xpm
 %%DATADIR%%/images/math/searrow.xpm
@@ -609,8 +645,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/surd.xpm
 %%DATADIR%%/images/math/swarrow.xpm
 %%DATADIR%%/images/math/tau.xpm
-%%DATADIR%%/images/math/textrm_0.xpm
-%%DATADIR%%/images/math/textrm_A.xpm
+%%DATADIR%%/images/math/textrm_AA.xpm
+%%DATADIR%%/images/math/textrm_Oe.xpm
 %%DATADIR%%/images/math/therefore.xpm
 %%DATADIR%%/images/math/theta.xpm
 %%DATADIR%%/images/math/theta2.xpm
@@ -676,11 +712,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/xi.xpm
 %%DATADIR%%/images/math/xi2.xpm
 %%DATADIR%%/images/math/zeta.xpm
-%%DATADIR%%/images/math-mode.xpm
-%%DATADIR%%/images/math-panel.xpm
-%%DATADIR%%/images/math-subscript.xpm
-%%DATADIR%%/images/math-superscript.xpm
-%%DATADIR%%/images/melt.xpm
+%%DATADIR%%/images/note-insert.xpm
 %%DATADIR%%/images/paste.xpm
 %%DATADIR%%/images/psnfss1.xpm
 %%DATADIR%%/images/psnfss2.xpm
@@ -688,10 +720,33 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/psnfss4.xpm
 %%DATADIR%%/images/redo.xpm
 %%DATADIR%%/images/standard.xpm
+%%DATADIR%%/images/tabular-feature_align-center.xpm
+%%DATADIR%%/images/tabular-feature_align-left.xpm
+%%DATADIR%%/images/tabular-feature_align-right.xpm
+%%DATADIR%%/images/tabular-feature_append-column.xpm
+%%DATADIR%%/images/tabular-feature_append-row.xpm
+%%DATADIR%%/images/tabular-feature_delete-column.xpm
+%%DATADIR%%/images/tabular-feature_delete-row.xpm
+%%DATADIR%%/images/tabular-feature_multicolumn.xpm
+%%DATADIR%%/images/tabular-feature_set-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_set-longtabular.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-cell.xpm
+%%DATADIR%%/images/tabular-feature_set-rotate-tabular.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-bottom.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-left.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-right.xpm
+%%DATADIR%%/images/tabular-feature_toggle-line-top.xpm
+%%DATADIR%%/images/tabular-feature_unset-all-lines.xpm
+%%DATADIR%%/images/tabular-feature_valign-bottom.xpm
+%%DATADIR%%/images/tabular-feature_valign-middle.xpm
+%%DATADIR%%/images/tabular-feature_valign-top.xpm
 %%DATADIR%%/images/tabular-insert.xpm
+%%DATADIR%%/images/thesaurus-entry.xpm
+%%DATADIR%%/images/toc-view.xpm
 %%DATADIR%%/images/undo.xpm
 %%DATADIR%%/images/unknown.xpm
 %%DATADIR%%/images/up.xpm
+%%DATADIR%%/images/url-insert.xpm
 %%DATADIR%%/kbd/american-2.kmap
 %%DATADIR%%/kbd/american.kmap
 %%DATADIR%%/kbd/arabic.kmap
@@ -750,6 +805,12 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agu-dtd.layout
+%%DATADIR%%/layouts/agu_stdclass.inc
+%%DATADIR%%/layouts/agu_stdcounters.inc
+%%DATADIR%%/layouts/agu_stdlists.inc
+%%DATADIR%%/layouts/agu_stdsections.inc
+%%DATADIR%%/layouts/agu_stdtitle.inc
 %%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
@@ -768,6 +829,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cl2emult.layout
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
+%%DATADIR%%/layouts/db_stdcharstyles.inc
 %%DATADIR%%/layouts/db_stdclass.inc
 %%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
@@ -814,7 +876,9 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/mwart.layout
 %%DATADIR%%/layouts/mwbk.layout
 %%DATADIR%%/layouts/mwrep.layout
-%%DATADIR%%/layouts/obsolete.inc
+%%DATADIR%%/layouts/numarticle.inc
+%%DATADIR%%/layouts/numreport.inc
+%%DATADIR%%/layouts/numrevtex.inc
 %%DATADIR%%/layouts/paper.layout
 %%DATADIR%%/layouts/report.layout
 %%DATADIR%%/layouts/revtex.layout
@@ -824,7 +888,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/scrclass.inc
 %%DATADIR%%/layouts/scrlettr.layout
 %%DATADIR%%/layouts/scrlttr2.layout
-%%DATADIR%%/layouts/scrmacros.inc
 %%DATADIR%%/layouts/scrreprt.layout
 %%DATADIR%%/layouts/seminar.layout
 %%DATADIR%%/layouts/siamltex.layout
@@ -844,70 +907,68 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/svjog.layout
 %%DATADIR%%/layouts/svjour.inc
 %%DATADIR%%/layouts/svprobth.layout
-%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/LyX.py
 %%DATADIR%%/lyx2lyx/LyX.pyc
-%%DATADIR%%/lyx2lyx/error.pyc
+%%DATADIR%%/lyx2lyx/LyX.pyo
+%%DATADIR%%/lyx2lyx/lyx2lyx
 %%DATADIR%%/lyx2lyx/lyx_0_12.py
 %%DATADIR%%/lyx2lyx/lyx_0_12.pyc
+%%DATADIR%%/lyx2lyx/lyx_0_12.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_0.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_0.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.py
 %%DATADIR%%/lyx2lyx/lyx_1_0_1.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_0_1.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_4.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_4.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_5.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_5.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.py
 %%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_1_6fix3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_2.py
 %%DATADIR%%/lyx2lyx/lyx_1_2.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_2.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_3.py
 %%DATADIR%%/lyx2lyx/lyx_1_3.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_3.pyo
 %%DATADIR%%/lyx2lyx/lyx_1_4.py
 %%DATADIR%%/lyx2lyx/lyx_1_4.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_216.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_217.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_218.pyc
-%%DATADIR%%/lyx2lyx/lyxconvert_220.pyc
+%%DATADIR%%/lyx2lyx/lyx_1_4.pyo
 %%DATADIR%%/lyx2lyx/parser_tools.py
 %%DATADIR%%/lyx2lyx/parser_tools.pyc
+%%DATADIR%%/lyx2lyx/parser_tools.pyo
 %%DATADIR%%/lyx2lyx/profiling.py
+%%DATADIR%%/lyx2lyx/profiling.pyc
+%%DATADIR%%/lyx2lyx/profiling.pyo
 %%DATADIR%%/lyxrc.defaults
 %%DATADIR%%/lyxrc.example
 %%DATADIR%%/packages.lst
-%%DATADIR%%/reLyX/BUGS
-%%DATADIR%%/reLyX/BasicLyX.pm
-%%DATADIR%%/reLyX/CHANGES
-%%DATADIR%%/reLyX/CleanTeX.pm
-%%DATADIR%%/reLyX/LastLyX.pm
-%%DATADIR%%/reLyX/MakePreamble.pm
-%%DATADIR%%/reLyX/README
-%%DATADIR%%/reLyX/ReadCommands.pm
-%%DATADIR%%/reLyX/RelyxFigure.pm
-%%DATADIR%%/reLyX/RelyxTable.pm
-%%DATADIR%%/reLyX/Text/TeX.pm
-%%DATADIR%%/reLyX/Verbatim.pm
-%%DATADIR%%/reLyX/reLyX.pod
-%%DATADIR%%/reLyX/reLyXmain.pl
-%%DATADIR%%/reLyX/syntax.default
 %%DATADIR%%/scripts/TeXFiles.sh
 %%DATADIR%%/scripts/convertDefault.sh
 %%DATADIR%%/scripts/fen2ascii.py
-%%DATADIR%%/scripts/fig2pstex.py
-%%DATADIR%%/scripts/general_command_wrapper.py
+%%DATADIR%%/scripts/fig2pdftex.sh
+%%DATADIR%%/scripts/fig2pstex.sh
+%%DATADIR%%/scripts/fig_copy.sh
+%%DATADIR%%/scripts/layout2layout.py
+%%DATADIR%%/scripts/legacy_lyxpreview2ppm.py
 %%DATADIR%%/scripts/listerrors
-%%DATADIR%%/scripts/lyxpreview2ppm.py
-%%DATADIR%%/scripts/pic2ascii.py
-%%DATADIR%%/scripts/pic2png_eps.py
-%%DATADIR%%/scripts/pic2png_eps.sh
+%%DATADIR%%/scripts/lyxpreview2bitmap.py
+%%DATADIR%%/scripts/lyxpreview_tools.py
+%%DATADIR%%/scripts/tex_copy.py
 %%DATADIR%%/symbols
+%%DATADIR%%/syntax.default
 %%DATADIR%%/templates/IEEEtran.lyx
+%%DATADIR%%/templates/README.new_templates
 %%DATADIR%%/templates/aa.lyx
 %%DATADIR%%/templates/aastex.lyx
+%%DATADIR%%/templates/agu_article.lyx
 %%DATADIR%%/templates/dinbrief.lyx
 %%DATADIR%%/templates/docbook_article.lyx
 %%DATADIR%%/templates/elsart.lyx
@@ -930,31 +991,19 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/tex/lyxskak.sty
 %%DATADIR%%/tex/revtex.cls
 %%DATADIR%%/textclass.lst
+%%DATADIR%%/ui/classic.ui
 %%DATADIR%%/ui/default.ui
-%%PSRES%%%%DATADIR%%/xfonts/PSres.upr
-%%DATADIR%%/xfonts/cmex10.pfb
-%%DATADIR%%/xfonts/cmmi10.pfb
-%%DATADIR%%/xfonts/cmr10.pfb
-%%DATADIR%%/xfonts/cmsy10.pfb
-%%DATADIR%%/xfonts/eufm10.pfb
-%%DATADIR%%/xfonts/fonts.dir
-%%DATADIR%%/xfonts/fonts.scale
-%%DATADIR%%/xfonts/msam10.pfb
-%%DATADIR%%/xfonts/msbm10.pfb
-%%DATADIR%%/xfonts/wasy10.pfb
-@dirrm %%DATADIR%%/xfonts
+%%DATADIR%%/ui/stdmenus.ui
+%%DATADIR%%/ui/stdtoolbars.ui
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/tex
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/reLyX/Text
-@dirrm %%DATADIR%%/reLyX
 @dirrm %%DATADIR%%/lyx2lyx
 @dirrm %%DATADIR%%/layouts
 @dirrm %%DATADIR%%/kbd
 @dirrm %%DATADIR%%/images/math
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/clipart