Update to 2.0.3

Feature safe:	yes

5 files changed, 15 insertions, 184 deletions

diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 9424b33c4805..68a439f8706b 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	lyx
 PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}
-PORTREVISION=	1
 CATEGORIES=	print editors
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
 		http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
@@ -26,7 +25,7 @@ LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost-libs \
 
 CONFLICTS=	lyx-1.[0-9]*
 MAJOR_VERSION=	2.0
-MINOR_VERSION=	2
+MINOR_VERSION=	3
 
 USE_XZ=		yes
 USE_GMAKE=	yes
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 16939ad8cab0..ca856f4ae556 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lyx-2.0.2.tar.xz) = e5eacacd200d4502808f59e244d380634dca421b2bc89a5c213b3faddadcbd18
-SIZE (lyx-2.0.2.tar.xz) = 10175756
+SHA256 (lyx-2.0.3.tar.xz) = 4e1c993754acfb14d5e0f2bd2521fb6686d08e0656ec6e5fde0406c285a05ac8
+SIZE (lyx-2.0.3.tar.xz) = 10265532
diff --git a/print/lyx/files/patch-configure b/print/lyx/files/patch-configure
index 7bb03559faf7..c61ed1323bab 100644
--- a/print/lyx/files/patch-configure
+++ b/print/lyx/files/patch-configure
@@ -1,12 +1,12 @@
 --- configure.orig	2011-09-12 19:17:15.000000000 -0300
 +++ configure	2011-09-12 19:17:40.000000000 -0300
-@@ -7307,73 +7317,56 @@
+@@ -7319,73 +7320,56 @@
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lyx_cv_with_included_boost" >&5
  $as_echo "$lyx_cv_with_included_boost" >&6; }
  	if test x$lyx_cv_with_included_boost != xyes ; then
 -		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lboost_signals" >&5
 -$as_echo_n "checking for main in -lboost_signals... " >&6; }
--if test "${ac_cv_lib_boost_signals_main+set}" = set; then :
+-if ${ac_cv_lib_boost_signals_main+:} false; then :
 -  $as_echo_n "(cached) " >&6
 -else
 -  ac_check_lib_save_LIBS=$LIBS
@@ -47,13 +47,13 @@
 -fi
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_signals_main" >&5
 -$as_echo "$ac_cv_lib_boost_signals_main" >&6; }
--if test "x$ac_cv_lib_boost_signals_main" = x""yes; then :
+-if test "x$ac_cv_lib_boost_signals_main" = xyes; then :
 -  lyx_boost_underscore=yes
 -fi
 -
 -		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lboost_signals-mt" >&5
 -$as_echo_n "checking for main in -lboost_signals-mt... " >&6; }
--if test "${ac_cv_lib_boost_signals_mt_main+set}" = set; then :
+-if ${ac_cv_lib_boost_signals_mt_main+:} false; then :
 -  $as_echo_n "(cached) " >&6
 -else
 -  ac_check_lib_save_LIBS=$LIBS
@@ -87,7 +87,7 @@
 -fi
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_boost_signals_mt_main" >&5
 -$as_echo "$ac_cv_lib_boost_signals_mt_main" >&6; }
--if test "x$ac_cv_lib_boost_signals_mt_main" = x""yes; then :
+-if test "x$ac_cv_lib_boost_signals_mt_main" = xyes; then :
 -  lyx_boost_underscore_mt=yes
 -fi
 +
diff --git a/print/lyx/files/patch-src__insets__InsetTabular.cpp b/print/lyx/files/patch-src__insets__InsetTabular.cpp
deleted file mode 100644
index 931002474ef8..000000000000
--- a/print/lyx/files/patch-src__insets__InsetTabular.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-Index: src/insets/InsetTabular.cpp
-===================================================================
---- src/insets/InsetTabular.cpp	(revision 39812)
-+++ src/insets/InsetTabular.cpp	(revision 39813)
-@@ -188,62 +188,6 @@
- };
- 
- 
--template <class T>
--string const write_attribute(string const & name, T const & t)
--{
--	string const s = tostr(t);
--	return s.empty() ? s : " " + name + "=\"" + s + "\"";
--}
--
--template <>
--string const write_attribute(string const & name, string const & t)
--{
--	return t.empty() ? t : " " + name + "=\"" + t + "\"";
--}
--
--
--template <>
--string const write_attribute(string const & name, docstring const & t)
--{
--	return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\"";
--}
--
--
--template <>
--string const write_attribute(string const & name, bool const & b)
--{
--	// we write only true attribute values so we remove a bit of the
--	// file format bloat for tabulars.
--	return b ? write_attribute(name, convert<string>(b)) : string();
--}
--
--
--template <>
--string const write_attribute(string const & name, int const & i)
--{
--	// we write only true attribute values so we remove a bit of the
--	// file format bloat for tabulars.
--	return i ? write_attribute(name, convert<string>(i)) : string();
--}
--
--
--template <>
--string const write_attribute(string const & name, Tabular::idx_type const & i)
--{
--	// we write only true attribute values so we remove a bit of the
--	// file format bloat for tabulars.
--	return i ? write_attribute(name, convert<string>(i)) : string();
--}
--
--
--template <>
--string const write_attribute(string const & name, Length const & value)
--{
--	// we write only the value if we really have one same reson as above.
--	return value.zero() ? string() : write_attribute(name, value.asString());
--}
--
--
- string const tostr(LyXAlignment const & num)
- {
- 	switch (num) {
-@@ -503,6 +447,61 @@
- 	}
- }
- 
-+template <class T>
-+string const write_attribute(string const & name, T const & t)
-+{
-+	string const s = tostr(t);
-+	return s.empty() ? s : " " + name + "=\"" + s + "\"";
-+}
-+
-+template <>
-+string const write_attribute(string const & name, string const & t)
-+{
-+	return t.empty() ? t : " " + name + "=\"" + t + "\"";
-+}
-+
-+
-+template <>
-+string const write_attribute(string const & name, docstring const & t)
-+{
-+	return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\"";
-+}
-+
-+
-+template <>
-+string const write_attribute(string const & name, bool const & b)
-+{
-+	// we write only true attribute values so we remove a bit of the
-+	// file format bloat for tabulars.
-+	return b ? write_attribute(name, convert<string>(b)) : string();
-+}
-+
-+
-+template <>
-+string const write_attribute(string const & name, int const & i)
-+{
-+	// we write only true attribute values so we remove a bit of the
-+	// file format bloat for tabulars.
-+	return i ? write_attribute(name, convert<string>(i)) : string();
-+}
-+
-+
-+template <>
-+string const write_attribute(string const & name, Tabular::idx_type const & i)
-+{
-+	// we write only true attribute values so we remove a bit of the
-+	// file format bloat for tabulars.
-+	return i ? write_attribute(name, convert<string>(i)) : string();
-+}
-+
-+
-+template <>
-+string const write_attribute(string const & name, Length const & value)
-+{
-+	// we write only the value if we really have one same reson as above.
-+	return value.zero() ? string() : write_attribute(name, value.asString());
-+}
-+
- } // namespace
- 
- 
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 0377fa36b2e2..ee27837451f4 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -20,6 +20,7 @@ bin/tex2lyx
 %%NLS%%share/locale/it/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/lyx.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/lyx.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/lyx.mo
@@ -54,8 +55,6 @@ share/icons/hicolor/48x48/apps/lyx.png
 %%DATADIR%%/chkconfig.ltx
 %%DATADIR%%/commands/default.def
 %%DATADIR%%/configure.py
-%%DATADIR%%/configure.pyc
-%%DATADIR%%/configure.pyo
 %%DATADIR%%/doc/Additional.lyx
 %%DATADIR%%/doc/Customization.lyx
 %%DATADIR%%/doc/DummyDocument1.lyx
@@ -345,6 +344,7 @@ share/icons/hicolor/48x48/apps/lyx.png
 %%DATADIR%%/examples/ja/splash.lyx
 %%DATADIR%%/examples/ja/xyfigure.png
 %%DATADIR%%/examples/ja/xypic.lyx
+%%DATADIR%%/examples/knitr.lyx
 %%DATADIR%%/examples/landslide.lyx
 %%DATADIR%%/examples/lilypond.lyx
 %%DATADIR%%/examples/linguistics.lyx
@@ -671,6 +671,7 @@ share/icons/hicolor/48x48/apps/lyx.png
 %%DATADIR%%/images/layout_Section.png
 %%DATADIR%%/images/lyx-quit.png
 %%DATADIR%%/images/lyx.png
+%%DATADIR%%/images/lyx.svg
 %%DATADIR%%/images/marginalnote-insert.png
 %%DATADIR%%/images/master-buffer-update.png
 %%DATADIR%%/images/master-buffer-view.png
@@ -1470,6 +1471,7 @@ share/icons/hicolor/48x48/apps/lyx.png
 %%DATADIR%%/layouts/iopart.layout
 %%DATADIR%%/layouts/isprs.layout
 %%DATADIR%%/layouts/jarticle.layout
+%%DATADIR%%/layouts/jasatex.layout
 %%DATADIR%%/layouts/jbook.layout
 %%DATADIR%%/layouts/jgrga.layout
 %%DATADIR%%/layouts/jreport.layout
@@ -1477,6 +1479,7 @@ share/icons/hicolor/48x48/apps/lyx.png
 %%DATADIR%%/layouts/jsbook.layout
 %%DATADIR%%/layouts/jss.layout
 %%DATADIR%%/layouts/kluwer.layout
+%%DATADIR%%/layouts/knitr.module
 %%DATADIR%%/layouts/latex8.layout
 %%DATADIR%%/layouts/letter.layout
 %%DATADIR%%/layouts/lettre.layout
@@ -1649,81 +1652,39 @@ share/icons/hicolor/48x48/apps/lyx.png
 %%DATADIR%%/lyx2lyx/unicode_symbols.pyc
 %%DATADIR%%/lyx2lyx/unicode_symbols.pyo
 %%DATADIR%%/scripts/TeXFiles.py
-%%DATADIR%%/scripts/TeXFiles.pyc
-%%DATADIR%%/scripts/TeXFiles.pyo
 %%DATADIR%%/scripts/bash_completion
 %%DATADIR%%/scripts/clean_dvi.py
-%%DATADIR%%/scripts/clean_dvi.pyc
-%%DATADIR%%/scripts/clean_dvi.pyo
 %%DATADIR%%/scripts/convertDefault.py
-%%DATADIR%%/scripts/convertDefault.pyc
-%%DATADIR%%/scripts/convertDefault.pyo
 %%DATADIR%%/scripts/csv2lyx.py
-%%DATADIR%%/scripts/csv2lyx.pyc
-%%DATADIR%%/scripts/csv2lyx.pyo
 %%DATADIR%%/scripts/date.py
-%%DATADIR%%/scripts/date.pyc
-%%DATADIR%%/scripts/date.pyo
 %%DATADIR%%/scripts/ext_copy.py
-%%DATADIR%%/scripts/ext_copy.pyc
-%%DATADIR%%/scripts/ext_copy.pyo
 %%DATADIR%%/scripts/fen2ascii.py
-%%DATADIR%%/scripts/fen2ascii.pyc
-%%DATADIR%%/scripts/fen2ascii.pyo
 %%DATADIR%%/scripts/fig2pdftex.py
-%%DATADIR%%/scripts/fig2pdftex.pyc
-%%DATADIR%%/scripts/fig2pdftex.pyo
 %%DATADIR%%/scripts/fig2pstex.py
-%%DATADIR%%/scripts/fig2pstex.pyc
-%%DATADIR%%/scripts/fig2pstex.pyo
 %%DATADIR%%/scripts/fig_copy.py
-%%DATADIR%%/scripts/fig_copy.pyc
-%%DATADIR%%/scripts/fig_copy.pyo
 %%DATADIR%%/scripts/include_bib.py
-%%DATADIR%%/scripts/include_bib.pyc
-%%DATADIR%%/scripts/include_bib.pyo
 %%DATADIR%%/scripts/layout2layout.py
-%%DATADIR%%/scripts/layout2layout.pyc
-%%DATADIR%%/scripts/layout2layout.pyo
 %%DATADIR%%/scripts/legacy_lyxpreview2ppm.py
-%%DATADIR%%/scripts/legacy_lyxpreview2ppm.pyc
-%%DATADIR%%/scripts/legacy_lyxpreview2ppm.pyo
 %%DATADIR%%/scripts/listerrors
+%%DATADIR%%/scripts/lyxknitr.R
 %%DATADIR%%/scripts/lyxpak.py
-%%DATADIR%%/scripts/lyxpak.pyc
-%%DATADIR%%/scripts/lyxpak.pyo
 %%DATADIR%%/scripts/lyxpreview-lytex2bitmap.py
-%%DATADIR%%/scripts/lyxpreview-lytex2bitmap.pyc
-%%DATADIR%%/scripts/lyxpreview-lytex2bitmap.pyo
 %%DATADIR%%/scripts/lyxpreview-platex2bitmap.py
-%%DATADIR%%/scripts/lyxpreview-platex2bitmap.pyc
-%%DATADIR%%/scripts/lyxpreview-platex2bitmap.pyo
 %%DATADIR%%/scripts/lyxpreview2bitmap.py
-%%DATADIR%%/scripts/lyxpreview2bitmap.pyc
-%%DATADIR%%/scripts/lyxpreview2bitmap.pyo
 %%DATADIR%%/scripts/lyxpreview_tools.py
-%%DATADIR%%/scripts/lyxpreview_tools.pyc
-%%DATADIR%%/scripts/lyxpreview_tools.pyo
 %%DATADIR%%/scripts/lyxstangle.R
 %%DATADIR%%/scripts/lyxsweave.R
 %%DATADIR%%/scripts/prefs2prefs.py
-%%DATADIR%%/scripts/prefs2prefs.pyc
-%%DATADIR%%/scripts/prefs2prefs.pyo
 %%DATADIR%%/scripts/prefs2prefs_lfuns.py
-%%DATADIR%%/scripts/prefs2prefs_lfuns.pyc
-%%DATADIR%%/scripts/prefs2prefs_lfuns.pyo
 %%DATADIR%%/scripts/prefs2prefs_prefs.py
-%%DATADIR%%/scripts/prefs2prefs_prefs.pyc
-%%DATADIR%%/scripts/prefs2prefs_prefs.pyo
 %%DATADIR%%/scripts/tex_copy.py
-%%DATADIR%%/scripts/tex_copy.pyc
-%%DATADIR%%/scripts/tex_copy.pyo
 %%DATADIR%%/symbols
 %%DATADIR%%/syntax.default
 %%DATADIR%%/templates/ACM-siggraph.lyx
 %%DATADIR%%/templates/ACM-sigplan.lyx
 %%DATADIR%%/templates/AEA.lyx
 %%DATADIR%%/templates/IEEEtran.lyx
+%%DATADIR%%/templates/JASA.lyx
 %%DATADIR%%/templates/JSS-article.lyx
 %%DATADIR%%/templates/README.new_templates
 %%DATADIR%%/templates/aa.lyx