diff --git a/math/calc/Makefile b/math/calc/Makefile index 2f93ed72947c..66f1c37cda6e 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -1,39 +1,43 @@ # Created by: jmz PORTNAME= calc -PORTVERSION= 2.14.0.10 +PORTVERSION= 2.14.0.12 DISTVERSIONPREFIX= v CATEGORIES= math MAINTAINER= adamw@FreeBSD.org COMMENT= Interactive CLI arbitrary-precision calculator LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING-LGPL USES= gmake tar:bzip2 readline USE_GITHUB= yes GH_ACCOUNT= lcn2 MAKE_JOBS_UNSAFE= yes PLIST_SUB+= VERSION=${PORTVERSION} MAKEFILE= Makefile.ship MAKE_ARGS= DATADIR="${DATADIR}" TEST_TARGET= check OPTIONS_DEFINE= FULL HELP OPTIONS_DEFAULT=FULL HELP OPTIONS_SUB= yes FULL_DESC= Install all funcs/scripts/headers (OFF: just basic calculator) 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 .include 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 @@ -1,19 +1,20 @@ # vim:ft=make ARCH_CFLAGS:= BINDIR:= ${PREFIX}/bin CALC_INCDIR:= ${PREFIX}/include/calc CALC_SHAREDIR:= ${DATADIR} CALCPAGER:= more CC:= %%CC%% CFLAGS:= %%CFLAGS%% ${ICFLAGS} ${CCOPT} INCDIR:= ${LOCALBASE}/include LCC:= %%CC%% LIBDIR:= ${PREFIX}/lib +MAKE:= %%GMAKE%% MANDIR:= ${PREFIX}/man/man1 SCRIPTDIR:= ${PREFIX}/libexec/cscript T:= ${DESTDIR} USE_READLINE:= -DUSE_READLINE -I${LOCALBASE}/include # These need to be in this order: READLINE_LIBS:= -L${LOCALBASE}/lib -lreadline READLINE_EXTRAS:= ${READLINE_LIBS} -lhistory -lncurses