git: 0ee40e5d0975 - main - math/calc: Update to 2.14.0.12
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 12 Dec 2021 10:11:41 UTC
The branch main has been updated by adamw:
URL: https://cgit.FreeBSD.org/ports/commit/?id=0ee40e5d0975428266633c96a5c3296c2a9f2e0a
commit 0ee40e5d0975428266633c96a5c3296c2a9f2e0a
Author: Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2021-12-12 10:11:30 +0000
Commit: Adam Weinberger <adamw@FreeBSD.org>
CommitDate: 2021-12-12 10:11:36 +0000
math/calc: Update to 2.14.0.12
---
math/calc/Makefile | 8 ++++++--
math/calc/distinfo | 6 +++---
math/calc/files/Makefile.freebsd | 1 +
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/math/calc/Makefile b/math/calc/Makefile
index 2f93ed72947c..66f1c37cda6e 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,7 +1,7 @@
# Created by: jmz
PORTNAME= calc
-PORTVERSION= 2.14.0.10
+PORTVERSION= 2.14.0.12
DISTVERSIONPREFIX= v
CATEGORIES= math
@@ -30,8 +30,12 @@ HELP_DESC= Install calc help files
# We use Makefile.freebsd because Makefile.local is in .gitignore
post-extract:
- ${SED} -e 's|%%CC%%|${CC}|; s|%%CFLAGS%%|${CFLAGS}|' \
+ ${SED} -e 's|%%CC%%|${CC}|; s|%%CFLAGS%%|${CFLAGS}|; s|%%GMAKE%%|${MAKE_CMD}|' \
${FILESDIR}/Makefile.freebsd > ${WRKSRC}/Makefile.local
+# The upstream Makefiles are a mess. Bash is hardcoded in many files, and only
+# some of the Makefiles allow overrides. Plus, they error out if sed .bkp files exist.
+ ${FIND} ${WRKSRC} -name 'Makefile*' \
+ | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|/bin/bash|${SH}|'
post-install:
cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/calc lib/lib*.so
diff --git a/math/calc/distinfo b/math/calc/distinfo
index f2d7acb2a487..3e078bbbcc53 100644
--- a/math/calc/distinfo
+++ b/math/calc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638634588
-SHA256 (lcn2-calc-v2.14.0.10_GH0.tar.gz) = 6fc6d4e5815a15b12fcb935983563be6dd1571d3d5f2db8d5c77f85ad911c324
-SIZE (lcn2-calc-v2.14.0.10_GH0.tar.gz) = 1162568
+TIMESTAMP = 1639302685
+SHA256 (lcn2-calc-v2.14.0.12_GH0.tar.gz) = 06b1605140d00884b88a62b4dabc880c8ddccb9d430f5910e9c081e9996395f8
+SIZE (lcn2-calc-v2.14.0.12_GH0.tar.gz) = 1204146
diff --git a/math/calc/files/Makefile.freebsd b/math/calc/files/Makefile.freebsd
index 4e2b53f88dc1..500a28eb25e8 100644
--- a/math/calc/files/Makefile.freebsd
+++ b/math/calc/files/Makefile.freebsd
@@ -9,6 +9,7 @@ CFLAGS:= %%CFLAGS%% ${ICFLAGS} ${CCOPT}
INCDIR:= ${LOCALBASE}/include
LCC:= %%CC%%
LIBDIR:= ${PREFIX}/lib
+MAKE:= %%GMAKE%%
MANDIR:= ${PREFIX}/man/man1
SCRIPTDIR:= ${PREFIX}/libexec/cscript
T:= ${DESTDIR}