5 files changed, 40 insertions, 31 deletions

diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index d803caf4fcab..159f4df4118e 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -20,49 +20,53 @@ COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost-libs \
+		mythes-1.2.0:${PORTSDIR}/textproc/mythes
 
 CONFLICTS=	lyx-1.[0-9]*
 MAJOR_VERSION=	2.0
-MINOR_VERSION=	0
+MINOR_VERSION=	1
 
 USE_XZ=		yes
 USE_GMAKE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build uic_build rcc_build
+QT_COMPONENTS=	corelib gui moc_build uic_build rcc_build
 USE_PYTHON=	yes
 USE_PERL=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--with-frontend=qt4 \
-		--without-included-boost \
-		--without-included-gettext \
+CONFIGURE_ARGS=	--without-included-boost \
+		--without-included-mythes \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-extra-prefix=${LOCALBASE}
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		lyx.1 lyxclient.1 tex2lyx.1
 
-OPTIONS=	ASPELL	"Use Aspell library"	on \
-		AIKSAUR	"Build Aiksaurus support (English thesaurus)"	on \
-		NLS	"Native language support"	on
+OPTIONS=	ASPELL	 "Use Aspell for spell checking" off \
+		ENCHANT  "Use Enchant for spell checking" off \
+		HUNSPELL "Use Hunspell for spell checking" on \
+		NLS	 "Native language support"	on
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_AIKSAUR)
-LIB_DEPENDS+=	Aiksaurus:${PORTSDIR}/textproc/aiksaurus
+.if !defined(WITHOUT_ASPELL)
+LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 .else
-CONFIGURE_ARGS+=	--without-aiksaurus
+CONFIGURE_ARGS+=	--without-aspell
 .endif
 
-.if !defined(WITHOUT_ASPELL)
-LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--with-pspell \
-			--with-pspell-lib="${LOCALBASE}/lib" \
-			--with-pspell-include="${LOCALBASE}/include"
+.if !defined(WITHOUT_ENCHANT)
+LIB_DEPENDS+=	enchant.1:${PORTSDIR}/textproc/enchant
+.else
+CONFIGURE_ARGS+=	--without-enchant
+.endif
+
+.if !defined(WITHOUT_HUNSPELL)
+LIB_DEPENDS+=	hunspell-1.3.0:${PORTSDIR}/textproc/hunspell
 .else
-CONFIGURE_ARGS+=	--without-aspell --without-pspell
+CONFIGURE_ARGS+=	--without-hunspell
 .endif
 
 .if defined(WITHOUT_NLS)
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 818479ea8341..2383c12ac9cd 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lyx-2.0.0.tar.xz) = a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61
-SIZE (lyx-2.0.0.tar.xz) = 10011408
+SHA256 (lyx-2.0.1.tar.xz) = a58b7e0f27afce0497fffec0d19fc95fb1b3ac36818e8d02ecaf9e882c8f3852
+SIZE (lyx-2.0.1.tar.xz) = 10119588
diff --git a/print/lyx/pkg-descr b/print/lyx/pkg-descr
index eef8211b0551..1d259742208e 100644
--- a/print/lyx/pkg-descr
+++ b/print/lyx/pkg-descr
@@ -19,8 +19,4 @@ boundaries. You just write. On screen, LyX looks like any word
 processor; its printed output - or richly cross-referenced PDF,
 just as readily produced - looks like nothing else.
 
-LyX is released under a Free Software/Open Source license, runs on
-Linux/Unix, Windows, and Mac OS X, and is available in several
-languages.
-
 WWW:	http://www.lyx.org/
diff --git a/print/lyx/pkg-message b/print/lyx/pkg-message
index f9b07c285ad4..2d9ffd22aaa0 100644
--- a/print/lyx/pkg-message
+++ b/print/lyx/pkg-message
@@ -1,4 +1,13 @@
-For lyx to work you need to install some kind of TeX software.
-The easiest way is probably to install print/teTeX port which is quite old.
-A newer alternative could be TeXLive:
-	http://code.google.com/p/freebsd-texlive/
+For LyX to work you need to install some kind of TeX distribution.
+
+  - The print/teTeX port in the ports tree.
+  - The TexLive ports in https://code.google.com/p/freebsd-texlive.
+
+Either one should work fine.
+
+***
+
+As of version 2.0.0, LyX depends on the textproc/mythes ports for
+thesaurus support. Even though the LyX port depends on textproc/mythes,
+it is up to the user to install the thesaurus ports for her languages
+of preference.
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 547071fa41e1..ebdf6d0d8de3 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -32,6 +32,7 @@ bin/tex2lyx
 %%NLS%%share/locale/uk/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lyx.mo
+%%DATADIR%%/autocorrect
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -287,7 +288,6 @@ bin/tex2lyx
 %%DATADIR%%/examples/de/tufte-handout.lyx
 %%DATADIR%%/examples/docbook_article.lyx
 %%DATADIR%%/examples/el/splash.lyx
-%%DATADIR%%/examples/enumitem.lyx
 %%DATADIR%%/examples/es/Braille.lyx
 %%DATADIR%%/examples/es/ItemizeBullets.lyx
 %%DATADIR%%/examples/es/ejemplo_con_lyx.lyx
@@ -1139,6 +1139,7 @@ bin/tex2lyx
 %%DATADIR%%/images/math/underrightarrow.png
 %%DATADIR%%/images/math/underscore.png
 %%DATADIR%%/images/math/underset.png
+%%DATADIR%%/images/math/undertilde.png
 %%DATADIR%%/images/math/uparrow.png
 %%DATADIR%%/images/math/uparrow2.png
 %%DATADIR%%/images/math/updownarrow.png
@@ -1150,6 +1151,7 @@ bin/tex2lyx
 %%DATADIR%%/images/math/upsilon2.png
 %%DATADIR%%/images/math/upuparrows.png
 %%DATADIR%%/images/math/urcorner.png
+%%DATADIR%%/images/math/utilde.png
 %%DATADIR%%/images/math/varepsilon.png
 %%DATADIR%%/images/math/varkappa.png
 %%DATADIR%%/images/math/varnothing.png
@@ -1734,10 +1736,8 @@ bin/tex2lyx
 %%DATADIR%%/templates/iop-article.lyx
 %%DATADIR%%/templates/kluwer.lyx
 %%DATADIR%%/templates/koma-letter2.lyx
-%%DATADIR%%/templates/latex8.lyx
 %%DATADIR%%/templates/letter.lyx
 %%DATADIR%%/templates/lettre.lyx
-%%DATADIR%%/templates/revtex.lyx
 %%DATADIR%%/templates/revtex4.lyx
 %%DATADIR%%/templates/slides.lyx
 %%DATADIR%%/templates/svjour3.lyx