From 448742e47d80fae9c6c5bf05696cf43f547275bb Mon Sep 17 00:00:00 2001 From: edd Date: Fri, 4 Jan 2013 14:05:41 +0000 Subject: [PATCH] update to maxima-5.29.1 OK shadchin@ --- math/maxima/Makefile | 4 +-- math/maxima/distinfo | 7 ++---- math/maxima/patches/patch-configure | 8 +++--- math/maxima/patches/patch-share_Makefile_in | 8 +++--- math/maxima/patches/patch-src_Makefile_in | 8 +++--- math/maxima/patches/patch-src_init-cl_lisp | 27 +++++++++++++++++++++ math/maxima/pkg/PLIST | 16 ++++++------ 7 files changed, 50 insertions(+), 28 deletions(-) create mode 100644 math/maxima/patches/patch-src_init-cl_lisp diff --git a/math/maxima/Makefile b/math/maxima/Makefile index 27b2ce5697d..2216611f2ef 100644 --- a/math/maxima/Makefile +++ b/math/maxima/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.25 2012/10/15 15:18:32 sthen Exp $ +# $OpenBSD: Makefile,v 1.26 2013/01/04 14:05:41 edd Exp $ COMMENT= GPL computer algebra system based on DOE Macsyma -VERSION= 5.27.0 +VERSION= 5.29.1 DISTNAME= maxima-${VERSION} CATEGORIES= math diff --git a/math/maxima/distinfo b/math/maxima/distinfo index f39de9305c9..958af09cb1f 100644 --- a/math/maxima/distinfo +++ b/math/maxima/distinfo @@ -1,5 +1,2 @@ -MD5 (maxima-5.27.0.tar.gz) = KcROaZNvGhk6b98dZklYPw== -RMD160 (maxima-5.27.0.tar.gz) = kkT3OX1qa/DPNjpq1NSRFggUuzU= -SHA1 (maxima-5.27.0.tar.gz) = jY0LPbJ/ACmGz/VCneqWraRqBXY= -SHA256 (maxima-5.27.0.tar.gz) = kAaANxTxOFIhxDlWl/rVPxJaE9KbULGI0EXQjiX43Kc= -SIZE (maxima-5.27.0.tar.gz) = 27101764 +SHA256 (maxima-5.29.1.tar.gz) = 5NhVjm7/CaoLQk/TWRo/MJx/UwaGQGWNQMCyppCgJN0= +SIZE (maxima-5.29.1.tar.gz) = 27148396 diff --git a/math/maxima/patches/patch-configure b/math/maxima/patches/patch-configure index 72622b13899..50ccb854898 100644 --- a/math/maxima/patches/patch-configure +++ b/math/maxima/patches/patch-configure @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure,v 1.1 2011/11/14 20:48:43 edd Exp $ +$OpenBSD: patch-configure,v 1.2 2013/01/04 14:05:41 edd Exp $ /bin/sh can't do this in POSIX mode on OpenBSD. @@ -9,9 +9,9 @@ Reported upstream here: https://sourceforge.net/tracker/?func=detail&aid=3436157&group_id=4933&atid=104933 ---- configure.orig Sat Nov 12 12:14:12 2011 -+++ configure Sat Nov 12 12:15:17 2011 -@@ -4571,12 +4571,12 @@ if test x"${exec_prefix}" = xNONE ; then +--- configure.orig Mon Dec 10 20:34:16 2012 ++++ configure Wed Dec 12 10:46:08 2012 +@@ -4700,12 +4700,12 @@ if test x"${exec_prefix}" = xNONE ; then else tmp_exec_prefix="${exec_prefix}" fi diff --git a/math/maxima/patches/patch-share_Makefile_in b/math/maxima/patches/patch-share_Makefile_in index cb3d2ab532c..ec76f52e5d8 100644 --- a/math/maxima/patches/patch-share_Makefile_in +++ b/math/maxima/patches/patch-share_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-share_Makefile_in,v 1.1 2011/11/14 20:48:43 edd Exp $ ---- share/Makefile.in.orig Thu Nov 10 12:22:36 2011 -+++ share/Makefile.in Thu Nov 10 12:23:02 2011 -@@ -1373,18 +1373,6 @@ EXTRA_DIST = $(genericdirDATA) +$OpenBSD: patch-share_Makefile_in,v 1.2 2013/01/04 14:05:41 edd Exp $ +--- share/Makefile.in.orig Mon Dec 10 20:34:31 2012 ++++ share/Makefile.in Wed Dec 12 10:46:08 2012 +@@ -1383,18 +1383,6 @@ EXTRA_DIST = $(genericdirDATA) all: all-am .SUFFIXES: diff --git a/math/maxima/patches/patch-src_Makefile_in b/math/maxima/patches/patch-src_Makefile_in index 0534fd2dbf8..a92ad4884fa 100644 --- a/math/maxima/patches/patch-src_Makefile_in +++ b/math/maxima/patches/patch-src_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_in,v 1.4 2011/11/14 20:48:43 edd Exp $ ---- src/Makefile.in.orig Sun Aug 28 17:57:39 2011 -+++ src/Makefile.in Thu Nov 10 12:20:20 2011 -@@ -562,18 +562,6 @@ EXTRA_DIST = $(real_lisp_sources) maxima.asd maxima.sy +$OpenBSD: patch-src_Makefile_in,v 1.5 2013/01/04 14:05:41 edd Exp $ +--- src/Makefile.in.orig Mon Dec 10 20:34:31 2012 ++++ src/Makefile.in Wed Dec 12 10:46:08 2012 +@@ -551,18 +551,6 @@ EXTRA_DIST = $(real_lisp_sources) maxima.asd maxima.sy all: all-am .SUFFIXES: diff --git a/math/maxima/patches/patch-src_init-cl_lisp b/math/maxima/patches/patch-src_init-cl_lisp new file mode 100644 index 00000000000..1d51ba83fab --- /dev/null +++ b/math/maxima/patches/patch-src_init-cl_lisp @@ -0,0 +1,27 @@ +$OpenBSD: patch-src_init-cl_lisp,v 1.1 2013/01/04 14:05:41 edd Exp $ + +Fix a bug about CL-USER:*MAXIMA-BUILD-TIME* being undefined. +Patch comes from upstream git. + +--- src/init-cl.lisp.orig Wed Dec 12 10:46:33 2012 ++++ src/init-cl.lisp Wed Dec 12 10:46:39 2012 +@@ -5,11 +5,16 @@ + ;; author: Liam Healy + ;;******************************************************** + +-(in-package :maxima) +- + ;;; An ANSI-CL portable initializer to replace init_max1.lisp + +-#+ecl (defvar cl-user::*maxima-build-time* '#.(multiple-value-list (get-decoded-time))) ++;; CL-USER:*MAXIMA-BUILD-TIME* is defined in maxima.asd and maxima.system, ++;; but I guess ECL doesn't see that, so define it here. ++#+ecl (progn ++ (in-package :cl-user) ++ (defvar *maxima-build-time* '#.(multiple-value-list (get-decoded-time))) ++ (export '*maxima-build-time*)) ++ ++(in-package :maxima) + + ;;; Locations of various types of files. These variables are discussed + ;;; in more detail in the file doc/implementation/dir_vars.txt. Since diff --git a/math/maxima/pkg/PLIST b/math/maxima/pkg/PLIST index a3797020101..e6ba6db2195 100644 --- a/math/maxima/pkg/PLIST +++ b/math/maxima/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2012/05/10 11:13:35 edd Exp $ +@comment $OpenBSD: PLIST,v 1.9 2013/01/04 14:05:41 edd Exp $ bin/maxima bin/rmaxima bin/xmaxima @@ -565,11 +565,11 @@ share/maxima/${VERSION}/share/contrib/fresnel/readme.txt share/maxima/${VERSION}/share/contrib/gentran/ share/maxima/${VERSION}/share/contrib/gentran/convmac.lisp share/maxima/${VERSION}/share/contrib/gentran/fdata.lisp +share/maxima/${VERSION}/share/contrib/gentran/gentran.lisp share/maxima/${VERSION}/share/contrib/gentran/global.lisp share/maxima/${VERSION}/share/contrib/gentran/gtfix.lisp share/maxima/${VERSION}/share/contrib/gentran/init.lisp share/maxima/${VERSION}/share/contrib/gentran/intrfc.lisp -share/maxima/${VERSION}/share/contrib/gentran/local.gtload.lisp share/maxima/${VERSION}/share/contrib/gentran/lspc.lisp share/maxima/${VERSION}/share/contrib/gentran/lspfor.lisp share/maxima/${VERSION}/share/contrib/gentran/lsprat.lisp @@ -626,8 +626,9 @@ share/maxima/${VERSION}/share/contrib/gentran/test/type.output share/maxima/${VERSION}/share/contrib/gentran/vaxinit.lisp share/maxima/${VERSION}/share/contrib/gentran/vaxlsp.lisp share/maxima/${VERSION}/share/contrib/gf/ +share/maxima/${VERSION}/share/contrib/gf/aes.mac +share/maxima/${VERSION}/share/contrib/gf/aes2.mac share/maxima/${VERSION}/share/contrib/gf/gf.mac -share/maxima/${VERSION}/share/contrib/gf/gf_hard_test.mac share/maxima/${VERSION}/share/contrib/gf/gf_manual.pdf share/maxima/${VERSION}/share/contrib/gf/gf_manual.tex share/maxima/${VERSION}/share/contrib/gf/gf_test.mac @@ -1238,8 +1239,6 @@ share/maxima/${VERSION}/share/misc/declin.dem share/maxima/${VERSION}/share/misc/declin.mac share/maxima/${VERSION}/share/misc/declin.usg share/maxima/${VERSION}/share/misc/diffop.lisp -share/maxima/${VERSION}/share/misc/disran.lisp -share/maxima/${VERSION}/share/misc/disran.usg share/maxima/${VERSION}/share/misc/dump.lisp share/maxima/${VERSION}/share/misc/dump.usg share/maxima/${VERSION}/share/misc/foptim.lisp @@ -1564,7 +1563,6 @@ share/maxima/${VERSION}/src/csimp2.lisp share/maxima/${VERSION}/src/db.lisp share/maxima/${VERSION}/src/defcal.lisp share/maxima/${VERSION}/src/defint.lisp -share/maxima/${VERSION}/src/defopt.lisp share/maxima/${VERSION}/src/desoln.lisp share/maxima/${VERSION}/src/displa.lisp share/maxima/${VERSION}/src/displm.lisp @@ -1596,9 +1594,7 @@ share/maxima/${VERSION}/src/intl.lisp share/maxima/${VERSION}/src/intpol.lisp share/maxima/${VERSION}/src/invert.lisp share/maxima/${VERSION}/src/irinte.lisp -share/maxima/${VERSION}/src/kclmac.lisp share/maxima/${VERSION}/src/laplac.lisp -share/maxima/${VERSION}/src/ldisp.lisp share/maxima/${VERSION}/src/lesfac.lisp share/maxima/${VERSION}/src/letmac.lisp share/maxima/${VERSION}/src/limit.lisp @@ -1795,7 +1791,6 @@ share/maxima/${VERSION}/src/rat3d.lisp share/maxima/${VERSION}/src/rat3e.lisp share/maxima/${VERSION}/src/ratmac.lisp share/maxima/${VERSION}/src/ratout.lisp -share/maxima/${VERSION}/src/ratpoi.lisp share/maxima/${VERSION}/src/residu.lisp share/maxima/${VERSION}/src/result.lisp share/maxima/${VERSION}/src/risch.lisp @@ -1886,6 +1881,7 @@ share/maxima/${VERSION}/tests/rtest_hypgeo.mac share/maxima/${VERSION}/tests/rtest_integrate.mac share/maxima/${VERSION}/tests/rtest_integrate_special.mac share/maxima/${VERSION}/tests/rtest_lambert_w.mac +share/maxima/${VERSION}/tests/rtest_laplace.mac share/maxima/${VERSION}/tests/rtest_log.mac share/maxima/${VERSION}/tests/rtest_map.mac share/maxima/${VERSION}/tests/rtest_mset.mac @@ -1893,6 +1889,7 @@ share/maxima/${VERSION}/tests/rtest_numth.mac share/maxima/${VERSION}/tests/rtest_plot.mac share/maxima/${VERSION}/tests/rtest_power.mac share/maxima/${VERSION}/tests/rtest_round.mac +share/maxima/${VERSION}/tests/rtest_rules.mac share/maxima/${VERSION}/tests/rtest_scalarp.mac share/maxima/${VERSION}/tests/rtest_sign.mac share/maxima/${VERSION}/tests/rtest_signum.mac @@ -1902,6 +1899,7 @@ share/maxima/${VERSION}/tests/rtest_translator.mac share/maxima/${VERSION}/tests/rtest_trig.mac share/maxima/${VERSION}/tests/rtest_zeta.mac share/maxima/${VERSION}/tests/rtestconjugate.mac +share/maxima/${VERSION}/tests/rtestdefstruct.mac share/maxima/${VERSION}/tests/rtesthyp.mac share/maxima/${VERSION}/tests/rtestifactor.mac share/maxima/${VERSION}/tests/rtestint.mac