Update to 1.2.0.

Based on Ports Fury's patch, I added:
 - compliation fix for -current
 - some c++-related fix
 - advice of R. Lahaye <lahaye@snu.ac.kr> for xforms

PR:		ports/40077
Submitted by:	Ports Fury and other people on -ports

13 files changed, 239 insertions, 86 deletions

diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 227ba83f1783..93fcb92a6552 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -6,43 +6,63 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.4
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	print
 MASTER_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
 PKGNAMEPREFIX=	cjk-
-DISTNAME=	${DIST_VER}-src
+DISTNAME=	CJK-LyX-${PORTVERSION}-src
 
 MAINTAINER=	cjh@FreeBSD.org
 
-BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
-.if defined(WITH_ISPELL)
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
-.endif
-LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
-		intl.2:${PORTSDIR}/devel/gettext
+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=	gm4:${PORTSDIR}/devel/m4 \
+		latex:${PORTSDIR}/print/teTeX
+
+WRKSRC=		${WRKDIR}/CJK-LyX-${PORTVERSION}
 
-USE_GMAKE=	yes
 USE_XPM=	yes
-USE_NEWGCC=	yes
+USE_REINPLACE=	yes
 USE_PERL5=	yes
-USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+USE_AUTOMAKE_VER=	15
+USE_XPM=	yes
+AUTOMAKE=	${WRKSRC}/autogen.sh
+AUTOCONF=	${TRUE}
+CONFIGURE_ENV=	CPPFLAGS="-DI18N"
 CONFIGURE_ARGS=	--with-extra-lib="${X11BASE}/lib ${LOCALBASE}/lib" \
 		--with-extra-inc="${X11BASE}/include ${LOCALBASE}/include"
-MAKE_ENV+=	INTLLIBS="-L${LOCALBASE}/lib -lintl"
 MAN1=		lyx.1 reLyX.1
 
-DIST_VER=	CJK-LyX-1.1.6fix4
-WRKSRC=		${WRKDIR}/${DIST_VER}
+.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
+
+pre-everything::
+.if !defined(WITH_ASPELL)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want to compile with Aspell/Pspell support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ASPELL=yes\""
+	@${ECHO_MSG}
+.endif
 
 .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"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want to compile with Ispell support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ISPELL=yes\""
+	@${ECHO_MSG}
 .endif
 
 post-patch:
-	(cd ${WRKSRC}; ${TOUCH} Makefile.in */Makefile.in src/config.h.in)
+	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 
 .include <bsd.port.mk>
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index 0d928f192949..bf4a4952622d 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1 +1 @@
-MD5 (CJK-LyX-1.1.6fix4-src.tar.gz) = 639ac509c9e5f9abdcff19c52de75863
+MD5 (CJK-LyX-1.2.0-src.tar.gz) = 0e0c33bb36d5d561ed83a230ef9837d0
diff --git a/print/cjk-lyx/files/patch-aa b/print/cjk-lyx/files/patch-aa
deleted file mode 100644
index 3b1ae527b89d..000000000000
--- a/print/cjk-lyx/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun Nov 25 01:30:49 2001
-+++ configure	Sun Nov 25 01:31:07 2001
-@@ -11603,7 +11603,7 @@
- 
- trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
- 
--DEFS=-DHAVE_CONFIG_H
-+DEFS="-DHAVE_CONFIG_H -DI18N"
- 
- # Without the "./", some shells look in PATH for config.status.
- : ${CONFIG_STATUS=./config.status}
diff --git a/print/cjk-lyx/files/patch-ab b/print/cjk-lyx/files/patch-ab
deleted file mode 100644
index 3e3ecce8853e..000000000000
--- a/print/cjk-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/cjk-lyx/files/patch-autogen.sh b/print/cjk-lyx/files/patch-autogen.sh
new file mode 100644
index 000000000000..18bcff099867
--- /dev/null
+++ b/print/cjk-lyx/files/patch-autogen.sh
@@ -0,0 +1,32 @@
+--- autogen.sh.orig	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/cjk-lyx/files/patch-ba b/print/cjk-lyx/files/patch-ba
deleted file mode 100644
index 3c9654b5083a..000000000000
--- a/print/cjk-lyx/files/patch-ba
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/reLyX/configure.orig	Tue Jul 24 21:45:16 2001
-+++ lib/reLyX/configure	Sun Nov 25 01:35:56 2001
-@@ -568,7 +568,7 @@
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:571: checking for a BSD compatible install" >&5
--if test -z "$INSTALL"; then
-+if test -z "$NO__INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
diff --git a/print/cjk-lyx/files/patch-config::ltmain.sh b/print/cjk-lyx/files/patch-config::ltmain.sh
new file mode 100644
index 000000000000..3bbc2ccf03ce
--- /dev/null
+++ b/print/cjk-lyx/files/patch-config::ltmain.sh
@@ -0,0 +1,28 @@
+--- config/ltmain.sh.orig	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/cjk-lyx/files/patch-configure.in b/print/cjk-lyx/files/patch-configure.in
new file mode 100644
index 000000000000..d02d4c108d92
--- /dev/null
+++ b/print/cjk-lyx/files/patch-configure.in
@@ -0,0 +1,15 @@
+--- work/CJK-LyX-1.2.0/configure.in.o	Fri Jul 12 14:13:14 2002
++++ configure.in	Fri Jul 12 14:13:35 2002
+@@ -170,9 +170,9 @@
+ # We should test for gcc version and see whether it supports -isystem,
+ # but since at least gcc 2.6.x supports it and it is still too old for
+ # us, it seems we are safe.
+-if test -n "$GXX" ; then
+-  X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'`
+-fi
++#if test -n "$GXX" ; then
++#  X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'`
++#fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ 
+ ## Check whether X is new enough to handle the input method stuff
diff --git a/print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C b/print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C
new file mode 100644
index 000000000000..bc5195aedd61
--- /dev/null
+++ b/print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C
@@ -0,0 +1,20 @@
+diff -ur c/src/frontends/xforms/GUIRunTime.C src/frontends/xforms/GUIRunTime.C
+--- c/src/frontends/xforms/GUIRunTime.C	Thu Jul 11 14:20:21 2002
++++ src/frontends/xforms/GUIRunTime.C	Thu Jul 11 14:23:55 2002
+@@ -26,11 +26,11 @@
+ 
+ // 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
++//#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
+ 
+ 
+ using std::endl;
diff --git a/print/cjk-lyx/files/patch-src::lyxcodeconv.C b/print/cjk-lyx/files/patch-src::lyxcodeconv.C
new file mode 100644
index 000000000000..4d3c93950d87
--- /dev/null
+++ b/print/cjk-lyx/files/patch-src::lyxcodeconv.C
@@ -0,0 +1,13 @@
+--- src/lyxcodeconv.C.orig	Thu Jul 11 19:55:02 2002
++++ src/lyxcodeconv.C	Thu Jul 11 19:55:36 2002
+@@ -11,6 +11,10 @@
+ #include "LString.h"
+ #include "lyxcodeconv.h"
+ 
++#include <iostream>
++
++using namespace std;
++
+ LyXCodeConv codeconverter;     //global
+ 
+ size_t LyXCodeConv::lyxmbstowcs(wchar_t *wcs, const char *cs, size_t n)
diff --git a/print/cjk-lyx/files/patch-src::lyxcodeconv.h b/print/cjk-lyx/files/patch-src::lyxcodeconv.h
new file mode 100644
index 000000000000..8eb0d748f13a
--- /dev/null
+++ b/print/cjk-lyx/files/patch-src::lyxcodeconv.h
@@ -0,0 +1,10 @@
+--- work/CJK-LyX-1.2.0/src/lyxcodeconv.h~	Thu Jul 11 15:18:49 2002
++++ src/lyxcodeconv.h	Thu Jul 11 15:24:20 2002
+@@ -10,6 +10,7 @@
+ #include <fstream>
+ #include <iomanip>
+ using std::ofstream;
++using std::ostream;
+ using std::ifstream;
+ using std::fstream;
+ using std::ios;
diff --git a/print/cjk-lyx/files/patch-src::lyxim.C b/print/cjk-lyx/files/patch-src::lyxim.C
new file mode 100644
index 000000000000..a5d1cf878ce3
--- /dev/null
+++ b/print/cjk-lyx/files/patch-src::lyxim.C
@@ -0,0 +1,13 @@
+--- src/lyxim.C.orig	Thu Jul 11 19:10:30 2002
++++ src/lyxim.C	Thu Jul 11 19:16:31 2002
+@@ -19,6 +19,10 @@
+ 
+ #define DUMMY_FONT_NAME       "-*-*-*-R-Normal--14-130-75-75-*-*"
+ 
++#include <iostream>
++
++using namespace std;
++
+ //extern FD_form_main *fd_form_main;
+ extern MiniBuffer *minibuffer;
+ extern BufferView *current_view;
diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist
index 98d7e0895750..c813e083c349 100644
--- a/print/cjk-lyx/pkg-plist
+++ b/print/cjk-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