Updated print/lyx package to 1.3.0. Major new features are listed below.

** Qt frontend
** Xforms frontend
** Gnome frontend
** Instant preview
** Math editor
** Reading old files
** Miscellaneous changes

A complete announcement is found at `http://www.lyx.org/announce/1_3_0.txt'.
Also, it now depends on teTeX2.

This package was provided by Marc Recht.  Close pkg/20417.

9 files changed, 569 insertions, 285 deletions

diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 58aa2d04bda..cd98910c724 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2003/01/09 14:36:33 martti Exp $
+# $NetBSD: Makefile,v 1.53 2003/03/02 14:57:35 kei Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
 #
 
-DISTNAME=		lyx-1.2.3
+DISTNAME=		lyx-1.3.0
 CATEGORIES=		print
 MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/ \
 			ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \
@@ -13,26 +13,49 @@ HOMEPAGE=		http://www.lyx.org/
 COMMENT=		Graphical frontend for LaTeX (nearly WYSIWYG)
 
 DEPENDS=		ispell-base-[0-9]*:../../textproc/ispell-base
-DEPENDS+=		teTeX>=1.0.6:../../print/teTeX
+DEPENDS+=		teTeX2>=2.0.1:../teTeX2
 
 USE_BUILDLINK2=		YES
 USE_PERL5=		YES
+USE_GMAKE=		YES
 USE_X11=		YES
 USE_CXX=		YES
+USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+= 	--with-extra-lib=${BUILDLINK_PREFIX.xforms}/lib \
-			--with-extra-inc=${BUILDLINK_PREFIX.xforms}/include/X11
+CONFIGURE_ARGS+= 	--with-extra-prefix=${BUILDLINK_PREFIX.xforms} \
+			--with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \
+			--with-pspell-include=${BUILDLINK_PREFIX.aspell}/include/pspell \
+			--with-pspell
+CXXFLAGS+=		-Wno-non-template-friend -ftemplate-depth-30
+
+.include "../../mk/bsd.prefs.mk"
+.if ${MACHINE_ARCH} == "sparc64"
+DBG=	-O -ffixed-g4	#Hack for embedany memory model compatibility
+.else
+DBG=	-O
+.endif
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/sigc++/libtool
 
-post-install:
-	${CHMOD} +x ${PREFIX}/share/lyx/configure
+# IPv6 support
+.if defined(LYX_USE_QT) && !empty(LYX_USE_QT:M[Yy][Ee][Ss])
+.include "../../x11/qt3-tools/buildlink2.mk"
+CONFIGURE_ARGS+= 	--with-extra-prefix=${BUILDLINK_PREFIX.qt3-libs} \
+			--with-qt-dir=${QTDIR} \
+			--with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include \
+			--with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib \
+			--with-frontend=qt
+.else
+.include "../../x11/xforms/buildlink2.mk"
+CONFIGURE_ARGS+= 	--with-extra-prefix=${BUILDLINK_PREFIX.xforms} \
+			--with-frontend=xforms
+.endif
 
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../lang/gcc/buildlink2.mk"
-.include "../../x11/xforms/buildlink2.mk"
+.include "../../textproc/aiksaurus/buildlink2.mk"
+.include "../../textproc/aspell/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lyx/PLIST b/print/lyx/PLIST
index d38734c77d0..b053923d21b 100644
--- a/print/lyx/PLIST
+++ b/print/lyx/PLIST
@@ -1,32 +1,32 @@
-@comment $NetBSD: PLIST,v 1.6 2002/12/31 09:19:02 martti Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/03/02 14:57:35 kei Exp $
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
 man/man1/lyx.1
 man/man1/reLyX.1
-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/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
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/lyx.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/lyx.mo
 share/lyx/CREDITS
 share/lyx/bind/broadway.bind
 share/lyx/bind/cua.bind
@@ -98,6 +98,7 @@ share/lyx/doc/mobius.eps
 share/lyx/doc/nl_Intro.lyx
 share/lyx/doc/nl_TOC.lyx
 share/lyx/doc/nl_Tutorial.lyx
+share/lyx/doc/pl_Extended.lyx
 share/lyx/doc/pl_Intro.lyx
 share/lyx/doc/pl_TOC.lyx
 share/lyx/doc/pl_Tutorial.lyx
@@ -192,7 +193,7 @@ share/lyx/external_templates
 share/lyx/help/Bibtex.hlp
 share/lyx/help/Texinfo.hlp
 share/lyx/images/amssymb.xpm
-share/lyx/images/banner.xpm
+share/lyx/images/banner.ppm
 share/lyx/images/buffer-close.xpm
 share/lyx/images/buffer-export_ascii.xpm
 share/lyx/images/buffer-export_latex.xpm
@@ -209,9 +210,10 @@ 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-tabular-insert.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/font-bold.xpm
 share/lyx/images/font-emph.xpm
 share/lyx/images/font-free.xpm
@@ -222,7 +224,6 @@ 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_LaTeX.xpm
 share/lyx/images/layout_LyX-Code.xpm
 share/lyx/images/layout_Scrap.xpm
 share/lyx/images/layout_Section.xpm
@@ -231,6 +232,453 @@ share/lyx/images/lyx.xpm
 share/lyx/images/marginalnote-insert.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
+share/lyx/images/math/Finv.xpm
+share/lyx/images/math/Game.xpm
+share/lyx/images/math/Im.xpm
+share/lyx/images/math/Lleftarrow.xpm
+share/lyx/images/math/Lsh.xpm
+share/lyx/images/math/Re.xpm
+share/lyx/images/math/Rsh.xpm
+share/lyx/images/math/Vert.xpm
+share/lyx/images/math/Vvdash.xpm
+share/lyx/images/math/acute.xpm
+share/lyx/images/math/aleph.xpm
+share/lyx/images/math/alpha.xpm
+share/lyx/images/math/amalg.xpm
+share/lyx/images/math/angle.xpm
+share/lyx/images/math/approx.xpm
+share/lyx/images/math/approxeq.xpm
+share/lyx/images/math/asymp.xpm
+share/lyx/images/math/backepsilon.xpm
+share/lyx/images/math/backprime.xpm
+share/lyx/images/math/backsim.xpm
+share/lyx/images/math/backsimeq.xpm
+share/lyx/images/math/backslash.xpm
+share/lyx/images/math/bar.xpm
+share/lyx/images/math/bars.xpm
+share/lyx/images/math/barwedge.xpm
+share/lyx/images/math/because.xpm
+share/lyx/images/math/beta.xpm
+share/lyx/images/math/beth.xpm
+share/lyx/images/math/between.xpm
+share/lyx/images/math/bigcap.xpm
+share/lyx/images/math/bigcirc.xpm
+share/lyx/images/math/bigcup.xpm
+share/lyx/images/math/bigodot.xpm
+share/lyx/images/math/bigoplus.xpm
+share/lyx/images/math/bigotimes.xpm
+share/lyx/images/math/bigsqcup.xpm
+share/lyx/images/math/bigstar.xpm
+share/lyx/images/math/bigtriangledown.xpm
+share/lyx/images/math/bigtriangleup.xpm
+share/lyx/images/math/biguplus.xpm
+share/lyx/images/math/bigvee.xpm
+share/lyx/images/math/bigwedge.xpm
+share/lyx/images/math/blacklozenge.xpm
+share/lyx/images/math/blacksquare.xpm
+share/lyx/images/math/blacktriangle.xpm
+share/lyx/images/math/blacktriangledown.xpm
+share/lyx/images/math/blacktriangleleft.xpm
+share/lyx/images/math/blacktriangleright.xpm
+share/lyx/images/math/bot.xpm
+share/lyx/images/math/bowtie.xpm
+share/lyx/images/math/boxdot.xpm
+share/lyx/images/math/boxminus.xpm
+share/lyx/images/math/boxplus.xpm
+share/lyx/images/math/boxtimes.xpm
+share/lyx/images/math/breve.xpm
+share/lyx/images/math/bullet.xpm
+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/cdot.xpm
+share/lyx/images/math/cdots.xpm
+share/lyx/images/math/centerdot.xpm
+share/lyx/images/math/check.xpm
+share/lyx/images/math/chi.xpm
+share/lyx/images/math/circ.xpm
+share/lyx/images/math/circeq.xpm
+share/lyx/images/math/circlearrowleft.xpm
+share/lyx/images/math/circlearrowright.xpm
+share/lyx/images/math/circledS.xpm
+share/lyx/images/math/circledast.xpm
+share/lyx/images/math/circledcirc.xpm
+share/lyx/images/math/circleddash.xpm
+share/lyx/images/math/clubsuit.xpm
+share/lyx/images/math/complement.xpm
+share/lyx/images/math/cong.xpm
+share/lyx/images/math/coprod.xpm
+share/lyx/images/math/cup.xpm
+share/lyx/images/math/cup2.xpm
+share/lyx/images/math/curlyeqprec.xpm
+share/lyx/images/math/curlyeqsucc.xpm
+share/lyx/images/math/curlyvee.xpm
+share/lyx/images/math/curlywedge.xpm
+share/lyx/images/math/curvearrowleft.xpm
+share/lyx/images/math/curvearrowright.xpm
+share/lyx/images/math/dagger.xpm
+share/lyx/images/math/daleth.xpm
+share/lyx/images/math/dashleftarrow.xpm
+share/lyx/images/math/dashrightarrow.xpm
+share/lyx/images/math/dashv.xpm
+share/lyx/images/math/ddagger.xpm
+share/lyx/images/math/ddot.xpm
+share/lyx/images/math/ddots.xpm
+share/lyx/images/math/delta.xpm
+share/lyx/images/math/delta2.xpm
+share/lyx/images/math/diagdown.xpm
+share/lyx/images/math/diagup.xpm
+share/lyx/images/math/diamond.xpm
+share/lyx/images/math/diamondsuit.xpm
+share/lyx/images/math/digamma.xpm
+share/lyx/images/math/div.xpm
+share/lyx/images/math/divideontimes.xpm
+share/lyx/images/math/dot.xpm
+share/lyx/images/math/doteq.xpm
+share/lyx/images/math/doteqdot.xpm
+share/lyx/images/math/dotplus.xpm
+share/lyx/images/math/doublebarwedge.xpm
+share/lyx/images/math/downarrow.xpm
+share/lyx/images/math/downarrow2.xpm
+share/lyx/images/math/downdownarrows.xpm
+share/lyx/images/math/downharpoonleft.xpm
+share/lyx/images/math/downharpoonright.xpm
+share/lyx/images/math/ell.xpm
+share/lyx/images/math/empty.xpm
+share/lyx/images/math/emptyset.xpm
+share/lyx/images/math/epsilon.xpm
+share/lyx/images/math/eqcirc.xpm
+share/lyx/images/math/eqslantgtr.xpm
+share/lyx/images/math/eqslantless.xpm
+share/lyx/images/math/equiv.xpm
+share/lyx/images/math/eta.xpm
+share/lyx/images/math/eth.xpm
+share/lyx/images/math/exists.xpm
+share/lyx/images/math/fallingdotseq.xpm
+share/lyx/images/math/flat.xpm
+share/lyx/images/math/forall.xpm
+share/lyx/images/math/frac.xpm
+share/lyx/images/math/frown.xpm
+share/lyx/images/math/gamma.xpm
+share/lyx/images/math/gamma2.xpm
+share/lyx/images/math/geq.xpm
+share/lyx/images/math/geqq.xpm
+share/lyx/images/math/geqslant.xpm
+share/lyx/images/math/gg.xpm
+share/lyx/images/math/ggg.xpm
+share/lyx/images/math/gimel.xpm
+share/lyx/images/math/gnapprox.xpm
+share/lyx/images/math/gneq.xpm
+share/lyx/images/math/gneqq.xpm
+share/lyx/images/math/gnsim.xpm
+share/lyx/images/math/grave.xpm
+share/lyx/images/math/gtrapprox.xpm
+share/lyx/images/math/gtrdot.xpm
+share/lyx/images/math/gtreqless.xpm
+share/lyx/images/math/gtreqqless.xpm
+share/lyx/images/math/gtrless.xpm
+share/lyx/images/math/gtrsim.xpm
+share/lyx/images/math/gvertneqq.xpm
+share/lyx/images/math/hat.xpm
+share/lyx/images/math/hbar.xpm
+share/lyx/images/math/heartsuit.xpm
+share/lyx/images/math/hookleftarrow.xpm
+share/lyx/images/math/hookrightarrow.xpm
+share/lyx/images/math/hslash.xpm
+share/lyx/images/math/imath.xpm
+share/lyx/images/math/in.xpm
+share/lyx/images/math/infty.xpm
+share/lyx/images/math/int.xpm
+share/lyx/images/math/intercal.xpm
+share/lyx/images/math/iota.xpm
+share/lyx/images/math/jmath.xpm
+share/lyx/images/math/kappa.xpm
+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/lbracket.xpm
+share/lyx/images/math/lceil.xpm
+share/lyx/images/math/ldots.xpm
+share/lyx/images/math/leftarrow.xpm
+share/lyx/images/math/leftarrow2.xpm
+share/lyx/images/math/leftarrowtail.xpm
+share/lyx/images/math/leftharpoondown.xpm
+share/lyx/images/math/leftharpoonup.xpm
+share/lyx/images/math/leftleftarrows.xpm
+share/lyx/images/math/leftrightarrow.xpm
+share/lyx/images/math/leftrightarrow2.xpm
+share/lyx/images/math/leftrightarrows.xpm
+share/lyx/images/math/leftrightharpoons.xpm
+share/lyx/images/math/leftrightsquigarrow.xpm
+share/lyx/images/math/leftthreetimes.xpm
+share/lyx/images/math/leq.xpm
+share/lyx/images/math/leqq.xpm
+share/lyx/images/math/leqslant.xpm
+share/lyx/images/math/lessapprox.xpm
+share/lyx/images/math/lessdot.xpm
+share/lyx/images/math/lesseqgtr.xpm
+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/ll.xpm
+share/lyx/images/math/llcorner.xpm
+share/lyx/images/math/lll.xpm
+share/lyx/images/math/lnapprox.xpm
+share/lyx/images/math/lneq.xpm
+share/lyx/images/math/lneqq.xpm
+share/lyx/images/math/lnsim.xpm
+share/lyx/images/math/longleftarrow.xpm
+share/lyx/images/math/longleftarrow2.xpm
+share/lyx/images/math/longleftrightarrow.xpm
+share/lyx/images/math/longleftrightarrow2.xpm
+share/lyx/images/math/longmapsto.xpm
+share/lyx/images/math/longrightarrow.xpm
+share/lyx/images/math/longrightarrow2.xpm
+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/lrcorner.xpm
+share/lyx/images/math/ltimes.xpm
+share/lyx/images/math/lvertneqq.xpm
+share/lyx/images/math/mapsto.xpm
+share/lyx/images/math/mathbb_C.xpm
+share/lyx/images/math/mathbb_H.xpm
+share/lyx/images/math/mathbb_N.xpm
+share/lyx/images/math/mathbb_Q.xpm
+share/lyx/images/math/mathbb_R.xpm
+share/lyx/images/math/mathbb_Z.xpm
+share/lyx/images/math/mathcal_F.xpm
+share/lyx/images/math/mathcal_H.xpm
+share/lyx/images/math/mathcal_L.xpm
+share/lyx/images/math/mathcal_O.xpm
+share/lyx/images/math/mathcircumflex.xpm
+share/lyx/images/math/mathrm_T.xpm
+share/lyx/images/math/measuredangle.xpm
+share/lyx/images/math/mho.xpm
+share/lyx/images/math/mid.xpm
+share/lyx/images/math/models.xpm
+share/lyx/images/math/mp.xpm
+share/lyx/images/math/mu.xpm
+share/lyx/images/math/multimap.xpm
+share/lyx/images/math/nabla.xpm
+share/lyx/images/math/natural.xpm
+share/lyx/images/math/ncong.xpm
+share/lyx/images/math/nearrow.xpm
+share/lyx/images/math/neg.xpm
+share/lyx/images/math/neq.xpm
+share/lyx/images/math/nexists.xpm
+share/lyx/images/math/ngeq.xpm
+share/lyx/images/math/ngeqq.xpm
+share/lyx/images/math/ngeqslant.xpm
+share/lyx/images/math/ngtr.xpm
+share/lyx/images/math/ni.xpm
+share/lyx/images/math/nleftarrow.xpm
+share/lyx/images/math/nleftarrow2.xpm
+share/lyx/images/math/nleftrightarrow.xpm
+share/lyx/images/math/nleftrightarrow2.xpm
+share/lyx/images/math/nleq.xpm
+share/lyx/images/math/nleqq.xpm
+share/lyx/images/math/nleqslant.xpm
+share/lyx/images/math/nless.xpm
+share/lyx/images/math/nmid.xpm
+share/lyx/images/math/notin.xpm
+share/lyx/images/math/nparallel.xpm
+share/lyx/images/math/nprec.xpm
+share/lyx/images/math/npreceq.xpm
+share/lyx/images/math/nrightarrow.xpm
+share/lyx/images/math/nrightarrow2.xpm
+share/lyx/images/math/nshortmid.xpm
+share/lyx/images/math/nshortparallel.xpm
+share/lyx/images/math/nsim.xpm
+share/lyx/images/math/nsubseteq.xpm
+share/lyx/images/math/nsucc.xpm
+share/lyx/images/math/nsucceq.xpm
+share/lyx/images/math/nsupseteq.xpm
+share/lyx/images/math/nsupseteqq.xpm
+share/lyx/images/math/ntriangleleft.xpm
+share/lyx/images/math/ntrianglelefteq.xpm
+share/lyx/images/math/ntriangleright.xpm
+share/lyx/images/math/ntrianglerighteq.xpm
+share/lyx/images/math/nu.xpm
+share/lyx/images/math/nvdash.xpm
+share/lyx/images/math/nvdash2.xpm
+share/lyx/images/math/nvdash3.xpm
+share/lyx/images/math/nwarrow.xpm
+share/lyx/images/math/odot.xpm
+share/lyx/images/math/oint.xpm
+share/lyx/images/math/omega.xpm
+share/lyx/images/math/omega2.xpm
+share/lyx/images/math/ominus.xpm
+share/lyx/images/math/oplus.xpm
+share/lyx/images/math/oslash.xpm
+share/lyx/images/math/otimes.xpm
+share/lyx/images/math/overbrace.xpm
+share/lyx/images/math/overleftarrow.xpm
+share/lyx/images/math/overleftrightarrow.xpm
+share/lyx/images/math/overline.xpm
+share/lyx/images/math/overrightarrow.xpm
+share/lyx/images/math/parallel.xpm
+share/lyx/images/math/partial.xpm
+share/lyx/images/math/perp.xpm
+share/lyx/images/math/phi.xpm
+share/lyx/images/math/phi2.xpm
+share/lyx/images/math/pi.xpm
+share/lyx/images/math/pi2.xpm
+share/lyx/images/math/pitchfork.xpm
+share/lyx/images/math/pm.xpm
+share/lyx/images/math/prec.xpm
+share/lyx/images/math/precapprox.xpm
+share/lyx/images/math/preccurlyeq.xpm
+share/lyx/images/math/preceq.xpm
+share/lyx/images/math/precnapprox.xpm
+share/lyx/images/math/precnsim.xpm
+share/lyx/images/math/precsim.xpm
+share/lyx/images/math/prime.xpm
+share/lyx/images/math/prod.xpm
+share/lyx/images/math/propto.xpm
+share/lyx/images/math/psi.xpm
+share/lyx/images/math/psi2.xpm
+share/lyx/images/math/rangle.xpm
+share/lyx/images/math/rbrace.xpm
+share/lyx/images/math/rbracket.xpm
+share/lyx/images/math/rceil.xpm
+share/lyx/images/math/rfloor.xpm
+share/lyx/images/math/rho.xpm
+share/lyx/images/math/rightarrow.xpm
+share/lyx/images/math/rightarrow2.xpm
+share/lyx/images/math/rightarrowtail.xpm
+share/lyx/images/math/rightharpoondown.xpm
+share/lyx/images/math/rightharpoonup.xpm
+share/lyx/images/math/rightleftarrows.xpm
+share/lyx/images/math/rightleftharpoons.xpm
+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/rparen.xpm
+share/lyx/images/math/rtimes.xpm
+share/lyx/images/math/searrow.xpm
+share/lyx/images/math/setminus.xpm
+share/lyx/images/math/sharp.xpm
+share/lyx/images/math/shortmid.xpm
+share/lyx/images/math/shortparallel.xpm
+share/lyx/images/math/sigma.xpm
+share/lyx/images/math/sigma2.xpm
+share/lyx/images/math/sim.xpm
+share/lyx/images/math/simeq.xpm
+share/lyx/images/math/slash.xpm
+share/lyx/images/math/smallfrown.xpm
+share/lyx/images/math/smallsetminus.xpm
+share/lyx/images/math/smallsmile.xpm
+share/lyx/images/math/smile.xpm
+share/lyx/images/math/spadesuit.xpm
+share/lyx/images/math/sphericalangle.xpm
+share/lyx/images/math/sqcap.xpm
+share/lyx/images/math/sqcup.xpm
+share/lyx/images/math/sqrt.xpm
+share/lyx/images/math/sqsubset.xpm
+share/lyx/images/math/sqsubseteq.xpm
+share/lyx/images/math/sqsupset.xpm
+share/lyx/images/math/sqsupseteq.xpm
+share/lyx/images/math/square.xpm
+share/lyx/images/math/star.xpm
+share/lyx/images/math/subset.xpm
+share/lyx/images/math/subset2.xpm
+share/lyx/images/math/subseteq.xpm
+share/lyx/images/math/subseteqq.xpm
+share/lyx/images/math/subsetneq.xpm
+share/lyx/images/math/subsetneqq.xpm
+share/lyx/images/math/succ.xpm
+share/lyx/images/math/succapprox.xpm
+share/lyx/images/math/succcurlyeq.xpm
+share/lyx/images/math/succeq.xpm
+share/lyx/images/math/succnapprox.xpm
+share/lyx/images/math/succnsim.xpm
+share/lyx/images/math/succsim.xpm
+share/lyx/images/math/sum.xpm
+share/lyx/images/math/supset.xpm
+share/lyx/images/math/supset2.xpm
+share/lyx/images/math/supseteq.xpm
+share/lyx/images/math/supseteqq.xpm
+share/lyx/images/math/supsetneq.xpm
+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/therefore.xpm
+share/lyx/images/math/theta.xpm
+share/lyx/images/math/theta2.xpm
+share/lyx/images/math/thickapprox.xpm
+share/lyx/images/math/thicksim.xpm
+share/lyx/images/math/tilde.xpm
+share/lyx/images/math/times.xpm
+share/lyx/images/math/top.xpm
+share/lyx/images/math/triangle.xpm
+share/lyx/images/math/triangledown.xpm
+share/lyx/images/math/triangleleft.xpm
+share/lyx/images/math/trianglelefteq.xpm
+share/lyx/images/math/triangleq.xpm
+share/lyx/images/math/triangleright.xpm
+share/lyx/images/math/trianglerighteq.xpm
+share/lyx/images/math/twoheadleftarrow.xpm
+share/lyx/images/math/twoheadrightarrow.xpm
+share/lyx/images/math/ulcorner.xpm
+share/lyx/images/math/underbrace.xpm
+share/lyx/images/math/underleftarrow.xpm
+share/lyx/images/math/underleftrightarrow.xpm
+share/lyx/images/math/underline.xpm
+share/lyx/images/math/underrightarrow.xpm
+share/lyx/images/math/underscore.xpm
+share/lyx/images/math/uparrow.xpm
+share/lyx/images/math/uparrow2.xpm
+share/lyx/images/math/updownarrow.xpm
+share/lyx/images/math/updownarrow2.xpm
+share/lyx/images/math/upharpoonleft.xpm
+share/lyx/images/math/upharpoonright.xpm
+share/lyx/images/math/uplus.xpm
+share/lyx/images/math/upsilon.xpm
+share/lyx/images/math/upsilon2.xpm
+share/lyx/images/math/upuparrows.xpm
+share/lyx/images/math/urcorner.xpm
+share/lyx/images/math/varepsilon.xpm
+share/lyx/images/math/varkappa.xpm
+share/lyx/images/math/varnothing.xpm
+share/lyx/images/math/varphi.xpm
+share/lyx/images/math/varpi.xpm
+share/lyx/images/math/varpropto.xpm
+share/lyx/images/math/varsigma.xpm
+share/lyx/images/math/varsubsetneq.xpm
+share/lyx/images/math/varsubsetneqq.xpm
+share/lyx/images/math/varsupsetneq.xpm
+share/lyx/images/math/varsupsetneqq.xpm
+share/lyx/images/math/vartheta.xpm
+share/lyx/images/math/vartriangle.xpm
+share/lyx/images/math/vartriangleleft.xpm
+share/lyx/images/math/vartriangleright.xpm
+share/lyx/images/math/vdash.xpm
+share/lyx/images/math/vdash2.xpm
+share/lyx/images/math/vdash3.xpm
+share/lyx/images/math/vdots.xpm
+share/lyx/images/math/vec.xpm
+share/lyx/images/math/vee.xpm
+share/lyx/images/math/veebar.xpm
+share/lyx/images/math/wedge.xpm
+share/lyx/images/math/widehat.xpm
+share/lyx/images/math/widetilde.xpm
+share/lyx/images/math/wp.xpm
+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/paste.xpm
 share/lyx/images/psnfss1.xpm
@@ -242,6 +690,7 @@ share/lyx/images/standard.xpm
 share/lyx/images/tabular-insert.xpm
 share/lyx/images/undo.xpm
 share/lyx/images/unknown.xpm
+share/lyx/images/up.xpm
 share/lyx/kbd/american-2.kmap
 share/lyx/kbd/american.kmap
 share/lyx/kbd/arabic.kmap
@@ -298,6 +747,7 @@ share/lyx/layouts/aa.layout
 share/lyx/layouts/aapaper.inc
 share/lyx/layouts/aapaper.layout
 share/lyx/layouts/aastex.layout
+share/lyx/layouts/aguplus.inc
 share/lyx/layouts/amsart-plain.layout
 share/lyx/layouts/amsart-seq.layout
 share/lyx/layouts/amsart.layout
@@ -339,7 +789,7 @@ share/lyx/layouts/g-brief-en.layout
 share/lyx/layouts/heb-article.layout
 share/lyx/layouts/heb-letter.layout
 share/lyx/layouts/hollywood.layout
-share/lyx/layouts/ijmpd.layout
+share/lyx/layouts/jgrga.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -368,6 +818,8 @@ share/lyx/layouts/siamltex.layout
 share/lyx/layouts/slides.layout
 share/lyx/layouts/spie.layout
 share/lyx/layouts/stdclass.inc
+share/lyx/layouts/stdcounters.inc
+share/lyx/layouts/stdfloats.inc
 share/lyx/layouts/stdlayouts.inc
 share/lyx/layouts/stdletter.inc
 share/lyx/layouts/stdlists.inc
@@ -378,6 +830,14 @@ share/lyx/layouts/stdtitle.inc
 share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
 share/lyx/layouts/svprobth.layout
+share/lyx/lyx2lyx/error.py
+share/lyx/lyx2lyx/lyx2lyx
+share/lyx/lyx2lyx/lyxconvert_215.py
+share/lyx/lyx2lyx/lyxconvert_216.py
+share/lyx/lyx2lyx/lyxconvert_217.py
+share/lyx/lyx2lyx/lyxconvert_218.py
+share/lyx/lyx2lyx/lyxconvert_220.py
+share/lyx/lyx2lyx/parser_tools.py
 share/lyx/lyxrc.defaults
 share/lyx/lyxrc.example
 share/lyx/packages.lst
@@ -397,10 +857,12 @@ 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/listerrors
+share/lyx/scripts/lyxpreview2bitmap.sh
 share/lyx/scripts/pic2ascii.py
 share/lyx/scripts/pic2png_eps.py
 share/lyx/scripts/pic2png_eps.sh
@@ -413,7 +875,6 @@ share/lyx/templates/docbook_article.lyx
 share/lyx/templates/g-brief-de.lyx
 share/lyx/templates/g-brief-en.lyx
 share/lyx/templates/hollywood.lyx
-share/lyx/templates/ijmpd.lyx
 share/lyx/templates/kluwer.lyx
 share/lyx/templates/latex8.lyx
 share/lyx/templates/letter.lyx
@@ -429,7 +890,6 @@ share/lyx/tex/lyxskak.sty
 share/lyx/tex/revtex.cls
 share/lyx/textclass.lst
 share/lyx/ui/default.ui
-share/lyx/ui/old-default.ui
 share/lyx/xfonts/cmex10.pfb
 share/lyx/xfonts/cmmi10.pfb
 share/lyx/xfonts/cmr10.pfb
@@ -439,19 +899,22 @@ share/lyx/xfonts/fonts.dir
 share/lyx/xfonts/fonts.scale
 share/lyx/xfonts/msam10.pfb
 share/lyx/xfonts/msbm10.pfb
-@dirrm share/lyx/bind
-@dirrm share/lyx/clipart
-@dirrm share/lyx/doc
-@dirrm share/lyx/examples
-@dirrm share/lyx/help
-@dirrm share/lyx/images
-@dirrm share/lyx/kbd
-@dirrm share/lyx/layouts
+share/lyx/xfonts/wasy10.pfb
+@dirrm share/lyx/xfonts
+@dirrm share/lyx/ui
+@dirrm share/lyx/tex
+@dirrm share/lyx/templates
+@dirrm share/lyx/scripts
 @dirrm share/lyx/reLyX/Text
 @dirrm share/lyx/reLyX
-@dirrm share/lyx/scripts
-@dirrm share/lyx/templates
-@dirrm share/lyx/tex
-@dirrm share/lyx/ui
-@dirrm share/lyx/xfonts
+@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
+@dirrm share/lyx/bind
 @dirrm share/lyx
diff --git a/print/lyx/distinfo b/print/lyx/distinfo
index 379a70d4887..63c78d36ee3 100644
--- a/print/lyx/distinfo
+++ b/print/lyx/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.14 2003/01/09 14:36:33 martti Exp $
+$NetBSD: distinfo,v 1.15 2003/03/02 14:57:35 kei Exp $
 
-SHA1 (lyx-1.2.3.tar.gz) = 2accb806e97390e2715402e49f6277b2f75e8ee1
-Size (lyx-1.2.3.tar.gz) = 6579440 bytes
-SHA1 (patch-aa) = bad3ab9d2e9e808f7be29c8cf3265bf0fd748fc0
-SHA1 (patch-ab) = fb9fd9edd0d27c1668eb1632578b671586d38636
-SHA1 (patch-ac) = ac244f09ce844a47aa8694d79f1a7b7087aa9cb7
-SHA1 (patch-ad) = be155ad21f5f51a8e7bd1fabeb3cafb16b459b90
-SHA1 (patch-ae) = ef67106da20c6a00b8ae9e532f4d1698fa0bdf61
+SHA1 (lyx-1.3.0.tar.gz) = 73324cf30ebb3b6997b979616a4069fffbd54b30
+Size (lyx-1.3.0.tar.gz) = 7270856 bytes
+SHA1 (patch-ad) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da
+SHA1 (patch-af) = 687545826d3727ba19e555d72d91162525c665f5
diff --git a/print/lyx/patches/patch-aa b/print/lyx/patches/patch-aa
deleted file mode 100644
index 23476a6ba2b..00000000000
--- a/print/lyx/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2002/12/31 09:19:02 martti Exp $
-
---- configure.orig	Mon Dec 16 13:11:11 2002
-+++ configure	Fri Dec 27 23:14:33 2002
-@@ -11644,7 +11644,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lforms  $LIBS"
-+LIBS="-lforms -ljpeg -lXpm $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 11649 "configure"
- #include "confdefs.h"
diff --git a/print/lyx/patches/patch-ab b/print/lyx/patches/patch-ab
deleted file mode 100644
index 45f6b5e63d9..00000000000
--- a/print/lyx/patches/patch-ab
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/08/23 09:08:09 martti Exp $
-
-Avoid the following error with gcc-2.95.3 (NetBSD-1.5ZC-m68k):
-
-    c++ -DHAVE_CONFIG_H -I. -I. -I. -I.. -I.. -I../boost   -I/usr/X11R6/include
-	-I/usr/X11R6/include/X11   -isystem /usr/X11R6/include  -O2 -c lyxfunc.C
-    lyxfunc.C: In method `const class string LyXFunc::Dispatch(int, const string & = string())':
-    lyxfunc.C:3027: Internal compiler error.
-    lyxfunc.C:3027: Please submit a full bug report.
-    lyxfunc.C:3027: See <URL:http://www.gnu.org/software/gcc/bugs.html> for instructions.
-    *** Error code 1
-
-    Stop.
-    make: stopped in /t/pkgobj/print/lyx/work.m68k/lyx-1.1.6fix4/src
-    [and so on]
-
-Line 3027 is a single close bracket, the end of a switch statement that starts
-on line 675. Increasing the process stack size to 32768 didn't help.
-
-
-Also avoid a c++ bug with gcc-2.95.3 on alpha where the assembler runs for ever and never
-finishes
-
---- src/Makefile.in.orig	Tue Aug 20 12:10:20 2002
-+++ src/Makefile.in	Thu Aug 22 14:07:44 2002
-@@ -549,6 +549,11 @@
- @AMDEP_TRUE@	$(DEPDIR)/undo_funcs.Po $(DEPDIR)/undostack.Po \
- @AMDEP_TRUE@	$(DEPDIR)/vc-backend.Po $(DEPDIR)/version.Po \
- @AMDEP_TRUE@	$(DEPDIR)/vspace.Po
-+CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
-+LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-@@ -559,6 +564,8 @@
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
- CFLAGS = @CFLAGS@
-+CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[0-9]*//)
-+CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[0-9]*//)
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -580,8 +587,15 @@
- all: $(BUILT_SOURCES) config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-+buffer.o: buffer.cc
-+buffer.lo: buffer.cc
-+lyxfunc.o: lyxfunc.cc
-+lyxfunc.lo: lyxfunc.cc
-+tex-accent.o: tex-accent.cc
-+tex-accent.lo: tex-accent.cc
-+
- .SUFFIXES:
--.SUFFIXES: .C .lo .o .obj
-+.SUFFIXES: .C .cc .lo .o .obj
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -753,6 +767,14 @@
- 
- distclean-depend:
- 	-rm -rf $(DEPDIR)
-+.C.cc:
-+	cp -f $< $@
-+
-+.cc.o:
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
- 
- .C.o:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@@ -765,6 +787,12 @@
- @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- 	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-+
-+.cc.lo:
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
- 
- .C.lo:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
diff --git a/print/lyx/patches/patch-ac b/print/lyx/patches/patch-ac
deleted file mode 100644
index a0ebfe17d4c..00000000000
--- a/print/lyx/patches/patch-ac
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/08/23 09:08:09 martti Exp $
-
---- src/insets/Makefile.in.orig	Tue Aug 20 12:10:28 2002
-+++ src/insets/Makefile.in	Thu Aug 22 14:08:48 2002
-@@ -353,10 +353,17 @@
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
-+LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
- CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
-+CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//)
-+CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//)
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -370,6 +377,18 @@
- SOURCES = $(libinsets_la_SOURCES)
- 
- all: all-am
-+
-+insetlatexaccent.o: insetlatexaccent.C
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-+
-+insetlatexaccent.lo: insetlatexaccent.C
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
- 
- .SUFFIXES:
- .SUFFIXES: .C .lo .o .obj
diff --git a/print/lyx/patches/patch-ad b/print/lyx/patches/patch-ad
index 024368e45b1..ec44bd69723 100644
--- a/print/lyx/patches/patch-ad
+++ b/print/lyx/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.3 2002/12/31 09:19:02 martti Exp $
+$NetBSD: patch-ad,v 1.4 2003/03/02 14:57:37 kei Exp $
 
---- boost/boost/detail/limits.hpp.orig	Fri Oct 18 10:07:55 2002
-+++ boost/boost/detail/limits.hpp	Fri Dec 27 23:15:03 2002
-@@ -42,12 +42,21 @@
- //#include <cwchar>             // for WCHAR_MIN and WCHAR_MAX
- #include <boost/config.hpp>
+--- boost/boost/detail/limits.hpp.orig	2003-02-18 13:12:14.000000000 +0100
++++ boost/boost/detail/limits.hpp	2003-02-18 13:13:50.000000000 +0100
+@@ -47,6 +47,14 @@
+ #include <cwchar> // for WCHAR_MIN and WCHAR_MAX
+ #endif
  
 +#ifdef __NetBSD__
 +#include <machine/endian.h>
@@ -14,13 +14,14 @@ $NetBSD: patch-ad,v 1.3 2002/12/31 09:19:02 martti Exp $
 +#define BOOST_LITTLE_ENDIAN
 +#endif
 +#else
+ // The macros are not named appropriately.  We don't care about integer
+ // bit layout, but about floating-point NaN (etc.) bit patterns.
  #if defined(__sparc) || defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER)
- #define BOOST_BIG_ENDIAN
- #elif defined(__i386__) || defined(__alpha__)
- #define BOOST_LITTLE_ENDIAN
+@@ -56,6 +64,7 @@
  #else
  #error The file boost/detail/limits.hpp needs to be set up for your CPU type.
-+#endif
  #endif
++#endif
  
  namespace std {
+ 
diff --git a/print/lyx/patches/patch-ae b/print/lyx/patches/patch-ae
deleted file mode 100644
index 7d92816c780..00000000000
--- a/print/lyx/patches/patch-ae
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/08/23 09:08:09 martti Exp $
-
---- src/frontends/xforms/Makefile.in.orig	Tue Aug 20 12:10:27 2002
-+++ src/frontends/xforms/Makefile.in	Thu Aug 22 14:17:07 2002
-@@ -657,10 +657,17 @@
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
-+LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
- CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
-+CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//)
-+CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//)
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -679,10 +686,15 @@
- DIST_SUBDIRS = $(SUBDIRS)
- SOURCES = $(libxforms_la_SOURCES)
- 
-+FormForks.o: FormForks.cc
-+FormForks.lo: FormForks.cc
-+FormPreferences.o: FormPreferences.cc
-+FormPreferences.lo: FormPreferences.cc
-+
- all: all-recursive
- 
- .SUFFIXES:
--.SUFFIXES: .C .c .lo .o .obj
-+.SUFFIXES: .C .c .cc .lo .o .obj
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -814,6 +826,15 @@
- distclean-depend:
- 	-rm -rf $(DEPDIR)
- 
-+.C.cc:
-+	cp -f $< $@
-+
-+.cc.o:
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-+
- .C.o:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@@ -825,6 +846,12 @@
- @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- 	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-+
-+.cc.lo:
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
- 
- .C.lo:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
diff --git a/print/lyx/patches/patch-af b/print/lyx/patches/patch-af
new file mode 100644
index 00000000000..aa4cb7e0bb8
--- /dev/null
+++ b/print/lyx/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/03/02 14:57:38 kei Exp $
+
+--- boost/boost/integer_traits.hpp.orig	2003-02-18 14:09:01.000000000 +0100
++++ boost/boost/integer_traits.hpp	2003-02-18 14:10:46.000000000 +0100
+@@ -93,7 +93,7 @@
+ #elif defined(__BORLANDC__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__BEOS__) && defined(__GNUC__))
+     // No WCHAR_MIN and WCHAR_MAX, whar_t is short and unsigned:
+     public detail::integer_traits_base<wchar_t, 0, 0xffff>
+-#elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400)) || (defined __APPLE__) || (defined(__FreeBSD__) && defined(__GNUC__)) || (defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 3) && !defined(__SGI_STL_PORT))
++#elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400)) || (defined __APPLE__) || (defined(__FreeBSD__) && defined(__GNUC__)) || (defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 3) && !defined(__SGI_STL_PORT)) | (defined(__NetBSD__) && defined(__GNUC__))
+     // No WCHAR_MIN and WCHAR_MAX, wchar_t has the same range as int.
+     //  - SGI MIPSpro with native library
+     //  - gcc 3.x on HP-UX