math/calc: Update to 2.13.0.1

5 files changed, 28 insertions, 182 deletions

diff --git a/math/calc/Makefile b/math/calc/Makefile
index 66e6fd5a6241..30e995a88293 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,7 +1,7 @@
 # Created by: jmz
 
 PORTNAME=	calc
-PORTVERSION=	2.13.0.0
+PORTVERSION=	2.13.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
@@ -28,6 +28,11 @@ 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}|' \
+		${FILESDIR}/Makefile.freebsd > ${WRKSRC}/Makefile.local
+
 post-install:
 	cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/calc lib/lib*.so
 
diff --git a/math/calc/distinfo b/math/calc/distinfo
index c76cdb9819db..9ea2926569bc 100644
--- a/math/calc/distinfo
+++ b/math/calc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617037653
-SHA256 (lcn2-calc-v2.13.0.0_GH0.tar.gz) = cddd50c91ccd51b7ad4e7fc29a544c4c0ec582a5853cd81192d4054a1faf5372
-SIZE (lcn2-calc-v2.13.0.0_GH0.tar.gz) = 1137154
+TIMESTAMP = 1618757148
+SHA256 (lcn2-calc-v2.13.0.1_GH0.tar.gz) = 3583278e29bd2508daa70098f99e467108ddb3ae3cf043d91ff27bee29365e4f
+SIZE (lcn2-calc-v2.13.0.1_GH0.tar.gz) = 1141812
diff --git a/math/calc/files/Makefile.freebsd b/math/calc/files/Makefile.freebsd
new file mode 100644
index 000000000000..4e2b53f88dc1
--- /dev/null
+++ b/math/calc/files/Makefile.freebsd
@@ -0,0 +1,19 @@
+# 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
+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
diff --git a/math/calc/files/patch-Makefile.ship b/math/calc/files/patch-Makefile.ship
deleted file mode 100644
index a461c4e213e1..000000000000
--- a/math/calc/files/patch-Makefile.ship
+++ /dev/null
@@ -1,145 +0,0 @@
---- Makefile.ship.orig	2021-03-29 17:08:06 UTC
-+++ Makefile.ship
-@@ -662,7 +662,7 @@ else
- #endif	/* end of skip for non-Gnu makefiles */
- 
- # default INCDIR for non-macOS
--INCDIR= /usr/include
-+INCDIR= ${LOCALBASE}/include
- #INCDIR= /usr/local/include
- #INCDIR= /dev/env/DJDIR/include
- 
-@@ -725,7 +725,7 @@ else
- #endif	/* end of skip for non-Gnu makefiles */
- 
- # default BINDIR for non-macOS
--BINDIR= /usr/bin
-+BINDIR= ${PREFIX}/bin
- #BINDIR= /usr/local/bin
- #BINDIR= /dev/env/DJDIR/bin
- 
-@@ -741,7 +741,7 @@ else
- #endif	/* end of skip for non-Gnu makefiles */
- 
- # default LIBDIR for non-macOS
--LIBDIR= /usr/lib
-+LIBDIR= ${PREFIX}/lib
- #LIBDIR= /usr/local/lib
- #LIBDIR= /dev/env/DJDIR/lib
- 
-@@ -757,7 +757,7 @@ else
- #endif	/* end of skip for non-Gnu makefiles */
- 
- # default CALC_SHAREDIR for non-macOS
--CALC_SHAREDIR= /usr/share/calc
-+CALC_SHAREDIR= ${DATADIR}
- #CALC_SHAREDIR= /usr/local/lib/calc
- #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
- 
-@@ -771,7 +771,7 @@ endif
- #
- #CALC_INCDIR= /usr/local/include/calc
- #CALC_INCDIR= /dev/env/DJDIR/include/calc
--CALC_INCDIR= ${INCDIR}/calc
-+CALC_INCDIR= ${PREFIX}/include/calc
- 
- # By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
- # ---------------------------------------------------------------
-@@ -798,7 +798,7 @@ HELPDIR= ${CALC_SHAREDIR}/help
- CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
- CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
- CUSTOMINCDIR= ${CALC_INCDIR}/custom
--SCRIPTDIR= ${BINDIR}/cscript
-+SCRIPTDIR= ${PREFIX}/libexec/cscript
- 
- # T - top level directory under which calc will be installed
- #
-@@ -830,7 +830,7 @@ SCRIPTDIR= ${BINDIR}/cscript
- #
- # If in doubt, use T=
- #
--T=
-+T= ${DESTDIR}
- 
- # where man section 1 pages are installed
- #
-@@ -852,7 +852,7 @@ ifeq ($(target),Darwin)
- MANDIR= /usr/local/share/man/man1
- else
- #endif	/* end of skip for non-Gnu makefiles */
--MANDIR= /usr/share/man/man1
-+MANDIR= ${PREFIX}/man/man1
- #if 0	/* start of skip for non-Gnu makefiles */
- endif
- #endif	/* end of skip for non-Gnu makefiles */
-@@ -993,11 +993,11 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit
- #
- # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
- #
--USE_READLINE=
-+USE_READLINE= -DUSE_READLINE
- #USE_READLINE= -DUSE_READLINE
- #
--READLINE_LIB=
--READLINE_EXTRAS=
-+READLINE_LIB= -L${LOCALBASE}/lib -lreadline
-+READLINE_EXTRAS= -lhistory -lncurses
- #
- #READLINE_LIB= -lreadline
- #READLINE_EXTRAS= -lhistory -lncurses
-@@ -1023,7 +1023,7 @@ READLINE_EXTRAS=
- #READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline
- #READLINE_EXTRAS= -lhistory -lncurses
- #
--READLINE_INCLUDE=
-+READLINE_INCLUDE= -I${LOCALBASE}/include
- #READLINE_INCLUDE= -I/usr/gnu/include
- #READLINE_INCLUDE= -I/usr/local/include
- 
-@@ -1034,7 +1034,7 @@ READLINE_INCLUDE=
- #CALCPAGER= more
- #CALCPAGER= pg
- #CALCPAGER= cat
--CALCPAGER= less
-+CALCPAGER= more
- #CALCPAGER= less.exe -ci
- 
- # Debug/Optimize options for ${CC} and ${LCC}
-@@ -1228,7 +1228,7 @@ EXTRA_LDFLAGS=
- # The ARCH_CFLAGS are ${CC} when compiling C files. They follow
- # CCMISC and precede EXTRA_CFLAGS.
- #
--ARCH_CFLAGS= -march=native
-+#ARCH_CFLAGS= -march=native
- #ARCH_CFLAGS=
- 
- # COMMON_CFLAGS are the common ${CC} flags used for all programs, both
-@@ -1511,8 +1511,8 @@ CCWERR=
- CCOPT= ${DEBUG}
- CCMISC=
- #
--LCC= gcc
--CC= ${PURIFY} ${LCC} ${CCWERR}
-+LCC= ${CC}
-+#CC= ${PURIFY} ${LCC} ${CCWERR}
- #
- MAKE= gmake
- #
-@@ -1725,7 +1725,7 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
- # LDFLAGS for ${CC} in linking calc programs other than intermediate programs
- #
- ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
--CFLAGS= ${ICFLAGS} ${CCOPT}
-+CFLAGS+= ${ICFLAGS} ${CCOPT}
- #
- ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
- LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
-@@ -1853,7 +1853,7 @@ ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
- else
- ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
- endif
--CFLAGS= ${ICFLAGS} ${CCOPT}
-+CFLAGS+= ${ICFLAGS} ${CCOPT}
- 
- # Required flags to link files for calc
- #
diff --git a/math/calc/pkg-plist b/math/calc/pkg-plist
index 8e631201618f..f3ebee106901 100644
--- a/math/calc/pkg-plist
+++ b/math/calc/pkg-plist
@@ -1,54 +1,22 @@
 bin/calc
-%%FULL%%include/calc/align32.h
 %%FULL%%include/calc/alloc.h
-%%FULL%%include/calc/args.h
 %%FULL%%include/calc/banned.h
 %%FULL%%include/calc/blkcpy.h
 %%FULL%%include/calc/block.h
 %%FULL%%include/calc/byteswap.h
 %%FULL%%include/calc/calc.h
-%%FULL%%include/calc/calcerr.c
-%%FULL%%include/calc/calcerr.h
 %%FULL%%include/calc/cmath.h
-%%FULL%%include/calc/conf.h
 %%FULL%%include/calc/config.h
 %%FULL%%include/calc/custom.h
 %%FULL%%include/calc/decl.h
-%%FULL%%include/calc/endian_calc.h
 %%FULL%%include/calc/file.h
-%%FULL%%include/calc/fposval.h
 %%FULL%%include/calc/func.h
 %%FULL%%include/calc/hash.h
-%%FULL%%include/calc/have_ban_pragma.h
-%%FULL%%include/calc/have_const.h
-%%FULL%%include/calc/have_fpos.h
-%%FULL%%include/calc/have_fpos_pos.h
-%%FULL%%include/calc/have_getpgid.h
-%%FULL%%include/calc/have_getprid.h
-%%FULL%%include/calc/have_getsid.h
-%%FULL%%include/calc/have_gettime.h
-%%FULL%%include/calc/have_memmv.h
-%%FULL%%include/calc/have_newstr.h
-%%FULL%%include/calc/have_offscl.h
-%%FULL%%include/calc/have_posscl.h
-%%FULL%%include/calc/have_rusage.h
-%%FULL%%include/calc/have_stdlib.h
-%%FULL%%include/calc/have_strdup.h
-%%FULL%%include/calc/have_strlcat.h
-%%FULL%%include/calc/have_strlcpy.h
-%%FULL%%include/calc/have_string.h
-%%FULL%%include/calc/have_times.h
-%%FULL%%include/calc/have_uid_t.h
-%%FULL%%include/calc/have_unistd.h
-%%FULL%%include/calc/have_unused.h
-%%FULL%%include/calc/have_urandom.h
-%%FULL%%include/calc/have_ustat.h
 %%FULL%%include/calc/hist.h
 %%FULL%%include/calc/jump.h
 %%FULL%%include/calc/label.h
 %%FULL%%include/calc/lib_calc.h
 %%FULL%%include/calc/lib_util.h
-%%FULL%%include/calc/longbits.h
 %%FULL%%include/calc/nametype.h
 %%FULL%%include/calc/opcodes.h
 %%FULL%%include/calc/prime.h
@@ -57,7 +25,6 @@ bin/calc
 %%FULL%%include/calc/str.h
 %%FULL%%include/calc/strl.h
 %%FULL%%include/calc/symbol.h
-%%FULL%%include/calc/terminal.h
 %%FULL%%include/calc/token.h
 %%FULL%%include/calc/value.h
 %%FULL%%include/calc/zmath.h