Update lyx to lyx-1.3.7.

Verified that this works without qt3-tools so remove that comment
and BUILDLINK_DEPMETHOD for that. (Now defaults to build only.)

Add another download mirror.

Use bzipped tar file.

Update PLIST to add "hu" locale file, compiled python code,
and other updates. And use PKG_LOCALTEXMFPREFIX instead of PKG_TEXMFPREFIX
for the dirrm.

Removed three patches related to DragonFly and other patch for a bug
fix as all are now fixed in official release.

Updated patch-ab. The official release removed the unlock() so
still coredumps on NetBSD without this patch.

And regenerated two other patches as lines didn't line up anymore.

And remove PKGREVISION from Makefiles. (Note I did not test "xforms"
version.)

Changes include:

** Updates

- Update lyx2lyx to handle properly the latest LyX 1.4 format (245).

- New hungarian translation. Update Spanish translation.

- Update German documentation.

** Bug fixes

* Document input/output:

- Don't load the wasysym package automatically anymore (bug 1942)

- Fix crash with S-Home while entering a macro name (bug 2046)

- Do not delete selection when entering an index entry.

- Fix LaTeX output when a bibtex inset is used in a child document.

- Support tex4ht for Tex -> MS Word conversion

- Support the previewers kdvi, kpdf, and kghostview

* User Interface:

- Fix wrong path when drag-and-dropping files on Windows. [Qt only]

- Fix interaction of LyX with external clipboard (e.g. Klipper) (bug 1976).

- Ensure that no dialogs have one shortcut assigned to more than one action.
  Always connect the OK button to the Alt-O shortcut. [Qt only]

- Ensure that the user cannot create a reference without first selecting
  one in the reference dialog. [Qt only].

- The Return key is no longer bound to the Goto button in the reference
  dialog. [Qt only].

- Double clicking in the reference dialog now inserts a reference
  (bug 2187) [Qt only].

- Searching backwards in the citation dialog always skipped one result
  (bug 2002). Fixed now.

- Do not trim spaces from either end of the find and replace strings in
  the Edit->Find & Replace... dialog. [XForms only].

- Fix crash when trying to display current directory and ${HOME} is empty.

- Don't force alignment to BLOCK when switching to fixed width cell (bug
1840).

- Add key bindings for "primary-selection-paste".

- Fix some math key sequences for sciword.bind.

- On exit, don't attempt to unlock a mutex in the Qt library --- it
  causes undefined behaviour and leads to a crash on NetBSD.

- Enable Instant Preview to work if the path to the external GhostScript
  executable contains spaces. (bug 2193).

- The error/warning/confirmation dialogs aren't hidden behind the main
  window anymore [Qt only] (bug 1977).

* Configuration/Installation:

- Enable TeXFiles.sh to run when its path contains spaces.

- Compile without STL compatibility support, since some systems do that
  by default (Slackware, for ex.). [Qt only]

- Fix compilation with gcc 2.95 under OSX 10.4. This is useful because
  LyX crashes on startup when compiled with gcc3.

- Fix compilation with Solaris/x86 (bug 992).

- Enable compilation of LyX on DragonFly BSD.

- Add missing cygwin support file in the distribution (bug 2035).

- Enable Windows boxes to recognize the hard-coded paths needed to run
  LyX from the build tree.

12 files changed, 76 insertions, 121 deletions

diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index d48ac11f6b8..88cbb279c41 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2006/01/05 10:08:58 ghen Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/18 21:00:45 reed Exp $
 #
 
 .include "./Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-qt-/}
-PKGREVISION=	2
 
 COMMENT+=	(QT version)
 
@@ -17,8 +16,4 @@ CONFIGURE_ARGS+= 	--with-extra-prefix=${BUILDLINK_PREFIX.qt3-libs} \
 			--with-frontend=qt
 
 .include "../../x11/qt3-tools/buildlink3.mk"
-# XXX Please verify whether qt3-tools is really needed at run-time.
-# If it is, then remove this comment.  If it is not, then remove
-# this comment and the line below, and bump PKGREVISION.
-BUILDLINK_DEPMETHOD.qt3-tools=	full
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 6b16ee090bc..9764ed48e8e 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile.common,v 1.33 2005/12/28 04:25:46 reed Exp $
+# $NetBSD: Makefile.common,v 1.34 2006/01/18 21:00:45 reed Exp $
 #
 
-DISTNAME=		lyx-1.3.6
+DISTNAME=		lyx-1.3.7
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/ \
+			ftp://ftp.devel.lyx.org/pub/lyx/ \
 			ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \
 			ftp://ftp.sdsc.edu/pub/other/lyx/stable/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		reed@reedmedia.net
 HOMEPAGE=		http://www.lyx.org/
diff --git a/editors/lyx-qt/PLIST.common b/editors/lyx-qt/PLIST.common
index 554b277f49a..84c2412ff77 100644
--- a/editors/lyx-qt/PLIST.common
+++ b/editors/lyx-qt/PLIST.common
@@ -1,13 +1,16 @@
-@comment $NetBSD: PLIST.common,v 1.8 2005/12/28 02:04:00 reed Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2006/01/18 21:00:45 reed Exp $
 bin/lyx
 bin/noweb2lyx
 bin/reLyX
+man/man1/lyx.1
+man/man1/reLyX.1
 ${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/hu/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/lyx.mo
@@ -18,8 +21,6 @@ ${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
-man/man1/lyx.1
-man/man1/reLyX.1
 share/lyx/CREDITS
 share/lyx/bind/aqua.bind
 share/lyx/bind/broadway.bind
@@ -137,6 +138,7 @@ share/lyx/examples/chessgame.lyx
 share/lyx/examples/currency.lyx
 share/lyx/examples/cv.lyx
 share/lyx/examples/da_splash.lyx
+share/lyx/examples/de_Minipage.lyx
 share/lyx/examples/de_beispiel_gelyxt.lyx
 share/lyx/examples/de_beispiel_roh.lyx
 share/lyx/examples/de_splash.lyx
@@ -846,18 +848,36 @@ share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
 share/lyx/layouts/svprobth.layout
 share/lyx/lyx2lyx/LyX.py
+share/lyx/lyx2lyx/LyX.pyc
+share/lyx/lyx2lyx/error.pyc
 share/lyx/lyx2lyx/lyx2lyx
 share/lyx/lyx2lyx/lyx_0_12.py
+share/lyx/lyx2lyx/lyx_0_12.pyc
 share/lyx/lyx2lyx/lyx_1_0_0.py
+share/lyx/lyx2lyx/lyx_1_0_0.pyc
 share/lyx/lyx2lyx/lyx_1_0_1.py
+share/lyx/lyx2lyx/lyx_1_0_1.pyc
 share/lyx/lyx2lyx/lyx_1_1_4.py
+share/lyx/lyx2lyx/lyx_1_1_4.pyc
 share/lyx/lyx2lyx/lyx_1_1_5.py
+share/lyx/lyx2lyx/lyx_1_1_5.pyc
 share/lyx/lyx2lyx/lyx_1_1_6.py
+share/lyx/lyx2lyx/lyx_1_1_6.pyc
 share/lyx/lyx2lyx/lyx_1_1_6fix3.py
+share/lyx/lyx2lyx/lyx_1_1_6fix3.pyc
 share/lyx/lyx2lyx/lyx_1_2.py
+share/lyx/lyx2lyx/lyx_1_2.pyc
 share/lyx/lyx2lyx/lyx_1_3.py
+share/lyx/lyx2lyx/lyx_1_3.pyc
 share/lyx/lyx2lyx/lyx_1_4.py
+share/lyx/lyx2lyx/lyx_1_4.pyc
+share/lyx/lyx2lyx/lyxconvert_215.pyc
+share/lyx/lyx2lyx/lyxconvert_216.pyc
+share/lyx/lyx2lyx/lyxconvert_217.pyc
+share/lyx/lyx2lyx/lyxconvert_218.pyc
+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
@@ -925,7 +945,7 @@ ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/hollywood.cls
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/lyxchess.sty
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/lyxskak.sty
 ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx/revtex.cls
-@dirrm ${PKG_TEXMFPREFIX}/tex/latex/lyx
+@dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/lyx
 @dirrm share/lyx/xfonts
 @dirrm share/lyx/ui
 @dirrm share/lyx/templates
diff --git a/editors/lyx-qt/distinfo b/editors/lyx-qt/distinfo
index dabddbbccb1..9000da2a987 100644
--- a/editors/lyx-qt/distinfo
+++ b/editors/lyx-qt/distinfo
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.12 2005/11/18 16:47:35 reed Exp $
+$NetBSD: distinfo,v 1.13 2006/01/18 21:00:45 reed Exp $
 
-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 (lyx-1.3.7.tar.bz2) = 7f2620ed179f669ee3ee875170d1ea8193ee55fd
+RMD160 (lyx-1.3.7.tar.bz2) = a91d94a71a8c057941b6047f4dec92f3480a94f3
+Size (lyx-1.3.7.tar.bz2) = 5893780 bytes
 SHA1 (patch-aa) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da
-SHA1 (patch-ab) = e46def6f52b4c1c3c5197795454867c6bc2dbed6
-SHA1 (patch-ac) = 12a986d76f16bb2a12a723337cc37d3cd268a68b
-SHA1 (patch-ad) = c8d30b0929d38f1723f92b64af2f81f8cb97a6f4
-SHA1 (patch-ae) = fa71cf0fdc5a98a13285858b54f890cef1078a81
-SHA1 (patch-af) = 033fbf114994b4c9dcbf91c50f5972ba8260d1a8
+SHA1 (patch-ab) = 177dbc39700f27ef81ff08e97c34ed781c9cb1d2
+SHA1 (patch-af) = 6b259210b1cf0c5a4fbbfb47432a7dd6e499bb8b
 SHA1 (patch-ah) = 278f5deaf94c1082b755af3cb9511bc2f68231ba
 SHA1 (patch-ai) = ddd905f335293fa510745c5fe4f8011a5b3a1d9e
-SHA1 (patch-aj) = bfbd7b6f0a512a5034009c221b4851309ca6fb56
-SHA1 (patch-ak) = ef43f9741dc77c9e794e88d8f8e72d58f80f39d3
+SHA1 (patch-aj) = 9df1c4cf92281c332efef921b24089ad2d86454c
diff --git a/editors/lyx-qt/patches/patch-ab b/editors/lyx-qt/patches/patch-ab
index b2fc54516e0..4b2cd8f236d 100644
--- a/editors/lyx-qt/patches/patch-ab
+++ b/editors/lyx-qt/patches/patch-ab
@@ -1,17 +1,29 @@
-$NetBSD: patch-ab,v 1.5 2005/11/16 18:06:12 reed Exp $
+$NetBSD: patch-ab,v 1.6 2006/01/18 21:00:45 reed Exp $
 
---- src/frontends/qt2/lyx_gui.C.orig	2005-10-12 16:16:12.000000000 -0700
-+++ src/frontends/qt2/lyx_gui.C	2005-10-12 16:19:15.000000000 -0700
-@@ -123,7 +123,12 @@
+--- src/frontends/qt2/lyx_gui.C.orig	2006-01-18 12:25:08.000000000 -0800
++++ src/frontends/qt2/lyx_gui.C	2006-01-18 12:33:05.000000000 -0800
+@@ -122,8 +122,22 @@
+ 
+ 
  LQApplication::~LQApplication()
- {
- #ifdef QT_THREAD_SUPPORT
-+/* For some reason it doesn't indicate it is locked on NetBSD
-+   resulting in a Error detected by libpthread: Destroying locked mutex.
-+*/
-+#if !defined(__NetBSD__)
- 	if (locked())
+-{}
+-
++{
++/* 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
- 		unlock();
- #endif
- }
++}
+ 
+ #ifdef Q_OS_MAC
+ 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 d512ead5c76..00000000000
--- a/editors/lyx-qt/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/11/18 06:23:09 reed Exp $
-
---- boost/boost/integer_traits.hpp.orig	2005-08-23 23:30:03.000000000 -0700
-+++ boost/boost/integer_traits.hpp	2005-08-23 22:27:02.000000000 -0700
-@@ -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(__OpenBSD__) && defined(__GNUC__)) || (defined(__NetBSD__) && 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(__DragonFly__) && defined(__GNUC__)) || (defined(__OpenBSD__) && defined(__GNUC__)) || (defined(__NetBSD__) && defined(__GNUC__)) || (defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 3) && !defined(__SGI_STL_PORT))
-     // 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
diff --git a/editors/lyx-qt/patches/patch-ad b/editors/lyx-qt/patches/patch-ad
deleted file mode 100644
index 6d1a5b82037..00000000000
--- a/editors/lyx-qt/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/11/18 06:23:09 reed Exp $
-
---- boost/boost/config/select_platform_config.hpp.orig	2005-08-23 23:29:40.000000000 -0700
-+++ boost/boost/config/select_platform_config.hpp	2005-08-23 22:29:53.000000000 -0700
-@@ -16,7 +16,7 @@
- // linux:
- #  define BOOST_PLATFORM_CONFIG "boost/config/platform/linux.hpp"
- 
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- // BSD:
- #  define BOOST_PLATFORM_CONFIG "boost/config/platform/bsd.hpp"
- 
diff --git a/editors/lyx-qt/patches/patch-ae b/editors/lyx-qt/patches/patch-ae
deleted file mode 100644
index 716c97a95df..00000000000
--- a/editors/lyx-qt/patches/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2005/11/18 06:23:09 reed Exp $
-
---- boost/boost/config/platform/bsd.hpp.orig	2005-08-23 22:25:05.000000000 -0700
-+++ boost/boost/config/platform/bsd.hpp	2005-08-23 22:29:21.000000000 -0700
-@@ -7,7 +7,7 @@
- 
- //  generic BSD config options:
- 
--#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
- #error "This platform is not BSD"
- #endif
- 
-@@ -17,6 +17,8 @@
- #define BOOST_PLATFORM "NetBSD " BOOST_STRINGIZE(__NetBSD__)
- #elif defined(__OpenBSD__)
- #define BOOST_PLATFORM "OpenBSD " BOOST_STRINGIZE(__OpenBSD__)
-+#elif defined(__DragonFly__)
-+#define BOOST_PLATFORM "DragonFly " BOOST_STRINGIZE(__DragonFly__)
- #endif
- 
- //
-@@ -24,7 +26,7 @@
- // FreeBSD has <nl_types.h> but does not
- // advertise the fact in <unistd.h>:
- //
--#if defined(__FreeBSD__) && (__FreeBSD__ >= 3)
-+#if (defined(__FreeBSD__) && (__FreeBSD__ >= 3)) || defined(__DragonFly__)
- #  define BOOST_HAS_NL_TYPES_H
- #endif
diff --git a/editors/lyx-qt/patches/patch-af b/editors/lyx-qt/patches/patch-af
index 777d308325c..04f1b40155c 100644
--- a/editors/lyx-qt/patches/patch-af
+++ b/editors/lyx-qt/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.3 2005/11/18 16:47:35 reed Exp $
+$NetBSD: patch-af,v 1.4 2006/01/18 21:00:45 reed Exp $
 
---- lib/Makefile.in.orig	2005-11-17 12:27:24.000000000 -0800
-+++ lib/Makefile.in	2005-11-17 12:27:58.000000000 -0800
-@@ -211,7 +211,7 @@
+--- lib/Makefile.in.orig	2006-01-16 06:51:40.000000000 -0800
++++ lib/Makefile.in	2006-01-17 10:46:05.000000000 -0800
+@@ -244,7 +244,7 @@
+ TEXSUPPORT = tex/*.cls tex/*.sty
  UI = ui/*.ui
- 
  LIBINSTFILES = $(BIND) $(CLIPART) $(DOCINST) $(EXAMPLES) $(HELP) $(IMAGES) \
 -	$(KBD) $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(UI)
 +	$(KBD) $(LAYOUT) $(TEMPL) $(UI)
  
- 
  LIBDISTFILES = $(BIND) $(CLIPART) $(DOCDIST) $(EXAMPLES) $(HELP) $(IMAGES) \
+ 	$(KBD) $(LAYOUT) $(TEMPL) $(UI) $(TEXSUPPORT) $(LYXSCRIPTS)
diff --git a/editors/lyx-qt/patches/patch-aj b/editors/lyx-qt/patches/patch-aj
index 6d8eb4d805b..29f507deaea 100644
--- a/editors/lyx-qt/patches/patch-aj
+++ b/editors/lyx-qt/patches/patch-aj
@@ -1,16 +1,16 @@
-$NetBSD: patch-aj,v 1.1 2005/07/19 17:49:33 drochner Exp $
+$NetBSD: patch-aj,v 1.2 2006/01/18 21:00:45 reed 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 \
+--- src/support/Makefile.in.orig	2006-01-16 06:51:45.000000000 -0800
++++ src/support/Makefile.in	2006-01-17 10:47:16.000000000 -0800
+@@ -626,12 +626,11 @@
  	$(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)\" \
+ 		-DLYX_DIR=\"$(LYX_ABS_INSTALLED_DATADIR)\" \
+ 		-DTOP_SRCDIR=\"$(LYX_ABS_TOP_SRCDIR)\" \
+ 		-DLOCALEDIR=\"$(LYX_ABS_INSTALLED_LOCALEDIR)\" \
 -		-c $(top_srcdir)/src/support/package.C && \
 -	echo "timestamp" > $@
 +		-c $(top_srcdir)/src/support/package.C
diff --git a/editors/lyx-qt/patches/patch-ak b/editors/lyx-qt/patches/patch-ak
deleted file mode 100644
index a506d890cf2..00000000000
--- a/editors/lyx-qt/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$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 ea7b668363f..fb5d8b4f055 100644
--- a/editors/lyx-xforms/Makefile
+++ b/editors/lyx-xforms/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/18 21:00:45 reed Exp $
 #
 
 .include "../../editors/lyx-qt/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-xforms-/}
-PKGREVISION=	1
 
 COMMENT+=	(xforms version)