editors/lyx: update to 2.0.6

What's new in 2.0 (from upstream):
* Advanced Search Facility
* Spell-checking on the fly
* Compare Documents
* Multilingual Thesaurus
* Refstyle Support
* Multiple Indices
* New backends: XeTeX, LuaTeX, and XHTML
* Better output customization
* Produce output with only selected subdocuments included
* Outliner enhancements
* Document-specific Layout
* New supported LaTeX commands
* Languages, scripts and encodings
* Branches enhancements
* Table features
* Size features
* Progress view and debugging pane
* Color handling
* Instant preview inset
* Forward search for DVI/PDF files
* Optional and Required Arguments
* New (sub)version control features
* Generalized support for LaTeX files preprocessing
** Improved support for Noweb
** Support for Sweave
** Support for LilyPond-Book

Ok@ wiz

11 files changed, 434 insertions, 466 deletions

diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile
index ec989a73567..2be4844d89a 100644
--- a/editors/lyx/Makefile
+++ b/editors/lyx/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.36 2013/06/06 12:54:17 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2014/01/19 14:04:39 rumko Exp $
 #
 
-DISTNAME=		lyx-1.6.10
-PKGREVISION=		12
+DISTNAME=		lyx-2.0.6
 CATEGORIES=		editors
-MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/ \
-			http://gd.tuwien.ac.at/publishing/tex/lyx/stable/1.6.x/ \
-			ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/1.6.x/ \
-			ftp://ftp.sdsc.edu/pub/other/lyx/stable/1.6.x/ \
-			ftp://ftp.lip6.fr/pub/lyx/stable/1.6.x/ \
-			ftp://ftp.ntua.gr/pub/X11/LyX/stable/1.6.x/
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/ \
+			http://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.0.x/ \
+			ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.0.x/ \
+			ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.0.x/ \
+			ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/ \
+			ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.0.x/
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		reed@reedmedia.net
 HOMEPAGE=		http://www.lyx.org/
 COMMENT=		Document processor and graphical frontend for LaTeX
+LICENSE=		gnu-gpl-v2
 
 CONFLICTS+=		lyx-xforms-[0-9]* lyx-qt-[0-9]*
 SUPERSEDES=		lyx-xforms-[0-9]* lyx-qt-[0-9]*
@@ -65,19 +65,16 @@ GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake perl:run pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
-GCC_REQD+=		2.95
 
 CXXFLAGS.Linux+=	-fpermissive
 
+CONFIGURE_ARGS+=	--without-included-mythes
+
 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-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \
-			--with-pspell-include=${BUILDLINK_PREFIX.aspell}/include/pspell \
-			--with-pspell
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
@@ -93,13 +90,13 @@ PLIST_SUBST+=		BIN_DIR=bin \
 			SHARE_DIR=share/lyx
 .endif
 
-PYTHON_PATCH_SCRIPTS=	development/tools/convert_kmap.py \
+PYTHON_PATCH_SCRIPTS=	development/cmake/doc/ReplaceValues.py \
+			development/cmake/po/cat.py \
+			development/tools/convert_kmap.py \
+			development/tools/gen_lfuns.py \
 			development/tools/generate_symbols_list.py \
-			development/tools/lyxpak.py \
-			development/tools/lyxpak.py \
 			development/tools/unicodesymbols.py \
 			lib/configure.py \
-			lib/doc/depend.py \
 			lib/lyx2lyx/lyx2lyx \
 			lib/lyx2lyx/profiling.py \
 			lib/scripts/TeXFiles.py \
@@ -112,13 +109,19 @@ PYTHON_PATCH_SCRIPTS=	development/tools/convert_kmap.py \
 			lib/scripts/fig2pdftex.py \
 			lib/scripts/fig2pstex.py \
 			lib/scripts/fig_copy.py \
+			lib/scripts/include_bib.py \
 			lib/scripts/layout2layout.py \
 			lib/scripts/legacy_lyxpreview2ppm.py \
 			lib/scripts/listerrors \
+			lib/scripts/lyxpak.py \
+			lib/scripts/lyxpreview-lytex2bitmap.py \
 			lib/scripts/lyxpreview-platex2bitmap.py \
 			lib/scripts/lyxpreview2bitmap.py \
 			lib/scripts/lyxpreview_tools.py \
 			lib/scripts/tex_copy.py \
+			lib/scripts/prefs2prefs.py \
+			lib/scripts/prefs2prefs_lfuns.py \
+			lib/scripts/prefs2prefs_prefs.py \
 			po/lyx_pot.py \
 			po/postats.py
 
@@ -128,7 +131,7 @@ SUBST_FILES.python=	lib/configure.py
 SUBST_SED.python=	-e "s,python ,${PYTHONBIN} ,"
 SUBST_FILES.python+=	src/graphics/GraphicsConverter.cpp
 SUBST_SED.python+=	-e "s,\#!/usr/bin/env python,\#!${PYTHONBIN},"
-SUBST_FILES.python+=	development/tools/lyxpak.py
+SUBST_FILES.python+=	lib/scripts/lyxpak.py
 SUBST_FILES.python+=	development/scons/SConstruct
 SUBST_SED.python+=	-e "s, = 'python, = '${PYTHONBIN},"
 SUBST_FILES.python+=	src/support/os.cpp
@@ -137,10 +140,10 @@ SUBST_SED.python+=	-e 's,command("python -tt,command("${PYTHONBIN} -tt,'
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../textproc/aiksaurus/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../textproc/mythes/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/lyx/PLIST b/editors/lyx/PLIST
index 87a5fef9c7b..97882be1bde 100644
--- a/editors/lyx/PLIST
+++ b/editors/lyx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/03/21 18:06:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/01/19 14:04:39 rumko Exp $
 ${BIN_DIR}/lyx
 ${BIN_DIR}/lyxclient
 ${BIN_DIR}/tex2lyx
@@ -8,6 +8,8 @@ ${MAN_DIR}/man1/tex2lyx.1
 share/locale/ar/LC_MESSAGES/${LYX}.mo
 share/locale/ca/LC_MESSAGES/${LYX}.mo
 share/locale/cs/LC_MESSAGES/${LYX}.mo
+share/locale/nl/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
@@ -18,10 +20,12 @@ 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
 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/LC_MESSAGES/${LYX}.mo
@@ -35,35 +39,31 @@ share/locale/uk/LC_MESSAGES/${LYX}.mo
 share/locale/zh_CN/LC_MESSAGES/${LYX}.mo
 share/locale/zh_TW/LC_MESSAGES/${LYX}.mo
 ${SHARE_DIR}/CREDITS
+${SHARE_DIR}/autocorrect
 ${SHARE_DIR}/bind/aqua.bind
 ${SHARE_DIR}/bind/broadway.bind
 ${SHARE_DIR}/bind/cua.bind
 ${SHARE_DIR}/bind/cyrkeys.bind
 ${SHARE_DIR}/bind/de/menus.bind
 ${SHARE_DIR}/bind/emacs.bind
-${SHARE_DIR}/bind/fi/menus.bind
 ${SHARE_DIR}/bind/greekkeys.bind
 ${SHARE_DIR}/bind/hollywood.bind
 ${SHARE_DIR}/bind/latinkeys.bind
 ${SHARE_DIR}/bind/mac.bind
 ${SHARE_DIR}/bind/math.bind
 ${SHARE_DIR}/bind/menus.bind
-${SHARE_DIR}/bind/pt/menus.bind
 ${SHARE_DIR}/bind/sciword.bind
 ${SHARE_DIR}/bind/site.bind
-${SHARE_DIR}/bind/sv/menus.bind
 ${SHARE_DIR}/bind/xemacs.bind
 ${SHARE_DIR}/chkconfig.ltx
 ${SHARE_DIR}/commands/default.def
 ${SHARE_DIR}/configure.py
-${SHARE_DIR}/configure.pyc
-${SHARE_DIR}/configure.pyo
+${SHARE_DIR}/doc/Additional.lyx
 ${SHARE_DIR}/doc/Customization.lyx
 ${SHARE_DIR}/doc/DummyDocument1.lyx
 ${SHARE_DIR}/doc/DummyDocument2.lyx
 ${SHARE_DIR}/doc/DummyTextDocument.txt
 ${SHARE_DIR}/doc/EmbeddedObjects.lyx
-${SHARE_DIR}/doc/Extended.lyx
 ${SHARE_DIR}/doc/Formula-numbering.lyx
 ${SHARE_DIR}/doc/Intro.lyx
 ${SHARE_DIR}/doc/LFUNs.lyx
@@ -98,7 +98,6 @@ ${SHARE_DIR}/doc/clipart/footnoteQt4.png
 ${SHARE_DIR}/doc/clipart/labelQt4.png
 ${SHARE_DIR}/doc/clipart/macrobox.png
 ${SHARE_DIR}/doc/clipart/macrouse.png
-${SHARE_DIR}/doc/clipart/mbox.png
 ${SHARE_DIR}/doc/clipart/mobius.eps
 ${SHARE_DIR}/doc/clipart/platypus.eps
 ${SHARE_DIR}/doc/clipart/referenceQt4.png
@@ -106,12 +105,12 @@ ${SHARE_DIR}/doc/clipart/with_fntright.pdf
 ${SHARE_DIR}/doc/clipart/without_fntright.pdf
 ${SHARE_DIR}/doc/cs/Tutorial.lyx
 ${SHARE_DIR}/doc/da/Intro.lyx
+${SHARE_DIR}/doc/de/Additional.lyx
 ${SHARE_DIR}/doc/de/Customization.lyx
 ${SHARE_DIR}/doc/de/DummyDocument1.lyx
 ${SHARE_DIR}/doc/de/DummyDocument2.lyx
 ${SHARE_DIR}/doc/de/DummyTextDocument.txt
 ${SHARE_DIR}/doc/de/EmbeddedObjects.lyx
-${SHARE_DIR}/doc/de/Extended.lyx
 ${SHARE_DIR}/doc/de/Formelnummerierung.lyx
 ${SHARE_DIR}/doc/de/Intro.lyx
 ${SHARE_DIR}/doc/de/Math.lyx
@@ -130,12 +129,12 @@ ${SHARE_DIR}/doc/de/clipart/Querverweis.png
 ${SHARE_DIR}/doc/de/clipart/StandardBoxQt4.png
 ${SHARE_DIR}/doc/de/clipart/UnterdokumentQt4.png
 ${SHARE_DIR}/doc/el/Intro.lyx
+${SHARE_DIR}/doc/es/Additional.lyx
 ${SHARE_DIR}/doc/es/Customization.lyx
 ${SHARE_DIR}/doc/es/DocumentoPostizo1.lyx
 ${SHARE_DIR}/doc/es/DocumentoPostizo2.lyx
 ${SHARE_DIR}/doc/es/DocumentoTextoPostizo.txt
 ${SHARE_DIR}/doc/es/EmbeddedObjects.lyx
-${SHARE_DIR}/doc/es/Extended.lyx
 ${SHARE_DIR}/doc/es/Formula-numbering.lyx
 ${SHARE_DIR}/doc/es/Intro.lyx
 ${SHARE_DIR}/doc/es/Math.lyx
@@ -155,17 +154,17 @@ ${SHARE_DIR}/doc/es/clipart/etiquetaQt4.png
 ${SHARE_DIR}/doc/es/clipart/flotanteQt4.png
 ${SHARE_DIR}/doc/es/clipart/notapieQt4.png
 ${SHARE_DIR}/doc/es/clipart/referenciaQt4.png
+${SHARE_DIR}/doc/eu/Additional.lyx
 ${SHARE_DIR}/doc/eu/Customization.lyx
-${SHARE_DIR}/doc/eu/Extended.lyx
 ${SHARE_DIR}/doc/eu/Intro.lyx
 ${SHARE_DIR}/doc/eu/Tutorial.lyx
 ${SHARE_DIR}/doc/eu/UserGuide.lyx
+${SHARE_DIR}/doc/fr/Additional.lyx
 ${SHARE_DIR}/doc/fr/Customization.lyx
 ${SHARE_DIR}/doc/fr/DocumentBidon1.lyx
 ${SHARE_DIR}/doc/fr/DocumentBidon2.lyx
 ${SHARE_DIR}/doc/fr/DocumentTexteBidon.txt
 ${SHARE_DIR}/doc/fr/EmbeddedObjects.lyx
-${SHARE_DIR}/doc/fr/Extended.lyx
 ${SHARE_DIR}/doc/fr/Formula-numbering.lyx
 ${SHARE_DIR}/doc/fr/Intro.lyx
 ${SHARE_DIR}/doc/fr/Math.lyx
@@ -175,6 +174,7 @@ ${SHARE_DIR}/doc/fr/UserGuide.lyx
 ${SHARE_DIR}/doc/fr/clipart/BoxInsetDefaultQt4.png
 ${SHARE_DIR}/doc/fr/clipart/ChildDocumentQt4.png
 ${SHARE_DIR}/doc/fr/clipart/CommentNoteImageQt4.png
+${SHARE_DIR}/doc/fr/clipart/ERT.png
 ${SHARE_DIR}/doc/fr/clipart/GreyedOutNoteImageQt4.png
 ${SHARE_DIR}/doc/fr/clipart/LyXNoteImageQt4.png
 ${SHARE_DIR}/doc/fr/clipart/floatQt4.png
@@ -187,7 +187,9 @@ ${SHARE_DIR}/doc/he/Tutorial.lyx
 ${SHARE_DIR}/doc/hu/Intro.lyx
 ${SHARE_DIR}/doc/hu/Tutorial.lyx
 ${SHARE_DIR}/doc/id/Intro.lyx
+${SHARE_DIR}/doc/id/Shortcuts.lyx
 ${SHARE_DIR}/doc/id/Tutorial.lyx
+${SHARE_DIR}/doc/id/UserGuide.lyx
 ${SHARE_DIR}/doc/id/clipart/id-contrib.png
 ${SHARE_DIR}/doc/id/clipart/id-footnote.png
 ${SHARE_DIR}/doc/id/clipart/id-lingkungan.png
@@ -197,11 +199,11 @@ ${SHARE_DIR}/doc/it/Tutorial.lyx
 ${SHARE_DIR}/doc/it/UserGuide.lyx
 ${SHARE_DIR}/doc/it/clipart/it_footnoteQt4.png
 ${SHARE_DIR}/doc/it/clipart/it_referenceQt4.png
+${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/EmbeddedObjects.lyx
-${SHARE_DIR}/doc/ja/Extended.lyx
 ${SHARE_DIR}/doc/ja/Formula-numbering.lyx
 ${SHARE_DIR}/doc/ja/Intro.lyx
 ${SHARE_DIR}/doc/ja/LaTeXConfig.lyx
@@ -219,7 +221,7 @@ ${SHARE_DIR}/doc/ja/clipart/referenceQt4.png
 ${SHARE_DIR}/doc/nb/Intro.lyx
 ${SHARE_DIR}/doc/nl/Intro.lyx
 ${SHARE_DIR}/doc/nl/Tutorial.lyx
-${SHARE_DIR}/doc/pl/Extended.lyx
+${SHARE_DIR}/doc/pl/Additional.lyx
 ${SHARE_DIR}/doc/pl/Intro.lyx
 ${SHARE_DIR}/doc/pl/Tutorial.lyx
 ${SHARE_DIR}/doc/pt/Intro.lyx
@@ -243,6 +245,7 @@ ${SHARE_DIR}/encodings
 ${SHARE_DIR}/examples/Braille.lyx
 ${SHARE_DIR}/examples/CV-image.eps
 ${SHARE_DIR}/examples/CV-image.png
+${SHARE_DIR}/examples/FeynmanDiagrams.lyx
 ${SHARE_DIR}/examples/Foils.lyx
 ${SHARE_DIR}/examples/ItemizeBullets.lyx
 ${SHARE_DIR}/examples/Literate.lyx
@@ -271,6 +274,8 @@ ${SHARE_DIR}/examples/ca/mathed.lyx
 ${SHARE_DIR}/examples/ca/splash.lyx
 ${SHARE_DIR}/examples/chess-article.lyx
 ${SHARE_DIR}/examples/chessgame.lyx
+${SHARE_DIR}/examples/cs/priklad_syrovy.lyx
+${SHARE_DIR}/examples/cs/priklad_zLyXovany.lyx
 ${SHARE_DIR}/examples/cs/splash.lyx
 ${SHARE_DIR}/examples/da/splash.lyx
 ${SHARE_DIR}/examples/de/Braille.lyx
@@ -290,10 +295,11 @@ ${SHARE_DIR}/examples/docbook_article.lyx
 ${SHARE_DIR}/examples/el/splash.lyx
 ${SHARE_DIR}/examples/es/Braille.lyx
 ${SHARE_DIR}/examples/es/ItemizeBullets.lyx
-${SHARE_DIR}/examples/es/beamer-conference-ornate20min.lyx
 ${SHARE_DIR}/examples/es/ejemplo_con_lyx.lyx
 ${SHARE_DIR}/examples/es/ejemplo_sin_lyx.lyx
+${SHARE_DIR}/examples/es/europeCV.lyx
 ${SHARE_DIR}/examples/es/linguistics.lyx
+${SHARE_DIR}/examples/es/modernCV.lyx
 ${SHARE_DIR}/examples/es/multicol.lyx
 ${SHARE_DIR}/examples/es/splash.lyx
 ${SHARE_DIR}/examples/es/tufte-book.lyx
@@ -307,6 +313,7 @@ ${SHARE_DIR}/examples/example_raw.lyx
 ${SHARE_DIR}/examples/fa/splash.lyx
 ${SHARE_DIR}/examples/fr/AlignementDecimal.lyx
 ${SHARE_DIR}/examples/fr/Braille.lyx
+${SHARE_DIR}/examples/fr/FeynmanDiagrams.lyx
 ${SHARE_DIR}/examples/fr/Foils.lyx
 ${SHARE_DIR}/examples/fr/ListesPuces.lyx
 ${SHARE_DIR}/examples/fr/exemple-powerdot.lyx
@@ -332,17 +339,23 @@ ${SHARE_DIR}/examples/id/splash.lyx
 ${SHARE_DIR}/examples/iecc05.fen
 ${SHARE_DIR}/examples/iecc07.fen
 ${SHARE_DIR}/examples/iecc12.fen
+${SHARE_DIR}/examples/instant_preview.lyx
 ${SHARE_DIR}/examples/it/ItemizeBullets.lyx
 ${SHARE_DIR}/examples/it/splash.lyx
 ${SHARE_DIR}/examples/ja/Braille.lyx
+${SHARE_DIR}/examples/ja/FeynmanDiagrams.lyx
 ${SHARE_DIR}/examples/ja/linguistics.lyx
 ${SHARE_DIR}/examples/ja/multicol.lyx
 ${SHARE_DIR}/examples/ja/splash.lyx
 ${SHARE_DIR}/examples/ja/xyfigure.png
 ${SHARE_DIR}/examples/ja/xypic.lyx
+${SHARE_DIR}/examples/knitr.lyx
 ${SHARE_DIR}/examples/landslide.lyx
+${SHARE_DIR}/examples/lilypond.lyx
 ${SHARE_DIR}/examples/linguistics.lyx
 ${SHARE_DIR}/examples/listerrors.lyx
+${SHARE_DIR}/examples/localization_test.lyx
+${SHARE_DIR}/examples/longsheet.gnumeric
 ${SHARE_DIR}/examples/modernCV.lyx
 ${SHARE_DIR}/examples/multicol.lyx
 ${SHARE_DIR}/examples/nl/multicol.lyx
@@ -362,14 +375,20 @@ ${SHARE_DIR}/examples/seminar.lyx
 ${SHARE_DIR}/examples/serial_letter1.lyx
 ${SHARE_DIR}/examples/serial_letter2.lyx
 ${SHARE_DIR}/examples/serial_letter3.lyx
+${SHARE_DIR}/examples/sheet1.gnumeric
+${SHARE_DIR}/examples/sheet2.ods
+${SHARE_DIR}/examples/sheet3.xls
 ${SHARE_DIR}/examples/simplecv.lyx
 ${SHARE_DIR}/examples/sk/splash.lyx
 ${SHARE_DIR}/examples/sl/primer_lyxan.lyx
 ${SHARE_DIR}/examples/sl/primer_surov.lyx
 ${SHARE_DIR}/examples/sl/splash.lyx
 ${SHARE_DIR}/examples/splash.lyx
+${SHARE_DIR}/examples/spreadsheet.lyx
+${SHARE_DIR}/examples/sr/Braille.lyx
 ${SHARE_DIR}/examples/sr/splash.lyx
 ${SHARE_DIR}/examples/sv/splash.lyx
+${SHARE_DIR}/examples/sweave.lyx
 ${SHARE_DIR}/examples/tufte-book.lyx
 ${SHARE_DIR}/examples/tufte-handout.lyx
 ${SHARE_DIR}/examples/uk/splash.lyx
@@ -386,6 +405,7 @@ ${SHARE_DIR}/fonts/esint10.ttf
 ${SHARE_DIR}/fonts/eufm10.ttf
 ${SHARE_DIR}/fonts/msam10.ttf
 ${SHARE_DIR}/fonts/msbm10.ttf
+${SHARE_DIR}/fonts/rsfs10.ttf
 ${SHARE_DIR}/fonts/wasy10.ttf
 ${SHARE_DIR}/images/all-changes-accept.png
 ${SHARE_DIR}/images/all-changes-reject.png
@@ -397,22 +417,211 @@ ${SHARE_DIR}/images/bookmark-save.png
 ${SHARE_DIR}/images/box-insert.png
 ${SHARE_DIR}/images/break-line.png
 ${SHARE_DIR}/images/buffer-close.png
+${SHARE_DIR}/images/buffer-export.png
 ${SHARE_DIR}/images/buffer-export_dvi.png
+${SHARE_DIR}/images/buffer-export_dvi3.png
 ${SHARE_DIR}/images/buffer-export_latex.png
+${SHARE_DIR}/images/buffer-export_pdf.png
 ${SHARE_DIR}/images/buffer-export_pdf2.png
+${SHARE_DIR}/images/buffer-export_pdf3.png
+${SHARE_DIR}/images/buffer-export_pdf4.png
+${SHARE_DIR}/images/buffer-export_pdf5.png
 ${SHARE_DIR}/images/buffer-export_ps.png
 ${SHARE_DIR}/images/buffer-export_text.png
 ${SHARE_DIR}/images/buffer-new.png
 ${SHARE_DIR}/images/buffer-reload.png
+${SHARE_DIR}/images/buffer-toggle-output-sync.png
+${SHARE_DIR}/images/buffer-update.png
 ${SHARE_DIR}/images/buffer-update_dvi.png
+${SHARE_DIR}/images/buffer-update_dvi3.png
+${SHARE_DIR}/images/buffer-update_pdf.png
 ${SHARE_DIR}/images/buffer-update_pdf2.png
+${SHARE_DIR}/images/buffer-update_pdf3.png
+${SHARE_DIR}/images/buffer-update_pdf4.png
+${SHARE_DIR}/images/buffer-update_pdf5.png
 ${SHARE_DIR}/images/buffer-update_ps.png
+${SHARE_DIR}/images/buffer-view.png
 ${SHARE_DIR}/images/buffer-view_dvi.png
+${SHARE_DIR}/images/buffer-view_dvi3.png
+${SHARE_DIR}/images/buffer-view_pdf.png
 ${SHARE_DIR}/images/buffer-view_pdf2.png
+${SHARE_DIR}/images/buffer-view_pdf3.png
+${SHARE_DIR}/images/buffer-view_pdf4.png
+${SHARE_DIR}/images/buffer-view_pdf5.png
 ${SHARE_DIR}/images/buffer-view_ps.png
 ${SHARE_DIR}/images/buffer-write-as.png
 ${SHARE_DIR}/images/buffer-write.png
 ${SHARE_DIR}/images/build-program.png
+${SHARE_DIR}/images/busy.gif
+${SHARE_DIR}/images/classic/all-changes-accept.png
+${SHARE_DIR}/images/classic/all-changes-reject.png
+${SHARE_DIR}/images/classic/bookmark-goto.png
+${SHARE_DIR}/images/classic/bookmark-goto_0.png
+${SHARE_DIR}/images/classic/bookmark-save.png
+${SHARE_DIR}/images/classic/box-insert.png
+${SHARE_DIR}/images/classic/break-line.png
+${SHARE_DIR}/images/classic/buffer-close.png
+${SHARE_DIR}/images/classic/buffer-export.png
+${SHARE_DIR}/images/classic/buffer-export_dvi.png
+${SHARE_DIR}/images/classic/buffer-export_dvi3.png
+${SHARE_DIR}/images/classic/buffer-export_latex.png
+${SHARE_DIR}/images/classic/buffer-export_pdf.png
+${SHARE_DIR}/images/classic/buffer-export_pdf2.png
+${SHARE_DIR}/images/classic/buffer-export_pdf3.png
+${SHARE_DIR}/images/classic/buffer-export_pdf4.png
+${SHARE_DIR}/images/classic/buffer-export_pdf5.png
+${SHARE_DIR}/images/classic/buffer-export_ps.png
+${SHARE_DIR}/images/classic/buffer-export_text.png
+${SHARE_DIR}/images/classic/buffer-new.png
+${SHARE_DIR}/images/classic/buffer-reload.png
+${SHARE_DIR}/images/classic/buffer-toggle-output-sync.png
+${SHARE_DIR}/images/classic/buffer-update.png
+${SHARE_DIR}/images/classic/buffer-update_dvi.png
+${SHARE_DIR}/images/classic/buffer-update_dvi3.png
+${SHARE_DIR}/images/classic/buffer-update_pdf.png
+${SHARE_DIR}/images/classic/buffer-update_pdf2.png
+${SHARE_DIR}/images/classic/buffer-update_pdf3.png
+${SHARE_DIR}/images/classic/buffer-update_pdf4.png
+${SHARE_DIR}/images/classic/buffer-update_pdf5.png
+${SHARE_DIR}/images/classic/buffer-update_ps.png
+${SHARE_DIR}/images/classic/buffer-view.png
+${SHARE_DIR}/images/classic/buffer-view_dvi.png
+${SHARE_DIR}/images/classic/buffer-view_dvi3.png
+${SHARE_DIR}/images/classic/buffer-view_pdf.png
+${SHARE_DIR}/images/classic/buffer-view_pdf2.png
+${SHARE_DIR}/images/classic/buffer-view_pdf3.png
+${SHARE_DIR}/images/classic/buffer-view_pdf4.png
+${SHARE_DIR}/images/classic/buffer-view_pdf5.png
+${SHARE_DIR}/images/classic/buffer-view_ps.png
+${SHARE_DIR}/images/classic/buffer-write-as.png
+${SHARE_DIR}/images/classic/buffer-write.png
+${SHARE_DIR}/images/classic/build-program.png
+${SHARE_DIR}/images/classic/change-accept.png
+${SHARE_DIR}/images/classic/change-next.png
+${SHARE_DIR}/images/classic/change-reject.png
+${SHARE_DIR}/images/classic/changes-merge.png
+${SHARE_DIR}/images/classic/changes-output.png
+${SHARE_DIR}/images/classic/changes-track.png
+${SHARE_DIR}/images/classic/close-tab-group.png
+${SHARE_DIR}/images/classic/copy.png
+${SHARE_DIR}/images/classic/cut.png
+${SHARE_DIR}/images/classic/demote.png
+${SHARE_DIR}/images/classic/depth-decrement.png
+${SHARE_DIR}/images/classic/depth-increment.png
+${SHARE_DIR}/images/classic/dialog-preferences.png
+${SHARE_DIR}/images/classic/dialog-show-new-inset_citation.png
+${SHARE_DIR}/images/classic/dialog-show-new-inset_graphics.png
+${SHARE_DIR}/images/classic/dialog-show-new-inset_include.png
+${SHARE_DIR}/images/classic/dialog-show-new-inset_ref.png
+${SHARE_DIR}/images/classic/dialog-show_character.png
+${SHARE_DIR}/images/classic/dialog-show_findreplace.png
+${SHARE_DIR}/images/classic/dialog-show_mathdelimiter.png
+${SHARE_DIR}/images/classic/dialog-show_mathmatrix.png
+${SHARE_DIR}/images/classic/dialog-show_print.png
+${SHARE_DIR}/images/classic/dialog-show_spellchecker.png
+${SHARE_DIR}/images/classic/dialog-show_vclog.png
+${SHARE_DIR}/images/classic/dialog-toggle_findreplaceadv.png
+${SHARE_DIR}/images/classic/dialog-toggle_toc.png
+${SHARE_DIR}/images/classic/down.png
+${SHARE_DIR}/images/classic/ert-insert.png
+${SHARE_DIR}/images/classic/file-open.png
+${SHARE_DIR}/images/classic/float-insert_figure.png
+${SHARE_DIR}/images/classic/float-insert_table.png
+${SHARE_DIR}/images/classic/font-bold.png
+${SHARE_DIR}/images/classic/font-emph.png
+${SHARE_DIR}/images/classic/font-noun.png
+${SHARE_DIR}/images/classic/font-sans.png
+${SHARE_DIR}/images/classic/font-smallcaps.png
+${SHARE_DIR}/images/classic/footnote-insert.png
+${SHARE_DIR}/images/classic/href-insert.png
+${SHARE_DIR}/images/classic/iconsize.png
+${SHARE_DIR}/images/classic/index-insert.png
+${SHARE_DIR}/images/classic/info-insert_buffer_vcs-revision.png
+${SHARE_DIR}/images/classic/label-insert.png
+${SHARE_DIR}/images/classic/layout-document.png
+${SHARE_DIR}/images/classic/layout-paragraph.png
+${SHARE_DIR}/images/classic/layout.png
+${SHARE_DIR}/images/classic/layout_Description.png
+${SHARE_DIR}/images/classic/layout_Enumerate.png
+${SHARE_DIR}/images/classic/layout_Itemize.png
+${SHARE_DIR}/images/classic/layout_List.png
+${SHARE_DIR}/images/classic/layout_LyX-Code.png
+${SHARE_DIR}/images/classic/layout_Scrap.png
+${SHARE_DIR}/images/classic/layout_Section.png
+${SHARE_DIR}/images/classic/marginalnote-insert.png
+${SHARE_DIR}/images/classic/master-buffer-update.png
+${SHARE_DIR}/images/classic/master-buffer-view.png
+${SHARE_DIR}/images/classic/math-display.png
+${SHARE_DIR}/images/classic/math-macro-add-greedy-optional-param.png
+${SHARE_DIR}/images/classic/math-macro-add-optional-param.png
+${SHARE_DIR}/images/classic/math-macro-add-param.png
+${SHARE_DIR}/images/classic/math-macro-append-greedy-param.png
+${SHARE_DIR}/images/classic/math-macro-make-nonoptional.png
+${SHARE_DIR}/images/classic/math-macro-make-optional.png
+${SHARE_DIR}/images/classic/math-macro-remove-greedy-param.png
+${SHARE_DIR}/images/classic/math-macro-remove-optional-param.png
+${SHARE_DIR}/images/classic/math-macro-remove-param.png
+${SHARE_DIR}/images/classic/math-macro_newmacroname_newcommand.png
+${SHARE_DIR}/images/classic/math-matrix.png
+${SHARE_DIR}/images/classic/math-mode.png
+${SHARE_DIR}/images/classic/math-subscript.png
+${SHARE_DIR}/images/classic/math-superscript.png
+${SHARE_DIR}/images/classic/nomencl-insert.png
+${SHARE_DIR}/images/classic/note-insert.png
+${SHARE_DIR}/images/classic/note-next.png
+${SHARE_DIR}/images/classic/paste.png
+${SHARE_DIR}/images/classic/promote.png
+${SHARE_DIR}/images/classic/redo.png
+${SHARE_DIR}/images/classic/reload.png
+${SHARE_DIR}/images/classic/script-insert_subscript.png
+${SHARE_DIR}/images/classic/script-insert_superscript.png
+${SHARE_DIR}/images/classic/split-view_horizontal.png
+${SHARE_DIR}/images/classic/split-view_vertical.png
+${SHARE_DIR}/images/classic/tabular-feature_align-decimal.png
+${SHARE_DIR}/images/classic/tabular-feature_append-column.png
+${SHARE_DIR}/images/classic/tabular-feature_append-row.png
+${SHARE_DIR}/images/classic/tabular-feature_delete-column.png
+${SHARE_DIR}/images/classic/tabular-feature_delete-row.png
+${SHARE_DIR}/images/classic/tabular-feature_m-align-center.png
+${SHARE_DIR}/images/classic/tabular-feature_m-align-left.png
+${SHARE_DIR}/images/classic/tabular-feature_m-align-right.png
+${SHARE_DIR}/images/classic/tabular-feature_m-valign-bottom.png
+${SHARE_DIR}/images/classic/tabular-feature_m-valign-middle.png
+${SHARE_DIR}/images/classic/tabular-feature_m-valign-top.png
+${SHARE_DIR}/images/classic/tabular-feature_multicolumn.png
+${SHARE_DIR}/images/classic/tabular-feature_multirow.png
+${SHARE_DIR}/images/classic/tabular-feature_set-all-lines.png
+${SHARE_DIR}/images/classic/tabular-feature_set-border-lines.png
+${SHARE_DIR}/images/classic/tabular-feature_set-longtabular.png
+${SHARE_DIR}/images/classic/tabular-feature_set-rotate-cell.png
+${SHARE_DIR}/images/classic/tabular-feature_set-rotate-tabular.png
+${SHARE_DIR}/images/classic/tabular-feature_toggle-line-bottom.png
+${SHARE_DIR}/images/classic/tabular-feature_toggle-line-left.png
+${SHARE_DIR}/images/classic/tabular-feature_toggle-line-right.png
+${SHARE_DIR}/images/classic/tabular-feature_toggle-line-top.png
+${SHARE_DIR}/images/classic/tabular-feature_toggle-rotate-cell.png
+${SHARE_DIR}/images/classic/tabular-feature_toggle-rotate-tabular.png
+${SHARE_DIR}/images/classic/tabular-feature_unset-all-lines.png
+${SHARE_DIR}/images/classic/tabular-insert.png
+${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_table.png
+${SHARE_DIR}/images/classic/undo.png
+${SHARE_DIR}/images/classic/unknown.png
+${SHARE_DIR}/images/classic/up.png
+${SHARE_DIR}/images/classic/update-others.png
+${SHARE_DIR}/images/classic/url-insert.png
+${SHARE_DIR}/images/classic/vc-check-in.png
+${SHARE_DIR}/images/classic/vc-check-out.png
+${SHARE_DIR}/images/classic/vc-compare.png
+${SHARE_DIR}/images/classic/vc-compare_0.png
+${SHARE_DIR}/images/classic/vc-locking-toggle.png
+${SHARE_DIR}/images/classic/vc-register.png
+${SHARE_DIR}/images/classic/vc-repo-update.png
+${SHARE_DIR}/images/classic/vc-revert.png
+${SHARE_DIR}/images/classic/view-others.png
 ${SHARE_DIR}/images/change-accept.png
 ${SHARE_DIR}/images/change-next.png
 ${SHARE_DIR}/images/change-reject.png
@@ -438,6 +647,7 @@ ${SHARE_DIR}/images/dialog-show_mathmatrix.png
 ${SHARE_DIR}/images/dialog-show_print.png
 ${SHARE_DIR}/images/dialog-show_spellchecker.png
 ${SHARE_DIR}/images/dialog-show_vclog.png
+${SHARE_DIR}/images/dialog-toggle_findreplaceadv.png
 ${SHARE_DIR}/images/dialog-toggle_toc.png
 ${SHARE_DIR}/images/down.png
 ${SHARE_DIR}/images/ert-insert.png
@@ -452,6 +662,7 @@ ${SHARE_DIR}/images/footnote-insert.png
 ${SHARE_DIR}/images/hidetab.png
 ${SHARE_DIR}/images/href-insert.png
 ${SHARE_DIR}/images/index-insert.png
+${SHARE_DIR}/images/info-insert_buffer_vcs-revision.png
 ${SHARE_DIR}/images/label-insert.png
 ${SHARE_DIR}/images/layout-document.png
 ${SHARE_DIR}/images/layout-paragraph.png
@@ -465,7 +676,10 @@ ${SHARE_DIR}/images/layout_Scrap.png
 ${SHARE_DIR}/images/layout_Section.png
 ${SHARE_DIR}/images/lyx-quit.png
 ${SHARE_DIR}/images/lyx.png
+${SHARE_DIR}/images/lyx.svg
 ${SHARE_DIR}/images/marginalnote-insert.png
+${SHARE_DIR}/images/master-buffer-update.png
+${SHARE_DIR}/images/master-buffer-view.png
 ${SHARE_DIR}/images/math-display.png
 ${SHARE_DIR}/images/math-macro-add-greedy-optional-param.png
 ${SHARE_DIR}/images/math-macro-add-optional-param.png
@@ -492,6 +706,7 @@ ${SHARE_DIR}/images/math/Rrightarrow.png
 ${SHARE_DIR}/images/math/Rsh.png
 ${SHARE_DIR}/images/math/Vvdash.png
 ${SHARE_DIR}/images/math/acute.png
+${SHARE_DIR}/images/math/adots.png
 ${SHARE_DIR}/images/math/aleph.png
 ${SHARE_DIR}/images/math/alpha.png
 ${SHARE_DIR}/images/math/amalg.png
@@ -613,6 +828,7 @@ ${SHARE_DIR}/images/math/equiv.png
 ${SHARE_DIR}/images/math/eta.png
 ${SHARE_DIR}/images/math/eth.png
 ${SHARE_DIR}/images/math/exists.png
+${SHARE_DIR}/images/math/export-others.png
 ${SHARE_DIR}/images/math/fallingdotseq.png
 ${SHARE_DIR}/images/math/fint.png
 ${SHARE_DIR}/images/math/fintop.png
@@ -650,6 +866,7 @@ ${SHARE_DIR}/images/math/hookleftarrow.png
 ${SHARE_DIR}/images/math/hookrightarrow.png
 ${SHARE_DIR}/images/math/hphantom.png
 ${SHARE_DIR}/images/math/hslash.png
+${SHARE_DIR}/images/math/iddots.png
 ${SHARE_DIR}/images/math/iiiint.png
 ${SHARE_DIR}/images/math/iiiintop.png
 ${SHARE_DIR}/images/math/iiint.png
@@ -936,6 +1153,7 @@ ${SHARE_DIR}/images/math/underline.png
 ${SHARE_DIR}/images/math/underrightarrow.png
 ${SHARE_DIR}/images/math/underscore.png
 ${SHARE_DIR}/images/math/underset.png
+${SHARE_DIR}/images/math/undertilde.png
 ${SHARE_DIR}/images/math/uparrow.png
 ${SHARE_DIR}/images/math/uparrow2.png
 ${SHARE_DIR}/images/math/updownarrow.png
@@ -947,6 +1165,7 @@ ${SHARE_DIR}/images/math/upsilon.png
 ${SHARE_DIR}/images/math/upsilon2.png
 ${SHARE_DIR}/images/math/upuparrows.png
 ${SHARE_DIR}/images/math/urcorner.png
+${SHARE_DIR}/images/math/utilde.png
 ${SHARE_DIR}/images/math/varepsilon.png
 ${SHARE_DIR}/images/math/varkappa.png
 ${SHARE_DIR}/images/math/varnothing.png
@@ -984,6 +1203,98 @@ ${SHARE_DIR}/images/math/zeta.png
 ${SHARE_DIR}/images/nomencl-insert.png
 ${SHARE_DIR}/images/note-insert.png
 ${SHARE_DIR}/images/note-next.png
+${SHARE_DIR}/images/oxygen/all-changes-accept.png
+${SHARE_DIR}/images/oxygen/all-changes-reject.png
+${SHARE_DIR}/images/oxygen/bookmark-goto.png
+${SHARE_DIR}/images/oxygen/bookmark-goto_0.png
+${SHARE_DIR}/images/oxygen/bookmark-save.png
+${SHARE_DIR}/images/oxygen/box-insert.png
+${SHARE_DIR}/images/oxygen/buffer-new.png
+${SHARE_DIR}/images/oxygen/buffer-reload.png
+${SHARE_DIR}/images/oxygen/buffer-toggle-output-sync.png
+${SHARE_DIR}/images/oxygen/buffer-update.png
+${SHARE_DIR}/images/oxygen/buffer-update_dvi.png
+${SHARE_DIR}/images/oxygen/buffer-update_dvi3.png
+${SHARE_DIR}/images/oxygen/buffer-update_pdf.png
+${SHARE_DIR}/images/oxygen/buffer-update_pdf2.png
+${SHARE_DIR}/images/oxygen/buffer-update_pdf3.png
+${SHARE_DIR}/images/oxygen/buffer-update_pdf4.png
+${SHARE_DIR}/images/oxygen/buffer-update_pdf5.png
+${SHARE_DIR}/images/oxygen/buffer-update_ps.png
+${SHARE_DIR}/images/oxygen/buffer-view.png
+${SHARE_DIR}/images/oxygen/buffer-view_dvi.png
+${SHARE_DIR}/images/oxygen/buffer-view_dvi3.png
+${SHARE_DIR}/images/oxygen/buffer-view_pdf.png
+${SHARE_DIR}/images/oxygen/buffer-view_pdf2.png
+${SHARE_DIR}/images/oxygen/buffer-view_pdf3.png
+${SHARE_DIR}/images/oxygen/buffer-view_pdf4.png
+${SHARE_DIR}/images/oxygen/buffer-view_pdf5.png
+${SHARE_DIR}/images/oxygen/buffer-view_ps.png
+${SHARE_DIR}/images/oxygen/buffer-write-as.png
+${SHARE_DIR}/images/oxygen/buffer-write.png
+${SHARE_DIR}/images/oxygen/change-accept.png
+${SHARE_DIR}/images/oxygen/change-next.png
+${SHARE_DIR}/images/oxygen/change-reject.png
+${SHARE_DIR}/images/oxygen/changes-output.png
+${SHARE_DIR}/images/oxygen/changes-track.png
+${SHARE_DIR}/images/oxygen/close-tab-group.png
+${SHARE_DIR}/images/oxygen/closetab.png
+${SHARE_DIR}/images/oxygen/copy.png
+${SHARE_DIR}/images/oxygen/cut.png
+${SHARE_DIR}/images/oxygen/depth-decrement.png
+${SHARE_DIR}/images/oxygen/depth-increment.png
+${SHARE_DIR}/images/oxygen/dialog-show-new-inset_citation.png
+${SHARE_DIR}/images/oxygen/dialog-show-new-inset_graphics.png
+${SHARE_DIR}/images/oxygen/dialog-show-new-inset_include.png
+${SHARE_DIR}/images/oxygen/dialog-show-new-inset_ref.png
+${SHARE_DIR}/images/oxygen/dialog-show_character.png
+${SHARE_DIR}/images/oxygen/dialog-show_findreplace.png
+${SHARE_DIR}/images/oxygen/dialog-show_print.png
+${SHARE_DIR}/images/oxygen/dialog-show_spellchecker.png
+${SHARE_DIR}/images/oxygen/dialog-toggle_findreplaceadv.png
+${SHARE_DIR}/images/oxygen/dialog-toggle_toc.png
+${SHARE_DIR}/images/oxygen/ert-insert.png
+${SHARE_DIR}/images/oxygen/file-open.png
+${SHARE_DIR}/images/oxygen/float-insert_figure.png
+${SHARE_DIR}/images/oxygen/float-insert_table.png
+${SHARE_DIR}/images/oxygen/font-bold.png
+${SHARE_DIR}/images/oxygen/font-emph.png
+${SHARE_DIR}/images/oxygen/font-noun.png
+${SHARE_DIR}/images/oxygen/footnote-insert.png
+${SHARE_DIR}/images/oxygen/href-insert.png
+${SHARE_DIR}/images/oxygen/index-insert.png
+${SHARE_DIR}/images/oxygen/label-insert.png
+${SHARE_DIR}/images/oxygen/layout-document.png
+${SHARE_DIR}/images/oxygen/layout-paragraph.png
+${SHARE_DIR}/images/oxygen/layout.png
+${SHARE_DIR}/images/oxygen/layout_Description.png
+${SHARE_DIR}/images/oxygen/layout_Enumerate.png
+${SHARE_DIR}/images/oxygen/layout_Itemize.png
+${SHARE_DIR}/images/oxygen/layout_List.png
+${SHARE_DIR}/images/oxygen/lyx-quit.png
+${SHARE_DIR}/images/oxygen/marginalnote-insert.png
+${SHARE_DIR}/images/oxygen/master-buffer-update.png
+${SHARE_DIR}/images/oxygen/master-buffer-view.png
+${SHARE_DIR}/images/oxygen/math-macro_newmacroname_newcommand.png
+${SHARE_DIR}/images/oxygen/math-mode.png
+${SHARE_DIR}/images/oxygen/nomencl-insert.png
+${SHARE_DIR}/images/oxygen/note-insert.png
+${SHARE_DIR}/images/oxygen/note-next.png
+${SHARE_DIR}/images/oxygen/paste.png
+${SHARE_DIR}/images/oxygen/redo.png
+${SHARE_DIR}/images/oxygen/reload.png
+${SHARE_DIR}/images/oxygen/split-view_horizontal.png
+${SHARE_DIR}/images/oxygen/split-view_vertical.png
+${SHARE_DIR}/images/oxygen/tabular-insert.png
+${SHARE_DIR}/images/oxygen/textstyle-apply.png
+${SHARE_DIR}/images/oxygen/thesaurus-entry.png
+${SHARE_DIR}/images/oxygen/toolbar-toggle_math.png
+${SHARE_DIR}/images/oxygen/toolbar-toggle_table.png
+${SHARE_DIR}/images/oxygen/undo.png
+${SHARE_DIR}/images/oxygen/update-others.png
+${SHARE_DIR}/images/oxygen/url-insert.png
+${SHARE_DIR}/images/oxygen/vc-revert.png
+${SHARE_DIR}/images/oxygen/view-others.png
 ${SHARE_DIR}/images/paste.png
 ${SHARE_DIR}/images/promote.png
 ${SHARE_DIR}/images/psnfss1.png
@@ -992,9 +1303,12 @@ ${SHARE_DIR}/images/psnfss3.png
 ${SHARE_DIR}/images/psnfss4.png
 ${SHARE_DIR}/images/redo.png
 ${SHARE_DIR}/images/reload.png
+${SHARE_DIR}/images/script-insert_subscript.png
+${SHARE_DIR}/images/script-insert_superscript.png
 ${SHARE_DIR}/images/split-view_horizontal.png
 ${SHARE_DIR}/images/split-view_vertical.png
 ${SHARE_DIR}/images/standard.png
+${SHARE_DIR}/images/tabular-feature_align-decimal.png
 ${SHARE_DIR}/images/tabular-feature_append-column.png
 ${SHARE_DIR}/images/tabular-feature_append-row.png
 ${SHARE_DIR}/images/tabular-feature_delete-column.png
@@ -1006,6 +1320,7 @@ ${SHARE_DIR}/images/tabular-feature_m-valign-bottom.png
 ${SHARE_DIR}/images/tabular-feature_m-valign-middle.png
 ${SHARE_DIR}/images/tabular-feature_m-valign-top.png
 ${SHARE_DIR}/images/tabular-feature_multicolumn.png
+${SHARE_DIR}/images/tabular-feature_multirow.png
 ${SHARE_DIR}/images/tabular-feature_set-all-lines.png
 ${SHARE_DIR}/images/tabular-feature_set-border-lines.png
 ${SHARE_DIR}/images/tabular-feature_set-longtabular.png
@@ -1027,13 +1342,17 @@ ${SHARE_DIR}/images/toolbar-toggle_table.png
 ${SHARE_DIR}/images/undo.png
 ${SHARE_DIR}/images/unknown.png
 ${SHARE_DIR}/images/up.png
+${SHARE_DIR}/images/update-others.png
 ${SHARE_DIR}/images/url-insert.png
 ${SHARE_DIR}/images/vc-check-in.png
 ${SHARE_DIR}/images/vc-check-out.png
+${SHARE_DIR}/images/vc-compare.png
+${SHARE_DIR}/images/vc-compare_0.png
 ${SHARE_DIR}/images/vc-locking-toggle.png
 ${SHARE_DIR}/images/vc-register.png
 ${SHARE_DIR}/images/vc-repo-update.png
 ${SHARE_DIR}/images/vc-revert.png
+${SHARE_DIR}/images/view-others.png
 ${SHARE_DIR}/kbd/american-2.kmap
 ${SHARE_DIR}/kbd/american.kmap
 ${SHARE_DIR}/kbd/arabic.kmap
@@ -1074,6 +1393,7 @@ ${SHARE_DIR}/kbd/transilvanian.kmap
 ${SHARE_DIR}/kbd/turkish-f.kmap
 ${SHARE_DIR}/kbd/turkish.kmap
 ${SHARE_DIR}/languages
+${SHARE_DIR}/layouts/AEA.layout
 ${SHARE_DIR}/layouts/IEEEtran.layout
 ${SHARE_DIR}/layouts/aa.layout
 ${SHARE_DIR}/layouts/aapaper.inc
@@ -1104,6 +1424,10 @@ ${SHARE_DIR}/layouts/braille.module
 ${SHARE_DIR}/layouts/broadway.layout
 ${SHARE_DIR}/layouts/chess.layout
 ${SHARE_DIR}/layouts/cl2emult.layout
+${SHARE_DIR}/layouts/ctex-article.layout
+${SHARE_DIR}/layouts/ctex-book.layout
+${SHARE_DIR}/layouts/ctex-report.layout
+${SHARE_DIR}/layouts/customHeadersFooters.module
 ${SHARE_DIR}/layouts/db_lyxmacros.inc
 ${SHARE_DIR}/layouts/db_stdcharstyles.inc
 ${SHARE_DIR}/layouts/db_stdclass.inc
@@ -1127,6 +1451,7 @@ ${SHARE_DIR}/layouts/elsart.layout
 ${SHARE_DIR}/layouts/elsarticle.layout
 ${SHARE_DIR}/layouts/endnotes.module
 ${SHARE_DIR}/layouts/entcs.layout
+${SHARE_DIR}/layouts/enumitem.module
 ${SHARE_DIR}/layouts/eqs-within-sections.module
 ${SHARE_DIR}/layouts/europecv.layout
 ${SHARE_DIR}/layouts/extarticle.layout
@@ -1134,11 +1459,12 @@ ${SHARE_DIR}/layouts/extbook.layout
 ${SHARE_DIR}/layouts/extletter.layout
 ${SHARE_DIR}/layouts/extreport.layout
 ${SHARE_DIR}/layouts/figs-within-sections.module
+${SHARE_DIR}/layouts/fix-cm.module
+${SHARE_DIR}/layouts/fixltx2e.module
 ${SHARE_DIR}/layouts/foils.layout
 ${SHARE_DIR}/layouts/foottoend.module
 ${SHARE_DIR}/layouts/frletter.layout
-${SHARE_DIR}/layouts/g-brief-de.layout
-${SHARE_DIR}/layouts/g-brief-en.layout
+${SHARE_DIR}/layouts/g-brief.layout
 ${SHARE_DIR}/layouts/g-brief2.layout
 ${SHARE_DIR}/layouts/hanging.module
 ${SHARE_DIR}/layouts/heb-article.layout
@@ -1146,9 +1472,11 @@ ${SHARE_DIR}/layouts/heb-letter.layout
 ${SHARE_DIR}/layouts/hollywood.layout
 ${SHARE_DIR}/layouts/ijmpc.layout
 ${SHARE_DIR}/layouts/ijmpd.layout
+${SHARE_DIR}/layouts/initials.module
 ${SHARE_DIR}/layouts/iopart.layout
 ${SHARE_DIR}/layouts/isprs.layout
 ${SHARE_DIR}/layouts/jarticle.layout
+${SHARE_DIR}/layouts/jasatex.layout
 ${SHARE_DIR}/layouts/jbook.layout
 ${SHARE_DIR}/layouts/jgrga.layout
 ${SHARE_DIR}/layouts/jreport.layout
@@ -1156,9 +1484,11 @@ ${SHARE_DIR}/layouts/jsarticle.layout
 ${SHARE_DIR}/layouts/jsbook.layout
 ${SHARE_DIR}/layouts/jss.layout
 ${SHARE_DIR}/layouts/kluwer.layout
+${SHARE_DIR}/layouts/knitr.module
 ${SHARE_DIR}/layouts/latex8.layout
 ${SHARE_DIR}/layouts/letter.layout
 ${SHARE_DIR}/layouts/lettre.layout
+${SHARE_DIR}/layouts/lilypond.module
 ${SHARE_DIR}/layouts/linguistics.module
 ${SHARE_DIR}/layouts/literate-article.layout
 ${SHARE_DIR}/layouts/literate-book.layout
@@ -1174,6 +1504,7 @@ ${SHARE_DIR}/layouts/moderncv.layout
 ${SHARE_DIR}/layouts/mwart.layout
 ${SHARE_DIR}/layouts/mwbk.layout
 ${SHARE_DIR}/layouts/mwrep.layout
+${SHARE_DIR}/layouts/noweb.module
 ${SHARE_DIR}/layouts/numarticle.inc
 ${SHARE_DIR}/layouts/numreport.inc
 ${SHARE_DIR}/layouts/numrevtex.inc
@@ -1199,6 +1530,7 @@ ${SHARE_DIR}/layouts/singlecol.layout
 ${SHARE_DIR}/layouts/slides.layout
 ${SHARE_DIR}/layouts/spie.layout
 ${SHARE_DIR}/layouts/stdcharstyles.inc
+${SHARE_DIR}/layouts/stdciteformats.inc
 ${SHARE_DIR}/layouts/stdclass.inc
 ${SHARE_DIR}/layouts/stdcounters.inc
 ${SHARE_DIR}/layouts/stdcustom.inc
@@ -1207,17 +1539,20 @@ ${SHARE_DIR}/layouts/stdinsets.inc
 ${SHARE_DIR}/layouts/stdlayouts.inc
 ${SHARE_DIR}/layouts/stdletter.inc
 ${SHARE_DIR}/layouts/stdlists.inc
+${SHARE_DIR}/layouts/stdlyxlist.inc
+${SHARE_DIR}/layouts/stdrefprefix.inc
 ${SHARE_DIR}/layouts/stdsections.inc
 ${SHARE_DIR}/layouts/stdstarsections.inc
 ${SHARE_DIR}/layouts/stdstruct.inc
 ${SHARE_DIR}/layouts/stdtitle.inc
+${SHARE_DIR}/layouts/svcommon.inc
 ${SHARE_DIR}/layouts/svglobal.layout
 ${SHARE_DIR}/layouts/svglobal3.layout
 ${SHARE_DIR}/layouts/svjog.layout
-${SHARE_DIR}/layouts/svjour.inc
 ${SHARE_DIR}/layouts/svmono.layout
 ${SHARE_DIR}/layouts/svmult.layout
 ${SHARE_DIR}/layouts/svprobth.layout
+${SHARE_DIR}/layouts/sweave.module
 ${SHARE_DIR}/layouts/tabs-within-sections.module
 ${SHARE_DIR}/layouts/tarticle.layout
 ${SHARE_DIR}/layouts/tbook.layout
@@ -1229,20 +1564,26 @@ ${SHARE_DIR}/layouts/theorems-ams.inc
 ${SHARE_DIR}/layouts/theorems-ams.module
 ${SHARE_DIR}/layouts/theorems-bytype.inc
 ${SHARE_DIR}/layouts/theorems-bytype.module
+${SHARE_DIR}/layouts/theorems-case.inc
 ${SHARE_DIR}/layouts/theorems-chap-bytype.module
 ${SHARE_DIR}/layouts/theorems-chap.module
+${SHARE_DIR}/layouts/theorems-named.module
 ${SHARE_DIR}/layouts/theorems-order.inc
 ${SHARE_DIR}/layouts/theorems-proof.inc
+${SHARE_DIR}/layouts/theorems-proof-std.inc
+${SHARE_DIR}/layouts/theorems-refprefix.inc
 ${SHARE_DIR}/layouts/theorems-sec-bytype.module
 ${SHARE_DIR}/layouts/theorems-sec.module
 ${SHARE_DIR}/layouts/theorems-starred-equivalents.inc
 ${SHARE_DIR}/layouts/theorems-starred.inc
 ${SHARE_DIR}/layouts/theorems-starred.module
 ${SHARE_DIR}/layouts/theorems-std.module
+${SHARE_DIR}/layouts/theorems-without-preamble.inc
 ${SHARE_DIR}/layouts/theorems.inc
 ${SHARE_DIR}/layouts/treport.layout
 ${SHARE_DIR}/layouts/tufte-book.layout
 ${SHARE_DIR}/layouts/tufte-handout.layout
+${SHARE_DIR}/layouttranslations
 ${SHARE_DIR}/lyx2lyx/LyX.py
 ${SHARE_DIR}/lyx2lyx/LyX.pyc
 ${SHARE_DIR}/lyx2lyx/LyX.pyo
@@ -1317,59 +1658,39 @@ ${SHARE_DIR}/lyx2lyx/unicode_symbols.py
 ${SHARE_DIR}/lyx2lyx/unicode_symbols.pyc
 ${SHARE_DIR}/lyx2lyx/unicode_symbols.pyo
 ${SHARE_DIR}/scripts/TeXFiles.py
-${SHARE_DIR}/scripts/TeXFiles.pyc
-${SHARE_DIR}/scripts/TeXFiles.pyo
+${SHARE_DIR}/scripts/bash_completion
 ${SHARE_DIR}/scripts/clean_dvi.py
-${SHARE_DIR}/scripts/clean_dvi.pyc
-${SHARE_DIR}/scripts/clean_dvi.pyo
 ${SHARE_DIR}/scripts/convertDefault.py
-${SHARE_DIR}/scripts/convertDefault.pyc
-${SHARE_DIR}/scripts/convertDefault.pyo
 ${SHARE_DIR}/scripts/csv2lyx.py
-${SHARE_DIR}/scripts/csv2lyx.pyc
-${SHARE_DIR}/scripts/csv2lyx.pyo
 ${SHARE_DIR}/scripts/date.py
-${SHARE_DIR}/scripts/date.pyc
-${SHARE_DIR}/scripts/date.pyo
 ${SHARE_DIR}/scripts/ext_copy.py
-${SHARE_DIR}/scripts/ext_copy.pyc
-${SHARE_DIR}/scripts/ext_copy.pyo
 ${SHARE_DIR}/scripts/fen2ascii.py
-${SHARE_DIR}/scripts/fen2ascii.pyc
-${SHARE_DIR}/scripts/fen2ascii.pyo
 ${SHARE_DIR}/scripts/fig2pdftex.py
-${SHARE_DIR}/scripts/fig2pdftex.pyc
-${SHARE_DIR}/scripts/fig2pdftex.pyo
 ${SHARE_DIR}/scripts/fig2pstex.py
-${SHARE_DIR}/scripts/fig2pstex.pyc
-${SHARE_DIR}/scripts/fig2pstex.pyo
 ${SHARE_DIR}/scripts/fig_copy.py
-${SHARE_DIR}/scripts/fig_copy.pyc
-${SHARE_DIR}/scripts/fig_copy.pyo
+${SHARE_DIR}/scripts/include_bib.py
 ${SHARE_DIR}/scripts/layout2layout.py
-${SHARE_DIR}/scripts/layout2layout.pyc
-${SHARE_DIR}/scripts/layout2layout.pyo
 ${SHARE_DIR}/scripts/legacy_lyxpreview2ppm.py
-${SHARE_DIR}/scripts/legacy_lyxpreview2ppm.pyc
-${SHARE_DIR}/scripts/legacy_lyxpreview2ppm.pyo
 ${SHARE_DIR}/scripts/listerrors
+${SHARE_DIR}/scripts/lyxknitr.R
+${SHARE_DIR}/scripts/lyxpak.py
+${SHARE_DIR}/scripts/lyxpreview-lytex2bitmap.py
 ${SHARE_DIR}/scripts/lyxpreview-platex2bitmap.py
-${SHARE_DIR}/scripts/lyxpreview-platex2bitmap.pyc
-${SHARE_DIR}/scripts/lyxpreview-platex2bitmap.pyo
 ${SHARE_DIR}/scripts/lyxpreview2bitmap.py
-${SHARE_DIR}/scripts/lyxpreview2bitmap.pyc
-${SHARE_DIR}/scripts/lyxpreview2bitmap.pyo
 ${SHARE_DIR}/scripts/lyxpreview_tools.py
-${SHARE_DIR}/scripts/lyxpreview_tools.pyc
-${SHARE_DIR}/scripts/lyxpreview_tools.pyo
+${SHARE_DIR}/scripts/lyxstangle.R
+${SHARE_DIR}/scripts/lyxsweave.R
+${SHARE_DIR}/scripts/prefs2prefs.py
+${SHARE_DIR}/scripts/prefs2prefs_lfuns.py
+${SHARE_DIR}/scripts/prefs2prefs_prefs.py
 ${SHARE_DIR}/scripts/tex_copy.py
-${SHARE_DIR}/scripts/tex_copy.pyc
-${SHARE_DIR}/scripts/tex_copy.pyo
 ${SHARE_DIR}/symbols
 ${SHARE_DIR}/syntax.default
 ${SHARE_DIR}/templates/ACM-siggraph.lyx
 ${SHARE_DIR}/templates/ACM-sigplan.lyx
+${SHARE_DIR}/templates/AEA.lyx
 ${SHARE_DIR}/templates/IEEEtran.lyx
+${SHARE_DIR}/templates/JASA.lyx
 ${SHARE_DIR}/templates/JSS-article.lyx
 ${SHARE_DIR}/templates/README.new_templates
 ${SHARE_DIR}/templates/aa.lyx
@@ -1378,6 +1699,7 @@ ${SHARE_DIR}/templates/agu_article.lyx
 ${SHARE_DIR}/templates/agutex.lyx
 ${SHARE_DIR}/templates/apa.lyx
 ${SHARE_DIR}/templates/beamer-conference-ornate-20min.lyx
+${SHARE_DIR}/templates/ctex.lyx
 ${SHARE_DIR}/templates/de_beamer-conference-ornate-20min.lyx
 ${SHARE_DIR}/templates/dinbrief.lyx
 ${SHARE_DIR}/templates/docbook_article.lyx
@@ -1395,23 +1717,34 @@ ${SHARE_DIR}/templates/ijmpd.lyx
 ${SHARE_DIR}/templates/iop-article.lyx
 ${SHARE_DIR}/templates/kluwer.lyx
 ${SHARE_DIR}/templates/koma-letter2.lyx
-${SHARE_DIR}/templates/latex8.lyx
 ${SHARE_DIR}/templates/letter.lyx
 ${SHARE_DIR}/templates/lettre.lyx
-${SHARE_DIR}/templates/revtex.lyx
 ${SHARE_DIR}/templates/revtex4.lyx
 ${SHARE_DIR}/templates/slides.lyx
-${SHARE_DIR}/templates/svjour3.lyx
-${SHARE_DIR}/templates/svmono_book.lyx
-${SHARE_DIR}/templates/svmult_appendix.lyx
-${SHARE_DIR}/templates/svmult_author.lyx
-${SHARE_DIR}/templates/svmult_editor.lyx
+${SHARE_DIR}/templates/springer/svjour3.lyx
+${SHARE_DIR}/templates/springer/svmono_acknow.lyx
+${SHARE_DIR}/templates/springer/svmono_acronym.lyx
+${SHARE_DIR}/templates/springer/svmono_appendix.lyx
+${SHARE_DIR}/templates/springer/svmono_book-master.lyx
+${SHARE_DIR}/templates/springer/svmono_chapter.lyx
+${SHARE_DIR}/templates/springer/svmono_dedication.lyx
+${SHARE_DIR}/templates/springer/svmono_foreword.lyx
+${SHARE_DIR}/templates/springer/svmono_glossary.lyx
+${SHARE_DIR}/templates/springer/svmono_part.lyx
+${SHARE_DIR}/templates/springer/svmono_preface.lyx
+${SHARE_DIR}/templates/thesis/Acknowledgments.lyx
+${SHARE_DIR}/templates/thesis/Appendix.lyx
+${SHARE_DIR}/templates/thesis/Summary.lyx
+${SHARE_DIR}/templates/thesis/alpha.bst
+${SHARE_DIR}/templates/thesis/chapter-1.lyx
+${SHARE_DIR}/templates/thesis/chapter-2.lyx
+${SHARE_DIR}/templates/thesis/thesis.lyx
+${SHARE_DIR}/templates/thesis/thesisExample.bib
 ${SHARE_DIR}/tex/broadway.cls
 ${SHARE_DIR}/tex/hollywood.cls
 ${SHARE_DIR}/tex/lyxchess.sty
 ${SHARE_DIR}/tex/lyxskak.sty
 ${SHARE_DIR}/tex/revtex.cls
-${SHARE_DIR}/ui/classic.ui
 ${SHARE_DIR}/ui/default.ui
 ${SHARE_DIR}/ui/stdcontext.inc
 ${SHARE_DIR}/ui/stdmenus.inc
diff --git a/editors/lyx/distinfo b/editors/lyx/distinfo
index b8308b4db21..4f2bdb11ce0 100644
--- a/editors/lyx/distinfo
+++ b/editors/lyx/distinfo
@@ -1,20 +1,14 @@
-$NetBSD: distinfo,v 1.11 2013/05/21 16:37:04 joerg Exp $
+$NetBSD: distinfo,v 1.12 2014/01/19 14:04:39 rumko Exp $
 
-SHA1 (lyx-1.6.10.tar.bz2) = 344e14897ea7d004bf181eac39355f1b08f0af83
-RMD160 (lyx-1.6.10.tar.bz2) = b84409c19d320f915c3254d56d8aa0b40e61540d
-Size (lyx-1.6.10.tar.bz2) = 12559454 bytes
-SHA1 (patch-boost_boost_detail_container__fwd.hpp) = 20e3b5cb7cc0ffff68f8678a2977771ff6ef92e3
+SHA1 (lyx-2.0.6.tar.xz) = d73ba7a5e796acdf32282207be0b29d66411c5f8
+RMD160 (lyx-2.0.6.tar.xz) = 8e0e3af80726f566fdd8498f7410c36cffa6bdda
+Size (lyx-2.0.6.tar.xz) = 10390452 bytes
+SHA1 (patch-boost_boost_detail_container__fwd.hpp) = ff95034c4e2c03c894b3aa4b9222b34b8495fba7
 SHA1 (patch-boost_libs_signals_src_named__slot__map.cpp) = 3d73f93911eb2a9b51b0be34e3a26e85ec5b54f4
 SHA1 (patch-development_MacOSX_Makefile.in) = ae9e51e3458f8986ae392b146f8684305b7fe25b
-SHA1 (patch-src_ISpell.cpp) = 6ec15efefe9f1c539f13a12a16757fd4e02b7b96
-SHA1 (patch-src_ServerSocket.cpp) = 62c9ecfe0de4516aba3ebca29b1a1e1768694551
 SHA1 (patch-src_WordList.cpp) = d747efcd6ca4d7015a5c6860a8844ac79a65672a
-SHA1 (patch-src_frontends_qt4_GuiCommandBuffer.cpp) = b0086302b644ad7139cc6b798057a08c8efbd44b
-SHA1 (patch-src_insets_InsetInclude.cpp) = 94d52c40e188a2d8c083720e5b758c862e499726
-SHA1 (patch-src_insets_InsetTabular.cpp) = 13e35c0a66ae87443315624d8c4bbbd11ea20cea
-SHA1 (patch-src_insets_InsetText.cpp) = 83719f8a1b6ff221ce34ef5a9b8c7da56c5fb79f
 SHA1 (patch-src_mathed_InsetMath.h) = c178b1436c7a969e29b328dde1a800e9ccb7af0e
 SHA1 (patch-src_mathed_MathData.h) = fcd51f36aa2aae29f75e041d7adb1d88baa370a5
-SHA1 (patch-src_support_debug.h) = fa6e4ddc0bd6fdeb00ab99e4be190be9430dced9
+SHA1 (patch-src_support_debug.h) = 749ab17184fe2fc059384785c426afe444c0b2a7
 SHA1 (patch-src_support_strfwd.h) = 4ef82f8703fd68f8b953447f05ab1fd71958c379
 SHA1 (patch-src_support_unicode.cpp) = 71bdc1b929a3c90bed84d6de5aa0734e548c67de
diff --git a/editors/lyx/patches/patch-boost_boost_detail_container__fwd.hpp b/editors/lyx/patches/patch-boost_boost_detail_container__fwd.hpp
index 88b8f21a2ef..8ee3a442da3 100644
--- a/editors/lyx/patches/patch-boost_boost_detail_container__fwd.hpp
+++ b/editors/lyx/patches/patch-boost_boost_detail_container__fwd.hpp
@@ -1,14 +1,14 @@
-$NetBSD: patch-boost_boost_detail_container__fwd.hpp,v 1.1 2013/05/09 13:56:58 joerg Exp $
+$NetBSD: patch-boost_boost_detail_container__fwd.hpp,v 1.2 2014/01/19 14:04:39 rumko Exp $
 
---- boost/boost/detail/container_fwd.hpp.orig	2013-05-09 11:28:09.000000000 +0000
+--- boost/boost/detail/container_fwd.hpp.orig	2013-04-29 15:58:30.000000000 +0000
 +++ boost/boost/detail/container_fwd.hpp
-@@ -16,7 +16,8 @@
- #if ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) && defined(_GLIBCXX_DEBUG)) \

-     || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \

-     || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \

--    || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))

+@@ -18,7 +18,8 @@
+         && (defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL))) \
+     || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
+     || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \
+-    || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
 +    || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) \
 +    || defined(_LIBCPP_VERSION)
- 

- #include <deque>

- #include <list>

+ 
+ #include <deque>
+ #include <list>
diff --git a/editors/lyx/patches/patch-src_ISpell.cpp b/editors/lyx/patches/patch-src_ISpell.cpp
deleted file mode 100644
index 91d3e52f5bf..00000000000
--- a/editors/lyx/patches/patch-src_ISpell.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_ISpell.cpp,v 1.1 2013/05/09 13:56:58 joerg Exp $
-
---- src/ISpell.cpp.orig	2013-05-09 12:16:25.000000000 +0000
-+++ src/ISpell.cpp
-@@ -34,8 +34,6 @@
- # include <sys/time.h>
- #endif
- 
--using boost::shared_ptr;
--
- using namespace std;
- using namespace lyx::support;
- 
-@@ -51,8 +49,8 @@ public:
- 		     int * in, int * out, int * err)
- 		: params(p), lang(l), pipein(in), pipeout(out), pipeerr(err) {}
- 	///
--	virtual shared_ptr<ForkedProcess> clone() const {
--		return shared_ptr<ForkedProcess>(new LaunchIspell(*this));
-+	virtual boost::shared_ptr<ForkedProcess> clone() const {
-+		return boost::shared_ptr<ForkedProcess>(new LaunchIspell(*this));
- 	}
- 	///
- 	int start();
diff --git a/editors/lyx/patches/patch-src_ServerSocket.cpp b/editors/lyx/patches/patch-src_ServerSocket.cpp
deleted file mode 100644
index cde3fc64b8c..00000000000
--- a/editors/lyx/patches/patch-src_ServerSocket.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-src_ServerSocket.cpp,v 1.1 2013/05/09 13:56:58 joerg Exp $
-
---- src/ServerSocket.cpp.orig	2013-05-09 12:01:41.000000000 +0000
-+++ src/ServerSocket.cpp
-@@ -39,8 +39,6 @@
- using namespace std;
- using namespace lyx::support;
- 
--using boost::shared_ptr;
--
- namespace lyx {
- 
- // Address is the unix address for the socket.
-@@ -112,7 +110,7 @@ void ServerSocket::serverCallback()
- 
- 	// Register the new client.
- 	clients[client_fd] =
--		shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
-+		boost::shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
- 	theApp()->registerSocketCallback(
- 		client_fd,
- 		boost::bind(&ServerSocket::dataCallback,
-@@ -125,7 +123,7 @@ void ServerSocket::serverCallback()
- // if the connection has been closed
- void ServerSocket::dataCallback(int fd)
- {
--	shared_ptr<LyXDataSocket> client = clients[fd];
-+	boost::shared_ptr<LyXDataSocket> client = clients[fd];
- 
- 	string line;
- 	size_t pos;
-@@ -191,8 +189,8 @@ void ServerSocket::writeln(string const 
- //	lyxerr << "ServerSocket debug dump.\n"
- //	     << "fd = " << fd_ << ", address = " << address_.absFilename() << ".\n"
- //	     << "Clients: " << clients.size() << ".\n";
--//	map<int, shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
--//	map<int, shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();
-+//	map<int, boost::shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
-+//	map<int, boost::shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();
- //	for (; client != end; ++client)
- //		lyxerr << "fd = " << client->first << '\n';
- // }
diff --git a/editors/lyx/patches/patch-src_frontends_qt4_GuiCommandBuffer.cpp b/editors/lyx/patches/patch-src_frontends_qt4_GuiCommandBuffer.cpp
deleted file mode 100644
index 429ca3898c2..00000000000
--- a/editors/lyx/patches/patch-src_frontends_qt4_GuiCommandBuffer.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_frontends_qt4_GuiCommandBuffer.cpp,v 1.1 2013/05/21 16:37:04 joerg Exp $
-
---- src/frontends/qt4/GuiCommandBuffer.cpp.orig	2013-05-21 14:52:09.000000000 +0000
-+++ src/frontends/qt4/GuiCommandBuffer.cpp
-@@ -315,7 +315,7 @@ GuiCommandBuffer::completions(string con
- {
- 	vector<string> comp;
- 
--	copy_if(commands_.begin(), commands_.end(),
-+	lyx::copy_if(commands_.begin(), commands_.end(),
- 		back_inserter(comp), prefix_p(prefix));
- 
- 	if (comp.empty()) {
-@@ -335,7 +335,7 @@ GuiCommandBuffer::completions(string con
- 		test += tmp[test.length()];
- 	while (test.length() < tmp.length()) {
- 		vector<string> vtmp;
--		copy_if(comp.begin(), comp.end(),
-+		lyx::copy_if(comp.begin(), comp.end(),
- 			back_inserter(vtmp), prefix_p(test));
- 		if (vtmp.size() != comp.size()) {
- 			test.erase(test.length() - 1);
diff --git a/editors/lyx/patches/patch-src_insets_InsetInclude.cpp b/editors/lyx/patches/patch-src_insets_InsetInclude.cpp
deleted file mode 100644
index eae193e2ee2..00000000000
--- a/editors/lyx/patches/patch-src_insets_InsetInclude.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_insets_InsetInclude.cpp,v 1.1 2012/11/23 12:32:00 joerg Exp $
-
---- src/insets/InsetInclude.cpp.orig	2012-11-22 21:58:32.000000000 +0000
-+++ src/insets/InsetInclude.cpp
-@@ -806,7 +806,7 @@ support::FileNameList const &
- 		tmp->setParent(&buffer);
- 		return cache;
- 	}
--	static support::FileNameList const empty;
-+	static support::FileNameList empty;
- 	return empty;
- }
- 
diff --git a/editors/lyx/patches/patch-src_insets_InsetTabular.cpp b/editors/lyx/patches/patch-src_insets_InsetTabular.cpp
deleted file mode 100644
index d0783b3cd0a..00000000000
--- a/editors/lyx/patches/patch-src_insets_InsetTabular.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-$NetBSD: patch-src_insets_InsetTabular.cpp,v 1.2 2013/05/09 13:56:58 joerg Exp $
-
---- src/insets/InsetTabular.cpp.orig	2011-01-05 14:02:35.000000000 +0000
-+++ src/insets/InsetTabular.cpp
-@@ -68,7 +68,6 @@
- using namespace std;
- using namespace lyx::support;
- 
--using boost::shared_ptr;
- using boost::dynamic_pointer_cast;
- 
- 
-@@ -176,6 +175,56 @@ private:
- };
- 
- 
-+string const tostr(LyXAlignment const & num)
-+{
-+	switch (num) {
-+	case LYX_ALIGN_NONE:
-+		return "none";
-+	case LYX_ALIGN_BLOCK:
-+		return "block";
-+	case LYX_ALIGN_LEFT:
-+		return "left";
-+	case LYX_ALIGN_CENTER:
-+		return "center";
-+	case LYX_ALIGN_RIGHT:
-+		return "right";
-+	case LYX_ALIGN_LAYOUT:
-+		return "layout";
-+	case LYX_ALIGN_SPECIAL:
-+		return "special";
-+	}
-+	return string();
-+}
-+
-+
-+string const tostr(Tabular::VAlignment const & num)
-+{
-+	switch (num) {
-+	case Tabular::LYX_VALIGN_TOP:
-+		return "top";
-+	case Tabular::LYX_VALIGN_MIDDLE:
-+		return "middle";
-+	case Tabular::LYX_VALIGN_BOTTOM:
-+		return "bottom";
-+	}
-+	return string();
-+}
-+
-+
-+string const tostr(Tabular::BoxType const & num)
-+{
-+	switch (num) {
-+	case Tabular::BOX_NONE:
-+		return "none";
-+	case Tabular::BOX_PARBOX:
-+		return "parbox";
-+	case Tabular::BOX_MINIPAGE:
-+		return "minipage";
-+	}
-+	return string();
-+}
-+
-+
- template <class T>
- string const write_attribute(string const & name, T const & t)
- {
-@@ -232,56 +281,6 @@ string const write_attribute(string cons
- }
- 
- 
--string const tostr(LyXAlignment const & num)
--{
--	switch (num) {
--	case LYX_ALIGN_NONE:
--		return "none";
--	case LYX_ALIGN_BLOCK:
--		return "block";
--	case LYX_ALIGN_LEFT:
--		return "left";
--	case LYX_ALIGN_CENTER:
--		return "center";
--	case LYX_ALIGN_RIGHT:
--		return "right";
--	case LYX_ALIGN_LAYOUT:
--		return "layout";
--	case LYX_ALIGN_SPECIAL:
--		return "special";
--	}
--	return string();
--}
--
--
--string const tostr(Tabular::VAlignment const & num)
--{
--	switch (num) {
--	case Tabular::LYX_VALIGN_TOP:
--		return "top";
--	case Tabular::LYX_VALIGN_MIDDLE:
--		return "middle";
--	case Tabular::LYX_VALIGN_BOTTOM:
--		return "bottom";
--	}
--	return string();
--}
--
--
--string const tostr(Tabular::BoxType const & num)
--{
--	switch (num) {
--	case Tabular::BOX_NONE:
--		return "none";
--	case Tabular::BOX_PARBOX:
--		return "parbox";
--	case Tabular::BOX_MINIPAGE:
--		return "minipage";
--	}
--	return string();
--}
--
--
- // I would have liked a fromstr template a lot better. (Lgb)
- bool string2type(string const str, LyXAlignment & num)
- {
-@@ -2203,7 +2202,7 @@ int Tabular::TeXRow(odocstream & os, row
- 		       OutputParams const & runparams) const
- {
- 	idx_type cell = cellIndex(i, 0);
--	shared_ptr<InsetTableCell> inset = cellInset(cell);
-+	boost::shared_ptr<InsetTableCell> inset = cellInset(cell);
- 	Paragraph const & par = inset->paragraphs().front();
- 	string const lang = par.getParLanguage(buffer().params())->lang();
- 
-@@ -2233,7 +2232,7 @@ int Tabular::TeXRow(odocstream & os, row
- 		if (isPartOfMultiColumn(i, j))
- 			continue;
- 		ret += TeXCellPreamble(os, cell, ismulticol);
--		shared_ptr<InsetTableCell> inset = cellInset(cell);
-+		boost::shared_ptr<InsetTableCell> inset = cellInset(cell);
- 
- 		Paragraph const & par = inset->paragraphs().front();
- 		bool rtl = par.isRTL(buffer().params())
-@@ -2769,13 +2768,13 @@ void Tabular::plaintext(odocstream & os,
- }
- 
- 
--shared_ptr<InsetTableCell> Tabular::cellInset(idx_type cell) const
-+boost::shared_ptr<InsetTableCell> Tabular::cellInset(idx_type cell) const
- {
- 	return cell_info[cellRow(cell)][cellColumn(cell)].inset;
- }
- 
- 
--shared_ptr<InsetTableCell> Tabular::cellInset(row_type row,
-+boost::shared_ptr<InsetTableCell> Tabular::cellInset(row_type row,
- 					       col_type column) const
- {
- 	return cell_info[row][column].inset;
-@@ -2783,7 +2782,7 @@ shared_ptr<InsetTableCell> Tabular::cell
- 
- 
- void Tabular::setCellInset(row_type row, col_type column,
--			      shared_ptr<InsetTableCell> ins) const
-+			      boost::shared_ptr<InsetTableCell> ins) const
- {
- 	CellData & cd = cell_info[row][column];
- 	cd.inset = ins;
-@@ -4154,13 +4153,13 @@ void InsetTabular::validate(LaTeXFeature
- }
- 
- 
--shared_ptr<InsetTableCell const> InsetTabular::cell(idx_type idx) const
-+boost::shared_ptr<InsetTableCell const> InsetTabular::cell(idx_type idx) const
- {
- 	return tabular.cellInset(idx);
- }
- 
- 
--shared_ptr<InsetTableCell> InsetTabular::cell(idx_type idx)
-+boost::shared_ptr<InsetTableCell> InsetTabular::cell(idx_type idx)
- {
- 	return tabular.cellInset(idx);
- }
-@@ -4960,7 +4959,7 @@ bool InsetTabular::pasteClipboard(Cursor
- 				--c1;
- 				continue;
- 			}
--			shared_ptr<InsetTableCell> inset(
-+			boost::shared_ptr<InsetTableCell> inset(
- 				new InsetTableCell(*paste_tabular->cellInset(r1, c1)));
- 			tabular.setCellInset(r2, c2, inset);
- 			// FIXME: change tracking (MG)
-@@ -4983,7 +4982,7 @@ void InsetTabular::cutSelection(Cursor &
- 	getSelection(cur, rs, re, cs, ce);
- 	for (row_type i = rs; i <= re; ++i) {
- 		for (col_type j = cs; j <= ce; ++j) {
--			shared_ptr<InsetTableCell> t
-+			boost::shared_ptr<InsetTableCell> t
- 				= cell(tabular.cellIndex(i, j));
- 			if (cur.buffer().params().trackChanges)
- 				// FIXME: Change tracking (MG)
-@@ -5153,7 +5152,7 @@ bool InsetTabular::insertPlaintextString
- 		case '\t':
- 			// we can only set this if we are not too far right
- 			if (cols < columns) {
--				shared_ptr<InsetTableCell> inset = loctab->cellInset(cell);
-+				boost::shared_ptr<InsetTableCell> inset = loctab->cellInset(cell);
- 				Font const font = bv.textMetrics(&inset->text()).
- 					displayFont(0, 0);
- 				inset->setText(buf.substr(op, p - op), font,
-@@ -5165,7 +5164,7 @@ bool InsetTabular::insertPlaintextString
- 		case '\n':
- 			// we can only set this if we are not too far right
- 			if (cols < columns) {
--				shared_ptr<InsetTableCell> inset = tabular.cellInset(cell);
-+				boost::shared_ptr<InsetTableCell> inset = tabular.cellInset(cell);
- 				Font const font = bv.textMetrics(&inset->text()).
- 					displayFont(0, 0);
- 				inset->setText(buf.substr(op, p - op), font,
-@@ -5182,7 +5181,7 @@ bool InsetTabular::insertPlaintextString
- 	}
- 	// check for the last cell if there is no trailing '\n'
- 	if (cell < cells && op < len) {
--		shared_ptr<InsetTableCell> inset = loctab->cellInset(cell);
-+		boost::shared_ptr<InsetTableCell> inset = loctab->cellInset(cell);
- 		Font const font = bv.textMetrics(&inset->text()).displayFont(0, 0);
- 		inset->setText(buf.substr(op, len - op), font,
- 			buffer().params().trackChanges);
diff --git a/editors/lyx/patches/patch-src_insets_InsetText.cpp b/editors/lyx/patches/patch-src_insets_InsetText.cpp
deleted file mode 100644
index 48cda63ea0d..00000000000
--- a/editors/lyx/patches/patch-src_insets_InsetText.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_insets_InsetText.cpp,v 1.1 2013/05/09 13:56:58 joerg Exp $
-
---- src/insets/InsetText.cpp.orig	2013-05-09 12:13:13.000000000 +0000
-+++ src/insets/InsetText.cpp
-@@ -62,7 +62,6 @@ using namespace std;
- using namespace lyx::support;
- 
- using boost::bind;
--using boost::ref;
- 
- namespace lyx {
- 
-@@ -353,7 +352,7 @@ int InsetText::docbook(odocstream & os, 
- void InsetText::validate(LaTeXFeatures & features) const
- {
- 	for_each(paragraphs().begin(), paragraphs().end(),
--		 bind(&Paragraph::validate, _1, ref(features)));
-+		 bind(&Paragraph::validate, _1, boost::ref(features)));
- }
- 
- 
-@@ -435,7 +434,7 @@ void InsetText::appendParagraphs(Paragra
- 		       distance(pl.begin(), ins) - 1);
- 
- 	for_each(pit, plist.end(),
--		 bind(&ParagraphList::push_back, ref(pl), _1));
-+		 bind(&ParagraphList::push_back, boost::ref(pl), _1));
- }
- 
- 
diff --git a/editors/lyx/patches/patch-src_support_debug.h b/editors/lyx/patches/patch-src_support_debug.h
index a292ab1991e..6aca72938fb 100644
--- a/editors/lyx/patches/patch-src_support_debug.h
+++ b/editors/lyx/patches/patch-src_support_debug.h
@@ -1,13 +1,12 @@
-$NetBSD: patch-src_support_debug.h,v 1.1 2013/05/09 13:56:58 joerg Exp $
+$NetBSD: patch-src_support_debug.h,v 1.2 2014/01/19 14:04:39 rumko Exp $
 
---- src/support/debug.h.orig	2013-05-09 11:37:52.000000000 +0000
+--- src/support/debug.h.orig	2013-04-29 15:58:31.000000000 +0000
 +++ src/support/debug.h
-@@ -19,17 +19,8 @@
+@@ -16,16 +16,8 @@
  #define LYXDEBUG_H
  
  #include "support/strfwd.h"
 -
--
 -namespace std {
 -
 -class ios_base;