summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/capc-calc/Makefile5
-rw-r--r--math/capc-calc/PLIST4
-rw-r--r--math/capc-calc/distinfo12
-rw-r--r--math/capc-calc/patches/patch-Makefile (renamed from math/capc-calc/patches/patch-aa)112
4 files changed, 97 insertions, 36 deletions
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index bb9640644e8..23dec920888 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2017/01/05 16:52:19 roy Exp $
+# $NetBSD: Makefile,v 1.48 2018/12/31 16:35:25 chuck Exp $
#
-DISTNAME= calc-2.12.4.13
+DISTNAME= calc-2.12.7.1
PKGNAME= capc-${DISTNAME:S/t/./}
-PKGREVISION= 3
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calc/}
EXTRACT_SUFX= .tar.bz2
diff --git a/math/capc-calc/PLIST b/math/capc-calc/PLIST
index 8ef78c0adbb..809860f1192 100644
--- a/math/capc-calc/PLIST
+++ b/math/capc-calc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2014/01/15 16:23:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2018/12/31 16:35:25 chuck Exp $
bin/calc
bin/calc-static
bin/cscript/4dsphere
@@ -312,6 +312,7 @@ share/calc/help/log
share/calc/help/lowbit
share/calc/help/ltol
share/calc/help/makelist
+share/calc/help/man
share/calc/help/mat
share/calc/help/matdim
share/calc/help/matfill
@@ -457,7 +458,6 @@ share/calc/linear.cal
share/calc/lnseries.cal
share/calc/lucas.cal
share/calc/lucas_chk.cal
-share/calc/lucas_tbl.cal
share/calc/mersenne.cal
share/calc/mfactor.cal
share/calc/mod.cal
diff --git a/math/capc-calc/distinfo b/math/capc-calc/distinfo
index 49502a17302..66c0108e295 100644
--- a/math/capc-calc/distinfo
+++ b/math/capc-calc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2016/04/01 22:29:36 jperkin Exp $
+$NetBSD: distinfo,v 1.28 2018/12/31 16:35:25 chuck Exp $
-SHA1 (calc-2.12.4.13.tar.bz2) = 4d48fb78c903f10e9bcd05c42105498637dea834
-RMD160 (calc-2.12.4.13.tar.bz2) = c04d995a500ad7b0be27afbb6edaa6978c42437e
-SHA512 (calc-2.12.4.13.tar.bz2) = 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534
-Size (calc-2.12.4.13.tar.bz2) = 970778 bytes
-SHA1 (patch-aa) = c4a3850a2d1172174f750c795b2c77065bab6af6
+SHA1 (calc-2.12.7.1.tar.bz2) = 34a197fae1d28a39977f8441a6c0cbb95b516c6b
+RMD160 (calc-2.12.7.1.tar.bz2) = 080d21defde4f2f7a6c48c8a235d12c5f2c225e5
+SHA512 (calc-2.12.7.1.tar.bz2) = aeef950afffab311611168a8c390c7bcccdd3bcd0cc721bab2940d90a9e98ea0c1d79ee74e8053d88511084f2369f03d92587ff5d013d7fb859343e7a4450f6c
+Size (calc-2.12.7.1.tar.bz2) = 967943 bytes
+SHA1 (patch-Makefile) = 72678b64953393bf90b9bd8817d3bb214c04cda4
SHA1 (patch-fposval_c) = 8a8d08f8b566e583faa3bd9033c4a9ac90cb343c
diff --git a/math/capc-calc/patches/patch-aa b/math/capc-calc/patches/patch-Makefile
index edcaab0c876..cdc71d65532 100644
--- a/math/capc-calc/patches/patch-aa
+++ b/math/capc-calc/patches/patch-Makefile
@@ -1,36 +1,98 @@
-$NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
+$NetBSD: patch-Makefile,v 1.1 2018/12/31 16:35:25 chuck Exp $
---- Makefile.orig 2013-09-01 23:02:02.000000000 +0000
-+++ Makefile
-@@ -585,7 +585,7 @@ HAVE_UNUSED=
+--- Makefile.orig 2018-11-05 10:35:46.000000000 -0500
++++ Makefile 2018-12-31 10:21:16.000000000 -0500
+@@ -575,15 +575,17 @@
+ ifeq ($(target),Darwin)
+ # default INCDIR for macOS
+-INCDIR= $(shell xcrun --show-sdk-path --sdk macosx)/usr/include
++#INCDIR= $(shell xcrun --show-sdk-path --sdk macosx)/usr/include
++INCDIR= ${COMPILER_INCLUDE_DIRS}
+
+ else
+ #endif /* end of skip for non-Gnu makefiles */
+
+ # default INCDIR for non-macOS
+-INCDIR= /usr/include
++#INCDIR= /usr/include
#INCDIR= /usr/local/include
#INCDIR= /dev/env/DJDIR/include
--INCDIR= /usr/include
-+INCDIR= ${PREFIX}/include
++INCDIR= ${COMPILER_INCLUDE_DIRS}
- # Where to install calc related things
- #
-@@ -624,15 +624,15 @@ INCDIR= /usr/include
- #
+ #if 0 /* start of skip for non-Gnu makefiles */
+ endif
+@@ -638,15 +640,17 @@
+ ifeq ($(target),Darwin)
+
+ # default BINDIR for macOS
+-BINDIR= /usr/local/bin
++#BINDIR= /usr/local/bin
++BINDIR= ${PREFIX}/bin
+
+ else
+ #endif /* end of skip for non-Gnu makefiles */
+
+ # default BINDIR for non-macOS
+-BINDIR= /usr/bin
++#BINDIR= /usr/bin
#BINDIR= /usr/local/bin
#BINDIR= /dev/env/DJDIR/bin
--BINDIR= /usr/bin
+BINDIR= ${PREFIX}/bin
+ #if 0 /* start of skip for non-Gnu makefiles */
+ endif
+@@ -654,15 +658,17 @@
+ ifeq ($(target),Darwin)
+
+ # default LIBDIR for macOS
+-LIBDIR= /usr/local/lib
++#LIBDIR= /usr/local/lib
++LIBDIR= ${PREFIX}/lib
+
+ else
+ #endif /* end of skip for non-Gnu makefiles */
+
+ # default LIBDIR for non-macOS
+-LIBDIR= /usr/lib
++#LIBDIR= /usr/lib
#LIBDIR= /usr/local/lib
#LIBDIR= /dev/env/DJDIR/lib
--LIBDIR= /usr/lib
+LIBDIR= ${PREFIX}/lib
+ #if 0 /* start of skip for non-Gnu makefiles */
+ endif
+@@ -670,15 +676,17 @@
+ ifeq ($(target),Darwin)
+
+ # default CALC_SHAREDIR for macOS
+-CALC_SHAREDIR= /usr/local/share/calc
++#CALC_SHAREDIR= /usr/local/share/calc
++CALC_SHAREDIR= ${PREFIX}/share/calc
+
+ else
+ #endif /* end of skip for non-Gnu makefiles */
+
+ # default CALC_SHAREDIR for non-macOS
+-CALC_SHAREDIR= /usr/share/calc
++#CALC_SHAREDIR= /usr/share/calc
#CALC_SHAREDIR= /usr/local/lib/calc
#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
--CALC_SHAREDIR= /usr/share/calc
+CALC_SHAREDIR= ${PREFIX}/share/calc
- # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
- # Always be sure that the CALC_INCDIR path ends in /calc to avoid
-@@ -710,7 +710,7 @@ T=
+ #if 0 /* start of skip for non-Gnu makefiles */
+ endif
+@@ -690,7 +698,8 @@
+ #
+ #CALC_INCDIR= /usr/local/include/calc
+ #CALC_INCDIR= /dev/env/DJDIR/include/calc
+-CALC_INCDIR= ${INCDIR}/calc
++#CALC_INCDIR= ${INCDIR}/calc
++CALC_INCDIR= ${PREFIX}/include/calc
+
+ # By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
+ # ---------------------------------------------------------------
+@@ -760,7 +769,7 @@
#MANDIR=
#MANDIR= /usr/local/man/man1
#MANDIR= /usr/man/man1
@@ -39,7 +101,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
#MANDIR= /dev/env/DJDIR/man/man1
#MANDIR= /usr/man/u_man/man1
#MANDIR= /usr/contrib/man/man1
-@@ -721,7 +721,7 @@ MANDIR= /usr/share/man/man1
+@@ -771,7 +780,7 @@
#
# Use CATDIR= to disable installation of the calc cat (formatted) page.
#
@@ -48,7 +110,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
#CATDIR= /usr/local/man/cat1
#CATDIR= /usr/local/catman/cat1
#CATDIR= /usr/man/cat1
-@@ -742,9 +742,9 @@ MANEXT= 1
+@@ -792,9 +801,9 @@
#
# This is ignored if CATDIR is empty.
#
@@ -60,7 +122,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
#CATEXT= l
# how to format a man page
-@@ -770,8 +770,8 @@ CATEXT= 1
+@@ -820,8 +829,8 @@
# and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
# lines below.
#
@@ -71,7 +133,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
#NROFF= groff
NROFF_ARG= -man
#NROFF_ARG= -mandoc
-@@ -837,13 +837,14 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
+@@ -895,13 +904,14 @@
#
# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
#
@@ -89,7 +151,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
#READLINE_EXTRAS= -lhistory -lncurses
#
#READLINE_LIB= -L/usr/gnu/lib -lreadline
-@@ -896,7 +897,7 @@ CALCPAGER= less
+@@ -963,7 +973,7 @@
#
#DEBUG= -O3
#DEBUG= -O3 -g
@@ -98,7 +160,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
#DEBUG= -O3 -ipa
#DEBUG= -O3 -g3 -ipa
-@@ -1409,10 +1410,10 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
+@@ -1604,10 +1614,10 @@
# LDFLAGS for ${CC} in linking calc programs other than intermediate programs
#
ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
@@ -111,7 +173,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
#
#if 0 /* start of skip for non-Gnu makefiles */
endif
-@@ -1470,7 +1471,7 @@ endif
+@@ -1668,7 +1678,7 @@
# NOTE: This is the default generic host target. Used when no other
# host target matches.
@@ -120,7 +182,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
#
BLD_TYPE= calc-static-only
#
-@@ -1516,7 +1517,7 @@ ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
+@@ -1734,7 +1744,7 @@
else
ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
endif
@@ -129,7 +191,7 @@ $NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
# Required flags to link files for calc
#
-@@ -4511,9 +4512,9 @@ endif
+@@ -4645,9 +4655,9 @@
${Q}# NOTE: The this makefile installs libcustcalc${LIB_EXT_VERSION}
${Q}# because we only want to perform one ${LDCONFIG} for both
${Q}# libcalc${LIB_EXT_VERSION} and libcustcalc${LIB_EXT_VERSION}.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 16:07:18 +0000