50 files changed, 950 insertions, 1440 deletions

diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 08be942e5e8b..d042c47f05ed 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -6,47 +6,58 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.4
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
-DISTNAME=	lyx-1.1.6
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
-		patch-1.1.6fix4.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		latex:${PORTSDIR}/print/teTeX
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
+		forms.1:${PORTSDIR}/x11-toolkits/xforms
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+.if defined(WITH_ASPELL)
+LIB_DEPENDS+= aspell.11:${PORTSDIR}/textproc/aspell
+CONFIGURE_ARGS+=--with-pspell
+.endif
+
 .if defined(WITH_ISPELL)
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
-LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
-		intl.2:${PORTSDIR}/devel/gettext
+
+pre-everything::
+.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
+	#
+	# If you want to compile with Aspell/Pspell or Ispell support,
+	# hit Ctrl-C right now and use
+	#	"make WITH_ASPELL=yes"
+	# or
+	#	"make WITH_ISPELL=yes"
+	#
+.endif
 
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 USE_XPM=	yes
-USE_NEWGCC=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
+USE_AUTOMAKE_VER=15
+AUTOMAKE=	${WRKSRC}/autogen.sh
+AUTOCONF=	${TRUE}
 CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
-		--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
+		--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
+		${LOCALBASE}/include"
+CONFIGURE_ENV+=	LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
 MAN1=		lyx.1 reLyX.1
 
-.if !defined(WITH_ISPELL)
-pre-fetch:
-	@${ECHO_MSG} "If you want this port built with spell checker support, use"
-	@${ECHO_MSG} "make WITH_ISPELL=yes"
-.endif
-
 post-patch:
-	(cd ${WRKSRC}; ${TOUCH} Makefile.in */Makefile.in src/config.h.in)
-	(cd ${WRKSRC}/lib/doc; ${RM} -f *.orig)
+	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|-lxforms|-lforms|g' \
+		-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
+		-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx-devel/distinfo b/print/lyx-devel/distinfo
index acc6538b7564..0495ced219ad 100644
--- a/print/lyx-devel/distinfo
+++ b/print/lyx-devel/distinfo
@@ -1,5 +1 @@
-MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
-MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
-MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
-MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
-MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
+MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
diff --git a/print/lyx-devel/files/patch-aa b/print/lyx-devel/files/patch-aa
deleted file mode 100644
index af9207168a48..000000000000
--- a/print/lyx-devel/files/patch-aa
+++ /dev/null
@@ -1,216 +0,0 @@
---- src/LyXView.C.orig	Thu Jul  4 18:26:33 2002
-+++ src/LyXView.C	Thu Jul  4 18:28:28 2002
-@@ -19,7 +19,7 @@
- 
- #include "LyXView.h"
- #include "lyx_main.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "minibuffer.h"
-@@ -214,7 +214,7 @@
- {
- 	fl_show_form(form_, place, border, title.c_str());
- 	minibuffer->Init();
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	InitLyXLookup(fl_get_display(), form_->window);
- #endif
- }
---- src/WorkArea.C.orig2	Thu Jul  4 18:33:22 2002
-+++ src/WorkArea.C	Thu Jul  4 18:36:02 2002
-@@ -24,7 +24,7 @@
- #include "LyXView.h"
- #include "lyxfunc.h"
- 
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- 
-@@ -323,7 +323,7 @@
- 				      ev->xbutton.y - ob->y,
- 				      ev->xbutton.button);
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_MOUSE:
- #else
- 	case FL_DRAG:
-@@ -339,7 +339,7 @@
- 					     ev->xbutton.state);
- 		}
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_KEYBOARD:
- #else
- 	case FL_KEYPRESS:
-@@ -350,7 +350,7 @@
- 		KeySym keysym = 0;
- 		char dummy[1];
- 		XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 		// XForms < 0.89.5 does not have compose support
- 		// so we are using our own compose support
- 		LyXLookupString(ev, dummy, 1, &keysym);
-@@ -369,7 +369,7 @@
- 			       << keysym << "]" << endl;
- 		}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 		if (keysym == NoSymbol) {
- 			lyxerr[Debug::KEY]
- 				<< "Empty kdb action (probably composing)"
-@@ -446,7 +446,7 @@
- 	}
- 	break;
- 
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 	case FL_KEYRELEASE:
- 		lyxerr << "Workarea event: KEYRELEASE" << endl;
- 		break;
---- src/lyx_gui.C.orig2	Thu Jul  4 18:36:45 2002
-+++ src/lyx_gui.C	Thu Jul  4 18:39:42 2002
-@@ -36,7 +36,7 @@
- #include "lyxrc.h"
- #include "gettext.h"
- #include "lyx_gui_misc.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "bufferlist.h"
-@@ -171,7 +171,7 @@
- 	delete lyxserver;
- 	lyxserver = 0;
- 	delete lyxViews;
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	CloseLyXLookup();
- #endif
- }
---- src/insets/figinset.C.orig2	Thu Jul  4 18:40:17 2002
-+++ src/insets/figinset.C	Thu Jul  4 18:42:08 2002
-@@ -933,7 +933,7 @@
- 					    tmpfig->inset->form->OkBtn);
- 			fl_hide_form(tmpfig->inset->form->Figure);
- 		}
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- #else
- 		fl_free_form(tmpfig->inset->form->Figure);
-@@ -1769,7 +1769,7 @@
- 			if (arg == 8) {
- 				fl_set_focus_object(form->Figure, form->OkBtn);
- 				fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 				// CHECK Reactivate this free_form calls
- #else
- 				fl_free_form(form->Figure);
-@@ -1786,7 +1786,7 @@
- 	case 9:				/* cancel = restore and close */
- 		fl_set_focus_object(form->Figure, form->OkBtn);
- 		fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- 		// Jug, is this still a problem?
- #else
---- src/frontends/kde/GUIRunTime.C.orig	Thu Jul  4 18:43:25 2002
-+++ src/frontends/kde/GUIRunTime.C	Thu Jul  4 18:44:57 2002
-@@ -26,7 +26,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/kde/GUIRunTime.C.
---- src/frontends/gnome/GUIRunTime.C.orig	Thu Jul  4 18:46:08 2002
-+++ src/frontends/gnome/GUIRunTime.C	Thu Jul  4 18:47:23 2002
-@@ -25,7 +25,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/gnome/GUIRunTime.C.
---- src/frontends/xforms/GUIRunTime.C.orig	Thu Jul  4 18:47:48 2002
-+++ src/frontends/xforms/GUIRunTime.C	Thu Jul  4 18:48:18 2002
-@@ -19,7 +19,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
---- src/frontends/xforms/Menubar_pimpl.C.orig	Thu Jul  4 18:49:05 2002
-+++ src/frontends/xforms/Menubar_pimpl.C	Thu Jul  4 18:50:18 2002
-@@ -219,7 +219,7 @@
- static inline
- string const fixlabel(string const & str)
- {
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	return subst(str, '%', '?');
- #else
- 	return subst(str, "%", "%%");
---- src/frontends/xforms/Toolbar_pimpl.C.orig	Thu Jul  4 18:50:40 2002
-+++ src/frontends/xforms/Toolbar_pimpl.C	Thu Jul  4 18:52:37 2002
-@@ -84,13 +84,13 @@
- 	: owner(o), sxpos(x), sypos(y)
- {
- 	combox = 0;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	bubble_timer = 0;
- #endif
- }
- 
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- // timer-cb for bubble-help (Matthias)
- static 
- void BubbleTimerCB(FL_OBJECT *, long data)
-@@ -339,7 +339,7 @@
- 		fl_addto_form(owner->getForm());
- 	}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	// add the time if it don't exist
- 	if (bubble_timer == 0)
- 		bubble_timer = fl_add_timer(FL_HIDDEN_TIMER,
-@@ -383,7 +383,7 @@
- 			fl_set_pixmapbutton_focus_outline(obj, 0);
- 
- 			// Set the tooltip
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 			string help = _(lyxaction.helpText(item->action));
- 			fl_set_object_helper(obj, help.c_str());	
- #else
---- src/frontends/xforms/Toolbar_pimpl.h.orig	Thu Jul  4 18:52:55 2002
-+++ src/frontends/xforms/Toolbar_pimpl.h	Thu Jul  4 18:53:40 2002
-@@ -93,7 +93,7 @@
- 	ToolbarList toollist;
- 	///
- 	LyXView * owner;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	///
- 	FL_OBJECT * bubble_timer;
- #endif
diff --git a/print/lyx-devel/files/patch-ab b/print/lyx-devel/files/patch-ab
deleted file mode 100644
index 3e3ecce8853e..000000000000
--- a/print/lyx-devel/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Mon Jan 17 21:04:28 2000
-+++ po/Makefile.in.in	Tue May  2 21:53:41 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/print/lyx-devel/files/patch-autogen.sh b/print/lyx-devel/files/patch-autogen.sh
new file mode 100644
index 000000000000..9358d3a465e0
--- /dev/null
+++ b/print/lyx-devel/files/patch-autogen.sh
@@ -0,0 +1,32 @@
+--- autogen.sh	Thu Apr 18 22:11:28 2002
++++ autogen.sh	Fri Jun 28 21:55:35 2002
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+ ACLOCAL=aclocal
+-AUTOHEADER=autoheader
++AUTOHEADER=autoheader213
+ AUTOMAKE="automake -a -c --foreign"
+-AUTOCONF=autoconf
++AUTOCONF=autoconf213
+ GNUM4=
+ 
+ ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
+@@ -31,7 +31,7 @@
+ echo "done."
+ 
+ # Generate the Makefiles and configure files
+-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
++if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building macros..."
+ 	for dir in . lib/reLyX sigc++ ; do
+ 	    echo "        $dir"
+@@ -43,7 +43,7 @@
+ 	exit
+ fi
+ 
+-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
++if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building config header template..."
+ 	for dir in . sigc++ ; do
+ 	    echo "        $dir"
diff --git a/print/lyx-devel/files/patch-config::ltmain.sh b/print/lyx-devel/files/patch-config::ltmain.sh
new file mode 100644
index 000000000000..29ed1a55df53
--- /dev/null
+++ b/print/lyx-devel/files/patch-config::ltmain.sh
@@ -0,0 +1,28 @@
+--- config/ltmain.sh	Thu Jan 24 06:28:31 2002
++++ config/ltmain.sh	Fri Jun 28 20:15:12 2002
+@@ -1043,14 +1043,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
diff --git a/print/lyx-devel/files/patch-sp_spell b/print/lyx-devel/files/patch-sp_spell
new file mode 100644
index 000000000000..9ec68f198e44
--- /dev/null
+++ b/print/lyx-devel/files/patch-sp_spell
@@ -0,0 +1,7 @@
+--- src/sp_spell.C	Thu Mar 21 12:25:20 2002
++++ src/sp_spell.C	Wed Jul 31 18:49:57 2002
+@@ -371,3 +371,3 @@
+ 		retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
+-				SELECT_TYPE_ARG234 (&infds),
++				&infds,
+ 				0,
diff --git a/print/lyx-devel/files/patch-xformsversion b/print/lyx-devel/files/patch-xformsversion
new file mode 100644
index 000000000000..29db709d6816
--- /dev/null
+++ b/print/lyx-devel/files/patch-xformsversion
@@ -0,0 +1,13 @@
+--- src/frontends/xforms/GUIRunTime.C	Thu Mar 21 16:18:03 2002
++++ src/frontends/xforms/GUIRunTime.C	Wed Jul 31 18:39:04 2002
+@@ -26,10 +26,2 @@
+ 
+-// I keep these here so that it will be processed as early in
+-// the compilation process as possible.
+-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
+-#error LyX will not compile with this version of XForms.\
+-       Please get version 0.89.\
+-       If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
+-#endif
+-
+ 
diff --git a/print/lyx-devel/files/patch-xpm b/print/lyx-devel/files/patch-xpm
new file mode 100644
index 000000000000..4ca930ba2341
--- /dev/null
+++ b/print/lyx-devel/files/patch-xpm
@@ -0,0 +1,7 @@
+--- src/graphics/GraphicsImageXPM.h	Thu Mar 21 12:27:08 2002
++++ src/graphics/GraphicsImageXPM.h	Wed Jul 31 18:08:13 2002
+@@ -17,3 +17,3 @@
+ #include "GraphicsImage.h"
+-#include XPM_H_LOCATION
++#include <X11/xpm.h>
+ #include "support/smart_ptr.h"
diff --git a/print/lyx-devel/pkg-plist b/print/lyx-devel/pkg-plist
index 98d7e0895750..c813e083c349 100644
--- a/print/lyx-devel/pkg-plist
+++ b/print/lyx-devel/pkg-plist
@@ -1,7 +1,7 @@
-bin/listerrors
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
+share/locale/bg/LC_MESSAGES/lyx.mo
 share/locale/ca/LC_MESSAGES/lyx.mo
 share/locale/cs/LC_MESSAGES/lyx.mo
 share/locale/da/LC_MESSAGES/lyx.mo
@@ -19,6 +19,7 @@ share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
 share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
@@ -29,9 +30,8 @@ share/lyx/bind/cua.bind
 share/lyx/bind/de_menus.bind
 share/lyx/bind/emacs.bind
 share/lyx/bind/fi_menus.bind
-share/lyx/bind/fr_menus.bind
 share/lyx/bind/hollywood.bind
-share/lyx/bind/hu_menus.bind
+share/lyx/bind/latinkeys.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
 share/lyx/bind/pt_menus.bind
@@ -42,11 +42,9 @@ share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
 share/lyx/configure
 share/lyx/configure.cmd
-share/lyx/doc/BUGS.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DocStyle.lyx
 share/lyx/doc/Extended.lyx
-share/lyx/doc/ExternalMaterial.lyx
 share/lyx/doc/FAQ.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LaTeXConfig.lyx
@@ -60,7 +58,6 @@ share/lyx/doc/cs_TOC.lyx
 share/lyx/doc/cs_Tutorial.lyx
 share/lyx/doc/da_Intro.lyx
 share/lyx/doc/da_TOC.lyx
-share/lyx/doc/de_BUGS.lyx
 share/lyx/doc/de_Customization.lyx
 share/lyx/doc/de_Extended.lyx
 share/lyx/doc/de_FAQ.lyx
@@ -75,10 +72,8 @@ share/lyx/doc/escher-lsd.eps
 share/lyx/doc/eu_Intro.lyx
 share/lyx/doc/eu_TOC.lyx
 share/lyx/doc/eu_Tutorial.lyx
-share/lyx/doc/fr_BUGS.lyx
 share/lyx/doc/fr_Customization.lyx
 share/lyx/doc/fr_Extended.lyx
-share/lyx/doc/fr_ExternalMaterial.lyx
 share/lyx/doc/fr_FAQ.lyx
 share/lyx/doc/fr_Intro.lyx
 share/lyx/doc/fr_TOC.lyx
@@ -104,6 +99,13 @@ share/lyx/doc/pt_TOC.lyx
 share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
+share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_Intro.lyx
+share/lyx/doc/ru_TOC.lyx
+share/lyx/doc/ru_Tutorial.lyx
+share/lyx/doc/sk_TOC.lyx
+share/lyx/doc/sk_Tutorial.lyx
+share/lyx/doc/sk_UserGuide.lyx
 share/lyx/doc/sl_Intro.lyx
 share/lyx/doc/sl_TOC.lyx
 share/lyx/doc/sl_Tutorial.lyx
@@ -114,7 +116,6 @@ share/lyx/encodings
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
 share/lyx/examples/Literate.lyx
-share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Minipage.lyx
 share/lyx/examples/TableExamples.lyx
 share/lyx/examples/aa_sample.lyx
@@ -122,6 +123,9 @@ share/lyx/examples/aas_sample.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
 share/lyx/examples/ca_splash.lyx
+share/lyx/examples/chess-article.lyx
+share/lyx/examples/chessgame.lyx
+share/lyx/examples/currency.lyx
 share/lyx/examples/cv.lyx
 share/lyx/examples/da_splash.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
@@ -138,7 +142,6 @@ share/lyx/examples/eu_splash.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/fr_AlignementDecimal.lyx
-share/lyx/examples/fr_EtiquetteMath.lyx
 share/lyx/examples/fr_ExemplesTableaux.lyx
 share/lyx/examples/fr_ListesPuces.lyx
 share/lyx/examples/fr_Minipage.lyx
@@ -147,11 +150,16 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_splash.lyx
 share/lyx/examples/hu_splash.lyx
+share/lyx/examples/iecc05.fen
+share/lyx/examples/iecc07.fen
+share/lyx/examples/iecc12.fen
 share/lyx/examples/it_ItemizeBullets.lyx
 share/lyx/examples/it_splash.lyx
 share/lyx/examples/landslide.lyx
+share/lyx/examples/linuxdoc_manpage.lyx
+share/lyx/examples/listerrors.lyx
+share/lyx/examples/mathed.lyx
 share/lyx/examples/multicol.lyx
-share/lyx/examples/nl_MathLabeling.lyx
 share/lyx/examples/nl_multicol.lyx
 share/lyx/examples/nl_opsommingstekens.lyx
 share/lyx/examples/nl_splash.lyx
@@ -167,12 +175,13 @@ share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
 share/lyx/examples/splash.lyx
 share/lyx/external_templates
+share/lyx/help/Bibtex.hlp
+share/lyx/help/Texinfo.hlp
 share/lyx/images/amssymb.xpm
 share/lyx/images/banner.xpm
 share/lyx/images/buffer-close.xpm
 share/lyx/images/buffer-export_ascii.xpm
 share/lyx/images/buffer-export_latex.xpm
-share/lyx/images/buffer-open.xpm
 share/lyx/images/buffer-print.xpm
 share/lyx/images/buffer-update_dvi.xpm
 share/lyx/images/buffer-update_ps.xpm
@@ -180,17 +189,23 @@ share/lyx/images/buffer-view_dvi.xpm
 share/lyx/images/buffer-view_ps.xpm
 share/lyx/images/buffer-write.xpm
 share/lyx/images/build-program.xpm
+share/lyx/images/citation-insert.xpm
 share/lyx/images/copy.xpm
 share/lyx/images/cut.xpm
-share/lyx/images/depth-next.xpm
+share/lyx/images/depth-decrement.xpm
+share/lyx/images/depth-increment.xpm
 share/lyx/images/dialog-tabular-insert.xpm
-share/lyx/images/figure-insert.xpm
+share/lyx/images/ert-insert.xpm
+share/lyx/images/file-open.xpm
 share/lyx/images/font-bold.xpm
 share/lyx/images/font-emph.xpm
 share/lyx/images/font-free.xpm
 share/lyx/images/font-noun.xpm
 share/lyx/images/font-sans.xpm
 share/lyx/images/footnote-insert.xpm
+share/lyx/images/graphics-insert.xpm
+share/lyx/images/index-insert.xpm
+share/lyx/images/label-insert.xpm
 share/lyx/images/layout.xpm
 share/lyx/images/layout_LaTeX.xpm
 share/lyx/images/layout_LyX-Code.xpm
@@ -199,8 +214,8 @@ share/lyx/images/layout_Section.xpm
 share/lyx/images/lyx-quit.xpm
 share/lyx/images/lyx.xpm
 share/lyx/images/marginalnote-insert.xpm
-share/lyx/images/marginpar-insert.xpm
 share/lyx/images/math-mode.xpm
+share/lyx/images/math-panel.xpm
 share/lyx/images/melt.xpm
 share/lyx/images/paste.xpm
 share/lyx/images/psnfss1.xpm
@@ -210,12 +225,12 @@ share/lyx/images/psnfss4.xpm
 share/lyx/images/redo.xpm
 share/lyx/images/standard.xpm
 share/lyx/images/tabular-insert.xpm
-share/lyx/images/tex-mode.xpm
 share/lyx/images/undo.xpm
 share/lyx/images/unknown.xpm
 share/lyx/kbd/american-2.kmap
 share/lyx/kbd/american.kmap
 share/lyx/kbd/arabic.kmap
+share/lyx/kbd/bg-bds-1251.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech-prg.kmap
@@ -235,6 +250,7 @@ share/lyx/kbd/iso8859-3.cdef
 share/lyx/kbd/iso8859-4.cdef
 share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/iso8859-8.cdef
+share/lyx/kbd/iso8859-9.cdef
 share/lyx/kbd/koi8-r.kmap
 share/lyx/kbd/koi8-u.kmap
 share/lyx/kbd/latvian.kmap
@@ -274,6 +290,7 @@ share/lyx/layouts/apa.layout
 share/lyx/layouts/article.layout
 share/lyx/layouts/book.layout
 share/lyx/layouts/broadway.layout
+share/lyx/layouts/chess.layout
 share/lyx/layouts/cv.layout
 share/lyx/layouts/db_lyxmacros.inc
 share/lyx/layouts/db_stdclass.inc
@@ -288,8 +305,8 @@ share/lyx/layouts/docbook-book.layout
 share/lyx/layouts/docbook-chapter.layout
 share/lyx/layouts/docbook-section.layout
 share/lyx/layouts/docbook.layout
+share/lyx/layouts/dtk.layout
 share/lyx/layouts/egs.layout
-share/lyx/layouts/ejour2.layout
 share/lyx/layouts/entcs.layout
 share/lyx/layouts/extarticle.layout
 share/lyx/layouts/extbook.layout
@@ -311,6 +328,7 @@ share/lyx/layouts/literate-book.layout
 share/lyx/layouts/literate-report.layout
 share/lyx/layouts/literate-scrap.inc
 share/lyx/layouts/llncs.layout
+share/lyx/layouts/ltugboat.layout
 share/lyx/layouts/lyxmacros.inc
 share/lyx/layouts/manpage.layout
 share/lyx/layouts/obsolete.inc
@@ -327,6 +345,7 @@ share/lyx/layouts/scrreprt.layout
 share/lyx/layouts/seminar.layout
 share/lyx/layouts/siamltex.layout
 share/lyx/layouts/slides.layout
+share/lyx/layouts/spie.layout
 share/lyx/layouts/stdclass.inc
 share/lyx/layouts/stdlayouts.inc
 share/lyx/layouts/stdletter.inc
@@ -337,6 +356,7 @@ share/lyx/layouts/stdstruct.inc
 share/lyx/layouts/stdtitle.inc
 share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
+share/lyx/layouts/svprobth.layout
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst
@@ -355,17 +375,20 @@ share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
-share/lyx/scripts/fen2latex.py
+share/lyx/scripts/TeXFiles.sh
+share/lyx/scripts/fen2ascii.py
 share/lyx/scripts/fig2pstex.py
 share/lyx/scripts/general_command_wrapper.py
+share/lyx/scripts/listerrors
 share/lyx/scripts/pic2ascii.py
 share/lyx/scripts/pic2png_eps.py
 share/lyx/scripts/pic2png_eps.sh
+share/lyx/symbols
 share/lyx/templates/IEEEtran.lyx
 share/lyx/templates/aa.lyx
 share/lyx/templates/aastex.lyx
 share/lyx/templates/dinbrief.lyx
-share/lyx/templates/docbook_template.lyx
+share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
@@ -373,30 +396,42 @@ share/lyx/templates/iletter.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
-share/lyx/templates/linuxdoctemplate.lyx
+share/lyx/templates/linuxdoc_article.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/revtex4.lyx
 share/lyx/templates/slides.lyx
 share/lyx/tex/broadway.cls
 share/lyx/tex/cv.cls
-share/lyx/tex/ejour2.cls
 share/lyx/tex/hollywood.cls
 share/lyx/tex/iletter.cls
+share/lyx/tex/lyxchess.sty
+share/lyx/tex/lyxskak.sty
 share/lyx/tex/revtex.cls
 share/lyx/textclass.lst
 share/lyx/ui/default.ui
 share/lyx/ui/old-default.ui
-@dirrm share/lyx/bind
-@dirrm share/lyx/clipart
-@dirrm share/lyx/doc
-@dirrm share/lyx/examples
-@dirrm share/lyx/images
-@dirrm share/lyx/kbd
-@dirrm share/lyx/layouts
+share/lyx/xfonts/cmex10.pfb
+share/lyx/xfonts/cmmi10.pfb
+share/lyx/xfonts/cmr10.pfb
+share/lyx/xfonts/cmsy10.pfb
+share/lyx/xfonts/eufm10.pfb
+share/lyx/xfonts/fonts.dir
+share/lyx/xfonts/fonts.scale
+share/lyx/xfonts/msam10.pfb
+share/lyx/xfonts/msbm10.pfb
+@dirrm share/lyx/xfonts
+@dirrm share/lyx/ui
+@dirrm share/lyx/tex
+@dirrm share/lyx/templates
+@dirrm share/lyx/scripts
 @dirrm share/lyx/reLyX/Text
 @dirrm share/lyx/reLyX
-@dirrm share/lyx/scripts
-@dirrm share/lyx/templates
-@dirrm share/lyx/tex
-@dirrm share/lyx/ui
+@dirrm share/lyx/layouts
+@dirrm share/lyx/kbd
+@dirrm share/lyx/images
+@dirrm share/lyx/help
+@dirrm share/lyx/examples
+@dirrm share/lyx/doc
+@dirrm share/lyx/clipart
+@dirrm share/lyx/bind
 @dirrm share/lyx
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 08be942e5e8b..d042c47f05ed 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -6,47 +6,58 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.4
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
-DISTNAME=	lyx-1.1.6
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
-		patch-1.1.6fix4.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		latex:${PORTSDIR}/print/teTeX
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
+		forms.1:${PORTSDIR}/x11-toolkits/xforms
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+.if defined(WITH_ASPELL)
+LIB_DEPENDS+= aspell.11:${PORTSDIR}/textproc/aspell
+CONFIGURE_ARGS+=--with-pspell
+.endif
+
 .if defined(WITH_ISPELL)
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
-LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
-		intl.2:${PORTSDIR}/devel/gettext
+
+pre-everything::
+.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
+	#
+	# If you want to compile with Aspell/Pspell or Ispell support,
+	# hit Ctrl-C right now and use
+	#	"make WITH_ASPELL=yes"
+	# or
+	#	"make WITH_ISPELL=yes"
+	#
+.endif
 
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 USE_XPM=	yes
-USE_NEWGCC=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
+USE_AUTOMAKE_VER=15
+AUTOMAKE=	${WRKSRC}/autogen.sh
+AUTOCONF=	${TRUE}
 CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
-		--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
+		--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
+		${LOCALBASE}/include"
+CONFIGURE_ENV+=	LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
 MAN1=		lyx.1 reLyX.1
 
-.if !defined(WITH_ISPELL)
-pre-fetch:
-	@${ECHO_MSG} "If you want this port built with spell checker support, use"
-	@${ECHO_MSG} "make WITH_ISPELL=yes"
-.endif
-
 post-patch:
-	(cd ${WRKSRC}; ${TOUCH} Makefile.in */Makefile.in src/config.h.in)
-	(cd ${WRKSRC}/lib/doc; ${RM} -f *.orig)
+	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|-lxforms|-lforms|g' \
+		-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
+		-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index acc6538b7564..0495ced219ad 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,5 +1 @@
-MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
-MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
-MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
-MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
-MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
+MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
diff --git a/print/lyx/files/patch-aa b/print/lyx/files/patch-aa
deleted file mode 100644
index af9207168a48..000000000000
--- a/print/lyx/files/patch-aa
+++ /dev/null
@@ -1,216 +0,0 @@
---- src/LyXView.C.orig	Thu Jul  4 18:26:33 2002
-+++ src/LyXView.C	Thu Jul  4 18:28:28 2002
-@@ -19,7 +19,7 @@
- 
- #include "LyXView.h"
- #include "lyx_main.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "minibuffer.h"
-@@ -214,7 +214,7 @@
- {
- 	fl_show_form(form_, place, border, title.c_str());
- 	minibuffer->Init();
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	InitLyXLookup(fl_get_display(), form_->window);
- #endif
- }
---- src/WorkArea.C.orig2	Thu Jul  4 18:33:22 2002
-+++ src/WorkArea.C	Thu Jul  4 18:36:02 2002
-@@ -24,7 +24,7 @@
- #include "LyXView.h"
- #include "lyxfunc.h"
- 
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- 
-@@ -323,7 +323,7 @@
- 				      ev->xbutton.y - ob->y,
- 				      ev->xbutton.button);
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_MOUSE:
- #else
- 	case FL_DRAG:
-@@ -339,7 +339,7 @@
- 					     ev->xbutton.state);
- 		}
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_KEYBOARD:
- #else
- 	case FL_KEYPRESS:
-@@ -350,7 +350,7 @@
- 		KeySym keysym = 0;
- 		char dummy[1];
- 		XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 		// XForms < 0.89.5 does not have compose support
- 		// so we are using our own compose support
- 		LyXLookupString(ev, dummy, 1, &keysym);
-@@ -369,7 +369,7 @@
- 			       << keysym << "]" << endl;
- 		}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 		if (keysym == NoSymbol) {
- 			lyxerr[Debug::KEY]
- 				<< "Empty kdb action (probably composing)"
-@@ -446,7 +446,7 @@
- 	}
- 	break;
- 
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 	case FL_KEYRELEASE:
- 		lyxerr << "Workarea event: KEYRELEASE" << endl;
- 		break;
---- src/lyx_gui.C.orig2	Thu Jul  4 18:36:45 2002
-+++ src/lyx_gui.C	Thu Jul  4 18:39:42 2002
-@@ -36,7 +36,7 @@
- #include "lyxrc.h"
- #include "gettext.h"
- #include "lyx_gui_misc.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "bufferlist.h"
-@@ -171,7 +171,7 @@
- 	delete lyxserver;
- 	lyxserver = 0;
- 	delete lyxViews;
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	CloseLyXLookup();
- #endif
- }
---- src/insets/figinset.C.orig2	Thu Jul  4 18:40:17 2002
-+++ src/insets/figinset.C	Thu Jul  4 18:42:08 2002
-@@ -933,7 +933,7 @@
- 					    tmpfig->inset->form->OkBtn);
- 			fl_hide_form(tmpfig->inset->form->Figure);
- 		}
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- #else
- 		fl_free_form(tmpfig->inset->form->Figure);
-@@ -1769,7 +1769,7 @@
- 			if (arg == 8) {
- 				fl_set_focus_object(form->Figure, form->OkBtn);
- 				fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 				// CHECK Reactivate this free_form calls
- #else
- 				fl_free_form(form->Figure);
-@@ -1786,7 +1786,7 @@
- 	case 9:				/* cancel = restore and close */
- 		fl_set_focus_object(form->Figure, form->OkBtn);
- 		fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- 		// Jug, is this still a problem?
- #else
---- src/frontends/kde/GUIRunTime.C.orig	Thu Jul  4 18:43:25 2002
-+++ src/frontends/kde/GUIRunTime.C	Thu Jul  4 18:44:57 2002
-@@ -26,7 +26,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/kde/GUIRunTime.C.
---- src/frontends/gnome/GUIRunTime.C.orig	Thu Jul  4 18:46:08 2002
-+++ src/frontends/gnome/GUIRunTime.C	Thu Jul  4 18:47:23 2002
-@@ -25,7 +25,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/gnome/GUIRunTime.C.
---- src/frontends/xforms/GUIRunTime.C.orig	Thu Jul  4 18:47:48 2002
-+++ src/frontends/xforms/GUIRunTime.C	Thu Jul  4 18:48:18 2002
-@@ -19,7 +19,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
---- src/frontends/xforms/Menubar_pimpl.C.orig	Thu Jul  4 18:49:05 2002
-+++ src/frontends/xforms/Menubar_pimpl.C	Thu Jul  4 18:50:18 2002
-@@ -219,7 +219,7 @@
- static inline
- string const fixlabel(string const & str)
- {
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	return subst(str, '%', '?');
- #else
- 	return subst(str, "%", "%%");
---- src/frontends/xforms/Toolbar_pimpl.C.orig	Thu Jul  4 18:50:40 2002
-+++ src/frontends/xforms/Toolbar_pimpl.C	Thu Jul  4 18:52:37 2002
-@@ -84,13 +84,13 @@
- 	: owner(o), sxpos(x), sypos(y)
- {
- 	combox = 0;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	bubble_timer = 0;
- #endif
- }
- 
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- // timer-cb for bubble-help (Matthias)
- static 
- void BubbleTimerCB(FL_OBJECT *, long data)
-@@ -339,7 +339,7 @@
- 		fl_addto_form(owner->getForm());
- 	}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	// add the time if it don't exist
- 	if (bubble_timer == 0)
- 		bubble_timer = fl_add_timer(FL_HIDDEN_TIMER,
-@@ -383,7 +383,7 @@
- 			fl_set_pixmapbutton_focus_outline(obj, 0);
- 
- 			// Set the tooltip
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 			string help = _(lyxaction.helpText(item->action));
- 			fl_set_object_helper(obj, help.c_str());	
- #else
---- src/frontends/xforms/Toolbar_pimpl.h.orig	Thu Jul  4 18:52:55 2002
-+++ src/frontends/xforms/Toolbar_pimpl.h	Thu Jul  4 18:53:40 2002
-@@ -93,7 +93,7 @@
- 	ToolbarList toollist;
- 	///
- 	LyXView * owner;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	///
- 	FL_OBJECT * bubble_timer;
- #endif
diff --git a/print/lyx/files/patch-ab b/print/lyx/files/patch-ab
deleted file mode 100644
index 3e3ecce8853e..000000000000
--- a/print/lyx/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Mon Jan 17 21:04:28 2000
-+++ po/Makefile.in.in	Tue May  2 21:53:41 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/print/lyx/files/patch-autogen.sh b/print/lyx/files/patch-autogen.sh
new file mode 100644
index 000000000000..9358d3a465e0
--- /dev/null
+++ b/print/lyx/files/patch-autogen.sh
@@ -0,0 +1,32 @@
+--- autogen.sh	Thu Apr 18 22:11:28 2002
++++ autogen.sh	Fri Jun 28 21:55:35 2002
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+ ACLOCAL=aclocal
+-AUTOHEADER=autoheader
++AUTOHEADER=autoheader213
+ AUTOMAKE="automake -a -c --foreign"
+-AUTOCONF=autoconf
++AUTOCONF=autoconf213
+ GNUM4=
+ 
+ ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
+@@ -31,7 +31,7 @@
+ echo "done."
+ 
+ # Generate the Makefiles and configure files
+-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
++if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building macros..."
+ 	for dir in . lib/reLyX sigc++ ; do
+ 	    echo "        $dir"
+@@ -43,7 +43,7 @@
+ 	exit
+ fi
+ 
+-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
++if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building config header template..."
+ 	for dir in . sigc++ ; do
+ 	    echo "        $dir"
diff --git a/print/lyx/files/patch-config::ltmain.sh b/print/lyx/files/patch-config::ltmain.sh
new file mode 100644
index 000000000000..29ed1a55df53
--- /dev/null
+++ b/print/lyx/files/patch-config::ltmain.sh
@@ -0,0 +1,28 @@
+--- config/ltmain.sh	Thu Jan 24 06:28:31 2002
++++ config/ltmain.sh	Fri Jun 28 20:15:12 2002
+@@ -1043,14 +1043,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
diff --git a/print/lyx/files/patch-sp_spell b/print/lyx/files/patch-sp_spell
new file mode 100644
index 000000000000..9ec68f198e44
--- /dev/null
+++ b/print/lyx/files/patch-sp_spell
@@ -0,0 +1,7 @@
+--- src/sp_spell.C	Thu Mar 21 12:25:20 2002
++++ src/sp_spell.C	Wed Jul 31 18:49:57 2002
+@@ -371,3 +371,3 @@
+ 		retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
+-				SELECT_TYPE_ARG234 (&infds),
++				&infds,
+ 				0,
diff --git a/print/lyx/files/patch-xformsversion b/print/lyx/files/patch-xformsversion
new file mode 100644
index 000000000000..29db709d6816
--- /dev/null
+++ b/print/lyx/files/patch-xformsversion
@@ -0,0 +1,13 @@
+--- src/frontends/xforms/GUIRunTime.C	Thu Mar 21 16:18:03 2002
++++ src/frontends/xforms/GUIRunTime.C	Wed Jul 31 18:39:04 2002
+@@ -26,10 +26,2 @@
+ 
+-// I keep these here so that it will be processed as early in
+-// the compilation process as possible.
+-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
+-#error LyX will not compile with this version of XForms.\
+-       Please get version 0.89.\
+-       If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
+-#endif
+-
+ 
diff --git a/print/lyx/files/patch-xpm b/print/lyx/files/patch-xpm
new file mode 100644
index 000000000000..4ca930ba2341
--- /dev/null
+++ b/print/lyx/files/patch-xpm
@@ -0,0 +1,7 @@
+--- src/graphics/GraphicsImageXPM.h	Thu Mar 21 12:27:08 2002
++++ src/graphics/GraphicsImageXPM.h	Wed Jul 31 18:08:13 2002
+@@ -17,3 +17,3 @@
+ #include "GraphicsImage.h"
+-#include XPM_H_LOCATION
++#include <X11/xpm.h>
+ #include "support/smart_ptr.h"
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 98d7e0895750..c813e083c349 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -1,7 +1,7 @@
-bin/listerrors
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
+share/locale/bg/LC_MESSAGES/lyx.mo
 share/locale/ca/LC_MESSAGES/lyx.mo
 share/locale/cs/LC_MESSAGES/lyx.mo
 share/locale/da/LC_MESSAGES/lyx.mo
@@ -19,6 +19,7 @@ share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
 share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
@@ -29,9 +30,8 @@ share/lyx/bind/cua.bind
 share/lyx/bind/de_menus.bind
 share/lyx/bind/emacs.bind
 share/lyx/bind/fi_menus.bind
-share/lyx/bind/fr_menus.bind
 share/lyx/bind/hollywood.bind
-share/lyx/bind/hu_menus.bind
+share/lyx/bind/latinkeys.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
 share/lyx/bind/pt_menus.bind
@@ -42,11 +42,9 @@ share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
 share/lyx/configure
 share/lyx/configure.cmd
-share/lyx/doc/BUGS.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DocStyle.lyx
 share/lyx/doc/Extended.lyx
-share/lyx/doc/ExternalMaterial.lyx
 share/lyx/doc/FAQ.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LaTeXConfig.lyx
@@ -60,7 +58,6 @@ share/lyx/doc/cs_TOC.lyx
 share/lyx/doc/cs_Tutorial.lyx
 share/lyx/doc/da_Intro.lyx
 share/lyx/doc/da_TOC.lyx
-share/lyx/doc/de_BUGS.lyx
 share/lyx/doc/de_Customization.lyx
 share/lyx/doc/de_Extended.lyx
 share/lyx/doc/de_FAQ.lyx
@@ -75,10 +72,8 @@ share/lyx/doc/escher-lsd.eps
 share/lyx/doc/eu_Intro.lyx
 share/lyx/doc/eu_TOC.lyx
 share/lyx/doc/eu_Tutorial.lyx
-share/lyx/doc/fr_BUGS.lyx
 share/lyx/doc/fr_Customization.lyx
 share/lyx/doc/fr_Extended.lyx
-share/lyx/doc/fr_ExternalMaterial.lyx
 share/lyx/doc/fr_FAQ.lyx
 share/lyx/doc/fr_Intro.lyx
 share/lyx/doc/fr_TOC.lyx
@@ -104,6 +99,13 @@ share/lyx/doc/pt_TOC.lyx
 share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
+share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_Intro.lyx
+share/lyx/doc/ru_TOC.lyx
+share/lyx/doc/ru_Tutorial.lyx
+share/lyx/doc/sk_TOC.lyx
+share/lyx/doc/sk_Tutorial.lyx
+share/lyx/doc/sk_UserGuide.lyx
 share/lyx/doc/sl_Intro.lyx
 share/lyx/doc/sl_TOC.lyx
 share/lyx/doc/sl_Tutorial.lyx
@@ -114,7 +116,6 @@ share/lyx/encodings
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
 share/lyx/examples/Literate.lyx
-share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Minipage.lyx
 share/lyx/examples/TableExamples.lyx
 share/lyx/examples/aa_sample.lyx
@@ -122,6 +123,9 @@ share/lyx/examples/aas_sample.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
 share/lyx/examples/ca_splash.lyx
+share/lyx/examples/chess-article.lyx
+share/lyx/examples/chessgame.lyx
+share/lyx/examples/currency.lyx
 share/lyx/examples/cv.lyx
 share/lyx/examples/da_splash.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
@@ -138,7 +142,6 @@ share/lyx/examples/eu_splash.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/fr_AlignementDecimal.lyx
-share/lyx/examples/fr_EtiquetteMath.lyx
 share/lyx/examples/fr_ExemplesTableaux.lyx
 share/lyx/examples/fr_ListesPuces.lyx
 share/lyx/examples/fr_Minipage.lyx
@@ -147,11 +150,16 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_splash.lyx
 share/lyx/examples/hu_splash.lyx
+share/lyx/examples/iecc05.fen
+share/lyx/examples/iecc07.fen
+share/lyx/examples/iecc12.fen
 share/lyx/examples/it_ItemizeBullets.lyx
 share/lyx/examples/it_splash.lyx
 share/lyx/examples/landslide.lyx
+share/lyx/examples/linuxdoc_manpage.lyx
+share/lyx/examples/listerrors.lyx
+share/lyx/examples/mathed.lyx
 share/lyx/examples/multicol.lyx
-share/lyx/examples/nl_MathLabeling.lyx
 share/lyx/examples/nl_multicol.lyx
 share/lyx/examples/nl_opsommingstekens.lyx
 share/lyx/examples/nl_splash.lyx
@@ -167,12 +175,13 @@ share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
 share/lyx/examples/splash.lyx
 share/lyx/external_templates
+share/lyx/help/Bibtex.hlp
+share/lyx/help/Texinfo.hlp
 share/lyx/images/amssymb.xpm
 share/lyx/images/banner.xpm
 share/lyx/images/buffer-close.xpm
 share/lyx/images/buffer-export_ascii.xpm
 share/lyx/images/buffer-export_latex.xpm
-share/lyx/images/buffer-open.xpm
 share/lyx/images/buffer-print.xpm
 share/lyx/images/buffer-update_dvi.xpm
 share/lyx/images/buffer-update_ps.xpm
@@ -180,17 +189,23 @@ share/lyx/images/buffer-view_dvi.xpm
 share/lyx/images/buffer-view_ps.xpm
 share/lyx/images/buffer-write.xpm
 share/lyx/images/build-program.xpm
+share/lyx/images/citation-insert.xpm
 share/lyx/images/copy.xpm
 share/lyx/images/cut.xpm
-share/lyx/images/depth-next.xpm
+share/lyx/images/depth-decrement.xpm
+share/lyx/images/depth-increment.xpm
 share/lyx/images/dialog-tabular-insert.xpm
-share/lyx/images/figure-insert.xpm
+share/lyx/images/ert-insert.xpm
+share/lyx/images/file-open.xpm
 share/lyx/images/font-bold.xpm
 share/lyx/images/font-emph.xpm
 share/lyx/images/font-free.xpm
 share/lyx/images/font-noun.xpm
 share/lyx/images/font-sans.xpm
 share/lyx/images/footnote-insert.xpm
+share/lyx/images/graphics-insert.xpm
+share/lyx/images/index-insert.xpm
+share/lyx/images/label-insert.xpm
 share/lyx/images/layout.xpm
 share/lyx/images/layout_LaTeX.xpm
 share/lyx/images/layout_LyX-Code.xpm
@@ -199,8 +214,8 @@ share/lyx/images/layout_Section.xpm
 share/lyx/images/lyx-quit.xpm
 share/lyx/images/lyx.xpm
 share/lyx/images/marginalnote-insert.xpm
-share/lyx/images/marginpar-insert.xpm
 share/lyx/images/math-mode.xpm
+share/lyx/images/math-panel.xpm
 share/lyx/images/melt.xpm
 share/lyx/images/paste.xpm
 share/lyx/images/psnfss1.xpm
@@ -210,12 +225,12 @@ share/lyx/images/psnfss4.xpm
 share/lyx/images/redo.xpm
 share/lyx/images/standard.xpm
 share/lyx/images/tabular-insert.xpm
-share/lyx/images/tex-mode.xpm
 share/lyx/images/undo.xpm
 share/lyx/images/unknown.xpm
 share/lyx/kbd/american-2.kmap
 share/lyx/kbd/american.kmap
 share/lyx/kbd/arabic.kmap
+share/lyx/kbd/bg-bds-1251.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech-prg.kmap
@@ -235,6 +250,7 @@ share/lyx/kbd/iso8859-3.cdef
 share/lyx/kbd/iso8859-4.cdef
 share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/iso8859-8.cdef
+share/lyx/kbd/iso8859-9.cdef
 share/lyx/kbd/koi8-r.kmap
 share/lyx/kbd/koi8-u.kmap
 share/lyx/kbd/latvian.kmap
@@ -274,6 +290,7 @@ share/lyx/layouts/apa.layout
 share/lyx/layouts/article.layout
 share/lyx/layouts/book.layout
 share/lyx/layouts/broadway.layout
+share/lyx/layouts/chess.layout
 share/lyx/layouts/cv.layout
 share/lyx/layouts/db_lyxmacros.inc
 share/lyx/layouts/db_stdclass.inc
@@ -288,8 +305,8 @@ share/lyx/layouts/docbook-book.layout
 share/lyx/layouts/docbook-chapter.layout
 share/lyx/layouts/docbook-section.layout
 share/lyx/layouts/docbook.layout
+share/lyx/layouts/dtk.layout
 share/lyx/layouts/egs.layout
-share/lyx/layouts/ejour2.layout
 share/lyx/layouts/entcs.layout
 share/lyx/layouts/extarticle.layout
 share/lyx/layouts/extbook.layout
@@ -311,6 +328,7 @@ share/lyx/layouts/literate-book.layout
 share/lyx/layouts/literate-report.layout
 share/lyx/layouts/literate-scrap.inc
 share/lyx/layouts/llncs.layout
+share/lyx/layouts/ltugboat.layout
 share/lyx/layouts/lyxmacros.inc
 share/lyx/layouts/manpage.layout
 share/lyx/layouts/obsolete.inc
@@ -327,6 +345,7 @@ share/lyx/layouts/scrreprt.layout
 share/lyx/layouts/seminar.layout
 share/lyx/layouts/siamltex.layout
 share/lyx/layouts/slides.layout
+share/lyx/layouts/spie.layout
 share/lyx/layouts/stdclass.inc
 share/lyx/layouts/stdlayouts.inc
 share/lyx/layouts/stdletter.inc
@@ -337,6 +356,7 @@ share/lyx/layouts/stdstruct.inc
 share/lyx/layouts/stdtitle.inc
 share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
+share/lyx/layouts/svprobth.layout
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst
@@ -355,17 +375,20 @@ share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
-share/lyx/scripts/fen2latex.py
+share/lyx/scripts/TeXFiles.sh
+share/lyx/scripts/fen2ascii.py
 share/lyx/scripts/fig2pstex.py
 share/lyx/scripts/general_command_wrapper.py
+share/lyx/scripts/listerrors
 share/lyx/scripts/pic2ascii.py
 share/lyx/scripts/pic2png_eps.py
 share/lyx/scripts/pic2png_eps.sh
+share/lyx/symbols
 share/lyx/templates/IEEEtran.lyx
 share/lyx/templates/aa.lyx
 share/lyx/templates/aastex.lyx
 share/lyx/templates/dinbrief.lyx
-share/lyx/templates/docbook_template.lyx
+share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
@@ -373,30 +396,42 @@ share/lyx/templates/iletter.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
-share/lyx/templates/linuxdoctemplate.lyx
+share/lyx/templates/linuxdoc_article.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/revtex4.lyx
 share/lyx/templates/slides.lyx
 share/lyx/tex/broadway.cls
 share/lyx/tex/cv.cls
-share/lyx/tex/ejour2.cls
 share/lyx/tex/hollywood.cls
 share/lyx/tex/iletter.cls
+share/lyx/tex/lyxchess.sty
+share/lyx/tex/lyxskak.sty
 share/lyx/tex/revtex.cls
 share/lyx/textclass.lst
 share/lyx/ui/default.ui
 share/lyx/ui/old-default.ui
-@dirrm share/lyx/bind
-@dirrm share/lyx/clipart
-@dirrm share/lyx/doc
-@dirrm share/lyx/examples
-@dirrm share/lyx/images
-@dirrm share/lyx/kbd
-@dirrm share/lyx/layouts
+share/lyx/xfonts/cmex10.pfb
+share/lyx/xfonts/cmmi10.pfb
+share/lyx/xfonts/cmr10.pfb
+share/lyx/xfonts/cmsy10.pfb
+share/lyx/xfonts/eufm10.pfb
+share/lyx/xfonts/fonts.dir
+share/lyx/xfonts/fonts.scale
+share/lyx/xfonts/msam10.pfb
+share/lyx/xfonts/msbm10.pfb
+@dirrm share/lyx/xfonts
+@dirrm share/lyx/ui
+@dirrm share/lyx/tex
+@dirrm share/lyx/templates
+@dirrm share/lyx/scripts
 @dirrm share/lyx/reLyX/Text
 @dirrm share/lyx/reLyX
-@dirrm share/lyx/scripts
-@dirrm share/lyx/templates
-@dirrm share/lyx/tex
-@dirrm share/lyx/ui
+@dirrm share/lyx/layouts
+@dirrm share/lyx/kbd
+@dirrm share/lyx/images
+@dirrm share/lyx/help
+@dirrm share/lyx/examples
+@dirrm share/lyx/doc
+@dirrm share/lyx/clipart
+@dirrm share/lyx/bind
 @dirrm share/lyx
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 08be942e5e8b..d042c47f05ed 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -6,47 +6,58 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.4
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
-DISTNAME=	lyx-1.1.6
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
-		patch-1.1.6fix4.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		latex:${PORTSDIR}/print/teTeX
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
+		forms.1:${PORTSDIR}/x11-toolkits/xforms
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+.if defined(WITH_ASPELL)
+LIB_DEPENDS+= aspell.11:${PORTSDIR}/textproc/aspell
+CONFIGURE_ARGS+=--with-pspell
+.endif
+
 .if defined(WITH_ISPELL)
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
-LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
-		intl.2:${PORTSDIR}/devel/gettext
+
+pre-everything::
+.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
+	#
+	# If you want to compile with Aspell/Pspell or Ispell support,
+	# hit Ctrl-C right now and use
+	#	"make WITH_ASPELL=yes"
+	# or
+	#	"make WITH_ISPELL=yes"
+	#
+.endif
 
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 USE_XPM=	yes
-USE_NEWGCC=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
+USE_AUTOMAKE_VER=15
+AUTOMAKE=	${WRKSRC}/autogen.sh
+AUTOCONF=	${TRUE}
 CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
-		--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
+		--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
+		${LOCALBASE}/include"
+CONFIGURE_ENV+=	LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
 MAN1=		lyx.1 reLyX.1
 
-.if !defined(WITH_ISPELL)
-pre-fetch:
-	@${ECHO_MSG} "If you want this port built with spell checker support, use"
-	@${ECHO_MSG} "make WITH_ISPELL=yes"
-.endif
-
 post-patch:
-	(cd ${WRKSRC}; ${TOUCH} Makefile.in */Makefile.in src/config.h.in)
-	(cd ${WRKSRC}/lib/doc; ${RM} -f *.orig)
+	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|-lxforms|-lforms|g' \
+		-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
+		-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx14/distinfo b/print/lyx14/distinfo
index acc6538b7564..0495ced219ad 100644
--- a/print/lyx14/distinfo
+++ b/print/lyx14/distinfo
@@ -1,5 +1 @@
-MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
-MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
-MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
-MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
-MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
+MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
diff --git a/print/lyx14/files/patch-aa b/print/lyx14/files/patch-aa
deleted file mode 100644
index af9207168a48..000000000000
--- a/print/lyx14/files/patch-aa
+++ /dev/null
@@ -1,216 +0,0 @@
---- src/LyXView.C.orig	Thu Jul  4 18:26:33 2002
-+++ src/LyXView.C	Thu Jul  4 18:28:28 2002
-@@ -19,7 +19,7 @@
- 
- #include "LyXView.h"
- #include "lyx_main.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "minibuffer.h"
-@@ -214,7 +214,7 @@
- {
- 	fl_show_form(form_, place, border, title.c_str());
- 	minibuffer->Init();
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	InitLyXLookup(fl_get_display(), form_->window);
- #endif
- }
---- src/WorkArea.C.orig2	Thu Jul  4 18:33:22 2002
-+++ src/WorkArea.C	Thu Jul  4 18:36:02 2002
-@@ -24,7 +24,7 @@
- #include "LyXView.h"
- #include "lyxfunc.h"
- 
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- 
-@@ -323,7 +323,7 @@
- 				      ev->xbutton.y - ob->y,
- 				      ev->xbutton.button);
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_MOUSE:
- #else
- 	case FL_DRAG:
-@@ -339,7 +339,7 @@
- 					     ev->xbutton.state);
- 		}
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_KEYBOARD:
- #else
- 	case FL_KEYPRESS:
-@@ -350,7 +350,7 @@
- 		KeySym keysym = 0;
- 		char dummy[1];
- 		XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 		// XForms < 0.89.5 does not have compose support
- 		// so we are using our own compose support
- 		LyXLookupString(ev, dummy, 1, &keysym);
-@@ -369,7 +369,7 @@
- 			       << keysym << "]" << endl;
- 		}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 		if (keysym == NoSymbol) {
- 			lyxerr[Debug::KEY]
- 				<< "Empty kdb action (probably composing)"
-@@ -446,7 +446,7 @@
- 	}
- 	break;
- 
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 	case FL_KEYRELEASE:
- 		lyxerr << "Workarea event: KEYRELEASE" << endl;
- 		break;
---- src/lyx_gui.C.orig2	Thu Jul  4 18:36:45 2002
-+++ src/lyx_gui.C	Thu Jul  4 18:39:42 2002
-@@ -36,7 +36,7 @@
- #include "lyxrc.h"
- #include "gettext.h"
- #include "lyx_gui_misc.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "bufferlist.h"
-@@ -171,7 +171,7 @@
- 	delete lyxserver;
- 	lyxserver = 0;
- 	delete lyxViews;
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	CloseLyXLookup();
- #endif
- }
---- src/insets/figinset.C.orig2	Thu Jul  4 18:40:17 2002
-+++ src/insets/figinset.C	Thu Jul  4 18:42:08 2002
-@@ -933,7 +933,7 @@
- 					    tmpfig->inset->form->OkBtn);
- 			fl_hide_form(tmpfig->inset->form->Figure);
- 		}
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- #else
- 		fl_free_form(tmpfig->inset->form->Figure);
-@@ -1769,7 +1769,7 @@
- 			if (arg == 8) {
- 				fl_set_focus_object(form->Figure, form->OkBtn);
- 				fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 				// CHECK Reactivate this free_form calls
- #else
- 				fl_free_form(form->Figure);
-@@ -1786,7 +1786,7 @@
- 	case 9:				/* cancel = restore and close */
- 		fl_set_focus_object(form->Figure, form->OkBtn);
- 		fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- 		// Jug, is this still a problem?
- #else
---- src/frontends/kde/GUIRunTime.C.orig	Thu Jul  4 18:43:25 2002
-+++ src/frontends/kde/GUIRunTime.C	Thu Jul  4 18:44:57 2002
-@@ -26,7 +26,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/kde/GUIRunTime.C.
---- src/frontends/gnome/GUIRunTime.C.orig	Thu Jul  4 18:46:08 2002
-+++ src/frontends/gnome/GUIRunTime.C	Thu Jul  4 18:47:23 2002
-@@ -25,7 +25,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/gnome/GUIRunTime.C.
---- src/frontends/xforms/GUIRunTime.C.orig	Thu Jul  4 18:47:48 2002
-+++ src/frontends/xforms/GUIRunTime.C	Thu Jul  4 18:48:18 2002
-@@ -19,7 +19,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
---- src/frontends/xforms/Menubar_pimpl.C.orig	Thu Jul  4 18:49:05 2002
-+++ src/frontends/xforms/Menubar_pimpl.C	Thu Jul  4 18:50:18 2002
-@@ -219,7 +219,7 @@
- static inline
- string const fixlabel(string const & str)
- {
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	return subst(str, '%', '?');
- #else
- 	return subst(str, "%", "%%");
---- src/frontends/xforms/Toolbar_pimpl.C.orig	Thu Jul  4 18:50:40 2002
-+++ src/frontends/xforms/Toolbar_pimpl.C	Thu Jul  4 18:52:37 2002
-@@ -84,13 +84,13 @@
- 	: owner(o), sxpos(x), sypos(y)
- {
- 	combox = 0;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	bubble_timer = 0;
- #endif
- }
- 
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- // timer-cb for bubble-help (Matthias)
- static 
- void BubbleTimerCB(FL_OBJECT *, long data)
-@@ -339,7 +339,7 @@
- 		fl_addto_form(owner->getForm());
- 	}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	// add the time if it don't exist
- 	if (bubble_timer == 0)
- 		bubble_timer = fl_add_timer(FL_HIDDEN_TIMER,
-@@ -383,7 +383,7 @@
- 			fl_set_pixmapbutton_focus_outline(obj, 0);
- 
- 			// Set the tooltip
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 			string help = _(lyxaction.helpText(item->action));
- 			fl_set_object_helper(obj, help.c_str());	
- #else
---- src/frontends/xforms/Toolbar_pimpl.h.orig	Thu Jul  4 18:52:55 2002
-+++ src/frontends/xforms/Toolbar_pimpl.h	Thu Jul  4 18:53:40 2002
-@@ -93,7 +93,7 @@
- 	ToolbarList toollist;
- 	///
- 	LyXView * owner;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	///
- 	FL_OBJECT * bubble_timer;
- #endif
diff --git a/print/lyx14/files/patch-ab b/print/lyx14/files/patch-ab
deleted file mode 100644
index 3e3ecce8853e..000000000000
--- a/print/lyx14/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Mon Jan 17 21:04:28 2000
-+++ po/Makefile.in.in	Tue May  2 21:53:41 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/print/lyx14/files/patch-autogen.sh b/print/lyx14/files/patch-autogen.sh
new file mode 100644
index 000000000000..9358d3a465e0
--- /dev/null
+++ b/print/lyx14/files/patch-autogen.sh
@@ -0,0 +1,32 @@
+--- autogen.sh	Thu Apr 18 22:11:28 2002
++++ autogen.sh	Fri Jun 28 21:55:35 2002
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+ ACLOCAL=aclocal
+-AUTOHEADER=autoheader
++AUTOHEADER=autoheader213
+ AUTOMAKE="automake -a -c --foreign"
+-AUTOCONF=autoconf
++AUTOCONF=autoconf213
+ GNUM4=
+ 
+ ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
+@@ -31,7 +31,7 @@
+ echo "done."
+ 
+ # Generate the Makefiles and configure files
+-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
++if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building macros..."
+ 	for dir in . lib/reLyX sigc++ ; do
+ 	    echo "        $dir"
+@@ -43,7 +43,7 @@
+ 	exit
+ fi
+ 
+-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
++if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building config header template..."
+ 	for dir in . sigc++ ; do
+ 	    echo "        $dir"
diff --git a/print/lyx14/files/patch-config::ltmain.sh b/print/lyx14/files/patch-config::ltmain.sh
new file mode 100644
index 000000000000..29ed1a55df53
--- /dev/null
+++ b/print/lyx14/files/patch-config::ltmain.sh
@@ -0,0 +1,28 @@
+--- config/ltmain.sh	Thu Jan 24 06:28:31 2002
++++ config/ltmain.sh	Fri Jun 28 20:15:12 2002
+@@ -1043,14 +1043,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
diff --git a/print/lyx14/files/patch-sp_spell b/print/lyx14/files/patch-sp_spell
new file mode 100644
index 000000000000..9ec68f198e44
--- /dev/null
+++ b/print/lyx14/files/patch-sp_spell
@@ -0,0 +1,7 @@
+--- src/sp_spell.C	Thu Mar 21 12:25:20 2002
++++ src/sp_spell.C	Wed Jul 31 18:49:57 2002
+@@ -371,3 +371,3 @@
+ 		retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
+-				SELECT_TYPE_ARG234 (&infds),
++				&infds,
+ 				0,
diff --git a/print/lyx14/files/patch-xformsversion b/print/lyx14/files/patch-xformsversion
new file mode 100644
index 000000000000..29db709d6816
--- /dev/null
+++ b/print/lyx14/files/patch-xformsversion
@@ -0,0 +1,13 @@
+--- src/frontends/xforms/GUIRunTime.C	Thu Mar 21 16:18:03 2002
++++ src/frontends/xforms/GUIRunTime.C	Wed Jul 31 18:39:04 2002
+@@ -26,10 +26,2 @@
+ 
+-// I keep these here so that it will be processed as early in
+-// the compilation process as possible.
+-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
+-#error LyX will not compile with this version of XForms.\
+-       Please get version 0.89.\
+-       If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
+-#endif
+-
+ 
diff --git a/print/lyx14/files/patch-xpm b/print/lyx14/files/patch-xpm
new file mode 100644
index 000000000000..4ca930ba2341
--- /dev/null
+++ b/print/lyx14/files/patch-xpm
@@ -0,0 +1,7 @@
+--- src/graphics/GraphicsImageXPM.h	Thu Mar 21 12:27:08 2002
++++ src/graphics/GraphicsImageXPM.h	Wed Jul 31 18:08:13 2002
+@@ -17,3 +17,3 @@
+ #include "GraphicsImage.h"
+-#include XPM_H_LOCATION
++#include <X11/xpm.h>
+ #include "support/smart_ptr.h"
diff --git a/print/lyx14/pkg-plist b/print/lyx14/pkg-plist
index 98d7e0895750..c813e083c349 100644
--- a/print/lyx14/pkg-plist
+++ b/print/lyx14/pkg-plist
@@ -1,7 +1,7 @@
-bin/listerrors
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
+share/locale/bg/LC_MESSAGES/lyx.mo
 share/locale/ca/LC_MESSAGES/lyx.mo
 share/locale/cs/LC_MESSAGES/lyx.mo
 share/locale/da/LC_MESSAGES/lyx.mo
@@ -19,6 +19,7 @@ share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
 share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
@@ -29,9 +30,8 @@ share/lyx/bind/cua.bind
 share/lyx/bind/de_menus.bind
 share/lyx/bind/emacs.bind
 share/lyx/bind/fi_menus.bind
-share/lyx/bind/fr_menus.bind
 share/lyx/bind/hollywood.bind
-share/lyx/bind/hu_menus.bind
+share/lyx/bind/latinkeys.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
 share/lyx/bind/pt_menus.bind
@@ -42,11 +42,9 @@ share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
 share/lyx/configure
 share/lyx/configure.cmd
-share/lyx/doc/BUGS.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DocStyle.lyx
 share/lyx/doc/Extended.lyx
-share/lyx/doc/ExternalMaterial.lyx
 share/lyx/doc/FAQ.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LaTeXConfig.lyx
@@ -60,7 +58,6 @@ share/lyx/doc/cs_TOC.lyx
 share/lyx/doc/cs_Tutorial.lyx
 share/lyx/doc/da_Intro.lyx
 share/lyx/doc/da_TOC.lyx
-share/lyx/doc/de_BUGS.lyx
 share/lyx/doc/de_Customization.lyx
 share/lyx/doc/de_Extended.lyx
 share/lyx/doc/de_FAQ.lyx
@@ -75,10 +72,8 @@ share/lyx/doc/escher-lsd.eps
 share/lyx/doc/eu_Intro.lyx
 share/lyx/doc/eu_TOC.lyx
 share/lyx/doc/eu_Tutorial.lyx
-share/lyx/doc/fr_BUGS.lyx
 share/lyx/doc/fr_Customization.lyx
 share/lyx/doc/fr_Extended.lyx
-share/lyx/doc/fr_ExternalMaterial.lyx
 share/lyx/doc/fr_FAQ.lyx
 share/lyx/doc/fr_Intro.lyx
 share/lyx/doc/fr_TOC.lyx
@@ -104,6 +99,13 @@ share/lyx/doc/pt_TOC.lyx
 share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
+share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_Intro.lyx
+share/lyx/doc/ru_TOC.lyx
+share/lyx/doc/ru_Tutorial.lyx
+share/lyx/doc/sk_TOC.lyx
+share/lyx/doc/sk_Tutorial.lyx
+share/lyx/doc/sk_UserGuide.lyx
 share/lyx/doc/sl_Intro.lyx
 share/lyx/doc/sl_TOC.lyx
 share/lyx/doc/sl_Tutorial.lyx
@@ -114,7 +116,6 @@ share/lyx/encodings
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
 share/lyx/examples/Literate.lyx
-share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Minipage.lyx
 share/lyx/examples/TableExamples.lyx
 share/lyx/examples/aa_sample.lyx
@@ -122,6 +123,9 @@ share/lyx/examples/aas_sample.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
 share/lyx/examples/ca_splash.lyx
+share/lyx/examples/chess-article.lyx
+share/lyx/examples/chessgame.lyx
+share/lyx/examples/currency.lyx
 share/lyx/examples/cv.lyx
 share/lyx/examples/da_splash.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
@@ -138,7 +142,6 @@ share/lyx/examples/eu_splash.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/fr_AlignementDecimal.lyx
-share/lyx/examples/fr_EtiquetteMath.lyx
 share/lyx/examples/fr_ExemplesTableaux.lyx
 share/lyx/examples/fr_ListesPuces.lyx
 share/lyx/examples/fr_Minipage.lyx
@@ -147,11 +150,16 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_splash.lyx
 share/lyx/examples/hu_splash.lyx
+share/lyx/examples/iecc05.fen
+share/lyx/examples/iecc07.fen
+share/lyx/examples/iecc12.fen
 share/lyx/examples/it_ItemizeBullets.lyx
 share/lyx/examples/it_splash.lyx
 share/lyx/examples/landslide.lyx
+share/lyx/examples/linuxdoc_manpage.lyx
+share/lyx/examples/listerrors.lyx
+share/lyx/examples/mathed.lyx
 share/lyx/examples/multicol.lyx
-share/lyx/examples/nl_MathLabeling.lyx
 share/lyx/examples/nl_multicol.lyx
 share/lyx/examples/nl_opsommingstekens.lyx
 share/lyx/examples/nl_splash.lyx
@@ -167,12 +175,13 @@ share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
 share/lyx/examples/splash.lyx
 share/lyx/external_templates
+share/lyx/help/Bibtex.hlp
+share/lyx/help/Texinfo.hlp
 share/lyx/images/amssymb.xpm
 share/lyx/images/banner.xpm
 share/lyx/images/buffer-close.xpm
 share/lyx/images/buffer-export_ascii.xpm
 share/lyx/images/buffer-export_latex.xpm
-share/lyx/images/buffer-open.xpm
 share/lyx/images/buffer-print.xpm
 share/lyx/images/buffer-update_dvi.xpm
 share/lyx/images/buffer-update_ps.xpm
@@ -180,17 +189,23 @@ share/lyx/images/buffer-view_dvi.xpm
 share/lyx/images/buffer-view_ps.xpm
 share/lyx/images/buffer-write.xpm
 share/lyx/images/build-program.xpm
+share/lyx/images/citation-insert.xpm
 share/lyx/images/copy.xpm
 share/lyx/images/cut.xpm
-share/lyx/images/depth-next.xpm
+share/lyx/images/depth-decrement.xpm
+share/lyx/images/depth-increment.xpm
 share/lyx/images/dialog-tabular-insert.xpm
-share/lyx/images/figure-insert.xpm
+share/lyx/images/ert-insert.xpm
+share/lyx/images/file-open.xpm
 share/lyx/images/font-bold.xpm
 share/lyx/images/font-emph.xpm
 share/lyx/images/font-free.xpm
 share/lyx/images/font-noun.xpm
 share/lyx/images/font-sans.xpm
 share/lyx/images/footnote-insert.xpm
+share/lyx/images/graphics-insert.xpm
+share/lyx/images/index-insert.xpm
+share/lyx/images/label-insert.xpm
 share/lyx/images/layout.xpm
 share/lyx/images/layout_LaTeX.xpm
 share/lyx/images/layout_LyX-Code.xpm
@@ -199,8 +214,8 @@ share/lyx/images/layout_Section.xpm
 share/lyx/images/lyx-quit.xpm
 share/lyx/images/lyx.xpm
 share/lyx/images/marginalnote-insert.xpm
-share/lyx/images/marginpar-insert.xpm
 share/lyx/images/math-mode.xpm
+share/lyx/images/math-panel.xpm
 share/lyx/images/melt.xpm
 share/lyx/images/paste.xpm
 share/lyx/images/psnfss1.xpm
@@ -210,12 +225,12 @@ share/lyx/images/psnfss4.xpm
 share/lyx/images/redo.xpm
 share/lyx/images/standard.xpm
 share/lyx/images/tabular-insert.xpm
-share/lyx/images/tex-mode.xpm
 share/lyx/images/undo.xpm
 share/lyx/images/unknown.xpm
 share/lyx/kbd/american-2.kmap
 share/lyx/kbd/american.kmap
 share/lyx/kbd/arabic.kmap
+share/lyx/kbd/bg-bds-1251.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech-prg.kmap
@@ -235,6 +250,7 @@ share/lyx/kbd/iso8859-3.cdef
 share/lyx/kbd/iso8859-4.cdef
 share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/iso8859-8.cdef
+share/lyx/kbd/iso8859-9.cdef
 share/lyx/kbd/koi8-r.kmap
 share/lyx/kbd/koi8-u.kmap
 share/lyx/kbd/latvian.kmap
@@ -274,6 +290,7 @@ share/lyx/layouts/apa.layout
 share/lyx/layouts/article.layout
 share/lyx/layouts/book.layout
 share/lyx/layouts/broadway.layout
+share/lyx/layouts/chess.layout
 share/lyx/layouts/cv.layout
 share/lyx/layouts/db_lyxmacros.inc
 share/lyx/layouts/db_stdclass.inc
@@ -288,8 +305,8 @@ share/lyx/layouts/docbook-book.layout
 share/lyx/layouts/docbook-chapter.layout
 share/lyx/layouts/docbook-section.layout
 share/lyx/layouts/docbook.layout
+share/lyx/layouts/dtk.layout
 share/lyx/layouts/egs.layout
-share/lyx/layouts/ejour2.layout
 share/lyx/layouts/entcs.layout
 share/lyx/layouts/extarticle.layout
 share/lyx/layouts/extbook.layout
@@ -311,6 +328,7 @@ share/lyx/layouts/literate-book.layout
 share/lyx/layouts/literate-report.layout
 share/lyx/layouts/literate-scrap.inc
 share/lyx/layouts/llncs.layout
+share/lyx/layouts/ltugboat.layout
 share/lyx/layouts/lyxmacros.inc
 share/lyx/layouts/manpage.layout
 share/lyx/layouts/obsolete.inc
@@ -327,6 +345,7 @@ share/lyx/layouts/scrreprt.layout
 share/lyx/layouts/seminar.layout
 share/lyx/layouts/siamltex.layout
 share/lyx/layouts/slides.layout
+share/lyx/layouts/spie.layout
 share/lyx/layouts/stdclass.inc
 share/lyx/layouts/stdlayouts.inc
 share/lyx/layouts/stdletter.inc
@@ -337,6 +356,7 @@ share/lyx/layouts/stdstruct.inc
 share/lyx/layouts/stdtitle.inc
 share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
+share/lyx/layouts/svprobth.layout
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst
@@ -355,17 +375,20 @@ share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
-share/lyx/scripts/fen2latex.py
+share/lyx/scripts/TeXFiles.sh
+share/lyx/scripts/fen2ascii.py
 share/lyx/scripts/fig2pstex.py
 share/lyx/scripts/general_command_wrapper.py
+share/lyx/scripts/listerrors
 share/lyx/scripts/pic2ascii.py
 share/lyx/scripts/pic2png_eps.py
 share/lyx/scripts/pic2png_eps.sh
+share/lyx/symbols
 share/lyx/templates/IEEEtran.lyx
 share/lyx/templates/aa.lyx
 share/lyx/templates/aastex.lyx
 share/lyx/templates/dinbrief.lyx
-share/lyx/templates/docbook_template.lyx
+share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
@@ -373,30 +396,42 @@ share/lyx/templates/iletter.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
-share/lyx/templates/linuxdoctemplate.lyx
+share/lyx/templates/linuxdoc_article.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/revtex4.lyx
 share/lyx/templates/slides.lyx
 share/lyx/tex/broadway.cls
 share/lyx/tex/cv.cls
-share/lyx/tex/ejour2.cls
 share/lyx/tex/hollywood.cls
 share/lyx/tex/iletter.cls
+share/lyx/tex/lyxchess.sty
+share/lyx/tex/lyxskak.sty
 share/lyx/tex/revtex.cls
 share/lyx/textclass.lst
 share/lyx/ui/default.ui
 share/lyx/ui/old-default.ui
-@dirrm share/lyx/bind
-@dirrm share/lyx/clipart
-@dirrm share/lyx/doc
-@dirrm share/lyx/examples
-@dirrm share/lyx/images
-@dirrm share/lyx/kbd
-@dirrm share/lyx/layouts
+share/lyx/xfonts/cmex10.pfb
+share/lyx/xfonts/cmmi10.pfb
+share/lyx/xfonts/cmr10.pfb
+share/lyx/xfonts/cmsy10.pfb
+share/lyx/xfonts/eufm10.pfb
+share/lyx/xfonts/fonts.dir
+share/lyx/xfonts/fonts.scale
+share/lyx/xfonts/msam10.pfb
+share/lyx/xfonts/msbm10.pfb
+@dirrm share/lyx/xfonts
+@dirrm share/lyx/ui
+@dirrm share/lyx/tex
+@dirrm share/lyx/templates
+@dirrm share/lyx/scripts
 @dirrm share/lyx/reLyX/Text
 @dirrm share/lyx/reLyX
-@dirrm share/lyx/scripts
-@dirrm share/lyx/templates
-@dirrm share/lyx/tex
-@dirrm share/lyx/ui
+@dirrm share/lyx/layouts
+@dirrm share/lyx/kbd
+@dirrm share/lyx/images
+@dirrm share/lyx/help
+@dirrm share/lyx/examples
+@dirrm share/lyx/doc
+@dirrm share/lyx/clipart
+@dirrm share/lyx/bind
 @dirrm share/lyx
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 08be942e5e8b..d042c47f05ed 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -6,47 +6,58 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.4
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
-DISTNAME=	lyx-1.1.6
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
-		patch-1.1.6fix4.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		latex:${PORTSDIR}/print/teTeX
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
+		forms.1:${PORTSDIR}/x11-toolkits/xforms
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+.if defined(WITH_ASPELL)
+LIB_DEPENDS+= aspell.11:${PORTSDIR}/textproc/aspell
+CONFIGURE_ARGS+=--with-pspell
+.endif
+
 .if defined(WITH_ISPELL)
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
-LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
-		intl.2:${PORTSDIR}/devel/gettext
+
+pre-everything::
+.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
+	#
+	# If you want to compile with Aspell/Pspell or Ispell support,
+	# hit Ctrl-C right now and use
+	#	"make WITH_ASPELL=yes"
+	# or
+	#	"make WITH_ISPELL=yes"
+	#
+.endif
 
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 USE_XPM=	yes
-USE_NEWGCC=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
+USE_AUTOMAKE_VER=15
+AUTOMAKE=	${WRKSRC}/autogen.sh
+AUTOCONF=	${TRUE}
 CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
-		--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
+		--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
+		${LOCALBASE}/include"
+CONFIGURE_ENV+=	LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
 MAN1=		lyx.1 reLyX.1
 
-.if !defined(WITH_ISPELL)
-pre-fetch:
-	@${ECHO_MSG} "If you want this port built with spell checker support, use"
-	@${ECHO_MSG} "make WITH_ISPELL=yes"
-.endif
-
 post-patch:
-	(cd ${WRKSRC}; ${TOUCH} Makefile.in */Makefile.in src/config.h.in)
-	(cd ${WRKSRC}/lib/doc; ${RM} -f *.orig)
+	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|-lxforms|-lforms|g' \
+		-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
+		-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index acc6538b7564..0495ced219ad 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -1,5 +1 @@
-MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
-MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
-MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
-MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
-MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
+MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
diff --git a/print/lyx15/files/patch-aa b/print/lyx15/files/patch-aa
deleted file mode 100644
index af9207168a48..000000000000
--- a/print/lyx15/files/patch-aa
+++ /dev/null
@@ -1,216 +0,0 @@
---- src/LyXView.C.orig	Thu Jul  4 18:26:33 2002
-+++ src/LyXView.C	Thu Jul  4 18:28:28 2002
-@@ -19,7 +19,7 @@
- 
- #include "LyXView.h"
- #include "lyx_main.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "minibuffer.h"
-@@ -214,7 +214,7 @@
- {
- 	fl_show_form(form_, place, border, title.c_str());
- 	minibuffer->Init();
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	InitLyXLookup(fl_get_display(), form_->window);
- #endif
- }
---- src/WorkArea.C.orig2	Thu Jul  4 18:33:22 2002
-+++ src/WorkArea.C	Thu Jul  4 18:36:02 2002
-@@ -24,7 +24,7 @@
- #include "LyXView.h"
- #include "lyxfunc.h"
- 
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- 
-@@ -323,7 +323,7 @@
- 				      ev->xbutton.y - ob->y,
- 				      ev->xbutton.button);
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_MOUSE:
- #else
- 	case FL_DRAG:
-@@ -339,7 +339,7 @@
- 					     ev->xbutton.state);
- 		}
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_KEYBOARD:
- #else
- 	case FL_KEYPRESS:
-@@ -350,7 +350,7 @@
- 		KeySym keysym = 0;
- 		char dummy[1];
- 		XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 		// XForms < 0.89.5 does not have compose support
- 		// so we are using our own compose support
- 		LyXLookupString(ev, dummy, 1, &keysym);
-@@ -369,7 +369,7 @@
- 			       << keysym << "]" << endl;
- 		}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 		if (keysym == NoSymbol) {
- 			lyxerr[Debug::KEY]
- 				<< "Empty kdb action (probably composing)"
-@@ -446,7 +446,7 @@
- 	}
- 	break;
- 
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 	case FL_KEYRELEASE:
- 		lyxerr << "Workarea event: KEYRELEASE" << endl;
- 		break;
---- src/lyx_gui.C.orig2	Thu Jul  4 18:36:45 2002
-+++ src/lyx_gui.C	Thu Jul  4 18:39:42 2002
-@@ -36,7 +36,7 @@
- #include "lyxrc.h"
- #include "gettext.h"
- #include "lyx_gui_misc.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "bufferlist.h"
-@@ -171,7 +171,7 @@
- 	delete lyxserver;
- 	lyxserver = 0;
- 	delete lyxViews;
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	CloseLyXLookup();
- #endif
- }
---- src/insets/figinset.C.orig2	Thu Jul  4 18:40:17 2002
-+++ src/insets/figinset.C	Thu Jul  4 18:42:08 2002
-@@ -933,7 +933,7 @@
- 					    tmpfig->inset->form->OkBtn);
- 			fl_hide_form(tmpfig->inset->form->Figure);
- 		}
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- #else
- 		fl_free_form(tmpfig->inset->form->Figure);
-@@ -1769,7 +1769,7 @@
- 			if (arg == 8) {
- 				fl_set_focus_object(form->Figure, form->OkBtn);
- 				fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 				// CHECK Reactivate this free_form calls
- #else
- 				fl_free_form(form->Figure);
-@@ -1786,7 +1786,7 @@
- 	case 9:				/* cancel = restore and close */
- 		fl_set_focus_object(form->Figure, form->OkBtn);
- 		fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- 		// Jug, is this still a problem?
- #else
---- src/frontends/kde/GUIRunTime.C.orig	Thu Jul  4 18:43:25 2002
-+++ src/frontends/kde/GUIRunTime.C	Thu Jul  4 18:44:57 2002
-@@ -26,7 +26,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/kde/GUIRunTime.C.
---- src/frontends/gnome/GUIRunTime.C.orig	Thu Jul  4 18:46:08 2002
-+++ src/frontends/gnome/GUIRunTime.C	Thu Jul  4 18:47:23 2002
-@@ -25,7 +25,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/gnome/GUIRunTime.C.
---- src/frontends/xforms/GUIRunTime.C.orig	Thu Jul  4 18:47:48 2002
-+++ src/frontends/xforms/GUIRunTime.C	Thu Jul  4 18:48:18 2002
-@@ -19,7 +19,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
---- src/frontends/xforms/Menubar_pimpl.C.orig	Thu Jul  4 18:49:05 2002
-+++ src/frontends/xforms/Menubar_pimpl.C	Thu Jul  4 18:50:18 2002
-@@ -219,7 +219,7 @@
- static inline
- string const fixlabel(string const & str)
- {
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	return subst(str, '%', '?');
- #else
- 	return subst(str, "%", "%%");
---- src/frontends/xforms/Toolbar_pimpl.C.orig	Thu Jul  4 18:50:40 2002
-+++ src/frontends/xforms/Toolbar_pimpl.C	Thu Jul  4 18:52:37 2002
-@@ -84,13 +84,13 @@
- 	: owner(o), sxpos(x), sypos(y)
- {
- 	combox = 0;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	bubble_timer = 0;
- #endif
- }
- 
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- // timer-cb for bubble-help (Matthias)
- static 
- void BubbleTimerCB(FL_OBJECT *, long data)
-@@ -339,7 +339,7 @@
- 		fl_addto_form(owner->getForm());
- 	}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	// add the time if it don't exist
- 	if (bubble_timer == 0)
- 		bubble_timer = fl_add_timer(FL_HIDDEN_TIMER,
-@@ -383,7 +383,7 @@
- 			fl_set_pixmapbutton_focus_outline(obj, 0);
- 
- 			// Set the tooltip
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 			string help = _(lyxaction.helpText(item->action));
- 			fl_set_object_helper(obj, help.c_str());	
- #else
---- src/frontends/xforms/Toolbar_pimpl.h.orig	Thu Jul  4 18:52:55 2002
-+++ src/frontends/xforms/Toolbar_pimpl.h	Thu Jul  4 18:53:40 2002
-@@ -93,7 +93,7 @@
- 	ToolbarList toollist;
- 	///
- 	LyXView * owner;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	///
- 	FL_OBJECT * bubble_timer;
- #endif
diff --git a/print/lyx15/files/patch-ab b/print/lyx15/files/patch-ab
deleted file mode 100644
index 3e3ecce8853e..000000000000
--- a/print/lyx15/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Mon Jan 17 21:04:28 2000
-+++ po/Makefile.in.in	Tue May  2 21:53:41 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/print/lyx15/files/patch-autogen.sh b/print/lyx15/files/patch-autogen.sh
new file mode 100644
index 000000000000..9358d3a465e0
--- /dev/null
+++ b/print/lyx15/files/patch-autogen.sh
@@ -0,0 +1,32 @@
+--- autogen.sh	Thu Apr 18 22:11:28 2002
++++ autogen.sh	Fri Jun 28 21:55:35 2002
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+ ACLOCAL=aclocal
+-AUTOHEADER=autoheader
++AUTOHEADER=autoheader213
+ AUTOMAKE="automake -a -c --foreign"
+-AUTOCONF=autoconf
++AUTOCONF=autoconf213
+ GNUM4=
+ 
+ ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
+@@ -31,7 +31,7 @@
+ echo "done."
+ 
+ # Generate the Makefiles and configure files
+-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
++if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building macros..."
+ 	for dir in . lib/reLyX sigc++ ; do
+ 	    echo "        $dir"
+@@ -43,7 +43,7 @@
+ 	exit
+ fi
+ 
+-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
++if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building config header template..."
+ 	for dir in . sigc++ ; do
+ 	    echo "        $dir"
diff --git a/print/lyx15/files/patch-config::ltmain.sh b/print/lyx15/files/patch-config::ltmain.sh
new file mode 100644
index 000000000000..29ed1a55df53
--- /dev/null
+++ b/print/lyx15/files/patch-config::ltmain.sh
@@ -0,0 +1,28 @@
+--- config/ltmain.sh	Thu Jan 24 06:28:31 2002
++++ config/ltmain.sh	Fri Jun 28 20:15:12 2002
+@@ -1043,14 +1043,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
diff --git a/print/lyx15/files/patch-sp_spell b/print/lyx15/files/patch-sp_spell
new file mode 100644
index 000000000000..9ec68f198e44
--- /dev/null
+++ b/print/lyx15/files/patch-sp_spell
@@ -0,0 +1,7 @@
+--- src/sp_spell.C	Thu Mar 21 12:25:20 2002
++++ src/sp_spell.C	Wed Jul 31 18:49:57 2002
+@@ -371,3 +371,3 @@
+ 		retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
+-				SELECT_TYPE_ARG234 (&infds),
++				&infds,
+ 				0,
diff --git a/print/lyx15/files/patch-xformsversion b/print/lyx15/files/patch-xformsversion
new file mode 100644
index 000000000000..29db709d6816
--- /dev/null
+++ b/print/lyx15/files/patch-xformsversion
@@ -0,0 +1,13 @@
+--- src/frontends/xforms/GUIRunTime.C	Thu Mar 21 16:18:03 2002
++++ src/frontends/xforms/GUIRunTime.C	Wed Jul 31 18:39:04 2002
+@@ -26,10 +26,2 @@
+ 
+-// I keep these here so that it will be processed as early in
+-// the compilation process as possible.
+-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
+-#error LyX will not compile with this version of XForms.\
+-       Please get version 0.89.\
+-       If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
+-#endif
+-
+ 
diff --git a/print/lyx15/files/patch-xpm b/print/lyx15/files/patch-xpm
new file mode 100644
index 000000000000..4ca930ba2341
--- /dev/null
+++ b/print/lyx15/files/patch-xpm
@@ -0,0 +1,7 @@
+--- src/graphics/GraphicsImageXPM.h	Thu Mar 21 12:27:08 2002
++++ src/graphics/GraphicsImageXPM.h	Wed Jul 31 18:08:13 2002
+@@ -17,3 +17,3 @@
+ #include "GraphicsImage.h"
+-#include XPM_H_LOCATION
++#include <X11/xpm.h>
+ #include "support/smart_ptr.h"
diff --git a/print/lyx15/pkg-plist b/print/lyx15/pkg-plist
index 98d7e0895750..c813e083c349 100644
--- a/print/lyx15/pkg-plist
+++ b/print/lyx15/pkg-plist
@@ -1,7 +1,7 @@
-bin/listerrors
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
+share/locale/bg/LC_MESSAGES/lyx.mo
 share/locale/ca/LC_MESSAGES/lyx.mo
 share/locale/cs/LC_MESSAGES/lyx.mo
 share/locale/da/LC_MESSAGES/lyx.mo
@@ -19,6 +19,7 @@ share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
 share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
@@ -29,9 +30,8 @@ share/lyx/bind/cua.bind
 share/lyx/bind/de_menus.bind
 share/lyx/bind/emacs.bind
 share/lyx/bind/fi_menus.bind
-share/lyx/bind/fr_menus.bind
 share/lyx/bind/hollywood.bind
-share/lyx/bind/hu_menus.bind
+share/lyx/bind/latinkeys.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
 share/lyx/bind/pt_menus.bind
@@ -42,11 +42,9 @@ share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
 share/lyx/configure
 share/lyx/configure.cmd
-share/lyx/doc/BUGS.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DocStyle.lyx
 share/lyx/doc/Extended.lyx
-share/lyx/doc/ExternalMaterial.lyx
 share/lyx/doc/FAQ.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LaTeXConfig.lyx
@@ -60,7 +58,6 @@ share/lyx/doc/cs_TOC.lyx
 share/lyx/doc/cs_Tutorial.lyx
 share/lyx/doc/da_Intro.lyx
 share/lyx/doc/da_TOC.lyx
-share/lyx/doc/de_BUGS.lyx
 share/lyx/doc/de_Customization.lyx
 share/lyx/doc/de_Extended.lyx
 share/lyx/doc/de_FAQ.lyx
@@ -75,10 +72,8 @@ share/lyx/doc/escher-lsd.eps
 share/lyx/doc/eu_Intro.lyx
 share/lyx/doc/eu_TOC.lyx
 share/lyx/doc/eu_Tutorial.lyx
-share/lyx/doc/fr_BUGS.lyx
 share/lyx/doc/fr_Customization.lyx
 share/lyx/doc/fr_Extended.lyx
-share/lyx/doc/fr_ExternalMaterial.lyx
 share/lyx/doc/fr_FAQ.lyx
 share/lyx/doc/fr_Intro.lyx
 share/lyx/doc/fr_TOC.lyx
@@ -104,6 +99,13 @@ share/lyx/doc/pt_TOC.lyx
 share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
+share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_Intro.lyx
+share/lyx/doc/ru_TOC.lyx
+share/lyx/doc/ru_Tutorial.lyx
+share/lyx/doc/sk_TOC.lyx
+share/lyx/doc/sk_Tutorial.lyx
+share/lyx/doc/sk_UserGuide.lyx
 share/lyx/doc/sl_Intro.lyx
 share/lyx/doc/sl_TOC.lyx
 share/lyx/doc/sl_Tutorial.lyx
@@ -114,7 +116,6 @@ share/lyx/encodings
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
 share/lyx/examples/Literate.lyx
-share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Minipage.lyx
 share/lyx/examples/TableExamples.lyx
 share/lyx/examples/aa_sample.lyx
@@ -122,6 +123,9 @@ share/lyx/examples/aas_sample.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
 share/lyx/examples/ca_splash.lyx
+share/lyx/examples/chess-article.lyx
+share/lyx/examples/chessgame.lyx
+share/lyx/examples/currency.lyx
 share/lyx/examples/cv.lyx
 share/lyx/examples/da_splash.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
@@ -138,7 +142,6 @@ share/lyx/examples/eu_splash.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/fr_AlignementDecimal.lyx
-share/lyx/examples/fr_EtiquetteMath.lyx
 share/lyx/examples/fr_ExemplesTableaux.lyx
 share/lyx/examples/fr_ListesPuces.lyx
 share/lyx/examples/fr_Minipage.lyx
@@ -147,11 +150,16 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_splash.lyx
 share/lyx/examples/hu_splash.lyx
+share/lyx/examples/iecc05.fen
+share/lyx/examples/iecc07.fen
+share/lyx/examples/iecc12.fen
 share/lyx/examples/it_ItemizeBullets.lyx
 share/lyx/examples/it_splash.lyx
 share/lyx/examples/landslide.lyx
+share/lyx/examples/linuxdoc_manpage.lyx
+share/lyx/examples/listerrors.lyx
+share/lyx/examples/mathed.lyx
 share/lyx/examples/multicol.lyx
-share/lyx/examples/nl_MathLabeling.lyx
 share/lyx/examples/nl_multicol.lyx
 share/lyx/examples/nl_opsommingstekens.lyx
 share/lyx/examples/nl_splash.lyx
@@ -167,12 +175,13 @@ share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
 share/lyx/examples/splash.lyx
 share/lyx/external_templates
+share/lyx/help/Bibtex.hlp
+share/lyx/help/Texinfo.hlp
 share/lyx/images/amssymb.xpm
 share/lyx/images/banner.xpm
 share/lyx/images/buffer-close.xpm
 share/lyx/images/buffer-export_ascii.xpm
 share/lyx/images/buffer-export_latex.xpm
-share/lyx/images/buffer-open.xpm
 share/lyx/images/buffer-print.xpm
 share/lyx/images/buffer-update_dvi.xpm
 share/lyx/images/buffer-update_ps.xpm
@@ -180,17 +189,23 @@ share/lyx/images/buffer-view_dvi.xpm
 share/lyx/images/buffer-view_ps.xpm
 share/lyx/images/buffer-write.xpm
 share/lyx/images/build-program.xpm
+share/lyx/images/citation-insert.xpm
 share/lyx/images/copy.xpm
 share/lyx/images/cut.xpm
-share/lyx/images/depth-next.xpm
+share/lyx/images/depth-decrement.xpm
+share/lyx/images/depth-increment.xpm
 share/lyx/images/dialog-tabular-insert.xpm
-share/lyx/images/figure-insert.xpm
+share/lyx/images/ert-insert.xpm
+share/lyx/images/file-open.xpm
 share/lyx/images/font-bold.xpm
 share/lyx/images/font-emph.xpm
 share/lyx/images/font-free.xpm
 share/lyx/images/font-noun.xpm
 share/lyx/images/font-sans.xpm
 share/lyx/images/footnote-insert.xpm
+share/lyx/images/graphics-insert.xpm
+share/lyx/images/index-insert.xpm
+share/lyx/images/label-insert.xpm
 share/lyx/images/layout.xpm
 share/lyx/images/layout_LaTeX.xpm
 share/lyx/images/layout_LyX-Code.xpm
@@ -199,8 +214,8 @@ share/lyx/images/layout_Section.xpm
 share/lyx/images/lyx-quit.xpm
 share/lyx/images/lyx.xpm
 share/lyx/images/marginalnote-insert.xpm
-share/lyx/images/marginpar-insert.xpm
 share/lyx/images/math-mode.xpm
+share/lyx/images/math-panel.xpm
 share/lyx/images/melt.xpm
 share/lyx/images/paste.xpm
 share/lyx/images/psnfss1.xpm
@@ -210,12 +225,12 @@ share/lyx/images/psnfss4.xpm
 share/lyx/images/redo.xpm
 share/lyx/images/standard.xpm
 share/lyx/images/tabular-insert.xpm
-share/lyx/images/tex-mode.xpm
 share/lyx/images/undo.xpm
 share/lyx/images/unknown.xpm
 share/lyx/kbd/american-2.kmap
 share/lyx/kbd/american.kmap
 share/lyx/kbd/arabic.kmap
+share/lyx/kbd/bg-bds-1251.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech-prg.kmap
@@ -235,6 +250,7 @@ share/lyx/kbd/iso8859-3.cdef
 share/lyx/kbd/iso8859-4.cdef
 share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/iso8859-8.cdef
+share/lyx/kbd/iso8859-9.cdef
 share/lyx/kbd/koi8-r.kmap
 share/lyx/kbd/koi8-u.kmap
 share/lyx/kbd/latvian.kmap
@@ -274,6 +290,7 @@ share/lyx/layouts/apa.layout
 share/lyx/layouts/article.layout
 share/lyx/layouts/book.layout
 share/lyx/layouts/broadway.layout
+share/lyx/layouts/chess.layout
 share/lyx/layouts/cv.layout
 share/lyx/layouts/db_lyxmacros.inc
 share/lyx/layouts/db_stdclass.inc
@@ -288,8 +305,8 @@ share/lyx/layouts/docbook-book.layout
 share/lyx/layouts/docbook-chapter.layout
 share/lyx/layouts/docbook-section.layout
 share/lyx/layouts/docbook.layout
+share/lyx/layouts/dtk.layout
 share/lyx/layouts/egs.layout
-share/lyx/layouts/ejour2.layout
 share/lyx/layouts/entcs.layout
 share/lyx/layouts/extarticle.layout
 share/lyx/layouts/extbook.layout
@@ -311,6 +328,7 @@ share/lyx/layouts/literate-book.layout
 share/lyx/layouts/literate-report.layout
 share/lyx/layouts/literate-scrap.inc
 share/lyx/layouts/llncs.layout
+share/lyx/layouts/ltugboat.layout
 share/lyx/layouts/lyxmacros.inc
 share/lyx/layouts/manpage.layout
 share/lyx/layouts/obsolete.inc
@@ -327,6 +345,7 @@ share/lyx/layouts/scrreprt.layout
 share/lyx/layouts/seminar.layout
 share/lyx/layouts/siamltex.layout
 share/lyx/layouts/slides.layout
+share/lyx/layouts/spie.layout
 share/lyx/layouts/stdclass.inc
 share/lyx/layouts/stdlayouts.inc
 share/lyx/layouts/stdletter.inc
@@ -337,6 +356,7 @@ share/lyx/layouts/stdstruct.inc
 share/lyx/layouts/stdtitle.inc
 share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
+share/lyx/layouts/svprobth.layout
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst
@@ -355,17 +375,20 @@ share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
-share/lyx/scripts/fen2latex.py
+share/lyx/scripts/TeXFiles.sh
+share/lyx/scripts/fen2ascii.py
 share/lyx/scripts/fig2pstex.py
 share/lyx/scripts/general_command_wrapper.py
+share/lyx/scripts/listerrors
 share/lyx/scripts/pic2ascii.py
 share/lyx/scripts/pic2png_eps.py
 share/lyx/scripts/pic2png_eps.sh
+share/lyx/symbols
 share/lyx/templates/IEEEtran.lyx
 share/lyx/templates/aa.lyx
 share/lyx/templates/aastex.lyx
 share/lyx/templates/dinbrief.lyx
-share/lyx/templates/docbook_template.lyx
+share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
@@ -373,30 +396,42 @@ share/lyx/templates/iletter.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
-share/lyx/templates/linuxdoctemplate.lyx
+share/lyx/templates/linuxdoc_article.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/revtex4.lyx
 share/lyx/templates/slides.lyx
 share/lyx/tex/broadway.cls
 share/lyx/tex/cv.cls
-share/lyx/tex/ejour2.cls
 share/lyx/tex/hollywood.cls
 share/lyx/tex/iletter.cls
+share/lyx/tex/lyxchess.sty
+share/lyx/tex/lyxskak.sty
 share/lyx/tex/revtex.cls
 share/lyx/textclass.lst
 share/lyx/ui/default.ui
 share/lyx/ui/old-default.ui
-@dirrm share/lyx/bind
-@dirrm share/lyx/clipart
-@dirrm share/lyx/doc
-@dirrm share/lyx/examples
-@dirrm share/lyx/images
-@dirrm share/lyx/kbd
-@dirrm share/lyx/layouts
+share/lyx/xfonts/cmex10.pfb
+share/lyx/xfonts/cmmi10.pfb
+share/lyx/xfonts/cmr10.pfb
+share/lyx/xfonts/cmsy10.pfb
+share/lyx/xfonts/eufm10.pfb
+share/lyx/xfonts/fonts.dir
+share/lyx/xfonts/fonts.scale
+share/lyx/xfonts/msam10.pfb
+share/lyx/xfonts/msbm10.pfb
+@dirrm share/lyx/xfonts
+@dirrm share/lyx/ui
+@dirrm share/lyx/tex
+@dirrm share/lyx/templates
+@dirrm share/lyx/scripts
 @dirrm share/lyx/reLyX/Text
 @dirrm share/lyx/reLyX
-@dirrm share/lyx/scripts
-@dirrm share/lyx/templates
-@dirrm share/lyx/tex
-@dirrm share/lyx/ui
+@dirrm share/lyx/layouts
+@dirrm share/lyx/kbd
+@dirrm share/lyx/images
+@dirrm share/lyx/help
+@dirrm share/lyx/examples
+@dirrm share/lyx/doc
+@dirrm share/lyx/clipart
+@dirrm share/lyx/bind
 @dirrm share/lyx
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 08be942e5e8b..d042c47f05ed 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -6,47 +6,58 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.4
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
-DISTNAME=	lyx-1.1.6
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
-		patch-1.1.6fix4.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		latex:${PORTSDIR}/print/teTeX
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
+		forms.1:${PORTSDIR}/x11-toolkits/xforms
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+.if defined(WITH_ASPELL)
+LIB_DEPENDS+= aspell.11:${PORTSDIR}/textproc/aspell
+CONFIGURE_ARGS+=--with-pspell
+.endif
+
 .if defined(WITH_ISPELL)
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
-LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
-		intl.2:${PORTSDIR}/devel/gettext
+
+pre-everything::
+.if !defined(WITH_ASPELL) && !defined(WITH_ISPELL)
+	#
+	# If you want to compile with Aspell/Pspell or Ispell support,
+	# hit Ctrl-C right now and use
+	#	"make WITH_ASPELL=yes"
+	# or
+	#	"make WITH_ISPELL=yes"
+	#
+.endif
 
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 USE_XPM=	yes
-USE_NEWGCC=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
+USE_AUTOMAKE_VER=15
+AUTOMAKE=	${WRKSRC}/autogen.sh
+AUTOCONF=	${TRUE}
 CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
-		--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
+		--with-extra-inc="${X11BASE}/include/X11 ${X11BASE}/include \
+		${LOCALBASE}/include"
+CONFIGURE_ENV+=	LDFLAGS="-L${X11BASE}/lib -lXpm -lX11"
 MAN1=		lyx.1 reLyX.1
 
-.if !defined(WITH_ISPELL)
-pre-fetch:
-	@${ECHO_MSG} "If you want this port built with spell checker support, use"
-	@${ECHO_MSG} "make WITH_ISPELL=yes"
-.endif
-
 post-patch:
-	(cd ${WRKSRC}; ${TOUCH} Makefile.in */Makefile.in src/config.h.in)
-	(cd ${WRKSRC}/lib/doc; ${RM} -f *.orig)
+	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|-lxforms|-lforms|g' \
+		-e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g' \
+		-e 's|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/lyx16/distinfo b/print/lyx16/distinfo
index acc6538b7564..0495ced219ad 100644
--- a/print/lyx16/distinfo
+++ b/print/lyx16/distinfo
@@ -1,5 +1 @@
-MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
-MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
-MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
-MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
-MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
+MD5 (lyx-1.2.0.tar.gz) = cc7592d311f3dfd2db01f9ca5e506fb6
diff --git a/print/lyx16/files/patch-aa b/print/lyx16/files/patch-aa
deleted file mode 100644
index af9207168a48..000000000000
--- a/print/lyx16/files/patch-aa
+++ /dev/null
@@ -1,216 +0,0 @@
---- src/LyXView.C.orig	Thu Jul  4 18:26:33 2002
-+++ src/LyXView.C	Thu Jul  4 18:28:28 2002
-@@ -19,7 +19,7 @@
- 
- #include "LyXView.h"
- #include "lyx_main.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "minibuffer.h"
-@@ -214,7 +214,7 @@
- {
- 	fl_show_form(form_, place, border, title.c_str());
- 	minibuffer->Init();
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	InitLyXLookup(fl_get_display(), form_->window);
- #endif
- }
---- src/WorkArea.C.orig2	Thu Jul  4 18:33:22 2002
-+++ src/WorkArea.C	Thu Jul  4 18:36:02 2002
-@@ -24,7 +24,7 @@
- #include "LyXView.h"
- #include "lyxfunc.h"
- 
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- 
-@@ -323,7 +323,7 @@
- 				      ev->xbutton.y - ob->y,
- 				      ev->xbutton.button);
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_MOUSE:
- #else
- 	case FL_DRAG:
-@@ -339,7 +339,7 @@
- 					     ev->xbutton.state);
- 		}
- 		break;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	case FL_KEYBOARD:
- #else
- 	case FL_KEYPRESS:
-@@ -350,7 +350,7 @@
- 		KeySym keysym = 0;
- 		char dummy[1];
- 		XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 		// XForms < 0.89.5 does not have compose support
- 		// so we are using our own compose support
- 		LyXLookupString(ev, dummy, 1, &keysym);
-@@ -369,7 +369,7 @@
- 			       << keysym << "]" << endl;
- 		}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 		if (keysym == NoSymbol) {
- 			lyxerr[Debug::KEY]
- 				<< "Empty kdb action (probably composing)"
-@@ -446,7 +446,7 @@
- 	}
- 	break;
- 
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 	case FL_KEYRELEASE:
- 		lyxerr << "Workarea event: KEYRELEASE" << endl;
- 		break;
---- src/lyx_gui.C.orig2	Thu Jul  4 18:36:45 2002
-+++ src/lyx_gui.C	Thu Jul  4 18:39:42 2002
-@@ -36,7 +36,7 @@
- #include "lyxrc.h"
- #include "gettext.h"
- #include "lyx_gui_misc.h"
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- #include "lyxlookup.h"
- #endif
- #include "bufferlist.h"
-@@ -171,7 +171,7 @@
- 	delete lyxserver;
- 	lyxserver = 0;
- 	delete lyxViews;
--#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
-+#if (FL_VERSION == 0 && FL_REVISION < 89) || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
- 	CloseLyXLookup();
- #endif
- }
---- src/insets/figinset.C.orig2	Thu Jul  4 18:40:17 2002
-+++ src/insets/figinset.C	Thu Jul  4 18:42:08 2002
-@@ -933,7 +933,7 @@
- 					    tmpfig->inset->form->OkBtn);
- 			fl_hide_form(tmpfig->inset->form->Figure);
- 		}
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- #else
- 		fl_free_form(tmpfig->inset->form->Figure);
-@@ -1769,7 +1769,7 @@
- 			if (arg == 8) {
- 				fl_set_focus_object(form->Figure, form->OkBtn);
- 				fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 				// CHECK Reactivate this free_form calls
- #else
- 				fl_free_form(form->Figure);
-@@ -1786,7 +1786,7 @@
- 	case 9:				/* cancel = restore and close */
- 		fl_set_focus_object(form->Figure, form->OkBtn);
- 		fl_hide_form(form->Figure);
--#if FL_REVISION == 89
-+#if (FL_VERSION == 0 && FL_REVISION == 89)
- 		// CHECK Reactivate this free_form calls
- 		// Jug, is this still a problem?
- #else
---- src/frontends/kde/GUIRunTime.C.orig	Thu Jul  4 18:43:25 2002
-+++ src/frontends/kde/GUIRunTime.C	Thu Jul  4 18:44:57 2002
-@@ -26,7 +26,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/kde/GUIRunTime.C.
---- src/frontends/gnome/GUIRunTime.C.orig	Thu Jul  4 18:46:08 2002
-+++ src/frontends/gnome/GUIRunTime.C	Thu Jul  4 18:47:23 2002
-@@ -25,7 +25,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/gnome/GUIRunTime.C.
---- src/frontends/xforms/GUIRunTime.C.orig	Thu Jul  4 18:47:48 2002
-+++ src/frontends/xforms/GUIRunTime.C	Thu Jul  4 18:48:18 2002
-@@ -19,7 +19,7 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
--#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
-+#if !defined(FL_REVISION) || (FL_REVISION < 88 && FL_VERSION == 0)
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
---- src/frontends/xforms/Menubar_pimpl.C.orig	Thu Jul  4 18:49:05 2002
-+++ src/frontends/xforms/Menubar_pimpl.C	Thu Jul  4 18:50:18 2002
-@@ -219,7 +219,7 @@
- static inline
- string const fixlabel(string const & str)
- {
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	return subst(str, '%', '?');
- #else
- 	return subst(str, "%", "%%");
---- src/frontends/xforms/Toolbar_pimpl.C.orig	Thu Jul  4 18:50:40 2002
-+++ src/frontends/xforms/Toolbar_pimpl.C	Thu Jul  4 18:52:37 2002
-@@ -84,13 +84,13 @@
- 	: owner(o), sxpos(x), sypos(y)
- {
- 	combox = 0;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	bubble_timer = 0;
- #endif
- }
- 
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- // timer-cb for bubble-help (Matthias)
- static 
- void BubbleTimerCB(FL_OBJECT *, long data)
-@@ -339,7 +339,7 @@
- 		fl_addto_form(owner->getForm());
- 	}
- 
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	// add the time if it don't exist
- 	if (bubble_timer == 0)
- 		bubble_timer = fl_add_timer(FL_HIDDEN_TIMER,
-@@ -383,7 +383,7 @@
- 			fl_set_pixmapbutton_focus_outline(obj, 0);
- 
- 			// Set the tooltip
--#if FL_REVISION >= 89
-+#if (FL_VERSION > 0 || FL_REVISION >= 89)
- 			string help = _(lyxaction.helpText(item->action));
- 			fl_set_object_helper(obj, help.c_str());	
- #else
---- src/frontends/xforms/Toolbar_pimpl.h.orig	Thu Jul  4 18:52:55 2002
-+++ src/frontends/xforms/Toolbar_pimpl.h	Thu Jul  4 18:53:40 2002
-@@ -93,7 +93,7 @@
- 	ToolbarList toollist;
- 	///
- 	LyXView * owner;
--#if FL_REVISION < 89
-+#if (FL_VERSION == 0 && FL_REVISION < 89)
- 	///
- 	FL_OBJECT * bubble_timer;
- #endif
diff --git a/print/lyx16/files/patch-ab b/print/lyx16/files/patch-ab
deleted file mode 100644
index 3e3ecce8853e..000000000000
--- a/print/lyx16/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Mon Jan 17 21:04:28 2000
-+++ po/Makefile.in.in	Tue May  2 21:53:41 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/print/lyx16/files/patch-autogen.sh b/print/lyx16/files/patch-autogen.sh
new file mode 100644
index 000000000000..9358d3a465e0
--- /dev/null
+++ b/print/lyx16/files/patch-autogen.sh
@@ -0,0 +1,32 @@
+--- autogen.sh	Thu Apr 18 22:11:28 2002
++++ autogen.sh	Fri Jun 28 21:55:35 2002
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+ ACLOCAL=aclocal
+-AUTOHEADER=autoheader
++AUTOHEADER=autoheader213
+ AUTOMAKE="automake -a -c --foreign"
+-AUTOCONF=autoconf
++AUTOCONF=autoconf213
+ GNUM4=
+ 
+ ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
+@@ -31,7 +31,7 @@
+ echo "done."
+ 
+ # Generate the Makefiles and configure files
+-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
++if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building macros..."
+ 	for dir in . lib/reLyX sigc++ ; do
+ 	    echo "        $dir"
+@@ -43,7 +43,7 @@
+ 	exit
+ fi
+ 
+-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
++if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
+ 	echo "Building config header template..."
+ 	for dir in . sigc++ ; do
+ 	    echo "        $dir"
diff --git a/print/lyx16/files/patch-config::ltmain.sh b/print/lyx16/files/patch-config::ltmain.sh
new file mode 100644
index 000000000000..29ed1a55df53
--- /dev/null
+++ b/print/lyx16/files/patch-config::ltmain.sh
@@ -0,0 +1,28 @@
+--- config/ltmain.sh	Thu Jan 24 06:28:31 2002
++++ config/ltmain.sh	Fri Jun 28 20:15:12 2002
+@@ -1043,14 +1043,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
diff --git a/print/lyx16/files/patch-sp_spell b/print/lyx16/files/patch-sp_spell
new file mode 100644
index 000000000000..9ec68f198e44
--- /dev/null
+++ b/print/lyx16/files/patch-sp_spell
@@ -0,0 +1,7 @@
+--- src/sp_spell.C	Thu Mar 21 12:25:20 2002
++++ src/sp_spell.C	Wed Jul 31 18:49:57 2002
+@@ -371,3 +371,3 @@
+ 		retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
+-				SELECT_TYPE_ARG234 (&infds),
++				&infds,
+ 				0,
diff --git a/print/lyx16/files/patch-xformsversion b/print/lyx16/files/patch-xformsversion
new file mode 100644
index 000000000000..29db709d6816
--- /dev/null
+++ b/print/lyx16/files/patch-xformsversion
@@ -0,0 +1,13 @@
+--- src/frontends/xforms/GUIRunTime.C	Thu Mar 21 16:18:03 2002
++++ src/frontends/xforms/GUIRunTime.C	Wed Jul 31 18:39:04 2002
+@@ -26,10 +26,2 @@
+ 
+-// I keep these here so that it will be processed as early in
+-// the compilation process as possible.
+-#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
+-#error LyX will not compile with this version of XForms.\
+-       Please get version 0.89.\
+-       If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
+-#endif
+-
+ 
diff --git a/print/lyx16/files/patch-xpm b/print/lyx16/files/patch-xpm
new file mode 100644
index 000000000000..4ca930ba2341
--- /dev/null
+++ b/print/lyx16/files/patch-xpm
@@ -0,0 +1,7 @@
+--- src/graphics/GraphicsImageXPM.h	Thu Mar 21 12:27:08 2002
++++ src/graphics/GraphicsImageXPM.h	Wed Jul 31 18:08:13 2002
+@@ -17,3 +17,3 @@
+ #include "GraphicsImage.h"
+-#include XPM_H_LOCATION
++#include <X11/xpm.h>
+ #include "support/smart_ptr.h"
diff --git a/print/lyx16/pkg-plist b/print/lyx16/pkg-plist
index 98d7e0895750..c813e083c349 100644
--- a/print/lyx16/pkg-plist
+++ b/print/lyx16/pkg-plist
@@ -1,7 +1,7 @@
-bin/listerrors
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
+share/locale/bg/LC_MESSAGES/lyx.mo
 share/locale/ca/LC_MESSAGES/lyx.mo
 share/locale/cs/LC_MESSAGES/lyx.mo
 share/locale/da/LC_MESSAGES/lyx.mo
@@ -19,6 +19,7 @@ share/locale/pl/LC_MESSAGES/lyx.mo
 share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
 share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
@@ -29,9 +30,8 @@ share/lyx/bind/cua.bind
 share/lyx/bind/de_menus.bind
 share/lyx/bind/emacs.bind
 share/lyx/bind/fi_menus.bind
-share/lyx/bind/fr_menus.bind
 share/lyx/bind/hollywood.bind
-share/lyx/bind/hu_menus.bind
+share/lyx/bind/latinkeys.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
 share/lyx/bind/pt_menus.bind
@@ -42,11 +42,9 @@ share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
 share/lyx/configure
 share/lyx/configure.cmd
-share/lyx/doc/BUGS.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DocStyle.lyx
 share/lyx/doc/Extended.lyx
-share/lyx/doc/ExternalMaterial.lyx
 share/lyx/doc/FAQ.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LaTeXConfig.lyx
@@ -60,7 +58,6 @@ share/lyx/doc/cs_TOC.lyx
 share/lyx/doc/cs_Tutorial.lyx
 share/lyx/doc/da_Intro.lyx
 share/lyx/doc/da_TOC.lyx
-share/lyx/doc/de_BUGS.lyx
 share/lyx/doc/de_Customization.lyx
 share/lyx/doc/de_Extended.lyx
 share/lyx/doc/de_FAQ.lyx
@@ -75,10 +72,8 @@ share/lyx/doc/escher-lsd.eps
 share/lyx/doc/eu_Intro.lyx
 share/lyx/doc/eu_TOC.lyx
 share/lyx/doc/eu_Tutorial.lyx
-share/lyx/doc/fr_BUGS.lyx
 share/lyx/doc/fr_Customization.lyx
 share/lyx/doc/fr_Extended.lyx
-share/lyx/doc/fr_ExternalMaterial.lyx
 share/lyx/doc/fr_FAQ.lyx
 share/lyx/doc/fr_Intro.lyx
 share/lyx/doc/fr_TOC.lyx
@@ -104,6 +99,13 @@ share/lyx/doc/pt_TOC.lyx
 share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
+share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_Intro.lyx
+share/lyx/doc/ru_TOC.lyx
+share/lyx/doc/ru_Tutorial.lyx
+share/lyx/doc/sk_TOC.lyx
+share/lyx/doc/sk_Tutorial.lyx
+share/lyx/doc/sk_UserGuide.lyx
 share/lyx/doc/sl_Intro.lyx
 share/lyx/doc/sl_TOC.lyx
 share/lyx/doc/sl_Tutorial.lyx
@@ -114,7 +116,6 @@ share/lyx/encodings
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
 share/lyx/examples/Literate.lyx
-share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Minipage.lyx
 share/lyx/examples/TableExamples.lyx
 share/lyx/examples/aa_sample.lyx
@@ -122,6 +123,9 @@ share/lyx/examples/aas_sample.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
 share/lyx/examples/ca_splash.lyx
+share/lyx/examples/chess-article.lyx
+share/lyx/examples/chessgame.lyx
+share/lyx/examples/currency.lyx
 share/lyx/examples/cv.lyx
 share/lyx/examples/da_splash.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
@@ -138,7 +142,6 @@ share/lyx/examples/eu_splash.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/fr_AlignementDecimal.lyx
-share/lyx/examples/fr_EtiquetteMath.lyx
 share/lyx/examples/fr_ExemplesTableaux.lyx
 share/lyx/examples/fr_ListesPuces.lyx
 share/lyx/examples/fr_Minipage.lyx
@@ -147,11 +150,16 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_splash.lyx
 share/lyx/examples/hu_splash.lyx
+share/lyx/examples/iecc05.fen
+share/lyx/examples/iecc07.fen
+share/lyx/examples/iecc12.fen
 share/lyx/examples/it_ItemizeBullets.lyx
 share/lyx/examples/it_splash.lyx
 share/lyx/examples/landslide.lyx
+share/lyx/examples/linuxdoc_manpage.lyx
+share/lyx/examples/listerrors.lyx
+share/lyx/examples/mathed.lyx
 share/lyx/examples/multicol.lyx
-share/lyx/examples/nl_MathLabeling.lyx
 share/lyx/examples/nl_multicol.lyx
 share/lyx/examples/nl_opsommingstekens.lyx
 share/lyx/examples/nl_splash.lyx
@@ -167,12 +175,13 @@ share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
 share/lyx/examples/splash.lyx
 share/lyx/external_templates
+share/lyx/help/Bibtex.hlp
+share/lyx/help/Texinfo.hlp
 share/lyx/images/amssymb.xpm
 share/lyx/images/banner.xpm
 share/lyx/images/buffer-close.xpm
 share/lyx/images/buffer-export_ascii.xpm
 share/lyx/images/buffer-export_latex.xpm
-share/lyx/images/buffer-open.xpm
 share/lyx/images/buffer-print.xpm
 share/lyx/images/buffer-update_dvi.xpm
 share/lyx/images/buffer-update_ps.xpm
@@ -180,17 +189,23 @@ share/lyx/images/buffer-view_dvi.xpm
 share/lyx/images/buffer-view_ps.xpm
 share/lyx/images/buffer-write.xpm
 share/lyx/images/build-program.xpm
+share/lyx/images/citation-insert.xpm
 share/lyx/images/copy.xpm
 share/lyx/images/cut.xpm
-share/lyx/images/depth-next.xpm
+share/lyx/images/depth-decrement.xpm
+share/lyx/images/depth-increment.xpm
 share/lyx/images/dialog-tabular-insert.xpm
-share/lyx/images/figure-insert.xpm
+share/lyx/images/ert-insert.xpm
+share/lyx/images/file-open.xpm
 share/lyx/images/font-bold.xpm
 share/lyx/images/font-emph.xpm
 share/lyx/images/font-free.xpm
 share/lyx/images/font-noun.xpm
 share/lyx/images/font-sans.xpm
 share/lyx/images/footnote-insert.xpm
+share/lyx/images/graphics-insert.xpm
+share/lyx/images/index-insert.xpm
+share/lyx/images/label-insert.xpm
 share/lyx/images/layout.xpm
 share/lyx/images/layout_LaTeX.xpm
 share/lyx/images/layout_LyX-Code.xpm
@@ -199,8 +214,8 @@ share/lyx/images/layout_Section.xpm
 share/lyx/images/lyx-quit.xpm
 share/lyx/images/lyx.xpm
 share/lyx/images/marginalnote-insert.xpm
-share/lyx/images/marginpar-insert.xpm
 share/lyx/images/math-mode.xpm
+share/lyx/images/math-panel.xpm
 share/lyx/images/melt.xpm
 share/lyx/images/paste.xpm
 share/lyx/images/psnfss1.xpm
@@ -210,12 +225,12 @@ share/lyx/images/psnfss4.xpm
 share/lyx/images/redo.xpm
 share/lyx/images/standard.xpm
 share/lyx/images/tabular-insert.xpm
-share/lyx/images/tex-mode.xpm
 share/lyx/images/undo.xpm
 share/lyx/images/unknown.xpm
 share/lyx/kbd/american-2.kmap
 share/lyx/kbd/american.kmap
 share/lyx/kbd/arabic.kmap
+share/lyx/kbd/bg-bds-1251.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech-prg.kmap
@@ -235,6 +250,7 @@ share/lyx/kbd/iso8859-3.cdef
 share/lyx/kbd/iso8859-4.cdef
 share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/iso8859-8.cdef
+share/lyx/kbd/iso8859-9.cdef
 share/lyx/kbd/koi8-r.kmap
 share/lyx/kbd/koi8-u.kmap
 share/lyx/kbd/latvian.kmap
@@ -274,6 +290,7 @@ share/lyx/layouts/apa.layout
 share/lyx/layouts/article.layout
 share/lyx/layouts/book.layout
 share/lyx/layouts/broadway.layout
+share/lyx/layouts/chess.layout
 share/lyx/layouts/cv.layout
 share/lyx/layouts/db_lyxmacros.inc
 share/lyx/layouts/db_stdclass.inc
@@ -288,8 +305,8 @@ share/lyx/layouts/docbook-book.layout
 share/lyx/layouts/docbook-chapter.layout
 share/lyx/layouts/docbook-section.layout
 share/lyx/layouts/docbook.layout
+share/lyx/layouts/dtk.layout
 share/lyx/layouts/egs.layout
-share/lyx/layouts/ejour2.layout
 share/lyx/layouts/entcs.layout
 share/lyx/layouts/extarticle.layout
 share/lyx/layouts/extbook.layout
@@ -311,6 +328,7 @@ share/lyx/layouts/literate-book.layout
 share/lyx/layouts/literate-report.layout
 share/lyx/layouts/literate-scrap.inc
 share/lyx/layouts/llncs.layout
+share/lyx/layouts/ltugboat.layout
 share/lyx/layouts/lyxmacros.inc
 share/lyx/layouts/manpage.layout
 share/lyx/layouts/obsolete.inc
@@ -327,6 +345,7 @@ share/lyx/layouts/scrreprt.layout
 share/lyx/layouts/seminar.layout
 share/lyx/layouts/siamltex.layout
 share/lyx/layouts/slides.layout
+share/lyx/layouts/spie.layout
 share/lyx/layouts/stdclass.inc
 share/lyx/layouts/stdlayouts.inc
 share/lyx/layouts/stdletter.inc
@@ -337,6 +356,7 @@ share/lyx/layouts/stdstruct.inc
 share/lyx/layouts/stdtitle.inc
 share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
+share/lyx/layouts/svprobth.layout
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst
@@ -355,17 +375,20 @@ share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
-share/lyx/scripts/fen2latex.py
+share/lyx/scripts/TeXFiles.sh
+share/lyx/scripts/fen2ascii.py
 share/lyx/scripts/fig2pstex.py
 share/lyx/scripts/general_command_wrapper.py
+share/lyx/scripts/listerrors
 share/lyx/scripts/pic2ascii.py
 share/lyx/scripts/pic2png_eps.py
 share/lyx/scripts/pic2png_eps.sh
+share/lyx/symbols
 share/lyx/templates/IEEEtran.lyx
 share/lyx/templates/aa.lyx
 share/lyx/templates/aastex.lyx
 share/lyx/templates/dinbrief.lyx
-share/lyx/templates/docbook_template.lyx
+share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
@@ -373,30 +396,42 @@ share/lyx/templates/iletter.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
-share/lyx/templates/linuxdoctemplate.lyx
+share/lyx/templates/linuxdoc_article.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/revtex4.lyx
 share/lyx/templates/slides.lyx
 share/lyx/tex/broadway.cls
 share/lyx/tex/cv.cls
-share/lyx/tex/ejour2.cls
 share/lyx/tex/hollywood.cls
 share/lyx/tex/iletter.cls
+share/lyx/tex/lyxchess.sty
+share/lyx/tex/lyxskak.sty
 share/lyx/tex/revtex.cls
 share/lyx/textclass.lst
 share/lyx/ui/default.ui
 share/lyx/ui/old-default.ui
-@dirrm share/lyx/bind
-@dirrm share/lyx/clipart
-@dirrm share/lyx/doc
-@dirrm share/lyx/examples
-@dirrm share/lyx/images
-@dirrm share/lyx/kbd
-@dirrm share/lyx/layouts
+share/lyx/xfonts/cmex10.pfb
+share/lyx/xfonts/cmmi10.pfb
+share/lyx/xfonts/cmr10.pfb
+share/lyx/xfonts/cmsy10.pfb
+share/lyx/xfonts/eufm10.pfb
+share/lyx/xfonts/fonts.dir
+share/lyx/xfonts/fonts.scale
+share/lyx/xfonts/msam10.pfb
+share/lyx/xfonts/msbm10.pfb
+@dirrm share/lyx/xfonts
+@dirrm share/lyx/ui
+@dirrm share/lyx/tex
+@dirrm share/lyx/templates
+@dirrm share/lyx/scripts
 @dirrm share/lyx/reLyX/Text
 @dirrm share/lyx/reLyX
-@dirrm share/lyx/scripts
-@dirrm share/lyx/templates
-@dirrm share/lyx/tex
-@dirrm share/lyx/ui
+@dirrm share/lyx/layouts
+@dirrm share/lyx/kbd
+@dirrm share/lyx/images
+@dirrm share/lyx/help
+@dirrm share/lyx/examples
+@dirrm share/lyx/doc
+@dirrm share/lyx/clipart
+@dirrm share/lyx/bind
 @dirrm share/lyx