Update to 1.1.5fix1.

4 files changed, 45 insertions, 6 deletions

diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 16e4901c0e72..37200f653033 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.4.3
+PORTVERSION=	1.1.5.1
 CATEGORIES=	print
 MASTER_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
 PKGNAMEPREFIX=	cjk-
-DISTNAME=	CJK-LyX-1.1.4fix3-src
+DISTNAME=	CJK-LyX-1.1.5fix1-src
 
 MAINTAINER=	cjh@FreeBSD.org
 
@@ -22,15 +22,16 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
 		intl.1:${PORTSDIR}/devel/gettext
 
+USE_GMAKE=	yes
 USE_XPM=	yes
 USE_NEWGCC=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-USE_GMAKE=	yes
 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.4fix3
+WRKSRC=		${WRKDIR}/CJK-LyX-1.1.5fix1
 
 .if !defined(WITH_ISPELL)
 pre-fetch:
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index 640231ab65e5..6c6c5d0a5325 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1,2 +1 @@
-MD5 (CJK-LyX-1.1.4fix3-src.tar.gz) = 5a71c22c4e29d220949363c192041a1f
-MD5 (CJK-LyX-1.1.4fix3_menu-patch) = 4f1140416fba662dab295f6ce9e71d1e
+MD5 (CJK-LyX-1.1.5fix1-src.tar.gz) = fe796e0d076c36251f6df5d398e2258a
diff --git a/print/cjk-lyx/files/patch-ba b/print/cjk-lyx/files/patch-ba
new file mode 100644
index 000000000000..db4efd8728e0
--- /dev/null
+++ b/print/cjk-lyx/files/patch-ba
@@ -0,0 +1,11 @@
+--- 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 @@
+ # ./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
+-if test -z "$INSTALL"; then
++if test -z "$NO__INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist
index 1fb61d2476dc..c1ee14977e2c 100644
--- a/print/cjk-lyx/pkg-plist
+++ b/print/cjk-lyx/pkg-plist
@@ -6,8 +6,10 @@ share/locale/cs/LC_MESSAGES/lyx.mo
 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/he/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
 share/locale/it/LC_MESSAGES/lyx.mo
 share/locale/nl/LC_MESSAGES/lyx.mo
@@ -42,26 +44,35 @@ share/lyx/configure.cmd
 share/lyx/doc/BUGS.lyx
 share/lyx/doc/Customization.lyx
 share/lyx/doc/DocStyle.lyx
+share/lyx/doc/Doc_toc.pl
 share/lyx/doc/Extended.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/README.Documentation
 share/lyx/doc/Reference.lyx
+share/lyx/doc/TOC.lyx
 share/lyx/doc/Tutorial.lyx
 share/lyx/doc/UserGuide.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_Intro.lyx
+share/lyx/doc/de_TOC.lyx
 share/lyx/doc/de_Tutorial.lyx
 share/lyx/doc/de_UserGuide.lyx
 share/lyx/doc/es_Intro.lyx
 share/lyx/doc/es_Tutorial.lyx
 share/lyx/doc/escher-lsd.eps
+share/lyx/doc/eu_Intro.lyx
+share/lyx/doc/eu_Tutorial.lyx
+share/lyx/doc/fr_Extended.lyx
 share/lyx/doc/fr_Intro.lyx
 share/lyx/doc/fr_Tutorial.lyx
+share/lyx/doc/hu_Intro.lyx
 share/lyx/doc/it_Intro.lyx
 share/lyx/doc/it_Tutorial.lyx
 share/lyx/doc/mobius.eps
@@ -76,6 +87,7 @@ share/lyx/doc/sl_Intro.lyx
 share/lyx/doc/sl_Tutorial.lyx
 share/lyx/doc/sv_Intro.lyx
 share/lyx/doc/sv_Tutorial.lyx
+share/lyx/doc/toc_make
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
 share/lyx/examples/Literate.lyx
@@ -92,15 +104,20 @@ share/lyx/examples/ca_splash.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/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/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_splash.lyx
+share/lyx/examples/it_ItemizeBullets.lyx
 share/lyx/examples/it_splash.lyx
 share/lyx/examples/landslide.lyx
 share/lyx/examples/multicol.lyx
@@ -131,6 +148,7 @@ share/lyx/images/standard.xbm
 share/lyx/images/standard.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
@@ -141,13 +159,16 @@ share/lyx/kbd/german-2.kmap
 share/lyx/kbd/german-3.kmap
 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-2.cdef
 share/lyx/kbd/iso8859-7.cdef
+share/lyx/kbd/iso8859-8.cdef
 share/lyx/kbd/koi8-r.kmap
 share/lyx/kbd/magyar-2.kmap
 share/lyx/kbd/magyar-3.kmap
 share/lyx/kbd/magyar.kmap
+share/lyx/kbd/null.kmap
 share/lyx/kbd/polish.kmap
 share/lyx/kbd/portuges.kmap
 share/lyx/kbd/romanian.kmap
@@ -181,6 +202,8 @@ share/lyx/layouts/ejour2.layout
 share/lyx/layouts/foils.layout
 share/lyx/layouts/g-brief-de.layout
 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/jarticle.layout
@@ -194,6 +217,7 @@ share/lyx/layouts/literate-article.layout
 share/lyx/layouts/literate-book.layout
 share/lyx/layouts/literate-report.layout
 share/lyx/layouts/literate-scrap.inc
+share/lyx/layouts/llncs.layout
 share/lyx/layouts/lyxmacros.inc
 share/lyx/layouts/manpage.layout
 share/lyx/layouts/obsolete.inc
@@ -207,6 +231,7 @@ share/lyx/layouts/scrclass.inc
 share/lyx/layouts/scrlettr.layout
 share/lyx/layouts/scrmacros.inc
 share/lyx/layouts/scrreprt.layout
+share/lyx/layouts/seminar.layout
 share/lyx/layouts/slides.layout
 share/lyx/layouts/stdclass.inc
 share/lyx/layouts/stdlayouts.inc
@@ -215,6 +240,9 @@ share/lyx/layouts/stdlists.inc
 share/lyx/layouts/stdsections.inc
 share/lyx/layouts/stdstarsections.inc
 share/lyx/layouts/stdstruct.inc
+share/lyx/layouts/stdtitle.inc
+share/lyx/layouts/svjog.layout
+share/lyx/layouts/svjour.inc
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst