4 files changed, 19 insertions, 22 deletions

diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 8a418bd7c0e4..9f600125eaaa 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	maxima
-PORTVERSION=	5.21.1
+PORTVERSION=	5.22.0
 CATEGORIES=	math tk
 MASTER_SITES=	SF/maxima/Maxima-source/${PORTVERSION}-source
 
@@ -78,11 +78,12 @@ IGNORE=		define only one lisp
 
 post-patch:
 	${FIND} -X ${WRKSRC}/archive ${WRKSRC}/interfaces/xmaxima \
-	 -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e "s;tclsh;${TCLSH};g"
+	-name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e "s;tclsh;${TCLSH};g"
+	${REINPLACE_CMD} -e "s;/usr/;${LOCALBASE}/;g" ${WRKSRC}/src/intl.lisp
 	( cd ${WRKSRC}/doc/info ; ${LOCALBASE}/bin/bash ./fix_crlf ; \
 	${LOCALBASE}/bin/bash ./fix_tab )
 
-regression-test: build
+test: build
 	${LOCALBASE}/bin/bash ${WRKSRC}/maxima-local --batch-string='run_testsuite();'
 
 .include <bsd.port.post.mk>
diff --git a/math/maxima/distinfo b/math/maxima/distinfo
index 973385deeec0..b54dabac3c8f 100644
--- a/math/maxima/distinfo
+++ b/math/maxima/distinfo
@@ -1,3 +1,3 @@
-MD5 (maxima-5.21.1.tar.gz) = e08ed533f3059cec52788ef35198bdcc
-SHA256 (maxima-5.21.1.tar.gz) = 1dae887e1787871437d699a6b1acc1c1f7428729487492a07c6a31e26bf53a1b
-SIZE (maxima-5.21.1.tar.gz) = 21371967
+MD5 (maxima-5.22.0.tar.gz) = 25fda7174e849f3e3e96be6b5f252823
+SHA256 (maxima-5.22.0.tar.gz) = 3f11c597e2ecd38f6531365548d4b630463ad15e11ba89ddb7230e93065fa2a4
+SIZE (maxima-5.22.0.tar.gz) = 21468637
diff --git a/math/maxima/files/patch-interfaces-xmaxima-doc-xmaxima.texi b/math/maxima/files/patch-interfaces-xmaxima-doc-xmaxima.texi
deleted file mode 100644
index 998409b13c98..000000000000
--- a/math/maxima/files/patch-interfaces-xmaxima-doc-xmaxima.texi
+++ /dev/null
@@ -1,15 +0,0 @@
---- interfaces/xmaxima/doc/xmaxima.texi.orig	Sun Aug 26 05:58:42 2007
-+++ interfaces/xmaxima/doc/xmaxima.texi	Sun Aug 26 06:06:12 2007
-@@ -25,6 +25,12 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-+
-+@format
-+START-INFO-DIR-ENTRY
-+* Xmaxima: (xmaxima).     Graphical interface for Maxima, with additional plotting functions.
-+END-INFO-DIR-ENTRY
-+@end format
- @end ifinfo
- 
- @titlepage
diff --git a/math/maxima/pkg-plist b/math/maxima/pkg-plist
index bef019c83dc9..3993d605f488 100644
--- a/math/maxima/pkg-plist
+++ b/math/maxima/pkg-plist
@@ -186,6 +186,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_93.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_94.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_95.html
+%%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_96.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_abt.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_fot.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_ovr.html
@@ -297,8 +298,11 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/calculus/qualsp.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/calculus/revert.mac
 %%DATADIR%%/%%PORTVERSION%%/share/calculus/taylor1.mac
+%%DATADIR%%/%%PORTVERSION%%/share/colnew/colnew-if.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/colnew/colnew-lisp.system
 %%DATADIR%%/%%PORTVERSION%%/share/colnew/colnew-package.lisp
+%%DATADIR%%/%%PORTVERSION%%/share/colnew/colnew.mac
+%%DATADIR%%/%%PORTVERSION%%/share/colnew/colnew.system
 %%DATADIR%%/%%PORTVERSION%%/share/colnew/lisp/approx.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/colnew/lisp/appsln.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/colnew/lisp/colnew.lisp
@@ -328,6 +332,8 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/colnew/lisp/subfor.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/colnew/lisp/vmonde.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/colnew/lisp/vwblok.lisp
+%%DATADIR%%/%%PORTVERSION%%/share/colnew/prob1.mac
+%%DATADIR%%/%%PORTVERSION%%/share/colnew/prob2.mac
 %%DATADIR%%/%%PORTVERSION%%/share/combinatorics/README
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/Grobner/README
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/Grobner/grobner-demo.output
@@ -435,6 +441,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/ezunits/physical_constants.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/ezunits/rtestezunits.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/f90.lisp
+%%DATADIR%%/%%PORTVERSION%%/share/contrib/finance/finance.es.texi
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/finance/finance.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/finance/finance.texi
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/floatproperties.lisp
@@ -688,8 +695,10 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/rand/vandpol.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/rand/vandpol.usg
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/rtest_lsquares.mac
+%%DATADIR%%/%%PORTVERSION%%/share/contrib/rtest_mnewton.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/rtest_opproperties.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/rtest_sequence.mac
+%%DATADIR%%/%%PORTVERSION%%/share/contrib/rtest_solve_rat_ineq.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/rtest_to_poly_solver.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/rtest_topoly.mac
 %%DATADIR%%/%%PORTVERSION%%/share/contrib/rtest_z_transform.mac
@@ -1220,6 +1229,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/sym/treillis.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/sym/tri.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/sym/util.lisp
+%%DATADIR%%/%%PORTVERSION%%/share/template-standalone.texi
 %%DATADIR%%/%%PORTVERSION%%/share/template.texi
 %%DATADIR%%/%%PORTVERSION%%/share/tensor/ademo.dem
 %%DATADIR%%/%%PORTVERSION%%/share/tensor/adsitter.dem
@@ -1287,6 +1297,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/trigonometry/trgsmp.mac
 %%DATADIR%%/%%PORTVERSION%%/share/trigonometry/trigrat.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/utils/mactex-utilities.lisp
+%%DATADIR%%/%%PORTVERSION%%/share/vector/rtest_vect.mac
 %%DATADIR%%/%%PORTVERSION%%/share/vector/vect.dem
 %%DATADIR%%/%%PORTVERSION%%/share/vector/vect.mac
 %%DATADIR%%/%%PORTVERSION%%/share/vector/vect.usg
@@ -1629,9 +1640,9 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest9.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest9a.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_abs.mac
-%%DATADIR%%/%%PORTVERSION%%/tests/rtest_ask.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_algebraic.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_allnummod.mac
+%%DATADIR%%/%%PORTVERSION%%/tests/rtest_ask.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_boolean.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_diff_invtrig.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_dot.mac