- Update to 1.3.5

PR:		ports/85841
Submitted by:	Koji Yokota <yokota@res.otaru-uc.ac.jp>
Approved by:	maintainer timeout (cjh; 3 months)

11 files changed, 341 insertions, 615 deletions

diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index f75fc4cdd4ce..0cb206a542b9 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -6,46 +6,92 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.4.1
-PORTREVISION=	1
-CATEGORIES=	print
-MASTER_SITES=	ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/
+PORTVERSION=	1.3.5
+CATEGORIES=	print chinese japanese korean
+MASTER_SITES=	http://www.otaru-uc.ac.jp/~yokota/comp/CJK-LyX/ \
+		http://www.otaru-uc.ac.jp/~yokota/comp/layouts/:JPN \
+		ftp://cellular.phys.pusan.ac.kr/CJK-LyX/${FORM}/
 PKGNAMEPREFIX=	cjk-
-DISTNAME=	CJK-LyX-qt-${PORTVERSION:R}-${PORTVERSION:E}.src
+DISTNAME=	CJK-LyX-${FORM}-${PORTVERSION}-1.src
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		lyx-platex-patch-${FORM}-${PORTVERSION}.tar.gz:JPN \
+		lyx.mo:JPN
+DIST_SUBDIR=	CJK-LyX
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
+		lyx-platex-patch-${FORM}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Document processor interfaced with LaTeX, with CJK support
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX \
 		makepsres:${X_CLIENTS_PORT}
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		latex:${PORTSDIR}/print/teTeX
+RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-WRKSRC=		${WRKDIR}/CJK-LyX-qt-${PORTVERSION:R}
-
-CONFLICTS=	lyx-*
+CONFLICTS=	lyx-[0-9]*
+WRKSRC=		${WRKDIR}/CJK-LyX-${FORM}-${PORTVERSION}
+EXTRA_PATCHES=	${WRKDIR}/platex.patch
+.if !defined(NOPORTDOCS)
+MASTER_SITES+=	http://133.16.174.22/lyx/lyx-manual/:JADOC
+JADOCVER=	1.3.3-1
+JADOCNAME=	ja_LyX_Doc-${JADOCVER}.tar.gz
+JADOCWRK=	1.3.3
+DISTFILES+=	${JADOCNAME}:JADOC
+EXTRACT_ONLY+=	${JADOCNAME}
+.endif
 
-USE_QT_VER=	3
 USE_GNOME=	gnometarget lthack
 USE_PERL5=	yes
+USE_QT_VER=	3
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13
-CONFIGURE_ARGS=	--with-frontend=qt \
-		--with-extra-lib="${LOCALBASE}/lib" \
+USE_AUTOTOOLS=	libtool:15
+
+OPTIONS=	QT "Compile with qt instead of xforms (recommended)" ON \
+		ASPELL "Compile with aspell support" ON \
+		ISPELL "Compile with ispell support" OFF
+.if defined(LANG) && ${LANG:C/_.*//} == "ja"
+OPTIONS+=	JATETEX "Set Japanese teTeX dependency (recommended to Japanese users)" ON
+.else
+OPTIONS+=	JATETEX "Set Japanese teTeX dependency (recommended to Japanese users)" OFF
+.endif
+
+.include <bsd.port.pre.mk>
+
+# Choose an appropriate localized LaTeX as dependency
+.if defined(WITH_JATETEX)
+RUN_DEPENDS+=	latex:${PORTSDIR}/japanese/teTeX
+.else
+RUN_DEPENDS+=	latex:${PORTSDIR}/print/teTeX
+.endif
+
+CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 		--with-extra-inc="${LOCALBASE}/include"
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 		AUTOHEADER="${TRUE}"
 MAN1=		lyx.1 reLyX.1
 
 CFLAGS+=	-DI18N
+.if ${OSVERSION} < 500035
+CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
+.endif
 
+.if !defined(WITHOUT_QT)
+FORM=		qt
+CONFIGURE_ARGS+=	--with-frontend=qt
 QTCPPFLAGS+=	${PTHREAD_CFLAGS}
 QTCFGLIBS+=	${PTHREAD_LIBS}
+RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
+PLIST_SUB+=	WITH_XFORMS="@comment "
+.else
+FORM=		xforms
+LIB_DEPENDS+=	forms.1:${PORTSDIR}/x11-toolkits/xforms-i18n
+USE_XPM=	yes
+CONFIGURE_ARGS+=	--with-extra-inc="${X11BASE}/include/X11"
+PLIST_SUB+=	WITH_XFORMS=""
+.endif
 
-.if defined(WITH_ASPELL)
+.if !defined(WITHOUT_ASPELL)
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 CONFIGURE_ARGS+=	--with-pspell \
 			--with-pspell-lib="${LOCALBASE}/lib" \
@@ -56,25 +102,19 @@ CONFIGURE_ARGS+=	--with-pspell \
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500035
-CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
-.endif
-
-pre-everything::
-.if !defined(WITH_ASPELL)
+post-extract::
+.if !defined(NOPORTDOCS)
 	@${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} "Extracting Japanese documentations to the source tree..."
 	@${ECHO_MSG}
+	@${MV} ${WRKDIR}/${JADOCWRK}/* ${WRKSRC}/lib/doc
+	@${RMDIR} ${WRKDIR}/${JADOCWRK}
 .endif
 
-.if !defined(WITH_ISPELL)
+post-build::
 	@${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} "Fixing up the Japanese message file..."
 	@${ECHO_MSG}
-.endif
+	@${CP} -f ${DISTDIR}/${DIST_SUBDIR}/lyx.mo ${WRKSRC}/po/ja.gmo
 
 .include <bsd.port.post.mk>
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index 22d55ed2929a..342ed2b00518 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1,3 +1,12 @@
-MD5 (CJK-LyX-qt-1.3.4-1.src.tar.gz) = 7295bf28d2554a52e802f186f3d1026b
-SIZE (CJK-LyX-qt-1.3.4-1.src.tar.gz) = 7501719
-SIZE (CJK-LyX-1.2.3-src.tar.gz) = 6671283
+MD5 (CJK-LyX/CJK-LyX-qt-1.3.5-1.src.tar.gz) = 0993a94f92077aaa877d874706f8e6d4
+SIZE (CJK-LyX/CJK-LyX-qt-1.3.5-1.src.tar.gz) = 7579993
+MD5 (CJK-LyX/CJK-LyX-xforms-1.3.5-1.src.tar.gz) = 4b229f921a24e42f1218c1c3347848ca
+SIZE (CJK-LyX/CJK-LyX-xforms-1.3.5-1.src.tar.gz) = 7588092
+MD5 (CJK-LyX/lyx-platex-patch-qt-1.3.5.tar.gz) = 0893b82d4f371445e919f8fea2f799f1
+SIZE (CJK-LyX/lyx-platex-patch-qt-1.3.5.tar.gz) = 3041
+MD5 (CJK-LyX/lyx-platex-patch-xforms-1.3.5.tar.gz) = 62559df87c609d4c11a17ce15e5d99c5
+SIZE (CJK-LyX/lyx-platex-patch-xforms-1.3.5.tar.gz) = 3043
+MD5 (CJK-LyX/lyx.mo) = 8675a12c48fe35a6cfc0975a77fbfd08
+SIZE (CJK-LyX/lyx.mo) = 101276
+MD5 (CJK-LyX/ja_LyX_Doc-1.3.3-1.tar.gz) = 1d3ab752c09b86801351efb874434616
+SIZE (CJK-LyX/ja_LyX_Doc-1.3.3-1.tar.gz) = 260673
diff --git a/print/cjk-lyx/files/patch-boost::boost::config::compiler::gcc.hpp b/print/cjk-lyx/files/patch-boost::boost::config::compiler::gcc.hpp
deleted file mode 100644
index 7c4814ea9941..000000000000
--- a/print/cjk-lyx/files/patch-boost::boost::config::compiler::gcc.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD$
-
---- ./boost/boost/config/compiler/gcc.hpp.orig	2003-05-26 08:27:34.000000000 -0600
-+++ ./boost/boost/config/compiler/gcc.hpp
-@@ -1,7 +1,13 @@
--//  (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and
--//  distribute this software is granted provided this copyright notice appears
--//  in all copies. This software is provided "as is" without express or implied
--//  warranty, and with no claim as to its suitability for any purpose.
-+//  (C) Copyright John Maddock 2001 - 2003.
-+//  (C) Copyright Darin Adler 2001 - 2002.
-+//  (C) Copyright Jens Maurer 2001 - 2002.
-+//  (C) Copyright Beman Dawes 2001 - 2003.
-+//  (C) Copyright Douglas Gregor 2002.
-+//  (C) Copyright David Abrahams 2002 - 2003.
-+//  (C) Copyright Synge Todo 2003.
-+//  Use, modification and distribution are subject to the
-+//  Boost Software License, Version 1.0. (See accompanying file
-+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
- //  See http://www.boost.org for most recent version.
- 
-@@ -23,24 +29,53 @@
- #     endif
- #   endif
- 
-+#   if __GNUC__ == 2 && __GNUC_MINOR__ < 96
-+#     define BOOST_NO_SFINAE
-+#   endif
-+
- #   if __GNUC__ == 2 && __GNUC_MINOR__ <= 97
- #     define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
- #     define BOOST_NO_OPERATORS_IN_NAMESPACE
- #   endif
- 
-+#   if __GNUC__ < 3
-+#      define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
-+#      define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
-+#   endif
-+
-+#
-+#
-+#
-+
-+//
-+// Bug specific to gcc 3.1 and 3.2:
-+//
-+#if (__GNUC__ == 3) && ((__GNUC_MINOR__ == 1) || (__GNUC_MINOR__ == 2))
-+#  define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
-+#endif
-+
- //
--// Threading support:
--// Turn this on unconditionally here, it will get turned off again later
--// if no threading API is detected.
-+// Threading support: Turn this on unconditionally here (except for
-+// those platforms where we can know for sure). It will get turned off again
-+// later if no threading API is detected.
- //
--#define BOOST_HAS_THREADS
-+#if !defined(__MINGW32__) && !defined(linux) && !defined(__linux) && !defined(__linux__)
-+# define BOOST_HAS_THREADS
-+#endif
- 
- //
- // gcc has "long long"
- //
- #define BOOST_HAS_LONG_LONG
- 
--#define BOOST_COMPILER "GNU C++ version " BOOST_STRINGIZE(__GNUC__) "." BOOST_STRINGIZE(__GNUC_MINOR__)
-+//
-+// gcc implements the named return value optimization since version 3.1
-+//
-+#if __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 1 )
-+#define BOOST_HAS_NRVO
-+#endif
-+
-+#define BOOST_COMPILER "GNU C++ version " __VERSION__
- 
- //
- // versions check:
-@@ -49,11 +84,13 @@
- #  error "Compiler not configured - please reconfigure"
- #endif
- //
--// last known and checked version is 3.2:
--#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
-+// last known and checked version is 3.4:
-+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4))
- #  if defined(BOOST_ASSERT_CONFIG)
- #     error "Unknown compiler version - please run the configure tests and report the results"
- #  else
- #     warning "Unknown compiler version - please run the configure tests and report the results"
- #  endif
- #endif
-+
-+
diff --git a/print/cjk-lyx/files/patch-boost::boost::format::feed_args.hpp b/print/cjk-lyx/files/patch-boost::boost::format::feed_args.hpp
deleted file mode 100644
index 63e5aa397e06..000000000000
--- a/print/cjk-lyx/files/patch-boost::boost::format::feed_args.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- ./boost/boost/format/feed_args.hpp.orig	2002-11-20 10:20:54.000000000 -0700
-+++ ./boost/boost/format/feed_args.hpp
-@@ -34,7 +34,7 @@ namespace  {
- 
-   template<class Tr, class Ch> inline
-   void empty_buf(BOOST_IO_STD basic_ostringstream<Ch,Tr> & os) {
--    static const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and  L"" )
-+    const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and  L"" )
-     os.str(emptyStr);
-   }
- 
diff --git a/print/cjk-lyx/files/patch-boost::boost::format::format_implementation.hpp b/print/cjk-lyx/files/patch-boost::boost::format::format_implementation.hpp
deleted file mode 100644
index 4c13f145afa1..000000000000
--- a/print/cjk-lyx/files/patch-boost::boost::format::format_implementation.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- ./boost/boost/format/format_implementation.hpp.orig	2002-11-21 11:33:01.000000000 -0700
-+++ ./boost/boost/format/format_implementation.hpp
-@@ -151,7 +151,7 @@ basic_format<Ch,Tr>& basic_format<Ch,Tr>
- {
-     if(argN<1 || argN > num_args_ || bound_.size()==0 || !bound_[argN-1] )
-       {
--	if( exceptions() & out_of_range_bit )
-+       if( exceptions() & io::out_of_range_bit )
- 	  boost::throw_exception(io::out_of_range()); // arg not in range.
- 	else return *this;
-       }
diff --git a/print/cjk-lyx/files/patch-configure b/print/cjk-lyx/files/patch-configure
deleted file mode 100644
index 638a66c23d38..000000000000
--- a/print/cjk-lyx/files/patch-configure
+++ /dev/null
@@ -1,94 +0,0 @@
---- configure.orig	Thu Feb 19 02:35:31 2004
-+++ configure	Tue Mar  2 01:03:20 2004
-@@ -5304,33 +5304,51 @@
- 
- fi
- 
--
--echo "$as_me:$LINENO: checking for fopen in -lc" >&5
--echo $ECHO_N "checking for fopen in -lc... $ECHO_C" >&6
--if test "${ac_cv_lib_c_fopen+set}" = set; then
-+echo "$as_me:$LINENO: checking for fopen" >&5
-+echo $ECHO_N "checking for fopen... $ECHO_C" >&6
-+if test "${ac_cv_func_fopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lc  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
-+  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char fopen (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
-+{
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char fopen ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_fopen) || defined (__stub___fopen)
-+choke me
-+#else
-+char (*f) () = fopen;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
- int
- main ()
- {
--fopen ();
-+return f != fopen;
-   ;
-   return 0;
- }
-@@ -5347,26 +5365,17 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_c_fopen=yes
-+  ac_cv_func_fopen=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_c_fopen=no
-+ac_cv_func_fopen=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_c_fopen" >&5
--echo "${ECHO_T}$ac_cv_lib_c_fopen" >&6
--if test $ac_cv_lib_c_fopen = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBC 1
--_ACEOF
--
--  LIBS="-lc $LIBS"
--
- fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_fopen" >&5
-+echo "${ECHO_T}$ac_cv_func_fopen" >&6
- 
- 
- ### Add extra directories to check for libraries.
diff --git a/print/cjk-lyx/files/patch-src::BoostFormat.h b/print/cjk-lyx/files/patch-src::BoostFormat.h
deleted file mode 100644
index 5926d34fad7f..000000000000
--- a/print/cjk-lyx/files/patch-src::BoostFormat.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- ./src/BoostFormat.h.orig    2002-11-25 12:44:44.000000000 -0700
-+++ ./src/BoostFormat.h
-@@ -15,7 +15,7 @@ namespace boost
- {
-
- extern
--template basic_format<char>;
-+template class basic_format<char>;
-
- extern template
- std::ostream &
diff --git a/print/cjk-lyx/files/patch-src::frontends::controllers::ControlDialog.tmpl b/print/cjk-lyx/files/patch-src::frontends::controllers::ControlDialog.tmpl
deleted file mode 100644
index e805b47a3519..000000000000
--- a/print/cjk-lyx/files/patch-src::frontends::controllers::ControlDialog.tmpl
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD$
-
---- src/frontends/controllers/ControlDialog.tmpl.orig	2004-05-29 04:23:23.000000000 -0600
-+++ src/frontends/controllers/ControlDialog.tmpl
-@@ -4,7 +4,7 @@
-  * This file is part of LyX, the document processor.
-  * Licence details can be found in the file COPYING.
-  *
-- * \author Angus Leeming 
-+ * \author Angus Leeming
-  *
-  * Full author contact details are available in file CREDITS
-  *
-@@ -27,54 +27,56 @@ ControlDialog<Base>::ControlDialog(LyXVi
- template <class Base>
- void ControlDialog<Base>::show()
- {
--	if (isBufferDependent() && !bufferIsAvailable())
-+	if (this->isBufferDependent() && !this->bufferIsAvailable())
- 		return;
- 
--	connect();
-+	this->connect();
- 
- 	if (!dialog_built_) {
--		view().build();
-+		this->view().build();
- 		dialog_built_ = true;
- 	}
- 
- 	setParams();
--	if (emergency_exit_) {
-+	if (this->emergency_exit_) {
- 		hide();
- 		return;
- 	}
- 
--	bc().readOnly(bufferIsReadonly());
--	view().show();
-+	this->bc().readOnly(this->bufferIsReadonly());
-+	this->view().show();
- 
- 	// The widgets may not be valid, so refresh the button controller
--	bc().refresh();
-+	this->bc().refresh();
- }
- 
-+
- template <class Base>
- void ControlDialog<Base>::update()
- {
--	if (isBufferDependent() && !bufferIsAvailable())
-+	if (this->isBufferDependent() && !this->bufferIsAvailable())
- 		return;
- 
- 	setParams();
--	if (emergency_exit_) {
-+	if (this->emergency_exit_) {
- 		hide();
- 		return;
- 	}
- 
--	bc().readOnly(bufferIsReadonly());
--	view().update();
-+	this->bc().readOnly(this->bufferIsReadonly());
-+	this->view().update();
- 
- 	// The widgets may not be valid, so refresh the button controller
--	bc().refresh();
-+	this->bc().refresh();
- }
- 
-+
- template <class Base>
- void ControlDialog<Base>::hide()
- {
--	emergency_exit_ = false;
-+	this->emergency_exit_ = false;
- 	clearParams();
- 
--	disconnect();
--	view().hide();
-+	this->disconnect();
-+	this->view().hide();
- }
diff --git a/print/cjk-lyx/files/patch-src::frontends::qt2::Qt2Base.h b/print/cjk-lyx/files/patch-src::frontends::qt2::Qt2Base.h
deleted file mode 100644
index d8bdd5d2893a..000000000000
--- a/print/cjk-lyx/files/patch-src::frontends::qt2::Qt2Base.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- ./src/frontends/qt2/Qt2Base.h.orig	2003-02-01 17:48:38.000000000 -0700
-+++ ./src/frontends/qt2/Qt2Base.h
-@@ -174,14 +174,14 @@ Qt2CB<Controller, Base>::Qt2CB(QString c
- template <class Controller, class Base>
- Controller & Qt2CB<Controller, Base>::controller()
- {
--	return static_cast<Controller &>(getController());
-+       return static_cast<Controller &>(this->getController());
- }
- 
- 
- template <class Controller, class Base>
- Controller const & Qt2CB<Controller, Base>::controller() const
- {
--	return static_cast<Controller const &>(getController());
-+       return static_cast<Controller const &>(this->getController());
- }
- 
- 
diff --git a/print/cjk-lyx/files/patch-src::frontends::xforms::FormBase.h b/print/cjk-lyx/files/patch-src::frontends::xforms::FormBase.h
deleted file mode 100644
index ac64841f6101..000000000000
--- a/print/cjk-lyx/files/patch-src::frontends::xforms::FormBase.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- src/frontends/xforms/FormBase.h.orig	2003-02-01 17:48:38.000000000 -0700
-+++ src/frontends/xforms/FormBase.h
-@@ -188,14 +188,14 @@ FormCB<Controller, Base>::FormCB(string 
- template <class Controller, class Base>
- Controller & FormCB<Controller, Base>::controller()
- {
--	return static_cast<Controller &>(getController());
-+	return static_cast<Controller &>(this->getController());
- }
- 
- 
- template <class Controller, class Base>
- Controller const & FormCB<Controller, Base>::controller() const
- {
--	return static_cast<Controller const &>(getController());
-+	return static_cast<Controller const &>(this->getController());
- }
- 
- 
diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist
index a13907eca896..172beba55345 100644
--- a/print/cjk-lyx/pkg-plist
+++ b/print/cjk-lyx/pkg-plist
@@ -1,24 +1,40 @@
 bin/lyx
-bin/noweb2lyx
 bin/reLyX
+bin/noweb2lyx
 share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
 share/locale/eu/LC_MESSAGES/lyx.mo
-share/locale/fi/LC_MESSAGES/lyx.mo
 share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/it/LC_MESSAGES/lyx.mo
 share/locale/ja/LC_MESSAGES/lyx.mo
-share/locale/ko/LC_MESSAGES/lyx.mo
 share/locale/nl/LC_MESSAGES/lyx.mo
+share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/fi/LC_MESSAGES/lyx.mo
 share/locale/nn/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
 share/locale/pl/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
-%%DATADIR%%/CREDITS
+share/locale/ko/LC_MESSAGES/lyx.mo
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+%%DATADIR%%/reLyX/Text/TeX.pm
+%%DATADIR%%/reLyX/BasicLyX.pm
+%%DATADIR%%/reLyX/CleanTeX.pm
+%%DATADIR%%/reLyX/LastLyX.pm
+%%DATADIR%%/reLyX/MakePreamble.pm
+%%DATADIR%%/reLyX/ReadCommands.pm
+%%DATADIR%%/reLyX/RelyxFigure.pm
+%%DATADIR%%/reLyX/RelyxTable.pm
+%%DATADIR%%/reLyX/Verbatim.pm
+%%DATADIR%%/reLyX/reLyXmain.pl
+%%DATADIR%%/reLyX/README
+%%DATADIR%%/reLyX/BUGS
+%%DATADIR%%/reLyX/CHANGES
+%%DATADIR%%/reLyX/reLyX.pod
+%%DATADIR%%/reLyX/syntax.default
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
 %%DATADIR%%/bind/cua.bind
@@ -29,96 +45,100 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/bind/greekkeys.bind
 %%DATADIR%%/bind/hollywood.bind
 %%DATADIR%%/bind/latinkeys.bind
+%%DATADIR%%/bind/mac.bind
 %%DATADIR%%/bind/math.bind
 %%DATADIR%%/bind/menus.bind
 %%DATADIR%%/bind/pt_menus.bind
 %%DATADIR%%/bind/sciword.bind
 %%DATADIR%%/bind/sv_menus.bind
 %%DATADIR%%/bind/xemacs.bind
-%%DATADIR%%/chkconfig.ltx
 %%DATADIR%%/clipart/platypus.eps
-%%DATADIR%%/configure
-%%DATADIR%%/configure.cmd
-%%DATADIR%%/doc/Customization.lyx
-%%DATADIR%%/doc/DocStyle.lyx
-%%DATADIR%%/doc/Extended.lyx
-%%DATADIR%%/doc/FAQ.lyx
-%%DATADIR%%/doc/Intro.lyx
-%%DATADIR%%/doc/LaTeXConfig.lyx
-%%DATADIR%%/doc/LaTeXConfig.lyx.in
-%%DATADIR%%/doc/LyXConfig.lyx.in
-%%DATADIR%%/doc/Reference.lyx
-%%DATADIR%%/doc/TOC.lyx
-%%DATADIR%%/doc/Tutorial.lyx
-%%DATADIR%%/doc/UserGuide.lyx
-%%DATADIR%%/doc/cs_TOC.lyx
-%%DATADIR%%/doc/cs_Tutorial.lyx
-%%DATADIR%%/doc/da_Intro.lyx
-%%DATADIR%%/doc/da_TOC.lyx
-%%DATADIR%%/doc/de_Customization.lyx
-%%DATADIR%%/doc/de_Extended.lyx
-%%DATADIR%%/doc/de_FAQ.lyx
-%%DATADIR%%/doc/de_Intro.lyx
-%%DATADIR%%/doc/de_TOC.lyx
-%%DATADIR%%/doc/de_Tutorial.lyx
-%%DATADIR%%/doc/de_UserGuide.lyx
-%%DATADIR%%/doc/es_Intro.lyx
-%%DATADIR%%/doc/es_TOC.lyx
-%%DATADIR%%/doc/es_Tutorial.lyx
-%%DATADIR%%/doc/escher-lsd.eps
-%%DATADIR%%/doc/eu_Extended.lyx
-%%DATADIR%%/doc/eu_Intro.lyx
-%%DATADIR%%/doc/eu_TOC.lyx
-%%DATADIR%%/doc/eu_Tutorial.lyx
-%%DATADIR%%/doc/eu_UserGuide.lyx
-%%DATADIR%%/doc/fr_Customization.lyx
-%%DATADIR%%/doc/fr_Extended.lyx
-%%DATADIR%%/doc/fr_FAQ.lyx
-%%DATADIR%%/doc/fr_Intro.lyx
-%%DATADIR%%/doc/fr_TOC.lyx
-%%DATADIR%%/doc/fr_Tutorial.lyx
-%%DATADIR%%/doc/fr_UserGuide.lyx
-%%DATADIR%%/doc/he_Intro.lyx
-%%DATADIR%%/doc/he_TOC.lyx
-%%DATADIR%%/doc/he_Tutorial.lyx
-%%DATADIR%%/doc/hu_Intro.lyx
-%%DATADIR%%/doc/hu_TOC.lyx
-%%DATADIR%%/doc/it_Customization.lyx
-%%DATADIR%%/doc/it_Intro.lyx
-%%DATADIR%%/doc/it_TOC.lyx
-%%DATADIR%%/doc/it_Tutorial.lyx
-%%DATADIR%%/doc/it_UserGuide.lyx
-%%DATADIR%%/doc/mobius.eps
-%%DATADIR%%/doc/nl_Intro.lyx
-%%DATADIR%%/doc/nl_TOC.lyx
-%%DATADIR%%/doc/nl_Tutorial.lyx
-%%DATADIR%%/doc/no_Intro.lyx
-%%DATADIR%%/doc/no_TOC.lyx
-%%DATADIR%%/doc/pl_Extended.lyx
-%%DATADIR%%/doc/pl_Intro.lyx
-%%DATADIR%%/doc/pl_TOC.lyx
-%%DATADIR%%/doc/pl_Tutorial.lyx
-%%DATADIR%%/doc/platypus.eps
-%%DATADIR%%/doc/pt_Intro.lyx
-%%DATADIR%%/doc/pt_TOC.lyx
-%%DATADIR%%/doc/pt_Tutorial.lyx
-%%DATADIR%%/doc/ro_Intro.lyx
-%%DATADIR%%/doc/ro_TOC.lyx
-%%DATADIR%%/doc/ro_splash.lyx
-%%DATADIR%%/doc/ru_FAQ.lyx
-%%DATADIR%%/doc/ru_Intro.lyx
-%%DATADIR%%/doc/ru_TOC.lyx
-%%DATADIR%%/doc/ru_Tutorial.lyx
-%%DATADIR%%/doc/sk_TOC.lyx
-%%DATADIR%%/doc/sk_Tutorial.lyx
-%%DATADIR%%/doc/sk_UserGuide.lyx
-%%DATADIR%%/doc/sl_Intro.lyx
-%%DATADIR%%/doc/sl_TOC.lyx
-%%DATADIR%%/doc/sl_Tutorial.lyx
-%%DATADIR%%/doc/sv_Intro.lyx
-%%DATADIR%%/doc/sv_TOC.lyx
-%%DATADIR%%/doc/sv_Tutorial.lyx
-%%DATADIR%%/encodings
+%%PORTDOCS%%%%DATADIR%%/doc/Customization.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/DocStyle.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/Extended.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/FAQ.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/LaTeXConfig.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/LaTeXConfig.lyx.in
+%%PORTDOCS%%%%DATADIR%%/doc/LyXConfig.lyx.in
+%%PORTDOCS%%%%DATADIR%%/doc/Reference.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/UserGuide.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/cs_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/cs_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/da_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/da_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/de_Customization.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/de_Extended.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/de_FAQ.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/de_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/de_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/de_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/de_UserGuide.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/es_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/es_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/es_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/escher-lsd.eps
+%%PORTDOCS%%%%DATADIR%%/doc/eu_Customization.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/eu_Extended.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/eu_FAQ.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/eu_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/eu_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/eu_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/eu_UserGuide.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/fr_Customization.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/fr_Extended.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/fr_FAQ.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/fr_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/fr_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/fr_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/fr_UserGuide.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/he_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/he_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/he_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/hu_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/hu_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/it_Customization.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/it_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/it_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/it_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/it_UserGuide.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ja_Customization.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ja_Extended.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ja_FAQ.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ja_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ja_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ja_UserGuide.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/mobius.eps
+%%PORTDOCS%%%%DATADIR%%/doc/nl_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/nl_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/nl_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/no_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/no_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/pl_Extended.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/pl_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/pl_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/pl_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/platypus.eps
+%%PORTDOCS%%%%DATADIR%%/doc/pt_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/pt_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/pt_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ro_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ro_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ru_FAQ.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ru_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ru_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/ru_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/sk_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/sk_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/sk_UserGuide.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/sl_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/sl_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/sl_Tutorial.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/sv_Intro.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/sv_TOC.lyx
+%%PORTDOCS%%%%DATADIR%%/doc/sv_Tutorial.lyx
 %%DATADIR%%/examples/Foils.lyx
 %%DATADIR%%/examples/ItemizeBullets.lyx
 %%DATADIR%%/examples/Literate.lyx
@@ -138,6 +158,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/de_beispiel_roh.lyx
 %%DATADIR%%/examples/de_splash.lyx
 %%DATADIR%%/examples/decimal.lyx
+%%DATADIR%%/examples/fr_CV.lyx
 %%DATADIR%%/examples/docbook_article.lyx
 %%DATADIR%%/examples/es_ejemplo_con_lyx.lyx
 %%DATADIR%%/examples/es_ejemplo_sin_lyx.lyx
@@ -148,7 +169,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/example_lyxified.lyx
 %%DATADIR%%/examples/example_raw.lyx
 %%DATADIR%%/examples/fr_AlignementDecimal.lyx
-%%DATADIR%%/examples/fr_CV.lyx
 %%DATADIR%%/examples/fr_ExemplesTableaux.lyx
 %%DATADIR%%/examples/fr_Foils.lyx
 %%DATADIR%%/examples/fr_ListesPuces.lyx
@@ -163,9 +183,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/he_he_example_lyxified.lyx
 %%DATADIR%%/examples/he_he_example_raw.lyx
 %%DATADIR%%/examples/hu_splash.lyx
-%%DATADIR%%/examples/iecc05.fen
-%%DATADIR%%/examples/iecc07.fen
-%%DATADIR%%/examples/iecc12.fen
 %%DATADIR%%/examples/it_ItemizeBullets.lyx
 %%DATADIR%%/examples/it_splash.lyx
 %%DATADIR%%/examples/landslide.lyx
@@ -181,53 +198,18 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/noweb2lyx.lyx
 %%DATADIR%%/examples/pl_splash.lyx
 %%DATADIR%%/examples/pt_splash.lyx
+%%DATADIR%%/examples/ro_splash.lyx
 %%DATADIR%%/examples/ru_splash.lyx
 %%DATADIR%%/examples/script_form.lyx
 %%DATADIR%%/examples/sl_primer_lyxan.lyx
 %%DATADIR%%/examples/sl_primer_surov.lyx
 %%DATADIR%%/examples/sl_splash.lyx
 %%DATADIR%%/examples/splash.lyx
-%%DATADIR%%/external_templates
+%%DATADIR%%/examples/iecc05.fen
+%%DATADIR%%/examples/iecc07.fen
+%%DATADIR%%/examples/iecc12.fen
 %%DATADIR%%/help/Bibtex.hlp
 %%DATADIR%%/help/Texinfo.hlp
-%%DATADIR%%/images/amssymb.xpm
-%%DATADIR%%/images/banner.ppm
-%%DATADIR%%/images/buffer-close.xpm
-%%DATADIR%%/images/buffer-export_ascii.xpm
-%%DATADIR%%/images/buffer-export_latex.xpm
-%%DATADIR%%/images/buffer-new.xpm
-%%DATADIR%%/images/buffer-print.xpm
-%%DATADIR%%/images/buffer-update_dvi.xpm
-%%DATADIR%%/images/buffer-update_ps.xpm
-%%DATADIR%%/images/buffer-view_dvi.xpm
-%%DATADIR%%/images/buffer-view_ps.xpm
-%%DATADIR%%/images/buffer-write.xpm
-%%DATADIR%%/images/build-program.xpm
-%%DATADIR%%/images/citation-insert.xpm
-%%DATADIR%%/images/copy.xpm
-%%DATADIR%%/images/cut.xpm
-%%DATADIR%%/images/depth-decrement.xpm
-%%DATADIR%%/images/depth-increment.xpm
-%%DATADIR%%/images/down.xpm
-%%DATADIR%%/images/ert-insert.xpm
-%%DATADIR%%/images/file-open.xpm
-%%DATADIR%%/images/find-replace.xpm
-%%DATADIR%%/images/font-bold.xpm
-%%DATADIR%%/images/font-emph.xpm
-%%DATADIR%%/images/font-free.xpm
-%%DATADIR%%/images/font-noun.xpm
-%%DATADIR%%/images/font-sans.xpm
-%%DATADIR%%/images/footnote-insert.xpm
-%%DATADIR%%/images/graphics-insert.xpm
-%%DATADIR%%/images/index-insert.xpm
-%%DATADIR%%/images/label-insert.xpm
-%%DATADIR%%/images/layout.xpm
-%%DATADIR%%/images/layout_LyX-Code.xpm
-%%DATADIR%%/images/layout_Scrap.xpm
-%%DATADIR%%/images/layout_Section.xpm
-%%DATADIR%%/images/lyx-quit.xpm
-%%DATADIR%%/images/lyx.xpm
-%%DATADIR%%/images/marginalnote-insert.xpm
 %%DATADIR%%/images/math/Bbbk.xpm
 %%DATADIR%%/images/math/Finv.xpm
 %%DATADIR%%/images/math/Game.xpm
@@ -340,8 +322,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/downarrow2.xpm
 %%DATADIR%%/images/math/downdownarrows.xpm
 %%DATADIR%%/images/math/downharpoonleft.xpm
-%%DATADIR%%/images/math/downharpoonright.xpm
 %%DATADIR%%/images/math/ell.xpm
+%%DATADIR%%/images/math/downharpoonright.xpm
 %%DATADIR%%/images/math/empty.xpm
 %%DATADIR%%/images/math/emptyset.xpm
 %%DATADIR%%/images/math/epsilon.xpm
@@ -365,6 +347,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/gg.xpm
 %%DATADIR%%/images/math/ggg.xpm
 %%DATADIR%%/images/math/gimel.xpm
+%%DATADIR%%/images/math/hat.xpm
 %%DATADIR%%/images/math/gnapprox.xpm
 %%DATADIR%%/images/math/gneq.xpm
 %%DATADIR%%/images/math/gneqq.xpm
@@ -377,7 +360,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/gtrless.xpm
 %%DATADIR%%/images/math/gtrsim.xpm
 %%DATADIR%%/images/math/gvertneqq.xpm
-%%DATADIR%%/images/math/hat.xpm
 %%DATADIR%%/images/math/hbar.xpm
 %%DATADIR%%/images/math/heartsuit.xpm
 %%DATADIR%%/images/math/hookleftarrow.xpm
@@ -389,6 +371,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/int.xpm
 %%DATADIR%%/images/math/intercal.xpm
 %%DATADIR%%/images/math/iota.xpm
+%%DATADIR%%/images/math/leq.xpm
 %%DATADIR%%/images/math/jmath.xpm
 %%DATADIR%%/images/math/kappa.xpm
 %%DATADIR%%/images/math/lambda.xpm
@@ -409,9 +392,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/leftrightarrows.xpm
 %%DATADIR%%/images/math/leftrightharpoons.xpm
 %%DATADIR%%/images/math/leftrightsquigarrow.xpm
-%%DATADIR%%/images/math/leftthreetimes.xpm
-%%DATADIR%%/images/math/leq.xpm
 %%DATADIR%%/images/math/leqq.xpm
+%%DATADIR%%/images/math/leftthreetimes.xpm
 %%DATADIR%%/images/math/leqslant.xpm
 %%DATADIR%%/images/math/lessapprox.xpm
 %%DATADIR%%/images/math/lessdot.xpm
@@ -432,11 +414,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/longleftrightarrow.xpm
 %%DATADIR%%/images/math/longleftrightarrow2.xpm
 %%DATADIR%%/images/math/longmapsto.xpm
+%%DATADIR%%/images/math/lozenge.xpm
 %%DATADIR%%/images/math/longrightarrow.xpm
 %%DATADIR%%/images/math/longrightarrow2.xpm
 %%DATADIR%%/images/math/looparrowleft.xpm
 %%DATADIR%%/images/math/looparrowright.xpm
-%%DATADIR%%/images/math/lozenge.xpm
 %%DATADIR%%/images/math/lparen.xpm
 %%DATADIR%%/images/math/lrcorner.xpm
 %%DATADIR%%/images/math/ltimes.xpm
@@ -478,6 +460,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/nleftrightarrow.xpm
 %%DATADIR%%/images/math/nleftrightarrow2.xpm
 %%DATADIR%%/images/math/nleq.xpm
+%%DATADIR%%/images/math/nu.xpm
 %%DATADIR%%/images/math/nleqq.xpm
 %%DATADIR%%/images/math/nleqslant.xpm
 %%DATADIR%%/images/math/nless.xpm
@@ -499,9 +482,8 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/ntriangleleft.xpm
 %%DATADIR%%/images/math/ntrianglelefteq.xpm
 %%DATADIR%%/images/math/ntriangleright.xpm
-%%DATADIR%%/images/math/ntrianglerighteq.xpm
-%%DATADIR%%/images/math/nu.xpm
 %%DATADIR%%/images/math/nvdash.xpm
+%%DATADIR%%/images/math/ntrianglerighteq.xpm
 %%DATADIR%%/images/math/nvdash2.xpm
 %%DATADIR%%/images/math/nvdash3.xpm
 %%DATADIR%%/images/math/nwarrow.xpm
@@ -633,12 +615,12 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/underrightarrow.xpm
 %%DATADIR%%/images/math/underscore.xpm
 %%DATADIR%%/images/math/uparrow.xpm
+%%DATADIR%%/images/math/uplus.xpm
 %%DATADIR%%/images/math/uparrow2.xpm
 %%DATADIR%%/images/math/updownarrow.xpm
 %%DATADIR%%/images/math/updownarrow2.xpm
 %%DATADIR%%/images/math/upharpoonleft.xpm
 %%DATADIR%%/images/math/upharpoonright.xpm
-%%DATADIR%%/images/math/uplus.xpm
 %%DATADIR%%/images/math/upsilon.xpm
 %%DATADIR%%/images/math/upsilon2.xpm
 %%DATADIR%%/images/math/upuparrows.xpm
@@ -654,6 +636,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/varsubsetneqq.xpm
 %%DATADIR%%/images/math/varsupsetneq.xpm
 %%DATADIR%%/images/math/varsupsetneqq.xpm
+%%DATADIR%%/images/math/vec.xpm
 %%DATADIR%%/images/math/vartheta.xpm
 %%DATADIR%%/images/math/vartriangle.xpm
 %%DATADIR%%/images/math/vartriangleleft.xpm
@@ -662,7 +645,6 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/vdash2.xpm
 %%DATADIR%%/images/math/vdash3.xpm
 %%DATADIR%%/images/math/vdots.xpm
-%%DATADIR%%/images/math/vec.xpm
 %%DATADIR%%/images/math/vee.xpm
 %%DATADIR%%/images/math/veebar.xpm
 %%DATADIR%%/images/math/wedge.xpm
@@ -673,6 +655,43 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/math/xi.xpm
 %%DATADIR%%/images/math/xi2.xpm
 %%DATADIR%%/images/math/zeta.xpm
+%%DATADIR%%/images/amssymb.xpm
+%%DATADIR%%/images/buffer-close.xpm
+%%DATADIR%%/images/buffer-export_ascii.xpm
+%%DATADIR%%/images/buffer-export_latex.xpm
+%%DATADIR%%/images/buffer-new.xpm
+%%DATADIR%%/images/buffer-print.xpm
+%%DATADIR%%/images/buffer-update_dvi.xpm
+%%DATADIR%%/images/buffer-update_ps.xpm
+%%DATADIR%%/images/buffer-view_dvi.xpm
+%%DATADIR%%/images/buffer-view_ps.xpm
+%%DATADIR%%/images/buffer-write.xpm
+%%DATADIR%%/images/build-program.xpm
+%%DATADIR%%/images/citation-insert.xpm
+%%DATADIR%%/images/copy.xpm
+%%DATADIR%%/images/cut.xpm
+%%DATADIR%%/images/depth-decrement.xpm
+%%DATADIR%%/images/depth-increment.xpm
+%%DATADIR%%/images/down.xpm
+%%DATADIR%%/images/ert-insert.xpm
+%%DATADIR%%/images/file-open.xpm
+%%DATADIR%%/images/find-replace.xpm
+%%DATADIR%%/images/font-bold.xpm
+%%DATADIR%%/images/font-emph.xpm
+%%DATADIR%%/images/font-free.xpm
+%%DATADIR%%/images/font-noun.xpm
+%%DATADIR%%/images/font-sans.xpm
+%%DATADIR%%/images/footnote-insert.xpm
+%%DATADIR%%/images/graphics-insert.xpm
+%%DATADIR%%/images/index-insert.xpm
+%%DATADIR%%/images/label-insert.xpm
+%%DATADIR%%/images/layout.xpm
+%%DATADIR%%/images/layout_LyX-Code.xpm
+%%DATADIR%%/images/layout_Scrap.xpm
+%%DATADIR%%/images/layout_Section.xpm
+%%DATADIR%%/images/lyx-quit.xpm
+%%DATADIR%%/images/lyx.xpm
+%%DATADIR%%/images/marginalnote-insert.xpm
 %%DATADIR%%/images/math-mode.xpm
 %%DATADIR%%/images/math-panel.xpm
 %%DATADIR%%/images/math-subscript.xpm
@@ -689,13 +708,13 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/images/undo.xpm
 %%DATADIR%%/images/unknown.xpm
 %%DATADIR%%/images/up.xpm
+%%DATADIR%%/images/banner.ppm
 %%DATADIR%%/kbd/american-2.kmap
 %%DATADIR%%/kbd/american.kmap
 %%DATADIR%%/kbd/arabic.kmap
 %%DATADIR%%/kbd/bg-bds-1251.kmap
 %%DATADIR%%/kbd/brazil.kmap
 %%DATADIR%%/kbd/brazil2.kmap
-%%DATADIR%%/kbd/cp1251.cdef
 %%DATADIR%%/kbd/czech-prg.kmap
 %%DATADIR%%/kbd/czech.kmap
 %%DATADIR%%/kbd/espanol.kmap
@@ -707,22 +726,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/german.kmap
 %%DATADIR%%/kbd/greek.kmap
 %%DATADIR%%/kbd/hebrew.kmap
-%%DATADIR%%/kbd/ibm866.cdef
-%%DATADIR%%/kbd/iso8859-1.cdef
-%%DATADIR%%/kbd/iso8859-15.cdef
-%%DATADIR%%/kbd/iso8859-2.cdef
-%%DATADIR%%/kbd/iso8859-3.cdef
-%%DATADIR%%/kbd/iso8859-4.cdef
-%%DATADIR%%/kbd/iso8859-7.cdef
-%%DATADIR%%/kbd/iso8859-8.cdef
-%%DATADIR%%/kbd/iso8859-9.cdef
-%%DATADIR%%/kbd/koi8-r.cdef
 %%DATADIR%%/kbd/koi8-r.kmap
-%%DATADIR%%/kbd/koi8-t.cdef
-%%DATADIR%%/kbd/koi8-u.cdef
 %%DATADIR%%/kbd/koi8-u.kmap
 %%DATADIR%%/kbd/latvian.kmap
 %%DATADIR%%/kbd/magyar-2.kmap
+%%DATADIR%%/kbd/sf.kmap
 %%DATADIR%%/kbd/magyar-3.kmap
 %%DATADIR%%/kbd/magyar.kmap
 %%DATADIR%%/kbd/null.kmap
@@ -732,31 +740,36 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/romanian.kmap
 %%DATADIR%%/kbd/serbian.kmap
 %%DATADIR%%/kbd/serbocroatian.kmap
-%%DATADIR%%/kbd/sf.kmap
 %%DATADIR%%/kbd/sg.kmap
 %%DATADIR%%/kbd/slovak.kmap
 %%DATADIR%%/kbd/slovene.kmap
 %%DATADIR%%/kbd/thai-kedmanee.kmap
-%%DATADIR%%/kbd/tis620-0.cdef
 %%DATADIR%%/kbd/transilvanian.kmap
 %%DATADIR%%/kbd/turkish-f.kmap
 %%DATADIR%%/kbd/turkish.kmap
-%%DATADIR%%/languages
+%%DATADIR%%/kbd/cp1251.cdef
+%%DATADIR%%/kbd/ibm866.cdef
+%%DATADIR%%/kbd/iso8859-1.cdef
+%%DATADIR%%/kbd/iso8859-15.cdef
+%%DATADIR%%/kbd/iso8859-2.cdef
+%%DATADIR%%/kbd/iso8859-3.cdef
+%%DATADIR%%/kbd/iso8859-4.cdef
+%%DATADIR%%/kbd/iso8859-7.cdef
+%%DATADIR%%/kbd/iso8859-8.cdef
+%%DATADIR%%/kbd/iso8859-9.cdef
+%%DATADIR%%/kbd/koi8-r.cdef
+%%DATADIR%%/kbd/koi8-t.cdef
+%%DATADIR%%/kbd/koi8-u.cdef
+%%DATADIR%%/kbd/tis620-0.cdef
 %%DATADIR%%/layouts/IEEEtran.layout
 %%DATADIR%%/layouts/aa.layout
-%%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
 %%DATADIR%%/layouts/agums.layout
-%%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
 %%DATADIR%%/layouts/amsart-seq.layout
 %%DATADIR%%/layouts/amsart.layout
 %%DATADIR%%/layouts/amsbook.layout
-%%DATADIR%%/layouts/amsdefs.inc
-%%DATADIR%%/layouts/amsmaths-plain.inc
-%%DATADIR%%/layouts/amsmaths-seq.inc
-%%DATADIR%%/layouts/amsmaths.inc
 %%DATADIR%%/layouts/apa.layout
 %%DATADIR%%/layouts/article.layout
 %%DATADIR%%/layouts/book.layout
@@ -764,20 +777,11 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/chess.layout
 %%DATADIR%%/layouts/cl2emult.layout
 %%DATADIR%%/layouts/cv.layout
-%%DATADIR%%/layouts/db_lyxmacros.inc
-%%DATADIR%%/layouts/db_stdclass.inc
-%%DATADIR%%/layouts/db_stdcounters.inc
-%%DATADIR%%/layouts/db_stdlayouts.inc
-%%DATADIR%%/layouts/db_stdlists.inc
-%%DATADIR%%/layouts/db_stdsections.inc
-%%DATADIR%%/layouts/db_stdstarsections.inc
-%%DATADIR%%/layouts/db_stdstruct.inc
-%%DATADIR%%/layouts/db_stdtitle.inc
 %%DATADIR%%/layouts/dinbrief.layout
 %%DATADIR%%/layouts/docbook-book.layout
 %%DATADIR%%/layouts/docbook-chapter.layout
-%%DATADIR%%/layouts/docbook-section.layout
 %%DATADIR%%/layouts/docbook.layout
+%%DATADIR%%/layouts/docbook-section.layout
 %%DATADIR%%/layouts/dtk.layout
 %%DATADIR%%/layouts/egs.layout
 %%DATADIR%%/layouts/elsart.layout
@@ -794,7 +798,12 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/heb-letter.layout
 %%DATADIR%%/layouts/hollywood.layout
 %%DATADIR%%/layouts/ijmpd.layout
+%%DATADIR%%/layouts/jarticle.layout
+%%DATADIR%%/layouts/jbook.layout
 %%DATADIR%%/layouts/jgrga.layout
+%%DATADIR%%/layouts/jreport.layout
+%%DATADIR%%/layouts/jsarticle.layout
+%%DATADIR%%/layouts/jsbook.layout
 %%DATADIR%%/layouts/kluwer.layout
 %%DATADIR%%/layouts/latex8.layout
 %%DATADIR%%/layouts/letter.layout
@@ -802,31 +811,50 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/literate-article.layout
 %%DATADIR%%/layouts/literate-book.layout
 %%DATADIR%%/layouts/literate-report.layout
-%%DATADIR%%/layouts/literate-scrap.inc
 %%DATADIR%%/layouts/llncs.layout
 %%DATADIR%%/layouts/ltugboat.layout
-%%DATADIR%%/layouts/lyxmacros.inc
 %%DATADIR%%/layouts/manpage.layout
 %%DATADIR%%/layouts/memoir.layout
 %%DATADIR%%/layouts/mwart.layout
 %%DATADIR%%/layouts/mwbk.layout
 %%DATADIR%%/layouts/mwrep.layout
-%%DATADIR%%/layouts/obsolete.inc
 %%DATADIR%%/layouts/paper.layout
+%%DATADIR%%/layouts/prosper.layout
 %%DATADIR%%/layouts/report.layout
 %%DATADIR%%/layouts/revtex.layout
 %%DATADIR%%/layouts/revtex4.layout
 %%DATADIR%%/layouts/scrartcl.layout
 %%DATADIR%%/layouts/scrbook.layout
-%%DATADIR%%/layouts/scrclass.inc
 %%DATADIR%%/layouts/scrlettr.layout
 %%DATADIR%%/layouts/scrlttr2.layout
-%%DATADIR%%/layouts/scrmacros.inc
 %%DATADIR%%/layouts/scrreprt.layout
 %%DATADIR%%/layouts/seminar.layout
 %%DATADIR%%/layouts/siamltex.layout
 %%DATADIR%%/layouts/slides.layout
 %%DATADIR%%/layouts/spie.layout
+%%DATADIR%%/layouts/svglobal.layout
+%%DATADIR%%/layouts/svjog.layout
+%%DATADIR%%/layouts/svprobth.layout
+%%DATADIR%%/layouts/aapaper.inc
+%%DATADIR%%/layouts/aguplus.inc
+%%DATADIR%%/layouts/amsdefs.inc
+%%DATADIR%%/layouts/amsmaths-plain.inc
+%%DATADIR%%/layouts/amsmaths-seq.inc
+%%DATADIR%%/layouts/amsmaths.inc
+%%DATADIR%%/layouts/db_lyxmacros.inc
+%%DATADIR%%/layouts/db_stdclass.inc
+%%DATADIR%%/layouts/db_stdcounters.inc
+%%DATADIR%%/layouts/db_stdlayouts.inc
+%%DATADIR%%/layouts/db_stdlists.inc
+%%DATADIR%%/layouts/db_stdsections.inc
+%%DATADIR%%/layouts/db_stdtitle.inc
+%%DATADIR%%/layouts/db_stdstarsections.inc
+%%DATADIR%%/layouts/db_stdstruct.inc
+%%DATADIR%%/layouts/literate-scrap.inc
+%%DATADIR%%/layouts/lyxmacros.inc
+%%DATADIR%%/layouts/obsolete.inc
+%%DATADIR%%/layouts/scrclass.inc
+%%DATADIR%%/layouts/scrmacros.inc
 %%DATADIR%%/layouts/stdclass.inc
 %%DATADIR%%/layouts/stdcounters.inc
 %%DATADIR%%/layouts/stdfloats.inc
@@ -837,9 +865,7 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/stdstarsections.inc
 %%DATADIR%%/layouts/stdstruct.inc
 %%DATADIR%%/layouts/stdtitle.inc
-%%DATADIR%%/layouts/svjog.layout
 %%DATADIR%%/layouts/svjour.inc
-%%DATADIR%%/layouts/svprobth.layout
 %%DATADIR%%/lyx2lyx/error.py
 %%DATADIR%%/lyx2lyx/error.pyc
 %%DATADIR%%/lyx2lyx/lyx2lyx
@@ -856,35 +882,16 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/lyx2lyx/lyxconvert_220.pyc
 %%DATADIR%%/lyx2lyx/parser_tools.py
 %%DATADIR%%/lyx2lyx/parser_tools.pyc
-%%DATADIR%%/lyxrc.defaults
-%%DATADIR%%/lyxrc.example
-%%DATADIR%%/packages.lst
-%%DATADIR%%/reLyX/BUGS
-%%DATADIR%%/reLyX/BasicLyX.pm
-%%DATADIR%%/reLyX/CHANGES
-%%DATADIR%%/reLyX/CleanTeX.pm
-%%DATADIR%%/reLyX/LastLyX.pm
-%%DATADIR%%/reLyX/MakePreamble.pm
-%%DATADIR%%/reLyX/README
-%%DATADIR%%/reLyX/ReadCommands.pm
-%%DATADIR%%/reLyX/RelyxFigure.pm
-%%DATADIR%%/reLyX/RelyxTable.pm
-%%DATADIR%%/reLyX/Text/TeX.pm
-%%DATADIR%%/reLyX/Verbatim.pm
-%%DATADIR%%/reLyX/reLyX.pod
-%%DATADIR%%/reLyX/reLyXmain.pl
-%%DATADIR%%/reLyX/syntax.default
 %%DATADIR%%/scripts/TeXFiles.sh
 %%DATADIR%%/scripts/convertDefault.sh
 %%DATADIR%%/scripts/fen2ascii.py
 %%DATADIR%%/scripts/fig2pstex.py
 %%DATADIR%%/scripts/general_command_wrapper.py
 %%DATADIR%%/scripts/listerrors
-%%DATADIR%%/scripts/lyxpreview2bitmap.sh
+%%DATADIR%%/scripts/lyxpreview2ppm.py
 %%DATADIR%%/scripts/pic2ascii.py
 %%DATADIR%%/scripts/pic2png_eps.py
 %%DATADIR%%/scripts/pic2png_eps.sh
-%%DATADIR%%/symbols
 %%DATADIR%%/templates/IEEEtran.lyx
 %%DATADIR%%/templates/aa.lyx
 %%DATADIR%%/templates/aastex.lyx
@@ -906,37 +913,64 @@ share/locale/sl/LC_MESSAGES/lyx.mo
 %%DATADIR%%/tex/broadway.cls
 %%DATADIR%%/tex/cv.cls
 %%DATADIR%%/tex/hollywood.cls
+%%DATADIR%%/tex/revtex.cls
 %%DATADIR%%/tex/lyxchess.sty
 %%DATADIR%%/tex/lyxskak.sty
-%%DATADIR%%/tex/revtex.cls
-%%DATADIR%%/textclass.lst
 %%DATADIR%%/ui/default.ui
-%%DATADIR%%/xfonts/PSres.upr
-%%DATADIR%%/xfonts/cmex10.pfb
-%%DATADIR%%/xfonts/cmmi10.pfb
-%%DATADIR%%/xfonts/cmr10.pfb
-%%DATADIR%%/xfonts/cmsy10.pfb
-%%DATADIR%%/xfonts/eufm10.pfb
-%%DATADIR%%/xfonts/fonts.dir
-%%DATADIR%%/xfonts/fonts.scale
-%%DATADIR%%/xfonts/msam10.pfb
-%%DATADIR%%/xfonts/msbm10.pfb
-%%DATADIR%%/xfonts/wasy10.pfb
-@dirrm %%DATADIR%%/xfonts
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/tex
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/scripts
+%%DATADIR%%/configure
+%%DATADIR%%/configure.cmd
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/cmex10.pfb
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/cmmi10.pfb
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/cmr10.pfb
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/cmsy10.pfb
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/eufm10.pfb
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/msam10.pfb
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/msbm10.pfb
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/wasy10.pfb
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/fonts.dir
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/fonts.scale
+%%WITH_XFORMS%%%%DATADIR%%/xfonts/PSres.upr
+%%DATADIR%%/lyxrc.example
+%%DATADIR%%/CREDITS
+%%DATADIR%%/chkconfig.ltx
+%%DATADIR%%/lyxrc.defaults
+%%DATADIR%%/textclass.lst
+%%DATADIR%%/packages.lst
+%%DATADIR%%/external_templates
+%%DATADIR%%/encodings
+%%DATADIR%%/languages
+%%DATADIR%%/symbols
+@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fi 2>/dev/null || true
+@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nn 2>/dev/null || true
+@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ko 2>/dev/null || true
 @dirrm %%DATADIR%%/reLyX/Text
 @dirrm %%DATADIR%%/reLyX
-@dirrm %%DATADIR%%/lyx2lyx
-@dirrm %%DATADIR%%/layouts
-@dirrm %%DATADIR%%/kbd
+@dirrm %%DATADIR%%/bind
+@dirrm %%DATADIR%%/clipart
+%%PORTDOCS%%@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/images/math
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/clipart
-@dirrm %%DATADIR%%/bind
+@dirrm %%DATADIR%%/kbd
+@dirrm %%DATADIR%%/layouts
+@dirrm %%DATADIR%%/lyx2lyx
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/tex
+@dirrm %%DATADIR%%/ui
+%%WITH_XFORMS%%@dirrm %%DATADIR%%/xfonts
 @dirrm %%DATADIR%%