diff options
| -rw-r--r-- | editors/lyx-qt/MESSAGE | 6 | ||||
| -rw-r--r-- | editors/lyx-qt/Makefile | 3 | ||||
| -rw-r--r-- | editors/lyx-qt/Makefile.common | 10 | ||||
| -rw-r--r-- | editors/lyx-qt/PLIST.common | 15 | ||||
| -rw-r--r-- | editors/lyx-qt/distinfo | 10 | ||||
| -rw-r--r-- | editors/lyx-qt/patches/patch-ab | 29 | ||||
| -rw-r--r-- | editors/lyx-qt/patches/patch-ac | 15 | ||||
| -rw-r--r-- | editors/lyx-xforms/Makefile | 3 |
8 files changed, 23 insertions, 68 deletions
diff --git a/editors/lyx-qt/MESSAGE b/editors/lyx-qt/MESSAGE index c3460b14962..10647ecd25c 100644 --- a/editors/lyx-qt/MESSAGE +++ b/editors/lyx-qt/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2004/08/26 18:04:10 reed Exp $ +$NetBSD: MESSAGE,v 1.2 2006/07/23 00:28:12 reed Exp $ After upgrading LyX or adding new converters, document previewers, TeX fonts, or other features, LyX users should consider running -the LyX Edit -> Reconfigure option so it can properly recognize -any changed capabilities. Then you can use the Edit -> Preferences +the LyX Tools -> Reconfigure option so it can properly recognize +any changed capabilities. Then you can use the Tools -> Preferences options to further configure these features. Examples of packages that can be used to extend LyX include: diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile index 71f2a09d11b..dff63444668 100644 --- a/editors/lyx-qt/Makefile +++ b/editors/lyx-qt/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2006/05/06 20:18:36 reed Exp $ +# $NetBSD: Makefile,v 1.32 2006/07/23 00:28:12 reed Exp $ # .include "./Makefile.common" PKGNAME= ${DISTNAME:S/lyx-/lyx-qt-/} -PKGREVISION= 1 COMMENT+= (QT version) diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common index 31f15537cd2..a65c8cb3f7f 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.39 2006/06/19 22:38:38 joerg Exp $ +# $NetBSD: Makefile.common,v 1.40 2006/07/23 00:28:12 reed Exp $ # -DISTNAME= lyx-1.4.1 +DISTNAME= lyx-1.4.2 CATEGORIES= editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \ ftp://ftp.devel.lyx.org/pub/lyx/ \ @@ -11,7 +11,6 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \ ftp://ftp.lip6.fr/pub/lyx/stable/ \ ftp://ftp.ntua.gr/pub/X11/LyX/stable/ EXTRACT_SUFX= .tar.bz2 -EXTRACT_USING= gtar MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.lyx.org/ @@ -74,7 +73,10 @@ CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q} . endif .endif -PYTHON_PATCH_SCRIPTS= lib/lyx2lyx/lyx2lyx \ +PYTHON_PATCH_SCRIPTS= lib/configure.py \ + lib/scripts/TeXFiles.py \ + lib/scripts/clean_dvi.py \ + lib/lyx2lyx/lyx2lyx \ lib/lyx2lyx/profiling.py \ lib/scripts/fen2ascii.py \ lib/scripts/layout2layout.py \ diff --git a/editors/lyx-qt/PLIST.common b/editors/lyx-qt/PLIST.common index d7a30fd751a..804a523b02c 100644 --- a/editors/lyx-qt/PLIST.common +++ b/editors/lyx-qt/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.13 2006/05/06 20:18:36 reed Exp $ +@comment $NetBSD: PLIST.common,v 1.14 2006/07/23 00:28:12 reed Exp $ bin/lyx bin/lyxclient bin/tex2lyx @@ -42,13 +42,12 @@ share/lyx/bind/sv_menus.bind share/lyx/bind/xemacs.bind share/lyx/chkconfig.ltx share/lyx/clipart/platypus.eps -share/lyx/configure +share/lyx/configure.py share/lyx/doc/Customization.lyx share/lyx/doc/DocStyle.lyx share/lyx/doc/Extended.lyx share/lyx/doc/FAQ.lyx share/lyx/doc/Intro.lyx -share/lyx/doc/LaTeXConfig.lyx share/lyx/doc/LaTeXConfig.lyx.in share/lyx/doc/Reference.lyx share/lyx/doc/TOC.lyx @@ -560,6 +559,7 @@ 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/overset.xpm share/lyx/images/math/parallel.xpm share/lyx/images/math/partial.xpm share/lyx/images/math/perp.xpm @@ -675,6 +675,7 @@ 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/underset.xpm share/lyx/images/math/uparrow.xpm share/lyx/images/math/uparrow2.xpm share/lyx/images/math/updownarrow.xpm @@ -862,6 +863,7 @@ share/lyx/layouts/g-brief2.layout share/lyx/layouts/heb-article.layout share/lyx/layouts/heb-letter.layout share/lyx/layouts/hollywood.layout +share/lyx/layouts/ijmpc.layout share/lyx/layouts/ijmpd.layout share/lyx/layouts/jgrga.layout share/lyx/layouts/kluwer.layout @@ -951,10 +953,9 @@ 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/scripts/TeXFiles.sh +share/lyx/scripts/TeXFiles.py +share/lyx/scripts/clean_dvi.py share/lyx/scripts/convertDefault.sh share/lyx/scripts/fen2ascii.py share/lyx/scripts/fig2pdftex.sh @@ -979,6 +980,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/ijmpc.lyx share/lyx/templates/ijmpd.lyx share/lyx/templates/kluwer.lyx share/lyx/templates/koma-letter2.lyx @@ -988,7 +990,6 @@ share/lyx/templates/linuxdoc_article.lyx 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/ui/stdmenus.ui diff --git a/editors/lyx-qt/distinfo b/editors/lyx-qt/distinfo index ed45b8a5094..20402682237 100644 --- a/editors/lyx-qt/distinfo +++ b/editors/lyx-qt/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.15 2006/04/18 23:21:18 reed Exp $ +$NetBSD: distinfo,v 1.16 2006/07/23 00:28:12 reed Exp $ -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 (lyx-1.4.2.tar.bz2) = df79126dd2cad60c15640c0218654ec22b404c77 +RMD160 (lyx-1.4.2.tar.bz2) = af1dac6f6601ba3aae16543db4310afb990101b9 +Size (lyx-1.4.2.tar.bz2) = 6874598 bytes SHA1 (patch-aa) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da -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 deleted file mode 100644 index cc5d8a1b1d8..00000000000 --- a/editors/lyx-qt/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2006/04/18 23:21:18 reed Exp $ - ---- 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() --{} -- -+{ -+/* revision 1.30.2.11 says: -+ * "Don't unlock QApplication's mutex as it leads to undefined behaviour -+ * (and crashes NetBSD)". -+ * -+ * Really the problem was that checking for locked() on NetBSD -+ * for some unknown reason did not work. It did not crash, but just -+ * core dumped when exiting due to "Destroying locked mutex". -+ * -+ * The "lyx: Error detected by libpthread: Destroying locked mutex." -+ * problem still continues on NetBSD, so re-adding the following: -+ */ -+#if defined(__NetBSD__) && defined(QT_THREAD_SUPPORT) -+ unlock(); -+#endif -+} - - #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 deleted file mode 100644 index 595b502306e..00000000000 --- a/editors/lyx-qt/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$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-xforms/Makefile b/editors/lyx-xforms/Makefile index 2017f8e4eb1..f4bc9e16a75 100644 --- a/editors/lyx-xforms/Makefile +++ b/editors/lyx-xforms/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2006/05/06 20:18:36 reed Exp $ +# $NetBSD: Makefile,v 1.23 2006/07/23 00:28:13 reed Exp $ # .include "../../editors/lyx-qt/Makefile.common" PKGNAME= ${DISTNAME:S/lyx-/lyx-xforms-/} -PKGREVISION= 1 COMMENT+= (xforms version) |