5 files changed, 33 insertions, 35 deletions

diff --git a/math/calc/Makefile b/math/calc/Makefile
index 0166b558e960..60ae02f686b6 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	calc
-PORTVERSION=	2.11.11
+PORTVERSION=	2.12.1.8
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/math/calc/distinfo b/math/calc/distinfo
index ea5fc2ce11c0..47b7849c80f0 100644
--- a/math/calc/distinfo
+++ b/math/calc/distinfo
@@ -1,3 +1,3 @@
-MD5 (calc-2.11.11.tar.gz) = 3c040f1b2152625fb93dc19598e4477f
-SHA256 (calc-2.11.11.tar.gz) = 3e722d5cd9c0ec5362fbcfa4ab6f334b4954a2c186e34f85a40864d802e0e59c
-SIZE (calc-2.11.11.tar.gz) = 976437
+MD5 (calc-2.12.1.8.tar.gz) = 163fcec68cf13f750407161b015f787b
+SHA256 (calc-2.12.1.8.tar.gz) = 6fbaeb450103139b8b84416a11b87051e105313bc509b4ad35d86d9d5a6582f1
+SIZE (calc-2.12.1.8.tar.gz) = 1022615
diff --git a/math/calc/files/patch-Makefile b/math/calc/files/patch-Makefile
index 4c16b826634c..5e6d28d47e10 100644
--- a/math/calc/files/patch-Makefile
+++ b/math/calc/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Tue Oct 18 19:56:15 2005
-+++ Makefile	Thu Jun  1 11:40:25 2006
-@@ -572,7 +572,7 @@
+--- Makefile.orig	Wed Feb  7 01:35:20 2007
++++ Makefile	Wed Feb  7 14:54:34 2007
+@@ -571,7 +571,7 @@
  
  #INCDIR= /usr/local/include
  #INCDIR= /dev/env/DJDIR/include
@@ -9,7 +9,7 @@
  
  # Where to install calc realted things
  #
-@@ -599,15 +599,15 @@
+@@ -598,15 +598,15 @@
  #
  #BINDIR= /usr/local/bin
  #BINDIR= /dev/env/DJDIR/bin
@@ -28,7 +28,7 @@
  
  #CALC_INCDIR= /usr/local/include/calc
  #CALC_INCDIR= /dev/env/DJDIR/include/calc
-@@ -681,7 +681,7 @@
+@@ -680,7 +680,7 @@
  #MANDIR=
  #MANDIR= /usr/local/man/man1
  #MANDIR= /usr/man/man1
@@ -37,7 +37,7 @@
  #MANDIR= /dev/env/DJDIR/man/man1
  #MANDIR= /usr/man/u_man/man1
  #MANDIR= /usr/contrib/man/man1
-@@ -786,13 +786,13 @@
+@@ -785,13 +785,13 @@
  #
  # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
  #
@@ -55,26 +55,26 @@
  #
  # For Apple OS X: install fink from http://fink.sourceforge.net
  #		  and then do a 'fink install readline' and then use:
-@@ -1004,13 +1004,13 @@
+@@ -1008,13 +1008,13 @@
  CCOPT= ${DEBUG} ${NO_SHARED}
  CCMISC=
  #
 -CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
 -ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
-+CFLAGS= -DCALC_SRC
-+ICFLAGS= ${CFLAGS}
++CFLAGS+= -DCALC_SRC
++ICFLAGS= -DCALC_SRC
  #
  LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
  ILDFLAGS=
  #
 -LCC= gcc
 +LCC= cc
- CC= ${PURIFY} ${LCC}
+ CC= ${PURIFY} ${LCC} ${CCWERR}
  #
  ###
-@@ -1509,6 +1509,7 @@
+@@ -1573,6 +1573,7 @@
  TARGETS= ${LICENSE} ${CALC_LIBS} custom/.all calc${EXT} sample/.all \
- 	 cal/.all help/.all help/builtin cscript/.all calc.1
+ 	 cal/.all help/.all help/builtin cscript/.all calc.1 calc.usage
  
 +RM=	rm
  
diff --git a/math/calc/files/patch-lib_calc.c b/math/calc/files/patch-lib_calc.c
deleted file mode 100644
index 241bead76932..000000000000
--- a/math/calc/files/patch-lib_calc.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib_calc.c.orig	Mon Feb  7 22:08:08 2000
-+++ lib_calc.c	Mon Feb  7 22:10:42 2000
-@@ -407,9 +407,13 @@
- 		if (ent == NULL) {
- 			/* just assume . is home if all else fails */
- 			home = ".";
-+		} else {
-+			home = (char *)malloc(strlen(ent->pw_dir)+1);
-+			if (home == NULL)
-+				home = ".";
-+			else
-+				strcpy(home, ent->pw_dir);
- 		}
--		home = (char *)malloc(strlen(ent->pw_dir)+1);
--		strcpy(home, ent->pw_dir);
- 	}
- 
- 	/* determine the $PAGER value */
diff --git a/math/calc/pkg-plist b/math/calc/pkg-plist
index 94d925b607e4..64ce63770d2c 100644
--- a/math/calc/pkg-plist
+++ b/math/calc/pkg-plist
@@ -70,6 +70,7 @@ include/calc/zrand.h
 include/calc/zrandom.h
 lib/libcalc.a
 %%DATADIR%%/README
+%%DATADIR%%/alg_config.cal
 %%DATADIR%%/beer.cal
 %%DATADIR%%/bernoulli.cal
 %%DATADIR%%/bigprime.cal
@@ -88,6 +89,7 @@ lib/libcalc.a
 %%DATADIR%%/custom/pmodm127.cal
 %%DATADIR%%/custom/pzasusb8.cal
 %%DATADIR%%/deg.cal
+%%DATADIR%%/dotest.cal
 %%DATADIR%%/ellip.cal
 %%DATADIR%%/hello.cal
 %%DATADIR%%/help/COPYING
@@ -154,7 +156,6 @@ lib/libcalc.a
 %%DATADIR%%/help/cot
 %%DATADIR%%/help/coth
 %%DATADIR%%/help/count
-%%DATADIR%%/help/cp
 %%DATADIR%%/help/credit
 %%DATADIR%%/help/csc
 %%DATADIR%%/help/csch
@@ -179,6 +180,7 @@ lib/libcalc.a
 %%DATADIR%%/help/error
 %%DATADIR%%/help/errorcode
 %%DATADIR%%/help/errorcodes
+%%DATADIR%%/help/estr
 %%DATADIR%%/help/euler
 %%DATADIR%%/help/eval
 %%DATADIR%%/help/exp
@@ -192,6 +194,7 @@ lib/libcalc.a
 %%DATADIR%%/help/fflush
 %%DATADIR%%/help/fgetc
 %%DATADIR%%/help/fgetfield
+%%DATADIR%%/help/fgetfile
 %%DATADIR%%/help/fgetline
 %%DATADIR%%/help/fgets
 %%DATADIR%%/help/fgetstr
@@ -201,6 +204,7 @@ lib/libcalc.a
 %%DATADIR%%/help/floor
 %%DATADIR%%/help/fopen
 %%DATADIR%%/help/forall
+%%DATADIR%%/help/fpathopen
 %%DATADIR%%/help/fprintf
 %%DATADIR%%/help/fputc
 %%DATADIR%%/help/fputs
@@ -282,6 +286,7 @@ lib/libcalc.a
 %%DATADIR%%/help/libcalc
 %%DATADIR%%/help/list
 %%DATADIR%%/help/ln
+%%DATADIR%%/help/log
 %%DATADIR%%/help/lowbit
 %%DATADIR%%/help/ltol
 %%DATADIR%%/help/makelist
@@ -328,6 +333,7 @@ lib/libcalc.a
 %%DATADIR%%/help/poly
 %%DATADIR%%/help/pop
 %%DATADIR%%/help/popcnt
+%%DATADIR%%/help/pound
 %%DATADIR%%/help/power
 %%DATADIR%%/help/prevcand
 %%DATADIR%%/help/prevprime
@@ -386,8 +392,12 @@ lib/libcalc.a
 %%DATADIR%%/help/statement
 %%DATADIR%%/help/str
 %%DATADIR%%/help/strcat
+%%DATADIR%%/help/strcmp
+%%DATADIR%%/help/strcpy
 %%DATADIR%%/help/strerror
 %%DATADIR%%/help/strlen
+%%DATADIR%%/help/strncmp
+%%DATADIR%%/help/strncpy
 %%DATADIR%%/help/strpos
 %%DATADIR%%/help/strprintf
 %%DATADIR%%/help/strscan
@@ -396,6 +406,7 @@ lib/libcalc.a
 %%DATADIR%%/help/sum
 %%DATADIR%%/help/swap
 %%DATADIR%%/help/system
+%%DATADIR%%/help/systime
 %%DATADIR%%/help/tail
 %%DATADIR%%/help/tan
 %%DATADIR%%/help/tanh
@@ -407,6 +418,7 @@ lib/libcalc.a
 %%DATADIR%%/help/types
 %%DATADIR%%/help/unexpected
 %%DATADIR%%/help/usage
+%%DATADIR%%/help/usertime
 %%DATADIR%%/help/variable
 %%DATADIR%%/help/version
 %%DATADIR%%/help/wishlist
@@ -436,9 +448,13 @@ lib/libcalc.a
 %%DATADIR%%/randrun.cal
 %%DATADIR%%/regress.cal
 %%DATADIR%%/repeat.cal
+%%DATADIR%%/screen.cal
 %%DATADIR%%/seedrandom.cal
+%%DATADIR%%/set8700.cal
+%%DATADIR%%/set8700.line
 %%DATADIR%%/solve.cal
 %%DATADIR%%/sumsq.cal
+%%DATADIR%%/sumtimes.cal
 %%DATADIR%%/surd.cal
 %%DATADIR%%/test1700.cal
 %%DATADIR%%/test2300.cal