Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Jul 2017 20:20:02 -0600
From:      Adam Weinberger <adamw@adamw.org>
To:        Johan van Selst <johans@FreeBSD.org>
Cc:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r445096 - in head/math/calc: . files
Message-ID:  <541FF227-5E7F-479D-B5CD-9BDA803076B9@adamw.org>
In-Reply-To: <201707052010.v65KANUG080710@repo.freebsd.org>
References:  <201707052010.v65KANUG080710@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
> On 5 Jul, 2017, at 14:10, Johan van Selst <johans@FreeBSD.org> wrote:
>=20
> Author: johans
> Date: Wed Jul  5 20:10:23 2017
> New Revision: 445096
> URL: https://svnweb.freebsd.org/changeset/ports/445096
>=20
> Log:
>  Update to calc 2.12.6.0
>  List licence
>=20
> Modified:
>  head/math/calc/Makefile
>  head/math/calc/distinfo
>  head/math/calc/files/patch-Makefile
>  head/math/calc/pkg-plist

Johan -

This is failing to build for me. The crux of it is:

# gmake[2]: Entering directory =
'/wrkdirs/usr/ports/math/calc/work/calc-2.12.6.0/cal'
gmake[2]: HELPDIR=3D/usr/local/share/calc/help: No such file or =
directory
gmake[2]: *** No rule to make target =
'HELPDIR=3D/usr/local/share/calc/help'.  Stop.

The patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D219906 =
works.

# Adam


--=20
Adam Weinberger
adamw@adamw.org
https://www.adamw.org


>=20
> Modified: head/math/calc/Makefile
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/math/calc/Makefile	Wed Jul  5 20:02:44 2017	=
(r445095)
> +++ head/math/calc/Makefile	Wed Jul  5 20:10:23 2017	=
(r445096)
> @@ -2,10 +2,11 @@
> # $FreeBSD$
>=20
> PORTNAME=3D	calc
> -PORTVERSION=3D	2.12.5.3
> -PORTREVISION=3D	1
> +PORTVERSION=3D	2.12.6.0
> CATEGORIES=3D	math
> MASTER_SITES=3D	SF
> +
> +LICENSE=3D	LGPL21
>=20
> MAINTAINER=3D	johans@FreeBSD.org
> COMMENT=3D	Arbitrary precision calculator
>=20
> Modified: head/math/calc/distinfo
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/math/calc/distinfo	Wed Jul  5 20:02:44 2017	=
(r445095)
> +++ head/math/calc/distinfo	Wed Jul  5 20:10:23 2017	=
(r445096)
> @@ -1,2 +1,3 @@
> -SHA256 (calc-2.12.5.3.tar.bz2) =3D =
0fcf60917efb10aab145f1180c278a3ab63d789aad6d5e5f066a4458b5f9b692
> -SIZE (calc-2.12.5.3.tar.bz2) =3D 956025
> +TIMESTAMP =3D 1499281492
> +SHA256 (calc-2.12.6.0.tar.bz2) =3D =
18dee9d979d8d397ee4a6f57c494a60790034c0ff109b3c552faff97f1ad7cf2
> +SIZE (calc-2.12.6.0.tar.bz2) =3D 959818
>=20
> Modified: head/math/calc/files/patch-Makefile
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/math/calc/files/patch-Makefile	Wed Jul  5 20:02:44 2017	=
(r445095)
> +++ head/math/calc/files/patch-Makefile	Wed Jul  5 20:10:23 2017	=
(r445096)
> @@ -1,6 +1,6 @@
> ---- Makefile.orig	2016-02-08 22:10:13 UTC
> -+++ Makefile
> -@@ -573,7 +573,7 @@ HAVE_UNUSED=3D
> +--- Makefile.orig	2017-06-02 23:50:17.000000000 +0200
> ++++ Makefile	2017-07-05 21:12:24.953147000 +0200
> +@@ -571,7 +571,7 @@ HAVE_UNUSED=3D
>=20
>  #INCDIR=3D /usr/local/include
>  #INCDIR=3D /dev/env/DJDIR/include
> @@ -9,7 +9,7 @@
>=20
>  # Where to install calc related things
>  #
> -@@ -612,15 +612,15 @@ INCDIR=3D /usr/include
> +@@ -610,15 +610,15 @@ INCDIR=3D /usr/include
>  #
>  #BINDIR=3D /usr/local/bin
>  #BINDIR=3D /dev/env/DJDIR/bin
> @@ -28,7 +28,7 @@
>=20
>  # 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
> -@@ -687,7 +687,7 @@ SCRIPTDIR=3D ${BINDIR}/cscript
> +@@ -685,7 +685,7 @@ SCRIPTDIR=3D ${BINDIR}/cscript
>  #
>  # If in doubt, use T=3D
>  #
> @@ -37,7 +37,7 @@
>=20
>  # where man pages are installed
>  #
> -@@ -698,7 +698,7 @@ T=3D
> +@@ -696,7 +696,7 @@ T=3D
>  #MANDIR=3D
>  #MANDIR=3D /usr/local/man/man1
>  #MANDIR=3D /usr/man/man1
> @@ -46,7 +46,7 @@
>  #MANDIR=3D /dev/env/DJDIR/man/man1
>  #MANDIR=3D /usr/man/u_man/man1
>  #MANDIR=3D /usr/contrib/man/man1
> -@@ -825,14 +825,14 @@ CALCRC=3D ${CALC_SHAREDIR}/startup:~/.calc
> +@@ -831,14 +831,14 @@ CALCRC=3D ${CALC_SHAREDIR}/startup:~/.calc
>  #
>  # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to =
nothing.
>  #
> @@ -67,7 +67,7 @@
>  #
>  #READLINE_LIB=3D -L/usr/gnu/lib -lreadline
>  #READLINE_EXTRAS=3D -lhistory -lncurses
> -@@ -866,7 +866,7 @@ READLINE_INCLUDE=3D
> +@@ -872,7 +872,7 @@ READLINE_INCLUDE=3D
>  #CALCPAGER=3D more
>  #CALCPAGER=3D pg
>  #CALCPAGER=3D cat
> @@ -76,7 +76,7 @@
>  #CALCPAGER=3D less.exe -ci
>=20
>  # Debug/Optimize options for ${CC} and ${LCC}
> -@@ -993,35 +993,36 @@ LIB_EXT_VERSION=3D ${LIB_EXT}.${VERSION}
> +@@ -999,35 +999,36 @@ LIB_EXT_VERSION=3D ${LIB_EXT}.${VERSION}
>=20
>  # standard utilities used during make
>  #
> @@ -126,7 +126,7 @@
>  # assume the X11 makedepend tool for the depend rule
>  MAKEDEPEND=3D makedepend
>  STRIP=3D strip
> -@@ -1269,13 +1270,15 @@ WNO_IMPLICT=3D -Wno-implicit
> +@@ -1327,13 +1328,15 @@ WNO_IMPLICT=3D -Wno-implicit
>  WNO_ERROR_LONG_LONG=3D -Wno-error=3Dlong-long
>  WNO_LONG_LONG=3D -Wno-long-long
>  CCWERR=3D
> @@ -146,7 +146,7 @@
>  #
>  endif
>=20
> -@@ -1554,7 +1557,8 @@ ICFLAGS=3D ${COMMON_CFLAGS} ${CC_STATIC}
> +@@ -1680,7 +1683,8 @@ ICFLAGS=3D ${COMMON_CFLAGS} ${CC_STATIC}
>  else
>  ICFLAGS=3D ${COMMON_CFLAGS} ${CC_SHARE}
>  endif
> @@ -156,8 +156,8 @@
>=20
>  # Required flags to link files for calc
>  #
> -@@ -1738,7 +1742,7 @@ CUSTOM_PASSDOWN=3D  \
> -     CO=3D${CO} \
> +@@ -1865,7 +1869,7 @@ CUSTOM_PASSDOWN=3D  \
> +     COMMON_ADD=3D"${COMMON_ADD}" \
>      COMMON_CFLAGS=3D"${COMMON_CFLAGS} -I.." \
>      COMMON_LDFLAGS=3D"${COMMON_LDFLAGS}" \
> -    CP=3D${CP} \
> @@ -165,7 +165,7 @@
>      CUSTOMCALDIR=3D"${CUSTOMCALDIR}" \
>      CUSTOMHELPDIR=3D"${CUSTOMHELPDIR}" \
>      CUSTOMINCDIR=3D"${CUSTOMINCDIR}" \
> -@@ -1766,7 +1770,7 @@ CUSTOM_PASSDOWN=3D  \
> +@@ -1893,7 +1897,7 @@ CUSTOM_PASSDOWN=3D  \
>      PURIFY=3D"${PURIFY}" \
>      Q=3D"${Q}" \
>      RANLIB=3D"${RANLIB}" \
> @@ -174,16 +174,16 @@
>      RMDIR=3D${RMDIR} \
>      SCRIPTDIR=3D"${SCRIPTDIR}" \
>      SED=3D${SED} \
> -@@ -1792,7 +1796,7 @@ HELP_PASSDOWN=3D \
> -     CO=3D${CO} \
> +@@ -1920,7 +1924,7 @@ HELP_PASSDOWN=3D \
> +     COMMON_ADD=3D"${COMMON_ADD}" \
>      COMMON_CFLAGS=3D"${COMMON_CFLAGS}" \
>      COMMON_LDFLAGS=3D"${COMMON_LDFLAGS}" \
> -    CP=3D${CP} \
> +    CP=3D"${CP}" \
>      EXT=3D${EXT} \
>      FMT=3D${FMT} \
> -     HELPDIR=3D"${HELPDIR}" \
> -@@ -1806,7 +1810,7 @@ HELP_PASSDOWN=3D \
> +     GREP=3D${GREP} \
> +@@ -1935,7 +1939,7 @@ HELP_PASSDOWN=3D \
>      MKDIR=3D${MKDIR} \
>      MV=3D${MV} \
>      Q=3D"${Q}" \
> @@ -192,16 +192,7 @@
>      RMDIR=3D${RMDIR} \
>      SCRIPTDIR=3D"${SCRIPTDIR}" \
>      SED=3D${SED} \
> -@@ -1826,7 +1830,7 @@ CAL_PASSDOWN=3D \
> -     CHMOD=3D${CHMOD} \
> -     CMP=3D${CMP} \
> -     CO=3D${CO} \
> --    CP=3D${CP} \
> -+    CP=3D"${CP}" \
> -     HELPDIR=3D"${HELPDIR}" \
> -     INCDIR=3D"${INCDIR}" \
> -     LANG=3D${LANG} \
> -@@ -1835,7 +1839,7 @@ CAL_PASSDOWN=3D \
> +@@ -1964,7 +1968,7 @@ CAL_PASSDOWN=3D \
>      MKDIR=3D${MKDIR} \
>      MV=3D${MV} \
>      Q=3D"${Q}" \
> @@ -210,7 +201,7 @@
>      RMDIR=3D${RMDIR} \
>      SCRIPTDIR=3D"${SCRIPTDIR}" \
>      T=3D${T} \
> -@@ -1854,7 +1858,7 @@ CSCRIPT_PASSDOWN=3D \
> +@@ -1983,7 +1987,7 @@ CSCRIPT_PASSDOWN=3D \
>      CHMOD=3D${CHMOD} \
>      CMP=3D${CMP} \
>      CO=3D${CO} \
> @@ -219,7 +210,7 @@
>      FMT=3D${FMT} \
>      HELPDIR=3D"${HELPDIR}" \
>      INCDIR=3D"${INCDIR}" \
> -@@ -1864,7 +1868,7 @@ CSCRIPT_PASSDOWN=3D \
> +@@ -1993,7 +1997,7 @@ CSCRIPT_PASSDOWN=3D \
>      MKDIR=3D${MKDIR} \
>      MV=3D${MV} \
>      Q=3D"${Q}" \
>=20
> Modified: head/math/calc/pkg-plist
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/math/calc/pkg-plist	Wed Jul  5 20:02:44 2017	=
(r445095)
> +++ head/math/calc/pkg-plist	Wed Jul  5 20:10:23 2017	=
(r445096)
> @@ -312,6 +312,7 @@ man/man1/calc.1.gz
> %%DATADIR%%/help/lowbit
> %%DATADIR%%/help/ltol
> %%DATADIR%%/help/makelist
> +%%DATADIR%%/help/man
> %%DATADIR%%/help/mat
> %%DATADIR%%/help/matdim
> %%DATADIR%%/help/matfill
> @@ -457,7 +458,6 @@ man/man1/calc.1.gz
> %%DATADIR%%/lnseries.cal
> %%DATADIR%%/lucas.cal
> %%DATADIR%%/lucas_chk.cal
> -%%DATADIR%%/lucas_tbl.cal
> %%DATADIR%%/mersenne.cal
> %%DATADIR%%/mfactor.cal
> %%DATADIR%%/mod.cal
>=20




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?541FF227-5E7F-479D-B5CD-9BDA803076B9>