CVS commit: pkgsrc/news

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Nov  4 19:17:11 UTC 2019

Modified Files:
        pkgsrc/news/flnews: options.mk
        pkgsrc/news/hellanzb: Makefile
        pkgsrc/news/inn: Makefile options.mk
        pkgsrc/news/lottanzb: Makefile
        pkgsrc/news/nn: Makefile
        pkgsrc/news/nntpclnt: Makefile
        pkgsrc/news/suck: options.mk
        pkgsrc/news/tin: Makefile
        pkgsrc/news/trn: options.mk
        pkgsrc/news/xrn: Makefile

Log Message:
news: align variable assignments

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

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/news/flnews/options.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/news/hellanzb/Makefile
cvs rdiff -u -r1.128 -r1.129 pkgsrc/news/inn/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/news/inn/options.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/news/lottanzb/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/news/nn/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/news/nntpclnt/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/news/suck/options.mk
cvs rdiff -u -r1.85 -r1.86 pkgsrc/news/tin/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/news/trn/options.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/news/xrn/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/news/flnews/options.mk
diff -u pkgsrc/news/flnews/options.mk:1.2 pkgsrc/news/flnews/options.mk:1.3
--- pkgsrc/news/flnews/options.mk:1.2   Mon Jan 21 12:03:41 2019
+++ pkgsrc/news/flnews/options.mk       Mon Nov  4 19:17:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/01/21 12:03:41 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/04 19:17:10 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.flnews
 PKG_SUPPORTED_OPTIONS= inet6 nls xdbe xdg-utils
@@ -21,12 +21,12 @@ FLNEWS_OPT_DISABLE_IP6=             1
 # nls: Optional support for National Language Support (NLS)
 # Requires an OS with X/Open XSI extension API (SUSv2) and the gencat utility
 # Note: Only locales with UTF-8, ISO-8859-1 or US-ASCII codeset are supported!
-PLIST_VARS+=   nls
+PLIST_VARS+=           nls
 .if !empty(PKG_OPTIONS:Mnls)
-PLIST.nls=     yes
-FLNEWS_OPT_DISABLE_NLS=                0
+PLIST.nls=             yes
+FLNEWS_OPT_DISABLE_NLS=        0
 .else
-FLNEWS_OPT_DISABLE_NLS=                1
+FLNEWS_OPT_DISABLE_NLS=        1
 .endif
 
 # xdbe: Optional support for X11 Double Buffer Extension (XDBE)

Index: pkgsrc/news/hellanzb/Makefile
diff -u pkgsrc/news/hellanzb/Makefile:1.20 pkgsrc/news/hellanzb/Makefile:1.21
--- pkgsrc/news/hellanzb/Makefile:1.20  Mon Sep  2 13:20:10 2019
+++ pkgsrc/news/hellanzb/Makefile       Mon Nov  4 19:17:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/09/02 13:20:10 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 19:17:10 rillig Exp $
 #
 .include "../../news/hellanzb/Makefile.version"
 
@@ -18,7 +18,7 @@ DEPENDS+=     ${PYPKGPREFIX}-expat-[0-9]*:..
 DEPENDS+=      par2>=0.4:../../archivers/par2
 DEPENDS+=      unrar>=3.5.4:../../archivers/unrar
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 0.14
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.14
 
 USE_LANGUAGES= #none
 

Index: pkgsrc/news/inn/Makefile
diff -u pkgsrc/news/inn/Makefile:1.128 pkgsrc/news/inn/Makefile:1.129
--- pkgsrc/news/inn/Makefile:1.128      Sun Aug 11 13:22:33 2019
+++ pkgsrc/news/inn/Makefile    Mon Nov  4 19:17:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2019/08/11 13:22:33 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2019/11/04 19:17:10 rillig Exp $
 
 DISTNAME=              inn-2.6.1
 PKGREVISION=           3
@@ -58,7 +58,7 @@ CONFIGURE_ENV+=               _PATH_SORT=${TOOLS_SORT
 CONFIGURE_ENV+=                GZIP=${TOOLS_GZIP_CMD}
 USE_TOOLS+=            awk egrep gzip perl:run sed sh sort yacc
 
-LDFLAGS.SunOS+= -lsocket -lnsl
+LDFLAGS.SunOS+=        -lsocket -lnsl
 
 DEPENDS+=              p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
 DEPENDS+=              p5-GD-[0-9]*:../../graphics/p5-GD
@@ -166,7 +166,7 @@ GCC_REQD+=          2.95.3
 
 .include "options.mk"
 
-TEST_TARGET=    tests
+TEST_TARGET=   tests
 
 pre-install:
 .for file in ${CFILES} active.minimal newsgroups.minimal

Index: pkgsrc/news/inn/options.mk
diff -u pkgsrc/news/inn/options.mk:1.6 pkgsrc/news/inn/options.mk:1.7
--- pkgsrc/news/inn/options.mk:1.6      Tue Apr 13 21:18:00 2010
+++ pkgsrc/news/inn/options.mk  Mon Nov  4 19:17:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2010/04/13 21:18:00 spz Exp $
+# $NetBSD: options.mk,v 1.7 2019/11/04 19:17:10 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.inn
 PKG_SUPPORTED_OPTIONS= inet6 perl python uucp
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=      --enable-ipv6
 ###
 .if !empty(PKG_OPTIONS:Muucp)
 CONFIGURE_ARGS+=       --enable-uucp-rnews
-PKG_GROUPS+= uucp
+PKG_GROUPS+=           uucp
 .else
 CONFIGURE_ARGS+=       --disable-uucp-rnews
 .endif

Index: pkgsrc/news/lottanzb/Makefile
diff -u pkgsrc/news/lottanzb/Makefile:1.29 pkgsrc/news/lottanzb/Makefile:1.30
--- pkgsrc/news/lottanzb/Makefile:1.29  Mon Sep  2 13:20:10 2019
+++ pkgsrc/news/lottanzb/Makefile       Mon Nov  4 19:17:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/09/02 13:20:10 adam Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/04 19:17:11 rillig Exp $
 
 DISTNAME=      lottanzb-0.4.1
 PKGREVISION=   2
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=     yes
 USE_TOOLS+=            intltool msgfmt
 
 REPLACE_PYTHON=        lottanzb/postprocessor.py
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2 via py-kiwi
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 via py-kiwi
 
 SUBST_CLASSES+=                localedir
 SUBST_STAGE.localedir= pre-configure

Index: pkgsrc/news/nn/Makefile
diff -u pkgsrc/news/nn/Makefile:1.49 pkgsrc/news/nn/Makefile:1.50
--- pkgsrc/news/nn/Makefile:1.49        Wed Jan  4 22:34:47 2017
+++ pkgsrc/news/nn/Makefile     Mon Nov  4 19:17:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2017/01/04 22:34:47 roy Exp $
+# $NetBSD: Makefile,v 1.50 2019/11/04 19:17:11 rillig Exp $
 
 DISTNAME=      nn-6.7.3
 PKGREVISION=   5
@@ -24,11 +24,11 @@ SFILE.*=    s-netbsd.h
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386"
-MFILE=         m-i80386.h
+MFILE= m-i80386.h
 .elif ${MACHINE_ARCH} == "mipseb"
-MFILE=         m-mipsel.h
+MFILE= m-mipsel.h
 .else
-MFILE=         m-${MACHINE_ARCH}.h
+MFILE= m-${MACHINE_ARCH}.h
 .endif
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8

Index: pkgsrc/news/nntpclnt/Makefile
diff -u pkgsrc/news/nntpclnt/Makefile:1.39 pkgsrc/news/nntpclnt/Makefile:1.40
--- pkgsrc/news/nntpclnt/Makefile:1.39  Sun Apr 24 10:34:44 2016
+++ pkgsrc/news/nntpclnt/Makefile       Mon Nov  4 19:17:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2016/04/24 10:34:44 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/04 19:17:11 rillig Exp $
 
 DISTNAME=      nntpclnt-1.6.1
 PKGREVISION=   6
@@ -9,23 +9,23 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 COMMENT=       NNTP client library and inews client posting program
 LICENSE=       nntpclnt-license
 
-RESTRICTED=    Do not sell, rent, trade, market, or use for monetary profit
+RESTRICTED=            Do not sell, rent, trade, market, or use for monetary profit
 # No permission granted for derivative works.
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
+NO_BIN_ON_FTP=         ${RESTRICTED}
+NO_SRC_ON_CDROM=       ${RESTRICTED}
+NO_BIN_ON_CDROM=       ${RESTRICTED}
 
 CONFLICTS+=    inn-[0-9]*
 
-BUILD_TARGET=  inews
-PKG_GROUPS=    news
+BUILD_TARGET=          inews
+PKG_GROUPS=            news
 PKG_SYSCONFSUBDIR=     nntp
 
 PLIST_SUBST+=  PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIG_SH=     ${FILESDIR}/config.${OPSYS}.sh
+CONFIG_SH=                     ${FILESDIR}/config.${OPSYS}.sh
 BROKEN_EXCEPT_ON_PLATFORM=     NetBSD-*-* DragonFly-*-* \
                                SunOS-*-* Linux-*-* Darwin-*-*
 

Index: pkgsrc/news/suck/options.mk
diff -u pkgsrc/news/suck/options.mk:1.2 pkgsrc/news/suck/options.mk:1.3
--- pkgsrc/news/suck/options.mk:1.2     Wed Sep 30 08:25:37 2015
+++ pkgsrc/news/suck/options.mk Mon Nov  4 19:17:11 2019
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.2 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/04 19:17:11 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.suck
+PKG_OPTIONS_VAR=               PKG_OPTIONS.suck
 PKG_OPTIONS_OPTIONAL_GROUPS+=  socks
 PKG_OPTIONS_GROUP.socks=       socks4 dante
 

Index: pkgsrc/news/tin/Makefile
diff -u pkgsrc/news/tin/Makefile:1.85 pkgsrc/news/tin/Makefile:1.86
--- pkgsrc/news/tin/Makefile:1.85       Sun Aug 11 13:22:33 2019
+++ pkgsrc/news/tin/Makefile    Mon Nov  4 19:17:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2019/08/11 13:22:33 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2019/11/04 19:17:11 rillig Exp $
 
 DISTNAME=      tin-2.4.3
 PKGREVISION=   2
@@ -20,8 +20,8 @@ RESTRICTED=           Profit from use, sale, trad
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR=yes
+GNU_CONFIGURE=         yes
+USE_PKGLOCALEDIR=      yes
 
 INSTALLATION_DIRS=     share/doc/tin
 

Index: pkgsrc/news/trn/options.mk
diff -u pkgsrc/news/trn/options.mk:1.4 pkgsrc/news/trn/options.mk:1.5
--- pkgsrc/news/trn/options.mk:1.4      Fri Jan 14 16:58:26 2011
+++ pkgsrc/news/trn/options.mk  Mon Nov  4 19:17:11 2019
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2011/01/14 16:58:26 asau Exp $
+# $NetBSD: options.mk,v 1.5 2019/11/04 19:17:11 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.trn
+PKG_OPTIONS_VAR=               PKG_OPTIONS.trn
 PKG_OPTIONS_REQUIRED_GROUPS=   nntpclient
 PKG_OPTIONS_GROUP.nntpclient=  trn-inn trn-nntpclnt
-PKG_SUGGESTED_OPTIONS+=        trn-nntpclnt
+PKG_SUGGESTED_OPTIONS+=                trn-nntpclnt
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/news/xrn/Makefile
diff -u pkgsrc/news/xrn/Makefile:1.20 pkgsrc/news/xrn/Makefile:1.21
--- pkgsrc/news/xrn/Makefile:1.20       Sat Nov 10 20:03:40 2018
+++ pkgsrc/news/xrn/Makefile    Mon Nov  4 19:17:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/11/10 20:03:40 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 19:17:11 rillig Exp $
 
 DISTNAME=      xrn-10.11
 CATEGORIES=    news
@@ -13,7 +13,7 @@ GNU_CONFIGURE=        yes
 # Note for gmake: Recent NetBSD make should work too, bmake-20150505 fails
 USE_TOOLS+=    gmake lex pkg-config yacc
 
-DOCDIR=                share/doc/xrn
+DOCDIR=                        share/doc/xrn
 INSTALLATION_DIRS+=    ${DOCDIR}
 INSTALLATION_DIRS+=    lib/X11/app-defaults