Bugfix. fix wish --> wish8.4 to fix xmaxima. Sort out INFO files a

bit better, and allow different lisp compilers to be used. The clisp
compiler dumps core, so mark that case as an error until it can get
fixed. Fix the COMMENT a bit to fit in with sysinstall better.

OK'ed by:	portmgr(marcus)

2 files changed, 39 insertions, 29 deletions

diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 06d89f7eb3e0..9dce913d0f2a 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -8,24 +8,14 @@
 PORTNAME=	maxima
 PORTVERSION=	5.9.0
 CATEGORIES=	math
-MASTER_SITES=	http://unc.dl.sourceforge.net/sourceforge/maxima/ \
-		http://aleron.dl.sourceforge.net/sourceforge/maxima/ \
-		http://switch.dl.sourceforge.net/sourceforge/maxima/ \
-		http://heanet.dl.sourceforge.net/sourceforge/maxima/ \
-		http://umn.dl.sourceforge.net/sourceforge/maxima/ \
-		http://flow.dl.sourceforge.net/sourceforge/maxima/ \
-		http://belnet.dl.sourceforge.net/sourceforge/maxima/ \
-		http://easynews.dl.sourceforge.net/sourceforge/maxima/ \
-		http://twtelecom.dl.sourceforge.net/sourceforge/maxima/ \
-		http://cesnet.dl.sourceforge.net/sourceforge/maxima/ \
-		${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 
 MAINTAINER=	sf@slappy.org
-COMMENT=	Maxima symbolic computation program
+COMMENT=	Symbolic mathematics program
 
-BUILD_DEPENDS=	lisp:${PORTSDIR}/lang/cmucl
+BUILD_DEPENDS=	${LISPPORT}
 LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84
-RUN_DEPENDS=	${LOCALBASE}/bin/lisp:${PORTSDIR}/lang/cmucl \
+RUN_DEPENDS=	${LOCALBASE}/bin/${LISPPORT} \
 		${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
 
@@ -34,10 +24,43 @@ USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--with-posix-shell=${PREFIX}/bin/bash
+			--with-posix-shell=${LOCALBASE}/bin/bash \
+			--with-wish=${LOCALBASE}/bin/wish8.4 \
+			${LISPSELECT}
 # don't pass "-s" to install to avoid trying to strip a shell script
 CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}"
 
 MAN1=		maxima.1
+INFO=		maxima
+
+PLIST_SUB=	LISPBIN=${LISPBINARY}
+
+#Only define ONE of these!
+USE_CMUCL=	yes
+#USE_GCL=	yes
+#USE_CLISP=	yes
+
+.if defined(USE_CMUCL)
+LISPSELECT=	--enable-cmucl
+LISPPORT=	lisp:${PORTSDIR}/lang/cmucl
+LISPBINARY=	binary-cmucl/maxima.core
+.endif
+
+.if defined(USE_GCL)
+LISPSELECT=	--enable-gcl
+LISPPORT=	gcl:${PORTSDIR}/lang/gcl
+LISPBINARY=	binary-gcl/maxima
+.endif
+
+.if defined(USE_CLISP)
+LISPSELECT=	--enable-clisp
+LISPPORT=	clisp:${PORTSDIR}/lang/clisp
+# The value for LISPBINARY is a guess. Fix when the core dump is sorted out.
+LISPBINARY=	binary-clisp/maxima.core
+BROKEN=		"Dumps core while compiling bessel.fas in CURRENT"
+.endif
+
+post-extract:
+		@${RM} -f ${WRKSRC}/doc/info/*.info*
 
 .include <bsd.port.mk>
diff --git a/math/maxima/pkg-plist b/math/maxima/pkg-plist
index 48377165a055..5dce5158fbb8 100644
--- a/math/maxima/pkg-plist
+++ b/math/maxima/pkg-plist
@@ -1,22 +1,9 @@
 bin/maxima
 bin/xmaxima
-info/maxima.info
+lib/maxima/5.9.0/%%LISPBIN%%
 info/maxima.info-1
-info/maxima.info-10
-info/maxima.info-11
-info/maxima.info-12
-info/maxima.info-13
-info/maxima.info-14
-info/maxima.info-15
 info/maxima.info-2
 info/maxima.info-3
-info/maxima.info-4
-info/maxima.info-5
-info/maxima.info-6
-info/maxima.info-7
-info/maxima.info-8
-info/maxima.info-9
-lib/maxima/5.9.0/binary-cmucl/maxima.core
 libexec/maxima/5.9.0/maxima-run-lisp
 libexec/maxima/5.9.0/mgnuplot
 libexec/maxima/5.9.0/omplotdata