Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Feb 2018 10:55:23 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r461038 - in head/math/calc: . files
Message-ID:  <201802061055.w16AtN1K094515@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: johans
Date: Tue Feb  6 10:55:23 2018
New Revision: 461038
URL: https://svnweb.freebsd.org/changeset/ports/461038

Log:
  Update calc to version 2.12.6.5 (bugfix release)
  Replace SF with Github as source

Added:
  head/math/calc/files/patch-Makefile.ship   (contents, props changed)
Deleted:
  head/math/calc/files/patch-Makefile
Modified:
  head/math/calc/Makefile
  head/math/calc/distinfo

Modified: head/math/calc/Makefile
==============================================================================
--- head/math/calc/Makefile	Tue Feb  6 09:02:49 2018	(r461037)
+++ head/math/calc/Makefile	Tue Feb  6 10:55:23 2018	(r461038)
@@ -2,21 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	calc
-PORTVERSION=	2.12.6.0
+PORTVERSION=	2.12.6.5
 CATEGORIES=	math
-MASTER_SITES=	SF
 
-LICENSE=	LGPL21
-
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Arbitrary precision calculator
 
+LICENSE=	LGPL21
+
 USES=		gmake tar:bzip2 readline
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	lcn2
 
 MAKE_JOBS_UNSAFE=	yes
 
 CALCPAGER?=	more
+MAKEFILE=	Makefile.ship
 MAKE_ENV+=	CALCPAGER="${CALCPAGER}" CAT="${CAT}" CHMOD="${CHMOD}" \
 		CP="${CP}" GMAKE="${MAKE_CMD}" LN="${LN}" MKDIR="${MKDIR}" \
 		MV="${MV}" RM="${RM}" SED="${SED}" TOUCH="${TOUCH}" \

Modified: head/math/calc/distinfo
==============================================================================
--- head/math/calc/distinfo	Tue Feb  6 09:02:49 2018	(r461037)
+++ head/math/calc/distinfo	Tue Feb  6 10:55:23 2018	(r461038)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499281492
-SHA256 (calc-2.12.6.0.tar.bz2) = 18dee9d979d8d397ee4a6f57c494a60790034c0ff109b3c552faff97f1ad7cf2
-SIZE (calc-2.12.6.0.tar.bz2) = 959818
+TIMESTAMP = 1517913994
+SHA256 (lcn2-calc-2.12.6.5_GH0.tar.gz) = c87697db966b83e499e046f43e3d772fbcab4b29e452084645885664fa329807
+SIZE (lcn2-calc-2.12.6.5_GH0.tar.gz) = 1112269

Added: head/math/calc/files/patch-Makefile.ship
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/calc/files/patch-Makefile.ship	Tue Feb  6 10:55:23 2018	(r461038)
@@ -0,0 +1,235 @@
+--- Makefile.ship.orig	2018-01-29 02:26:08 UTC
++++ Makefile.ship
+@@ -581,7 +581,7 @@ else
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default INCDIR for non-macOS
+-INCDIR= /usr/include
++INCDIR= ${PREFIX}/include
+ #INCDIR= /usr/local/include
+ #INCDIR= /dev/env/DJDIR/include
+ 
+@@ -644,7 +644,7 @@ else
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default BINDIR for non-macOS
+-BINDIR= /usr/bin
++BINDIR= ${PREFIX}/bin
+ #BINDIR= /usr/local/bin
+ #BINDIR= /dev/env/DJDIR/bin
+ 
+@@ -660,7 +660,7 @@ else
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default LIBDIR for non-macOS
+-LIBDIR= /usr/lib
++LIBDIR= ${PREFIX}/lib
+ #LIBDIR= /usr/local/lib
+ #LIBDIR= /dev/env/DJDIR/lib
+ 
+@@ -676,7 +676,7 @@ else
+ #endif	/* end of skip for non-Gnu makefiles */
+ 
+ # default CALC_SHAREDIR for non-macOS
+-CALC_SHAREDIR= /usr/share/calc
++CALC_SHAREDIR= ${PREFIX}/share/calc
+ #CALC_SHAREDIR= /usr/local/lib/calc
+ #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+ 
+@@ -749,7 +749,7 @@ SCRIPTDIR= ${BINDIR}/cscript
+ #
+ # If in doubt, use T=
+ #
+-T=
++T=${DESTDIR}
+ 
+ # where man pages are installed
+ #
+@@ -760,7 +760,7 @@ T=
+ #MANDIR=
+ #MANDIR= /usr/local/man/man1
+ #MANDIR= /usr/man/man1
+-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
+@@ -895,14 +895,14 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
+ #
+ # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
+ #
+-USE_READLINE=
+-#USE_READLINE= -DUSE_READLINE
++#USE_READLINE=
++USE_READLINE= -DUSE_READLINE
+ #
+ READLINE_LIB=
+ READLINE_EXTRAS=
+ #
+-#READLINE_LIB= -lreadline
+-#READLINE_EXTRAS= -lhistory -lncurses
++READLINE_LIB= -lreadline
++READLINE_EXTRAS= -lhistory -lncurses
+ #
+ #READLINE_LIB= -L/usr/gnu/lib -lreadline
+ #READLINE_EXTRAS= -lhistory -lncurses
+@@ -936,7 +936,7 @@ READLINE_INCLUDE=
+ #CALCPAGER= more
+ #CALCPAGER= pg
+ #CALCPAGER= cat
+-CALCPAGER= less
++#CALCPAGER= less
+ #CALCPAGER= less.exe -ci
+ 
+ # Debug/Optimize options for ${CC} and ${LCC}
+@@ -1063,35 +1063,35 @@ LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}
+ 
+ # standard utilities used during make
+ #
+-SHELL= /bin/sh
++#SHELL= /bin/sh
+ LANG= C
+-MAKE= make
++#MAKE= make
+ AWK= awk
+-SED= sed
++#SED= sed
+ DIFF= diff
+ GREP= egrep
+ SORT= sort
+ TEE= tee
+ CTAGS= ctags
+-CHMOD= chmod
++#CHMOD= chmod
+ FMT= fmt
+ XARGS= xargs
+ CMP= cmp
+-MKDIR= mkdir
++#MKDIR= mkdir
+ SPLINT= splint
+ SPLINT_OPTS=
+-RM= rm
+-TOUCH= touch
++#RM= rm
++#TOUCH= touch
+ RMDIR= rmdir
+-CP= cp
+-MV= mv
++#CP= cp
++#MV= mv
+ CO= co
+ AR= ar
+-TRUE= true
+-CAT= cat
++#TRUE= true
++#CAT= cat
+ COL= col
+-LN= ln
+-LDCONFIG= ldconfig
++#LN= ln
++#LDCONFIG= ldconfig
+ # assume the X11 makedepend tool for the depend rule
+ MAKEDEPEND= makedepend
+ STRIP= strip
+@@ -1381,13 +1381,15 @@ WNO_IMPLICT= -Wno-implicit
+ WNO_ERROR_LONG_LONG= -Wno-error=long-long
+ WNO_LONG_LONG= -Wno-long-long
+ CCWERR=
+-CCOPT= ${DEBUG}
++#CCOPT= ${DEBUG}
++CCOPT=
+ CCMISC=
+ #
+-LCC= gcc
+-CC= ${PURIFY} ${LCC} ${CCWERR}
++LCC= ${CC}
++#CC= ${PURIFY} ${LCC} ${CCWERR}
+ #
+-MAKE= gmake
++#MAKE= gmake
++MAKE= ${GMAKE}
+ #
+ endif
+ 
+@@ -1734,7 +1736,8 @@ ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
+ else
+ ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
+ endif
+-CFLAGS= ${ICFLAGS} ${CCOPT}
++#CFLAGS= ${ICFLAGS} ${CCOPT}
++CFLAGS+= ${ICFLAGS} ${CCOPT}
+ 
+ # Required flags to link files for calc
+ #
+@@ -1919,7 +1922,7 @@ CUSTOM_PASSDOWN=  \
+     COMMON_ADD="${COMMON_ADD}" \
+     COMMON_CFLAGS="${COMMON_CFLAGS} -I.." \
+     COMMON_LDFLAGS="${COMMON_LDFLAGS}" \
+-    CP=${CP} \
++    CP="${CP}" \
+     CUSTOMCALDIR="${CUSTOMCALDIR}" \
+     CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
+     CUSTOMINCDIR="${CUSTOMINCDIR}" \
+@@ -1947,7 +1950,7 @@ CUSTOM_PASSDOWN=  \
+     PURIFY="${PURIFY}" \
+     Q="${Q}" \
+     RANLIB="${RANLIB}" \
+-    RM=${RM} \
++    RM="${RM}" \
+     RMDIR=${RMDIR} \
+     SCRIPTDIR="${SCRIPTDIR}" \
+     SED=${SED} \
+@@ -1974,7 +1977,7 @@ HELP_PASSDOWN= \
+     COMMON_ADD="${COMMON_ADD}" \
+     COMMON_CFLAGS="${COMMON_CFLAGS}" \
+     COMMON_LDFLAGS="${COMMON_LDFLAGS}" \
+-    CP=${CP} \
++    CP="${CP}" \
+     EXT=${EXT} \
+     FMT=${FMT} \
+     GREP=${GREP} \
+@@ -1989,7 +1992,7 @@ HELP_PASSDOWN= \
+     MKDIR=${MKDIR} \
+     MV=${MV} \
+     Q="${Q}" \
+-    RM=${RM} \
++    RM="${RM}" \
+     RMDIR=${RMDIR} \
+     SCRIPTDIR="${SCRIPTDIR}" \
+     SED=${SED} \
+@@ -2009,7 +2012,7 @@ CAL_PASSDOWN= \
+     CHMOD=${CHMOD} \
+     CMP=${CMP} \
+     CO=${CO} \
+-    CP=${CP} \
++    CP="${CP}" \
+     HELPDIR="${HELPDIR}" \
+     INCDIR="${INCDIR}" \
+     LANG=${LANG} \
+@@ -2018,7 +2021,7 @@ CAL_PASSDOWN= \
+     MKDIR=${MKDIR} \
+     MV=${MV} \
+     Q="${Q}" \
+-    RM=${RM} \
++    RM="${RM}" \
+     RMDIR=${RMDIR} \
+     SCRIPTDIR="${SCRIPTDIR}" \
+     T=${T} \
+@@ -2037,7 +2040,7 @@ CSCRIPT_PASSDOWN= \
+     CHMOD=${CHMOD} \
+     CMP=${CMP} \
+     CO=${CO} \
+-    CP=${CP} \
++    CP="${CP}" \
+     FMT=${FMT} \
+     HELPDIR="${HELPDIR}" \
+     INCDIR="${INCDIR}" \
+@@ -2047,7 +2050,7 @@ CSCRIPT_PASSDOWN= \
+     MKDIR=${MKDIR} \
+     MV=${MV} \
+     Q="${Q}" \
+-    RM=${RM} \
++    RM="${RM}" \
+     RMDIR=${RMDIR} \
+     SCRIPTDIR="${SCRIPTDIR}" \
+     SED=${SED} \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802061055.w16AtN1K094515>