Upgrade to 1.1.6fix4 (1.1.6.4).

15 files changed, 75 insertions, 30 deletions

diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 92a823e5998b..0097bfbba491 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.3
+PORTVERSION=	1.1.6.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 DISTNAME=	lyx-1.1.6
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz
+PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
+		patch-1.1.6fix4.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	dirk@FreeBSD.org
diff --git a/print/lyx-devel/distinfo b/print/lyx-devel/distinfo
index 94c2cc4d4a44..acc6538b7564 100644
--- a/print/lyx-devel/distinfo
+++ b/print/lyx-devel/distinfo
@@ -2,3 +2,4 @@ MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
 MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
 MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
 MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
+MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
diff --git a/print/lyx-devel/pkg-plist b/print/lyx-devel/pkg-plist
index edfc49c96633..98d7e0895750 100644
--- a/print/lyx-devel/pkg-plist
+++ b/print/lyx-devel/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
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 92a823e5998b..0097bfbba491 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.3
+PORTVERSION=	1.1.6.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 DISTNAME=	lyx-1.1.6
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz
+PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
+		patch-1.1.6fix4.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	dirk@FreeBSD.org
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 94c2cc4d4a44..acc6538b7564 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -2,3 +2,4 @@ MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
 MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
 MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
 MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
+MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index edfc49c96633..98d7e0895750 100644
--- a/print/lyx/pkg-plist
+++ b/print/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
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 92a823e5998b..0097bfbba491 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.3
+PORTVERSION=	1.1.6.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 DISTNAME=	lyx-1.1.6
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz
+PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
+		patch-1.1.6fix4.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	dirk@FreeBSD.org
diff --git a/print/lyx14/distinfo b/print/lyx14/distinfo
index 94c2cc4d4a44..acc6538b7564 100644
--- a/print/lyx14/distinfo
+++ b/print/lyx14/distinfo
@@ -2,3 +2,4 @@ MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
 MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
 MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
 MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
+MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
diff --git a/print/lyx14/pkg-plist b/print/lyx14/pkg-plist
index edfc49c96633..98d7e0895750 100644
--- a/print/lyx14/pkg-plist
+++ b/print/lyx14/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
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 92a823e5998b..0097bfbba491 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.3
+PORTVERSION=	1.1.6.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 DISTNAME=	lyx-1.1.6
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz
+PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
+		patch-1.1.6fix4.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	dirk@FreeBSD.org
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index 94c2cc4d4a44..acc6538b7564 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -2,3 +2,4 @@ MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
 MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
 MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
 MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
+MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
diff --git a/print/lyx15/pkg-plist b/print/lyx15/pkg-plist
index edfc49c96633..98d7e0895750 100644
--- a/print/lyx15/pkg-plist
+++ b/print/lyx15/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
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 92a823e5998b..0097bfbba491 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.3
+PORTVERSION=	1.1.6.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 DISTNAME=	lyx-1.1.6
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz
+PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz patch-1.1.6fix3.gz \
+		patch-1.1.6fix4.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	dirk@FreeBSD.org
diff --git a/print/lyx16/distinfo b/print/lyx16/distinfo
index 94c2cc4d4a44..acc6538b7564 100644
--- a/print/lyx16/distinfo
+++ b/print/lyx16/distinfo
@@ -2,3 +2,4 @@ MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
 MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
 MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
 MD5 (patch-1.1.6fix3.gz) = 2587918bb97606d9e57d8e69fdaec0f1
+MD5 (patch-1.1.6fix4.gz) = 2848476f217325d449252825165d0d22
diff --git a/print/lyx16/pkg-plist b/print/lyx16/pkg-plist
index edfc49c96633..98d7e0895750 100644
--- a/print/lyx16/pkg-plist
+++ b/print/lyx16/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