7 files changed, 19 insertions, 172 deletions

diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 33b82bbda346..7ef5dcfe3a25 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.3
 CATEGORIES=	print
 MASTER_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
 PKGNAMEPREFIX=	cjk-
@@ -28,11 +28,12 @@ USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	15
-AUTOMAKE=	${WRKSRC}/autogen.sh
-AUTOCONF=	${TRUE}
 CONFIGURE_ENV=	CPPFLAGS="-DI18N"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 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
 
 .if defined(WITH_ASPELL)
@@ -61,12 +62,13 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-post-extract:
-	@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
-
 post-patch:
-	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
-		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
+.for file in src/Makefile.am src/frontends/Makefile.am
+	@${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file}
+.endfor
+.for file in configure.in lib/reLyX/configure.in
+	@${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
+		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index bb6fa911f39b..27200282effb 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1 +1 @@
-MD5 (CJK-LyX-1.2.1-src.tar.gz) = ac07a60f1e3446e4c58631e2dca2cc95
+MD5 (CJK-LyX-1.2.3-src.tar.gz) = 30eab39df47ab8fc36863bdaa0d76c4d
diff --git a/print/cjk-lyx/files/patch-autogen.sh b/print/cjk-lyx/files/patch-autogen.sh
deleted file mode 100644
index 18bcff099867..000000000000
--- a/print/cjk-lyx/files/patch-autogen.sh
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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-config::pspell.m4 b/print/cjk-lyx/files/patch-config::pspell.m4
deleted file mode 100644
index 31bfdce0d433..000000000000
--- a/print/cjk-lyx/files/patch-config::pspell.m4
+++ /dev/null
@@ -1,20 +0,0 @@
---- config/pspell.m4.orig	Thu Jun 20 21:03:56 2002
-+++ config/pspell.m4	Wed Oct  2 22:10:21 2002
-@@ -12,7 +12,7 @@
-         fi
-       ])
- 
--    AC_ARG_WITH(pspell-includes, [  --with-pspell-include   where the pspell.h is located],
-+    AC_ARG_WITH(pspell-include, [  --with-pspell-include   where the pspell.h is located],
-       pspell_use_include="$withval",
-       pspell_use_include=NONE)
- 
-@@ -22,7 +22,7 @@
-       AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
-     fi
- 
--    AC_ARG_WITH(pspell-libs, [  --with-pspell-lib       where the libpspell.a is located],
-+    AC_ARG_WITH(pspell-lib, [  --with-pspell-lib       where the libpspell.a is located],
-       pspell_use_lib="$withval",
-       pspell_use_lib=NONE)
- 
diff --git a/print/cjk-lyx/files/patch-src::FontLoader.C b/print/cjk-lyx/files/patch-src::FontLoader.C
deleted file mode 100644
index 5073b8740fb1..000000000000
--- a/print/cjk-lyx/files/patch-src::FontLoader.C
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/FontLoader.C.orig	Fri Mar 22 02:25:07 2002
-+++ src/FontLoader.C	Fri Aug 23 03:38:09 2002
-@@ -300,7 +300,8 @@
- 		if (font == "fixed") {
- 			lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
- 		} else {
--			lyxerr << "Could not get font. Using 'fixed'." << endl;
-+			lyxerr << "Could not get font '" << font.c_str() <<
-+				"'. Using 'fixed'." << endl;
- 			fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
- 		}
- 	} else if (lyxerr.debugging(Debug::FONT)) {
diff --git a/print/cjk-lyx/files/xforms.m4 b/print/cjk-lyx/files/xforms.m4
deleted file mode 100644
index bbfc6c7d0c9f..000000000000
--- a/print/cjk-lyx/files/xforms.m4
+++ /dev/null
@@ -1,98 +0,0 @@
-dnl some macros to test for xforms-related functionality  -*- sh -*-
-
-dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
-dnl   If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
-dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
-AC_DEFUN(LYX_PATH_XFORMS,[
-AC_REQUIRE([LYX_PATH_XPM])
-
-AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
-  [AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
-    [LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
-AC_SUBST(XFORMS_LIB)
-
-### Check for xforms headers
-lyx_cv_forms_h_location="<forms.h>"
-AC_CHECK_HEADER(X11/forms.h,[
-  ac_cv_header_forms_h=yes
-  lyx_cv_forms_h_location="<X11/forms.h>"],[
-AC_CHECK_HEADER(forms.h,[],[
-LYX_LIB_ERROR(forms.h,forms)])])
-AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
-   [define this to the location of forms.h to be used with #include, e.g. <forms.h>])
-
-if test $ac_cv_header_forms_h = yes; then
-  AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
-  [ cat > conftest.$ac_ext <<EOF
-#line __oline__ "configure"
-#include "confdefs.h"
-
-#include FORMS_H_LOCATION
-#if ! defined(FL_INCLUDE_VERSION)
-"%%%"(unknown)"%%%"
-#else
-"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
-#endif
-EOF
-lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
-  grep '^"%%%"'  2>/dev/null | \
-  sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
-rm -f conftest*])
-
-XFORMS_VERSION=$lyx_cv_xfversion
-case "$lyx_cv_xfversion" in
-  "(unknown)"|0.8[1-7]*)
-	 LYX_ERROR(dnl
-Version $lyx_cv_xfversion of xforms is not compatible with LyX.
-   This version of LyX works best with versions 0.88 (recommended) and later.) ;;
-    0.88*) ;;
-    0.89[01234]) LYX_WARNING(dnl
-LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
-it is an unproven version and might still have some bugs. You should
-probably use version 0.89.6 (or 0.88) instead) ;;
-    0.89*) ;;
-    0.9999*) ;;
-    1.0*) ;;
-       *) LYX_WARNING(dnl
-Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
- since it is newer than 0.89. You might have slight problems with it.);;
-esac
-fi
-])
-
-
-
-dnl Check whether the xforms library has a viable image loader
-AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
-[AC_REQUIRE([LYX_PATH_XFORMS])
-save_LIBS=$LIBS
-LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
-lyx_use_xforms_image_loader=no
-AC_LANG_SAVE
-AC_LANG_C
-
-AC_CHECK_LIB(jpeg, jpeg_read_header,
-  [XFORMS_IMAGE_LIB=-ljpeg
-   LIBS="$LIBS -ljpeg"])
-AC_SEARCH_LIBS(flimage_dup, flimage,
-  [lyx_use_xforms_image_loader=yes
-   if test "$ac_cv_search_flimage_dup" != "none required" ; then
-     XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
-     LIBS="$XFORMS_IMAGE_LIB $LIBS"
-  fi])
-AC_SUBST(XFORMS_IMAGE_LIB)
-
-if test $lyx_use_xforms_image_loader = yes ; then
-  lyx_flags="$lyx_flags xforms-image-loader"
-  AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
-	    [Define if you want to use xforms built-in image loader])
-  AC_CHECK_FUNCS(flimage_enable_ps flimage_enable_jpeg)
-  AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
-fi
-
-### If the gui cannot load images itself, then we default to the
-### very simple one in graphics/GraphicsImageXPM.[Ch]
-AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
-	       test $lyx_use_xforms_image_loader = no)
-AC_LANG_RESTORE
-LIBS=$save_LIBS])
diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist
index 75ad1157c54f..7eab7ce8966d 100644
--- a/print/cjk-lyx/pkg-plist
+++ b/print/cjk-lyx/pkg-plist
@@ -83,6 +83,7 @@ share/lyx/doc/fr_Tutorial.lyx
 share/lyx/doc/fr_UserGuide.lyx
 share/lyx/doc/he_Intro.lyx
 share/lyx/doc/he_TOC.lyx
+share/lyx/doc/he_Tutorial.lyx
 share/lyx/doc/hu_Intro.lyx
 share/lyx/doc/hu_TOC.lyx
 share/lyx/doc/it_Customization.lyx
@@ -104,6 +105,7 @@ 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_FAQ.lyx
 share/lyx/doc/ru_Intro.lyx
 share/lyx/doc/ru_TOC.lyx
 share/lyx/doc/ru_Tutorial.lyx
@@ -155,6 +157,9 @@ share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_mathed.lyx
 share/lyx/examples/fr_splash.lyx
+share/lyx/examples/he_example_raw.lyx
+share/lyx/examples/he_he_example_lyxified.lyx
+share/lyx/examples/he_he_example_raw.lyx
 share/lyx/examples/hu_splash.lyx
 share/lyx/examples/iecc05.fen
 share/lyx/examples/iecc07.fen
@@ -331,6 +336,7 @@ share/lyx/layouts/g-brief-en.layout
 share/lyx/layouts/heb-article.layout
 share/lyx/layouts/heb-letter.layout
 share/lyx/layouts/hollywood.layout
+share/lyx/layouts/ijmpd.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -404,6 +410,7 @@ 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
+share/lyx/templates/ijmpd.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx