From nobody Sun Apr 24 10:32:42 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7AB18199DC5C; Sun, 24 Apr 2022 10:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KmPbt30sXz4TDM; Sun, 24 Apr 2022 10:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650796362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q6XKkTUly2J4A3DDF7OHIwgwdTUniOfq1H53nUBc0IY=; b=t+GfmXiih4Bs35rbmj0S62h/IMx/JfXMbAJOgG6mhigXhYp8a3v+gq09lYRfwIXp1KwGXW ABg3uE0BKZURkRPI68ztFjlheTd2LO+z02qSNlBUbY/Rc7210ME4bJTPQcwxCs5cVVdBv9 ahVlGcix0kVQhrbZgu5CkK2ya23u3MId5wdyo1kOVhKX85JRHYRpsA8MzZLpCMmVAgb0sp AjFpKFD6qj/hTXpJ0iLU8VyqMvuQ1urBPY4xhowiMSRJY4l/qkE2HpJEP1MBdGJSCaUH5Q PLhMrjztUjiruBUFH+is9j8ztccsB5Z7gIdrXFEC1E53n1K2ODcGDKKF4sa4cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 48562249A8; Sun, 24 Apr 2022 10:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23OAWgix079682; Sun, 24 Apr 2022 10:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23OAWgXO079681; Sun, 24 Apr 2022 10:32:42 GMT (envelope-from git) Date: Sun, 24 Apr 2022 10:32:42 GMT Message-Id: <202204241032.23OAWgXO079681@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 3b2281ed4a62 - main - math/maxima: Bugfix, style, adopt again List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b2281ed4a6211220244727787b87ad275f13d7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650796362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q6XKkTUly2J4A3DDF7OHIwgwdTUniOfq1H53nUBc0IY=; b=lRhJ4GZNY2bIkfVTnRLL5Q6CWbc/+X5BqmJvAPsgobHw6Kef9PUJFYnYyZP7held9ljZjF CcT3PYjydP2d/ZyKGatpZzPhLYmrerakyFkzA6IHRsLna8jCn0e+V25BTF7j2fc0pCQoqF dWEOjuyvZxv34gLISBlLr9h7pIJQvpoG0+9fWHX5UJG8CcSosK0x5NbU3ZTZ+vYw6fjKwx btT056nOI1luHZlGJ3f/VTMZqatvG1qKiTwCF4a0sGGMM7VYfmHrXNa67VnazLlhvCyfLy gJtQ0+xgblontX14JLtjASRvLXbOh68qBeZQiV/r+pa/rqh2XOkfxcDqZSmndw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650796362; a=rsa-sha256; cv=none; b=UrA4C0LygfL/JKjUc22fWTzAMyENVSHlESSdaukxWsLYg9AvasSZufTbQ3MEVsVTKiN9wr QeqS1lHfm19a8lB/pt5iIfWUBv73pFRDRbuGziq/ayO3SJix9IhaeUN0UrKTk43N1B/ZFU uNgmS46rC43sqHaW18Ope7HXO7IjYR4vY3HFLTPgTFtljSfGRQPP5TW5AANkiiy/ykGhzm QBPYV9GgHU8Tbdp2+muMBp44jN9MeMYYqjAIDxWdbc8n0ojL8gRPmS3p1wof6TqDdn0bIg uxy/zOSDpc5vf+M7ezVFbOjrtFSm12fluN+2VOz7jOhvWVof7Q96SKEQ4PQMmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b2281ed4a6211220244727787b87ad275f13d7a commit 3b2281ed4a6211220244727787b87ad275f13d7a Author: Lorenzo Salvadore AuthorDate: 2022-04-23 15:48:00 +0000 Commit: Lorenzo Salvadore 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