Update to 1.3.3

Remove dependency on ispell since it can be installed at any time later.
Adapted changes to CXXFLAGS from LyX's configure script and downgrade
optimizations only for archs where gcc is known to produce broken code
for >= -02.

What's new
==========
** Updates
- add basic support for the memoir class
- add Proof layout to elsart class and get sections to be numbered
- make LyX compile almost out-of-the-box with Qt/Mac (see README.MacOSX)
- add a bit of documentation of the AGU journals support in the
  Extended manual; small tweaks to the english documentation; german
  documentation overhaul; french documentation and examples update
- completely new italian localization; french, german, russian and
  slovenian localization updates
** Bug fixes
- fix possible crash when changing text class [bug #1050]
- fix language setting when switching textclass
- fix math bug where formulas containing for example a \prettyref
  would not be parsed correctly [bug #1126]
- speed up conversion of large old files on some systems
- fix bad conversion of tables from LyX 1.0 [bug #1045]
- convert old files (0.11 series) correctly, suppressing space
  between number and units [bug #763]
- fix docbook export with nested environments [bug #821]
- output newline and hfill correctly in docbook [bug #1148]
- when pressing delete or backspace over a selection, do not modify
  the clipboard [bug #1049]
- when inserting a float or a note over a selection, make sure that
  the insets and font changes in the selection are correctly kept
  (note however that doing this now modifies the clipboard)
- clean-up properly after completed graphics conversion processes.
- enable graphics conversion using the default convertDefault.sh converter
  when exporting, even if convertDefault.sh is not executable.
- work around a Qt 3.1.2 bug with the environment combo box [bug #1136]
- fix bug where browsing for files in graphics inset would always
  return an absolute path [bug #1028, Qt only]
- do not write in preference file the colors which are still at their
  default value [bug #1069, Qt only]
- fix loading of symbol fonts [Qt 3.2.0 only]
- fix loading of symbol fonts on solaris
- fix the math panel symbols [Qt 3.2.0 only]
- do not reset natbib style when adding a new entry to a citation [Qt
  only]
- allow insertion of width strings like "2.5in" into tabular dialog
  [Qt only]
- fix some cases where the View>TeX information dialog would get
  confused because the same file gets listed several times
- remove annoying message on console when LyX tries to make TeX fonts
  available to the X server
- it was not possible to view the french versions of the Extended and
  Customization manual.
- the lib/configure script now works correctly with zsh [bug #977]
- add missing c_str.sed file in the distribution
- hopefully really fix problems with patch requiring aclocal-1.6
- fix compilation on HP-UX 11.x
- do not report failed inlining when compiling with gcc
- fix compilation with new development versions of xforms
- fix compilation with AikSaurus 1.0

4 files changed, 40 insertions, 15 deletions

diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index e97bc55a042..378f76f9984 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/08/05 13:37:17 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/26 20:04:37 recht Exp $
 #
 
 .include "./Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-qt-/}
-PKGREVISION=	2
 
 COMMENT+=	(QT version)
 
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 00cf1906d7f..8fd0b7808af 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2003/07/17 21:34:37 grant Exp $
+# $NetBSD: Makefile.common,v 1.7 2003/09/26 20:04:37 recht Exp $
 #
 
-DISTNAME=		lyx-1.3.2
+DISTNAME=		lyx-1.3.3
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/ \
 			ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \
@@ -12,7 +12,6 @@ HOMEPAGE=		http://www.lyx.org/
 COMMENT=		Graphical frontend for LaTeX
 
 CONFLICTS=		lyx-[0-9]*
-DEPENDS=		ispell-base-[0-9]*:../../textproc/ispell-base
 DEPENDS+=		teTeX2>=2.0.1:../../print/teTeX2
 
 DESCR_SRC=		${.CURDIR}/../../editors/lyx-qt/DESCR
@@ -29,19 +28,42 @@ USE_LIBTOOL=		YES
 USE_PERL5=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
+GCC_REQD=		2.95
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--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
+
+# XXX these values are taken from the LyX configure script
+.if defined(CC_VERSION)
+.  if !empty(CC_VERSION:Mgcc-2.95.1)
+CXXFLAGS+= -fpermissive -ftemplate-depth-30
+.  elif !empty(CC_VERSION:Mgcc-2.95.*)
+CXXFLAGS+= -Wno-non-template-friend -ftemplate-depth-30
+.  elif !empty(CC_VERSION:Mgcc-2.96*) # some Linux distros
+CXXFLAGS+= -fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend
+.  elif !empty(CC_VERSION:Mgcc-3.0*)
+# no op
+.  elif !empty(CC_VERSION:Mgcc-3.1*)
+CXXFLAGS+= -finline-limit=500 -fno-exceptions
+.  else # >= 3.2
+CXXFLAGS+= -fno-exceptions
+.  endif
+.endif
+
+# XXX needed for gcc 2.95.* only?
+.if ${OPSYS} == "NetBSD"
+.  if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc" \
+      || ${MACHINE_ARCH} == "m68k")
+CXXFLAGS:=      ${CXXFLAGS:C/-O[0-9]*/-O/g}
+CFLAGS:=        ${CFLAGS:C/-O[0-9]*/-O/g}
+CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
+.  endif
 .endif
 
 PYTHON_PATCH_SCRIPTS=	lib/lyx2lyx/lyx2lyx \
diff --git a/editors/lyx-qt/PLIST.common b/editors/lyx-qt/PLIST.common
index 5d60e0606eb..f4a63542242 100644
--- a/editors/lyx-qt/PLIST.common
+++ b/editors/lyx-qt/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2003/05/09 08:02:30 martti Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2003/09/26 20:04:37 recht Exp $
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
@@ -29,6 +29,7 @@ ${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/aqua.bind
 share/lyx/bind/broadway.bind
 share/lyx/bind/cua.bind
 share/lyx/bind/cyrkeys.bind
@@ -158,10 +159,10 @@ share/lyx/examples/fr_ExemplesTableaux.lyx
 share/lyx/examples/fr_Foils.lyx
 share/lyx/examples/fr_ListesPuces.lyx
 share/lyx/examples/fr_Minipage.lyx
-share/lyx/examples/fr_MultiColonnes.lyx
 share/lyx/examples/fr_exemple_brut.lyx
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_mathed.lyx
+share/lyx/examples/fr_multicol.lyx
 share/lyx/examples/fr_splash.lyx
 share/lyx/examples/he_example_raw.lyx
 share/lyx/examples/he_he_example_lyxified.lyx
@@ -807,6 +808,7 @@ share/lyx/layouts/llncs.layout
 share/lyx/layouts/ltugboat.layout
 share/lyx/layouts/lyxmacros.inc
 share/lyx/layouts/manpage.layout
+share/lyx/layouts/memoir.layout
 share/lyx/layouts/mwart.layout
 share/lyx/layouts/mwbk.layout
 share/lyx/layouts/mwrep.layout
@@ -892,6 +894,7 @@ share/lyx/templates/elsart.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/koma-letter2.lyx
 share/lyx/templates/latex8.lyx
@@ -908,6 +911,7 @@ share/lyx/tex/lyxskak.sty
 share/lyx/tex/revtex.cls
 share/lyx/textclass.lst
 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
diff --git a/editors/lyx-qt/distinfo b/editors/lyx-qt/distinfo
index 878097e2f1d..48d4feaef57 100644
--- a/editors/lyx-qt/distinfo
+++ b/editors/lyx-qt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/05/09 08:02:31 martti Exp $
+$NetBSD: distinfo,v 1.3 2003/09/26 20:04:37 recht Exp $
 
-SHA1 (lyx-1.3.2.tar.gz) = 917cd132317e3510c1b9f965cf88ee3c8acf2179
-Size (lyx-1.3.2.tar.gz) = 7528733 bytes
+SHA1 (lyx-1.3.3.tar.gz) = c75abbd33a9706822e4252ab1c3b555e8f02b423
+Size (lyx-1.3.3.tar.gz) = 7622308 bytes
 SHA1 (patch-aa) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da