Received: by mail.netbsd.org (Postfix, from userid 605) id 1399F84D6C; Mon, 4 Nov 2019 21:14:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8674C84D54 for ; Mon, 4 Nov 2019 21:14:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id qpj2RFGnwhqL for ; Mon, 4 Nov 2019 21:14:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BCECA84CE2 for ; Mon, 4 Nov 2019 21:14:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BA958FA93; Mon, 4 Nov 2019 21:14:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157290204794070" MIME-Version: 1.0 Date: Mon, 4 Nov 2019 21:14:07 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/shells To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20191104211407.BA958FA93@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157290204794070 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Mon Nov 4 21:14:07 UTC 2019 Modified Files: pkgsrc/shells/bash-completion: Makefile pkgsrc/shells/bash2: Makefile pkgsrc/shells/eltclsh: options.mk pkgsrc/shells/rssh: Makefile pkgsrc/shells/scsh: Makefile pkgsrc/shells/static-ast-ksh: Makefile pkgsrc/shells/xsh: Makefile pkgsrc/shells/zsh: Makefile Log Message: shells: 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.11 -r1.12 pkgsrc/shells/bash-completion/Makefile cvs rdiff -u -r1.91 -r1.92 pkgsrc/shells/bash2/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/eltclsh/options.mk cvs rdiff -u -r1.19 -r1.20 pkgsrc/shells/rssh/Makefile cvs rdiff -u -r1.45 -r1.46 pkgsrc/shells/scsh/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/shells/static-ast-ksh/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/shells/xsh/Makefile cvs rdiff -u -r1.92 -r1.93 pkgsrc/shells/zsh/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157290204794070 Content-Disposition: inline Content-Length: 6802 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/shells/bash-completion/Makefile diff -u pkgsrc/shells/bash-completion/Makefile:1.11 pkgsrc/shells/bash-completion/Makefile:1.12 --- pkgsrc/shells/bash-completion/Makefile:1.11 Sun Dec 2 07:06:20 2018 +++ pkgsrc/shells/bash-completion/Makefile Mon Nov 4 21:14:06 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2018/12/02 07:06:20 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:14:06 rillig Exp $ # # Note to packagers: # packages installing additional completion files should drop @@ -9,7 +9,7 @@ DISTNAME= bash-completion-2.8 PKGREVISION= 1 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GITHUB:=scop/} -GITHUB_RELEASE= ${PKGVERSION_NOREV} +GITHUB_RELEASE= ${PKGVERSION_NOREV} EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/shells/bash2/Makefile diff -u pkgsrc/shells/bash2/Makefile:1.91 pkgsrc/shells/bash2/Makefile:1.92 --- pkgsrc/shells/bash2/Makefile:1.91 Thu Jan 19 18:52:25 2017 +++ pkgsrc/shells/bash2/Makefile Mon Nov 4 21:14:06 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2017/01/19 18:52:25 agc Exp $ +# $NetBSD: Makefile,v 1.92 2019/11/04 21:14:06 rillig Exp $ # DISTNAME= bash-2.05b @@ -19,13 +19,13 @@ COMMENT= The GNU Bourne Again Shell (ver CONFLICTS= static-bash-[0-9]* -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-installed-readline -USE_TOOLS+= yacc -MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} -CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\"" -TEST_TARGET= test -MAKE_JOBS_SAFE= no +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-installed-readline +USE_TOOLS+= yacc +MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} +CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\"" +TEST_TARGET= test +MAKE_JOBS_SAFE= no BROKEN_GETTEXT_DETECTION= yes PKG_SHELL= bin/bash @@ -44,7 +44,7 @@ PKG_SUGGESTED_OPTIONS= multibyte ## Static link ## .if !empty(PKG_OPTIONS:Mstatic) -CONFIGURE_ARGS+= --enable-static-link +CONFIGURE_ARGS+= --enable-static-link BUILDLINK_DEPMETHOD.gettext= build BUILDLINK_DEPMETHOD.readline= build .endif Index: pkgsrc/shells/eltclsh/options.mk diff -u pkgsrc/shells/eltclsh/options.mk:1.1 pkgsrc/shells/eltclsh/options.mk:1.2 --- pkgsrc/shells/eltclsh/options.mk:1.1 Fri Aug 22 07:44:00 2008 +++ pkgsrc/shells/eltclsh/options.mk Mon Nov 4 21:14:06 2019 @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2008/08/22 07:44:00 obache Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.eltclsh -PKG_SUPPORTED_OPTIONS= tk -PKG_SUGGESTED_OPTIONS= tk +# $NetBSD: options.mk,v 1.2 2019/11/04 21:14:06 rillig Exp $ +PKG_OPTIONS_VAR= PKG_OPTIONS.eltclsh +PKG_SUPPORTED_OPTIONS= tk +PKG_SUGGESTED_OPTIONS= tk .include "../../mk/bsd.options.mk" Index: pkgsrc/shells/rssh/Makefile diff -u pkgsrc/shells/rssh/Makefile:1.19 pkgsrc/shells/rssh/Makefile:1.20 --- pkgsrc/shells/rssh/Makefile:1.19 Fri Apr 13 16:59:13 2018 +++ pkgsrc/shells/rssh/Makefile Mon Nov 4 21:14:07 2019 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2018/04/13 16:59:13 he Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:14:07 rillig Exp $ DISTNAME= rssh-2.3.4 -PKGREVISION= 2 +PKGREVISION= 2 CATEGORIES= shells security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rssh/} Index: pkgsrc/shells/scsh/Makefile diff -u pkgsrc/shells/scsh/Makefile:1.45 pkgsrc/shells/scsh/Makefile:1.46 --- pkgsrc/shells/scsh/Makefile:1.45 Thu Jan 19 18:52:25 2017 +++ pkgsrc/shells/scsh/Makefile Mon Nov 4 21:14:07 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2017/01/19 18:52:25 agc Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/04 21:14:07 rillig Exp $ DISTNAME= scsh-0.6.7 PKGREVISION= 1 @@ -7,9 +7,9 @@ MASTER_SITES= http://ftp.scsh.net/pub/s MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=scsh/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.scsh.net/ -COMMENT= Unix shell embedded into Scheme, with access to all Posix calls -LICENSE= modified-bsd +HOMEPAGE= http://www.scsh.net/ +COMMENT= Unix shell embedded into Scheme, with access to all Posix calls +LICENSE= modified-bsd BROKEN_ON_PLATFORM= ${LP64PLATFORMS} # Not 64-bit clean. Index: pkgsrc/shells/static-ast-ksh/Makefile diff -u pkgsrc/shells/static-ast-ksh/Makefile:1.14 pkgsrc/shells/static-ast-ksh/Makefile:1.15 --- pkgsrc/shells/static-ast-ksh/Makefile:1.14 Thu Nov 6 12:25:36 2014 +++ pkgsrc/shells/static-ast-ksh/Makefile Mon Nov 4 21:14:07 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/11/06 12:25:36 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:14:07 rillig Exp $ # .include "../../shells/ast-ksh/Makefile.common" @@ -17,6 +17,6 @@ COMMENT:= Statically-linked version of t # SunOS 5.10 stopped shipping static libraries NOT_FOR_PLATFORM+= SunOS-5.1[0-9]-* -KSH93_MAKEFLAGS=LDFLAGS=-static +KSH93_MAKEFLAGS= LDFLAGS=-static .include "../../mk/bsd.pkg.mk" Index: pkgsrc/shells/xsh/Makefile diff -u pkgsrc/shells/xsh/Makefile:1.27 pkgsrc/shells/xsh/Makefile:1.28 --- pkgsrc/shells/xsh/Makefile:1.27 Sun Aug 11 13:23:02 2019 +++ pkgsrc/shells/xsh/Makefile Mon Nov 4 21:14:07 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/08/11 13:23:02 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/04 21:14:07 rillig Exp $ DISTNAME= XML-XSH-1.8.2 PKGNAME= ${DISTNAME:S/XML-XSH/xsh/} @@ -19,7 +19,7 @@ DEPENDS+= p5-XML-NodeFilter-[0-9]*:../.. USE_TOOLS+= gmake PKG_SHELL= bin/xsh -PERL5_PACKLIST= auto/XML/XSH/.packlist +PERL5_PACKLIST= auto/XML/XSH/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/shells/zsh/Makefile diff -u pkgsrc/shells/zsh/Makefile:1.92 pkgsrc/shells/zsh/Makefile:1.93 --- pkgsrc/shells/zsh/Makefile:1.92 Sat Mar 16 14:01:45 2019 +++ pkgsrc/shells/zsh/Makefile Mon Nov 4 21:14:07 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2019/03/16 14:01:45 wiz Exp $ +# $NetBSD: Makefile,v 1.93 2019/11/04 21:14:07 rillig Exp $ DISTNAME= zsh-5.7.1 PKGREVISION= 1 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --disable-gdbm CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR:Q} # Ensure we can find initscr(3) otherwise the curses module will not be built. -CONFIGURE_ARGS+= --with-term-lib="${BUILDLINK_LIBNAME.curses} ${BUILDLINK_LIBNAME.terminfo}" +CONFIGURE_ARGS+= --with-term-lib="${BUILDLINK_LIBNAME.curses} ${BUILDLINK_LIBNAME.terminfo}" .include "../../mk/bsd.prefs.mk" @@ -43,11 +43,11 @@ CONFIGURE_ENV.NetBSD+= zsh_cv_sys_dynami INSTALLATION_DIRS+= share/doc/zsh -PLIST_VARS+= xattr +PLIST_VARS+= xattr .if exists(/usr/include/sys/xattr.h) || \ exists(/usr/include/${NATIVE_MACHINE_GNU_ARCH}-${LOWER_OPSYS}-gnu/sys/xattr.h) || \ defined(OSX_SDK_PATH) && exists(${OSX_SDK_PATH}/usr/include/sys/xattr.h) -PLIST.xattr= yes +PLIST.xattr= yes .endif PRINT_PLIST_AWK+= {if ($$0 ~ /attr.so/) {$$0 = "$${PLIST.xattr}" $$0;}} --_----------=_157290204794070--