Update CJK patchset of 1.1.6fix3.

I think it is broken in -current under CJK locale
because of xforms+locale.

Submitted by:	statue@cnpa.adsldns.org

5 files changed, 124 insertions, 29 deletions

diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index cb5d5740a894..05c0774d5987 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.5.2
+PORTVERSION=	1.1.6.3
 CATEGORIES=	print
 MASTER_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
 PKGNAMEPREFIX=	cjk-
-DISTNAME=	CJK-LyX-1.1.5fix2-src
+DISTNAME=	CJK-LyX-1.1.6fix3-src
 
 MAINTAINER=	cjh@FreeBSD.org
 
@@ -31,7 +31,7 @@ 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.5fix2
+WRKSRC=		${WRKDIR}/CJK-LyX-1.1.6fix3
 
 .if !defined(WITH_ISPELL)
 pre-fetch:
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index 24b8bc5afbf2..3db1a8731e1b 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1 +1 @@
-MD5 (CJK-LyX-1.1.5fix2-src.tar.gz) = 931863a9947926a6109f0ce090c2aa11
+MD5 (CJK-LyX-1.1.6fix3-src.tar.gz) = ed8a97f6e08147e5d3c9ac46d23f7879
diff --git a/print/cjk-lyx/files/patch-aa b/print/cjk-lyx/files/patch-aa
new file mode 100644
index 000000000000..3b1ae527b89d
--- /dev/null
+++ b/print/cjk-lyx/files/patch-aa
@@ -0,0 +1,11 @@
+--- 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-ba b/print/cjk-lyx/files/patch-ba
index db4efd8728e0..3c9654b5083a 100644
--- a/print/cjk-lyx/files/patch-ba
+++ b/print/cjk-lyx/files/patch-ba
@@ -1,9 +1,9 @@
---- lib/reLyX/configure.orig	Wed Jul 19 07:02:12 2000
-+++ lib/reLyX/configure	Mon Sep 11 16:29:47 2000
-@@ -567,7 +567,7 @@
+--- 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:570: checking for a BSD compatible install" >&5
+ 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
diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist
index 228885fbec8f..edfc49c96633 100644
--- a/print/cjk-lyx/pkg-plist
+++ b/print/cjk-lyx/pkg-plist
@@ -1,3 +1,4 @@
+bin/listerrors
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
@@ -43,16 +44,14 @@ share/lyx/configure
 share/lyx/configure.cmd
 share/lyx/doc/BUGS.lyx
 share/lyx/doc/Customization.lyx
-share/lyx/doc/Depend.pl
 share/lyx/doc/DocStyle.lyx
-share/lyx/doc/Doc_toc.pl
 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
 share/lyx/doc/LaTeXConfig.lyx.in
-share/lyx/doc/Makefile
-share/lyx/doc/README.Documentation
+share/lyx/doc/LyXConfig.lyx.in
 share/lyx/doc/Reference.lyx
 share/lyx/doc/TOC.lyx
 share/lyx/doc/Tutorial.lyx
@@ -60,9 +59,9 @@ share/lyx/doc/UserGuide.lyx
 share/lyx/doc/cs_TOC.lyx
 share/lyx/doc/cs_Tutorial.lyx
 share/lyx/doc/de_BUGS.lyx
-share/lyx/doc/de_FAQ.lyx
 share/lyx/doc/de_Customization.lyx
 share/lyx/doc/de_Extended.lyx
+share/lyx/doc/de_FAQ.lyx
 share/lyx/doc/de_Intro.lyx
 share/lyx/doc/de_TOC.lyx
 share/lyx/doc/de_Tutorial.lyx
@@ -74,15 +73,21 @@ 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
 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_Intro.lyx
 share/lyx/doc/it_TOC.lyx
 share/lyx/doc/it_Tutorial.lyx
+share/lyx/doc/it_UserGuide.lyx
 share/lyx/doc/mobius.eps
 share/lyx/doc/nl_Intro.lyx
 share/lyx/doc/nl_TOC.lyx
@@ -93,6 +98,7 @@ share/lyx/doc/pl_Tutorial.lyx
 share/lyx/doc/platypus.eps
 share/lyx/doc/pt_Intro.lyx
 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/sl_Intro.lyx
@@ -101,6 +107,7 @@ share/lyx/doc/sl_Tutorial.lyx
 share/lyx/doc/sv_Intro.lyx
 share/lyx/doc/sv_TOC.lyx
 share/lyx/doc/sv_Tutorial.lyx
+share/lyx/encodings
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
 share/lyx/examples/Literate.lyx
@@ -108,32 +115,42 @@ 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_head.lyx
-share/lyx/examples/aa_paper.lyx
+share/lyx/examples/aa_sample.lyx
 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/cv.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
 share/lyx/examples/de_beispiel_roh.lyx
 share/lyx/examples/de_splash.lyx
 share/lyx/examples/decimal.lyx
-share/lyx/examples/docbook_example.lyx
+share/lyx/examples/docbook_article.lyx
 share/lyx/examples/es_ejemplo_con_lyx.lyx
 share/lyx/examples/es_ejemplo_sin_lyx.lyx
 share/lyx/examples/es_splash.lyx
-share/lyx/examples/eu_splash.lyx
 share/lyx/examples/eu_adibide_gordina.lyx
 share/lyx/examples/eu_adibide_lyx-atua.lyx
+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_Macros_Math.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_splash.lyx
+share/lyx/examples/hu_splash.lyx
 share/lyx/examples/it_ItemizeBullets.lyx
 share/lyx/examples/it_splash.lyx
 share/lyx/examples/landslide.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
 share/lyx/examples/nl_voorbeeld_ruw.lyx
@@ -147,25 +164,60 @@ share/lyx/examples/sl_primer_lyxan.lyx
 share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
 share/lyx/examples/splash.lyx
-share/lyx/images/amssymb.xbm
+share/lyx/external_templates
 share/lyx/images/amssymb.xpm
-share/lyx/images/psnfss1.xbm
+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
+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/copy.xpm
+share/lyx/images/cut.xpm
+share/lyx/images/depth-next.xpm
+share/lyx/images/dialog-tabular-insert.xpm
+share/lyx/images/figure-insert.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/layout.xpm
+share/lyx/images/layout_LaTeX.xpm
+share/lyx/images/layout_LyX-Code.xpm
+share/lyx/images/layout_Scrap.xpm
+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/melt.xpm
+share/lyx/images/paste.xpm
 share/lyx/images/psnfss1.xpm
-share/lyx/images/psnfss2.xbm
 share/lyx/images/psnfss2.xpm
-share/lyx/images/psnfss3.xbm
 share/lyx/images/psnfss3.xpm
-share/lyx/images/psnfss4.xbm
 share/lyx/images/psnfss4.xpm
-share/lyx/images/standard.xbm
+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/brazil.kmap
 share/lyx/kbd/brazil2.kmap
-share/lyx/kbd/czech.kmap
 share/lyx/kbd/czech-prg.kmap
+share/lyx/kbd/czech.kmap
 share/lyx/kbd/european.kmap
 share/lyx/kbd/francais.kmap
 share/lyx/kbd/french.kmap
@@ -179,6 +231,8 @@ share/lyx/kbd/iso8859-2.cdef
 share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/iso8859-8.cdef
 share/lyx/kbd/koi8-r.kmap
+share/lyx/kbd/koi8-u.kmap
+share/lyx/kbd/latvian.kmap
 share/lyx/kbd/magyar-2.kmap
 share/lyx/kbd/magyar-3.kmap
 share/lyx/kbd/magyar.kmap
@@ -186,14 +240,20 @@ share/lyx/kbd/null.kmap
 share/lyx/kbd/polish.kmap
 share/lyx/kbd/portuges.kmap
 share/lyx/kbd/romanian.kmap
+share/lyx/kbd/serbian.kmap
+share/lyx/kbd/serbocroatian.kmap
 share/lyx/kbd/sf.kmap
 share/lyx/kbd/sg.kmap
 share/lyx/kbd/slovak.kmap
 share/lyx/kbd/slovene.kmap
+share/lyx/kbd/thai-kedmanee.kmap
+share/lyx/kbd/tis620-0.cdef
 share/lyx/kbd/transilvanian.kmap
 share/lyx/kbd/turkish-f.kmap
 share/lyx/kbd/turkish.kmap
+share/lyx/languages
 share/lyx/layouts/IEEEtran.layout
+share/lyx/layouts/aa.layout
 share/lyx/layouts/aapaper.inc
 share/lyx/layouts/aapaper.layout
 share/lyx/layouts/aastex.layout
@@ -209,10 +269,27 @@ share/lyx/layouts/apa.layout
 share/lyx/layouts/article.layout
 share/lyx/layouts/book.layout
 share/lyx/layouts/broadway.layout
+share/lyx/layouts/cv.layout
+share/lyx/layouts/db_lyxmacros.inc
+share/lyx/layouts/db_stdclass.inc
+share/lyx/layouts/db_stdlayouts.inc
+share/lyx/layouts/db_stdlists.inc
+share/lyx/layouts/db_stdsections.inc
+share/lyx/layouts/db_stdstarsections.inc
+share/lyx/layouts/db_stdstruct.inc
+share/lyx/layouts/db_stdtitle.inc
 share/lyx/layouts/dinbrief.layout
+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/egs.layout
 share/lyx/layouts/ejour2.layout
+share/lyx/layouts/encts.layout
+share/lyx/layouts/extarticle.layout
+share/lyx/layouts/extbook.layout
+share/lyx/layouts/extletter.layout
+share/lyx/layouts/extreport.layout
 share/lyx/layouts/foils.layout
 share/lyx/layouts/g-brief-de.layout
 share/lyx/layouts/g-brief-en.layout
@@ -220,10 +297,6 @@ 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/jarticle.layout
-share/lyx/layouts/jbook.layout
-share/lyx/layouts/jlinuxdoc.layout
-share/lyx/layouts/jreport.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
 share/lyx/layouts/linuxdoc.layout
@@ -276,8 +349,14 @@ 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/fig2pstex.py
+share/lyx/scripts/general_command_wrapper.py
+share/lyx/scripts/pic2ascii.py
+share/lyx/scripts/pic2png_eps.py
+share/lyx/scripts/pic2png_eps.sh
 share/lyx/templates/IEEEtran.lyx
-share/lyx/templates/aapaper.lyx
+share/lyx/templates/aa.lyx
 share/lyx/templates/aastex.lyx
 share/lyx/templates/dinbrief.lyx
 share/lyx/templates/docbook_template.lyx
@@ -292,11 +371,14 @@ 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/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
@@ -306,6 +388,8 @@ share/lyx/textclass.lst
 @dirrm share/lyx/layouts
 @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