diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile index 055f45521cbd..22abd584e811 100644 --- a/math/capc-calc/Makefile +++ b/math/capc-calc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2013/07/15 02:02:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.44 2014/01/15 16:23:31 drochner Exp $ # -DISTNAME= calc-2.12.4.1 +DISTNAME= calc-2.12.4.13 PKGNAME= capc-${DISTNAME:S/t/./} CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calc/} diff --git a/math/capc-calc/PLIST b/math/capc-calc/PLIST index c6aad7473af8..8ef78c0adbbb 100644 --- a/math/capc-calc/PLIST +++ b/math/capc-calc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2011/04/05 17:18:14 drochner Exp $ +@comment $NetBSD: PLIST,v 1.14 2014/01/15 16:23:31 drochner Exp $ bin/calc bin/calc-static bin/cscript/4dsphere @@ -74,10 +74,13 @@ share/calc/README share/calc/alg_config.cal share/calc/beer.cal share/calc/bernoulli.cal +share/calc/bernpoly.cal share/calc/bigprime.cal share/calc/bindings +share/calc/brentsolve.cal share/calc/chi.cal share/calc/chrem.cal +share/calc/constants.cal share/calc/custhelp/argv share/calc/custhelp/devnull share/calc/custhelp/help @@ -94,6 +97,9 @@ share/calc/deg.cal share/calc/dms.cal share/calc/dotest.cal share/calc/ellip.cal +share/calc/factorial.cal +share/calc/factorial2.cal +share/calc/gvec.cal share/calc/hello.cal share/calc/help/COPYING share/calc/help/COPYING-LGPL @@ -253,18 +259,24 @@ share/calc/help/interrupt share/calc/help/intro share/calc/help/inverse share/calc/help/iroot +share/calc/help/isalnum +share/calc/help/isalpha share/calc/help/isassoc share/calc/help/isatty share/calc/help/isblk +share/calc/help/iscntrl share/calc/help/isconfig share/calc/help/isdefined +share/calc/help/isdigit share/calc/help/iserror share/calc/help/iseven share/calc/help/isfile +share/calc/help/isgraph share/calc/help/ishash share/calc/help/isident share/calc/help/isint share/calc/help/islist +share/calc/help/islower share/calc/help/ismat share/calc/help/ismult share/calc/help/isnull @@ -273,16 +285,21 @@ share/calc/help/isobj share/calc/help/isobjtype share/calc/help/isodd share/calc/help/isprime +share/calc/help/isprint share/calc/help/isptr +share/calc/help/ispunct share/calc/help/isqrt share/calc/help/isrand share/calc/help/israndom share/calc/help/isreal share/calc/help/isrel share/calc/help/issimple +share/calc/help/isspace share/calc/help/issq share/calc/help/isstr share/calc/help/istype +share/calc/help/isupper +share/calc/help/isxdigit share/calc/help/jacobi share/calc/help/join share/calc/help/lcm @@ -395,17 +412,21 @@ share/calc/help/ssq share/calc/help/statement share/calc/help/stoponerror share/calc/help/str +share/calc/help/strcasecmp share/calc/help/strcat share/calc/help/strcmp share/calc/help/strcpy share/calc/help/strerror share/calc/help/strlen +share/calc/help/strncasecmp share/calc/help/strncmp share/calc/help/strncpy share/calc/help/strpos share/calc/help/strprintf share/calc/help/strscan share/calc/help/strscanf +share/calc/help/strtolower +share/calc/help/strtoupper share/calc/help/substr share/calc/help/sum share/calc/help/swap @@ -428,8 +449,12 @@ share/calc/help/version share/calc/help/wishlist share/calc/help/xor share/calc/hms.cal +share/calc/infinities.cal share/calc/intfile.cal +share/calc/intnum.cal +share/calc/lambertw.cal share/calc/linear.cal +share/calc/lnseries.cal share/calc/lucas.cal share/calc/lucas_chk.cal share/calc/lucas_tbl.cal @@ -457,7 +482,11 @@ share/calc/screen.cal share/calc/seedrandom.cal share/calc/set8700.cal share/calc/set8700.line +share/calc/smallfactors.cal share/calc/solve.cal +share/calc/specialfunctions.cal +share/calc/statistics.cal +share/calc/strings.cal share/calc/sumsq.cal share/calc/sumtimes.cal share/calc/surd.cal @@ -477,7 +506,10 @@ share/calc/test5200.cal share/calc/test8400.cal share/calc/test8500.cal share/calc/test8600.cal +share/calc/test8900.cal +share/calc/toomcook.cal share/calc/unitfrac.cal share/calc/varargs.cal share/calc/xx_print.cal +share/calc/zeta2.cal @pkgdir include/calc/custom diff --git a/math/capc-calc/distinfo b/math/capc-calc/distinfo index 5bcf64fdfaa2..a8fc54498633 100644 --- a/math/capc-calc/distinfo +++ b/math/capc-calc/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.24 2012/05/07 19:57:17 dholland Exp $ +$NetBSD: distinfo,v 1.25 2014/01/15 16:23:31 drochner Exp $ -SHA1 (calc-2.12.4.1.tar.bz2) = b64eae89de2167f439f52b4005bbc4e5dfc0d6fb -RMD160 (calc-2.12.4.1.tar.bz2) = 68fe6352b6a1b58e53d7cb4b4f51c596aa8539f7 -Size (calc-2.12.4.1.tar.bz2) = 865856 bytes -SHA1 (patch-aa) = 65da8569bb74647ef01bfc389690d631d161ab96 +SHA1 (calc-2.12.4.13.tar.bz2) = 4d48fb78c903f10e9bcd05c42105498637dea834 +RMD160 (calc-2.12.4.13.tar.bz2) = c04d995a500ad7b0be27afbb6edaa6978c42437e +Size (calc-2.12.4.13.tar.bz2) = 970778 bytes +SHA1 (patch-aa) = 4cc64664e4eb3e5f1aea56f74d9615caa75483b2 SHA1 (patch-fposval_c) = 8a8d08f8b566e583faa3bd9033c4a9ac90cb343c diff --git a/math/capc-calc/patches/patch-aa b/math/capc-calc/patches/patch-aa index 3ab6b96ea3ab..df61c6d9e1eb 100644 --- a/math/capc-calc/patches/patch-aa +++ b/math/capc-calc/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ +$NetBSD: patch-aa,v 1.9 2014/01/15 16:23:31 drochner Exp $ ---- Makefile.orig 2008-02-24 08:58:36.000000000 +0100 +--- Makefile.orig 2013-09-01 23:02:02.000000000 +0000 +++ Makefile @@ -585,7 +585,7 @@ HAVE_UNUSED= @@ -9,9 +9,9 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ -INCDIR= /usr/include +INCDIR= ${PREFIX}/include - # Where to install calc realted things + # Where to install calc related things # -@@ -612,15 +612,15 @@ INCDIR= /usr/include +@@ -624,15 +624,15 @@ INCDIR= /usr/include # #BINDIR= /usr/local/bin #BINDIR= /dev/env/DJDIR/bin @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ # 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 -@@ -698,7 +698,7 @@ T= +@@ -710,7 +710,7 @@ T= #MANDIR= #MANDIR= /usr/local/man/man1 #MANDIR= /usr/man/man1 @@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ #MANDIR= /dev/env/DJDIR/man/man1 #MANDIR= /usr/man/u_man/man1 #MANDIR= /usr/contrib/man/man1 -@@ -709,7 +709,7 @@ MANDIR= /usr/share/man/man1 +@@ -721,7 +721,7 @@ MANDIR= /usr/share/man/man1 # # Use CATDIR= to disable installation of the calc cat (formatted) page. # @@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ #CATDIR= /usr/local/man/cat1 #CATDIR= /usr/local/catman/cat1 #CATDIR= /usr/man/cat1 -@@ -730,9 +730,9 @@ MANEXT= 1 +@@ -742,9 +742,9 @@ MANEXT= 1 # # This is ignored if CATDIR is empty. # @@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ #CATEXT= l # how to format a man page -@@ -758,8 +758,8 @@ CATEXT= 1 +@@ -770,8 +770,8 @@ CATEXT= 1 # and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE # lines below. # @@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ #NROFF= groff NROFF_ARG= -man #NROFF_ARG= -mandoc -@@ -825,13 +825,14 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc +@@ -837,13 +837,14 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc # # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing. # @@ -89,7 +89,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ #READLINE_EXTRAS= -lhistory -lncurses # #READLINE_LIB= -L/usr/gnu/lib -lreadline -@@ -884,7 +885,7 @@ CALCPAGER= less +@@ -896,7 +897,7 @@ CALCPAGER= less # #DEBUG= -O3 #DEBUG= -O3 -g @@ -98,8 +98,8 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ #DEBUG= -O3 -ipa #DEBUG= -O3 -g3 -ipa -@@ -1360,10 +1361,10 @@ CC= ${PURIFY} ${LCC} ${CCWERR} - # LDFLAGS for ${CC} in linking calc progs other than intermediate progs +@@ -1409,10 +1410,10 @@ CC= ${PURIFY} ${LCC} ${CCWERR} + # LDFLAGS for ${CC} in linking calc programs other than intermediate programs # ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC} -CFLAGS= ${ICFLAGS} ${CCOPT} @@ -111,7 +111,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ # #if 0 /* start of skip for non-Gnu makefiles */ endif -@@ -1375,7 +1376,7 @@ endif +@@ -1470,7 +1471,7 @@ endif # NOTE: This is the default generic host target. Used when no other # host target matches. @@ -120,7 +120,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ # BLD_TYPE= calc-static-only # -@@ -1421,7 +1422,7 @@ ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC} +@@ -1516,7 +1517,7 @@ ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC} else ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE} endif @@ -129,7 +129,7 @@ $NetBSD: patch-aa,v 1.8 2008/05/05 18:54:05 drochner Exp $ # Required flags to link files for calc # -@@ -4394,9 +4395,9 @@ endif +@@ -4511,9 +4512,9 @@ endif ${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}.