From 1962df333f06707f3b62e8b0fce3ce2ff690633d Mon Sep 17 00:00:00 2001 From: pirofti Date: Sun, 24 Oct 2010 22:36:37 +0000 Subject: [PATCH] Update to GiNaC 1.5.8. Okay steven@. --- math/ginac/Makefile | 4 +- math/ginac/distinfo | 10 +-- math/ginac/patches/patch-configure | 65 +++++++++++++------ math/ginac/patches/patch-ginac_Makefile_in | 8 +-- math/ginac/patches/patch-ginac_function_pl | 21 ++++-- .../patches/patch-ginac_parser_parser_cpp | 12 ---- 6 files changed, 71 insertions(+), 49 deletions(-) delete mode 100644 math/ginac/patches/patch-ginac_parser_parser_cpp diff --git a/math/ginac/Makefile b/math/ginac/Makefile index 320eca117ac..1dc31ebc7ae 100644 --- a/math/ginac/Makefile +++ b/math/ginac/Makefile @@ -1,8 +1,8 @@ -# $Id: Makefile,v 1.9 2010/10/18 20:52:05 espie Exp $ +# $Id: Makefile,v 1.10 2010/10/24 22:36:37 pirofti Exp $ COMMENT= GiNaC is Not a Computer Algebra System (CAS) -DISTNAME= ginac-1.5.3 +DISTNAME= ginac-1.5.8 REVISION= 0 SHARED_LIBS += ginac 2.0 # 0.3 CATEGORIES= math diff --git a/math/ginac/distinfo b/math/ginac/distinfo index 343dcd03437..7493611f3f5 100644 --- a/math/ginac/distinfo +++ b/math/ginac/distinfo @@ -1,5 +1,5 @@ -MD5 (ginac-1.5.3.tar.bz2) = drSGLaQusapNzzHsh9LHYQ== -RMD160 (ginac-1.5.3.tar.bz2) = D8N+edhrhSuENon7347wCm1TnFs= -SHA1 (ginac-1.5.3.tar.bz2) = otwURynU5X7kC/DqT/3owuDX9fk= -SHA256 (ginac-1.5.3.tar.bz2) = BmILRIy4pr549ANbb5SyOUpBSF3DdOC3bhVHUXO2VGk= -SIZE (ginac-1.5.3.tar.bz2) = 996505 +MD5 (ginac-1.5.8.tar.bz2) = hpOzycNGdpQDLOnIswY9TA== +RMD160 (ginac-1.5.8.tar.bz2) = kAXIYl/a11Ou5UhG23TqR7gSStc= +SHA1 (ginac-1.5.8.tar.bz2) = Qud6tfnH+Pq0ra608smpP2GL9mo= +SHA256 (ginac-1.5.8.tar.bz2) = jOcucPdTnporMlOeE+tlH9aI0UI92QvPC5w3tZLPwt0= +SIZE (ginac-1.5.8.tar.bz2) = 1003965 diff --git a/math/ginac/patches/patch-configure b/math/ginac/patches/patch-configure index 4ee179a39d5..7224b0bc13c 100644 --- a/math/ginac/patches/patch-configure +++ b/math/ginac/patches/patch-configure @@ -1,29 +1,56 @@ ---- configure.orig Thu Jul 30 19:06:02 2009 -+++ configure Mon Jun 7 03:59:36 2010 -@@ -11835,7 +11835,7 @@ if test "${ac_cv_lib_dl_dlopen+set}" = set; then +$OpenBSD: patch-configure,v 1.4 2010/10/24 22:36:37 pirofti Exp $ +--- configure.orig Tue Jul 6 15:41:06 2010 ++++ configure Sun Oct 24 22:08:49 2010 +@@ -10803,7 +10803,7 @@ if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" +LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -12157,7 +12157,7 @@ if test "${ac_cv_lib_dl_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" -+LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -12293,7 +12293,7 @@ if test "${ac_cv_lib_dld_dld_link+set}" = set; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -10856,7 +10856,7 @@ if test "${ac_cv_lib_dld_shl_load+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" +LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -10899,7 +10899,7 @@ if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" ++LIBS="$LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -10977,7 +10977,7 @@ if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" ++LIBS="$LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -15504,14 +15504,14 @@ fi + + if test "$CONFIG_EXCOMPILER" = "yes"; then + found_dlopen_lib="no" +- DL_LIBS="-ldl" ++ DL_LIBS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } + if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" ++LIBS="$LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/math/ginac/patches/patch-ginac_Makefile_in b/math/ginac/patches/patch-ginac_Makefile_in index 0533d29332f..55ae6fc58f3 100644 --- a/math/ginac/patches/patch-ginac_Makefile_in +++ b/math/ginac/patches/patch-ginac_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-ginac_Makefile_in,v 1.3 2010/06/07 13:47:44 espie Exp $ ---- ginac/Makefile.in.orig Thu Jul 30 19:06:05 2009 -+++ ginac/Makefile.in Mon Jun 7 03:59:36 2010 -@@ -316,7 +316,7 @@ polynomial/primpart_content.cpp \ +$OpenBSD: patch-ginac_Makefile_in,v 1.4 2010/10/24 22:36:37 pirofti Exp $ +--- ginac/Makefile.in.orig Tue Jul 6 15:41:09 2010 ++++ ginac/Makefile.in Sun Oct 24 20:33:18 2010 +@@ -318,7 +318,7 @@ polynomial/primpart_content.cpp \ polynomial/smod_helpers.h \ polynomial/debug.h diff --git a/math/ginac/patches/patch-ginac_function_pl b/math/ginac/patches/patch-ginac_function_pl index fb5b7a23828..b11d7a50ab4 100644 --- a/math/ginac/patches/patch-ginac_function_pl +++ b/math/ginac/patches/patch-ginac_function_pl @@ -1,6 +1,6 @@ -$OpenBSD: patch-ginac_function_pl,v 1.1 2010/06/07 13:47:44 espie Exp $ ---- ginac/function.pl.orig Wed Jul 15 06:29:52 2009 -+++ ginac/function.pl Mon Jun 7 10:48:59 2010 +$OpenBSD: patch-ginac_function_pl,v 1.2 2010/10/24 22:36:37 pirofti Exp $ +--- ginac/function.pl.orig Tue Jul 6 15:39:14 2010 ++++ ginac/function.pl Sun Oct 24 20:37:54 2010 @@ -59,7 +59,7 @@ sub generate { $declare_function_macro = generate( <<'END_OF_DECLARE_FUNCTION_MACRO','typename T${N}','const T${N} & p${N}','GiNaC::ex(p${N})'); @@ -108,7 +108,7 @@ $OpenBSD: patch-ginac_function_pl,v 1.1 2010/06/07 13:47:44 espie Exp $ { // Force re-evaluation even if the exprseq was already evaluated -@@ -840,12 +841,12 @@ function::function(unsigned ser, const exprseq & es) : +@@ -840,7 +841,7 @@ function::function(unsigned ser, const exprseq & es) : clearflag(status_flags::evaluated); } @@ -116,6 +116,9 @@ $OpenBSD: patch-ginac_function_pl,v 1.1 2010/06/07 13:47:44 espie Exp $ +function::function(serial_t ser, const exvector & v, bool discardable) : exprseq(v,discardable), serial(ser) { + if ( ser >= registered_functions().size() ) { +@@ -848,7 +849,7 @@ function::function(unsigned ser, const exvector & v, b + } } -function::function(unsigned ser, std::auto_ptr vp) @@ -123,7 +126,7 @@ $OpenBSD: patch-ginac_function_pl,v 1.1 2010/06/07 13:47:44 espie Exp $ : exprseq(vp), serial(ser) { } -@@ -1343,7 +1344,7 @@ void function::store_remember_table(ex const & result) +@@ -1346,7 +1347,7 @@ void function::store_remember_table(ex const & result) // public @@ -132,7 +135,7 @@ $OpenBSD: patch-ginac_function_pl,v 1.1 2010/06/07 13:47:44 espie Exp $ { size_t same_name = 0; for (size_t i=0; i::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end(); - unsigned serial = 0; +- unsigned serial = 0; ++ serial_t serial = 0; + while (i != end) { + if (i->get_name() == name && i->get_nparams() == nparams) + return serial; diff --git a/math/ginac/patches/patch-ginac_parser_parser_cpp b/math/ginac/patches/patch-ginac_parser_parser_cpp deleted file mode 100644 index ff12f13d13a..00000000000 --- a/math/ginac/patches/patch-ginac_parser_parser_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-ginac_parser_parser_cpp,v 1.1 2010/06/07 13:47:44 espie Exp $ ---- ginac/parser/parser.cpp.orig Mon Jun 7 09:40:21 2010 -+++ ginac/parser/parser.cpp Mon Jun 7 09:50:26 2010 -@@ -66,7 +66,7 @@ ex parser::parse_identifier_expr() - Parse_error_("no function \"" << name << "\" with " << - args.size() << " arguments"); - } -- ex ret = GiNaC::function((unsigned)reader->second, args); -+ ex ret = GiNaC::function((serial_t)reader->second, args); - return ret; - } -