Update to CJK-LyX-1.1.6fix4.

I am not sure that it really works. It doesn't work in my environment
(-current today) because libc.3 and libc.5 conflicts due to xforms,
in CJK locale mode. It need -stable test.

PR:		ports/35698
Submitted by:	Eric Yu <ericyu@mail2000.com.tw>

3 files changed, 18 insertions, 9 deletions

diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index eae9f21f2d68..4f54f4f3f61b 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.3
+PORTVERSION=	1.1.6.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
 PKGNAMEPREFIX=	cjk-
-DISTNAME=	CJK-LyX-1.1.6fix3-src
+DISTNAME=	${DIST_VER}-src
 
 MAINTAINER=	cjh@FreeBSD.org
 
@@ -19,7 +19,7 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 .if defined(WITH_ISPELL)
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .endif
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
+LIB_DEPENDS=	forms.0:${PORTSDIR}/x11-toolkits/xforms \
 		intl.1:${PORTSDIR}/devel/gettext-old
 
 USE_GMAKE=	yes
@@ -31,7 +31,9 @@ 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
-WRKSRC=		${WRKDIR}/CJK-LyX-1.1.6fix3
+
+DIST_VER=	CJK-LyX-1.1.6fix4
+WRKSRC=		${WRKDIR}/${DIST_VER}
 
 .if !defined(WITH_ISPELL)
 pre-fetch:
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index 3db1a8731e1b..0d928f192949 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1 +1 @@
-MD5 (CJK-LyX-1.1.6fix3-src.tar.gz) = ed8a97f6e08147e5d3c9ac46d23f7879
+MD5 (CJK-LyX-1.1.6fix4-src.tar.gz) = 639ac509c9e5f9abdcff19c52de75863
diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist
index edfc49c96633..98d7e0895750 100644
--- a/print/cjk-lyx/pkg-plist
+++ b/print/cjk-lyx/pkg-plist
@@ -58,6 +58,8 @@ share/lyx/doc/Tutorial.lyx
 share/lyx/doc/UserGuide.lyx
 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
@@ -84,6 +86,7 @@ share/lyx/doc/fr_Tutorial.lyx
 share/lyx/doc/fr_UserGuide.lyx
 share/lyx/doc/hu_Intro.lyx
 share/lyx/doc/hu_TOC.lyx
+share/lyx/doc/it_Customization.lyx
 share/lyx/doc/it_Intro.lyx
 share/lyx/doc/it_TOC.lyx
 share/lyx/doc/it_Tutorial.lyx
@@ -112,7 +115,6 @@ share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
 share/lyx/examples/Literate.lyx
 share/lyx/examples/MathLabeling.lyx
-share/lyx/examples/Math_macros.lyx
 share/lyx/examples/Minipage.lyx
 share/lyx/examples/TableExamples.lyx
 share/lyx/examples/aa_sample.lyx
@@ -121,6 +123,7 @@ share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
 share/lyx/examples/ca_splash.lyx
 share/lyx/examples/cv.lyx
+share/lyx/examples/da_splash.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
 share/lyx/examples/de_beispiel_roh.lyx
 share/lyx/examples/de_splash.lyx
@@ -138,7 +141,6 @@ 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_Macros_Math.lyx
 share/lyx/examples/fr_Minipage.lyx
 share/lyx/examples/fr_MultiColonnes.lyx
 share/lyx/examples/fr_exemple_brut.lyx
@@ -159,7 +161,7 @@ share/lyx/examples/noweb2lyx.lyx
 share/lyx/examples/pl_splash.lyx
 share/lyx/examples/pt_splash.lyx
 share/lyx/examples/ru_splash.lyx
-share/lyx/examples/scriptone.lyx
+share/lyx/examples/script_form.lyx
 share/lyx/examples/sl_primer_lyxan.lyx
 share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
@@ -227,7 +229,10 @@ share/lyx/kbd/german.kmap
 share/lyx/kbd/greek.kmap
 share/lyx/kbd/hebrew.kmap
 share/lyx/kbd/iso8859-1.cdef
+share/lyx/kbd/iso8859-15.cdef
 share/lyx/kbd/iso8859-2.cdef
+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/koi8-r.kmap
@@ -285,7 +290,7 @@ share/lyx/layouts/docbook-section.layout
 share/lyx/layouts/docbook.layout
 share/lyx/layouts/egs.layout
 share/lyx/layouts/ejour2.layout
-share/lyx/layouts/encts.layout
+share/lyx/layouts/entcs.layout
 share/lyx/layouts/extarticle.layout
 share/lyx/layouts/extbook.layout
 share/lyx/layouts/extletter.layout
@@ -297,6 +302,7 @@ 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
 share/lyx/layouts/linuxdoc.layout
@@ -364,6 +370,7 @@ 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
 share/lyx/templates/linuxdoctemplate.lyx