This is an update to lyx 1.4.1. The jump from 1.3.x to 1.4 is

huge. Please see the announcements at http://www.lyx.org/announce/1_4_0.txt
and http://www.lyx.org/announce/1_4_1.txt

This adds a different interface, change tracking, character styles
new tex2lyx (instead of reLyX) and a lot more.

Pkgsrc changes include:

DESCR -- remove the word "New" since it is not new.

Improve COMMENT.

makepsres tool not used anymore.

New python scripts.

Remove post-install target for texmf files as now done via normal install.

patch-ah removed -- already integrated.
patch-ai removed -- reLyX was removed.
patch-aj removed -- Makefile changed (maybe this is needed to stop rebuild
between build and install steps -- need to check this.)

patch-ac added for sys./time.h needed; already in lyx development version.

(I did this update last week and tested on Linux, NetBSD and DragonFly
and havce been using on NetBSD.)

13 files changed, 176 insertions, 262 deletions

diff --git a/editors/lyx-qt/DESCR b/editors/lyx-qt/DESCR
index 37ff5cfd085..6e0a7ffc04d 100644
--- a/editors/lyx-qt/DESCR
+++ b/editors/lyx-qt/DESCR
@@ -4,7 +4,7 @@ LaTeX.
 
 Quasi-WYSIWYG interface, many LaTeX styles and layouts automatically
 generated. Speeds up learning LaTeX and makes complicated layouts
-easy and intuitive. New features include spell-checking, international
+easy and intuitive. Features include spell-checking, international
 character support, WYSIWYG graphics, tables, and equations.
 
 This version of LyX uses the Qt toolkit for the graphical interface.
diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index a7c36d858f4..483692d3a92 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2006/04/17 13:46:22 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/18 23:21:18 reed Exp $
 #
 
 .include "./Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-qt-/}
-PKGREVISION=	4
 
 COMMENT+=	(QT version)
 
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index c0115f8f53d..305b1a52dde 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile.common,v 1.36 2006/04/07 00:54:25 minskim Exp $
+# $NetBSD: Makefile.common,v 1.37 2006/04/18 23:21:18 reed Exp $
 #
 
-DISTNAME=		lyx-1.3.7
+DISTNAME=		lyx-1.4.1
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/ \
 			ftp://ftp.devel.lyx.org/pub/lyx/ \
 			ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \
-			ftp://ftp.sdsc.edu/pub/other/lyx/stable/
+			ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
+			http://lyx.mirror.fr/stable/ \
+			ftp://ftp.lip6.fr/pub/lyx/stable/ \
+			ftp://ftp.ntua.gr/pub/X11/LyX/stable/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		reed@reedmedia.net
 HOMEPAGE=		http://www.lyx.org/
-COMMENT=		Graphical frontend for LaTeX
+COMMENT=		Document processor and graphical frontend for LaTeX
 
 CONFLICTS=		lyx-[0-9]*
 
@@ -26,11 +29,12 @@ UNLIMIT_RESOURCES+=	datasize
 USE_DIRS+=		texmf-1.0
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake makepsres perl:run
+USE_TOOLS+=		gmake perl:run
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 GCC_REQD+=		2.95
 TEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
+MAKE_ENV+=		PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX}
 
 CONFIGURE_ARGS+=	--with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \
 			--with-pspell-include=${BUILDLINK_PREFIX.aspell}/include/pspell \
@@ -70,20 +74,19 @@ CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
 .endif
 
 PYTHON_PATCH_SCRIPTS=	lib/lyx2lyx/lyx2lyx \
-			development/tools/generate_symbols_list.py \
+			lib/lyx2lyx/profiling.py \
 			lib/scripts/fen2ascii.py \
-			lib/scripts/fig2pstex.py \
-			lib/scripts/general_command_wrapper.py \
+			lib/scripts/layout2layout.py \
+			lib/scripts/legacy_lyxpreview2ppm.py \
 			lib/scripts/listerrors \
-			lib/scripts/pic2ascii.py \
-			lib/scripts/pic2png_eps.py
+			lib/scripts/lyxpreview2bitmap.py \
+			lib/scripts/lyxpreview_tools.py \
+			lib/scripts/tex_copy.py
 
-# using INSTALL_DATA_DIR instead of INSTALLATION_DIRS because PREFIX is included
-post-install:
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx &&	\
-	for i in ${WRKSRC}/lib/tex/* ; do \
-		${INSTALL_DATA} $$i ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/ ; \
-	done
+SUBST_CLASSES+=		python
+SUBST_STAGE.python=	pre-configure
+SUBST_FILES.python=	lib/configure.m4 lib/configure
+SUBST_SED.python=	-e "s,python ,${PYTHONBIN} ,"
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/editors/lyx-qt/PLIST.common b/editors/lyx-qt/PLIST.common
index b723c6b2213..a2c2a1f46fd 100644
--- a/editors/lyx-qt/PLIST.common
+++ b/editors/lyx-qt/PLIST.common
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST.common,v 1.10 2006/04/17 07:07:18 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.11 2006/04/18 23:21:18 reed Exp $
 bin/lyx
-bin/noweb2lyx
-bin/reLyX
+bin/lyxclient
+bin/tex2lyx
 man/man1/lyx.1
 man/man1/reLyX.1
 share/locale/da/LC_MESSAGES/lyx.mo
@@ -12,9 +12,9 @@ share/locale/fi/LC_MESSAGES/lyx.mo
 share/locale/fr/LC_MESSAGES/lyx.mo
 share/locale/hu/LC_MESSAGES/lyx.mo
 share/locale/it/LC_MESSAGES/lyx.mo
+share/locale/nb/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/ro/LC_MESSAGES/lyx.mo
 share/locale/ru/LC_MESSAGES/lyx.mo
@@ -49,7 +49,6 @@ share/lyx/doc/FAQ.lyx
 share/lyx/doc/Intro.lyx
 share/lyx/doc/LaTeXConfig.lyx
 share/lyx/doc/LaTeXConfig.lyx.in
-share/lyx/doc/LyXConfig.lyx.in
 share/lyx/doc/Reference.lyx
 share/lyx/doc/TOC.lyx
 share/lyx/doc/Tutorial.lyx
@@ -94,11 +93,11 @@ share/lyx/doc/it_TOC.lyx
 share/lyx/doc/it_Tutorial.lyx
 share/lyx/doc/it_UserGuide.lyx
 share/lyx/doc/mobius.eps
+share/lyx/doc/nb_Intro.lyx
+share/lyx/doc/nb_TOC.lyx
 share/lyx/doc/nl_Intro.lyx
 share/lyx/doc/nl_TOC.lyx
 share/lyx/doc/nl_Tutorial.lyx
-share/lyx/doc/no_Intro.lyx
-share/lyx/doc/no_TOC.lyx
 share/lyx/doc/pl_Extended.lyx
 share/lyx/doc/pl_Intro.lyx
 share/lyx/doc/pl_TOC.lyx
@@ -138,9 +137,16 @@ share/lyx/examples/chessgame.lyx
 share/lyx/examples/currency.lyx
 share/lyx/examples/cv.lyx
 share/lyx/examples/da_splash.lyx
+share/lyx/examples/de_ItemizeBullets.lyx
+share/lyx/examples/de_Lebenslauf.lyx
 share/lyx/examples/de_Minipage.lyx
+share/lyx/examples/de_TableExamples.lyx
+share/lyx/examples/de_Waehrungen.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
 share/lyx/examples/de_beispiel_roh.lyx
+share/lyx/examples/de_decimal.lyx
+share/lyx/examples/de_mathed.lyx
+share/lyx/examples/de_multicol.lyx
 share/lyx/examples/de_splash.lyx
 share/lyx/examples/decimal.lyx
 share/lyx/examples/docbook_article.lyx
@@ -194,48 +200,67 @@ share/lyx/examples/sl_primer_surov.lyx
 share/lyx/examples/sl_splash.lyx
 share/lyx/examples/splash.lyx
 share/lyx/external_templates
-share/lyx/help/Bibtex.hlp
-share/lyx/help/Texinfo.hlp
 share/lyx/images/amssymb.xpm
 share/lyx/images/banner.ppm
+share/lyx/images/bookmark-goto.xpm
+share/lyx/images/bookmark-save.xpm
+share/lyx/images/break-line.xpm
 share/lyx/images/buffer-close.xpm
-share/lyx/images/buffer-export_ascii.xpm
+share/lyx/images/buffer-export_dvi.xpm
 share/lyx/images/buffer-export_latex.xpm
+share/lyx/images/buffer-export_ps.xpm
+share/lyx/images/buffer-export_text.xpm
 share/lyx/images/buffer-new.xpm
-share/lyx/images/buffer-print.xpm
+share/lyx/images/buffer-reload.xpm
 share/lyx/images/buffer-update_dvi.xpm
 share/lyx/images/buffer-update_ps.xpm
 share/lyx/images/buffer-view_dvi.xpm
 share/lyx/images/buffer-view_ps.xpm
+share/lyx/images/buffer-write-as.xpm
 share/lyx/images/buffer-write.xpm
 share/lyx/images/build-program.xpm
-share/lyx/images/citation-insert.xpm
 share/lyx/images/copy.xpm
 share/lyx/images/cut.xpm
 share/lyx/images/depth-decrement.xpm
 share/lyx/images/depth-increment.xpm
+share/lyx/images/dialog-preferences.xpm
+share/lyx/images/dialog-show-new-inset_citation.xpm
+share/lyx/images/dialog-show-new-inset_graphics.xpm
+share/lyx/images/dialog-show-new-inset_include.xpm
+share/lyx/images/dialog-show-new-inset_ref.xpm
+share/lyx/images/dialog-show_character.xpm
+share/lyx/images/dialog-show_findreplace.xpm
+share/lyx/images/dialog-show_mathpanel.xpm
+share/lyx/images/dialog-show_print.xpm
+share/lyx/images/dialog-show_spellchecker.xpm
 share/lyx/images/down.xpm
 share/lyx/images/ert-insert.xpm
 share/lyx/images/file-open.xpm
-share/lyx/images/find-replace.xpm
+share/lyx/images/float-insert_figure.xpm
+share/lyx/images/float-insert_table.xpm
 share/lyx/images/font-bold.xpm
 share/lyx/images/font-emph.xpm
-share/lyx/images/font-free.xpm
+share/lyx/images/font-free-apply.xpm
 share/lyx/images/font-noun.xpm
 share/lyx/images/font-sans.xpm
 share/lyx/images/footnote-insert.xpm
-share/lyx/images/graphics-insert.xpm
 share/lyx/images/index-insert.xpm
 share/lyx/images/label-insert.xpm
-share/lyx/images/layout.xpm
+share/lyx/images/layout-document.xpm
+share/lyx/images/layout-paragraph.xpm
+share/lyx/images/layout_Description.xpm
+share/lyx/images/layout_Enumerate.xpm
+share/lyx/images/layout_Itemize.xpm
+share/lyx/images/layout_List.xpm
 share/lyx/images/layout_LyX-Code.xpm
 share/lyx/images/layout_Scrap.xpm
 share/lyx/images/layout_Section.xpm
 share/lyx/images/lyx-quit.xpm
 share/lyx/images/lyx.xpm
 share/lyx/images/marginalnote-insert.xpm
+share/lyx/images/math-display.xpm
+share/lyx/images/math-matrix.xpm
 share/lyx/images/math-mode.xpm
-share/lyx/images/math-panel.xpm
 share/lyx/images/math-subscript.xpm
 share/lyx/images/math-superscript.xpm
 share/lyx/images/math/Bbbk.xpm
@@ -299,6 +324,7 @@ share/lyx/images/math/bumpeq.xpm
 share/lyx/images/math/bumpeq2.xpm
 share/lyx/images/math/cap.xpm
 share/lyx/images/math/cap2.xpm
+share/lyx/images/math/cases.xpm
 share/lyx/images/math/cdot.xpm
 share/lyx/images/math/cdots.xpm
 share/lyx/images/math/centerdot.xpm
@@ -405,8 +431,11 @@ share/lyx/images/math/lambda.xpm
 share/lyx/images/math/lambda2.xpm
 share/lyx/images/math/langle.xpm
 share/lyx/images/math/lbrace.xpm
+share/lyx/images/math/lbrace_rbrace.xpm
 share/lyx/images/math/lbracket.xpm
+share/lyx/images/math/lbracket_rbracket.xpm
 share/lyx/images/math/lceil.xpm
+share/lyx/images/math/lceil_rceil.xpm
 share/lyx/images/math/ldots.xpm
 share/lyx/images/math/leftarrow.xpm
 share/lyx/images/math/leftarrow2.xpm
@@ -430,6 +459,7 @@ share/lyx/images/math/lesseqqgtr.xpm
 share/lyx/images/math/lessgtr.xpm
 share/lyx/images/math/lesssim.xpm
 share/lyx/images/math/lfloor.xpm
+share/lyx/images/math/lfloor_rfloor.xpm
 share/lyx/images/math/ll.xpm
 share/lyx/images/math/llcorner.xpm
 share/lyx/images/math/lll.xpm
@@ -448,6 +478,7 @@ share/lyx/images/math/looparrowleft.xpm
 share/lyx/images/math/looparrowright.xpm
 share/lyx/images/math/lozenge.xpm
 share/lyx/images/math/lparen.xpm
+share/lyx/images/math/lparen_rparen.xpm
 share/lyx/images/math/lrcorner.xpm
 share/lyx/images/math/ltimes.xpm
 share/lyx/images/math/lvertneqq.xpm
@@ -566,6 +597,7 @@ share/lyx/images/math/rightrightarrows.xpm
 share/lyx/images/math/rightsquigarrow.xpm
 share/lyx/images/math/rightthreetimes.xpm
 share/lyx/images/math/risingdotseq.xpm
+share/lyx/images/math/root.xpm
 share/lyx/images/math/rparen.xpm
 share/lyx/images/math/rtimes.xpm
 share/lyx/images/math/searrow.xpm
@@ -616,8 +648,8 @@ share/lyx/images/math/supsetneqq.xpm
 share/lyx/images/math/surd.xpm
 share/lyx/images/math/swarrow.xpm
 share/lyx/images/math/tau.xpm
-share/lyx/images/math/textrm_0.xpm
-share/lyx/images/math/textrm_A.xpm
+share/lyx/images/math/textrm_AA.xpm
+share/lyx/images/math/textrm_Oe.xpm
 share/lyx/images/math/therefore.xpm
 share/lyx/images/math/theta.xpm
 share/lyx/images/math/theta2.xpm
@@ -683,7 +715,7 @@ share/lyx/images/math/wr.xpm
 share/lyx/images/math/xi.xpm
 share/lyx/images/math/xi2.xpm
 share/lyx/images/math/zeta.xpm
-share/lyx/images/melt.xpm
+share/lyx/images/note-insert.xpm
 share/lyx/images/paste.xpm
 share/lyx/images/psnfss1.xpm
 share/lyx/images/psnfss2.xpm
@@ -691,10 +723,33 @@ share/lyx/images/psnfss3.xpm
 share/lyx/images/psnfss4.xpm
 share/lyx/images/redo.xpm
 share/lyx/images/standard.xpm
+share/lyx/images/tabular-feature_align-center.xpm
+share/lyx/images/tabular-feature_align-left.xpm
+share/lyx/images/tabular-feature_align-right.xpm
+share/lyx/images/tabular-feature_append-column.xpm
+share/lyx/images/tabular-feature_append-row.xpm
+share/lyx/images/tabular-feature_delete-column.xpm
+share/lyx/images/tabular-feature_delete-row.xpm
+share/lyx/images/tabular-feature_multicolumn.xpm
+share/lyx/images/tabular-feature_set-all-lines.xpm
+share/lyx/images/tabular-feature_set-longtabular.xpm
+share/lyx/images/tabular-feature_set-rotate-cell.xpm
+share/lyx/images/tabular-feature_set-rotate-tabular.xpm
+share/lyx/images/tabular-feature_toggle-line-bottom.xpm
+share/lyx/images/tabular-feature_toggle-line-left.xpm
+share/lyx/images/tabular-feature_toggle-line-right.xpm
+share/lyx/images/tabular-feature_toggle-line-top.xpm
+share/lyx/images/tabular-feature_unset-all-lines.xpm
+share/lyx/images/tabular-feature_valign-bottom.xpm
+share/lyx/images/tabular-feature_valign-middle.xpm
+share/lyx/images/tabular-feature_valign-top.xpm
 share/lyx/images/tabular-insert.xpm
+share/lyx/images/thesaurus-entry.xpm
+share/lyx/images/toc-view.xpm
 share/lyx/images/undo.xpm
 share/lyx/images/unknown.xpm
 share/lyx/images/up.xpm
+share/lyx/images/url-insert.xpm
 share/lyx/kbd/american-2.kmap
 share/lyx/kbd/american.kmap
 share/lyx/kbd/arabic.kmap
@@ -753,6 +808,12 @@ share/lyx/layouts/aa.layout
 share/lyx/layouts/aapaper.inc
 share/lyx/layouts/aapaper.layout
 share/lyx/layouts/aastex.layout
+share/lyx/layouts/agu-dtd.layout
+share/lyx/layouts/agu_stdclass.inc
+share/lyx/layouts/agu_stdcounters.inc
+share/lyx/layouts/agu_stdlists.inc
+share/lyx/layouts/agu_stdsections.inc
+share/lyx/layouts/agu_stdtitle.inc
 share/lyx/layouts/agums.layout
 share/lyx/layouts/aguplus.inc
 share/lyx/layouts/amsart-plain.layout
@@ -771,6 +832,7 @@ share/lyx/layouts/chess.layout
 share/lyx/layouts/cl2emult.layout
 share/lyx/layouts/cv.layout
 share/lyx/layouts/db_lyxmacros.inc
+share/lyx/layouts/db_stdcharstyles.inc
 share/lyx/layouts/db_stdclass.inc
 share/lyx/layouts/db_stdcounters.inc
 share/lyx/layouts/db_stdlayouts.inc
@@ -817,7 +879,9 @@ share/lyx/layouts/memoir.layout
 share/lyx/layouts/mwart.layout
 share/lyx/layouts/mwbk.layout
 share/lyx/layouts/mwrep.layout
-share/lyx/layouts/obsolete.inc
+share/lyx/layouts/numarticle.inc
+share/lyx/layouts/numreport.inc
+share/lyx/layouts/numrevtex.inc
 share/lyx/layouts/paper.layout
 share/lyx/layouts/report.layout
 share/lyx/layouts/revtex.layout
@@ -827,7 +891,6 @@ share/lyx/layouts/scrbook.layout
 share/lyx/layouts/scrclass.inc
 share/lyx/layouts/scrlettr.layout
 share/lyx/layouts/scrlttr2.layout
-share/lyx/layouts/scrmacros.inc
 share/lyx/layouts/scrreprt.layout
 share/lyx/layouts/seminar.layout
 share/lyx/layouts/siamltex.layout
@@ -849,68 +912,66 @@ share/lyx/layouts/svjour.inc
 share/lyx/layouts/svprobth.layout
 share/lyx/lyx2lyx/LyX.py
 share/lyx/lyx2lyx/LyX.pyc
-share/lyx/lyx2lyx/error.pyc
+share/lyx/lyx2lyx/LyX.pyo
 share/lyx/lyx2lyx/lyx2lyx
 share/lyx/lyx2lyx/lyx_0_12.py
 share/lyx/lyx2lyx/lyx_0_12.pyc
+share/lyx/lyx2lyx/lyx_0_12.pyo
 share/lyx/lyx2lyx/lyx_1_0_0.py
 share/lyx/lyx2lyx/lyx_1_0_0.pyc
+share/lyx/lyx2lyx/lyx_1_0_0.pyo
 share/lyx/lyx2lyx/lyx_1_0_1.py
 share/lyx/lyx2lyx/lyx_1_0_1.pyc
+share/lyx/lyx2lyx/lyx_1_0_1.pyo
 share/lyx/lyx2lyx/lyx_1_1_4.py
 share/lyx/lyx2lyx/lyx_1_1_4.pyc
+share/lyx/lyx2lyx/lyx_1_1_4.pyo
 share/lyx/lyx2lyx/lyx_1_1_5.py
 share/lyx/lyx2lyx/lyx_1_1_5.pyc
+share/lyx/lyx2lyx/lyx_1_1_5.pyo
 share/lyx/lyx2lyx/lyx_1_1_6.py
 share/lyx/lyx2lyx/lyx_1_1_6.pyc
+share/lyx/lyx2lyx/lyx_1_1_6.pyo
 share/lyx/lyx2lyx/lyx_1_1_6fix3.py
 share/lyx/lyx2lyx/lyx_1_1_6fix3.pyc
+share/lyx/lyx2lyx/lyx_1_1_6fix3.pyo
 share/lyx/lyx2lyx/lyx_1_2.py
 share/lyx/lyx2lyx/lyx_1_2.pyc
+share/lyx/lyx2lyx/lyx_1_2.pyo
 share/lyx/lyx2lyx/lyx_1_3.py
 share/lyx/lyx2lyx/lyx_1_3.pyc
+share/lyx/lyx2lyx/lyx_1_3.pyo
 share/lyx/lyx2lyx/lyx_1_4.py
 share/lyx/lyx2lyx/lyx_1_4.pyc
-share/lyx/lyx2lyx/lyxconvert_215.pyc
-share/lyx/lyx2lyx/lyxconvert_216.pyc
-share/lyx/lyx2lyx/lyxconvert_217.pyc
-share/lyx/lyx2lyx/lyxconvert_218.pyc
-share/lyx/lyx2lyx/lyxconvert_220.pyc
+share/lyx/lyx2lyx/lyx_1_4.pyo
 share/lyx/lyx2lyx/parser_tools.py
 share/lyx/lyx2lyx/parser_tools.pyc
+share/lyx/lyx2lyx/parser_tools.pyo
 share/lyx/lyx2lyx/profiling.py
+share/lyx/lyx2lyx/profiling.pyc
+share/lyx/lyx2lyx/profiling.pyo
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst
-share/lyx/reLyX/BUGS
-share/lyx/reLyX/BasicLyX.pm
-share/lyx/reLyX/CHANGES
-share/lyx/reLyX/CleanTeX.pm
-share/lyx/reLyX/LastLyX.pm
-share/lyx/reLyX/MakePreamble.pm
-share/lyx/reLyX/README
-share/lyx/reLyX/ReadCommands.pm
-share/lyx/reLyX/RelyxFigure.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
 share/lyx/scripts/TeXFiles.sh
 share/lyx/scripts/convertDefault.sh
 share/lyx/scripts/fen2ascii.py
-share/lyx/scripts/fig2pstex.py
-share/lyx/scripts/general_command_wrapper.py
+share/lyx/scripts/fig2pdftex.sh
+share/lyx/scripts/fig2pstex.sh
+share/lyx/scripts/fig_copy.sh
+share/lyx/scripts/layout2layout.py
+share/lyx/scripts/legacy_lyxpreview2ppm.py
 share/lyx/scripts/listerrors
-share/lyx/scripts/lyxpreview2ppm.py
-share/lyx/scripts/pic2ascii.py
-share/lyx/scripts/pic2png_eps.py
-share/lyx/scripts/pic2png_eps.sh
+share/lyx/scripts/lyxpreview2bitmap.py
+share/lyx/scripts/lyxpreview_tools.py
+share/lyx/scripts/tex_copy.py
 share/lyx/symbols
+share/lyx/syntax.default
 share/lyx/templates/IEEEtran.lyx
+share/lyx/templates/README.new_templates
 share/lyx/templates/aa.lyx
 share/lyx/templates/aastex.lyx
+share/lyx/templates/agu_article.lyx
 share/lyx/templates/dinbrief.lyx
 share/lyx/templates/docbook_article.lyx
 share/lyx/templates/elsart.lyx
@@ -927,18 +988,10 @@ share/lyx/templates/revtex.lyx
 share/lyx/templates/revtex4.lyx
 share/lyx/templates/slides.lyx
 share/lyx/textclass.lst
+share/lyx/ui/classic.ui
 share/lyx/ui/default.ui
-share/lyx/xfonts/PSres.upr
-share/lyx/xfonts/cmex10.pfb
-share/lyx/xfonts/cmmi10.pfb
-share/lyx/xfonts/cmr10.pfb
-share/lyx/xfonts/cmsy10.pfb
-share/lyx/xfonts/eufm10.pfb
-share/lyx/xfonts/fonts.dir
-share/lyx/xfonts/fonts.scale
-share/lyx/xfonts/msam10.pfb
-share/lyx/xfonts/msbm10.pfb
-share/lyx/xfonts/wasy10.pfb
+share/lyx/ui/stdmenus.ui
+share/lyx/ui/stdtoolbars.ui
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/broadway.cls
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/cv.cls
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/hollywood.cls
@@ -946,18 +999,16 @@ ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/lyxchess.sty
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/lyxskak.sty
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/revtex.cls
 @dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx
-@dirrm share/lyx/xfonts
+@comment In texmf-dirs: @dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex
+@comment In texmf-dirs: @dirrm ${PKG_LOCALTEXMFPREFIX}/tex
 @dirrm share/lyx/ui
 @dirrm share/lyx/templates
 @dirrm share/lyx/scripts
-@dirrm share/lyx/reLyX/Text
-@dirrm share/lyx/reLyX
 @dirrm share/lyx/lyx2lyx
 @dirrm share/lyx/layouts
 @dirrm share/lyx/kbd
 @dirrm share/lyx/images/math
 @dirrm share/lyx/images
-@dirrm share/lyx/help
 @dirrm share/lyx/examples
 @dirrm share/lyx/doc
 @dirrm share/lyx/clipart
diff --git a/editors/lyx-qt/distinfo b/editors/lyx-qt/distinfo
index 5e59720e5d5..ed45b8a5094 100644
--- a/editors/lyx-qt/distinfo
+++ b/editors/lyx-qt/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.14 2006/04/07 00:44:53 minskim Exp $
+$NetBSD: distinfo,v 1.15 2006/04/18 23:21:18 reed Exp $
 
-SHA1 (lyx-1.3.7.tar.bz2) = 7f2620ed179f669ee3ee875170d1ea8193ee55fd
-RMD160 (lyx-1.3.7.tar.bz2) = a91d94a71a8c057941b6047f4dec92f3480a94f3
-Size (lyx-1.3.7.tar.bz2) = 5893780 bytes
+SHA1 (lyx-1.4.1.tar.bz2) = 7c036311891692d90dcc3d70bcf9c3cdd0c2fcdf
+RMD160 (lyx-1.4.1.tar.bz2) = 8569859a1badb3f5f1869b61210bd743bd274c5c
+Size (lyx-1.4.1.tar.bz2) = 6637018 bytes
 SHA1 (patch-aa) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da
-SHA1 (patch-ab) = 177dbc39700f27ef81ff08e97c34ed781c9cb1d2
-SHA1 (patch-af) = f31afdb4145ae1245e23dd1189da9d2a3d0cce60
-SHA1 (patch-ah) = 278f5deaf94c1082b755af3cb9511bc2f68231ba
-SHA1 (patch-ai) = ddd905f335293fa510745c5fe4f8011a5b3a1d9e
-SHA1 (patch-aj) = 9df1c4cf92281c332efef921b24089ad2d86454c
+SHA1 (patch-ab) = a43ebed4d1a2fe4dff47c5a99c823113b55c2d62
+SHA1 (patch-ac) = e62afbb3165c0d0b0583073d39f329b4b727430e
+SHA1 (patch-af) = a2dda183512e8fdfa79ecf4b2c40b32198f9a1fb
diff --git a/editors/lyx-qt/patches/patch-ab b/editors/lyx-qt/patches/patch-ab
index 4b2cd8f236d..cc5d8a1b1d8 100644
--- a/editors/lyx-qt/patches/patch-ab
+++ b/editors/lyx-qt/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2006/01/18 21:00:45 reed Exp $
+$NetBSD: patch-ab,v 1.7 2006/04/18 23:21:18 reed Exp $
 
---- src/frontends/qt2/lyx_gui.C.orig	2006-01-18 12:25:08.000000000 -0800
-+++ src/frontends/qt2/lyx_gui.C	2006-01-18 12:33:05.000000000 -0800
-@@ -122,8 +122,22 @@
+--- src/frontends/qt2/lyx_gui.C.orig	2006-04-14 13:33:44.000000000 -0700
++++ src/frontends/qt2/lyx_gui.C	2006-04-14 14:18:59.000000000 -0700
+@@ -135,8 +135,22 @@
  
  
  LQApplication::~LQApplication()
@@ -25,5 +25,5 @@ $NetBSD: patch-ab,v 1.6 2006/01/18 21:00:45 reed Exp $
 +#endif
 +}
  
- #ifdef Q_OS_MAC
+ #ifdef Q_WS_MACX
  bool LQApplication::macEventFilter(EventRef event)
diff --git a/editors/lyx-qt/patches/patch-ac b/editors/lyx-qt/patches/patch-ac
new file mode 100644
index 00000000000..595b502306e
--- /dev/null
+++ b/editors/lyx-qt/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.5 2006/04/18 23:21:18 reed Exp $
+
+--- src/client/client.C.orig	2006-04-11 14:56:26.000000000 -0700
++++ src/client/client.C	2006-04-11 14:57:53.000000000 -0700
+@@ -27,6 +27,10 @@
+ # include <unistd.h>
+ #endif
+ 
++#ifdef HAVE_SYS_TIME_H
++# include <sys/time.h>
++#endif
++
+ // select()
+ #ifdef HAVE_SYS_SELECT_H
+ # include <sys/select.h>
diff --git a/editors/lyx-qt/patches/patch-af b/editors/lyx-qt/patches/patch-af
index cbfda677edf..66ea129b894 100644
--- a/editors/lyx-qt/patches/patch-af
+++ b/editors/lyx-qt/patches/patch-af
@@ -1,22 +1,13 @@
-$NetBSD: patch-af,v 1.5 2006/04/07 00:44:53 minskim Exp $
+$NetBSD: patch-af,v 1.6 2006/04/18 23:21:18 reed Exp $
 
---- lib/Makefile.in.orig	2006-01-16 14:51:40.000000000 +0000
-+++ lib/Makefile.in
-@@ -244,7 +244,7 @@ TEMPL = templates/*.lyx
- TEXSUPPORT = tex/*.cls tex/*.sty
- UI = ui/*.ui
- LIBINSTFILES = $(BIND) $(CLIPART) $(DOCINST) $(EXAMPLES) $(HELP) $(IMAGES) \
--	$(KBD) $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(UI)
-+	$(KBD) $(LAYOUT) $(TEMPL) $(UI)
+--- lib/Makefile.in.orig	2006-04-11 17:45:48.000000000 -0700
++++ lib/Makefile.in	2006-04-11 17:49:01.000000000 -0700
+@@ -1185,7 +1185,7 @@
+ 	templates/ijmpd.lyx \
+ 	templates/agu_article.lyx
  
- LIBDISTFILES = $(BIND) $(CLIPART) $(DOCDIST) $(EXAMPLES) $(HELP) $(IMAGES) \
- 	$(KBD) $(LAYOUT) $(TEMPL) $(UI) $(TEXSUPPORT) $(LYXSCRIPTS)
-@@ -254,7 +254,7 @@ pkgdata_DATA = lyxrc.example CREDITS chk
- 	       encodings languages symbols
- 
- LYXLIBDIRS = bind clipart doc examples help images images/math kbd layouts lyx2lyx scripts \
--	     templates tex ui
-+	     templates ui
- 
- EXTRA_DIST = CREDITS chkconfig.ltx lyxrc.example \
- 	external_templates bind clipart doc examples help images \
+-texdir = $(pkgdatadir)/tex
++texdir = ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx
+ dist_tex_DATA = \
+ 	tex/broadway.cls \
+ 	tex/cv.cls \
diff --git a/editors/lyx-qt/patches/patch-ah b/editors/lyx-qt/patches/patch-ah
deleted file mode 100644
index 575e56f9ed1..00000000000
--- a/editors/lyx-qt/patches/patch-ah
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/12/21 07:00:53 martti Exp $
-
---- ./boost/boost/config/compiler/gcc.hpp.orig	2003-05-26 08:27:34.000000000 -0600
-+++ ./boost/boost/config/compiler/gcc.hpp
-@@ -1,7 +1,13 @@
--//  (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and
--//  distribute this software is granted provided this copyright notice appears
--//  in all copies. This software is provided "as is" without express or implied
--//  warranty, and with no claim as to its suitability for any purpose.
-+//  (C) Copyright John Maddock 2001 - 2003.
-+//  (C) Copyright Darin Adler 2001 - 2002.
-+//  (C) Copyright Jens Maurer 2001 - 2002.
-+//  (C) Copyright Beman Dawes 2001 - 2003.
-+//  (C) Copyright Douglas Gregor 2002.
-+//  (C) Copyright David Abrahams 2002 - 2003.
-+//  (C) Copyright Synge Todo 2003.
-+//  Use, modification and distribution are subject to the
-+//  Boost Software License, Version 1.0. (See accompanying file
-+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
- //  See http://www.boost.org for most recent version.
- 
-@@ -23,24 +29,53 @@
- #     endif
- #   endif
- 
-+#   if __GNUC__ == 2 && __GNUC_MINOR__ < 96
-+#     define BOOST_NO_SFINAE
-+#   endif
-+
- #   if __GNUC__ == 2 && __GNUC_MINOR__ <= 97
- #     define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
- #     define BOOST_NO_OPERATORS_IN_NAMESPACE
- #   endif
- 
-+#   if __GNUC__ < 3
-+#      define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
-+#      define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
-+#   endif
-+
-+#
-+#
-+#
-+
-+//
-+// Bug specific to gcc 3.1 and 3.2:
-+//
-+#if (__GNUC__ == 3) && ((__GNUC_MINOR__ == 1) || (__GNUC_MINOR__ == 2))
-+#  define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
-+#endif
-+
- //
--// Threading support:
--// Turn this on unconditionally here, it will get turned off again later
--// if no threading API is detected.
-+// Threading support: Turn this on unconditionally here (except for
-+// those platforms where we can know for sure). It will get turned off again
-+// later if no threading API is detected.
- //
--#define BOOST_HAS_THREADS
-+#if !defined(__MINGW32__) && !defined(linux) && !defined(__linux) && !defined(__linux__)
-+# define BOOST_HAS_THREADS
-+#endif
- 
- //
- // gcc has "long long"
- //
- #define BOOST_HAS_LONG_LONG
- 
--#define BOOST_COMPILER "GNU C++ version " BOOST_STRINGIZE(__GNUC__) "." BOOST_STRINGIZE(__GNUC_MINOR__)
-+//
-+// gcc implements the named return value optimization since version 3.1
-+//
-+#if __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 1 )
-+#define BOOST_HAS_NRVO
-+#endif
-+
-+#define BOOST_COMPILER "GNU C++ version " __VERSION__
- 
- //
- // versions check:
diff --git a/editors/lyx-qt/patches/patch-ai b/editors/lyx-qt/patches/patch-ai
deleted file mode 100644
index 6bcac02c089..00000000000
--- a/editors/lyx-qt/patches/patch-ai
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/01/04 19:51:11 markd Exp $
-
---- lib/reLyX/configure.orig	2004-10-07 03:43:23.000000000 +1300
-+++ lib/reLyX/configure	2005-01-05 02:10:36.000000000 +1300
-@@ -1724,37 +1724,6 @@
-   PATH_IFS=':'
-   ;;
- esac
--for ac_prog in perl perl5 perl5.6.1  perl5.6.0 perl5.005 perl5.004 perl5.003 perl5.002 ; do
--# Extract the first word of "$ac_prog", so it can be a program name with
--# args.
--  set dummy $ac_prog ; ac_word=$2
--  if test ! -n "$PERL"; then
--    IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}$PATH_IFS"
--    for ac_dir in $PATH; do
--      test -z "$ac_dir" && ac_dir=.
--      if test -f $ac_dir/$ac_word -o -f $ac_dir/$ac_word$ac_exeext; then
--        PERL="$ac_prog"
--        break
--      fi
--    done
--    IFS="$ac_save_ifs"
--  fi
--
--  if test -n "$PERL"; then
--    ac_result=yes
--  else
--    ac_result=no
--  fi
--
--if echo 'require 5.002;exit' | $ac_dir/$ac_prog 2>&5
--then
--  PERL=$ac_dir/$ac_prog
--else
--  PERL=
--fi
--
--  test -n "$PERL" && break
--done
- 
- if test -n "$PERL" ; then
-   echo "$as_me:$LINENO: result: $PERL" >&5
diff --git a/editors/lyx-qt/patches/patch-aj b/editors/lyx-qt/patches/patch-aj
deleted file mode 100644
index 29f507deaea..00000000000
--- a/editors/lyx-qt/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2006/01/18 21:00:45 reed Exp $
-
---- src/support/Makefile.in.orig	2006-01-16 06:51:45.000000000 -0800
-+++ src/support/Makefile.in	2006-01-17 10:47:16.000000000 -0800
-@@ -626,12 +626,11 @@
- 	$(top_srcdir)/src/BoostFormat.h $(top_srcdir)/src/debug.h \
- 	$(top_srcdir)/src/gettext.h $(top_srcdir)/src/Lsstream.h \
- 	$(top_srcdir)/src/LString.h
--	$(CXXCOMPILE) \
-+	$(LTCXXCOMPILE) \
- 		-DLYX_DIR=\"$(LYX_ABS_INSTALLED_DATADIR)\" \
- 		-DTOP_SRCDIR=\"$(LYX_ABS_TOP_SRCDIR)\" \
- 		-DLOCALEDIR=\"$(LYX_ABS_INSTALLED_LOCALEDIR)\" \
--		-c $(top_srcdir)/src/support/package.C && \
--	echo "timestamp" > $@
-+		-c $(top_srcdir)/src/support/package.C
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/editors/lyx-xforms/DESCR b/editors/lyx-xforms/DESCR
index 3ea793a282e..8c4598a69a8 100644
--- a/editors/lyx-xforms/DESCR
+++ b/editors/lyx-xforms/DESCR
@@ -4,7 +4,7 @@ LaTeX.
 
 Quasi-WYSIWYG interface, many LaTeX styles and layouts automatically
 generated. Speeds up learning LaTeX and makes complicated layouts
-easy and intuitive. New features include spell-checking, international
+easy and intuitive. Features include spell-checking, international
 character support, WYSIWYG graphics, tables, and equations.
 
 This version of LyX uses the XForms graphical user interface toolkit.
diff --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile
index 7059c2a898f..929a630f4ef 100644
--- a/editors/lyx-xforms/Makefile
+++ b/editors/lyx-xforms/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2006/04/07 00:54:25 minskim Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/18 23:21:18 reed Exp $
 #
 
 .include "../../editors/lyx-qt/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-xforms-/}
-PKGREVISION=	2
 
 COMMENT+=	(xforms version)