git: 3b2281ed4a62 - main - math/maxima: Bugfix, style, adopt again

The branch main has been updated by salvadore:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3b2281ed4a6211220244727787b87ad275f13d7a

commit 3b2281ed4a6211220244727787b87ad275f13d7a
Author:     Lorenzo Salvadore <salvadore@FreeBSD.org>
AuthorDate: 2022-04-23 15:48:00 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2022-04-24 10:29:49 +0000

    math/maxima: Bugfix, style, adopt again
    
    - Fix pkg-plist when SBCL is ON [1]
    - Improve style according to suggestions from portclippy and portfmt
    
    PR:             247955 [1]
    Reported by:    dal36@gmx.co.uk [1]
    Approved by:    gerald (mentor)
---
 math/maxima/Makefile  | 67 ++++++++++++++++++++++++++++-----------------------
 math/maxima/pkg-plist |  4 +--
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index ef4ce4b3102c..a7eef60618dc 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -5,14 +5,15 @@ PORTVERSION=	5.46.0
 CATEGORIES=	math lisp tk
 MASTER_SITES=	SF/maxima/Maxima-source/${PORTVERSION}-source
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	Symbolic mathematics program
 
-LICENSE=				GPLv2 MAXIMAEXTRACLAUSE
-LICENSE_COMB=				multi
-LICENSE_NAME_MAXIMAEXTRACLAUSE=		Maxima extra clause
-LICENSE_FILE_MAXIMAEXTRACLAUSE=		${FILESDIR}/license-extra-clause.txt
-LICENSE_PERMS_MAXIMAEXTRACLAUSE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE=	GPLv2 MAXIMAEXTRACLAUSE
+LICENSE_COMB=	multi
+LICENSE_NAME_MAXIMAEXTRACLAUSE=	Maxima extra clause
+LICENSE_FILE_MAXIMAEXTRACLAUSE=	${FILESDIR}/license-extra-clause.txt
+LICENSE_PERMS_MAXIMAEXTRACLAUSE=	dist-mirror dist-sell pkg-mirror \
+					pkg-sell auto-accept
 
 RUN_DEPENDS=	gnuplot:math/gnuplot \
 		rlwrap:devel/rlwrap
@@ -22,72 +23,78 @@ USES=		autoreconf gmake makeinfo shared-mime-info
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	PYTHON=dummy
 
+TEST_TARGET=	check
+
 INFO=		imaxima maxima xmaxima abs_integrate drawutils kovacicODE logic
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-PORTDOCS=	*
 PORTDATA=	*
+PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=		EXAMPLES DOCS NOUSERINIT MANPAGES SAGE TEST XMAXIMA
+OPTIONS_DEFINE=		DOCS EXAMPLES MANPAGES NOUSERINIT SAGE TEST XMAXIMA
+OPTIONS_DEFAULT=	ECL MANPAGES NOUSERINIT SAGE TEST XMAXIMA
 OPTIONS_SINGLE=		LISP
 OPTIONS_SINGLE_LISP=	CCL CMUCL ECL SBCL
 
-OPTIONS_DEFAULT=	ECL NOUSERINIT MANPAGES SAGE TEST XMAXIMA
-OPTIONS_SUB=		yes
+OPTIONS_SUB=	yes
 
 CCL_DESC=		Build with Clozure Common Lisp
+CMUCL_DESC=		Build with CMU Common Lisp
+ECL_DESC=		Build with Embedabble Common Lisp
+NOUSERINIT_DESC=	Do not load user init file for lisp (only for sbcl)
+SAGE_DESC=		Build with patches from Sage (implies ECL)
+SBCL_DESC=		Build with Steel Bank Common Lisp
+XMAXIMA_DESC=		Install xmaxima (implies DOCS and TEST)
+
 CCL_BUILD_DEPENDS=	ccl:lang/ccl
 CCL_RUN_DEPENDS=	ccl:lang/ccl
 CCL_CONFIGURE_ON=	--with-ccl=ccl
-CCL_PLIST_SUB=		BINDIR=binary-openmcl BINNAME=maxima.image
+CCL_PLIST_SUB=		BINDIR=binary-openmcl \
+			BINNAME=maxima.image
 
-CMUCL_DESC=		Build with CMU Common Lisp
 CMUCL_BUILD_DEPENDS=	lisp:lang/cmucl
 CMUCL_RUN_DEPENDS=	lisp:lang/cmucl
 CMUCL_CONFIGURE_ON=	--enable-cmucl
-CMUCL_PLIST_SUB=	BINDIR=binary-cmucl BINNAME=maxima_core
+CMUCL_PLIST_SUB=	BINDIR=binary-cmucl \
+			BINNAME=maxima_core
 
-ECL_DESC=		Build with Embedabble Common Lisp
 ECL_BUILD_DEPENDS=	ecl:lang/ecl
+ECL_LIB_DEPENDS=	libffi.so:devel/libffi \
+			libgc-threaded.so:devel/boehm-gc-threaded \
+			libgc.so:devel/boehm-gc \
+			libgmp.so:math/gmp
 ECL_RUN_DEPENDS=	ecl:lang/ecl
-ECL_LIB_DEPENDS=	libgmp.so:math/gmp	\
-			libffi.so:devel/libffi	\
-			libgc.so:devel/boehm-gc	\
-			libgc-threaded.so:devel/boehm-gc-threaded
 # libgc-threaded.so is really only used when ecl is built with THREADS on,
 # which is the default. See https://reviews.freebsd.org/D24959 for more
 # details.
 ECL_CONFIGURE_ON=	--with-ecl=ecl
-ECL_PLIST_SUB=		BINDIR=binary-ecl BINNAME=maxima
+ECL_PLIST_SUB=		BINDIR=binary-ecl \
+			BINNAME=maxima
 
-NOUSERINIT_DESC=		Do not load user init file for lisp (only for sbcl)
 NOUSERINIT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_maxima.in
 NOUSERINIT_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-OFF-src_maxima.in
 
-SAGE_DESC=		Build with patches from Sage (implies ECL)
+SAGE_IMPLIES=		ECL
 SAGE_BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 SAGE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-share_linearalgebra_matrixexp.lisp \
 			${PATCHDIR}/extra-patch-src_grind.lisp \
 			${PATCHDIR}/extra-patch-src_hayat.lisp \
 			${PATCHDIR}/extra-patch-src_init-cl.lisp
-SAGE_IMPLIES=		ECL
 
-SBCL_DESC=		Build with Steel Bank Common Lisp
 SBCL_BUILD_DEPENDS=	sbcl:lang/sbcl
 SBCL_RUN_DEPENDS=	sbcl:lang/sbcl
 SBCL_CONFIGURE_ON=	--enable-sbcl
-SBCL_PLIST_SUB=		BINDIR=binary-sbcl BINNAME=maxima_core
+SBCL_PLIST_SUB=		BINDIR=binary-sbcl \
+			BINNAME=maxima_core
 
-TEST_TARGET=		check
 TEST_BUILD_DEPENDS=	gnuplot:math/gnuplot \
 			rlwrap:devel/rlwrap
 TEST_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-OFF-Makefile.am
 
-XMAXIMA_DESC=		Install xmaxima (implies DOCS and TEST)
-XMAXIMA_IMPLIES=	DOCS TEST
-XMAXIMA_USES=		tk
-XMAXIMA_CONFIGURE_WITH=	wish=${WISH}
+XMAXIMA_IMPLIES=		DOCS TEST
+XMAXIMA_USES=			tk
+XMAXIMA_CONFIGURE_WITH=		wish=${WISH}
 XMAXIMA_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-interfaces_Makefile.am
 
 post-patch:
@@ -124,7 +131,7 @@ post-install-EXAMPLES-on:
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/maxima.1.gz ${STAGEDIR}${PREFIX}/man/man1
 
-post-install-SAGE-on:
+post-install-ECL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/ecl
 	${INSTALL_DATA} ${WRKSRC}/src/binary-ecl/maxima.fas \
 		${STAGEDIR}${PREFIX}/lib/ecl
diff --git a/math/maxima/pkg-plist b/math/maxima/pkg-plist
index 3b543ff65e3b..c6eb0b5cb98a 100644
--- a/math/maxima/pkg-plist
+++ b/math/maxima/pkg-plist
@@ -6,8 +6,8 @@ lib/maxima/%%PORTVERSION%%/%%BINDIR%%/%%BINNAME%%
 %%CMUCL%%lib/maxima/%%PORTVERSION%%/%%BINDIR%%/lisp
 libexec/maxima/%%PORTVERSION%%/mgnuplot
 %%MANPAGES%%man/man1/maxima.1.gz
-%%MANPAGES%%man/de/man1/%%BINNAME%%.1.gz
-%%MANPAGES%%man/ru/man1/%%BINNAME%%.1.gz
+%%MANPAGES%%man/de/man1/maxima.1.gz
+%%MANPAGES%%man/ru/man1/maxima.1.gz
 share/applications/net.sourceforge.maxima.xmaxima.desktop
 share/bash-completion/completions/maxima
 share/bash-completion/completions/rmaxima