Update to 1.2.1 and unbroke ports.

PR:		ports/43705
Submitted by:	Ports Fury

9 files changed, 80 insertions, 47 deletions

diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 3d1ee456b73f..33b82bbda346 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	print
 MASTER_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
 PKGNAMEPREFIX=	cjk-
@@ -15,8 +14,6 @@ DISTNAME=	CJK-LyX-${PORTVERSION}-src
 
 MAINTAINER=	cjh@FreeBSD.org
 
-BROKEN=		"Does not compile"
-
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		latex:${PORTSDIR}/print/teTeX
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
@@ -31,17 +28,18 @@ USE_REINPLACE=	yes
 USE_PERL5=	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"
+CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
+		--with-extra-inc="${LOCALBASE}/include"
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.15:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--with-pspell
+CONFIGURE_ARGS+=	--with-pspell \
+			--with-pspell-lib="${LOCALBASE}/lib" \
+			--with-pspell-include="${LOCALBASE}/include" 
 .endif
 
 .if defined(WITH_ISPELL)
@@ -63,6 +61,9 @@ 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 ; \
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index bf4a4952622d..bb6fa911f39b 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1 +1 @@
-MD5 (CJK-LyX-1.2.0-src.tar.gz) = 0e0c33bb36d5d561ed83a230ef9837d0
+MD5 (CJK-LyX-1.2.1-src.tar.gz) = ac07a60f1e3446e4c58631e2dca2cc95
diff --git a/print/cjk-lyx/files/patch-config::pspell.m4 b/print/cjk-lyx/files/patch-config::pspell.m4
new file mode 100644
index 000000000000..31bfdce0d433
--- /dev/null
+++ b/print/cjk-lyx/files/patch-config::pspell.m4
@@ -0,0 +1,20 @@
+--- 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-configure.in b/print/cjk-lyx/files/patch-configure.in
deleted file mode 100644
index d02d4c108d92..000000000000
--- a/print/cjk-lyx/files/patch-configure.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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::FontLoader.C b/print/cjk-lyx/files/patch-src::FontLoader.C
new file mode 100644
index 000000000000..5073b8740fb1
--- /dev/null
+++ b/print/cjk-lyx/files/patch-src::FontLoader.C
@@ -0,0 +1,12 @@
+--- 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/patch-src::WorkArea.C b/print/cjk-lyx/files/patch-src::WorkArea.C
new file mode 100644
index 000000000000..ebfb370319f9
--- /dev/null
+++ b/print/cjk-lyx/files/patch-src::WorkArea.C
@@ -0,0 +1,14 @@
+--- src/WorkArea.C.orig	Fri Aug 23 15:04:29 2002
++++ src/WorkArea.C	Thu Oct  3 00:30:28 2002
+@@ -409,9 +409,9 @@
+ 		KeySym keysym = 0;
+ #ifdef I18N
+                char s_r[256];
+-#else
+-		char dummy[1];
++               int num_bytes;
+ #endif		
++		char dummy[1];
+ 		XKeyEvent * xke = reinterpret_cast<XKeyEvent *>(ev);
+ #if FL_VERSION < 1 && (FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5))
+ 		// XForms < 0.89.5 does not have compose support
diff --git a/print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C b/print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C
deleted file mode 100644
index bc5195aedd61..000000000000
--- a/print/cjk-lyx/files/patch-src::frontends::xforms::GUIRunTime.C
+++ /dev/null
@@ -1,20 +0,0 @@
-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::sp_spell.C b/print/cjk-lyx/files/patch-src::sp_spell.C
new file mode 100644
index 000000000000..32da4ce945b5
--- /dev/null
+++ b/print/cjk-lyx/files/patch-src::sp_spell.C
@@ -0,0 +1,11 @@
+--- src/sp_spell.C.orig	Mon Aug 12 19:25:50 2002
++++ src/sp_spell.C	Fri Aug 23 03:38:09 2002
+@@ -379,7 +379,7 @@
+ 		// Configure provides us with macros which are supposed to do
+ 		// the right typecast.
+ 		retval = select(SELECT_TYPE_ARG1 (pipeout[0]+1),
+-				SELECT_TYPE_ARG234 (&infds),
++				&infds,
+ 				0,
+ 				0,
+ 				SELECT_TYPE_ARG5 (&tv));
diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist
index c813e083c349..75ad1157c54f 100644
--- a/print/cjk-lyx/pkg-plist
+++ b/print/cjk-lyx/pkg-plist
@@ -27,9 +27,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 share/lyx/CREDITS
 share/lyx/bind/broadway.bind
 share/lyx/bind/cua.bind
+share/lyx/bind/cyrkeys.bind
 share/lyx/bind/de_menus.bind
 share/lyx/bind/emacs.bind
 share/lyx/bind/fi_menus.bind
+share/lyx/bind/greekkeys.bind
 share/lyx/bind/hollywood.bind
 share/lyx/bind/latinkeys.bind
 share/lyx/bind/math.bind
@@ -79,6 +81,8 @@ share/lyx/doc/fr_Intro.lyx
 share/lyx/doc/fr_TOC.lyx
 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/hu_Intro.lyx
 share/lyx/doc/hu_TOC.lyx
 share/lyx/doc/it_Customization.lyx
@@ -142,12 +146,14 @@ 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_CV.lyx
 share/lyx/examples/fr_ExemplesTableaux.lyx
 share/lyx/examples/fr_ListesPuces.lyx
 share/lyx/examples/fr_Minipage.lyx
 share/lyx/examples/fr_MultiColonnes.lyx
 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/hu_splash.lyx
 share/lyx/examples/iecc05.fen
@@ -182,6 +188,7 @@ 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-new.xpm
 share/lyx/images/buffer-print.xpm
 share/lyx/images/buffer-update_dvi.xpm
 share/lyx/images/buffer-update_ps.xpm
@@ -233,6 +240,7 @@ 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/cp1251.cdef
 share/lyx/kbd/czech-prg.kmap
 share/lyx/kbd/czech.kmap
 share/lyx/kbd/european.kmap
@@ -243,6 +251,7 @@ share/lyx/kbd/german-3.kmap
 share/lyx/kbd/german.kmap
 share/lyx/kbd/greek.kmap
 share/lyx/kbd/hebrew.kmap
+share/lyx/kbd/ibm866.cdef
 share/lyx/kbd/iso8859-1.cdef
 share/lyx/kbd/iso8859-15.cdef
 share/lyx/kbd/iso8859-2.cdef
@@ -251,7 +260,10 @@ 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.cdef
 share/lyx/kbd/koi8-r.kmap
+share/lyx/kbd/koi8-t.cdef
+share/lyx/kbd/koi8-u.cdef
 share/lyx/kbd/koi8-u.kmap
 share/lyx/kbd/latvian.kmap
 share/lyx/kbd/magyar-2.kmap
@@ -291,6 +303,7 @@ share/lyx/layouts/article.layout
 share/lyx/layouts/book.layout
 share/lyx/layouts/broadway.layout
 share/lyx/layouts/chess.layout
+share/lyx/layouts/cl2emult.layout
 share/lyx/layouts/cv.layout
 share/lyx/layouts/db_lyxmacros.inc
 share/lyx/layouts/db_stdclass.inc
@@ -318,7 +331,6 @@ 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/iletter.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -392,7 +404,6 @@ 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/iletter.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
@@ -403,7 +414,6 @@ share/lyx/templates/slides.lyx
 share/lyx/tex/broadway.cls
 share/lyx/tex/cv.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