Hello community, here is the log from the commit of package calc for openSUSE:Factory checked in at 2016-02-17 10:26:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calc (Old) and /work/SRC/openSUSE:Factory/.calc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calc" Changes: -------- --- /work/SRC/openSUSE:Factory/calc/calc.changes 2015-08-03 17:22:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calc.new/calc.changes 2016-02-17 12:10:03.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Feb 15 13:04:32 UTC 2016 - [email protected] + +- add calc-rpmlintrc package to spec file + +------------------------------------------------------------------- +Sat Feb 13 06:06:28 UTC 2016 - [email protected] + +- update to 2.12.5.3 +- add calc-qmath-sequence-point.patch +- replace calc-2.12.3.3-no-rpath.patch by using LD_SHARE="" +- add test for checksum +- bit of reworking the spec/merging with my old one (which is based + on the include upstream calc.spec.in) + +------------------------------------------------------------------- Old: ---- calc-2.12.3.3-no-rpath.patch calc-2.12.5.0.tar.bz2 New: ---- calc-2.12.5.3.tar.bz2 calc-qmath-sequence-point.patch calc-rpmlintrc checksum.sha-256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calc.spec ++++++ --- /var/tmp/diff_new_pack.yiMqxp/_old 2016-02-17 12:10:04.000000000 +0100 +++ /var/tmp/diff_new_pack.yiMqxp/_new 2016-02-17 12:10:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package calc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,33 @@ # -%define soname 1 +%define soname 2 %define libname libcalc%{soname} Name: calc -Version: 2.12.5.0 +Version: 2.12.5.3 Release: 0 -Summary: C-style arbitrary precision system +Summary: C-style arbitrary precision calculator License: LGPL-2.1 Group: Productivity/Scientific/Math -Url: http://sourceforge.net/projects/calc -Source0: http://sourceforge.net/projects/calc/files/calc/%{version}/%{name}-%{version}.tar.bz2 +Url: http://www.isthe.com/chongo/tech/comp/calc/index.html +Source0: http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2 +Source1: http://www.isthe.com/chongo/src/calc/checksum.sha-256 Source2: README.openSUSE -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch1: calc-2.12.3.3-no-rpath.patch +Source3: calc-rpmlintrc +# patch to replace a macro possibly dereferencing an undefined value +# by an inline-function +Patch0: %{name}-qmath-sequence-point.patch BuildRequires: fdupes +BuildRequires: ncurses-devel >= 5.5 +BuildRequires: readline-devel >= 5.1 +Requires: %{libname} = %{version}-%{release} +Requires: less >= 358 +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Calc is arbitrary precision C-like arithmetic system that is a -calculator, an algorithm prototyper and mathematical research tool. Calc -comes with a rich set of builtin mathematical and programmatic +calculator, an algorithm prototype and mathematical research tool. +Calc comes with a rich set of builtin mathematical and programmatic functions. %package -n %{libname} @@ -50,7 +58,7 @@ %package devel Summary: Development files for libcalc Group: Development/Libraries/C and C++ -Requires: %{libname} = %{version} +Requires: %{libname} = %{version}-%{release} %description devel Part of the calc release consists of an arbitrary precision math link @@ -62,16 +70,53 @@ this library. %prep +( cd ${RPM_SOURCE_DIR}; ls -l; + grep $(basename %{SOURCE0}) %{SOURCE1} | \ + sed 's/[[:space:]]\+/ /' | sha256sum -c - || exit 23; +) %setup -q -%patch1 +%patch0 -p1 + cp "%{SOURCE2}" . +%define makevars \\\ + BINDIR=%{_bindir} \\\ + LIBDIR=%{_libdir} \\\ + SCRIPTDIR=%{_datadir}/%{name}/cscript \\\ + CALC_SHAREDIR=%{_datadir}/%{name} \\\ + CALC_INCDIR=%{_includedir}/calc \\\ + MANDIR=%{_mandir}/man1 \\\ + HAVE_FPOS="-DHAVE_NO_FPOS" \\\ + LD_SHARE="" \\\ + EXTRA_CFLAGS="%{optflags} -g -fno-strict-aliasing" + %build -make EXTRA_CFLAGS="%{optflags}" HAVE_FPOS="-DHAVE_NO_FPOS" +make -e %{makevars} + +%check +make -e %{makevars} chk %install -make T=%{buildroot} LIBDIR=%{_libdir} SCRIPTDIR=%{_datadir}/calc/cscript install -%fdupes %{buildroot}%{_datadir}/calc/ +make T=%{buildroot} %{makevars} install + +# dummy-install some docs etc. to create the symlinks +install -d -m 755 %{buildroot}%{_docdir}/%{name} +install -m 644 BUGS COPYING COPYING-LGPL CHANGES %{buildroot}%{_docdir}/%{name}/ +# create symlinks to the help-dir for the help command, e.g. "help bugs" +ln -sf %{_docdir}/%{name}/COPYING \ + %{buildroot}%{_datadir}/%{name}/help/COPYING +ln -sf %{_docdir}/%{name}/COPYING-LGPL \ + %{buildroot}%{_datadir}/%{name}/help/COPYING-LGPL +ln -sf %{_docdir}/%{name}/BUGS \ + %{buildroot}%{_datadir}/%{name}/help/bug +ln -sf %{_docdir}/%{name}/BUGS \ + %{buildroot}%{_datadir}/%{name}/help/bugs +ln -sf %{_docdir}/%{name}/CHANGES \ + %{buildroot}%{_datadir}/%{name}/help/changes +ln -sf %{_docdir}/%{name}/CHANGES \ + %{buildroot}%{_datadir}/%{name}/help/change + +%fdupes %{buildroot} %post -n %{libname} -p /sbin/ldconfig @@ -79,19 +124,22 @@ %files %defattr(-, root, root) -%doc README README.openSUSE -%{_bindir}/calc -%{_datadir}/calc -%{_mandir}/man1/calc.1* +%doc BUGS CHANGES COPYING COPYING-LGPL README README.openSUSE +%{_bindir}/%{name} +%{_datadir}/%{name} +%doc %{_mandir}/man1/%{name}.1.gz %files -n %{libname} -%defattr(-, root, root) -%{_libdir}/*.so.* +%defattr(-,root,root) +%attr(755, root, root) %{_libdir}/libcalc.so.* +%attr(755, root, root) %{_libdir}/libcustcalc.so.* %files devel %defattr(-, root, root) -%doc LIBRARY sample_many.c sample_rand.c sample.README README README.openSUSE -%{_includedir}/* -%{_libdir}/*.so +%doc %attr(644, root, root) BUGS COPYING COPYING-LGPL LIBRARY +%doc sample_many.c sample_rand.c sample.README README README.openSUSE +%{_includedir}/%{name} +%{_libdir}/libcalc.so +%{_libdir}/libcustcalc.so %changelog ++++++ calc-2.12.5.0.tar.bz2 -> calc-2.12.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/CHANGES new/calc-2.12.5.3/CHANGES --- old/calc-2.12.5.0/CHANGES 2014-10-12 14:46:34.000000000 +0200 +++ new/calc-2.12.5.3/CHANGES 2016-02-08 23:09:38.000000000 +0100 @@ -1,4 +1,55 @@ -The following are the changes from calc version 2.12.5.0 to date: +The following are the changes from calc version 2.12.5.3 to date: + + Calc version 2.12.5.2 for Darwin (Mac OS X) users, code to installed + calc under /opt/calc. Moreover the CHANGES file did not mention + /opt/calc. Sorry about that!. + + A much better tree for Darwin (Mac OS X) users would have been + to install cal under /opt/calc. This release ONLY changes the Darwin + (Mac OS X) install tree to /usr/local. + + Darwin (Mac OS X) users who installed calc version 2.12.5.2 + should, after installing version 2.12.5.3: + + rm -rf /opt/calc + + +The following are the changes from calc version 2.12.5.1 to 2.12.5.2: + + NOTE: calc version 2.12.5.2, for Darwin (Mac OS X) users, + installed under /opt/calc. We neglected to mention this + AND /usr/local would have been a better choice. Sorry! + Fixed in calc version 2.12.5.3. + + Removed rules and makefile variables assocated with shortened + calc version numbers of less than 4 levels. + + Under OS X (darwin), if /usr/include is missing, warnings + are issued to help the user use xcode-select --install + so that one may properly compile C code. + + Lowered REDC levels: + + #define MAXREDC 256 /* number of entries in REDC cache */ + + #define SQ_ALG2 28 /* size for alternative squaring */ + config("sq2") == 28 /* was 3388 */ + #define MUL_ALG2 28 /* size for alternative multiply */ + config("mul2") == 28 /* was 1780 */ + #define POW_ALG2 20 /* size for using REDC for powers */ + config("pow2") == 20 /* was 176 */ + #define REDC_ALG2 25 /* size for using alternative REDC */ + config("redc2") == 25 /* was 220 */ + + The alg_config.cal script appears to be not correctly finding the + best REDC values. While it has been improved, alg_config.cal still + seems to be suspect on how it attempts to find the best values. + + Fixed an intro help file mistake found by Roger Hardiman + <roger at rjh dot org dot uk>. + + +The following are the changes from calc version 2.12.5.0 to 2.12.5.1: Calc has a new calc-tester mailing list. This list is for those who are using/testing calc. We also use this list to announce @@ -61,7 +112,7 @@ a general non-cryptographic quick hash. -The following are the changes from calc version 2.12.4.14 to date: +The following are the changes from calc version 2.12.4.14 to 2.12.5.0: For Apple OS X / Darwin target: @@ -7106,8 +7157,8 @@ ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ## -## @(#) $Revision: 30.46 $ -## @(#) $Id: CHANGES,v 30.46 2014/10/12 12:46:23 chongo Exp $ +## @(#) $Revision: 30.50 $ +## @(#) $Id: CHANGES,v 30.50 2016/02/08 22:09:34 chongo Exp $ ## @(#) $Source: /usr/local/src/bin/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/Makefile new/calc-2.12.5.3/Makefile --- old/calc-2.12.5.0/Makefile 2014-10-06 10:45:15.000000000 +0200 +++ new/calc-2.12.5.3/Makefile 2016-02-08 23:10:13.000000000 +0100 @@ -39,8 +39,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -MAKEFILE_REV= $$Revision: 30.78 $$ -# @(#) $Id: Makefile.ship,v 30.78 2014/10/06 08:45:06 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.85 $$ +# @(#) $Id: Makefile.ship,v 30.85 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -846,6 +846,15 @@ #READLINE_LIB= -L/sw/lib -lreadline #READLINE_EXTRAS= -lhistory -lncurses # +# For Apple OS X: install homebrew and then: +# +# brew install readline +# +# and use: +# +#READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline +#READLINE_EXTRAS= -lhistory -lncurses +# READLINE_INCLUDE= #READLINE_INCLUDE= -I/usr/gnu/include #READLINE_INCLUDE= -I/usr/local/include @@ -975,22 +984,13 @@ # The default calc versions # -VERSION= 2.12.5.0 +VERSION= 2.12.5.3 # Names of shared libraries with versions # LIB_EXT= .so LIB_EXT_VERSION= ${LIB_EXT}.${VERSION} -# legacy partial versions are no longer used, only removed -# -VERS= 2.12.5 -VER= 2.12 -VE= 2 -LIB_EXT_VERS= ${LIB_EXT}.${VERS} -LIB_EXT_VER= ${LIB_EXT}.${VER} -LIB_EXT_VE= ${LIB_EXT}.${VE} - # standard utilities used during make # SHELL= /bin/sh @@ -1215,10 +1215,6 @@ # Darwin dynamic shared lib filenames LIB_EXT:= .dylib LIB_EXT_VERSION:= .${VERSION}${LIB_EXT} -# legacy partial versions are no longer used, only removed -LIB_EXT_VERS:= .${VERS}${LIB_EXT} -LIB_EXT_VER:= .${VER}${LIB_EXT} -LIB_EXT_VE:= .${VE}${LIB_EXT} # LDCONFIG not required on this platform, so we redefine it to an empty string LDCONFIG:= # DARWIN_ARCH= -arch i386 -arch ppc # Universal binary @@ -1227,6 +1223,15 @@ # DARWIN_ARCH= -arch x86_64 # native 64-bit binary DARWIN_ARCH= # native binary # +# Starting with El Capitan OS X 10.11, root by default could not +# mkdir under system locations, so we now use the /usr/local tree. +# +OPTDIR:= /usr/local +BINDIR:= /${OPTDIR}/bin +LIBDIR:= /${OPTDIR}/lib +CALC_SHAREDIR:= /${OPTDIR}/share +CALC_INCDIR:= /${OPTDIR}/include +SCRIPTDIR:= ${BINDIR}/cscript endif ################## @@ -1771,9 +1776,6 @@ TOUCH=${TOUCH} \ TRUE=${TRUE} \ VERSION=${VERSION} \ - VERS=${VERS} \ - VER=${VER} \ - VE=${VE} \ target=${target} # The complete list of Makefile vars passed down to help/Makefile. @@ -1991,7 +1993,33 @@ # ### -all: ${BLD_TYPE} CHANGES +all: check_include ${BLD_TYPE} CHANGES + +check_include: + $(Q) if [ ! -d /usr/include ]; then \ + echo "ERROR: critical directory missing: /usr/include" 1>&2; \ + echo "Without this critical directory, we cannot compile." 1>&2; \ + echo 1>&2; \ + echo "Perhaps your system isn't setup to compile C source?" 1>&2; \ + echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \ + echo "must be installed and that you run the command:" 1>&2; \ + echo 1>&2; \ + echo " xcode-select --install" 1>&2; \ + echo 1>&2; \ + exit 1; \ + fi + $(Q) if [ ! -f /usr/include/stdio.h ]; then \ + echo "ERROR: critical include files are missing" 1>&2; \ + echo "Without this critical directory, we cannot compile." 1>&2; \ + echo 1>&2; \ + echo "Perhaps your system isn't setup to compile C source?" 1>&2; \ + echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \ + echo "must be installed and that you run the command:" 1>&2; \ + echo 1>&2; \ + echo " xcode-select --install" 1>&2; \ + echo 1>&2; \ + exit 1; \ + fi prep: ${Q} ${MAKE} -f ${MAKE_FILE} all DEBUG='-g3' @@ -4256,12 +4284,6 @@ cd cscript; ${RM} -f all; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@ ${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' ${V} echo remove files that are obsolete - ${RM} -f libcalc${LIB_EXT_VERS} - ${RM} -f libcalc${LIB_EXT_VER} - ${RM} -f libcalc${LIB_EXT_VE} - ${RM} -f libcustcalc${LIB_EXT_VERS} - ${RM} -f libcustcalc${LIB_EXT_VER} - ${RM} -f libcustcalc${LIB_EXT_VE} ${RM} -rf win32 build ${RM} -f no_implicit.arg ${RM} -f no_implicit.c no_implicit.o no_implicit${EXT} @@ -4466,27 +4488,6 @@ ${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new \ ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}; \ echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VERS}" ]; then \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \ - fi; \ - fi; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VER}" ]; then \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VER}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \ - fi; \ - fi; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VE}" ]; then \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VE}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \ - fi; \ - fi; \ ${LN} -f -s libcalc${LIB_EXT_VERSION} \ ${T}${LIBDIR}/libcalc${LIB_EXT}; \ echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \ @@ -4497,27 +4498,6 @@ ${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new \ ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; \ echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VERS}" ]; then \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \ - fi; \ - fi; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VER}" ]; then \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \ - fi; \ - fi; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VE}" ]; then \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \ - fi; \ - fi; \ ${LN} -f -s libcustcalc${LIB_EXT_VERSION} \ ${T}${LIBDIR}/libcustcalc${LIB_EXT}; \ echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \ @@ -4655,32 +4635,6 @@ echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT}"; \ fi; \ fi - -${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \ - echo "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}";\ - else \ - echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \ - fi; \ - fi - -${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \ - echo -n "cannot uninstall "; \ - echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \ - fi; \ - fi - -${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \ - echo \ - "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \ - fi; \ - fi -${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \ ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \ if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \ @@ -4698,30 +4652,6 @@ echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT}"; \ fi; \ fi - -${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \ - echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \ - fi; \ - fi - -${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \ - echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \ - fi; \ - fi - -${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \ - echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \ - fi; \ - fi -${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \ ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \ if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/Makefile.simple new/calc-2.12.5.3/Makefile.simple --- old/calc-2.12.5.0/Makefile.simple 2014-10-12 14:54:16.000000000 +0200 +++ new/calc-2.12.5.3/Makefile.simple 2016-02-08 23:13:16.000000000 +0100 @@ -39,8 +39,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -MAKEFILE_REV= $$Revision: 30.78 $$ -# @(#) $Id: Makefile.ship,v 30.78 2014/10/06 08:45:06 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.85 $$ +# @(#) $Id: Makefile.ship,v 30.85 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -823,6 +823,15 @@ #READLINE_LIB= -L/sw/lib -lreadline #READLINE_EXTRAS= -lhistory -lncurses # +# For Apple OS X: install homebrew and then: +# +# brew install readline +# +# and use: +# +#READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline +#READLINE_EXTRAS= -lhistory -lncurses +# READLINE_INCLUDE= #READLINE_INCLUDE= -I/usr/gnu/include #READLINE_INCLUDE= -I/usr/local/include @@ -952,22 +961,13 @@ # The default calc versions # -VERSION= 2.12.5.0 +VERSION= 2.12.5.3 # Names of shared libraries with versions # LIB_EXT= .so LIB_EXT_VERSION= ${LIB_EXT}.${VERSION} -# legacy partial versions are no longer used, only removed -# -VERS= 2.12.5 -VER= 2.12 -VE= 2 -LIB_EXT_VERS= ${LIB_EXT}.${VERS} -LIB_EXT_VER= ${LIB_EXT}.${VER} -LIB_EXT_VE= ${LIB_EXT}.${VE} - # standard utilities used during make # SHELL= /bin/sh @@ -1347,9 +1347,6 @@ TOUCH=${TOUCH} \ TRUE=${TRUE} \ VERSION=${VERSION} \ - VERS=${VERS} \ - VER=${VER} \ - VE=${VE} \ target=${target} # The complete list of Makefile vars passed down to help/Makefile. @@ -1535,7 +1532,33 @@ # ### -all: ${BLD_TYPE} CHANGES +all: check_include ${BLD_TYPE} CHANGES + +check_include: + $(Q) if [ ! -d /usr/include ]; then \ + echo "ERROR: critical directory missing: /usr/include" 1>&2; \ + echo "Without this critical directory, we cannot compile." 1>&2; \ + echo 1>&2; \ + echo "Perhaps your system isn't setup to compile C source?" 1>&2; \ + echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \ + echo "must be installed and that you run the command:" 1>&2; \ + echo 1>&2; \ + echo " xcode-select --install" 1>&2; \ + echo 1>&2; \ + exit 1; \ + fi + $(Q) if [ ! -f /usr/include/stdio.h ]; then \ + echo "ERROR: critical include files are missing" 1>&2; \ + echo "Without this critical directory, we cannot compile." 1>&2; \ + echo 1>&2; \ + echo "Perhaps your system isn't setup to compile C source?" 1>&2; \ + echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \ + echo "must be installed and that you run the command:" 1>&2; \ + echo 1>&2; \ + echo " xcode-select --install" 1>&2; \ + echo 1>&2; \ + exit 1; \ + fi prep: ${Q} ${MAKE} -f ${MAKE_FILE} all DEBUG='-g3' @@ -3756,12 +3779,6 @@ cd cscript; ${RM} -f all; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@ ${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' ${V} echo remove files that are obsolete - ${RM} -f libcalc${LIB_EXT_VERS} - ${RM} -f libcalc${LIB_EXT_VER} - ${RM} -f libcalc${LIB_EXT_VE} - ${RM} -f libcustcalc${LIB_EXT_VERS} - ${RM} -f libcustcalc${LIB_EXT_VER} - ${RM} -f libcustcalc${LIB_EXT_VE} ${RM} -rf win32 build ${RM} -f no_implicit.arg ${RM} -f no_implicit.c no_implicit.o no_implicit${EXT} @@ -3949,27 +3966,6 @@ ${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new \ ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}; \ echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VERS}" ]; then \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \ - fi; \ - fi; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VER}" ]; then \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VER}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \ - fi; \ - fi; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VE}" ]; then \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VE}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \ - fi; \ - fi; \ ${LN} -f -s libcalc${LIB_EXT_VERSION} \ ${T}${LIBDIR}/libcalc${LIB_EXT}; \ echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \ @@ -3980,27 +3976,6 @@ ${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new \ ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; \ echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VERS}" ]; then \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \ - fi; \ - fi; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VER}" ]; then \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \ - fi; \ - fi; \ - if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VE}" ]; then \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \ - ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}; \ - echo -n "removed legacy and likely out of date: "; \ - echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \ - fi; \ - fi; \ ${LN} -f -s libcustcalc${LIB_EXT_VERSION} \ ${T}${LIBDIR}/libcustcalc${LIB_EXT}; \ echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \ @@ -4138,32 +4113,6 @@ echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT}"; \ fi; \ fi - -${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \ - echo "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}";\ - else \ - echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \ - fi; \ - fi - -${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \ - echo -n "cannot uninstall "; \ - echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \ - fi; \ - fi - -${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \ - if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \ - echo \ - "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \ - fi; \ - fi -${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \ ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \ if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \ @@ -4181,30 +4130,6 @@ echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT}"; \ fi; \ fi - -${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \ - echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \ - fi; \ - fi - -${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \ - echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \ - fi; \ - fi - -${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \ - ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \ - if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \ - echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \ - else \ - echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \ - fi; \ - fi -${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \ ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \ if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/cal/alg_config.cal new/calc-2.12.5.3/cal/alg_config.cal --- old/calc-2.12.5.0/cal/alg_config.cal 2014-09-07 08:13:25.000000000 +0200 +++ new/calc-2.12.5.3/cal/alg_config.cal 2016-02-06 09:39:14.000000000 +0100 @@ -17,8 +17,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.11 $ - * @(#) $Id: alg_config.cal,v 30.11 2014/09/07 06:13:04 chongo Exp $ + * @(#) $Revision: 30.12 $ + * @(#) $Id: alg_config.cal,v 30.12 2016/02/06 08:38:56 chongo Exp $ * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/alg_config.cal,v $ * * Under source code control: 2006/06/07 14:10:11 @@ -364,7 +364,8 @@ /* * setup */ - test_time = 30.0; + printf("WARNING: This tool may not be computing the correct best value\n"); + test_time = 5.0; printf("The best_mul2() function will take a LONG time to run!\n"); printf("It is important that best_mul2() run on an othwewise idle host!\n"); if (config("user_debug") <= 0) { @@ -376,7 +377,7 @@ /* * firewall - must have a >1 ratio for the initial length */ - high = 16; + high = 8; best_val = high; if (config("user_debug") > 0) { printf("testing multiply alg1/alg2 ratio for len = %d\n", high); @@ -400,7 +401,7 @@ * We will multiplicatively expand our test level until * the ratio drops below 1.0. */ - expand = ((ratio >= 10) ? 1024 : 2^round(ratio)); + expand = 2; low = high; high *= expand; if (config("user_debug") > 1) { @@ -844,7 +845,8 @@ /* * setup */ - test_time = 30.0; + printf("WARNING: This tool may not be computing the correct best value\n"); + test_time = 5.0; printf("The best_sq2() function will take a LONG time to run!\n"); printf("It is important that best_sq2() run on an othwewise idle host!\n"); if (config("user_debug") <= 0) { @@ -856,7 +858,7 @@ /* * firewall - must have a >1 ratio for the initial length */ - high = 16; + high = 8; best_val = high; if (config("user_debug") > 0) { printf("testing square alg1/alg2 ratio for len = %d\n", high); @@ -880,7 +882,7 @@ * We will multiplicatively expand our test level until * the ratio drops below 1.0. */ - expand = ((ratio >= 10) ? 1024 : 2^round(ratio)); + expand = 2; low = high; high *= expand; if (config("user_debug") > 1) { @@ -1346,6 +1348,7 @@ /* * setup */ + printf("WARNING: This tool may not be computing the correct best value\n"); test_time = 60.0; printf("The best_pow2() function will take a LONG time to run!\n"); printf("It is important that best_pow2() run on an othwewise idle host!\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/cal/regress.cal new/calc-2.12.5.3/cal/regress.cal --- old/calc-2.12.5.0/cal/regress.cal 2014-08-31 18:52:58.000000000 +0200 +++ new/calc-2.12.5.3/cal/regress.cal 2016-02-06 09:39:48.000000000 +0100 @@ -17,8 +17,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.12 $ - * @(#) $Id: regress.cal,v 30.12 2013/09/02 02:32:55 chongo Exp $ + * @(#) $Revision: 30.13 $ + * @(#) $Id: regress.cal,v 30.13 2016/02/06 08:39:35 chongo Exp $ * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/regress.cal,v $ * * Under source code control: 1990/02/15 01:50:36 @@ -403,14 +403,14 @@ '512: config("trace") == 0'); vrfy(config("maxprint") == 16, '513: config("maxprint") == 16'); - vrfy(config("mul2") == 1780, - '514: config("mul2") == 1780'); - vrfy(config("sq2") == 3388, - '515: config("sq2") == 3388'); - vrfy(config("pow2") == 176, - '516: config("pow2") == 176'); - vrfy(config("redc2") == 220, - '517: config("redc2") == 220'); + vrfy(config("mul2") == 28, + '514: config("mul2") == 28'); + vrfy(config("sq2") == 28, + '515: config("sq2") == 28'); + vrfy(config("pow2") == 20, + '516: config("pow2") == 20'); + vrfy(config("redc2") == 25, + '517: config("redc2") == 25'); vrfy(config("tilde"), '518: config("tilde")'); vrfy(config("tab"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/custom/Makefile new/calc-2.12.5.3/custom/Makefile --- old/calc-2.12.5.0/custom/Makefile 2014-10-12 14:53:29.000000000 +0200 +++ new/calc-2.12.5.3/custom/Makefile 2016-02-08 23:12:30.000000000 +0100 @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.36 $ -# @(#) $Id: Makefile.head,v 30.36 2014/09/30 00:03:05 chongo Exp $ +# @(#) $Revision: 30.40 $ +# @(#) $Id: Makefile.head,v 30.40 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -352,22 +352,13 @@ # The default calc versions # -VERSION= 2.12.5.0 +VERSION= 2.12.5.3 # Names of shared libraries with versions # LIB_EXT= .so LIB_EXT_VERSION= ${LIB_EXT}.${VERSION} -# legacy partial versions are no longer used, only removed -# -VERS= 2.12.5 -VER= 2.12 -VE= 2 -LIB_EXT_VERS= ${LIB_EXT}.${VERS} -LIB_EXT_VER= ${LIB_EXT}.${VER} -LIB_EXT_VE= ${LIB_EXT}.${VE} - # standard tools # SHELL= /bin/sh @@ -599,10 +590,6 @@ # Darwin dynamic shared lib filenames LIB_EXT:= .dylib LIB_EXT_VERSION:= .${VERSION}${LIB_EXT} -# legacy partial versions are no longer used, only removed -LIB_EXT_VERS:= .${VERS}${LIB_EXT} -LIB_EXT_VER:= .${VER}${LIB_EXT} -LIB_EXT_VE:= .${VE}${LIB_EXT} # LDCONFIG not required on this platform, so we redefine it to an empty string LDCONFIG:= # DARWIN_ARCH= -arch i386 -arch ppc # Universal binary @@ -611,6 +598,15 @@ # DARWIN_ARCH= -arch x86_64 # native 64-bit binary DARWIN_ARCH= # native binary # +# Starting with El Capitan OS X 10.11, root by default could not +# mkdir under system locations, so we now use the /usr/local tree. +# +OPTDIR:= /usr/local +BINDIR:= /${OPTDIR}/bin +LIBDIR:= /${OPTDIR}/lib +CALC_SHAREDIR:= /${OPTDIR}/share +CALC_INCDIR:= /${OPTDIR}/include +SCRIPTDIR:= ${BINDIR}/cscript endif ################## @@ -1243,9 +1239,6 @@ ${RM} -f libcustcalc.*.dylib ${RM} -f libcustcalc.a ${V} echo remove files that are obsolete - ${RM} -f libcustcalc${LIB_EXT_VERS} - ${RM} -f libcustcalc${LIB_EXT_VER} - ${RM} -f libcustcalc${LIB_EXT_VE} #if 0 /* start of skip for non-Gnu makefiles */ ${RM} -f Makefile.simple #endif /* end of skip for non-Gnu makefiles */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/custom/Makefile.head new/calc-2.12.5.3/custom/Makefile.head --- old/calc-2.12.5.0/custom/Makefile.head 2014-09-30 02:03:05.000000000 +0200 +++ new/calc-2.12.5.3/custom/Makefile.head 2016-02-08 23:10:13.000000000 +0100 @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.36 $ -# @(#) $Id: Makefile.head,v 30.36 2014/09/30 00:03:05 chongo Exp $ +# @(#) $Revision: 30.40 $ +# @(#) $Id: Makefile.head,v 30.40 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -352,22 +352,13 @@ # The default calc versions # -VERSION= 2.12.5.0 +VERSION= 2.12.5.3 # Names of shared libraries with versions # LIB_EXT= .so LIB_EXT_VERSION= ${LIB_EXT}.${VERSION} -# legacy partial versions are no longer used, only removed -# -VERS= 2.12.5 -VER= 2.12 -VE= 2 -LIB_EXT_VERS= ${LIB_EXT}.${VERS} -LIB_EXT_VER= ${LIB_EXT}.${VER} -LIB_EXT_VE= ${LIB_EXT}.${VE} - # standard tools # SHELL= /bin/sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/custom/Makefile.simple new/calc-2.12.5.3/custom/Makefile.simple --- old/calc-2.12.5.0/custom/Makefile.simple 2014-10-12 14:54:16.000000000 +0200 +++ new/calc-2.12.5.3/custom/Makefile.simple 2016-02-08 23:13:16.000000000 +0100 @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.36 $ -# @(#) $Id: Makefile.head,v 30.36 2014/09/30 00:03:05 chongo Exp $ +# @(#) $Revision: 30.40 $ +# @(#) $Id: Makefile.head,v 30.40 2016/02/08 22:10:13 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -337,22 +337,13 @@ # The default calc versions # -VERSION= 2.12.5.0 +VERSION= 2.12.5.3 # Names of shared libraries with versions # LIB_EXT= .so LIB_EXT_VERSION= ${LIB_EXT}.${VERSION} -# legacy partial versions are no longer used, only removed -# -VERS= 2.12.5 -VER= 2.12 -VE= 2 -LIB_EXT_VERS= ${LIB_EXT}.${VERS} -LIB_EXT_VER= ${LIB_EXT}.${VER} -LIB_EXT_VE= ${LIB_EXT}.${VE} - # standard tools # SHELL= /bin/sh @@ -798,9 +789,6 @@ ${RM} -f libcustcalc.*.dylib ${RM} -f libcustcalc.a ${V} echo remove files that are obsolete - ${RM} -f libcustcalc${LIB_EXT_VERS} - ${RM} -f libcustcalc${LIB_EXT_VER} - ${RM} -f libcustcalc${LIB_EXT_VE} # install everything # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/custom/Makefile.tail new/calc-2.12.5.3/custom/Makefile.tail --- old/calc-2.12.5.0/custom/Makefile.tail 2014-09-08 03:50:42.000000000 +0200 +++ new/calc-2.12.5.3/custom/Makefile.tail 2015-03-01 05:10:55.000000000 +0100 @@ -293,9 +293,6 @@ ${RM} -f libcustcalc.*.dylib ${RM} -f libcustcalc.a ${V} echo remove files that are obsolete - ${RM} -f libcustcalc${LIB_EXT_VERS} - ${RM} -f libcustcalc${LIB_EXT_VER} - ${RM} -f libcustcalc${LIB_EXT_VE} #if 0 /* start of skip for non-Gnu makefiles */ ${RM} -f Makefile.simple #endif /* end of skip for non-Gnu makefiles */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/help/intro new/calc-2.12.5.3/help/intro --- old/calc-2.12.5.0/help/intro 2014-08-31 18:53:07.000000000 +0200 +++ new/calc-2.12.5.3/help/intro 2016-02-06 09:25:39.000000000 +0100 @@ -54,7 +54,7 @@ Functions can be used in expressions. There are a great number of pre-defined functions. For example, the following will calculate - the factorial of the value of 'old': + the factorial of the value of 'whey': fact(whey) @@ -185,8 +185,8 @@ ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ## -## @(#) $Revision: 30.1 $ -## @(#) $Id: intro,v 30.1 2007/03/16 11:10:42 chongo Exp $ +## @(#) $Revision: 30.2 $ +## @(#) $Id: intro,v 30.2 2016/02/06 08:25:30 chongo Exp $ ## @(#) $Source: /usr/local/src/bin/calc/help/RCS/intro,v $ ## ## Under source code control: 1991/07/21 04:37:21 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/version.c new/calc-2.12.5.3/version.c --- old/calc-2.12.5.0/version.c 2014-10-12 14:45:17.000000000 +0200 +++ new/calc-2.12.5.3/version.c 2016-02-08 23:09:39.000000000 +0100 @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.27 $ - * @(#) $Id: version.c,v 30.27 2014/10/12 12:44:57 chongo Exp $ + * @(#) $Revision: 30.30 $ + * @(#) $Id: version.c,v 30.30 2016/02/08 22:09:34 chongo Exp $ * @(#) $Source: /usr/local/src/bin/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -49,7 +49,7 @@ #define MAJOR_VER 2 /* major library version */ #define MINOR_VER 12 /* minor library version */ #define MAJOR_PATCH 5 /* major software level under library version */ -#define MINOR_PATCH 0 /* minor software level or 0 if not patched */ +#define MINOR_PATCH 3 /* minor software level or 0 if not patched */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/calc-2.12.5.0/zmath.h new/calc-2.12.5.3/zmath.h --- old/calc-2.12.5.0/zmath.h 2014-09-30 02:55:29.000000000 +0200 +++ new/calc-2.12.5.3/zmath.h 2016-02-06 09:39:47.000000000 +0100 @@ -17,8 +17,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.6 $ - * @(#) $Id: zmath.h,v 30.6 2014/09/30 00:55:11 chongo Exp $ + * @(#) $Revision: 30.7 $ + * @(#) $Id: zmath.h,v 30.7 2016/02/06 08:39:35 chongo Exp $ * @(#) $Source: /usr/local/src/bin/calc/RCS/zmath.h,v $ * * Under source code control: 1993/07/30 19:42:48 @@ -229,12 +229,12 @@ #define MAXLEN ((LEN) 0x7fffffff >> 3) /* longest value allowed */ -#define MAXREDC 64 /* number of entries in REDC cache */ -#define SQ_ALG2 3388 /* size for alternative squaring */ -#define MUL_ALG2 1780 /* size for alternative multiply */ -#define POW_ALG2 176 /* size for using REDC for powers */ +#define MAXREDC 256 /* number of entries in REDC cache */ +#define SQ_ALG2 28 /* size for alternative squaring */ +#define MUL_ALG2 28 /* size for alternative multiply */ +#define POW_ALG2 20 /* size for using REDC for powers */ /* old REDC_ALG2 was 5/4 of POW_ALG2, so we will keep the same ratio */ -#define REDC_ALG2 220 /* size for using alternative REDC */ +#define REDC_ALG2 25 /* size for using alternative REDC */ typedef union { ++++++ calc-qmath-sequence-point.patch ++++++ --- calc-2.12.4.4/qmath.h.orig 2011-09-08 03:18:31.000000000 +0200 +++ calc-2.12.4.4/qmath.h 2011-09-08 04:20:23.000000000 +0200 @@ -257,7 +257,9 @@ #define qhighbit(q) (zhighbit((q)->num)) #define qlowbit(q) (zlowbit((q)->num)) #define qdivcount(q1, q2) (zdivcount((q1)->num, (q2)->num)) -#define qlink(q) ((q)->links++, (q)) +/* operation on #q may be undefined, so replaced by inline-function */ +/* #define qlink(q) ((q)->links++, (q)) */ +static inline NUMBER* qlink(NUMBER* q) { if(q) { (q)->links++; } return q; } #define qfree(q) {if (--((q)->links) <= 0) qfreenum(q);} ++++++ calc-rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * addFilter("shared-lib-calls-exit") ++++++ checksum.sha-256 ++++++ # These are the SHA-256 cryptographic hashes some of the of tar balls. # # These were produced with the command: # # sha256sum filename # 6881d5fc0adf544557efd4c0b2eb57044e5bf1a3878f42666cb82a496b71fdc2 calc-2.12.4.13-11.i686.rpm aae6c5f2f3b121e093e795967e000900a4f70f49aa2af0040d047469d9bf1ca5 calc-2.12.4.13-11.src.rpm 1e6fd3256bd7bf738fcfe6e2d6a9d8a6bb0f37393aba6020b01d96274419a92c calc-2.12.4.13.tar.bz2 dbf14329d5e80d02a6bcee7c5709ac1afaa6539d51988f98772b706bc1663c56 calc-2.12.4.14-12.src.rpm fe97c8ccd5a5c9761ff4d9706721ffd296172cb49da3cbe741c2ec834c0e3665 calc-2.12.4.14-12.x86_64.rpm 12b627ab22dddc56b215c0b10c1fb04f864931e0d337d7facc100ebe9c94ec5c calc-2.12.4.14.tar.bz2 fa4802e364a287c1f074bbbe108effc9cf0a859e49e976d2e03c3ddb08b7bd50 calc-2.12.5.0-12.src.rpm b7bb96b26d42ae40c8cb12f634db0a838f46e54fe9557d26f3097bf1adfcdab6 calc-2.12.5.0-12.x86_64.rpm a0e7b47af38330f188970998c8e5039134dadf6f2e3f2c00d7efdae272a4338d calc-2.12.5.0.tar.bz2 93c4ad46dfc77402d064308348f56a07f5b5200b4f51971c712e2bf310e3d6b4 calc-2.12.5.2-12.src.rpm 0d6a4d40073f2adc22a6bcbf140a2e1444a30df908b70acac5ae33c0ced52510 calc-2.12.5.2-12.x86_64.rpm 39f5fad54bdb18d8c05a8b43cd73af24b2797c56e3c9c19d4c198793b53797b6 calc-2.12.5.2.tar.bz2 e5e6be7672c61d8c5f5d99188bd41777f1087f007e02382fdfd1549d3f792e37 calc-2.12.5.3-12.src.rpm ae18bcd1d50148a2b00a7e4947268f27aecae8994af2a2b93854ccd95ee0ae4b calc-2.12.5.3-12.x86_64.rpm 0fcf60917efb10aab145f1180c278a3ab63d789aad6d5e5f066a4458b5f9b692 calc-2.12.5.3.tar.bz2 000353ca45343bfb9c6024017745de5862fc4845427eb7ee2ebe3a59e0826713 calc-debuginfo-2.12.4.13-11.i686.rpm 62d0aa0052e3688076fd6d5d138f133e581b7df5bb0fe9e53fc7db2678a606b5 calc-debuginfo-2.12.4.14-12.x86_64.rpm a6461f0cea3cb107f97ea6cb585f47baca98610f3616ed7a5c3649750d14d08b calc-debuginfo-2.12.5.0-12.x86_64.rpm 504d16412ed7c9b2f1122220b4187923bbb82615697c2af355ee3abad54b42ad calc-debuginfo-2.12.5.2-12.x86_64.rpm ac0aa872fc3f774d9c7e553f370d628ea98119041500326f3f67595ffd332874 calc-debuginfo-2.12.5.3-12.x86_64.rpm 9a0a8c1b483c8cba1eec401f91578da5f12fa08e0aa1c6e48e9e3d7b83c96a55 calc-devel-2.12.4.13-11.i686.rpm 8a3af8c4f77f5717b4eb77304870111d3ce6a4be67c6fd41b3ad87edf3694352 calc-devel-2.12.4.14-12.x86_64.rpm e753c5737d2ad7123e15f0817605fe8760c2287bbf261347d0097ca43f24ed99 calc-devel-2.12.5.0-12.x86_64.rpm ca58c8c45878d0b5534ad6bb1f5ce99974b14d349061de512f03f7a818e5c82f calc-devel-2.12.5.2-12.x86_64.rpm 37aa0dea8ad0bb40fd90b5aea1559d83f1992f68f2d14c3379a46e3c85b3cc14 calc-devel-2.12.5.3-12.x86_64.rpm
