diff options
-rw-r--r-- | math/capc-calc/Makefile | 8 | ||||
-rw-r--r-- | math/capc-calc/PLIST | 27 | ||||
-rw-r--r-- | math/capc-calc/distinfo | 11 | ||||
-rw-r--r-- | math/capc-calc/patches/patch-aa | 71 | ||||
-rw-r--r-- | math/capc-calc/patches/patch-ab | 25 |
5 files changed, 72 insertions, 70 deletions
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile index 190da661634..a739b2f6036 100644 --- a/math/capc-calc/Makefile +++ b/math/capc-calc/Makefile @@ -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 @@ HOMEPAGE= http://www.isthe.com/chongo/tech/comp/calc/ 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 --git a/math/capc-calc/PLIST b/math/capc-calc/PLIST index f2c7c1855a7..939868ac71b 100644 --- a/math/capc-calc/PLIST +++ b/math/capc-calc/PLIST @@ -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/cmath.h 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_getpgid.h 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/have_ustat.h 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/devnull 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/bugs 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/cosh 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/matsum 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/seed 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/srand 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/strscan 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.cal 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 @@ share/calc/xx_print.cal @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 --git a/math/capc-calc/distinfo b/math/capc-calc/distinfo index 98450aaa70d..cc89d02772f 100644 --- a/math/capc-calc/distinfo +++ b/math/capc-calc/distinfo @@ -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 --git a/math/capc-calc/patches/patch-aa b/math/capc-calc/patches/patch-aa index 3dba3c781e3..ab40a9503dc 100644 --- a/math/capc-calc/patches/patch-aa +++ b/math/capc-calc/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $ # 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 @@ $NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $ -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 @@ $NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $ #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 @@ $NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $ #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 @@ $NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $ #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 @@ $NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $ #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 @@ $NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $ #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 @@ $NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $ +#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 # --CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} --ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} -+CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} ${CPPFLAGS} -+ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} ${CPPFLAGS} +@@ -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 # --LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED} -+LDFLAGS+= ${NO_SHARED} ${LD_NO_SHARED} - ILDFLAGS= +@@ -1304,7 +1304,7 @@ CFLAGS= ${ICFLAGS} ${CCOPT} + # LDFLAGS for ${CC} in linking calc progs other than intermediate progs # - LCC= gcc + ILDFLAGS= ${COMMON_LDFLAGS} +-LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ++LDFLAGS+= ${LD_DEBUG} ${ILDFLAGS} + + #endif /* end of skip for non-Gnu makefiles */ + +@@ -4192,9 +4192,9 @@ install: custom/Makefile ${LIB_H_SRC} ${ + ${Q}# NOTE: The this makefile installs libcustcalc${LIB_EXT_VERS} + ${Q}# because we only want to perform one ${LDCONFIG} for both + ${Q}# libcalc${LIB_EXT_VERS} and libcustcalc${LIB_EXT_VERS}. +- -${Q} if ${CMP} -s libcalc${LIB_EXT_VERS} \ ++ -${Q} if true ${CMP} -s libcalc${LIB_EXT_VERS} \ + ${T}${LIBDIR}/libcalc${LIB_EXT_VERS} && \ +- ${CMP} -s custom/libcustcalc${LIB_EXT_VERS} \ ++ true ${CMP} -s custom/libcustcalc${LIB_EXT_VERS} \ + ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; then \ + ${TRUE}; \ + else \ diff --git a/math/capc-calc/patches/patch-ab b/math/capc-calc/patches/patch-ab deleted file mode 100644 index b4548fbf9bb..00000000000 --- a/math/capc-calc/patches/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2007/08/01 20:51:45 joerg Exp $ - ---- alloc.h.orig 2007-08-01 20:33:48.000000000 +0000 -+++ alloc.h -@@ -44,19 +44,7 @@ - # include <calc/have_memmv.h> - #endif - --#ifdef HAVE_MALLOC_H --# include <malloc.h> --#else --#if defined(FORCE_STDC) || (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus) -- extern void *malloc(); -- extern void *realloc(); -- extern void free(); --# else -- extern char *malloc(); -- extern char *realloc(); -- extern void free(); --# endif --#endif -+#include <stdlib.h> - - #ifdef HAVE_STRING_H - # include <string.h> |