Upgrade to 1.0.0pre6

Requested by:	Andreas Klemm <andreas@FreeBSD.ORG>

15 files changed, 130 insertions, 70 deletions

diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index c704cc07622f..2c578e9d80f8 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -3,10 +3,10 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.22 1998/09/26 23:18:08 steve Exp $
+# $Id: Makefile,v 1.23 1998/11/10 15:15:59 andreas Exp $
 #
 
-DISTNAME=	lyx-1.0.0pre2
+DISTNAME=	lyx-1.0.0pre6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.via.ecp.fr/pub/lyx/stable/ \
 		ftp://la1ad.uio.no/pub/lyx/                
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 STRIP=
 CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
-MAN1=		lyx.1
+MAN1=		lyx.1 reLyX.1
 
 pre-fetch:
 .if !defined(WITH_ISPELL)
diff --git a/print/lyx-devel/distinfo b/print/lyx-devel/distinfo
index 8a9e680c2231..b55aa1bca91a 100644
--- a/print/lyx-devel/distinfo
+++ b/print/lyx-devel/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.0.0pre2.tar.gz) = e2520dae70c2d31de099148e6b190ff1
+MD5 (lyx-1.0.0pre6.tar.gz) = 3ef12ac6cc29cabd5cd7e92794ac793a
diff --git a/print/lyx-devel/pkg-plist b/print/lyx-devel/pkg-plist
index 5d648481f1ca..18f4e52eaf24 100644
--- a/print/lyx-devel/pkg-plist
+++ b/print/lyx-devel/pkg-plist
@@ -1,13 +1,15 @@
 bin/lyx
+bin/reLyX
+share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
-share/locale/fr/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
+share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
-share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/nl/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
-share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
 share/lyx/CREDITS
 share/lyx/bind/cua.bind
@@ -16,6 +18,7 @@ share/lyx/bind/emacs.bind
 share/lyx/bind/hu_menus.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
+share/lyx/bind/sv_menus.bind
 share/lyx/bind/xemacs.bind
 share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
@@ -30,14 +33,17 @@ share/lyx/doc/LaTeXConfig.lyx.in
 share/lyx/doc/Reference.lyx
 share/lyx/doc/Tutorial.lyx
 share/lyx/doc/UserGuide.lyx
+share/lyx/doc/de_BUGS.lyx
+share/lyx/doc/de_Customization.lyx
+share/lyx/doc/de_Intro.lyx
+share/lyx/doc/de_Tutorial.lyx
 share/lyx/doc/escher-lsd.eps
 share/lyx/doc/mobius.eps
 share/lyx/doc/platypus.eps
-share/lyx/examples/Bibliography.lyx
-share/lyx/examples/Delimiters.lyx
+share/lyx/doc/sv_Intro.lyx
+share/lyx/doc/sv_Tutorial.lyx
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
-share/lyx/examples/Maketitle.lyx
 share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Math_macros.lyx
 share/lyx/examples/Minipage.lyx
@@ -46,6 +52,8 @@ share/lyx/examples/aa_head.lyx
 share/lyx/examples/aa_paper.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
+share/lyx/examples/beispiel_gelyxt.lyx
+share/lyx/examples/beispiel_roh.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/landslide.lyx
@@ -66,6 +74,7 @@ share/lyx/kbd/american.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech.kmap
+share/lyx/kbd/european.kmap
 share/lyx/kbd/francais.kmap
 share/lyx/kbd/french.kmap
 share/lyx/kbd/german-2.kmap
@@ -78,15 +87,17 @@ share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/magyar-2.kmap
 share/lyx/kbd/magyar-3.kmap
 share/lyx/kbd/magyar.kmap
-share/lyx/kbd/polish-2.kmap
 share/lyx/kbd/polish.kmap
 share/lyx/kbd/portuges.kmap
 share/lyx/kbd/romanian.kmap
+share/lyx/kbd/sf.kmap
+share/lyx/kbd/sg.kmap
 share/lyx/kbd/slovak.kmap
 share/lyx/kbd/slovene.kmap
 share/lyx/kbd/transilvanian.kmap
 share/lyx/kbd/turkish-f.kmap
 share/lyx/kbd/turkish.kmap
+share/lyx/layouts/IEEEtran.layout
 share/lyx/layouts/aapaper.inc
 share/lyx/layouts/aapaper.layout
 share/lyx/layouts/amsart-plain.layout
@@ -125,8 +136,8 @@ share/lyx/layouts/stdlists.inc
 share/lyx/layouts/stdsections.inc
 share/lyx/layouts/stdstarsections.inc
 share/lyx/layouts/stdstruct.inc
-share/lyx/lyxrc
 share/lyx/lyxrc.defaults
+share/lyx/lyxrc.example
 share/lyx/packages.lst
 share/lyx/reLyX/BUGS
 share/lyx/reLyX/BasicLyX.pm
@@ -138,6 +149,7 @@ share/lyx/reLyX/README
 share/lyx/reLyX/ReadCommands.pm
 share/lyx/reLyX/RelyxTable.pm
 share/lyx/reLyX/Text/TeX.pm
+share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
@@ -145,7 +157,7 @@ share/lyx/templates/aapaper.lyx
 share/lyx/templates/dinbrief.lyx
 share/lyx/templates/iletter.lyx
 share/lyx/templates/latex8.lyx
-share/lyx/templates/latex_letter.lyx
+share/lyx/templates/letter.lyx
 share/lyx/templates/linuxdoctemplate.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/slides.lyx
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index c704cc07622f..2c578e9d80f8 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -3,10 +3,10 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.22 1998/09/26 23:18:08 steve Exp $
+# $Id: Makefile,v 1.23 1998/11/10 15:15:59 andreas Exp $
 #
 
-DISTNAME=	lyx-1.0.0pre2
+DISTNAME=	lyx-1.0.0pre6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.via.ecp.fr/pub/lyx/stable/ \
 		ftp://la1ad.uio.no/pub/lyx/                
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 STRIP=
 CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
-MAN1=		lyx.1
+MAN1=		lyx.1 reLyX.1
 
 pre-fetch:
 .if !defined(WITH_ISPELL)
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 8a9e680c2231..b55aa1bca91a 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.0.0pre2.tar.gz) = e2520dae70c2d31de099148e6b190ff1
+MD5 (lyx-1.0.0pre6.tar.gz) = 3ef12ac6cc29cabd5cd7e92794ac793a
diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist
index 5d648481f1ca..18f4e52eaf24 100644
--- a/print/lyx/pkg-plist
+++ b/print/lyx/pkg-plist
@@ -1,13 +1,15 @@
 bin/lyx
+bin/reLyX
+share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
-share/locale/fr/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
+share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
-share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/nl/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
-share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
 share/lyx/CREDITS
 share/lyx/bind/cua.bind
@@ -16,6 +18,7 @@ share/lyx/bind/emacs.bind
 share/lyx/bind/hu_menus.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
+share/lyx/bind/sv_menus.bind
 share/lyx/bind/xemacs.bind
 share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
@@ -30,14 +33,17 @@ share/lyx/doc/LaTeXConfig.lyx.in
 share/lyx/doc/Reference.lyx
 share/lyx/doc/Tutorial.lyx
 share/lyx/doc/UserGuide.lyx
+share/lyx/doc/de_BUGS.lyx
+share/lyx/doc/de_Customization.lyx
+share/lyx/doc/de_Intro.lyx
+share/lyx/doc/de_Tutorial.lyx
 share/lyx/doc/escher-lsd.eps
 share/lyx/doc/mobius.eps
 share/lyx/doc/platypus.eps
-share/lyx/examples/Bibliography.lyx
-share/lyx/examples/Delimiters.lyx
+share/lyx/doc/sv_Intro.lyx
+share/lyx/doc/sv_Tutorial.lyx
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
-share/lyx/examples/Maketitle.lyx
 share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Math_macros.lyx
 share/lyx/examples/Minipage.lyx
@@ -46,6 +52,8 @@ share/lyx/examples/aa_head.lyx
 share/lyx/examples/aa_paper.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
+share/lyx/examples/beispiel_gelyxt.lyx
+share/lyx/examples/beispiel_roh.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/landslide.lyx
@@ -66,6 +74,7 @@ share/lyx/kbd/american.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech.kmap
+share/lyx/kbd/european.kmap
 share/lyx/kbd/francais.kmap
 share/lyx/kbd/french.kmap
 share/lyx/kbd/german-2.kmap
@@ -78,15 +87,17 @@ share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/magyar-2.kmap
 share/lyx/kbd/magyar-3.kmap
 share/lyx/kbd/magyar.kmap
-share/lyx/kbd/polish-2.kmap
 share/lyx/kbd/polish.kmap
 share/lyx/kbd/portuges.kmap
 share/lyx/kbd/romanian.kmap
+share/lyx/kbd/sf.kmap
+share/lyx/kbd/sg.kmap
 share/lyx/kbd/slovak.kmap
 share/lyx/kbd/slovene.kmap
 share/lyx/kbd/transilvanian.kmap
 share/lyx/kbd/turkish-f.kmap
 share/lyx/kbd/turkish.kmap
+share/lyx/layouts/IEEEtran.layout
 share/lyx/layouts/aapaper.inc
 share/lyx/layouts/aapaper.layout
 share/lyx/layouts/amsart-plain.layout
@@ -125,8 +136,8 @@ share/lyx/layouts/stdlists.inc
 share/lyx/layouts/stdsections.inc
 share/lyx/layouts/stdstarsections.inc
 share/lyx/layouts/stdstruct.inc
-share/lyx/lyxrc
 share/lyx/lyxrc.defaults
+share/lyx/lyxrc.example
 share/lyx/packages.lst
 share/lyx/reLyX/BUGS
 share/lyx/reLyX/BasicLyX.pm
@@ -138,6 +149,7 @@ share/lyx/reLyX/README
 share/lyx/reLyX/ReadCommands.pm
 share/lyx/reLyX/RelyxTable.pm
 share/lyx/reLyX/Text/TeX.pm
+share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
@@ -145,7 +157,7 @@ share/lyx/templates/aapaper.lyx
 share/lyx/templates/dinbrief.lyx
 share/lyx/templates/iletter.lyx
 share/lyx/templates/latex8.lyx
-share/lyx/templates/latex_letter.lyx
+share/lyx/templates/letter.lyx
 share/lyx/templates/linuxdoctemplate.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/slides.lyx
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index c704cc07622f..2c578e9d80f8 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -3,10 +3,10 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.22 1998/09/26 23:18:08 steve Exp $
+# $Id: Makefile,v 1.23 1998/11/10 15:15:59 andreas Exp $
 #
 
-DISTNAME=	lyx-1.0.0pre2
+DISTNAME=	lyx-1.0.0pre6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.via.ecp.fr/pub/lyx/stable/ \
 		ftp://la1ad.uio.no/pub/lyx/                
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 STRIP=
 CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
-MAN1=		lyx.1
+MAN1=		lyx.1 reLyX.1
 
 pre-fetch:
 .if !defined(WITH_ISPELL)
diff --git a/print/lyx14/distinfo b/print/lyx14/distinfo
index 8a9e680c2231..b55aa1bca91a 100644
--- a/print/lyx14/distinfo
+++ b/print/lyx14/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.0.0pre2.tar.gz) = e2520dae70c2d31de099148e6b190ff1
+MD5 (lyx-1.0.0pre6.tar.gz) = 3ef12ac6cc29cabd5cd7e92794ac793a
diff --git a/print/lyx14/pkg-plist b/print/lyx14/pkg-plist
index 5d648481f1ca..18f4e52eaf24 100644
--- a/print/lyx14/pkg-plist
+++ b/print/lyx14/pkg-plist
@@ -1,13 +1,15 @@
 bin/lyx
+bin/reLyX
+share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
-share/locale/fr/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
+share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
-share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/nl/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
-share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
 share/lyx/CREDITS
 share/lyx/bind/cua.bind
@@ -16,6 +18,7 @@ share/lyx/bind/emacs.bind
 share/lyx/bind/hu_menus.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
+share/lyx/bind/sv_menus.bind
 share/lyx/bind/xemacs.bind
 share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
@@ -30,14 +33,17 @@ share/lyx/doc/LaTeXConfig.lyx.in
 share/lyx/doc/Reference.lyx
 share/lyx/doc/Tutorial.lyx
 share/lyx/doc/UserGuide.lyx
+share/lyx/doc/de_BUGS.lyx
+share/lyx/doc/de_Customization.lyx
+share/lyx/doc/de_Intro.lyx
+share/lyx/doc/de_Tutorial.lyx
 share/lyx/doc/escher-lsd.eps
 share/lyx/doc/mobius.eps
 share/lyx/doc/platypus.eps
-share/lyx/examples/Bibliography.lyx
-share/lyx/examples/Delimiters.lyx
+share/lyx/doc/sv_Intro.lyx
+share/lyx/doc/sv_Tutorial.lyx
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
-share/lyx/examples/Maketitle.lyx
 share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Math_macros.lyx
 share/lyx/examples/Minipage.lyx
@@ -46,6 +52,8 @@ share/lyx/examples/aa_head.lyx
 share/lyx/examples/aa_paper.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
+share/lyx/examples/beispiel_gelyxt.lyx
+share/lyx/examples/beispiel_roh.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/landslide.lyx
@@ -66,6 +74,7 @@ share/lyx/kbd/american.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech.kmap
+share/lyx/kbd/european.kmap
 share/lyx/kbd/francais.kmap
 share/lyx/kbd/french.kmap
 share/lyx/kbd/german-2.kmap
@@ -78,15 +87,17 @@ share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/magyar-2.kmap
 share/lyx/kbd/magyar-3.kmap
 share/lyx/kbd/magyar.kmap
-share/lyx/kbd/polish-2.kmap
 share/lyx/kbd/polish.kmap
 share/lyx/kbd/portuges.kmap
 share/lyx/kbd/romanian.kmap
+share/lyx/kbd/sf.kmap
+share/lyx/kbd/sg.kmap
 share/lyx/kbd/slovak.kmap
 share/lyx/kbd/slovene.kmap
 share/lyx/kbd/transilvanian.kmap
 share/lyx/kbd/turkish-f.kmap
 share/lyx/kbd/turkish.kmap
+share/lyx/layouts/IEEEtran.layout
 share/lyx/layouts/aapaper.inc
 share/lyx/layouts/aapaper.layout
 share/lyx/layouts/amsart-plain.layout
@@ -125,8 +136,8 @@ share/lyx/layouts/stdlists.inc
 share/lyx/layouts/stdsections.inc
 share/lyx/layouts/stdstarsections.inc
 share/lyx/layouts/stdstruct.inc
-share/lyx/lyxrc
 share/lyx/lyxrc.defaults
+share/lyx/lyxrc.example
 share/lyx/packages.lst
 share/lyx/reLyX/BUGS
 share/lyx/reLyX/BasicLyX.pm
@@ -138,6 +149,7 @@ share/lyx/reLyX/README
 share/lyx/reLyX/ReadCommands.pm
 share/lyx/reLyX/RelyxTable.pm
 share/lyx/reLyX/Text/TeX.pm
+share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
@@ -145,7 +157,7 @@ share/lyx/templates/aapaper.lyx
 share/lyx/templates/dinbrief.lyx
 share/lyx/templates/iletter.lyx
 share/lyx/templates/latex8.lyx
-share/lyx/templates/latex_letter.lyx
+share/lyx/templates/letter.lyx
 share/lyx/templates/linuxdoctemplate.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/slides.lyx
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index c704cc07622f..2c578e9d80f8 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -3,10 +3,10 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.22 1998/09/26 23:18:08 steve Exp $
+# $Id: Makefile,v 1.23 1998/11/10 15:15:59 andreas Exp $
 #
 
-DISTNAME=	lyx-1.0.0pre2
+DISTNAME=	lyx-1.0.0pre6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.via.ecp.fr/pub/lyx/stable/ \
 		ftp://la1ad.uio.no/pub/lyx/                
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 STRIP=
 CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
-MAN1=		lyx.1
+MAN1=		lyx.1 reLyX.1
 
 pre-fetch:
 .if !defined(WITH_ISPELL)
diff --git a/print/lyx15/distinfo b/print/lyx15/distinfo
index 8a9e680c2231..b55aa1bca91a 100644
--- a/print/lyx15/distinfo
+++ b/print/lyx15/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.0.0pre2.tar.gz) = e2520dae70c2d31de099148e6b190ff1
+MD5 (lyx-1.0.0pre6.tar.gz) = 3ef12ac6cc29cabd5cd7e92794ac793a
diff --git a/print/lyx15/pkg-plist b/print/lyx15/pkg-plist
index 5d648481f1ca..18f4e52eaf24 100644
--- a/print/lyx15/pkg-plist
+++ b/print/lyx15/pkg-plist
@@ -1,13 +1,15 @@
 bin/lyx
+bin/reLyX
+share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
-share/locale/fr/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
+share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
-share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/nl/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
-share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
 share/lyx/CREDITS
 share/lyx/bind/cua.bind
@@ -16,6 +18,7 @@ share/lyx/bind/emacs.bind
 share/lyx/bind/hu_menus.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
+share/lyx/bind/sv_menus.bind
 share/lyx/bind/xemacs.bind
 share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
@@ -30,14 +33,17 @@ share/lyx/doc/LaTeXConfig.lyx.in
 share/lyx/doc/Reference.lyx
 share/lyx/doc/Tutorial.lyx
 share/lyx/doc/UserGuide.lyx
+share/lyx/doc/de_BUGS.lyx
+share/lyx/doc/de_Customization.lyx
+share/lyx/doc/de_Intro.lyx
+share/lyx/doc/de_Tutorial.lyx
 share/lyx/doc/escher-lsd.eps
 share/lyx/doc/mobius.eps
 share/lyx/doc/platypus.eps
-share/lyx/examples/Bibliography.lyx
-share/lyx/examples/Delimiters.lyx
+share/lyx/doc/sv_Intro.lyx
+share/lyx/doc/sv_Tutorial.lyx
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
-share/lyx/examples/Maketitle.lyx
 share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Math_macros.lyx
 share/lyx/examples/Minipage.lyx
@@ -46,6 +52,8 @@ share/lyx/examples/aa_head.lyx
 share/lyx/examples/aa_paper.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
+share/lyx/examples/beispiel_gelyxt.lyx
+share/lyx/examples/beispiel_roh.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/landslide.lyx
@@ -66,6 +74,7 @@ share/lyx/kbd/american.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech.kmap
+share/lyx/kbd/european.kmap
 share/lyx/kbd/francais.kmap
 share/lyx/kbd/french.kmap
 share/lyx/kbd/german-2.kmap
@@ -78,15 +87,17 @@ share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/magyar-2.kmap
 share/lyx/kbd/magyar-3.kmap
 share/lyx/kbd/magyar.kmap
-share/lyx/kbd/polish-2.kmap
 share/lyx/kbd/polish.kmap
 share/lyx/kbd/portuges.kmap
 share/lyx/kbd/romanian.kmap
+share/lyx/kbd/sf.kmap
+share/lyx/kbd/sg.kmap
 share/lyx/kbd/slovak.kmap
 share/lyx/kbd/slovene.kmap
 share/lyx/kbd/transilvanian.kmap
 share/lyx/kbd/turkish-f.kmap
 share/lyx/kbd/turkish.kmap
+share/lyx/layouts/IEEEtran.layout
 share/lyx/layouts/aapaper.inc
 share/lyx/layouts/aapaper.layout
 share/lyx/layouts/amsart-plain.layout
@@ -125,8 +136,8 @@ share/lyx/layouts/stdlists.inc
 share/lyx/layouts/stdsections.inc
 share/lyx/layouts/stdstarsections.inc
 share/lyx/layouts/stdstruct.inc
-share/lyx/lyxrc
 share/lyx/lyxrc.defaults
+share/lyx/lyxrc.example
 share/lyx/packages.lst
 share/lyx/reLyX/BUGS
 share/lyx/reLyX/BasicLyX.pm
@@ -138,6 +149,7 @@ share/lyx/reLyX/README
 share/lyx/reLyX/ReadCommands.pm
 share/lyx/reLyX/RelyxTable.pm
 share/lyx/reLyX/Text/TeX.pm
+share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
@@ -145,7 +157,7 @@ share/lyx/templates/aapaper.lyx
 share/lyx/templates/dinbrief.lyx
 share/lyx/templates/iletter.lyx
 share/lyx/templates/latex8.lyx
-share/lyx/templates/latex_letter.lyx
+share/lyx/templates/letter.lyx
 share/lyx/templates/linuxdoctemplate.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/slides.lyx
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index c704cc07622f..2c578e9d80f8 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -3,10 +3,10 @@
 # Date created:		Sa  12 Okt 1996 19:20:51 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.22 1998/09/26 23:18:08 steve Exp $
+# $Id: Makefile,v 1.23 1998/11/10 15:15:59 andreas Exp $
 #
 
-DISTNAME=	lyx-1.0.0pre2
+DISTNAME=	lyx-1.0.0pre6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.via.ecp.fr/pub/lyx/stable/ \
 		ftp://la1ad.uio.no/pub/lyx/                
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 STRIP=
 CONFIGURE_ARGS= --with-extra-lib=${X11BASE}/lib --with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
-MAN1=		lyx.1
+MAN1=		lyx.1 reLyX.1
 
 pre-fetch:
 .if !defined(WITH_ISPELL)
diff --git a/print/lyx16/distinfo b/print/lyx16/distinfo
index 8a9e680c2231..b55aa1bca91a 100644
--- a/print/lyx16/distinfo
+++ b/print/lyx16/distinfo
@@ -1 +1 @@
-MD5 (lyx-1.0.0pre2.tar.gz) = e2520dae70c2d31de099148e6b190ff1
+MD5 (lyx-1.0.0pre6.tar.gz) = 3ef12ac6cc29cabd5cd7e92794ac793a
diff --git a/print/lyx16/pkg-plist b/print/lyx16/pkg-plist
index 5d648481f1ca..18f4e52eaf24 100644
--- a/print/lyx16/pkg-plist
+++ b/print/lyx16/pkg-plist
@@ -1,13 +1,15 @@
 bin/lyx
+bin/reLyX
+share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/de/LC_MESSAGES/lyx.mo
-share/locale/fr/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/es/LC_MESSAGES/lyx.mo
+share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
-share/locale/da/LC_MESSAGES/lyx.mo
 share/locale/nl/LC_MESSAGES/lyx.mo
 share/locale/no/LC_MESSAGES/lyx.mo
-share/locale/fi/LC_MESSAGES/lyx.mo
+share/locale/ru/LC_MESSAGES/lyx.mo
+share/locale/sv/LC_MESSAGES/lyx.mo
 share/locale/tr/LC_MESSAGES/lyx.mo
 share/lyx/CREDITS
 share/lyx/bind/cua.bind
@@ -16,6 +18,7 @@ share/lyx/bind/emacs.bind
 share/lyx/bind/hu_menus.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
+share/lyx/bind/sv_menus.bind
 share/lyx/bind/xemacs.bind
 share/lyx/chkconfig.ltx
 share/lyx/clipart/platypus.eps
@@ -30,14 +33,17 @@ share/lyx/doc/LaTeXConfig.lyx.in
 share/lyx/doc/Reference.lyx
 share/lyx/doc/Tutorial.lyx
 share/lyx/doc/UserGuide.lyx
+share/lyx/doc/de_BUGS.lyx
+share/lyx/doc/de_Customization.lyx
+share/lyx/doc/de_Intro.lyx
+share/lyx/doc/de_Tutorial.lyx
 share/lyx/doc/escher-lsd.eps
 share/lyx/doc/mobius.eps
 share/lyx/doc/platypus.eps
-share/lyx/examples/Bibliography.lyx
-share/lyx/examples/Delimiters.lyx
+share/lyx/doc/sv_Intro.lyx
+share/lyx/doc/sv_Tutorial.lyx
 share/lyx/examples/Foils.lyx
 share/lyx/examples/ItemizeBullets.lyx
-share/lyx/examples/Maketitle.lyx
 share/lyx/examples/MathLabeling.lyx
 share/lyx/examples/Math_macros.lyx
 share/lyx/examples/Minipage.lyx
@@ -46,6 +52,8 @@ share/lyx/examples/aa_head.lyx
 share/lyx/examples/aa_paper.lyx
 share/lyx/examples/amsart-test.lyx
 share/lyx/examples/amsbook-test.lyx
+share/lyx/examples/beispiel_gelyxt.lyx
+share/lyx/examples/beispiel_roh.lyx
 share/lyx/examples/example_lyxified.lyx
 share/lyx/examples/example_raw.lyx
 share/lyx/examples/landslide.lyx
@@ -66,6 +74,7 @@ share/lyx/kbd/american.kmap
 share/lyx/kbd/brazil.kmap
 share/lyx/kbd/brazil2.kmap
 share/lyx/kbd/czech.kmap
+share/lyx/kbd/european.kmap
 share/lyx/kbd/francais.kmap
 share/lyx/kbd/french.kmap
 share/lyx/kbd/german-2.kmap
@@ -78,15 +87,17 @@ share/lyx/kbd/iso8859-7.cdef
 share/lyx/kbd/magyar-2.kmap
 share/lyx/kbd/magyar-3.kmap
 share/lyx/kbd/magyar.kmap
-share/lyx/kbd/polish-2.kmap
 share/lyx/kbd/polish.kmap
 share/lyx/kbd/portuges.kmap
 share/lyx/kbd/romanian.kmap
+share/lyx/kbd/sf.kmap
+share/lyx/kbd/sg.kmap
 share/lyx/kbd/slovak.kmap
 share/lyx/kbd/slovene.kmap
 share/lyx/kbd/transilvanian.kmap
 share/lyx/kbd/turkish-f.kmap
 share/lyx/kbd/turkish.kmap
+share/lyx/layouts/IEEEtran.layout
 share/lyx/layouts/aapaper.inc
 share/lyx/layouts/aapaper.layout
 share/lyx/layouts/amsart-plain.layout
@@ -125,8 +136,8 @@ share/lyx/layouts/stdlists.inc
 share/lyx/layouts/stdsections.inc
 share/lyx/layouts/stdstarsections.inc
 share/lyx/layouts/stdstruct.inc
-share/lyx/lyxrc
 share/lyx/lyxrc.defaults
+share/lyx/lyxrc.example
 share/lyx/packages.lst
 share/lyx/reLyX/BUGS
 share/lyx/reLyX/BasicLyX.pm
@@ -138,6 +149,7 @@ share/lyx/reLyX/README
 share/lyx/reLyX/ReadCommands.pm
 share/lyx/reLyX/RelyxTable.pm
 share/lyx/reLyX/Text/TeX.pm
+share/lyx/reLyX/Verbatim.pm
 share/lyx/reLyX/reLyX.pod
 share/lyx/reLyX/reLyXmain.pl
 share/lyx/reLyX/syntax.default
@@ -145,7 +157,7 @@ share/lyx/templates/aapaper.lyx
 share/lyx/templates/dinbrief.lyx
 share/lyx/templates/iletter.lyx
 share/lyx/templates/latex8.lyx
-share/lyx/templates/latex_letter.lyx
+share/lyx/templates/letter.lyx
 share/lyx/templates/linuxdoctemplate.lyx
 share/lyx/templates/revtex.lyx
 share/lyx/templates/slides.lyx