Upgrade to 1.1.6.2 (i. e. include patch-1.1.6fix2).

Submitted by:	AMAKAWA Shuhei <sa264@cam.ac.uk>

3 files changed, 28 insertions, 5 deletions

diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 329815cb964b..4a4b4d600a7e 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.1.6.1
+PORTVERSION=	1.1.6.2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 DISTNAME=	lyx-1.1.6
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	patch-1.1.6fix1.gz
+PATCHFILES=	patch-1.1.6fix1.gz patch-1.1.6fix2.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	dirk@FreeBSD.org
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 2042ad7fb38d..4fc3a46b6df5 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,2 +1,3 @@
 MD5 (lyx-1.1.6.tar.gz) = 07358580d2d5b8ff2cba85da7dc3d17a
 MD5 (patch-1.1.6fix1.gz) = 9bd3ba521845fd102822de9d366a1fad
+MD5 (patch-1.1.6fix2.gz) = 456eda143c238d1d49dd427e8bb1919a
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 420367d7d3dd..8f2a62e5c936 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -73,7 +73,11 @@ 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
@@ -93,6 +97,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
@@ -128,10 +133,13 @@ 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_ItemizeBullets.lyx
-share/lyx/examples/fr_MathLabeling.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_TableExamples.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
@@ -228,10 +236,14 @@ 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
@@ -252,8 +264,18 @@ share/lyx/layouts/apa.layout
 share/lyx/layouts/article.layout
 share/lyx/layouts/book.layout
 share/lyx/layouts/broadway.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