git: 1b9b7e36375f - main - math/maxima: Fix staging error

[Fernando Apesteguía]

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1b9b7e36375f51b5b1cfc50c46694885f1c63f47

commit 1b9b7e36375f51b5b1cfc50c46694885f1c63f47
Author:     Fernando Apesteguía <fernape at FreeBSD.org>
AuthorDate: 2021-06-23 06:38:17 +0000
Commit:     Fernando Apesteguía <fernape at FreeBSD.org>
CommitDate: 2021-06-23 16:32:56 +0000

    math/maxima: Fix staging error
    
    configure.ac uses the git command if present to populate the VERSION variable.
    As a consecuence, this produces a dynamically changing installation directory in
    STAGEDIR that breaks the build in some conditions. Note that on a clean
    environment (poudriere), this works fine.
    
    This patch comments that portion of configure.ac out since it is of no use
    inside the ports tree.
    
    PR:     255683
    Reported by:    russo at bogodyn.org
---
 math/maxima/files/patch-configure.ac | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/math/maxima/files/patch-configure.ac b/math/maxima/files/patch-configure.ac
new file mode 100644
index 000000000000..2d42071d5c66
--- /dev/null
+++ b/math/maxima/files/patch-configure.ac
@@ -0,0 +1,39 @@
+--- configure.ac.orig	2021-06-22 16:59:07.387685000 -0600
++++ configure.ac	2021-06-22 16:59:40.892936000 -0600
+@@ -165,21 +165,21 @@
+ 
+ 
+ dnl See if git exists.  If it does, update VERSION to include a git tag
+-AC_CHECK_PROG(git_found, git, true, false)
+-if test x"${git_found}" = xtrue; then
+-    # Test to see if git describe works (discarding any output).  If
+-    # it works, use it.  Otherwise, keep existing value of VERSION.
+-    # (git describe fails if git is executed in a non-Git directory, e.g.,
+-    # an unpacked tarball. Since the exit codes of git describe are undocumented,
+-    # we cannot distinguish that from a missing annotated tag.
+-    # Play it safe by refusing to change VERSION.)
+-    if git describe > /dev/null 2>&1; then
+-        VERSION="`git describe --dirty`"
+-        # When building RPMs, hyphens in the version are not allowed, so
+-        # replace them with underscores.
+-        VERSION=`echo $VERSION | sed 's;-;_;g'`
+-    fi
+-fi
++dnl AC_CHECK_PROG(git_found, git, true, false)
++dnl if test x"${git_found}" = xtrue; then
++dnl     # Test to see if git describe works (discarding any output).  If
++dnl     # it works, use it.  Otherwise, keep existing value of VERSION.
++dnl     # (git describe fails if git is executed in a non-Git directory, e.g.,
++dnl     # an unpacked tarball. Since the exit codes of git describe are undocumented,
++dnl     # we cannot distinguish that from a missing annotated tag.
++dnl     # Play it safe by refusing to change VERSION.)
++dnl     if git describe > /dev/null 2>&1; then
++dnl         VERSION="`git describe --dirty`"
++dnl         # When building RPMs, hyphens in the version are not allowed, so
++dnl         # replace them with underscores.
++dnl         VERSION=`echo $VERSION | sed 's;-;_;g'`
++dnl     fi
++dnl fi
+ 
+ dnl Parses the version number for the manual
+ manual_version=`echo $VERSION | sed 's+branch_++; s+_base++; s+_dirty++; s+_+.+g'`