CVS commit: pkgsrc/meta-pkgs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/meta-pkgs
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Sun, 3 Nov 2019 19:35:55 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Nov  3 19:35:55 UTC 2019

Modified Files:
        pkgsrc/meta-pkgs/bulk-small: Makefile
        pkgsrc/meta-pkgs/gnuradio: Makefile
        pkgsrc/meta-pkgs/kde4: Makefile.kde4
        pkgsrc/meta-pkgs/py-tryton-platform: Makefile
        pkgsrc/meta-pkgs/ruby-redmine-plugins: Makefile
        pkgsrc/meta-pkgs/ruby-redmine-themes: Makefile
        pkgsrc/meta-pkgs/texlive-collection-context: Makefile
        pkgsrc/meta-pkgs/texlive-collection-latexextra: Makefile

Log Message:
meta-pkgs: align variable assignments

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

Manual correction in bulk-small: Some comments have been kept manually
since pkglint thinks they are shell commands, which is wrong.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/meta-pkgs/bulk-small/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/meta-pkgs/gnuradio/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/meta-pkgs/kde4/Makefile.kde4
cvs rdiff -u -r1.8 -r1.9 pkgsrc/meta-pkgs/py-tryton-platform/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/meta-pkgs/texlive-collection-context/Makefile
cvs rdiff -u -r1.47 -r1.48 \
    pkgsrc/meta-pkgs/texlive-collection-latexextra/Makefile

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

Modified files:

Index: pkgsrc/meta-pkgs/bulk-small/Makefile
diff -u pkgsrc/meta-pkgs/bulk-small/Makefile:1.24 pkgsrc/meta-pkgs/bulk-small/Makefile:1.25
--- pkgsrc/meta-pkgs/bulk-small/Makefile:1.24   Sun Aug 11 13:21:53 2019
+++ pkgsrc/meta-pkgs/bulk-small/Makefile        Sun Nov  3 19:35:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:21:53 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 19:35:54 rillig Exp $
 
 DISTNAME=      bulk-small-20180101
 PKGREVISION=   3
@@ -98,22 +98,22 @@ BUILD_DEPENDS+=     python27-[0-9]*:../../la
 #
 # 3. Archivers and build tools.
 #
-BUILD_DEPENDS+=        bsdtar-[0-9]*:../../archivers/bsdtar
-BUILD_DEPENDS+=        bzip2-[0-9]*:../../archivers/bzip2
-BUILD_DEPENDS+=        gtar-base-[0-9]*:../../archivers/gtar-base
-BUILD_DEPENDS+=        unzip-[0-9]*:../../archivers/unzip
-BUILD_DEPENDS+=        xz-[0-9]*:../../archivers/xz
-BUILD_DEPENDS+=        zip-[0-9]*:../../archivers/zip
-BUILD_DEPENDS+=        autoconf-[0-9]*:../../devel/autoconf
-BUILD_DEPENDS+=        automake-[0-9]*:../../devel/automake
-BUILD_DEPENDS+=        bison-[0-9]*:../../devel/bison
-BUILD_DEPENDS+=        flex-[0-9]*:../../devel/flex
-BUILD_DEPENDS+=        gmake-[0-9]*:../../devel/gmake
-BUILD_DEPENDS+=        libtool-base-[0-9]*:../../devel/libtool-base
-BUILD_DEPENDS+=        m4-[0-9]*:../../devel/m4
-BUILD_DEPENDS+=        pkg-config-[0-9]*:../../devel/pkg-config
+BUILD_DEPENDS+=                bsdtar-[0-9]*:../../archivers/bsdtar
+BUILD_DEPENDS+=                bzip2-[0-9]*:../../archivers/bzip2
+BUILD_DEPENDS+=                gtar-base-[0-9]*:../../archivers/gtar-base
+BUILD_DEPENDS+=                unzip-[0-9]*:../../archivers/unzip
+BUILD_DEPENDS+=                xz-[0-9]*:../../archivers/xz
+BUILD_DEPENDS+=                zip-[0-9]*:../../archivers/zip
+BUILD_DEPENDS+=                autoconf-[0-9]*:../../devel/autoconf
+BUILD_DEPENDS+=                automake-[0-9]*:../../devel/automake
+BUILD_DEPENDS+=                bison-[0-9]*:../../devel/bison
+BUILD_DEPENDS+=                flex-[0-9]*:../../devel/flex
+BUILD_DEPENDS+=                gmake-[0-9]*:../../devel/gmake
+BUILD_DEPENDS+=                libtool-base-[0-9]*:../../devel/libtool-base
+BUILD_DEPENDS+=                m4-[0-9]*:../../devel/m4
+BUILD_DEPENDS+=                pkg-config-[0-9]*:../../devel/pkg-config
 #BUILD_DEPENDS+=       osabi-[0-9]*:../../pkgtools/osabi
-BUILD_DEPENDS+=        pkg_tarup-[0-9]*:../../pkgtools/pkg_tarup
+BUILD_DEPENDS+=                pkg_tarup-[0-9]*:../../pkgtools/pkg_tarup
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/meta-pkgs/gnuradio/Makefile
diff -u pkgsrc/meta-pkgs/gnuradio/Makefile:1.18 pkgsrc/meta-pkgs/gnuradio/Makefile:1.19
--- pkgsrc/meta-pkgs/gnuradio/Makefile:1.18     Fri Jan 13 22:03:35 2017
+++ pkgsrc/meta-pkgs/gnuradio/Makefile  Sun Nov  3 19:35:55 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2017/01/13 22:03:35 mef Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/03 19:35:55 rillig Exp $
 
 META_PACKAGE=  yes
 
 .include       "../../ham/gnuradio-core/Makefile.version"
 
-DISTNAME=       gnuradio-${VERSION}
+DISTNAME=      gnuradio-${VERSION}
 CATEGORIES=    meta-pkgs ham
 MASTER_SITES=  # empty
 DISTFILES=     # empty

Index: pkgsrc/meta-pkgs/kde4/Makefile.kde4
diff -u pkgsrc/meta-pkgs/kde4/Makefile.kde4:1.26 pkgsrc/meta-pkgs/kde4/Makefile.kde4:1.27
--- pkgsrc/meta-pkgs/kde4/Makefile.kde4:1.26    Fri Jun  8 12:42:13 2018
+++ pkgsrc/meta-pkgs/kde4/Makefile.kde4 Sun Nov  3 19:35:55 2019
@@ -1,28 +1,28 @@
-# $NetBSD: Makefile.kde4,v 1.26 2018/06/08 12:42:13 he Exp $
+# $NetBSD: Makefile.kde4,v 1.27 2019/11/03 19:35:55 rillig Exp $
 #
 # This Makefile fragment is included at the top of package Makefiles for
 # KDE4-distributed packages (they all share common configure and build
 # settings).
 
-CATEGORIES+=   kde
-_KDE_VERSION=  4.14.3
+CATEGORIES+=           kde
+_KDE_VERSION=          4.14.3
 MASTER_SITE_KDE_I18N=  ${MASTER_SITE_KDE:=4.14.3/src/kde-l10n/}
-MASTER_SITES?= ${MASTER_SITE_KDE:=4.14.3/src/}
-EXTRACT_SUFX?= .tar.xz
-EXTRACT_USING= gtar
+MASTER_SITES?=         ${MASTER_SITE_KDE:=4.14.3/src/}
+EXTRACT_SUFX?=         .tar.xz
+EXTRACT_USING=         gtar
 
 MAINTAINER?=   markd%NetBSD.org@localhost
 HOMEPAGE?=     http://www.kde.org/
 LICENSE?=      gnu-gpl-v2 AND gnu-lgpl-v2
 
-BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
-TOOLS_DEPENDS.cmake= cmake>=2.8.12:../../devel/cmake
+BUILD_DEPENDS+=                automoc4>=0.9.87:../../devel/automoc4
+TOOLS_DEPENDS.cmake=   cmake>=2.8.12:../../devel/cmake
 
 USE_TOOLS+=    pkg-config perl
 USE_LANGUAGES= c gnu++03
 USE_CMAKE=     yes
 CMAKE_ARG_PATH=        ..
-CONFIGURE_DIRS= _KDE_build
+CONFIGURE_DIRS=        _KDE_build
 
 # eventually allow CMAKE_BUILD_TYPE to be overridden
 # set for current default

Index: pkgsrc/meta-pkgs/py-tryton-platform/Makefile
diff -u pkgsrc/meta-pkgs/py-tryton-platform/Makefile:1.8 pkgsrc/meta-pkgs/py-tryton-platform/Makefile:1.9
--- pkgsrc/meta-pkgs/py-tryton-platform/Makefile:1.8    Mon Sep  2 13:20:21 2019
+++ pkgsrc/meta-pkgs/py-tryton-platform/Makefile        Sun Nov  3 19:35:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/09/02 13:20:21 adam Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 19:35:55 rillig Exp $
 #
 DISTNAME=      # empty
 PKGNAME=       ${PYPKGPREFIX}-tryton-platform-${TRYTON_BASEVER}
@@ -126,6 +126,6 @@ DEPENDS+=   ${PYPKGPREFIX}-trytond-timeshe
 DEPENDS+=      ${PYPKGPREFIX}-trytond-web-user>=${TRYTON_BASEVER}:../../www/py-trytond-web-user
 DEPENDS+=      ${PYPKGPREFIX}-trytond-webdav>=${TRYTON_BASEVER}:../../www/py-trytond-webdav
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-simplesoap via py-stdnum and py-trytond-bank
+PYTHON_VERSIONS_ACCEPTED=      27 # py-simplesoap via py-stdnum and py-trytond-bank
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile
diff -u pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile:1.5 pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile:1.6
--- pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile:1.5  Sat Sep 30 15:48:42 2017
+++ pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile      Sun Nov  3 19:35:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/09/30 15:48:42 taca Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/03 19:35:55 rillig Exp $
 
 DISTNAME=      redmine-plugins-1.2.0
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -17,8 +17,8 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-redmine_star
 DEPENDS+=      ${RUBY_PKGPREFIX}-redmine_theme_changer-[0-9]*:../../devel/ruby-redmine_theme_changer
 DEPENDS+=      ${RUBY_PKGPREFIX}-redmine_work_time-[0-9]*:../../devel/ruby-redmine_work_time
 
-META_PACKAGE=  yes
-MESSAGE_SRC+=  ${.CURDIR}/MESSAGE.common ${.CURDIR}/MESSAGE
+META_PACKAGE=          yes
+MESSAGE_SRC+=          ${.CURDIR}/MESSAGE.common ${.CURDIR}/MESSAGE
 RUBY_VERSIONS_ACCEPTED=        22
 
 .include "../../lang/ruby/rubyversion.mk"

Index: pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile
diff -u pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile:1.6 pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile:1.7
--- pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile:1.6   Sat Sep 30 15:48:42 2017
+++ pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile       Sun Nov  3 19:35:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/09/30 15:48:42 taca Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 19:35:55 rillig Exp $
 
 DISTNAME=      redmine-themes-1.3.0
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-redmine-gitm
 DEPENDS+=      ${RUBY_PKGPREFIX}-redmine-minimalflat-theme-[0-9]*:../../devel/ruby-redmine-minimalflat-theme
 DEPENDS+=      ${RUBY_PKGPREFIX}-redmine-red-andy-theme-[0-9]*:../../devel/ruby-redmine-red-andy-theme
 
-META_PACKAGE=  yes
+META_PACKAGE=          yes
 RUBY_VERSIONS_ACCEPTED=        22
 
 .include "../../lang/ruby/rubyversion.mk"

Index: pkgsrc/meta-pkgs/texlive-collection-context/Makefile
diff -u pkgsrc/meta-pkgs/texlive-collection-context/Makefile:1.7 pkgsrc/meta-pkgs/texlive-collection-context/Makefile:1.8
--- pkgsrc/meta-pkgs/texlive-collection-context/Makefile:1.7    Wed May 15 11:42:53 2019
+++ pkgsrc/meta-pkgs/texlive-collection-context/Makefile        Sun Nov  3 19:35:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/05/15 11:42:53 markd Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 19:35:55 rillig Exp $
 
 DISTNAME=      collection-context
 PKGNAME=       texlive-${DISTNAME}-2019pre1
@@ -13,42 +13,42 @@ COMMENT=    ConTeXt and packages
 DEPENDS+=      texlive-collection-basic-[0-9]*:../../meta-pkgs/texlive-collection-basic
 
 DEPENDS+=      tex-context-[0-9]*:../../print/tex-context
-DEPENDS+=       tex-jmn-[0-9]*:../../fonts/tex-jmn
-DEPENDS+=       tex-context-account-[0-9]*:../../print/tex-context-account
-DEPENDS+=       tex-context-algorithmic-[0-9]*:../../print/tex-context-algorithmic
-DEPENDS+=       tex-context-animation-[0-9]*:../../print/tex-context-animation
-DEPENDS+=       tex-context-annotation-[0-9]*:../../print/tex-context-annotation
-DEPENDS+=       tex-context-bnf-[0-9]*:../../print/tex-context-bnf
-DEPENDS+=       tex-context-chromato-[0-9]*:../../print/tex-context-chromato
+DEPENDS+=      tex-jmn-[0-9]*:../../fonts/tex-jmn
+DEPENDS+=      tex-context-account-[0-9]*:../../print/tex-context-account
+DEPENDS+=      tex-context-algorithmic-[0-9]*:../../print/tex-context-algorithmic
+DEPENDS+=      tex-context-animation-[0-9]*:../../print/tex-context-animation
+DEPENDS+=      tex-context-annotation-[0-9]*:../../print/tex-context-annotation
+DEPENDS+=      tex-context-bnf-[0-9]*:../../print/tex-context-bnf
+DEPENDS+=      tex-context-chromato-[0-9]*:../../print/tex-context-chromato
 # depend context-cmscbf
 # depend context-cmttbf
-DEPENDS+=       tex-context-construction-plan-[0-9]*:../../print/tex-context-construction-plan
-DEPENDS+=       tex-context-cyrillicnumbers-[0-9]*:../../print/tex-context-cyrillicnumbers
-DEPENDS+=       tex-context-degrade-[0-9]*:../../print/tex-context-degrade
-DEPENDS+=       tex-context-fancybreak-[0-9]*:../../print/tex-context-fancybreak
-DEPENDS+=       tex-context-filter-[0-9]*:../../print/tex-context-filter
-DEPENDS+=       tex-context-french-[0-9]*:../../print/tex-context-french
-DEPENDS+=       tex-context-fullpage-[0-9]*:../../print/tex-context-fullpage
-DEPENDS+=       tex-context-gantt-[0-9]*:../../print/tex-context-gantt
-DEPENDS+=       tex-context-gnuplot-[0-9]*:../../print/tex-context-gnuplot
+DEPENDS+=      tex-context-construction-plan-[0-9]*:../../print/tex-context-construction-plan
+DEPENDS+=      tex-context-cyrillicnumbers-[0-9]*:../../print/tex-context-cyrillicnumbers
+DEPENDS+=      tex-context-degrade-[0-9]*:../../print/tex-context-degrade
+DEPENDS+=      tex-context-fancybreak-[0-9]*:../../print/tex-context-fancybreak
+DEPENDS+=      tex-context-filter-[0-9]*:../../print/tex-context-filter
+DEPENDS+=      tex-context-french-[0-9]*:../../print/tex-context-french
+DEPENDS+=      tex-context-fullpage-[0-9]*:../../print/tex-context-fullpage
+DEPENDS+=      tex-context-gantt-[0-9]*:../../print/tex-context-gantt
+DEPENDS+=      tex-context-gnuplot-[0-9]*:../../print/tex-context-gnuplot
 # depend context-handlecsv
 # depend context-inifile
 # depend context-layout
-DEPENDS+=       tex-context-letter-[0-9]*:../../print/tex-context-letter
-DEPENDS+=       tex-context-lettrine-[0-9]*:../../print/tex-context-lettrine
-DEPENDS+=       tex-context-mathsets-[0-9]*:../../print/tex-context-mathsets
+DEPENDS+=      tex-context-letter-[0-9]*:../../print/tex-context-letter
+DEPENDS+=      tex-context-lettrine-[0-9]*:../../print/tex-context-lettrine
+DEPENDS+=      tex-context-mathsets-[0-9]*:../../print/tex-context-mathsets
 # only a doc package exists
-#DEPENDS+=       tex-context-notes-zh-cn-[0-9]*:../../print/tex-context-notes-zh-cn
-DEPENDS+=       tex-context-rst-[0-9]*:../../print/tex-context-rst
-DEPENDS+=       tex-context-ruby-[0-9]*:../../print/tex-context-ruby
-DEPENDS+=       tex-context-simplefonts-[0-9]*:../../print/tex-context-simplefonts
-DEPENDS+=       tex-context-simpleslides-[0-9]*:../../print/tex-context-simpleslides
-DEPENDS+=       tex-context-title-[0-9]*:../../print/tex-context-title
-DEPENDS+=       tex-context-transliterator-[0-9]*:../../print/tex-context-transliterator
-DEPENDS+=       tex-context-typearea-[0-9]*:../../print/tex-context-typearea
-DEPENDS+=       tex-context-typescripts-[0-9]*:../../print/tex-context-typescripts
-DEPENDS+=       tex-context-vim-[0-9]*:../../print/tex-context-vim
-DEPENDS+=       tex-context-visualcounter-[0-9]*:../../print/tex-context-visualcounter
+#DEPENDS+=     tex-context-notes-zh-cn-[0-9]*:../../print/tex-context-notes-zh-cn
+DEPENDS+=      tex-context-rst-[0-9]*:../../print/tex-context-rst
+DEPENDS+=      tex-context-ruby-[0-9]*:../../print/tex-context-ruby
+DEPENDS+=      tex-context-simplefonts-[0-9]*:../../print/tex-context-simplefonts
+DEPENDS+=      tex-context-simpleslides-[0-9]*:../../print/tex-context-simpleslides
+DEPENDS+=      tex-context-title-[0-9]*:../../print/tex-context-title
+DEPENDS+=      tex-context-transliterator-[0-9]*:../../print/tex-context-transliterator
+DEPENDS+=      tex-context-typearea-[0-9]*:../../print/tex-context-typearea
+DEPENDS+=      tex-context-typescripts-[0-9]*:../../print/tex-context-typescripts
+DEPENDS+=      tex-context-vim-[0-9]*:../../print/tex-context-vim
+DEPENDS+=      tex-context-visualcounter-[0-9]*:../../print/tex-context-visualcounter
 # depend npp-for-context
 
 META_PACKAGE=  yes

Index: pkgsrc/meta-pkgs/texlive-collection-latexextra/Makefile
diff -u pkgsrc/meta-pkgs/texlive-collection-latexextra/Makefile:1.47 pkgsrc/meta-pkgs/texlive-collection-latexextra/Makefile:1.48
--- pkgsrc/meta-pkgs/texlive-collection-latexextra/Makefile:1.47        Tue Aug 13 20:55:15 2019
+++ pkgsrc/meta-pkgs/texlive-collection-latexextra/Makefile     Sun Nov  3 19:35:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/08/13 20:55:15 markd Exp $
+# $NetBSD: Makefile,v 1.48 2019/11/03 19:35:55 rillig Exp $
 
 DISTNAME=      collection-latexextra
 PKGNAME=       texlive-${DISTNAME}-2019pre4
@@ -10,8 +10,8 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/texlive/
 COMMENT=       LaTeX additional packages
 
-DEPENDS+=      texlive-collection-latexrecommended-[0-9]*:../../meta-pkgs/texlive-collection-latexrecommended
-DEPENDS+=      texlive-collection-pictures-[0-9]*:../../meta-pkgs/texlive-collection-pictures
+DEPENDS+=      texlive-collection-latexrecommended-[0-9]*:../../meta-pkgs/texlive-collection-latexrecommended
+DEPENDS+=      texlive-collection-pictures-[0-9]*:../../meta-pkgs/texlive-collection-pictures
 
 DEPENDS+=      tex-2up-[0-9]*:../../print/tex-2up
 # depend ESIEEcv

Prev by Date: CVS commit: pkgsrc/ham
Next by Date: CVS commit: pkgsrc/net/youtube-dl
Previous by Thread: CVS commit: pkgsrc/ham
Next by Thread: CVS commit: pkgsrc/net/youtube-dl
Indexes:

Home | Main Index | Thread Index | Old Index