svn commit: r569488 - in head/math/calc: . files
Adam Weinberger
adamw at FreeBSD.org
Mon Mar 29 17:22:38 UTC 2021
Author: adamw
Date: Mon Mar 29 17:22:37 2021
New Revision: 569488
URL: https://svnweb.freebsd.org/changeset/ports/569488
Log:
math/calc: Update to 2.13.0.0
Modified:
head/math/calc/Makefile
head/math/calc/distinfo
head/math/calc/files/patch-Makefile.ship
Modified: head/math/calc/Makefile
==============================================================================
--- head/math/calc/Makefile Mon Mar 29 16:59:57 2021 (r569487)
+++ head/math/calc/Makefile Mon Mar 29 17:22:37 2021 (r569488)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= calc
-PORTVERSION= 2.12.9.1
+PORTVERSION= 2.13.0.0
DISTVERSIONPREFIX= v
CATEGORIES= math
Modified: head/math/calc/distinfo
==============================================================================
--- head/math/calc/distinfo Mon Mar 29 16:59:57 2021 (r569487)
+++ head/math/calc/distinfo Mon Mar 29 17:22:37 2021 (r569488)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616843925
-SHA256 (lcn2-calc-v2.12.9.1_GH0.tar.gz) = 48c97c067e58c0f7da1fe12b08a25eb7ccbfece9152dca4b3febaa8ab59de725
-SIZE (lcn2-calc-v2.12.9.1_GH0.tar.gz) = 1135135
+TIMESTAMP = 1617037653
+SHA256 (lcn2-calc-v2.13.0.0_GH0.tar.gz) = cddd50c91ccd51b7ad4e7fc29a544c4c0ec582a5853cd81192d4054a1faf5372
+SIZE (lcn2-calc-v2.13.0.0_GH0.tar.gz) = 1137154
Modified: head/math/calc/files/patch-Makefile.ship
==============================================================================
--- head/math/calc/files/patch-Makefile.ship Mon Mar 29 16:59:57 2021 (r569487)
+++ head/math/calc/files/patch-Makefile.ship Mon Mar 29 17:22:37 2021 (r569488)
@@ -1,6 +1,6 @@
---- Makefile.ship.orig 2021-02-20 17:27:50 UTC
+--- Makefile.ship.orig 2021-03-29 17:08:06 UTC
+++ Makefile.ship
-@@ -579,7 +579,7 @@ else
+@@ -662,7 +662,7 @@ else
#endif /* end of skip for non-Gnu makefiles */
# default INCDIR for non-macOS
@@ -9,7 +9,7 @@
#INCDIR= /usr/local/include
#INCDIR= /dev/env/DJDIR/include
-@@ -642,7 +642,7 @@ else
+@@ -725,7 +725,7 @@ else
#endif /* end of skip for non-Gnu makefiles */
# default BINDIR for non-macOS
@@ -18,7 +18,7 @@
#BINDIR= /usr/local/bin
#BINDIR= /dev/env/DJDIR/bin
-@@ -658,7 +658,7 @@ else
+@@ -741,7 +741,7 @@ else
#endif /* end of skip for non-Gnu makefiles */
# default LIBDIR for non-macOS
@@ -27,7 +27,7 @@
#LIBDIR= /usr/local/lib
#LIBDIR= /dev/env/DJDIR/lib
-@@ -674,7 +674,7 @@ else
+@@ -757,7 +757,7 @@ else
#endif /* end of skip for non-Gnu makefiles */
# default CALC_SHAREDIR for non-macOS
@@ -36,7 +36,7 @@
#CALC_SHAREDIR= /usr/local/lib/calc
#CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-@@ -688,7 +688,7 @@ endif
+@@ -771,7 +771,7 @@ endif
#
#CALC_INCDIR= /usr/local/include/calc
#CALC_INCDIR= /dev/env/DJDIR/include/calc
@@ -45,7 +45,7 @@
# By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
# ---------------------------------------------------------------
-@@ -715,7 +715,7 @@ HELPDIR= ${CALC_SHAREDIR}/help
+@@ -798,7 +798,7 @@ HELPDIR= ${CALC_SHAREDIR}/help
CUSTOMCALDIR= ${CALC_SHAREDIR}/custom
CUSTOMHELPDIR= ${CALC_SHAREDIR}/custhelp
CUSTOMINCDIR= ${CALC_INCDIR}/custom
@@ -54,25 +54,25 @@
# T - top level directory under which calc will be installed
#
-@@ -747,7 +747,7 @@ SCRIPTDIR= ${BINDIR}/cscript
+@@ -830,7 +830,7 @@ SCRIPTDIR= ${BINDIR}/cscript
#
# If in doubt, use T=
#
-T=
+T= ${DESTDIR}
- # where man pages are installed
+ # where man section 1 pages are installed
#
-@@ -758,7 +758,7 @@ T=
- #MANDIR=
- #MANDIR= /usr/local/man/man1
- #MANDIR= /usr/man/man1
+@@ -852,7 +852,7 @@ ifeq ($(target),Darwin)
+ MANDIR= /usr/local/share/man/man1
+ else
+ #endif /* end of skip for non-Gnu makefiles */
-MANDIR= /usr/share/man/man1
+MANDIR= ${PREFIX}/man/man1
- #MANDIR= /dev/env/DJDIR/man/man1
- #MANDIR= /usr/man/u_man/man1
- #MANDIR= /usr/contrib/man/man1
-@@ -893,11 +893,11 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
+ #if 0 /* start of skip for non-Gnu makefiles */
+ endif
+ #endif /* end of skip for non-Gnu makefiles */
+@@ -993,11 +993,11 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calcrc:./.calcinit
#
# If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
#
@@ -87,7 +87,7 @@
#
#READLINE_LIB= -lreadline
#READLINE_EXTRAS= -lhistory -lncurses
-@@ -923,7 +923,7 @@ READLINE_EXTRAS=
+@@ -1023,7 +1023,7 @@ READLINE_EXTRAS=
#READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline
#READLINE_EXTRAS= -lhistory -lncurses
#
@@ -96,7 +96,7 @@
#READLINE_INCLUDE= -I/usr/gnu/include
#READLINE_INCLUDE= -I/usr/local/include
-@@ -934,7 +934,7 @@ READLINE_INCLUDE=
+@@ -1034,7 +1034,7 @@ READLINE_INCLUDE=
#CALCPAGER= more
#CALCPAGER= pg
#CALCPAGER= cat
@@ -105,7 +105,7 @@
#CALCPAGER= less.exe -ci
# Debug/Optimize options for ${CC} and ${LCC}
-@@ -1125,7 +1125,7 @@ EXTRA_LDFLAGS=
+@@ -1228,7 +1228,7 @@ EXTRA_LDFLAGS=
# The ARCH_CFLAGS are ${CC} when compiling C files. They follow
# CCMISC and precede EXTRA_CFLAGS.
#
@@ -114,20 +114,29 @@
#ARCH_CFLAGS=
# COMMON_CFLAGS are the common ${CC} flags used for all programs, both
-@@ -1398,8 +1398,8 @@ CCWERR=
+@@ -1511,8 +1511,8 @@ CCWERR=
CCOPT= ${DEBUG}
CCMISC=
#
-LCC= gcc
-CC= ${PURIFY} ${LCC} ${CCWERR}
+LCC= ${CC}
-+#CC= ${PURIFY} ${CC} ${CCWERR}
++#CC= ${PURIFY} ${LCC} ${CCWERR}
#
MAKE= gmake
#
-@@ -1748,7 +1748,7 @@ ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
+@@ -1725,7 +1725,7 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
+ # LDFLAGS for ${CC} in linking calc programs other than intermediate programs
+ #
+ ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
+-CFLAGS= ${ICFLAGS} ${CCOPT}
++CFLAGS+= ${ICFLAGS} ${CCOPT}
+ #
+ ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
+ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
+@@ -1853,7 +1853,7 @@ ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_STATIC}
else
- ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
+ ICFLAGS= ${COMMON_CFLAGS} ${CCBAN} ${CC_SHARE}
endif
-CFLAGS= ${ICFLAGS} ${CCOPT}
+CFLAGS+= ${ICFLAGS} ${CCOPT}
More information about the svn-ports-head
mailing list