From nobody Sun Sep 01 20:24:52 2024 X-Original-To: dev-commits-ports-main@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 4Wxjzn09PTz5PPlH; Sun, 01 Sep 2024 20:24:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wxjzm6mqMz44LK; Sun, 1 Sep 2024 20:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725222293; 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=JnyEbTxISzJTkZQpSLeDBrswF9VshAaXLgi0bUw32S4=; b=QbpfGIjtoyU8w2oGPbqc4TlHunGO4Z9dDwldn5Mp1CrTNT41Rtq5fEO+6NvcoCfzjfdNwl QsuCyttSh1vbsZAbgvt+4D5ZsOHrIJmnLDcZYeYaSm7Ko1nASkmWtJbwaTPjgg2HsK/+wT WEQ5XiLZgn33J6WXDZ9KaRBbigZlB+6r4evYeqe8KJ8rxWGb215Zwfzc91AhqrzfczNloR W+f9vfnQPPNR7W0gmtXOV4W9BqTgbOYdfWCDkONpcFGo+OUiErOIcBd2JO60RHuXXesyjx m8iU2GyU+BPuuCsRxI/EYbt/w6QYm+cQYX0IHaHGqeqG5lmWFf4mEMvb0f0aQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725222292; a=rsa-sha256; cv=none; b=UmaBxCHMNLSIMIybRB29U0OwvtoCSmMwSbWU3tFJREW1egev8z8WtJ912b7z2mHRD+FmYe 2pWNFbjBURWRKpxycrZF3K334njmW5KvPXffpGGXySFuHHYQWi6wMKHZFOOfoDfSoA6UkV YdWtHHRURibcktDBQdZ0mrMSUZw7WLWd6HcWqFqFSItghTbvMGvvDN4LHJL1lPKSbQtWTz Tdq+3Ow+jGMgznSZwB8empZHf2e/MLQe1K95kv9CCF9IzWu3fSH0g9JoBQkQwB3c6TI76j MSLwiVLYyPvG7gGLttIKM49gOhak/I3JaOpayGlUBSvwlilDPCM8dGw89mzj+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725222292; 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=JnyEbTxISzJTkZQpSLeDBrswF9VshAaXLgi0bUw32S4=; b=er9G4NIvUFKu7/bGC1fQoXc+tG3j2jhLKqLZrmHsLPv1bOexwFL2bkuvpRZ/OTXc7opafC qKqbYi2xmZYNnc6CJWoQI+r9yefSwNqqRTj6q6ADUtCS6aotbjvLz5ekJ+Tmd785cpdeGn 3ZDysDjzQEA5OoYBAcL4TD06gEsMsPmuXMLEeOXq5qLhDu8okAyw3gLzlrq64itjiX6oSU wSMuJR3NtRs2BXlMfIp2Sp0FcrUcAG2AAGrJXVCfpWBNGVy5O0Z7kmKPryW7soFLQghQP2 aKOdLaNw0B9xNn9YHC0n4QKIfQWPbNPgDiUMxHZCIGI4D5BBnr1q6wfGEaoiNA== 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 4Wxjzm5xF6zk04; Sun, 1 Sep 2024 20:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 481KOqMQ044896; Sun, 1 Sep 2024 20:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 481KOq0m044893; Sun, 1 Sep 2024 20:24:52 GMT (envelope-from git) Date: Sun, 1 Sep 2024 20:24:52 GMT Message-Id: <202409012024.481KOq0m044893@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: ee2ef7f8efeb - main - math/maxima: build fix (mandir, makeinfo) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee2ef7f8efeb1570f9ed30812083b8ddad1da622 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee2ef7f8efeb1570f9ed30812083b8ddad1da622 commit ee2ef7f8efeb1570f9ed30812083b8ddad1da622 Author: Zsolt Udvari AuthorDate: 2024-09-01 20:15:05 +0000 Commit: Zsolt Udvari CommitDate: 2024-09-01 20:24:34 +0000 math/maxima: build fix (mandir, makeinfo) Remove create unneeded and unsupported PREFIX/man/man1 directory (causes Error: Orphaned: @dir man/man1). Fix makeinfo version checking error in configure: - replace backtick to brackets and dollar sign - use gexpr instead of builtin expr (add sysutils/coreutils to BULD_DEPENDS and use BINARY_ALIAS) The makeinfo_version_string variable is empty because the backslashes remain before backticks, do not appear. And the regexp is not compatible with shipped expr so shoud use GNU expr. --- math/maxima/Makefile | 4 +++- math/maxima/files/patch-configure.ac | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/math/maxima/Makefile b/math/maxima/Makefile index 7016b22c168d..013d9e65e011 100644 --- a/math/maxima/Makefile +++ b/math/maxima/Makefile @@ -17,6 +17,7 @@ LICENSE_FILE_MAXIMAEXTRACLAUSE= ${FILESDIR}/license-extra-clause.txt LICENSE_PERMS_MAXIMAEXTRACLAUSE= dist-mirror dist-sell pkg-mirror \ pkg-sell auto-accept +BUILD_DEPENDS= coreutils>0:sysutils/coreutils RUN_DEPENDS= gnuplot:math/gnuplot \ rlwrap:devel/rlwrap @@ -26,6 +27,8 @@ GNU_CONFIGURE= yes TEST_TARGET= check +BINARY_ALIAS= expr=gexpr + INFO= imaxima maxima xmaxima abs_integrate drawutils kovacicODE logic \ nelder_mead symplectic_ode @@ -134,7 +137,6 @@ post-install-EXAMPLES-on: cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} '-name *\.dem' post-install-MANPAGES-on: - ${MKDIR} ${STAGEDIR}${PREFIX}/man/man1 && \ ${INSTALL_MAN} ${WRKSRC}/doc/man/maxima.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/maxima.1.gz .include diff --git a/math/maxima/files/patch-configure.ac b/math/maxima/files/patch-configure.ac index 74433aa98ca2..4d03280b444b 100644 --- a/math/maxima/files/patch-configure.ac +++ b/math/maxima/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2022-04-13 05:02:12 UTC +--- configure.ac.orig 2024-09-01 19:17:42 UTC +++ configure.ac @@ -165,21 +165,21 @@ dnl See if git exists. If it does, update VERSION to @@ -37,3 +37,12 @@ dnl Parses the version number for the manual manual_version=`echo $VERSION | sed 's+branch_++; s+_base++; s+_dirty++; s+_+.+g'` +@@ -644,7 +644,7 @@ if test x"${enable_build_docs}" = xtrue ; then + dnl assuming that the end of the version string contains the + dnl version number consisting of digits separated by a period. + dnl This allows for version numbers like 6.8.90. +- makeinfo_version_string=`expr "\`makeinfo --version | head -1\`" : '.* \([[.0-9]]\+\)'` ++ makeinfo_version_string=`expr "$(makeinfo --version | head -1)" : '.* \([[.0-9]]\+\)'` + dnl echo Makeinfo version ${makeinfo_version} + + dnl From makeinfo_version, extract out the major and minor