Update to 1.3.4

PR:		63498
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

20 files changed, 80 insertions, 135 deletions

diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index bb129cac0586..4a13b7ea7d1f 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -59,6 +58,9 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 
 .if ${OSVERSION} < 500035
 CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
+.if defined(WITH_QT)
+BROKEN=	QT Frontend coredumps on 4.x. Use the xforms Frontend instead.
+.endif
 .endif
 
 pre-everything::
diff --git a/print/lyx-devel/distinfo b/print/lyx-devel/distinfo
index 4592a0e89b5a..dcd5b50afe3c 100644
--- a/print/lyx-devel/distinfo
+++ b/print/lyx-devel/distinfo
@@ -1 +1,2 @@
-MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
+MD5 (lyx-1.3.4.tar.bz2) = 13fe7a7bcec0430e9a9436f2e3cfa04e
+SIZE (lyx-1.3.4.tar.bz2) = 5404453
diff --git a/print/lyx-devel/files/patch-lib::Makefile.am b/print/lyx-devel/files/patch-lib::Makefile.am
deleted file mode 100644
index af7f86f7831e..000000000000
--- a/print/lyx-devel/files/patch-lib::Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Makefile.am.orig	Wed Sep 17 15:13:05 2003
-+++ lib/Makefile.am	Wed Feb 18 18:24:39 2004
-@@ -58,8 +58,10 @@
- 	  ln -f -s `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
- 	done ; \
- 	$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \
--	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale
--	test -f xfonts/PSres.upr && $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr
-+	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale ;
-+	if test -f xfonts/PSres.upr ; then
-+	$(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr ;
-+	fi
- 
- uninstall-xfonts:
- 	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
diff --git a/print/lyx-devel/pkg-plist b/print/lyx-devel/pkg-plist
index 4592b4ab03fe..77d329cdb962 100644
--- a/print/lyx-devel/pkg-plist
+++ b/print/lyx-devel/pkg-plist
@@ -1,30 +1,21 @@
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
-share/locale/bg/LC_MESSAGES/lyx.mo
-share/locale/ca/LC_MESSAGES/lyx.mo
-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
 share/locale/nn/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
-share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
-share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -73,9 +64,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/es_TOC.lyx
 %%DATADIR%%/doc/es_Tutorial.lyx
 %%DATADIR%%/doc/escher-lsd.eps
+%%DATADIR%%/doc/eu_Extended.lyx
 %%DATADIR%%/doc/eu_Intro.lyx
 %%DATADIR%%/doc/eu_TOC.lyx
 %%DATADIR%%/doc/eu_Tutorial.lyx
+%%DATADIR%%/doc/eu_UserGuide.lyx
 %%DATADIR%%/doc/fr_Customization.lyx
 %%DATADIR%%/doc/fr_Extended.lyx
 %%DATADIR%%/doc/fr_FAQ.lyx
@@ -97,6 +90,8 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
+%%DATADIR%%/doc/no_Intro.lyx
+%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -161,6 +156,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/fr_mathed.lyx
 %%DATADIR%%/examples/fr_multicol.lyx
 %%DATADIR%%/examples/fr_splash.lyx
+%%DATADIR%%/examples/g-brief2.lyx
 %%DATADIR%%/examples/he_example_raw.lyx
 %%DATADIR%%/examples/he_he_example_lyxified.lyx
 %%DATADIR%%/examples/he_he_example_raw.lyx
@@ -700,6 +696,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/cp1251.cdef
 %%DATADIR%%/kbd/czech-prg.kmap
 %%DATADIR%%/kbd/czech.kmap
+%%DATADIR%%/kbd/espanol.kmap
 %%DATADIR%%/kbd/european.kmap
 %%DATADIR%%/kbd/francais.kmap
 %%DATADIR%%/kbd/french.kmap
@@ -748,6 +745,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
 %%DATADIR%%/layouts/amsart-seq.layout
@@ -766,6 +764,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
 %%DATADIR%%/layouts/db_stdclass.inc
+%%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
 %%DATADIR%%/layouts/db_stdlists.inc
 %%DATADIR%%/layouts/db_stdsections.inc
@@ -788,6 +787,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/foils.layout
 %%DATADIR%%/layouts/g-brief-de.layout
 %%DATADIR%%/layouts/g-brief-en.layout
+%%DATADIR%%/layouts/g-brief2.layout
 %%DATADIR%%/layouts/heb-article.layout
 %%DATADIR%%/layouts/heb-letter.layout
 %%DATADIR%%/layouts/hollywood.layout
@@ -841,6 +841,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/lyx2lyx/error.py
 %%DATADIR%%/lyx2lyx/error.pyc
 %%DATADIR%%/lyx2lyx/lyx2lyx
+%%DATADIR%%/lyx2lyx/lyxconvert_210.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
 %%DATADIR%%/lyx2lyx/lyxconvert_216.py
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index bb129cac0586..4a13b7ea7d1f 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -59,6 +58,9 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 
 .if ${OSVERSION} < 500035
 CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
+.if defined(WITH_QT)
+BROKEN=	QT Frontend coredumps on 4.x. Use the xforms Frontend instead.
+.endif
 .endif
 
 pre-everything::
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 4592a0e89b5a..dcd5b50afe3c 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1 +1,2 @@
-MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
+MD5 (lyx-1.3.4.tar.bz2) = 13fe7a7bcec0430e9a9436f2e3cfa04e
+SIZE (lyx-1.3.4.tar.bz2) = 5404453
diff --git a/print/lyx/files/patch-lib::Makefile.am b/print/lyx/files/patch-lib::Makefile.am
deleted file mode 100644
index af7f86f7831e..000000000000
--- a/print/lyx/files/patch-lib::Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Makefile.am.orig	Wed Sep 17 15:13:05 2003
-+++ lib/Makefile.am	Wed Feb 18 18:24:39 2004
-@@ -58,8 +58,10 @@
- 	  ln -f -s `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
- 	done ; \
- 	$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \
--	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale
--	test -f xfonts/PSres.upr && $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr
-+	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale ;
-+	if test -f xfonts/PSres.upr ; then
-+	$(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr ;
-+	fi
- 
- uninstall-xfonts:
- 	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 4592b4ab03fe..77d329cdb962 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -1,30 +1,21 @@
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
-share/locale/bg/LC_MESSAGES/lyx.mo
-share/locale/ca/LC_MESSAGES/lyx.mo
-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
 share/locale/nn/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
-share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
-share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -73,9 +64,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/es_TOC.lyx
 %%DATADIR%%/doc/es_Tutorial.lyx
 %%DATADIR%%/doc/escher-lsd.eps
+%%DATADIR%%/doc/eu_Extended.lyx
 %%DATADIR%%/doc/eu_Intro.lyx
 %%DATADIR%%/doc/eu_TOC.lyx
 %%DATADIR%%/doc/eu_Tutorial.lyx
+%%DATADIR%%/doc/eu_UserGuide.lyx
 %%DATADIR%%/doc/fr_Customization.lyx
 %%DATADIR%%/doc/fr_Extended.lyx
 %%DATADIR%%/doc/fr_FAQ.lyx
@@ -97,6 +90,8 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
+%%DATADIR%%/doc/no_Intro.lyx
+%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -161,6 +156,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/fr_mathed.lyx
 %%DATADIR%%/examples/fr_multicol.lyx
 %%DATADIR%%/examples/fr_splash.lyx
+%%DATADIR%%/examples/g-brief2.lyx
 %%DATADIR%%/examples/he_example_raw.lyx
 %%DATADIR%%/examples/he_he_example_lyxified.lyx
 %%DATADIR%%/examples/he_he_example_raw.lyx
@@ -700,6 +696,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/cp1251.cdef
 %%DATADIR%%/kbd/czech-prg.kmap
 %%DATADIR%%/kbd/czech.kmap
+%%DATADIR%%/kbd/espanol.kmap
 %%DATADIR%%/kbd/european.kmap
 %%DATADIR%%/kbd/francais.kmap
 %%DATADIR%%/kbd/french.kmap
@@ -748,6 +745,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
 %%DATADIR%%/layouts/amsart-seq.layout
@@ -766,6 +764,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
 %%DATADIR%%/layouts/db_stdclass.inc
+%%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
 %%DATADIR%%/layouts/db_stdlists.inc
 %%DATADIR%%/layouts/db_stdsections.inc
@@ -788,6 +787,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/foils.layout
 %%DATADIR%%/layouts/g-brief-de.layout
 %%DATADIR%%/layouts/g-brief-en.layout
+%%DATADIR%%/layouts/g-brief2.layout
 %%DATADIR%%/layouts/heb-article.layout
 %%DATADIR%%/layouts/heb-letter.layout
 %%DATADIR%%/layouts/hollywood.layout
@@ -841,6 +841,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/lyx2lyx/error.py
 %%DATADIR%%/lyx2lyx/error.pyc
 %%DATADIR%%/lyx2lyx/lyx2lyx
+%%DATADIR%%/lyx2lyx/lyxconvert_210.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
 %%DATADIR%%/lyx2lyx/lyxconvert_216.py
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index bb129cac0586..4a13b7ea7d1f 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -59,6 +58,9 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 
 .if ${OSVERSION} < 500035
 CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
+.if defined(WITH_QT)
+BROKEN=	QT Frontend coredumps on 4.x. Use the xforms Frontend instead.
+.endif
 .endif
 
 pre-everything::
diff --git a/print/lyx14/distinfo b/print/lyx14/distinfo
index 4592a0e89b5a..dcd5b50afe3c 100644
--- a/print/lyx14/distinfo
+++ b/print/lyx14/distinfo
@@ -1 +1,2 @@
-MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
+MD5 (lyx-1.3.4.tar.bz2) = 13fe7a7bcec0430e9a9436f2e3cfa04e
+SIZE (lyx-1.3.4.tar.bz2) = 5404453
diff --git a/print/lyx14/files/patch-lib::Makefile.am b/print/lyx14/files/patch-lib::Makefile.am
deleted file mode 100644
index af7f86f7831e..000000000000
--- a/print/lyx14/files/patch-lib::Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Makefile.am.orig	Wed Sep 17 15:13:05 2003
-+++ lib/Makefile.am	Wed Feb 18 18:24:39 2004
-@@ -58,8 +58,10 @@
- 	  ln -f -s `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
- 	done ; \
- 	$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \
--	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale
--	test -f xfonts/PSres.upr && $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr
-+	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale ;
-+	if test -f xfonts/PSres.upr ; then
-+	$(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr ;
-+	fi
- 
- uninstall-xfonts:
- 	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
diff --git a/print/lyx14/pkg-plist b/print/lyx14/pkg-plist
index 4592b4ab03fe..77d329cdb962 100644
--- a/print/lyx14/pkg-plist
+++ b/print/lyx14/pkg-plist
@@ -1,30 +1,21 @@
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
-share/locale/bg/LC_MESSAGES/lyx.mo
-share/locale/ca/LC_MESSAGES/lyx.mo
-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
 share/locale/nn/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
-share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
-share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -73,9 +64,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/es_TOC.lyx
 %%DATADIR%%/doc/es_Tutorial.lyx
 %%DATADIR%%/doc/escher-lsd.eps
+%%DATADIR%%/doc/eu_Extended.lyx
 %%DATADIR%%/doc/eu_Intro.lyx
 %%DATADIR%%/doc/eu_TOC.lyx
 %%DATADIR%%/doc/eu_Tutorial.lyx
+%%DATADIR%%/doc/eu_UserGuide.lyx
 %%DATADIR%%/doc/fr_Customization.lyx
 %%DATADIR%%/doc/fr_Extended.lyx
 %%DATADIR%%/doc/fr_FAQ.lyx
@@ -97,6 +90,8 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
+%%DATADIR%%/doc/no_Intro.lyx
+%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -161,6 +156,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/fr_mathed.lyx
 %%DATADIR%%/examples/fr_multicol.lyx
 %%DATADIR%%/examples/fr_splash.lyx
+%%DATADIR%%/examples/g-brief2.lyx
 %%DATADIR%%/examples/he_example_raw.lyx
 %%DATADIR%%/examples/he_he_example_lyxified.lyx
 %%DATADIR%%/examples/he_he_example_raw.lyx
@@ -700,6 +696,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/cp1251.cdef
 %%DATADIR%%/kbd/czech-prg.kmap
 %%DATADIR%%/kbd/czech.kmap
+%%DATADIR%%/kbd/espanol.kmap
 %%DATADIR%%/kbd/european.kmap
 %%DATADIR%%/kbd/francais.kmap
 %%DATADIR%%/kbd/french.kmap
@@ -748,6 +745,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
 %%DATADIR%%/layouts/amsart-seq.layout
@@ -766,6 +764,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
 %%DATADIR%%/layouts/db_stdclass.inc
+%%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
 %%DATADIR%%/layouts/db_stdlists.inc
 %%DATADIR%%/layouts/db_stdsections.inc
@@ -788,6 +787,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/foils.layout
 %%DATADIR%%/layouts/g-brief-de.layout
 %%DATADIR%%/layouts/g-brief-en.layout
+%%DATADIR%%/layouts/g-brief2.layout
 %%DATADIR%%/layouts/heb-article.layout
 %%DATADIR%%/layouts/heb-letter.layout
 %%DATADIR%%/layouts/hollywood.layout
@@ -841,6 +841,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/lyx2lyx/error.py
 %%DATADIR%%/lyx2lyx/error.pyc
 %%DATADIR%%/lyx2lyx/lyx2lyx
+%%DATADIR%%/lyx2lyx/lyxconvert_210.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
 %%DATADIR%%/lyx2lyx/lyxconvert_216.py
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index bb129cac0586..4a13b7ea7d1f 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -59,6 +58,9 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 
 .if ${OSVERSION} < 500035
 CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
+.if defined(WITH_QT)
+BROKEN=	QT Frontend coredumps on 4.x. Use the xforms Frontend instead.
+.endif
 .endif
 
 pre-everything::
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index 4592a0e89b5a..dcd5b50afe3c 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -1 +1,2 @@
-MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
+MD5 (lyx-1.3.4.tar.bz2) = 13fe7a7bcec0430e9a9436f2e3cfa04e
+SIZE (lyx-1.3.4.tar.bz2) = 5404453
diff --git a/print/lyx15/files/patch-lib::Makefile.am b/print/lyx15/files/patch-lib::Makefile.am
deleted file mode 100644
index af7f86f7831e..000000000000
--- a/print/lyx15/files/patch-lib::Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Makefile.am.orig	Wed Sep 17 15:13:05 2003
-+++ lib/Makefile.am	Wed Feb 18 18:24:39 2004
-@@ -58,8 +58,10 @@
- 	  ln -f -s `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
- 	done ; \
- 	$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \
--	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale
--	test -f xfonts/PSres.upr && $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr
-+	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale ;
-+	if test -f xfonts/PSres.upr ; then
-+	$(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr ;
-+	fi
- 
- uninstall-xfonts:
- 	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
diff --git a/print/lyx15/pkg-plist b/print/lyx15/pkg-plist
index 4592b4ab03fe..77d329cdb962 100644
--- a/print/lyx15/pkg-plist
+++ b/print/lyx15/pkg-plist
@@ -1,30 +1,21 @@
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
-share/locale/bg/LC_MESSAGES/lyx.mo
-share/locale/ca/LC_MESSAGES/lyx.mo
-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
 share/locale/nn/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
-share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
-share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -73,9 +64,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/es_TOC.lyx
 %%DATADIR%%/doc/es_Tutorial.lyx
 %%DATADIR%%/doc/escher-lsd.eps
+%%DATADIR%%/doc/eu_Extended.lyx
 %%DATADIR%%/doc/eu_Intro.lyx
 %%DATADIR%%/doc/eu_TOC.lyx
 %%DATADIR%%/doc/eu_Tutorial.lyx
+%%DATADIR%%/doc/eu_UserGuide.lyx
 %%DATADIR%%/doc/fr_Customization.lyx
 %%DATADIR%%/doc/fr_Extended.lyx
 %%DATADIR%%/doc/fr_FAQ.lyx
@@ -97,6 +90,8 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
+%%DATADIR%%/doc/no_Intro.lyx
+%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -161,6 +156,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/fr_mathed.lyx
 %%DATADIR%%/examples/fr_multicol.lyx
 %%DATADIR%%/examples/fr_splash.lyx
+%%DATADIR%%/examples/g-brief2.lyx
 %%DATADIR%%/examples/he_example_raw.lyx
 %%DATADIR%%/examples/he_he_example_lyxified.lyx
 %%DATADIR%%/examples/he_he_example_raw.lyx
@@ -700,6 +696,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/cp1251.cdef
 %%DATADIR%%/kbd/czech-prg.kmap
 %%DATADIR%%/kbd/czech.kmap
+%%DATADIR%%/kbd/espanol.kmap
 %%DATADIR%%/kbd/european.kmap
 %%DATADIR%%/kbd/francais.kmap
 %%DATADIR%%/kbd/french.kmap
@@ -748,6 +745,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
 %%DATADIR%%/layouts/amsart-seq.layout
@@ -766,6 +764,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
 %%DATADIR%%/layouts/db_stdclass.inc
+%%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
 %%DATADIR%%/layouts/db_stdlists.inc
 %%DATADIR%%/layouts/db_stdsections.inc
@@ -788,6 +787,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/foils.layout
 %%DATADIR%%/layouts/g-brief-de.layout
 %%DATADIR%%/layouts/g-brief-en.layout
+%%DATADIR%%/layouts/g-brief2.layout
 %%DATADIR%%/layouts/heb-article.layout
 %%DATADIR%%/layouts/heb-letter.layout
 %%DATADIR%%/layouts/hollywood.layout
@@ -841,6 +841,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/lyx2lyx/error.py
 %%DATADIR%%/lyx2lyx/error.pyc
 %%DATADIR%%/lyx2lyx/lyx2lyx
+%%DATADIR%%/lyx2lyx/lyxconvert_210.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
 %%DATADIR%%/lyx2lyx/lyxconvert_216.py
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index bb129cac0586..4a13b7ea7d1f 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.3.3
-PORTREVISION=	1
+PORTVERSION=	1.3.4
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -59,6 +58,9 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 
 .if ${OSVERSION} < 500035
 CFLAGS+=	-Wno-non-template-friend -ftemplate-depth-30
+.if defined(WITH_QT)
+BROKEN=	QT Frontend coredumps on 4.x. Use the xforms Frontend instead.
+.endif
 .endif
 
 pre-everything::
diff --git a/print/lyx16/distinfo b/print/lyx16/distinfo
index 4592a0e89b5a..dcd5b50afe3c 100644
--- a/print/lyx16/distinfo
+++ b/print/lyx16/distinfo
@@ -1 +1,2 @@
-MD5 (lyx-1.3.3.tar.bz2) = 0f22124b000feb3c471096a1031d3722
+MD5 (lyx-1.3.4.tar.bz2) = 13fe7a7bcec0430e9a9436f2e3cfa04e
+SIZE (lyx-1.3.4.tar.bz2) = 5404453
diff --git a/print/lyx16/files/patch-lib::Makefile.am b/print/lyx16/files/patch-lib::Makefile.am
deleted file mode 100644
index af7f86f7831e..000000000000
--- a/print/lyx16/files/patch-lib::Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/Makefile.am.orig	Wed Sep 17 15:13:05 2003
-+++ lib/Makefile.am	Wed Feb 18 18:24:39 2004
-@@ -58,8 +58,10 @@
- 	  ln -f -s `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
- 	done ; \
- 	$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \
--	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale
--	test -f xfonts/PSres.upr && $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr
-+	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale ;
-+	if test -f xfonts/PSres.upr ; then
-+	$(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr ;
-+	fi
- 
- uninstall-xfonts:
- 	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
diff --git a/print/lyx16/pkg-plist b/print/lyx16/pkg-plist
index 4592b4ab03fe..77d329cdb962 100644
--- a/print/lyx16/pkg-plist
+++ b/print/lyx16/pkg-plist
@@ -1,30 +1,21 @@
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
-share/locale/bg/LC_MESSAGES/lyx.mo
-share/locale/ca/LC_MESSAGES/lyx.mo
-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
 share/locale/nn/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
 share/locale/pl/LC_MESSAGES/lyx.mo
-share/locale/pt/LC_MESSAGES/lyx.mo
 share/locale/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
 share/locale/sk/LC_MESSAGES/lyx.mo
 share/locale/sl/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
-share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/CREDITS
 %%DATADIR%%/bind/aqua.bind
 %%DATADIR%%/bind/broadway.bind
@@ -73,9 +64,11 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/es_TOC.lyx
 %%DATADIR%%/doc/es_Tutorial.lyx
 %%DATADIR%%/doc/escher-lsd.eps
+%%DATADIR%%/doc/eu_Extended.lyx
 %%DATADIR%%/doc/eu_Intro.lyx
 %%DATADIR%%/doc/eu_TOC.lyx
 %%DATADIR%%/doc/eu_Tutorial.lyx
+%%DATADIR%%/doc/eu_UserGuide.lyx
 %%DATADIR%%/doc/fr_Customization.lyx
 %%DATADIR%%/doc/fr_Extended.lyx
 %%DATADIR%%/doc/fr_FAQ.lyx
@@ -97,6 +90,8 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/doc/nl_Intro.lyx
 %%DATADIR%%/doc/nl_TOC.lyx
 %%DATADIR%%/doc/nl_Tutorial.lyx
+%%DATADIR%%/doc/no_Intro.lyx
+%%DATADIR%%/doc/no_TOC.lyx
 %%DATADIR%%/doc/pl_Extended.lyx
 %%DATADIR%%/doc/pl_Intro.lyx
 %%DATADIR%%/doc/pl_TOC.lyx
@@ -161,6 +156,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/examples/fr_mathed.lyx
 %%DATADIR%%/examples/fr_multicol.lyx
 %%DATADIR%%/examples/fr_splash.lyx
+%%DATADIR%%/examples/g-brief2.lyx
 %%DATADIR%%/examples/he_example_raw.lyx
 %%DATADIR%%/examples/he_he_example_lyxified.lyx
 %%DATADIR%%/examples/he_he_example_raw.lyx
@@ -700,6 +696,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/kbd/cp1251.cdef
 %%DATADIR%%/kbd/czech-prg.kmap
 %%DATADIR%%/kbd/czech.kmap
+%%DATADIR%%/kbd/espanol.kmap
 %%DATADIR%%/kbd/european.kmap
 %%DATADIR%%/kbd/francais.kmap
 %%DATADIR%%/kbd/french.kmap
@@ -748,6 +745,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/aapaper.inc
 %%DATADIR%%/layouts/aapaper.layout
 %%DATADIR%%/layouts/aastex.layout
+%%DATADIR%%/layouts/agums.layout
 %%DATADIR%%/layouts/aguplus.inc
 %%DATADIR%%/layouts/amsart-plain.layout
 %%DATADIR%%/layouts/amsart-seq.layout
@@ -766,6 +764,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/cv.layout
 %%DATADIR%%/layouts/db_lyxmacros.inc
 %%DATADIR%%/layouts/db_stdclass.inc
+%%DATADIR%%/layouts/db_stdcounters.inc
 %%DATADIR%%/layouts/db_stdlayouts.inc
 %%DATADIR%%/layouts/db_stdlists.inc
 %%DATADIR%%/layouts/db_stdsections.inc
@@ -788,6 +787,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/layouts/foils.layout
 %%DATADIR%%/layouts/g-brief-de.layout
 %%DATADIR%%/layouts/g-brief-en.layout
+%%DATADIR%%/layouts/g-brief2.layout
 %%DATADIR%%/layouts/heb-article.layout
 %%DATADIR%%/layouts/heb-letter.layout
 %%DATADIR%%/layouts/hollywood.layout
@@ -841,6 +841,7 @@ share/locale/wa/LC_MESSAGES/lyx.mo
 %%DATADIR%%/lyx2lyx/error.py
 %%DATADIR%%/lyx2lyx/error.pyc
 %%DATADIR%%/lyx2lyx/lyx2lyx
+%%DATADIR%%/lyx2lyx/lyxconvert_210.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.py
 %%DATADIR%%/lyx2lyx/lyxconvert_215.pyc
 %%DATADIR%%/lyx2lyx/lyxconvert_216.py