diff options
-rw-r--r-- | editors/lyx-qt/Makefile | 3 | ||||
-rw-r--r-- | editors/lyx-qt/Makefile.common | 4 | ||||
-rw-r--r-- | editors/lyx-qt/PLIST.common | 30 | ||||
-rw-r--r-- | editors/lyx-qt/distinfo | 11 | ||||
-rw-r--r-- | editors/lyx-qt/patches/patch-af | 13 | ||||
-rw-r--r-- | editors/lyx-qt/patches/patch-aj | 19 | ||||
-rw-r--r-- | editors/lyx-qt/patches/patch-ak | 13 | ||||
-rw-r--r-- | editors/lyx-xforms/Makefile | 3 |
8 files changed, 56 insertions, 40 deletions
diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile index 2083fd1b67c..84a6e16cb20 100644 --- a/editors/lyx-qt/Makefile +++ b/editors/lyx-qt/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2004/12/29 09:19:58 recht Exp $ +# $NetBSD: Makefile,v 1.19 2005/07/19 17:49:33 drochner 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 7a32b528b0c..2766eef63c9 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.25 2005/07/16 01:19:09 jlam Exp $ +# $NetBSD: Makefile.common,v 1.26 2005/07/19 17:49:33 drochner Exp $ # -DISTNAME= lyx-1.3.5 +DISTNAME= lyx-1.3.6 CATEGORIES= editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \ ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \ diff --git a/editors/lyx-qt/PLIST.common b/editors/lyx-qt/PLIST.common index 25396a92e9c..657b37dc20d 100644 --- a/editors/lyx-qt/PLIST.common +++ b/editors/lyx-qt/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.5 2004/12/21 07:00:52 martti Exp $ +@comment $NetBSD: PLIST.common,v 1.6 2005/07/19 17:49:33 drochner Exp $ ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/lyx.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/lyx.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/lyx.mo @@ -14,6 +14,7 @@ ${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/tr/LC_MESSAGES/lyx.mo bin/lyx bin/noweb2lyx bin/reLyX @@ -40,7 +41,6 @@ share/lyx/bind/xemacs.bind share/lyx/chkconfig.ltx share/lyx/clipart/platypus.eps share/lyx/configure -share/lyx/configure.cmd share/lyx/doc/Customization.lyx share/lyx/doc/DocStyle.lyx share/lyx/doc/Extended.lyx @@ -845,22 +845,20 @@ share/lyx/layouts/svglobal.layout share/lyx/layouts/svjog.layout share/lyx/layouts/svjour.inc share/lyx/layouts/svprobth.layout -share/lyx/lyx2lyx/error.py -share/lyx/lyx2lyx/error.pyc +share/lyx/lyx2lyx/LyX.py +share/lyx/lyx2lyx/lyx_0_12.py +share/lyx/lyx2lyx/lyx_1_0_0.py +share/lyx/lyx2lyx/lyx_1_0_1.py +share/lyx/lyx2lyx/lyx_1_1_4.py +share/lyx/lyx2lyx/lyx_1_1_5.py +share/lyx/lyx2lyx/lyx_1_1_6.py +share/lyx/lyx2lyx/lyx_1_1_6fix3.py +share/lyx/lyx2lyx/lyx_1_2.py +share/lyx/lyx2lyx/lyx_1_3.py +share/lyx/lyx2lyx/lyx_1_4.py share/lyx/lyx2lyx/lyx2lyx -share/lyx/lyx2lyx/lyxconvert_210.py -share/lyx/lyx2lyx/lyxconvert_215.py -share/lyx/lyx2lyx/lyxconvert_215.pyc -share/lyx/lyx2lyx/lyxconvert_216.py -share/lyx/lyx2lyx/lyxconvert_216.pyc -share/lyx/lyx2lyx/lyxconvert_217.py -share/lyx/lyx2lyx/lyxconvert_217.pyc -share/lyx/lyx2lyx/lyxconvert_218.py -share/lyx/lyx2lyx/lyxconvert_218.pyc -share/lyx/lyx2lyx/lyxconvert_220.py -share/lyx/lyx2lyx/lyxconvert_220.pyc share/lyx/lyx2lyx/parser_tools.py -share/lyx/lyx2lyx/parser_tools.pyc +share/lyx/lyx2lyx/profiling.py share/lyx/lyxrc.defaults share/lyx/lyxrc.example share/lyx/packages.lst diff --git a/editors/lyx-qt/distinfo b/editors/lyx-qt/distinfo index 08f04bb8a99..560b6cf212a 100644 --- a/editors/lyx-qt/distinfo +++ b/editors/lyx-qt/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.8 2005/02/23 17:15:11 agc Exp $ +$NetBSD: distinfo,v 1.9 2005/07/19 17:49:33 drochner Exp $ -SHA1 (lyx-1.3.5.tar.gz) = b654eff87339019702306c3aec8da8aa8058d386 -RMD160 (lyx-1.3.5.tar.gz) = 4c7edd95f802ba474acfc42dbd95e7fb5d0afa33 -Size (lyx-1.3.5.tar.gz) = 7412737 bytes +SHA1 (lyx-1.3.6.tar.gz) = 9a0045bf007e4ebc4ca024536e03b3d95acb5ace +RMD160 (lyx-1.3.6.tar.gz) = c05c106fdf4159fbde70747eced9b3685121ac5f +Size (lyx-1.3.6.tar.gz) = 7782849 bytes SHA1 (patch-aa) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da -SHA1 (patch-af) = dfd91bf21ccb7310e7ab8f62425e65efacba87a7 SHA1 (patch-ah) = 278f5deaf94c1082b755af3cb9511bc2f68231ba SHA1 (patch-ai) = ddd905f335293fa510745c5fe4f8011a5b3a1d9e +SHA1 (patch-aj) = bfbd7b6f0a512a5034009c221b4851309ca6fb56 +SHA1 (patch-ak) = ef43f9741dc77c9e794e88d8f8e72d58f80f39d3 diff --git a/editors/lyx-qt/patches/patch-af b/editors/lyx-qt/patches/patch-af deleted file mode 100644 index 35bf9aa909b..00000000000 --- a/editors/lyx-qt/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2004/05/29 11:19:59 shannonjr Exp $ - ---- ./boost/boost/format/feed_args.hpp.orig 2002-11-20 10:20:54.000000000 -0700 -+++ ./boost/boost/format/feed_args.hpp -@@ -34,7 +34,7 @@ namespace { - - template<class Tr, class Ch> inline - void empty_buf(BOOST_IO_STD basic_ostringstream<Ch,Tr> & os) { -- static const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and L"" ) -+ const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and L"" ) - os.str(emptyStr); - } - diff --git a/editors/lyx-qt/patches/patch-aj b/editors/lyx-qt/patches/patch-aj new file mode 100644 index 00000000000..6d8eb4d805b --- /dev/null +++ b/editors/lyx-qt/patches/patch-aj @@ -0,0 +1,19 @@ +$NetBSD: patch-aj,v 1.1 2005/07/19 17:49:33 drochner Exp $ + +--- src/support/Makefile.in.orig 2005-07-18 18:00:23.000000000 +0200 ++++ src/support/Makefile.in +@@ -651,12 +651,11 @@ package.lo: ../config.h \ + $(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=\"$(pkgdatadir)\" \ + -DTOP_SRCDIR=\"$(top_srcdir)\" \ + -DLOCALEDIR=\"$(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-qt/patches/patch-ak b/editors/lyx-qt/patches/patch-ak new file mode 100644 index 00000000000..a506d890cf2 --- /dev/null +++ b/editors/lyx-qt/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2005/07/19 17:49:33 drochner Exp $ + +--- src/frontends/qt2/QPrefs.C.orig 2005-07-18 19:00:12.000000000 +0200 ++++ src/frontends/qt2/QPrefs.C +@@ -347,7 +347,7 @@ void setComboxFont(QComboBox * cb, strin + string const & default_font_name = tmp.first; + + for (int i = cb->count() - 1; i >= 0; --i) { +- if (cb->text(i) == default_font_name) { ++ if (fromqstr(cb->text(i)) == default_font_name) { + cb->setCurrentItem(i); + return; + } diff --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile index 2fd342dae8c..6c8f17f001e 100644 --- a/editors/lyx-xforms/Makefile +++ b/editors/lyx-xforms/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2004/12/29 09:19:58 recht Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/19 17:49:33 drochner Exp $ # .include "../lyx-qt/Makefile.common" PKGNAME= ${DISTNAME:S/lyx-/lyx-xforms-/} -PKGREVISION= 3 COMMENT+= (xforms version) |