diff options
| -rw-r--r-- | editors/lyx-qt/Makefile | 3 | ||||
| -rw-r--r-- | editors/lyx-qt/Makefile.common | 38 | ||||
| -rw-r--r-- | editors/lyx-qt/PLIST.common | 8 | ||||
| -rw-r--r-- | editors/lyx-qt/distinfo | 6 |
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 |