pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math math: align variable assignments



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3bf1c8aa02e7
branches:  trunk
changeset: 403860:3bf1c8aa02e7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 02 16:16:18 2019 +0000

description:
math: align variable assignments

pkglint -Wall -F --only aligned -r

Manual correction in R/Makefile.extension for the MASTER_SITES
continuation line.

diffstat:

 math/R/Makefile.extension             |  16 ++++++++--------
 math/blitz++/Makefile                 |   6 +++---
 math/clisp-pari/Makefile              |   6 +++---
 math/coinmp/Makefile                  |  14 +++++++-------
 math/dcdflib.c/Makefile               |  10 +++++-----
 math/double-conversion/buildlink3.mk  |   4 ++--
 math/eigen3/Makefile                  |  14 +++++++-------
 math/fityk/Makefile                   |   4 ++--
 math/gap/gap.package.mk               |   8 ++++----
 math/gnumeric112/Makefile             |   6 +++---
 math/go-stats/Makefile                |   4 ++--
 math/gtklife/Makefile                 |  12 ++++++------
 math/harminv/Makefile                 |   4 ++--
 math/libshorttext/Makefile            |   6 +++---
 math/libsvm/Makefile                  |   4 ++--
 math/linpack/Makefile                 |   8 ++++----
 math/mpcomplex/buildlink3.mk          |   4 ++--
 math/mpcomplex/builtin.mk             |   4 ++--
 math/mpfr/Makefile                    |   4 ++--
 math/mpfr/builtin.mk                  |  10 +++++-----
 math/newmat/Makefile                  |   4 ++--
 math/ocaml-num/Makefile               |   8 ++++----
 math/ocaml-num/buildlink3.mk          |   4 ++--
 math/ocaml-zarith/Makefile            |   8 ++++----
 math/octave/Makefile                  |   6 +++---
 math/openfst/Makefile                 |   4 ++--
 math/ordCalc/Makefile                 |   6 +++---
 math/p5-Math-BigInt-Pari/Makefile     |   4 ++--
 math/p5-Math-Random-ISAAC-XS/Makefile |   6 +++---
 math/p5-Spreadsheet-XLSX/Makefile     |   6 +++---
 math/php-stats/Makefile               |   6 +++---
 math/ppl/Makefile                     |   4 ++--
 math/pspp/Makefile                    |   8 ++++----
 math/py-bottleneck/Makefile           |   4 ++--
 math/py-cdecimal/Makefile             |   6 +++---
 math/py-fftw/Makefile                 |   4 ++--
 math/py-pandas-datareader/Makefile    |   4 ++--
 math/py-quadprog/Makefile             |   4 ++--
 math/py-scipy/Makefile                |   4 ++--
 math/py-scipy12/Makefile              |   4 ++--
 math/py-z3/Makefile                   |   6 +++---
 math/randlib/Makefile                 |   4 ++--
 math/ranger/Makefile                  |  10 +++++-----
 math/snns/Makefile                    |   4 ++--
 math/sundials/Makefile                |   6 +++---
 math/yices2/Makefile                  |  12 ++++++------
 math/yorick/Makefile                  |   8 ++++----
 47 files changed, 151 insertions(+), 151 deletions(-)

diffs (truncated from 985 to 300 lines):

diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/R/Makefile.extension
--- a/math/R/Makefile.extension Sat Nov 02 16:08:47 2019 +0000
+++ b/math/R/Makefile.extension Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.25 2019/10/13 12:21:23 rillig Exp $
+# $NetBSD: Makefile.extension,v 1.26 2019/11/02 16:16:18 rillig Exp $
 #
 # This Makefile fragment is included by packages for R library packages.
 #
@@ -22,14 +22,14 @@
 R_PKGNAME?=    ${DISTNAME:C/_.*//}
 R_PKGVER?=     ${DISTNAME:C/.*_//}
 .else
-DISTNAME?=             ${R_PKGNAME}_${R_PKGVER}
+DISTNAME?=     ${R_PKGNAME}_${R_PKGVER}
 .endif
-PKGNAME?=              R-${R_PKGNAME}-${R_PKGVER:S/-/./}
-MASTER_SITES?=         ${MASTER_SITE_R_CRAN:=contrib/} \
-                       ${MASTER_SITE_R_CRAN:=contrib/Archive/${R_PKGNAME}/}
-DIST_SUBDIR?=          R
-CATEGORIES+=           math R
-HOMEPAGE?=             https://CRAN.R-project.org/package=${R_PKGNAME}
+PKGNAME?=      R-${R_PKGNAME}-${R_PKGVER:S/-/./}
+MASTER_SITES?= ${MASTER_SITE_R_CRAN:=contrib/} \
+               ${MASTER_SITE_R_CRAN:=contrib/Archive/${R_PKGNAME}/}
+DIST_SUBDIR?=  R
+CATEGORIES+=   math R
+HOMEPAGE?=     https://CRAN.R-project.org/package=${R_PKGNAME}
 
 WRKSRC=                ${WRKDIR}/${R_PKGNAME}
 
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/blitz++/Makefile
--- a/math/blitz++/Makefile     Sat Nov 02 16:08:47 2019 +0000
+++ b/math/blitz++/Makefile     Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/12/29 01:41:09 obache Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/02 16:16:18 rillig Exp $
 
 DISTNAME=      blitz-0.8
 PKGNAME=       blitz++-0.8
@@ -33,8 +33,8 @@
 COMPILER_SPECIFIC_HEADER=      gnu
 .endif
 .if defined(COMPILER_SPECIFIC_HEADER)
-CONFIGURE_ENV+=COMPILER_SPECIFIC_HEADER=${COMPILER_SPECIFIC_HEADER}/bzconfig.h
+CONFIGURE_ENV+=                        COMPILER_SPECIFIC_HEADER=${COMPILER_SPECIFIC_HEADER}/bzconfig.h
 .endif
-PLIST_SUBST+=COMPILER_SPECIFIC_HEADER=${COMPILER_SPECIFIC_HEADER:Dinclude/blitz/${COMPILER_SPECIFIC_HEADER}/bzconfig.h:U@comment}
+PLIST_SUBST+=                  COMPILER_SPECIFIC_HEADER=${COMPILER_SPECIFIC_HEADER:Dinclude/blitz/${COMPILER_SPECIFIC_HEADER}/bzconfig.h:U@comment}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/clisp-pari/Makefile
--- a/math/clisp-pari/Makefile  Sat Nov 02 16:08:47 2019 +0000
+++ b/math/clisp-pari/Makefile  Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/12/11 22:12:33 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 16:16:18 rillig Exp $
 #
 
 CLISP_MODULE=  pari
@@ -18,9 +18,9 @@
 .include "../../math/pari/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 
-ac_cv_libpari_libs=     -L${BUILDLINK_PREFIX.pari}/lib -l${PARI_LIB}
+ac_cv_libpari_libs=    -L${BUILDLINK_PREFIX.pari}/lib -l${PARI_LIB}
 .if ${PARI_LIB} == "pari-gmp"
-ac_cv_libpari_libs+=    -L${BUILDLINK_PREFIX.gmp}/lib -lgmp
+ac_cv_libpari_libs+=   -L${BUILDLINK_PREFIX.gmp}/lib -lgmp
 .endif
 
 CONFIGURE_ENV+=        "ac_cv_libpari_libs=${ac_cv_libpari_libs} ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/coinmp/Makefile
--- a/math/coinmp/Makefile      Sat Nov 02 16:08:47 2019 +0000
+++ b/math/coinmp/Makefile      Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/03/25 13:26:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/02 16:16:18 rillig Exp $
 
 DISTNAME=      CoinMP-1.8.4
 PKGNAME=       ${DISTNAME:tl}
@@ -33,11 +33,11 @@
 PKGCONFIG_OVERRIDE+=   Osi/osi-unittests.pc.in
 PKGCONFIG_OVERRIDE+=   Osi/osi.pc.in
 
-SUBST_CLASSES+=                pkgconfig
-SUBST_STAGE.pkgconfig= pre-configure
-SUBST_MESSAGE.pkgconfig=Set temporary pkg-config directory
-SUBST_FILES.pkgconfig+=        */Makefile.in
-SUBST_SED.pkgconfig+=  -e 's,PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@,PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:${DESTDIR}${PREFIX}/lib/pkgconfig,'
-SUBST_SED.pkgconfig+=  -e 's,PKG_CONFIG_PATH="@COIN_PKG_CONFIG_PATH@",PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:${DESTDIR}${PREFIX}/lib/pkgconfig,'
+SUBST_CLASSES+=                        pkgconfig
+SUBST_STAGE.pkgconfig=         pre-configure
+SUBST_MESSAGE.pkgconfig=       Set temporary pkg-config directory
+SUBST_FILES.pkgconfig+=                */Makefile.in
+SUBST_SED.pkgconfig+=          -e 's,PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@,PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:${DESTDIR}${PREFIX}/lib/pkgconfig,'
+SUBST_SED.pkgconfig+=          -e 's,PKG_CONFIG_PATH="@COIN_PKG_CONFIG_PATH@",PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:${DESTDIR}${PREFIX}/lib/pkgconfig,'
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/dcdflib.c/Makefile
--- a/math/dcdflib.c/Makefile   Sat Nov 02 16:08:47 2019 +0000
+++ b/math/dcdflib.c/Makefile   Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/08/01 17:40:13 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/02 16:16:18 rillig Exp $
 
 DISTNAME=      dcdflib.c-1.1
 PKGREVISION=   1
@@ -9,11 +9,11 @@
 #HOMEPAGE=     http://odin.mdacc.tmc.edu/anonftp/
 COMMENT=       Library of C Routines for Cumulative Distribution Functions
 
-WRKSRC=                ${WRKDIR}/dcdflib.c
-BUILD_DIRS=    src
-DIST_SUBDIR=   ${PKGNAME_NOREV}
+WRKSRC=                        ${WRKDIR}/dcdflib.c
+BUILD_DIRS=            src
+DIST_SUBDIR=           ${PKGNAME_NOREV}
 CWARNFLAGS.clang=      -Wno-error=logical-op-parentheses
-MAKE_ENV+=     LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q} \
+MAKE_ENV+=             LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q} \
                CWARNFLAGS.clang=${CWARNFLAGS.clang:Q}
 USE_BSD_MAKEFILE=      yes
 
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/double-conversion/buildlink3.mk
--- a/math/double-conversion/buildlink3.mk      Sat Nov 02 16:08:47 2019 +0000
+++ b/math/double-conversion/buildlink3.mk      Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/06/02 14:15:45 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/02 16:16:18 rillig Exp $
 
 BUILDLINK_TREE+=       double-conversion
 
@@ -7,7 +7,7 @@
 
 BUILDLINK_API_DEPENDS.double-conversion+=      double-conversion>=3.0.0
 BUILDLINK_ABI_DEPENDS.double-conversion+=      double-conversion>=3.0.0
-BUILDLINK_PKGSRCDIR.double-conversion?=        ../../math/double-conversion
+BUILDLINK_PKGSRCDIR.double-conversion?=                ../../math/double-conversion
 
 .endif # DOUBLE_CONVERSION_BUILDLINK3_MK
 
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/eigen3/Makefile
--- a/math/eigen3/Makefile      Sat Nov 02 16:08:47 2019 +0000
+++ b/math/eigen3/Makefile      Sat Nov 02 16:16:18 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2019/03/09 14:14:39 wen Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/02 16:16:18 rillig Exp $
 
 DISTNAME=      3.3.7
 PKGNAME=       eigen3-${DISTNAME}
 CATEGORIES=    math
-MASTER_SITES=   http://bitbucket.org/eigen/eigen/get/
+MASTER_SITES=  http://bitbucket.org/eigen/eigen/get/
 DIST_SUBDIR=   eigen3
 EXTRACT_SUFX=  .tar.bz2
 
@@ -12,16 +12,16 @@
 COMMENT=       C++ template library for linear algebra
 LICENSE=       mpl-2.0
 
-USE_LANGUAGES+= c c++
-USE_CMAKE= yes
-CMAKE_ARG_PATH= ..
-CONFIGURE_DIRS= _build
+USE_LANGUAGES+=        c c++
+USE_CMAKE=     yes
+CMAKE_ARG_PATH=        ..
+CONFIGURE_DIRS=        _build
 WRKSRC=                ${WRKDIR}/eigen-eigen-323c052e1731
 
 CMAKE_ARGS+=   -DCMAKEPACKAGE_INSTALL_DIR=${PREFIX}/lib/cmake/eigen3
 CMAKE_ARGS+=   -DPKGCONFIG_INSTALL_DIR=${PREFIX}/lib/pkgconfig
 
-PKGCONFIG_OVERRIDE+=    eigen.pc.in
+PKGCONFIG_OVERRIDE+=   eigen.pc.in
 
 pre-configure:
        ${MKDIR} ${WRKSRC}/_build
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/fityk/Makefile
--- a/math/fityk/Makefile       Sat Nov 02 16:08:47 2019 +0000
+++ b/math/fityk/Makefile       Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/07/21 22:25:19 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/02 16:16:19 rillig Exp $
 
 DISTNAME=      fityk-0.9.7
 PKGREVISION=   26
@@ -18,7 +18,7 @@
 # XXX: xyconvert requires wxWidgets >= 2.9
 CONFIGURE_ARGS+=       --disable-xyconvert
 
-CFLAGS.FreeBSD+=       -D_WITH_GETLINE
+CFLAGS.FreeBSD+=       -D_WITH_GETLINE
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/gap/gap.package.mk
--- a/math/gap/gap.package.mk   Sat Nov 02 16:08:47 2019 +0000
+++ b/math/gap/gap.package.mk   Sat Nov 02 16:16:18 2019 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: gap.package.mk,v 1.14 2007/02/22 19:26:47 wiz Exp $
+# $NetBSD: gap.package.mk,v 1.15 2019/11/02 16:16:19 rillig Exp $
 #
 # Set GAP_PKG_NAME in your Makefile. More may appear here later.
 
 # Note that between 4.3nb1 == bug fix 3 and 4.3nb2 == bug fix 4 there are
 # some interface changes
 
-DEPENDS+=      gap>=4.3.5:../../math/gap
-GAP_DIRECTORY= ${LOCALBASE}/lib/gap4.3
+DEPENDS+=              gap>=4.3.5:../../math/gap
+GAP_DIRECTORY=         ${LOCALBASE}/lib/gap4.3
 GAP_PKG_ROOT=          ${GAP_DIRECTORY}/pkg
 GAP_PKG_DIRECTORY=     ${GAP_PKG_ROOT}/${GAP_PKG_NAME}
-GAP_PLATFORM=  ${MACHINE_GNU_PLATFORM}-${CC}
+GAP_PLATFORM=          ${MACHINE_GNU_PLATFORM}-${CC}
 
 PLIST_SUBST+=          GAP_PLATFORM=${GAP_PLATFORM:Q}
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/gnumeric112/Makefile
--- a/math/gnumeric112/Makefile Sat Nov 02 16:08:47 2019 +0000
+++ b/math/gnumeric112/Makefile Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2019/09/02 13:20:00 adam Exp $
+# $NetBSD: Makefile,v 1.61 2019/11/02 16:16:19 rillig Exp $
 
 DISTNAME=      gnumeric-1.12.45
 PKGREVISION=   1
@@ -27,8 +27,8 @@
 
 .include "options.mk"
 
-CONFIGURE_ARGS+=       --with-python
-CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
+CONFIGURE_ARGS+=               --with-python
+CONFIGURE_ENV+=                        PYTHON=${PYTHONBIN:Q}
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 1.12.9
 
 #CONFIGURE_ARGS+=      --with-gnome
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/go-stats/Makefile
--- a/math/go-stats/Makefile    Sat Nov 02 16:08:47 2019 +0000
+++ b/math/go-stats/Makefile    Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/10/18 14:58:53 bsiegert Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 16:16:19 rillig Exp $
 
 DISTNAME=      stats-0.2.0.20170729
 PKGNAME=       go-${DISTNAME}
@@ -6,7 +6,7 @@
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=montanaflynn/}
 CATEGORIES=    math
 GITHUB_TAG=    4a163274fa4ca0b524ccee24757d7bec79475aca
-GITHUB_PROJECT= ${PKGBASE:S/^go-//}
+GITHUB_PROJECT=        ${PKGBASE:S/^go-//}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/montanaflynn/stats
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/gtklife/Makefile
--- a/math/gtklife/Makefile     Sat Nov 02 16:08:47 2019 +0000
+++ b/math/gtklife/Makefile     Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/07/21 22:25:19 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/02 16:16:19 rillig Exp $
 
 DISTNAME=      gtklife-5.1
 PKGREVISION=   29
@@ -9,11 +9,11 @@
 HOMEPAGE=      http://ironphoenix.org/tril/gtklife/
 COMMENT=       The game of life
 
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-gtk2
-CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/gtklife
-USE_TOOLS+=    gmake pkg-config
-LDFLAGS+=      -lX11   # direct link required by ld v2.22
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-gtk2
+CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/gtklife
+USE_TOOLS+=            gmake pkg-config
+LDFLAGS+=              -lX11   # direct link required by ld v2.22
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3e9c15d153fc -r 3bf1c8aa02e7 math/harminv/Makefile
--- a/math/harminv/Makefile     Sat Nov 02 16:08:47 2019 +0000
+++ b/math/harminv/Makefile     Sat Nov 02 16:16:18 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/01/28 16:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 16:16:19 rillig Exp $
 
 DISTNAME=      harminv-1.3.1
 PKGREVISION=   1
@@ -13,7 +13,7 @@
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
-USE_LANGUAGES=  c c++ fortran77
+USE_LANGUAGES= c c++ fortran77
 
 PKGCONFIG_OVERRIDE+=   harminv.pc.in



Home | Main Index | Thread Index | Old Index