Date: Thu, 11 Nov 2004 16:06:10 +1300 From: Andrew Thompson <andy@fud.org.nz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73802: [maintainer-update] update print/lyx to 1.3.5 Message-ID: <20041111030610.GA30387@thingy.tbd.co.nz> Resent-Message-ID: <200411110310.iAB3AOM3071772@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73802 >Category: ports >Synopsis: [maintainer-update] update print/lyx to 1.3.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Nov 11 03:10:24 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Andrew Thompson >Release: FreeBSD 5.3-BETA6 i386 >Organization: <organization of PR author (multiple lines)> >Environment: System: FreeBSD hudson.fire.org.nz 5.3-BETA6 FreeBSD 5.3-BETA6 #0: Sat Oct 16 09:21:06 NZDT 2004 root@hudson.fire.org.nz:/usr/obj/usr/src/sys/HUDSON i386 >Description: update print/lyx to 1.3.5 >How-To-Repeat: >Fix: Apply patch. (Note: files/* are all removed) patch also available @ http://www.fud.org.nz/~andy/lyx.diff diff -urN print/lyx.orig/Makefile print/lyx/Makefile --- print/lyx.orig/Makefile Thu Nov 11 15:57:11 2004 +++ print/lyx/Makefile Wed Nov 10 14:18:32 2004 @@ -6,8 +6,7 @@ # PORTNAME= lyx -PORTVERSION= 1.3.4 -PORTREVISION= 1 +PORTVERSION= 1.3.5 CATEGORIES= print MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \ ftp://planetmirror.com/pub/lyx/stable/ \ diff -urN print/lyx.orig/distinfo print/lyx/distinfo --- print/lyx.orig/distinfo Thu Nov 11 15:57:11 2004 +++ print/lyx/distinfo Wed Nov 10 14:20:05 2004 @@ -1,2 +1,2 @@ -MD5 (lyx-1.3.4.tar.bz2) = 13fe7a7bcec0430e9a9436f2e3cfa04e -SIZE (lyx-1.3.4.tar.bz2) = 5404453 +MD5 (lyx-1.3.5.tar.bz2) = f4c70d2565ba9c974b1f94fc1dfd63bf +SIZE (lyx-1.3.5.tar.bz2) = 5459049 diff -urN print/lyx.orig/f/patch-boost::boost::config::compiler::gcc.hpp print/lyx/f/patch-boost::boost::config::compiler::gcc.hpp --- print/lyx.orig/f/patch-boost::boost::config::compiler::gcc.hpp Thu Nov 11 15:57:12 2004 +++ print/lyx/f/patch-boost::boost::config::compiler::gcc.hpp Thu Jan 1 12:00:00 1970 @@ -1,97 +0,0 @@ -$NetBSD$ - ---- ./boost/boost/config/compiler/gcc.hpp.orig 2003-05-26 08:27:34.000000000 -0600 -+++ ./boost/boost/config/compiler/gcc.hpp -@@ -1,7 +1,13 @@ --// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and --// distribute this software is granted provided this copyright notice appears --// in all copies. This software is provided "as is" without express or implied --// warranty, and with no claim as to its suitability for any purpose. -+// (C) Copyright John Maddock 2001 - 2003. -+// (C) Copyright Darin Adler 2001 - 2002. -+// (C) Copyright Jens Maurer 2001 - 2002. -+// (C) Copyright Beman Dawes 2001 - 2003. -+// (C) Copyright Douglas Gregor 2002. -+// (C) Copyright David Abrahams 2002 - 2003. -+// (C) Copyright Synge Todo 2003. -+// Use, modification and distribution are subject to the -+// Boost Software License, Version 1.0. (See accompanying file -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - // See http://www.boost.org for most recent version. - -@@ -23,24 +29,53 @@ - # endif - # endif - -+# if __GNUC__ == 2 && __GNUC_MINOR__ < 96 -+# define BOOST_NO_SFINAE -+# endif -+ - # if __GNUC__ == 2 && __GNUC_MINOR__ <= 97 - # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS - # define BOOST_NO_OPERATORS_IN_NAMESPACE - # endif - -+# if __GNUC__ < 3 -+# define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE -+# define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL -+# endif -+ -+# -+# -+# -+ -+// -+// Bug specific to gcc 3.1 and 3.2: -+// -+#if (__GNUC__ == 3) && ((__GNUC_MINOR__ == 1) || (__GNUC_MINOR__ == 2)) -+# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS -+#endif -+ - // --// Threading support: --// Turn this on unconditionally here, it will get turned off again later --// if no threading API is detected. -+// Threading support: Turn this on unconditionally here (except for -+// those platforms where we can know for sure). It will get turned off again -+// later if no threading API is detected. - // --#define BOOST_HAS_THREADS -+#if !defined(__MINGW32__) && !defined(linux) && !defined(__linux) && !defined(__linux__) -+# define BOOST_HAS_THREADS -+#endif - - // - // gcc has "long long" - // - #define BOOST_HAS_LONG_LONG - --#define BOOST_COMPILER "GNU C++ version " BOOST_STRINGIZE(__GNUC__) "." BOOST_STRINGIZE(__GNUC_MINOR__) -+// -+// gcc implements the named return value optimization since version 3.1 -+// -+#if __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 1 ) -+#define BOOST_HAS_NRVO -+#endif -+ -+#define BOOST_COMPILER "GNU C++ version " __VERSION__ - - // - // versions check: -@@ -49,11 +84,13 @@ - # error "Compiler not configured - please reconfigure" - #endif - // --// last known and checked version is 3.2: --#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)) -+// last known and checked version is 3.4: -+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4)) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else - # warning "Unknown compiler version - please run the configure tests and report the results" - # endif - #endif -+ -+ diff -urN print/lyx.orig/f/patch-boost::boost::format::feed_args.hpp print/lyx/f/patch-boost::boost::format::feed_args.hpp --- print/lyx.orig/f/patch-boost::boost::format::feed_args.hpp Thu Nov 11 15:57:12 2004 +++ print/lyx/f/patch-boost::boost::format::feed_args.hpp Thu Jan 1 12:00:00 1970 @@ -1,13 +0,0 @@ -$NetBSD$ - ---- ./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 -urN print/lyx.orig/f/patch-boost::boost::format::format_implementation.hpp print/lyx/f/patch-boost::boost::format::format_implementation.hpp --- print/lyx.orig/f/patch-boost::boost::format::format_implementation.hpp Thu Nov 11 15:57:12 2004 +++ print/lyx/f/patch-boost::boost::format::format_implementation.hpp Thu Jan 1 12:00:00 1970 @@ -1,13 +0,0 @@ -$NetBSD$ - ---- ./boost/boost/format/format_implementation.hpp.orig 2002-11-21 11:33:01.000000000 -0700 -+++ ./boost/boost/format/format_implementation.hpp -@@ -151,7 +151,7 @@ basic_format<Ch,Tr>& basic_format<Ch,Tr> - { - if(argN<1 || argN > num_args_ || bound_.size()==0 || !bound_[argN-1] ) - { -- if( exceptions() & out_of_range_bit ) -+ if( exceptions() & io::out_of_range_bit ) - boost::throw_exception(io::out_of_range()); // arg not in range. - else return *this; - } diff -urN print/lyx.orig/f/patch-configure print/lyx/f/patch-configure --- print/lyx.orig/f/patch-configure Thu Nov 11 15:57:12 2004 +++ print/lyx/f/patch-configure Thu Jan 1 12:00:00 1970 @@ -1,94 +0,0 @@ ---- configure.orig Thu Feb 19 02:35:31 2004 -+++ configure Tue Mar 2 01:03:20 2004 -@@ -5304,33 +5304,51 @@ - - fi - -- --echo "$as_me:$LINENO: checking for fopen in -lc" >&5 --echo $ECHO_N "checking for fopen in -lc... $ECHO_C" >&6 --if test "${ac_cv_lib_c_fopen+set}" = set; then -+echo "$as_me:$LINENO: checking for fopen" >&5 -+echo $ECHO_N "checking for fopen... $ECHO_C" >&6 -+if test "${ac_cv_func_fopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lc $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char fopen (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" -+{ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char fopen (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_fopen) || defined (__stub___fopen) -+choke me -+#else -+char (*f) () = fopen; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ - int - main () - { --fopen (); -+return f != fopen; - ; - return 0; - } -@@ -5347,26 +5365,17 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_c_fopen=yes -+ ac_cv_func_fopen=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_c_fopen=no -+ac_cv_func_fopen=no - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_c_fopen" >&5 --echo "${ECHO_T}$ac_cv_lib_c_fopen" >&6 --if test $ac_cv_lib_c_fopen = yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBC 1 --_ACEOF -- -- LIBS="-lc $LIBS" -- - fi -+echo "$as_me:$LINENO: result: $ac_cv_func_fopen" >&5 -+echo "${ECHO_T}$ac_cv_func_fopen" >&6 - - - ### Add extra directories to check for libraries. diff -urN print/lyx.orig/f/patch-src::BoostFormat.h print/lyx/f/patch-src::BoostFormat.h --- print/lyx.orig/f/patch-src::BoostFormat.h Thu Nov 11 15:57:12 2004 +++ print/lyx/f/patch-src::BoostFormat.h Thu Jan 1 12:00:00 1970 @@ -1,13 +0,0 @@ -$NetBSD$ - ---- ./src/BoostFormat.h.orig 2002-11-25 12:44:44.000000000 -0700 -+++ ./src/BoostFormat.h -@@ -15,7 +15,7 @@ namespace boost - { - - extern --template basic_format<char>; -+template class basic_format<char>; - - extern template - std::ostream & diff -urN print/lyx.orig/f/patch-src::frontends::controllers::ControlDialog.tmpl print/lyx/f/patch-src::frontends::controllers::ControlDialog.tmpl --- print/lyx.orig/f/patch-src::frontends::controllers::ControlDialog.tmpl Thu Nov 11 15:57:12 2004 +++ print/lyx/f/patch-src::frontends::controllers::ControlDialog.tmpl Thu Jan 1 12:00:00 1970 @@ -1,85 +0,0 @@ -$NetBSD$ - ---- src/frontends/controllers/ControlDialog.tmpl.orig 2004-05-29 04:23:23.000000000 -0600 -+++ src/frontends/controllers/ControlDialog.tmpl -@@ -4,7 +4,7 @@ - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * -- * \author Angus Leeming -+ * \author Angus Leeming - * - * Full author contact details are available in file CREDITS - * -@@ -27,54 +27,56 @@ ControlDialog<Base>::ControlDialog(LyXVi - template <class Base> - void ControlDialog<Base>::show() - { -- if (isBufferDependent() && !bufferIsAvailable()) -+ if (this->isBufferDependent() && !this->bufferIsAvailable()) - return; - -- connect(); -+ this->connect(); - - if (!dialog_built_) { -- view().build(); -+ this->view().build(); - dialog_built_ = true; - } - - setParams(); -- if (emergency_exit_) { -+ if (this->emergency_exit_) { - hide(); - return; - } - -- bc().readOnly(bufferIsReadonly()); -- view().show(); -+ this->bc().readOnly(this->bufferIsReadonly()); -+ this->view().show(); - - // The widgets may not be valid, so refresh the button controller -- bc().refresh(); -+ this->bc().refresh(); - } - -+ - template <class Base> - void ControlDialog<Base>::update() - { -- if (isBufferDependent() && !bufferIsAvailable()) -+ if (this->isBufferDependent() && !this->bufferIsAvailable()) - return; - - setParams(); -- if (emergency_exit_) { -+ if (this->emergency_exit_) { - hide(); - return; - } - -- bc().readOnly(bufferIsReadonly()); -- view().update(); -+ this->bc().readOnly(this->bufferIsReadonly()); -+ this->view().update(); - - // The widgets may not be valid, so refresh the button controller -- bc().refresh(); -+ this->bc().refresh(); - } - -+ - template <class Base> - void ControlDialog<Base>::hide() - { -- emergency_exit_ = false; -+ this->emergency_exit_ = false; - clearParams(); - -- disconnect(); -- view().hide(); -+ this->disconnect(); -+ this->view().hide(); - } diff -urN print/lyx.orig/f/patch-src::frontends::qt2::Qt2Base.h print/lyx/f/patch-src::frontends::qt2::Qt2Base.h --- print/lyx.orig/f/patch-src::frontends::qt2::Qt2Base.h Thu Nov 11 15:57:12 2004 +++ print/lyx/f/patch-src::frontends::qt2::Qt2Base.h Thu Jan 1 12:00:00 1970 @@ -1,21 +0,0 @@ -$NetBSD$ - ---- ./src/frontends/qt2/Qt2Base.h.orig 2003-02-01 17:48:38.000000000 -0700 -+++ ./src/frontends/qt2/Qt2Base.h -@@ -174,14 +174,14 @@ Qt2CB<Controller, Base>::Qt2CB(QString c - template <class Controller, class Base> - Controller & Qt2CB<Controller, Base>::controller() - { -- return static_cast<Controller &>(getController()); -+ return static_cast<Controller &>(this->getController()); - } - - - template <class Controller, class Base> - Controller const & Qt2CB<Controller, Base>::controller() const - { -- return static_cast<Controller const &>(getController()); -+ return static_cast<Controller const &>(this->getController()); - } - - diff -urN print/lyx.orig/f/patch-src::frontends::xforms::FormBase.h print/lyx/f/patch-src::frontends::xforms::FormBase.h --- print/lyx.orig/f/patch-src::frontends::xforms::FormBase.h Thu Nov 11 15:57:12 2004 +++ print/lyx/f/patch-src::frontends::xforms::FormBase.h Thu Jan 1 12:00:00 1970 @@ -1,21 +0,0 @@ -$NetBSD$ - ---- src/frontends/xforms/FormBase.h.orig 2003-02-01 17:48:38.000000000 -0700 -+++ src/frontends/xforms/FormBase.h -@@ -188,14 +188,14 @@ FormCB<Controller, Base>::FormCB(string - template <class Controller, class Base> - Controller & FormCB<Controller, Base>::controller() - { -- return static_cast<Controller &>(getController()); -+ return static_cast<Controller &>(this->getController()); - } - - - template <class Controller, class Base> - Controller const & FormCB<Controller, Base>::controller() const - { -- return static_cast<Controller const &>(getController()); -+ return static_cast<Controller const &>(this->getController()); - } - - diff -urN print/lyx.orig/files/patch-boost::boost::config::compiler::gcc.hpp print/lyx/files/patch-boost::boost::config::compiler::gcc.hpp --- print/lyx.orig/files/patch-boost::boost::config::compiler::gcc.hpp Thu Nov 11 15:57:12 2004 +++ print/lyx/files/patch-boost::boost::config::compiler::gcc.hpp Thu Jan 1 12:00:00 1970 @@ -1,97 +0,0 @@ -$NetBSD$ - ---- ./boost/boost/config/compiler/gcc.hpp.orig 2003-05-26 08:27:34.000000000 -0600 -+++ ./boost/boost/config/compiler/gcc.hpp -@@ -1,7 +1,13 @@ --// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and --// distribute this software is granted provided this copyright notice appears --// in all copies. This software is provided "as is" without express or implied --// warranty, and with no claim as to its suitability for any purpose. -+// (C) Copyright John Maddock 2001 - 2003. -+// (C) Copyright Darin Adler 2001 - 2002. -+// (C) Copyright Jens Maurer 2001 - 2002. -+// (C) Copyright Beman Dawes 2001 - 2003. -+// (C) Copyright Douglas Gregor 2002. -+// (C) Copyright David Abrahams 2002 - 2003. -+// (C) Copyright Synge Todo 2003. -+// Use, modification and distribution are subject to the -+// Boost Software License, Version 1.0. (See accompanying file -+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - // See http://www.boost.org for most recent version. - -@@ -23,24 +29,53 @@ - # endif - # endif - -+# if __GNUC__ == 2 && __GNUC_MINOR__ < 96 -+# define BOOST_NO_SFINAE -+# endif -+ - # if __GNUC__ == 2 && __GNUC_MINOR__ <= 97 - # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS - # define BOOST_NO_OPERATORS_IN_NAMESPACE - # endif - -+# if __GNUC__ < 3 -+# define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE -+# define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL -+# endif -+ -+# -+# -+# -+ -+// -+// Bug specific to gcc 3.1 and 3.2: -+// -+#if (__GNUC__ == 3) && ((__GNUC_MINOR__ == 1) || (__GNUC_MINOR__ == 2)) -+# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS -+#endif -+ - // --// Threading support: --// Turn this on unconditionally here, it will get turned off again later --// if no threading API is detected. -+// Threading support: Turn this on unconditionally here (except for -+// those platforms where we can know for sure). It will get turned off again -+// later if no threading API is detected. - // --#define BOOST_HAS_THREADS -+#if !defined(__MINGW32__) && !defined(linux) && !defined(__linux) && !defined(__linux__) -+# define BOOST_HAS_THREADS -+#endif - - // - // gcc has "long long" - // - #define BOOST_HAS_LONG_LONG - --#define BOOST_COMPILER "GNU C++ version " BOOST_STRINGIZE(__GNUC__) "." BOOST_STRINGIZE(__GNUC_MINOR__) -+// -+// gcc implements the named return value optimization since version 3.1 -+// -+#if __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 1 ) -+#define BOOST_HAS_NRVO -+#endif -+ -+#define BOOST_COMPILER "GNU C++ version " __VERSION__ - - // - // versions check: -@@ -49,11 +84,13 @@ - # error "Compiler not configured - please reconfigure" - #endif - // --// last known and checked version is 3.2: --#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)) -+// last known and checked version is 3.4: -+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4)) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else - # warning "Unknown compiler version - please run the configure tests and report the results" - # endif - #endif -+ -+ diff -urN print/lyx.orig/files/patch-boost::boost::format::feed_args.hpp print/lyx/files/patch-boost::boost::format::feed_args.hpp --- print/lyx.orig/files/patch-boost::boost::format::feed_args.hpp Thu Nov 11 15:57:12 2004 +++ print/lyx/files/patch-boost::boost::format::feed_args.hpp Thu Jan 1 12:00:00 1970 @@ -1,13 +0,0 @@ -$NetBSD$ - ---- ./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 -urN print/lyx.orig/files/patch-boost::boost::format::format_implementation.hpp print/lyx/files/patch-boost::boost::format::format_implementation.hpp --- print/lyx.orig/files/patch-boost::boost::format::format_implementation.hpp Thu Nov 11 15:57:12 2004 +++ print/lyx/files/patch-boost::boost::format::format_implementation.hpp Thu Jan 1 12:00:00 1970 @@ -1,13 +0,0 @@ -$NetBSD$ - ---- ./boost/boost/format/format_implementation.hpp.orig 2002-11-21 11:33:01.000000000 -0700 -+++ ./boost/boost/format/format_implementation.hpp -@@ -151,7 +151,7 @@ basic_format<Ch,Tr>& basic_format<Ch,Tr> - { - if(argN<1 || argN > num_args_ || bound_.size()==0 || !bound_[argN-1] ) - { -- if( exceptions() & out_of_range_bit ) -+ if( exceptions() & io::out_of_range_bit ) - boost::throw_exception(io::out_of_range()); // arg not in range. - else return *this; - } diff -urN print/lyx.orig/files/patch-configure print/lyx/files/patch-configure --- print/lyx.orig/files/patch-configure Thu Nov 11 15:57:12 2004 +++ print/lyx/files/patch-configure Thu Jan 1 12:00:00 1970 @@ -1,94 +0,0 @@ ---- configure.orig Thu Feb 19 02:35:31 2004 -+++ configure Tue Mar 2 01:03:20 2004 -@@ -5304,33 +5304,51 @@ - - fi - -- --echo "$as_me:$LINENO: checking for fopen in -lc" >&5 --echo $ECHO_N "checking for fopen in -lc... $ECHO_C" >&6 --if test "${ac_cv_lib_c_fopen+set}" = set; then -+echo "$as_me:$LINENO: checking for fopen" >&5 -+echo $ECHO_N "checking for fopen... $ECHO_C" >&6 -+if test "${ac_cv_func_fopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lc $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char fopen (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus - extern "C" -+{ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char fopen (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_fopen) || defined (__stub___fopen) -+choke me -+#else -+char (*f) () = fopen; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ - int - main () - { --fopen (); -+return f != fopen; - ; - return 0; - } -@@ -5347,26 +5365,17 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_c_fopen=yes -+ ac_cv_func_fopen=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_c_fopen=no -+ac_cv_func_fopen=no - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_c_fopen" >&5 --echo "${ECHO_T}$ac_cv_lib_c_fopen" >&6 --if test $ac_cv_lib_c_fopen = yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBC 1 --_ACEOF -- -- LIBS="-lc $LIBS" -- - fi -+echo "$as_me:$LINENO: result: $ac_cv_func_fopen" >&5 -+echo "${ECHO_T}$ac_cv_func_fopen" >&6 - - - ### Add extra directories to check for libraries. diff -urN print/lyx.orig/files/patch-src::BoostFormat.h print/lyx/files/patch-src::BoostFormat.h --- print/lyx.orig/files/patch-src::BoostFormat.h Thu Nov 11 15:57:12 2004 +++ print/lyx/files/patch-src::BoostFormat.h Thu Jan 1 12:00:00 1970 @@ -1,13 +0,0 @@ -$NetBSD$ - ---- ./src/BoostFormat.h.orig 2002-11-25 12:44:44.000000000 -0700 -+++ ./src/BoostFormat.h -@@ -15,7 +15,7 @@ namespace boost - { - - extern --template basic_format<char>; -+template class basic_format<char>; - - extern template - std::ostream & diff -urN print/lyx.orig/files/patch-src::frontends::controllers::ControlDialog.tmpl print/lyx/files/patch-src::frontends::controllers::ControlDialog.tmpl --- print/lyx.orig/files/patch-src::frontends::controllers::ControlDialog.tmpl Thu Nov 11 15:57:12 2004 +++ print/lyx/files/patch-src::frontends::controllers::ControlDialog.tmpl Thu Jan 1 12:00:00 1970 @@ -1,85 +0,0 @@ -$NetBSD$ - ---- src/frontends/controllers/ControlDialog.tmpl.orig 2004-05-29 04:23:23.000000000 -0600 -+++ src/frontends/controllers/ControlDialog.tmpl -@@ -4,7 +4,7 @@ - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * -- * \author Angus Leeming -+ * \author Angus Leeming - * - * Full author contact details are available in file CREDITS - * -@@ -27,54 +27,56 @@ ControlDialog<Base>::ControlDialog(LyXVi - template <class Base> - void ControlDialog<Base>::show() - { -- if (isBufferDependent() && !bufferIsAvailable()) -+ if (this->isBufferDependent() && !this->bufferIsAvailable()) - return; - -- connect(); -+ this->connect(); - - if (!dialog_built_) { -- view().build(); -+ this->view().build(); - dialog_built_ = true; - } - - setParams(); -- if (emergency_exit_) { -+ if (this->emergency_exit_) { - hide(); - return; - } - -- bc().readOnly(bufferIsReadonly()); -- view().show(); -+ this->bc().readOnly(this->bufferIsReadonly()); -+ this->view().show(); - - // The widgets may not be valid, so refresh the button controller -- bc().refresh(); -+ this->bc().refresh(); - } - -+ - template <class Base> - void ControlDialog<Base>::update() - { -- if (isBufferDependent() && !bufferIsAvailable()) -+ if (this->isBufferDependent() && !this->bufferIsAvailable()) - return; - - setParams(); -- if (emergency_exit_) { -+ if (this->emergency_exit_) { - hide(); - return; - } - -- bc().readOnly(bufferIsReadonly()); -- view().update(); -+ this->bc().readOnly(this->bufferIsReadonly()); -+ this->view().update(); - - // The widgets may not be valid, so refresh the button controller -- bc().refresh(); -+ this->bc().refresh(); - } - -+ - template <class Base> - void ControlDialog<Base>::hide() - { -- emergency_exit_ = false; -+ this->emergency_exit_ = false; - clearParams(); - -- disconnect(); -- view().hide(); -+ this->disconnect(); -+ this->view().hide(); - } diff -urN print/lyx.orig/files/patch-src::frontends::qt2::Qt2Base.h print/lyx/files/patch-src::frontends::qt2::Qt2Base.h --- print/lyx.orig/files/patch-src::frontends::qt2::Qt2Base.h Thu Nov 11 15:57:12 2004 +++ print/lyx/files/patch-src::frontends::qt2::Qt2Base.h Thu Jan 1 12:00:00 1970 @@ -1,21 +0,0 @@ -$NetBSD$ - ---- ./src/frontends/qt2/Qt2Base.h.orig 2003-02-01 17:48:38.000000000 -0700 -+++ ./src/frontends/qt2/Qt2Base.h -@@ -174,14 +174,14 @@ Qt2CB<Controller, Base>::Qt2CB(QString c - template <class Controller, class Base> - Controller & Qt2CB<Controller, Base>::controller() - { -- return static_cast<Controller &>(getController()); -+ return static_cast<Controller &>(this->getController()); - } - - - template <class Controller, class Base> - Controller const & Qt2CB<Controller, Base>::controller() const - { -- return static_cast<Controller const &>(getController()); -+ return static_cast<Controller const &>(this->getController()); - } - - diff -urN print/lyx.orig/files/patch-src::frontends::xforms::FormBase.h print/lyx/files/patch-src::frontends::xforms::FormBase.h --- print/lyx.orig/files/patch-src::frontends::xforms::FormBase.h Thu Nov 11 15:57:12 2004 +++ print/lyx/files/patch-src::frontends::xforms::FormBase.h Thu Jan 1 12:00:00 1970 @@ -1,21 +0,0 @@ -$NetBSD$ - ---- src/frontends/xforms/FormBase.h.orig 2003-02-01 17:48:38.000000000 -0700 -+++ src/frontends/xforms/FormBase.h -@@ -188,14 +188,14 @@ FormCB<Controller, Base>::FormCB(string - template <class Controller, class Base> - Controller & FormCB<Controller, Base>::controller() - { -- return static_cast<Controller &>(getController()); -+ return static_cast<Controller &>(this->getController()); - } - - - template <class Controller, class Base> - Controller const & FormCB<Controller, Base>::controller() const - { -- return static_cast<Controller const &>(getController()); -+ return static_cast<Controller const &>(this->getController()); - } - - diff -urN print/lyx.orig/pkg-plist print/lyx/pkg-plist --- print/lyx.orig/pkg-plist Thu Nov 11 15:57:12 2004 +++ print/lyx/pkg-plist Thu Nov 11 07:51:27 2004 @@ -27,6 +27,7 @@ %%DATADIR%%/bind/greekkeys.bind %%DATADIR%%/bind/hollywood.bind %%DATADIR%%/bind/latinkeys.bind +%%DATADIR%%/bind/mac.bind %%DATADIR%%/bind/math.bind %%DATADIR%%/bind/menus.bind %%DATADIR%%/bind/pt_menus.bind @@ -64,7 +65,9 @@ %%DATADIR%%/doc/es_TOC.lyx %%DATADIR%%/doc/es_Tutorial.lyx %%DATADIR%%/doc/escher-lsd.eps +%%DATADIR%%/doc/eu_Customization.lyx %%DATADIR%%/doc/eu_Extended.lyx +%%DATADIR%%/doc/eu_FAQ.lyx %%DATADIR%%/doc/eu_Intro.lyx %%DATADIR%%/doc/eu_TOC.lyx %%DATADIR%%/doc/eu_Tutorial.lyx @@ -102,7 +105,6 @@ %%DATADIR%%/doc/pt_Tutorial.lyx %%DATADIR%%/doc/ro_Intro.lyx %%DATADIR%%/doc/ro_TOC.lyx -%%DATADIR%%/doc/ro_splash.lyx %%DATADIR%%/doc/ru_FAQ.lyx %%DATADIR%%/doc/ru_Intro.lyx %%DATADIR%%/doc/ru_TOC.lyx @@ -179,6 +181,7 @@ %%DATADIR%%/examples/noweb2lyx.lyx %%DATADIR%%/examples/pl_splash.lyx %%DATADIR%%/examples/pt_splash.lyx +%%DATADIR%%/examples/ro_splash.lyx %%DATADIR%%/examples/ru_splash.lyx %%DATADIR%%/examples/script_form.lyx %%DATADIR%%/examples/sl_primer_lyxan.lyx @@ -835,6 +838,7 @@ %%DATADIR%%/layouts/stdstarsections.inc %%DATADIR%%/layouts/stdstruct.inc %%DATADIR%%/layouts/stdtitle.inc +%%DATADIR%%/layouts/svglobal.layout %%DATADIR%%/layouts/svjog.layout %%DATADIR%%/layouts/svjour.inc %%DATADIR%%/layouts/svprobth.layout @@ -878,7 +882,7 @@ %%DATADIR%%/scripts/fig2pstex.py %%DATADIR%%/scripts/general_command_wrapper.py %%DATADIR%%/scripts/listerrors -%%DATADIR%%/scripts/lyxpreview2bitmap.sh +%%DATADIR%%/scripts/lyxpreview2ppm.py %%DATADIR%%/scripts/pic2ascii.py %%DATADIR%%/scripts/pic2png_eps.py %%DATADIR%%/scripts/pic2png_eps.sh >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041111030610.GA30387>