From flynn@christine.energyhq.tk  Mon Jan  6 05:26:54 2003
Return-Path: <flynn@christine.energyhq.tk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B028237B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Jan 2003 05:26:54 -0800 (PST)
Received: from christine.energyhq.tk (213-97-200-73.uc.nombres.ttd.es [213.97.200.73])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 24A7643ED4
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  6 Jan 2003 05:26:53 -0800 (PST)
	(envelope-from flynn@christine.energyhq.tk)
Received: from christine.energyhq.tk (localhost.energyhq.tk [127.0.0.1])
	by christine.energyhq.tk (8.12.6/8.12.6) with ESMTP id h06DQZ8U048860
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 6 Jan 2003 14:26:36 +0100 (CET)
	(envelope-from flynn@christine.energyhq.tk)
Received: (from flynn@localhost)
	by christine.energyhq.tk (8.12.6/8.12.6/Submit) id h06DQZ9O048859;
	Mon, 6 Jan 2003 14:26:35 +0100 (CET)
Message-Id: <200301061326.h06DQZ9O048859@christine.energyhq.tk>
Date: Mon, 6 Jan 2003 14:26:35 +0100 (CET)
From: Miguel Mendez <flynn@energyhq.homeip.net>
Reply-To: Miguel Mendez <flynn@energyhq.homeip.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: print/lyx to 1.2.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         46796
>Category:       ports
>Synopsis:       Update port: print/lyx to 1.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 06 05:30:00 PST 2003
>Closed-Date:    Sat Jan 25 13:38:47 PST 2003
>Last-Modified:  Sat Jan 25 13:38:47 PST 2003
>Originator:     Miguel Mendez
>Release:        FreeBSD 5.0-RC i386
>Organization:
>Environment:
System: FreeBSD christine.energyhq.tk 5.0-RC FreeBSD 5.0-RC #0: Tue Dec 31 14:56:19 CET 2002 root@christine.energyhq.tk:/usr/obj/usr/src/sys/CHRISTINE i386


	
>Description:

Since the port is currently without a maintainer, I could maintain this 
for a while, if no one else is willing to do it.

This new release fixes many bugs present in 1.2.[01], from the change log:

We are glad to announce the release of LyX 1.2.2.

LyX 1.2.2 is a maintenance release. It is a recommended upgrade from
1.2.0 or 1.2.1, especially since it fixes a few bugs introduced in
1.2.1.

** Updates

- LyX builds with the newly released xforms 1.0. Actually, it is
  advised to use this version of xforms, since it fixes many bugs and
  support for older versions will probably be dropped in LyX 1.3.0

- selecting a word by double clicking now sets the X clipboard (like
  when dragging the mouse)

- it is now possible to specify the arguments for viewers; in
  particular, this means that it is possible to use browsers which
  require a file: URL as HTML viewers (mozilla is used as default if
  found)

- when a new LyX version is launched, the Edit>Reconfigure tool is
  automatically invoked; this should avoid many problems with users
  who are not aware that it is needed

- when changing the current layout with the toolbar, the corresponding
  keyboard binding is shown in the minibuffer

- in hebrew language, the key " now inserts a typewriter quote (since
  other quotes do not make sense in hebrew)

- Insert>Lists & TOC>Bibtex Reference uses style 'plain' by default

- new class ijmpd; update cl2emult, llncs and foils textclasses

- update sciword bindings

- small cleanup of UserGuide and FAQ; update to German, French and
  Russian documentation; new Hebrew tutorial

- update french, german, russian, finnish and danish localization of
  the interface


** Bug fixes

- fix bug where special characters in equations label confuse LyX
  (this was a new bug in 1.2.1)

- fix bug with citation keys that contain spaces (this was a new bug
  in 1.2.1)

- remove special handling of EPSI files, because it caused more
  problems than it fixed (EPSI handling was new in 1.2.1)

- fix crash with undo

- fix lockup when changing the layout of several paragraphs at the
  same time (and the layout of the first paragraph is already correct)

- fix possible endless repainting when a tabular is larger than the
  workarea 

- fix bug with graphics files which name contain a '.'

- fix bug in the xforms image loader, where images would be cropped by
  a few pixels

- when a viewer has not been found (set to "none"), remove the
  corresponding View menu entry

- fix rendering of Arabic text

- fix bad latex output with language changes in nested environment

- fix bad latex output with math array environment included in an
  eqnarray environment

- fix bug where \limits statements (as obtained in math with M-m l)
  would not be read back from the lyx file

- do not output labels in latex when numbering is off

- harmonize the behavior of delete and backspace in main text,
  insettext, and tabulars, i.e. don't put stuff into the clipboard

- add bindings for M-< and M-> in emacs mode

- fix crash when using the koi8-u keyboard mapping

- fix handling of word-related cursor movement functions in math editor

- fix placement of cursor with mouse in presence of hfills

- the reference dialog now lists the labels of the current buffer

- fix the thesaurus dialog so that it can be closed with the Escape key

- fix problem where citation labels do not appear in 'natbib' style
  when the user expects them to do so.

- fix problems with wrong highlighted entry in citation dialog

- fix drawing problem when a line of text contains both left-to-right
  and right-to-left text

- ignore bogus matches of scalable fonts

- when loading a font fails, show the name of the said font

- make sure that pdf files use 1.3 format

- add detection of kdeprintfax for sending faxes

- add missing autoconf file xforms.m4

- fix compilation problem (missing <wchar.h>) on some BSD systems
  (including Mac OS X)

- fix link problems with gcc on and non-GNU linkers


>How-To-Repeat:
	
>Fix:

	

--- lyx.diff begins here ---
diff -ruN lyx.old/Makefile lyx/Makefile
--- lyx.old/Makefile	Sun Nov 10 17:47:43 2002
+++ lyx/Makefile	Mon Jan  6 13:08:22 2003
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lyx
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
@@ -30,7 +29,9 @@
 AUTOMAKE=	${WRKSRC}/autogen.sh
 AUTOCONF=	${TRUE}
 CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
-		--with-extra-inc="${LOCALBASE}/include"
+		--with-extra-inc="${LOCALBASE}/include" \
+		--program-transform-name=''
+
 MAN1=		lyx.1 reLyX.1
 
 .if defined(WITH_ASPELL)
diff -ruN lyx.old/distinfo lyx/distinfo
--- lyx.old/distinfo	Fri Sep 20 05:25:03 2002
+++ lyx/distinfo	Mon Jan  6 11:46:16 2003
@@ -1 +1 @@
-MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
+MD5 (lyx-1.2.2.tar.gz) = 62d3c0337e133b11da8170f55be0860d
diff -ruN lyx.old/files/patch-src::FontLoader.C lyx/files/patch-src::FontLoader.C
--- lyx.old/files/patch-src::FontLoader.C	Fri Sep 20 05:25:03 2002
+++ lyx/files/patch-src::FontLoader.C	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
---- src/FontLoader.C.orig	Fri Mar 22 02:25:07 2002
-+++ src/FontLoader.C	Fri Aug 23 03:38:09 2002
-@@ -300,7 +300,8 @@
- 		if (font == "fixed") {
- 			lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
- 		} else {
--			lyxerr << "Could not get font. Using 'fixed'." << endl;
-+			lyxerr << "Could not get font '" << font.c_str() <<
-+				"'. Using 'fixed'." << endl;
- 			fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
- 		}
- 	} else if (lyxerr.debugging(Debug::FONT)) {
diff -ruN lyx.old/pkg-plist lyx/pkg-plist
--- lyx.old/pkg-plist	Fri Sep 20 05:25:03 2002
+++ lyx/pkg-plist	Mon Jan  6 13:00:28 2003
@@ -83,6 +83,7 @@
 share/lyx/doc/fr_UserGuide.lyx
 share/lyx/doc/he_Intro.lyx
 share/lyx/doc/he_TOC.lyx
+share/lyx/doc/he_Tutorial.lyx
 share/lyx/doc/hu_Intro.lyx
 share/lyx/doc/hu_TOC.lyx
 share/lyx/doc/it_Customization.lyx
@@ -104,6 +105,7 @@
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
 share/lyx/doc/ro_splash.lyx
+share/lyx/doc/ru_FAQ.lyx
 share/lyx/doc/ru_Intro.lyx
 share/lyx/doc/ru_TOC.lyx
 share/lyx/doc/ru_Tutorial.lyx
@@ -155,6 +157,9 @@
 share/lyx/examples/fr_exemple_lyxifie.lyx
 share/lyx/examples/fr_mathed.lyx
 share/lyx/examples/fr_splash.lyx
+share/lyx/examples/he_example_raw.lyx
+share/lyx/examples/he_he_example_lyxified.lyx
+share/lyx/examples/he_he_example_raw.lyx
 share/lyx/examples/hu_splash.lyx
 share/lyx/examples/iecc05.fen
 share/lyx/examples/iecc07.fen
@@ -331,6 +336,7 @@
 share/lyx/layouts/heb-article.layout
 share/lyx/layouts/heb-letter.layout
 share/lyx/layouts/hollywood.layout
+share/lyx/layouts/ijmpd.layout
 share/lyx/layouts/kluwer.layout
 share/lyx/layouts/latex8.layout
 share/lyx/layouts/letter.layout
@@ -404,6 +410,7 @@
 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/latex8.lyx
 share/lyx/templates/letter.lyx
--- lyx.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Miguel Mendez <flynn@energyhq.homeip.net>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/46796: Update port: print/lyx to 1.2.2
Date: Thu, 9 Jan 2003 22:29:44 +0100

 --=.P:v,dDsx5Si/m2
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 On Mon, 6 Jan 2003 05:30:01 -0800 (PST)
 FreeBSD-gnats-submit@FreeBSD.org wrote:
 
 Seems 1.2.3 just came out :)
 
 -- 
         Miguel Mendez - flynn@energyhq.homeip.net
         GPG Public Key :: http://energyhq.homeip.net/files/pubkey.txt
         EnergyHQ :: http://www.energyhq.tk
         Of course it runs NetBSD!
 
 diff -ruN lyx.old/Makefile lyx/Makefile
 --- lyx.old/Makefile	Sun Nov 10 17:47:43 2002
 +++ lyx/Makefile	Thu Jan  9 21:31:07 2003
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	lyx
 -PORTVERSION=	1.2.1
 -PORTREVISION=	1
 +PORTVERSION=	1.2.3
  CATEGORIES=	print
  MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
  		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 @@ -30,7 +29,9 @@
  AUTOMAKE=	${WRKSRC}/autogen.sh
  AUTOCONF=	${TRUE}
  CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
 -		--with-extra-inc="${LOCALBASE}/include"
 +		--with-extra-inc="${LOCALBASE}/include" \
 +		--program-transform-name=''
 +
  MAN1=		lyx.1 reLyX.1
  
  .if defined(WITH_ASPELL)
 diff -ruN lyx.old/distinfo lyx/distinfo
 --- lyx.old/distinfo	Fri Sep 20 05:25:03 2002
 +++ lyx/distinfo	Thu Jan  9 21:37:14 2003
 @@ -1 +1 @@
 -MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
 +MD5 (lyx-1.2.3.tar.gz) = 3a423e65f647bd0a8f9401dd43e5d912
 diff -ruN lyx.old/files/patch-src::FontLoader.C lyx/files/patch-src::FontLoader.C
 --- lyx.old/files/patch-src::FontLoader.C	Fri Sep 20 05:25:03 2002
 +++ lyx/files/patch-src::FontLoader.C	Thu Jan  1 01:00:00 1970
 @@ -1,12 +0,0 @@
 ---- src/FontLoader.C.orig	Fri Mar 22 02:25:07 2002
 -+++ src/FontLoader.C	Fri Aug 23 03:38:09 2002
 -@@ -300,7 +300,8 @@
 - 		if (font == "fixed") {
 - 			lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
 - 		} else {
 --			lyxerr << "Could not get font. Using 'fixed'." << endl;
 -+			lyxerr << "Could not get font '" << font.c_str() <<
 -+				"'. Using 'fixed'." << endl;
 - 			fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
 - 		}
 - 	} else if (lyxerr.debugging(Debug::FONT)) {
 diff -ruN lyx.old/pkg-plist lyx/pkg-plist
 --- lyx.old/pkg-plist	Fri Sep 20 05:25:03 2002
 +++ lyx/pkg-plist	Thu Jan  9 21:30:29 2003
 @@ -83,6 +83,7 @@
  share/lyx/doc/fr_UserGuide.lyx
  share/lyx/doc/he_Intro.lyx
  share/lyx/doc/he_TOC.lyx
 +share/lyx/doc/he_Tutorial.lyx
  share/lyx/doc/hu_Intro.lyx
  share/lyx/doc/hu_TOC.lyx
  share/lyx/doc/it_Customization.lyx
 @@ -104,6 +105,7 @@
  share/lyx/doc/ro_Intro.lyx
  share/lyx/doc/ro_TOC.lyx
  share/lyx/doc/ro_splash.lyx
 +share/lyx/doc/ru_FAQ.lyx
  share/lyx/doc/ru_Intro.lyx
  share/lyx/doc/ru_TOC.lyx
  share/lyx/doc/ru_Tutorial.lyx
 @@ -155,6 +157,9 @@
  share/lyx/examples/fr_exemple_lyxifie.lyx
  share/lyx/examples/fr_mathed.lyx
  share/lyx/examples/fr_splash.lyx
 +share/lyx/examples/he_example_raw.lyx
 +share/lyx/examples/he_he_example_lyxified.lyx
 +share/lyx/examples/he_he_example_raw.lyx
  share/lyx/examples/hu_splash.lyx
  share/lyx/examples/iecc05.fen
  share/lyx/examples/iecc07.fen
 @@ -331,6 +336,7 @@
  share/lyx/layouts/heb-article.layout
  share/lyx/layouts/heb-letter.layout
  share/lyx/layouts/hollywood.layout
 +share/lyx/layouts/ijmpd.layout
  share/lyx/layouts/kluwer.layout
  share/lyx/layouts/latex8.layout
  share/lyx/layouts/letter.layout
 @@ -404,6 +410,7 @@
  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/latex8.lyx
  share/lyx/templates/letter.lyx
 
 --=.P:v,dDsx5Si/m2
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (FreeBSD)
 
 iD8DBQE+HenNnLctrNyFFPERAsQ3AKC4/lg0HgNdoT+D5qA2yhjrGzZgWQCdGt3G
 a/dWEkikMB38EOHnUdQIzlw=
 =13ML
 -----END PGP SIGNATURE-----
 
 --=.P:v,dDsx5Si/m2--

From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: Miguel Mendez <flynn@energyhq.homeip.net>
Subject: Re: ports/46796: Update port: print/lyx to 1.2.2
Date: Fri, 10 Jan 2003 21:36:23 +0900

 On Thu, 9 Jan 2003 13:40:03 -0800 (PST)
 Miguel Mendez <flynn@energyhq.homeip.net> wrote:
 
 >  Seems 1.2.3 just came out :)
 
 Since similar fixes are applied to latest source, some 
 patches and extra files are not needed any more.
 
 I suppose following patch should be used instead.
 
 ***
 Remove file:
 files/patch-autogen.sh
 files/patch-config::pspell.m4
 files/patch-src::FontLoader.C
 files/xforms.m4
 ***
 
 diff -urN /usr/ports/print/lyx/Makefile print/lyx/Makefile
 --- /usr/ports/print/lyx/Makefile	Mon Nov 11 19:00:56 2002
 +++ print/lyx/Makefile	Fri Jan 10 15:49:22 2003
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	lyx
 -PORTVERSION=	1.2.1
 -PORTREVISION=	1
 +PORTVERSION=	1.2.3
  CATEGORIES=	print
  MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
  		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 @@ -27,10 +26,11 @@
  USE_PERL5=	yes
  USE_GMAKE=	yes
  USE_AUTOMAKE_VER=	15
 -AUTOMAKE=	${WRKSRC}/autogen.sh
 -AUTOCONF=	${TRUE}
 +CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
  CONFIGURE_ARGS=	--with-extra-lib="${LOCALBASE}/lib" \
  		--with-extra-inc="${LOCALBASE}/include"
 +MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
 +		AUTOHEADER="${TRUE}"
  MAN1=		lyx.1 reLyX.1
  
  .if defined(WITH_ASPELL)
 @@ -59,12 +59,13 @@
  	@${ECHO_MSG}
  .endif
  
 -post-extract:
 -	@${CP} -f ${FILESDIR}/xforms.m4 ${WRKSRC}/config
 -
  post-patch:
 -	@${FIND} ${WRKSRC} -name "configure.in" | ${XARGS} ${REINPLACE_CMD} -e \
 -		's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
 -		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g'
 +.for file in src/Makefile.am src/frontends/Makefile.am
 +	@${REINPLACE_CMD} -e 's|LIBS +=|LDFLAGS = @LDFLAGS@|g' ${WRKSRC}/${file}
 +.endfor
 +.for file in configure.in lib/reLyX/configure.in
 +	@${REINPLACE_CMD} -e 's|AC_CHECK_LIB(c,|AC_CHECK_FUNC(|g ; \
 +		 s|^INSTALL_SCRIPT=|#INSTALL_SCRIPT=|g' ${WRKSRC}/${file}
 +.endfor
  
  .include <bsd.port.mk>
 diff -urN /usr/ports/print/lyx/distinfo print/lyx/distinfo
 --- /usr/ports/print/lyx/distinfo	Fri Sep 20 19:34:06 2002
 +++ print/lyx/distinfo	Fri Jan 10 15:53:48 2003
 @@ -1 +1 @@
 -MD5 (lyx-1.2.1.tar.gz) = 6797b72d306000bd1579cfea21b3f1cf
 +MD5 (lyx-1.2.3.tar.gz) = 3a423e65f647bd0a8f9401dd43e5d912
 diff -urN /usr/ports/print/lyx/files/patch-autogen.sh print/lyx/files/patch-autogen.sh
 --- /usr/ports/print/lyx/files/patch-autogen.sh	Thu Aug  1 23:24:58 2002
 +++ print/lyx/files/patch-autogen.sh	Thu Jan  1 09:00:00 1970
 @@ -1,32 +0,0 @@
 ---- autogen.sh	Thu Apr 18 22:11:28 2002
 -+++ autogen.sh	Fri Jun 28 21:55:35 2002
 -@@ -1,9 +1,9 @@
 - #!/bin/sh
 - 
 - ACLOCAL=aclocal
 --AUTOHEADER=autoheader
 -+AUTOHEADER=autoheader213
 - AUTOMAKE="automake -a -c --foreign"
 --AUTOCONF=autoconf
 -+AUTOCONF=autoconf213
 - GNUM4=
 - 
 - ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
 -@@ -31,7 +31,7 @@
 - echo "done."
 - 
 - # Generate the Makefiles and configure files
 --if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
 -+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
 - 	echo "Building macros..."
 - 	for dir in . lib/reLyX sigc++ ; do
 - 	    echo "        $dir"
 -@@ -43,7 +43,7 @@
 - 	exit
 - fi
 - 
 --if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
 -+if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
 - 	echo "Building config header template..."
 - 	for dir in . sigc++ ; do
 - 	    echo "        $dir"
 diff -urN /usr/ports/print/lyx/files/patch-config::pspell.m4 print/lyx/files/patch-config::pspell.m4
 --- /usr/ports/print/lyx/files/patch-config::pspell.m4	Mon Oct  7 10:21:23 2002
 +++ print/lyx/files/patch-config::pspell.m4	Thu Jan  1 09:00:00 1970
 @@ -1,20 +0,0 @@
 ---- config/pspell.m4.orig	Thu Jun 20 21:03:56 2002
 -+++ config/pspell.m4	Wed Oct  2 22:10:21 2002
 -@@ -12,7 +12,7 @@
 -         fi
 -       ])
 - 
 --    AC_ARG_WITH(pspell-includes, [  --with-pspell-include   where the pspell.h is located],
 -+    AC_ARG_WITH(pspell-include, [  --with-pspell-include   where the pspell.h is located],
 -       pspell_use_include="$withval",
 -       pspell_use_include=NONE)
 - 
 -@@ -22,7 +22,7 @@
 -       AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
 -     fi
 - 
 --    AC_ARG_WITH(pspell-libs, [  --with-pspell-lib       where the libpspell.a is located],
 -+    AC_ARG_WITH(pspell-lib, [  --with-pspell-lib       where the libpspell.a is located],
 -       pspell_use_lib="$withval",
 -       pspell_use_lib=NONE)
 - 
 diff -urN /usr/ports/print/lyx/files/patch-src::FontLoader.C print/lyx/files/patch-src::FontLoader.C
 --- /usr/ports/print/lyx/files/patch-src::FontLoader.C	Fri Sep 20 12:25:03 2002
 +++ print/lyx/files/patch-src::FontLoader.C	Thu Jan  1 09:00:00 1970
 @@ -1,12 +0,0 @@
 ---- src/FontLoader.C.orig	Fri Mar 22 02:25:07 2002
 -+++ src/FontLoader.C	Fri Aug 23 03:38:09 2002
 -@@ -300,7 +300,8 @@
 - 		if (font == "fixed") {
 - 			lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
 - 		} else {
 --			lyxerr << "Could not get font. Using 'fixed'." << endl;
 -+			lyxerr << "Could not get font '" << font.c_str() <<
 -+				"'. Using 'fixed'." << endl;
 - 			fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
 - 		}
 - 	} else if (lyxerr.debugging(Debug::FONT)) {
 diff -urN /usr/ports/print/lyx/files/xforms.m4 print/lyx/files/xforms.m4
 --- /usr/ports/print/lyx/files/xforms.m4	Fri Sep 20 12:25:03 2002
 +++ print/lyx/files/xforms.m4	Thu Jan  1 09:00:00 1970
 @@ -1,98 +0,0 @@
 -dnl some macros to test for xforms-related functionality  -*- sh -*-
 -
 -dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
 -dnl   If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
 -dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
 -AC_DEFUN(LYX_PATH_XFORMS,[
 -AC_REQUIRE([LYX_PATH_XPM])
 -
 -AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
 -  [AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
 -    [LYX_LIB_ERROR(libforms or libxforms,xforms)], $XPM_LIB)], $XPM_LIB)
 -AC_SUBST(XFORMS_LIB)
 -
 -### Check for xforms headers
 -lyx_cv_forms_h_location="<forms.h>"
 -AC_CHECK_HEADER(X11/forms.h,[
 -  ac_cv_header_forms_h=yes
 -  lyx_cv_forms_h_location="<X11/forms.h>"],[
 -AC_CHECK_HEADER(forms.h,[],[
 -LYX_LIB_ERROR(forms.h,forms)])])
 -AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
 -   [define this to the location of forms.h to be used with #include, e.g. <forms.h>])
 -
 -if test $ac_cv_header_forms_h = yes; then
 -  AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
 -  [ cat > conftest.$ac_ext <<EOF
 -#line __oline__ "configure"
 -#include "confdefs.h"
 -
 -#include FORMS_H_LOCATION
 -#if ! defined(FL_INCLUDE_VERSION)
 -"%%%"(unknown)"%%%"
 -#else
 -"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
 -#endif
 -EOF
 -lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
 -  grep '^"%%%"'  2>/dev/null | \
 -  sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
 -rm -f conftest*])
 -
 -XFORMS_VERSION=$lyx_cv_xfversion
 -case "$lyx_cv_xfversion" in
 -  "(unknown)"|0.8[1-7]*)
 -	 LYX_ERROR(dnl
 -Version $lyx_cv_xfversion of xforms is not compatible with LyX.
 -   This version of LyX works best with versions 0.88 (recommended) and later.) ;;
 -    0.88*) ;;
 -    0.89[01234]) LYX_WARNING(dnl
 -LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
 -it is an unproven version and might still have some bugs. You should
 -probably use version 0.89.6 (or 0.88) instead) ;;
 -    0.89*) ;;
 -    0.9999*) ;;
 -    1.0*) ;;
 -       *) LYX_WARNING(dnl
 -Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
 - since it is newer than 0.89. You might have slight problems with it.);;
 -esac
 -fi
 -])
 -
 -
 -
 -dnl Check whether the xforms library has a viable image loader
 -AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
 -[AC_REQUIRE([LYX_PATH_XFORMS])
 -save_LIBS=$LIBS
 -LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
 -lyx_use_xforms_image_loader=no
 -AC_LANG_SAVE
 -AC_LANG_C
 -
 -AC_CHECK_LIB(jpeg, jpeg_read_header,
 -  [XFORMS_IMAGE_LIB=-ljpeg
 -   LIBS="$LIBS -ljpeg"])
 -AC_SEARCH_LIBS(flimage_dup, flimage,
 -  [lyx_use_xforms_image_loader=yes
 -   if test "$ac_cv_search_flimage_dup" != "none required" ; then
 -     XFORMS_IMAGE_LIB="-lflimage $XFORMS_IMAGE_LIB"
 -     LIBS="$XFORMS_IMAGE_LIB $LIBS"
 -  fi])
 -AC_SUBST(XFORMS_IMAGE_LIB)
 -
 -if test $lyx_use_xforms_image_loader = yes ; then
 -  lyx_flags="$lyx_flags xforms-image-loader"
 -  AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
 -	    [Define if you want to use xforms built-in image loader])
 -  AC_CHECK_FUNCS(flimage_enable_ps flimage_enable_jpeg)
 -  AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
 -fi
 -
 -### If the gui cannot load images itself, then we default to the
 -### very simple one in graphics/GraphicsImageXPM.[Ch]
 -AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
 -	       test $lyx_use_xforms_image_loader = no)
 -AC_LANG_RESTORE
 -LIBS=$save_LIBS])
 diff -urN /usr/ports/print/lyx/pkg-plist print/lyx/pkg-plist
 --- /usr/ports/print/lyx/pkg-plist	Fri Sep 20 19:34:06 2002
 +++ print/lyx/pkg-plist	Tue Jan  7 09:42:17 2003
 @@ -83,6 +83,7 @@
  share/lyx/doc/fr_UserGuide.lyx
  share/lyx/doc/he_Intro.lyx
  share/lyx/doc/he_TOC.lyx
 +share/lyx/doc/he_Tutorial.lyx
  share/lyx/doc/hu_Intro.lyx
  share/lyx/doc/hu_TOC.lyx
  share/lyx/doc/it_Customization.lyx
 @@ -104,6 +105,7 @@
  share/lyx/doc/ro_Intro.lyx
  share/lyx/doc/ro_TOC.lyx
  share/lyx/doc/ro_splash.lyx
 +share/lyx/doc/ru_FAQ.lyx
  share/lyx/doc/ru_Intro.lyx
  share/lyx/doc/ru_TOC.lyx
  share/lyx/doc/ru_Tutorial.lyx
 @@ -155,6 +157,9 @@
  share/lyx/examples/fr_exemple_lyxifie.lyx
  share/lyx/examples/fr_mathed.lyx
  share/lyx/examples/fr_splash.lyx
 +share/lyx/examples/he_example_raw.lyx
 +share/lyx/examples/he_he_example_lyxified.lyx
 +share/lyx/examples/he_he_example_raw.lyx
  share/lyx/examples/hu_splash.lyx
  share/lyx/examples/iecc05.fen
  share/lyx/examples/iecc07.fen
 @@ -331,6 +336,7 @@
  share/lyx/layouts/heb-article.layout
  share/lyx/layouts/heb-letter.layout
  share/lyx/layouts/hollywood.layout
 +share/lyx/layouts/ijmpd.layout
  share/lyx/layouts/kluwer.layout
  share/lyx/layouts/latex8.layout
  share/lyx/layouts/letter.layout
 @@ -404,6 +410,7 @@
  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/latex8.lyx
  share/lyx/templates/letter.lyx
State-Changed-From-To: open->closed 
State-Changed-By: mi 
State-Changed-When: Sat Jan 25 13:38:27 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46796 
>Unformatted:
