On Sun, Sep 13, 2015 at 11:17:45AM +0200, Ingo Feinerer wrote:
> On Sat, Sep 12, 2015 at 09:23:56AM +0200, Ingo Feinerer wrote:
> > On Sat, Sep 05, 2015 at 10:38:18AM +0200, Ingo Feinerer wrote:
> > > Update Maxima 5.36.1 -> 5.37.1:
> >
> > Revised diff attached based on received feedback.
> >
> > > - Eliminate no_x11 flavor
> >
> > Keep no_x11 flavor (requested by daniel@).
> >
> > [ Please note that I changed BUILD_DEPENDS += ${MODTK_RUN_DEPENDS} to
> > BUILD_DEPENDS += ${MODTK_BUILD_DEPENDS}. Was it just a typo? Or was
> > there a reason for having it? ]
> >
> > > - patch-configure is now merged in upstream
> > > - No need for patch-maxima_spec_in as we do not build Linux RPM packages
> > >
> > > NO_TEST is just set for this release as upstream forgot to include a
> > > file. If you run the tests manually from Maxima, they all pass (as we
> > > now have ecl 16 in ports).
>
> Another revised diff based on further feedback. Instead of NO_TEST just
> add (patch) the missing file.
One further small tweak for lang/python which is needed for configure.
@daniel is OK with it if someone else double checks the BUILD_DEPENDS +=
${MODTK_RUN_DEPENDS} -> BUILD_DEPENDS += ${MODTK_BUILD_DEPENDS} change.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/maxima/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 16 Jun 2015 05:04:43 -0000 1.31
+++ Makefile 17 Sep 2015 05:31:18 -0000
@@ -2,7 +2,7 @@
COMMENT= GPL computer algebra system based on DOE Macsyma
-VERSION= 5.36.1
+VERSION= 5.37.1
DISTNAME= maxima-${VERSION}
CATEGORIES= math
@@ -18,6 +18,11 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE
USE_GMAKE= yes
+# Python is not needed for building but configure fails without it.
+# Instead of patching just add the lang/python dependency.
+# http://sourceforge.net/p/maxima/mailman/message/34462954/
+MODULES = lang/python
+
LIB_DEPENDS= lang/ecl
RUN_DEPENDS = misc/rlwrap
@@ -33,7 +38,7 @@ FLAVOR?=
MODULES+= x11/tk
RUN_DEPENDS += ${MODTK_RUN_DEPENDS} \
math/gnuplot
-BUILD_DEPENDS += ${MODTK_RUN_DEPENDS}
+BUILD_DEPENDS += ${MODTK_BUILD_DEPENDS}
CONFIGURE_ARGS += --with-wish=${MODTK_BIN}
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/maxima/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 16 Jun 2015 05:04:43 -0000 1.11
+++ distinfo 17 Sep 2015 05:31:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (maxima-5.36.1.tar.gz) = QAv4MAC4TSgNdeIA4HhYL+RPIyIIJFYswGxYnYqZOXQ=
-SIZE (maxima-5.36.1.tar.gz) = 29615673
+SHA256 (maxima-5.37.1.tar.gz) = URR3y99GRaar1JWW1Z7USeyOAS+QtZsd3/x4PGl790Q=
+SIZE (maxima-5.37.1.tar.gz) = 29952404
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 16 Jun 2015 05:04:43 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2015/06/16 05:04:43 feinerer Exp $
-
-/bin/sh can't do this in POSIX mode on OpenBSD.
-
-Similar to this:
-https://bugs.launchpad.net/intltool/+bug/639857
-
-Reported upstream here:
-https://sourceforge.net/tracker/?func=detail&aid=3436157&group_id=4933&atid=104933
-
-
---- configure.orig Wed May 27 19:11:13 2015
-+++ configure Wed May 27 19:14:04 2015
-@@ -4926,12 +4926,12 @@ if test x"${exec_prefix}" = xNONE ; then
- else
- tmp_exec_prefix="${exec_prefix}"
- fi
--expanded_top_srcdir="`(cd \"$top_srcdir\" 1>/dev/null 2>/dev/null; pwd)`"
-+expanded_top_srcdir=`(cd "$top_srcdir" 1>/dev/null 2>/dev/null; pwd)`
- expanded_exec_prefix="${tmp_exec_prefix}"
--expanded_libdir="`eval \"exec_prefix=\\\"${tmp_exec_prefix}\\\";echo
${libdir}\"`"
--expanded_libexecdir="`eval \"exec_prefix=\\\"${tmp_exec_prefix}\\\";echo
${libexecdir}\"`"
--expanded_datadir="`eval
\"prefix=\\\"${tmp_prefix}\\\";datarootdir=\\\"${datarootdir}\\\";echo
${datadir}\"`"
--expanded_infodir="`eval
\"prefix=\\\"${tmp_prefix}\\\";datarootdir=\\\"${datarootdir}\\\";echo
${infodir}\"`"
-+expanded_libdir=`eval "exec_prefix="${tmp_exec_prefix}";echo ${libdir}"`
-+expanded_libexecdir=`eval "exec_prefix="${tmp_exec_prefix}";echo
${libexecdir}"`
-+expanded_datadir=`eval
"prefix="${tmp_prefix}";datarootdir="${datarootdir}";echo ${datadir}"`
-+expanded_infodir=`eval
"prefix="${tmp_prefix}";datarootdir="${datarootdir}";echo ${infodir}"`
-
-
-
Index: patches/patch-maxima_spec_in
===================================================================
RCS file: patches/patch-maxima_spec_in
diff -N patches/patch-maxima_spec_in
--- patches/patch-maxima_spec_in 20 Aug 2008 20:36:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-maxima_spec_in,v 1.1 2008/08/20 20:36:45 espie Exp $
---- maxima.spec.in.orig Fri Aug 15 18:28:30 2008
-+++ maxima.spec.in Fri Aug 15 18:28:40 2008
-@@ -33,7 +33,7 @@
-
- # Inhibit automatic compressing of info files. Compressed info
- # files break maxima's internal help.
--%define __spec_install_post /bin/true
-+%define __spec_install_post /usr/bin/true
-
- Summary: Symbolic Computation Program
- Name: maxima
Index: patches/patch-tests_test_sh_in
===================================================================
RCS file: patches/patch-tests_test_sh_in
diff -N patches/patch-tests_test_sh_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_test_sh_in 17 Sep 2015 05:31:18 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Only needed for make test in 5.37.1 as upstream forgot to package the file.
+http://sourceforge.net/p/maxima/mailman/message/34424940/
+
+--- tests/test.sh.in.orig Sun Sep 13 10:25:21 2015
++++ tests/test.sh.in Sun Sep 13 10:25:01 2015
+@@ -0,0 +1,25 @@
++#!/bin/sh
++
++# This is the general driver used by the testsuite to run tests by
++# "make check" in the tests directory. It gets processed by a
++# simple-minded sed script to fill in the lisp implementation etc
++# below and turns into <lispname>-test.sh
++
++LOCAL_MAXIMA="!LOCAL_MAXIMA!"
++OUTPUT_LOG="!OUTPUT_LOG!"
++LISP="!LISPNAME!"
++
++# Die if a command fails
++set -e
++
++# This command doesn't exit with a helpful status if the lisp survives
++# but the test fails so we must check by hand that nothing untoward
++# happened
++$LOCAL_MAXIMA --lisp=$LISP --batch-string="run_testsuite();" \
++ </dev/null 2>&1 | tee "$OUTPUT_LOG"
++
++grep -q 'No unexpected errors' <"$OUTPUT_LOG"
++
++# We'll have another copy of the log from the output of this script,
++# so there's no point in leaving the greppable one lying around.
++rm "$OUTPUT_LOG"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/maxima/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 16 Jun 2015 05:04:43 -0000 1.10
+++ pkg/PLIST 17 Sep 2015 05:31:19 -0000
@@ -494,6 +494,7 @@ share/maxima/${VERSION}/share/contrib/bo
share/maxima/${VERSION}/share/contrib/boolsimp/
share/maxima/${VERSION}/share/contrib/boolsimp/boolsimp.lisp
share/maxima/${VERSION}/share/contrib/boolsimp/rtest_boolsimp.mac
+share/maxima/${VERSION}/share/contrib/cgrind.lisp
share/maxima/${VERSION}/share/contrib/clebsch_gordan.mac
share/maxima/${VERSION}/share/contrib/clebsh-gordan.tex
share/maxima/${VERSION}/share/contrib/colorterm.lisp
@@ -558,6 +559,17 @@ share/maxima/${VERSION}/share/contrib/di
share/maxima/${VERSION}/share/contrib/diffequations/tests/rtestode_odelin.mac
share/maxima/${VERSION}/share/contrib/diffequations/tests/rtestode_utils.mac
share/maxima/${VERSION}/share/contrib/diffequations/tests/testsuite.lisp
+share/maxima/${VERSION}/share/contrib/elliptic_curves/
+share/maxima/${VERSION}/share/contrib/elliptic_curves/curve_parameters.mac
+share/maxima/${VERSION}/share/contrib/elliptic_curves/ec2.lisp
+share/maxima/${VERSION}/share/contrib/elliptic_curves/elliptic_curves.lisp
+share/maxima/${VERSION}/share/contrib/elliptic_curves/elliptic_curves.mac
+share/maxima/${VERSION}/share/contrib/elliptic_curves/elliptic_curves.texi
+share/maxima/${VERSION}/share/contrib/elliptic_curves/figures/
+share/maxima/${VERSION}/share/contrib/elliptic_curves/figures/ec_Z13.pdf
+share/maxima/${VERSION}/share/contrib/elliptic_curves/figures/ec_Z13.png
+share/maxima/${VERSION}/share/contrib/elliptic_curves/modular_polynomials.lisp
+share/maxima/${VERSION}/share/contrib/elliptic_curves/rtest_elliptic_curves.mac
share/maxima/${VERSION}/share/contrib/engineering-format.lisp
share/maxima/${VERSION}/share/contrib/f90.lisp
share/maxima/${VERSION}/share/contrib/floatproperties.lisp
@@ -793,6 +805,7 @@ share/maxima/${VERSION}/share/contrib/rk
share/maxima/${VERSION}/share/contrib/rkf45/rkf45.pdf
share/maxima/${VERSION}/share/contrib/rkf45/rtest_rkf45.mac
share/maxima/${VERSION}/share/contrib/rtest_augmented_lagrangian.mac
+share/maxima/${VERSION}/share/contrib/rtest_ggf.mac
share/maxima/${VERSION}/share/contrib/sarag/
share/maxima/${VERSION}/share/contrib/sarag/aliases.mac
share/maxima/${VERSION}/share/contrib/sarag/arag_test.mac
@@ -1485,6 +1498,7 @@ share/maxima/${VERSION}/share/stats/rtes
share/maxima/${VERSION}/share/stats/stats.mac
share/maxima/${VERSION}/share/stringproc/
share/maxima/${VERSION}/share/stringproc/base64.lisp
+share/maxima/${VERSION}/share/stringproc/cryptools.lisp
share/maxima/${VERSION}/share/stringproc/eval_string.lisp
share/maxima/${VERSION}/share/stringproc/md5.lisp
share/maxima/${VERSION}/share/stringproc/pregexp.lisp
@@ -1668,6 +1682,7 @@ share/maxima/${VERSION}/src/fcall.lisp
share/maxima/${VERSION}/src/float.lisp
share/maxima/${VERSION}/src/fortra.lisp
share/maxima/${VERSION}/src/gamma.lisp
+share/maxima/${VERSION}/src/gcl-compat.lisp
share/maxima/${VERSION}/src/generate-sys-proclaim.lisp
share/maxima/${VERSION}/src/generr.lisp
share/maxima/${VERSION}/src/getopt.lisp
@@ -1884,6 +1899,7 @@ share/maxima/${VERSION}/src/result.lisp
share/maxima/${VERSION}/src/risch.lisp
share/maxima/${VERSION}/src/rpart.lisp
share/maxima/${VERSION}/src/rzmac.lisp
+share/maxima/${VERSION}/src/safe-recursion.lisp
share/maxima/${VERSION}/src/schatc.lisp
share/maxima/${VERSION}/src/scs.lisp
share/maxima/${VERSION}/src/series.lisp
@@ -1901,7 +1917,6 @@ share/maxima/${VERSION}/src/strmac.lisp
share/maxima/${VERSION}/src/sublis.lisp
share/maxima/${VERSION}/src/sumcon.lisp
share/maxima/${VERSION}/src/suprv1.lisp
-share/maxima/${VERSION}/src/sys-proclaim.lisp
share/maxima/${VERSION}/src/tlimit.lisp
share/maxima/${VERSION}/src/todd-coxeter.lisp
share/maxima/${VERSION}/src/trans1.lisp
