5 files changed, 49 insertions, 55 deletions

diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 0851e16dbc01..6babb88a8890 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	maxima
-PORTVERSION=	5.16.3
-PORTREVISION=	4
+PORTVERSION=	5.17.0
+PORTREVISION=	0
 CATEGORIES=	math tk
 MASTER_SITES=	SF
 
@@ -20,9 +20,10 @@ RUN_DEPENDS=	${LOCALBASE}/bin/${LISPPORT} \
 		${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
-USE_TK=		84+
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	aclocal:110 autoconf:262
+USE_TK =		84+
+USE_GMAKE=		yes
+USE_PERL5_BUILD=	yes
+USE_AUTOTOOLS=		aclocal:110 autoconf:262
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--with-posix-shell=${LOCALBASE}/bin/bash \
 			--with-wish=${WISH} \
@@ -83,6 +84,6 @@ post-patch:
 	${LOCALBASE}/bin/bash ./fix_tab )
 
 regression-test: build
-	${LOCALBASE}/bin/bash ${WRKSRC}/src/maxima --batch-string='run_testsuite();'
+	${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 02d179f6bdb0..2984296a9949 100644
--- a/math/maxima/distinfo
+++ b/math/maxima/distinfo
@@ -1,3 +1,3 @@
-MD5 (maxima-5.16.3.tar.gz) = 690ee57f3884f565c898ed39a592e4e1
-SHA256 (maxima-5.16.3.tar.gz) = a2d581a9565eb022310c09f0b6235ccd0707d77c390ce8bd90825f528831358a
-SIZE (maxima-5.16.3.tar.gz) = 19938512
+MD5 (maxima-5.17.0.tar.gz) = 98ec3ec237d55639a8de5b317990eb2d
+SHA256 (maxima-5.17.0.tar.gz) = 922a31b4ae042064519d557c8c0c657acdc71c6e4c53f598441250452a85f7db
+SIZE (maxima-5.17.0.tar.gz) = 20042951
diff --git a/math/maxima/files/patch-doc-info-Makefile.in b/math/maxima/files/patch-doc-info-Makefile.in
deleted file mode 100644
index 504638138541..000000000000
--- a/math/maxima/files/patch-doc-info-Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
---- doc/info/Makefile.in.orig	Mon May 28 00:29:36 2007
-+++ doc/info/Makefile.in	Mon May 28 00:41:25 2007
-@@ -878,24 +878,26 @@
- 	rm -f index.hhk
- 
- check_texinfo:
--	pattern=`printf "\r$$"` ; \
--	bad_files=`find . -name '*.texi' -print | xargs grep -l -e "$$pattern"` ; \
--	[ -z  "$$bad_files" ] || ( echo "ERROR: The following files have DOS-style EOLs: $$bad_files" ; \
--	echo "Run make distclean and then /doc/info/fix_crlf to fix the problem." ; exit 1 )
--	pattern=`printf "\t"` ; \
--	bad_files=`find . -name '*.texi' -print | xargs grep -l -e "$$pattern"` ; \
--	[ -z  "$$bad_files" ] || ( echo "ERROR: The following files have unexpanded Tabs: $$bad_files" ; \
--	echo "Run make distclean and then /doc/info/fix_tab to fix the problem." ; exit 1 )
-+	echo check_texinfo
-+#	pattern=`printf "\r$$"` ; \
-+#	bad_files=`find . -name '*.texi' -print | xargs grep -l -e "$$pattern"` ; \
-+#	[ -z  "$$bad_files" ] || ( echo "ERROR: The following files have DOS-style EOLs: $$bad_files" ; \
-+#	echo "Run make distclean and then /doc/info/fix_crlf to fix the problem." ; exit 1 )
-+#	pattern=`printf "\t"` ; \
-+#	bad_files=`find . -name '*.texi' -print | xargs grep -l -e "$$pattern"` ; \
-+#	[ -z  "$$bad_files" ] || ( echo "ERROR: The following files have unexpanded Tabs: $$bad_files" ; \
-+#	echo "Run make distclean and then /doc/info/fix_tab to fix the problem." ; exit 1 )
- 
- warn_texinfo:
--	pattern=`printf "\r$$"` ; \
--	bad_files=`find . -name '*.texi' -print | xargs grep -l -e "$$pattern"` ; \
--	[ -z  "$$bad_files" ] || ( echo "WARNING: The following files have DOS-style EOLs: $$bad_files" ; \
--	echo "Run /doc/info/fix_crlf to fix the problem." )
--	pattern=`printf "\t"` ; \
--	bad_files=`find . -name '*.texi' -print | xargs grep -l -e "$$pattern"` ; \
--	[ -z  "$$bad_files" ] || ( echo "WARNING: The following files have unexpanded Tabs: $$bad_files" ; \
--	echo "Run /doc/info/fix_tab to fix the problem." )
-+	echo warn_texinfo
-+#	pattern=`printf "\r$$"` ; \
-+#	bad_files=`find . -name '*.texi' -print | xargs grep -l -e "$$pattern"` ; \
-+#	[ -z  "$$bad_files" ] || ( echo "WARNING: The following files have DOS-style EOLs: $$bad_files" ; \
-+#	echo "Run /doc/info/fix_crlf to fix the problem." )
-+#	pattern=`printf "\t"` ; \
-+#	bad_files=`find . -name '*.texi' -print | xargs grep -l -e "$$pattern"` ; \
-+#	[ -z  "$$bad_files" ] || ( echo "WARNING: The following files have unexpanded Tabs: $$bad_files" ; \
-+#	echo "Run /doc/info/fix_tab to fix the problem." )
- 
- .PHONY: check_texinfo warn_texinfo
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/math/maxima/files/patch-doc_info_Makefile.am b/math/maxima/files/patch-doc_info_Makefile.am
new file mode 100644
index 000000000000..25d0eab08818
--- /dev/null
+++ b/math/maxima/files/patch-doc_info_Makefile.am
@@ -0,0 +1,29 @@
+--- doc/info/Makefile.am.orig	2008-12-08 11:08:06.607586350 -0500
++++ doc/info/Makefile.am	2008-12-08 11:10:05.539477973 -0500
+@@ -202,24 +202,10 @@
+     check_crlf check_tab fix_crlf fix_tab build_index.pl
+ 
+ check_texinfo:
+-	pattern=`printf "\r$$"` ; \
+-	bad_files=`find . -name '*.texi' -print | xargs $(EGREP) -l -e "$$pattern"` ; \
+-	[ -z  "$$bad_files" ] || ( echo "ERROR: The following files have DOS-style EOLs: $$bad_files" ; \
+-	echo "Run make distclean and then /doc/info/fix_crlf to fix the problem." ; exit 1 )
+-	pattern=`printf "\t"` ; \
+-	bad_files=`find . -name '*.texi' -print | xargs $(EGREP) -l -e "$$pattern"` ; \
+-	[ -z  "$$bad_files" ] || ( echo "ERROR: The following files have unexpanded Tabs: $$bad_files" ; \
+-	echo "Run make distclean and then /doc/info/fix_tab to fix the problem." ; exit 1 )
++	echo "check_texinfo dummy target"
+ 
+ warn_texinfo:
+-	pattern=`printf "\r$$"` ; \
+-	bad_files=`find . -name '*.texi' -print | xargs $(EGREP) -l -e "$$pattern"` ; \
+-	[ -z  "$$bad_files" ] || ( echo "WARNING: The following files have DOS-style EOLs: $$bad_files" ; \
+-	echo "Run /doc/info/fix_crlf to fix the problem." )
+-	pattern=`printf "\t"` ; \
+-	bad_files=`find . -name '*.texi' -print | xargs $(EGREP) -l -e "$$pattern"` ; \
+-	[ -z  "$$bad_files" ] || ( echo "WARNING: The following files have unexpanded Tabs: $$bad_files" ; \
+-	echo "Run /doc/info/fix_tab to fix the problem." )
++	echo "warn_texinfo dummy target"
+ 
+ .PHONY: check_texinfo warn_texinfo
+ 
diff --git a/math/maxima/pkg-plist b/math/maxima/pkg-plist
index 6baad5a50397..0b1ab684584a 100644
--- a/math/maxima/pkg-plist
+++ b/math/maxima/pkg-plist
@@ -180,7 +180,6 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_90.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_91.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_92.html
-%%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_93.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_abt.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_fot.html
 %%DATADIR%%/%%PORTVERSION%%/doc/html/maxima_ovr.html
@@ -213,6 +212,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/emacs/imaxima.lisp
 %%DATADIR%%/%%PORTVERSION%%/emacs/maxima-font-lock.el
 %%DATADIR%%/%%PORTVERSION%%/emacs/maxima.el
+%%DATADIR%%/%%PORTVERSION%%/emacs/setup-imaxima-imath.el
 %%DATADIR%%/%%PORTVERSION%%/emacs/smart-complete.el
 %%DATADIR%%/%%PORTVERSION%%/emacs/sshell.el
 %%DATADIR%%/%%PORTVERSION%%/share/affine/README
@@ -1027,6 +1027,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/numeric/format.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/numeric/format.usg
 %%DATADIR%%/%%PORTVERSION%%/share/numeric/interpol.mac
+%%DATADIR%%/%%PORTVERSION%%/share/numeric/jtroot3.mac
 %%DATADIR%%/%%PORTVERSION%%/share/numeric/newton.mac
 %%DATADIR%%/%%PORTVERSION%%/share/numeric/newton1.mac
 %%DATADIR%%/%%PORTVERSION%%/share/numeric/riemsum.mac
@@ -1077,6 +1078,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/simplification/rducon.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/simplification/rncomb.dem
 %%DATADIR%%/%%PORTVERSION%%/share/simplification/rncomb.mac
+%%DATADIR%%/%%PORTVERSION%%/share/simplification/rtest_rncomb.mac
 %%DATADIR%%/%%PORTVERSION%%/share/simplification/scifac.dem
 %%DATADIR%%/%%PORTVERSION%%/share/simplification/scifac.lisp
 %%DATADIR%%/%%PORTVERSION%%/share/simplification/sqdnst.mac
@@ -1185,6 +1187,9 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/share/vector/vect.dem
 %%DATADIR%%/%%PORTVERSION%%/share/vector/vect.mac
 %%DATADIR%%/%%PORTVERSION%%/share/vector/vect.usg
+%%DATADIR%%/%%PORTVERSION%%/share/vector/vector_rebuild.lisp
+%%DATADIR%%/%%PORTVERSION%%/share/vector/vector_rebuild.mac
+%%DATADIR%%/%%PORTVERSION%%/share/vector/vector_rebuild.usg
 %%DATADIR%%/%%PORTVERSION%%/share/vector/vect_transform.mac
 %%DATADIR%%/%%PORTVERSION%%/share/vector/vector.dem
 %%DATADIR%%/%%PORTVERSION%%/share/vector/vector.mac
@@ -1231,6 +1236,7 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/src/fcall.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/float.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/fortra.lisp
+%%DATADIR%%/%%PORTVERSION%%/src/gamma.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/generate-sys-proclaim.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/generr.lisp
 %%DATADIR%%/%%PORTVERSION%%/src/gnuplot.lisp
@@ -1522,12 +1528,15 @@ libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_dot.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_equal.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_everysome.mac
+%%DATADIR%%/%%PORTVERSION%%/tests/rtest_expintegral.mac
+%%DATADIR%%/%%PORTVERSION%%/tests/rtest_gamma.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_hypgeo.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_map.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_mset.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_round.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_scalarp.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_sign.mac
+%%DATADIR%%/%%PORTVERSION%%/tests/rtest_signum.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_taylor.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_trig.mac
 %%DATADIR%%/%%PORTVERSION%%/tests/rtest_zeta.mac