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

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/ham ham: align variable assignments
From: rillig <rillig%pkgsrc.org@localhost>
Date: Sun, 03 Nov 2019 20:28:13 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5d328ea0b3c1
branches:  trunk
changeset: 343418:5d328ea0b3c1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 03 19:32:06 2019 +0000

description:
ham: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.

diffstat:

 ham/chirp/Makefile                 |   6 +++---
 ham/codec2/Makefile                |   8 ++++----
 ham/dpbox/Makefile                 |  16 ++++++++--------
 ham/gmfsk/Makefile                 |   6 +++---
 ham/gnuradio-core/Makefile.common  |  16 ++++++++--------
 ham/gnuradio-core/Makefile.version |   4 ++--
 ham/gnuradio-core/options.mk       |   8 ++++----
 ham/gpredict/Makefile              |  10 +++++-----
 ham/gr-osmosdr/Makefile            |   4 ++--
 ham/hackrf/Makefile                |   4 ++--
 ham/hamlib/Makefile                |  10 +++++-----
 ham/predict/Makefile               |   6 +++---
 ham/rtl-sdr/Makefile               |  12 ++++++------
 ham/tlf/Makefile                   |  10 +++++-----
 ham/trustedQSL/Makefile            |  12 ++++++------
 ham/xdx/Makefile                   |   8 ++++----
 ham/xlog/Makefile                  |   8 ++++----
 17 files changed, 74 insertions(+), 74 deletions(-)

diffs (truncated from 405 to 300 lines):

diff -r e53115d49546 -r 5d328ea0b3c1 ham/chirp/Makefile
--- a/ham/chirp/Makefile        Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/chirp/Makefile        Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/07/21 22:25:07 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 19:32:06 rillig Exp $
 
 DISTNAME=      chirp-0.4.1
 PKGREVISION=   10
@@ -11,9 +11,9 @@
 LICENSE=       gnu-gpl-v3
 
 USE_LANGUAGES= #none
-REPLACE_PYTHON= *.py chirp/*.py chirpui/*.py
+REPLACE_PYTHON=        *.py chirp/*.py chirpui/*.py
 
-DEPENDS+=       ${PYPKGPREFIX}-serial>=2.7:../../comms/py-serial
+DEPENDS+=      ${PYPKGPREFIX}-serial>=2.7:../../comms/py-serial
 
 PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
 
diff -r e53115d49546 -r 5d328ea0b3c1 ham/codec2/Makefile
--- a/ham/codec2/Makefile       Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/codec2/Makefile       Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/09/19 09:27:57 mef Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 19:32:06 rillig Exp $
 #
 
 DISTNAME=      codec2-0.5.1
@@ -14,9 +14,9 @@
 
 USE_LANGUAGES= c
 
-USE_CMAKE=yes
-CONFIGURE_DIRS=build
-CMAKE_ARG_PATH=..
+USE_CMAKE=     yes
+CONFIGURE_DIRS=        build
+CMAKE_ARG_PATH=        ..
 
 pre-configure:
        cd ${WRKSRC} && mkdir build
diff -r e53115d49546 -r 5d328ea0b3c1 ham/dpbox/Makefile
--- a/ham/dpbox/Makefile        Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/dpbox/Makefile        Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/03 13:01:43 asau Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 19:32:07 rillig Exp $
 #
 
 DISTNAME=      dpbox-60000
@@ -15,18 +15,18 @@
 USE_TOOLS+=    gmake
 MAKE_FILE=     Makefile.netbsd
 
-MAKE_ENV+=     prefix=${PREFIX:Q}
+MAKE_ENV+=             prefix=${PREFIX:Q}
 INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_SYSCONFDIR.dpbox=${PREFIX}/share/dpbox/conf
+PKG_SYSCONFDIR.dpbox=  ${PREFIX}/share/dpbox/conf
 
-DPBOX_CONF_DIR=        ${PKG_SYSCONFDIR}
-DPBOX_SPOOL_DIR=/var/spool/dpbox
-FILES_SUBST+=  DPBOX_CONF_DIR=${DPBOX_CONF_DIR:Q} \
-               DPBOX_SPOOL_DIR=${DPBOX_SPOOL_DIR:Q}
-EGDIR=         ${PREFIX}/share/examples/${PKGBASE}/conf
+DPBOX_CONF_DIR=                ${PKG_SYSCONFDIR}
+DPBOX_SPOOL_DIR=       /var/spool/dpbox
+FILES_SUBST+=          DPBOX_CONF_DIR=${DPBOX_CONF_DIR:Q} \
+                       DPBOX_SPOOL_DIR=${DPBOX_SPOOL_DIR:Q}
+EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}/conf
 
 REQD_DIRS=     ${PKG_SYSCONFDIR} \
                ${PKG_SYSCONFDIR}/sf \
diff -r e53115d49546 -r 5d328ea0b3c1 ham/gmfsk/Makefile
--- a/ham/gmfsk/Makefile        Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/gmfsk/Makefile        Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2019/07/21 22:25:07 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2019/11/03 19:32:07 rillig Exp $
 #
 
 DISTNAME=      gmfsk-0.6
@@ -13,9 +13,9 @@
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake pkg-config
 GNU_CONFIGURE= yes
-GCONF_SCHEMAS+=gmfsk.schemas
+GCONF_SCHEMAS+=        gmfsk.schemas
 
-CONFIGURE_ARGS+=--enable-hamlib
+CONFIGURE_ARGS+=       --enable-hamlib
 
 .include "../../mk/bsd.prefs.mk"
 LDFLAGS+=      ${LIBOSSAUDIO}
diff -r e53115d49546 -r 5d328ea0b3c1 ham/gnuradio-core/Makefile.common
--- a/ham/gnuradio-core/Makefile.common Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/gnuradio-core/Makefile.common Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2019/10/20 11:10:49 nia Exp $
+# $NetBSD: Makefile.common,v 1.22 2019/11/03 19:32:07 rillig Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -33,17 +33,17 @@
 
 DISTNAME?=     gnuradio-${VERSION}
 CATEGORIES+=   ham
-MASTER_SITES=  http://s3-dist.gnuradio.org/
-MASTER_SITES=  http://gnuradio.org/releases/gnuradio/
+MASTER_SITES=  http://s3-dist.gnuradio.org/
+MASTER_SITES=  http://gnuradio.org/releases/gnuradio/
 
 MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE?=     http://www.gnu.org/software/gnuradio/
 LICENSE=       gnu-gpl-v3
 
-USE_LANGUAGES= c c++
-USE_TOOLS=     perl gmake cmake pkg-config
-USE_CMAKE=     yes
-LDFLAGS.NetBSD+= -lrt
+USE_LANGUAGES=         c c++
+USE_TOOLS=             perl gmake cmake pkg-config
+USE_CMAKE=             yes
+LDFLAGS.NetBSD+=       -lrt
 
 
 DEPENDS+=      ${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
@@ -55,7 +55,7 @@
 DISTINFO_FILE=         ${.CURDIR}/../../ham/gnuradio-core/distinfo
 PATCHDIR=              ${.CURDIR}/../../ham/gnuradio-core/patches
 
-PYTHON_VERSIONS_ACCEPTED=    27 # not yet ported as of 3.3.0
+PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 3.3.0
 PLIST_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX}
 PLIST_SUBST+=  PYSITELIB=${PYSITELIB}
 PY_PATCHPLIST= yes
diff -r e53115d49546 -r 5d328ea0b3c1 ham/gnuradio-core/Makefile.version
--- a/ham/gnuradio-core/Makefile.version        Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/gnuradio-core/Makefile.version        Sun Nov 03 19:32:06 2019 +0000
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.13 2019/06/21 16:02:16 mef Exp $
+# $NetBSD: Makefile.version,v 1.14 2019/11/03 19:32:07 rillig Exp $
 
-VERSION=        3.7.13.5
+VERSION=       3.7.13.5
diff -r e53115d49546 -r 5d328ea0b3c1 ham/gnuradio-core/options.mk
--- a/ham/gnuradio-core/options.mk      Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/gnuradio-core/options.mk      Sun Nov 03 19:32:06 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2019/06/15 17:54:22 adam Exp $
+# $NetBSD: options.mk,v 1.5 2019/11/03 19:32:07 rillig Exp $
 
-PKG_OPTIONS_VAR=        PKG_OPTIONS.gnuradio
-PKG_SUPPORTED_OPTIONS=  ninja-build filter-design alsa
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gnuradio
+PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
 # ninja-build is said supported, but not working
 # alas        is said supported, but not good on NetBSD
 
@@ -10,7 +10,7 @@
 # FAILED: cd /PATH/ham/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
 # : permission denied
 
-PKG_SUGGESTED_OPTIONS= filter-design
+PKG_SUGGESTED_OPTIONS= filter-design
 
 .include "../../mk/bsd.options.mk"
 
diff -r e53115d49546 -r 5d328ea0b3c1 ham/gpredict/Makefile
--- a/ham/gpredict/Makefile     Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/gpredict/Makefile     Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2019/08/22 12:23:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2019/11/03 19:32:07 rillig Exp $
 
 DISTNAME=      gpredict-1.3
 PKGREVISION=   23
@@ -10,10 +10,10 @@
 COMMENT=       Gnome satellite tracking program
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES= c c++
-USE_TOOLS+=    gmake msgfmt pkg-config intltool
-USE_PKGLOCALEDIR=yes
-GNU_CONFIGURE= yes
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            gmake msgfmt pkg-config intltool
+USE_PKGLOCALEDIR=      yes
+GNU_CONFIGURE=         yes
 
 # needed for gpredict-0.8.0 and gtk2-2.20 -- remove on next update!
 BUILDLINK_TRANSFORM+=  rm:-DG_DISABLE_DEPRECATED
diff -r e53115d49546 -r 5d328ea0b3c1 ham/gr-osmosdr/Makefile
--- a/ham/gr-osmosdr/Makefile   Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/gr-osmosdr/Makefile   Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:57 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 19:32:07 rillig Exp $
 
 DISTNAME=              gr-osmosdr-0.1.4
 PKGREVISION=           15
@@ -24,7 +24,7 @@
 
 # Python 36 and 37 result in build errors; 27 builds ok.
 PYTHON_VERSIONS_ACCEPTED=      27
-REPLACE_PYTHON+=       apps/osmocom_siggen_base.py
+REPLACE_PYTHON+=               apps/osmocom_siggen_base.py
 
 .include       "../../devel/boost-headers/buildlink3.mk"
 .include       "../../devel/boost-libs/buildlink3.mk"
diff -r e53115d49546 -r 5d328ea0b3c1 ham/hackrf/Makefile
--- a/ham/hackrf/Makefile       Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/hackrf/Makefile       Sun Nov 03 19:32:06 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2019/06/18 12:42:26 mef Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 19:32:07 rillig Exp $
 
 DISTNAME=              hackrf-2018.01.1
 PKGREVISION=           1
 CATEGORIES=            ham
-MASTER_SITES=           ${MASTER_SITE_GITHUB:=mossmann/}
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=mossmann/}
 GITHUB_RELEASE=                v${PKGVERSION_NOREV}
 EXTRACT_SUFX=          .tar.xz
 
diff -r e53115d49546 -r 5d328ea0b3c1 ham/hamlib/Makefile
--- a/ham/hamlib/Makefile       Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/hamlib/Makefile       Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2019/08/11 13:21:18 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/03 19:32:07 rillig Exp $
 #
 
 DISTNAME=      hamlib-${VERSION}
@@ -20,13 +20,13 @@
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake
 GNU_CONFIGURE= yes
-INFO_FILES=     yes
+INFO_FILES=    yes
 USE_LIBTOOL=   yes
 
 # \todo Consider language bindings.
-CONFIGURE_ARGS+=--without-tcl-binding \
-               --without-perl-binding \
-               --without-python-binding
+CONFIGURE_ARGS+=       --without-tcl-binding \
+                       --without-perl-binding \
+                       --without-python-binding
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r e53115d49546 -r 5d328ea0b3c1 ham/predict/Makefile
--- a/ham/predict/Makefile      Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/predict/Makefile      Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/05/05 21:44:58 wiedi Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 19:32:07 rillig Exp $
 #
 
 DISTNAME=      predict-2.2.3
@@ -7,7 +7,7 @@
 
 MAINTAINER=    dbj%NetBSD.org@localhost
 HOMEPAGE=      http://www.qsl.net/kd2bd/predict.html
-COMMENT=       PREDICT - curses satellite tracking/orbital prediction program
+COMMENT=       PREDICT - curses satellite tracking/orbital prediction program
 
 LICENSE=       gnu-gpl-v2
 
@@ -25,7 +25,7 @@
        cd ${WRKSRC} && ${CC} ${CFLAGS} ${LDFLAGS} predict.c -o predict -lm -lncurses -lpthread
        ${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/vocalizer.sh > ${WRKSRC}/vocalizer/vocalizer.sh
 
-INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/predict/default share/predict/vocalizer
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1 share/predict/default share/predict/vocalizer
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/predict ${DESTDIR}${PREFIX}/bin/
diff -r e53115d49546 -r 5d328ea0b3c1 ham/rtl-sdr/Makefile
--- a/ham/rtl-sdr/Makefile      Sun Nov 03 19:30:32 2019 +0000
+++ b/ham/rtl-sdr/Makefile      Sun Nov 03 19:32:06 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/02/03 10:48:17 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 19:32:08 rillig Exp $
 
 DISTNAME=              rtl-sdr-0.6.0
 CATEGORIES=            ham
@@ -14,12 +14,12 @@
 USE_LANGUAGES+=                c c++
 USE_TOOLS+=            gmake pkg-config
 
-USE_CMAKE=             yes
-CONFIGURE_DIRS=build
-BUILD_DIRS=${CONFIGURE_DIRS}
Prev by Date: [pkgsrc/trunk]: pkgsrc/geography geography: align variable assignments
Next by Date: [pkgsrc/trunk]: pkgsrc/meta-pkgs meta-pkgs: align variable assignments
Previous by Thread: [pkgsrc/trunk]: pkgsrc/geography geography: align variable assignments
Next by Thread: [pkgsrc/trunk]: pkgsrc/meta-pkgs meta-pkgs: align variable assignments
Indexes:
Home | Main Index | Thread Index | Old Index