pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/math/capc-calc update to 2.12.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/eb46951b7bf9
branches: trunk
changeset: 533414:eb46951b7bf9
user: drochner <drochner%pkgsrc.org@localhost>
date: Tue Sep 18 19:40:19 2007 +0000
description:
update to 2.12.2
This is a major release. Significant changes include:
* calc may be built with static or dynamic shared libraries
* overhauled Makefiles to use system targets
- replaced compiler sets with host targets
- targets include: linux, OS X, FreeBSD, simple, default
- many changes to Makefile variables
* calc source static and extern variables declared with CPP symbols
- to make it easier to compile under certain Windoz environments
- to assist those who are developing a multi-threaded calc lib
* calc library makes it easier to control parse and scan messages
* added Makefile.simple for hosts without GNU Make
* added custom registers
- when calc is run with the -C flag
* dropped support of md5 and sha-0 hashes
* calc supports real and complex exponentiation bases and exponents
- i.e., 2.5 ^ 3.5, 0.5i ^ 0.25, 2.5 ^ 2.718i, 3.13145i ^ 0.30103i
added TEST_TARGET
diffstat:
math/capc-calc/Makefile | 8 +++-
math/capc-calc/PLIST | 27 +++++++-------
math/capc-calc/distinfo | 11 ++---
math/capc-calc/patches/patch-aa | 73 +++++++++++++++++++++++++++-------------
math/capc-calc/patches/patch-ab | 25 --------------
5 files changed, 73 insertions(+), 71 deletions(-)
diffs (truncated from 344 to 300 lines):
diff -r e93e5ab54152 -r eb46951b7bf9 math/capc-calc/Makefile
--- a/math/capc-calc/Makefile Tue Sep 18 19:24:17 2007 +0000
+++ b/math/capc-calc/Makefile Tue Sep 18 19:40:19 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2007/02/22 20:30:15 drochner Exp $
+# $NetBSD: Makefile,v 1.33 2007/09/18 19:40:19 drochner Exp $
#
-DISTNAME= calc-2.12.1.8
+DISTNAME= calc-2.12.2
PKGNAME= capc-${DISTNAME:S/t/./}
CATEGORIES= math
MASTER_SITES= http://www.isthe.com/chongo/src/calc/ \
@@ -12,6 +12,10 @@
COMMENT= C arbitrary precision calculator
USE_TOOLS+= gmake
+BUILD_TARGET= calc-static-only
+MAKE_ENV+= BLD_TYPE=calc-static-only target=pkgsrc
+
+TEST_TARGET= check
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff -r e93e5ab54152 -r eb46951b7bf9 math/capc-calc/PLIST
--- a/math/capc-calc/PLIST Tue Sep 18 19:24:17 2007 +0000
+++ b/math/capc-calc/PLIST Tue Sep 18 19:40:19 2007 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2007/02/22 20:30:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/09/18 19:40:19 drochner Exp $
bin/calc
+bin/calc-static
bin/cscript/4dsphere
bin/cscript/fproduct
bin/cscript/mersenne
@@ -20,6 +21,7 @@
include/calc/conf.h
include/calc/config.h
include/calc/custom.h
+include/calc/decl.h
include/calc/endian_calc.h
include/calc/file.h
include/calc/fposval.h
@@ -32,7 +34,6 @@
include/calc/have_getprid.h
include/calc/have_getsid.h
include/calc/have_gettime.h
-include/calc/have_malloc.h
include/calc/have_memmv.h
include/calc/have_newstr.h
include/calc/have_offscl.h
@@ -50,26 +51,24 @@
include/calc/hist.h
include/calc/jump.h
include/calc/label.h
+include/calc/lib_calc.h
include/calc/lib_util.h
include/calc/longbits.h
-include/calc/math_error.h
-include/calc/md5.h
include/calc/nametype.h
include/calc/opcodes.h
include/calc/prime.h
include/calc/qmath.h
-include/calc/shs.h
-include/calc/shs1.h
-include/calc/string.h
+include/calc/sha1.h
+include/calc/str.h
include/calc/symbol.h
include/calc/terminal.h
include/calc/token.h
include/calc/value.h
-include/calc/win32dll.h
include/calc/zmath.h
include/calc/zrand.h
include/calc/zrandom.h
lib/libcalc.a
+lib/libcustcalc.a
man/man1/calc.1
share/calc/README
share/calc/alg_config.cal
@@ -84,12 +83,13 @@
share/calc/custhelp/help
share/calc/custhelp/pmodm127
share/calc/custhelp/pzasusb8
+share/calc/custhelp/register
share/calc/custhelp/sysinfo
share/calc/custom/argv.cal
share/calc/custom/halflen.cal
-share/calc/custom/libcustcalc.a
share/calc/custom/pmodm127.cal
share/calc/custom/pzasusb8.cal
+share/calc/custom/register.cal
share/calc/deg.cal
share/calc/dotest.cal
share/calc/ellip.cal
@@ -139,6 +139,7 @@
share/calc/help/builtin
share/calc/help/calc_tty
share/calc/help/calclevel
+share/calc/help/calcpath
share/calc/help/catalan
share/calc/help/ceil
share/calc/help/cfappr
@@ -158,6 +159,7 @@
share/calc/help/cot
share/calc/help/coth
share/calc/help/count
+share/calc/help/cp
share/calc/help/credit
share/calc/help/csc
share/calc/help/csch
@@ -301,7 +303,6 @@
share/calc/help/mattrace
share/calc/help/mattrans
share/calc/help/max
-share/calc/help/md5
share/calc/help/memsize
share/calc/help/meq
share/calc/help/min
@@ -379,7 +380,6 @@
share/calc/help/segment
share/calc/help/select
share/calc/help/sgn
-share/calc/help/sha
share/calc/help/sha1
share/calc/help/sin
share/calc/help/sinh
@@ -392,6 +392,7 @@
share/calc/help/srandom
share/calc/help/ssq
share/calc/help/statement
+share/calc/help/stoponerror
share/calc/help/str
share/calc/help/strcat
share/calc/help/strcmp
@@ -406,7 +407,6 @@
share/calc/help/strscanf
share/calc/help/substr
share/calc/help/sum
-share/calc/sumtimes.cal
share/calc/help/swap
share/calc/help/system
share/calc/help/systime
@@ -457,6 +457,7 @@
share/calc/set8700.line
share/calc/solve.cal
share/calc/sumsq.cal
+share/calc/sumtimes.cal
share/calc/surd.cal
share/calc/test1700.cal
share/calc/test2300.cal
@@ -481,7 +482,5 @@
@dirrm share/calc/custom
@dirrm share/calc/custhelp
@dirrm share/calc
-@exec ${MKDIR} %D/include/calc/custom
-@dirrm include/calc/custom
@dirrm include/calc
@dirrm bin/cscript
diff -r e93e5ab54152 -r eb46951b7bf9 math/capc-calc/distinfo
--- a/math/capc-calc/distinfo Tue Sep 18 19:24:17 2007 +0000
+++ b/math/capc-calc/distinfo Tue Sep 18 19:40:19 2007 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.18 2007/08/01 20:51:45 joerg Exp $
+$NetBSD: distinfo,v 1.19 2007/09/18 19:40:19 drochner Exp $
-SHA1 (calc-2.12.1.8.tar.gz) = 4ff5f8adb638565814319513e8acdf98191cb580
-RMD160 (calc-2.12.1.8.tar.gz) = e1ff2fc7d8bc7ad9247d93645ae373774cc88314
-Size (calc-2.12.1.8.tar.gz) = 1022615 bytes
-SHA1 (patch-aa) = a23c0d11319f28d1de6d3c8d08330284d91772c6
-SHA1 (patch-ab) = 7c6f0a626edb7ea1cb3272ebc9cefa8cf81e1021
+SHA1 (calc-2.12.2.tar.gz) = b8d6459892b576db28df88b59eb4c42cd83e58fd
+RMD160 (calc-2.12.2.tar.gz) = 5354b3d576fa9b57329c58def734012a29bf1882
+Size (calc-2.12.2.tar.gz) = 1064176 bytes
+SHA1 (patch-aa) = 7cd0aa6d8c028584cf992d5c85f693e6037b64fa
diff -r e93e5ab54152 -r eb46951b7bf9 math/capc-calc/patches/patch-aa
--- a/math/capc-calc/patches/patch-aa Tue Sep 18 19:24:17 2007 +0000
+++ b/math/capc-calc/patches/patch-aa Tue Sep 18 19:40:19 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2007/09/18 19:40:19 drochner Exp $
---- Makefile.orig 2006-05-19 16:00:01.000000000 +0200
+--- Makefile.orig 2007-09-02 09:19:49.000000000 +0200
+++ Makefile
-@@ -571,7 +571,7 @@ HAVE_UNUSED=
+@@ -584,7 +584,7 @@ HAVE_UNUSED=
#INCDIR= /usr/local/include
#INCDIR= /dev/env/DJDIR/include
@@ -11,7 +11,7 @@
# Where to install calc realted things
#
-@@ -598,15 +598,15 @@ INCDIR= /usr/include
+@@ -611,15 +611,15 @@ INCDIR= /usr/include
#
#BINDIR= /usr/local/bin
#BINDIR= /dev/env/DJDIR/bin
@@ -28,9 +28,9 @@
-CALC_SHAREDIR= /usr/share/calc
+CALC_SHAREDIR= ${PREFIX}/share/calc
- #CALC_INCDIR= /usr/local/include/calc
- #CALC_INCDIR= /dev/env/DJDIR/include/calc
-@@ -680,7 +680,7 @@ T=
+ # 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
+@@ -697,7 +697,7 @@ T=
#MANDIR=
#MANDIR= /usr/local/man/man1
#MANDIR= /usr/man/man1
@@ -39,7 +39,7 @@
#MANDIR= /dev/env/DJDIR/man/man1
#MANDIR= /usr/man/u_man/man1
#MANDIR= /usr/contrib/man/man1
-@@ -691,7 +691,7 @@ MANDIR= /usr/share/man/man1
+@@ -708,7 +708,7 @@ MANDIR= /usr/share/man/man1
#
# Use CATDIR= to disable installation of the calc cat (formatted) page.
#
@@ -48,7 +48,7 @@
#CATDIR= /usr/local/man/cat1
#CATDIR= /usr/local/catman/cat1
#CATDIR= /usr/man/cat1
-@@ -712,9 +712,9 @@ MANEXT= 1
+@@ -729,9 +729,9 @@ MANEXT= 1
#
# This is ignored if CATDIR is empty.
#
@@ -60,7 +60,7 @@
#CATEXT= l
# how to format a man page
-@@ -740,8 +740,8 @@ CATEXT= 1
+@@ -757,8 +757,8 @@ CATEXT= 1
# and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
# lines below.
#
@@ -71,7 +71,7 @@
#NROFF= groff
NROFF_ARG= -man
#NROFF_ARG= -mandoc
-@@ -785,10 +785,10 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
+@@ -802,10 +802,10 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
#
# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
#
@@ -85,7 +85,7 @@
#READLINE_LIB= -lreadline -lhistory -lncurses
#READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
#READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
-@@ -834,7 +834,7 @@ CALCPAGER= less
+@@ -853,7 +853,7 @@ CALCPAGER= less
#
#DEBUG= -O3
#DEBUG= -O3 -g
@@ -93,18 +93,43 @@
+#DEBUG= -O3 -g3
#DEBUG= -O3 -ipa
#DEBUG= -O3 -g3 -ipa
+
+@@ -1254,7 +1254,7 @@ endif
+ # NOTE: This is the default generic host target. Used when no other
+ # host target matches.
+
+-ifeq ($(target),)
++ifeq ($(target),pkgsrc)
#
-@@ -1007,10 +1007,10 @@ CCWERR=
- CCOPT= ${DEBUG} ${NO_SHARED}
- CCMISC=
+ BLD_TYPE= calc-static-only
+ #
+@@ -1296,7 +1296,7 @@ ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
+ else
+ ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
+ endif
+-CFLAGS= ${ICFLAGS} ${CCOPT}
++CFLAGS= ${ICFLAGS} ${CCOPT} ${CPPFLAGS}
+
+ # Required flags to link files for calc
#
--CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
--ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
-+CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} ${CPPFLAGS}
-+ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} ${CPPFLAGS}
+@@ -1304,7 +1304,7 @@ CFLAGS= ${ICFLAGS} ${CCOPT}
+ # LDFLAGS for ${CC} in linking calc progs other than intermediate progs
#
--LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
-+LDFLAGS+= ${NO_SHARED} ${LD_NO_SHARED}
- ILDFLAGS=
- #
- LCC= gcc
+ ILDFLAGS= ${COMMON_LDFLAGS}
+-LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
++LDFLAGS+= ${LD_DEBUG} ${ILDFLAGS}
Home |
Main Index |
Thread Index |
Old Index