pkgsrc-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1225a3c2a9e0
branches:  trunk
changeset: 403941:1225a3c2a9e0
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 03 17:14:24 2019 +0000

description:
converters: align variable assignments

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

No manual corrections.

diffstat:

 converters/autoconvert/Makefile                 |   4 ++--
 converters/docx2txt/Makefile                    |  16 ++++++++--------
 converters/gbase/Makefile                       |   4 ++--
 converters/hztty/Makefile                       |   4 ++--
 converters/ish/Makefile                         |   6 +++---
 converters/ja-dvi2tty/Makefile                  |  10 +++++-----
 converters/kcc/Makefile                         |   4 ++--
 converters/libiconv/builtin.mk                  |   8 ++++----
 converters/libiconv/hacks.mk                    |   4 ++--
 converters/libmspub/Makefile                    |  10 +++++-----
 converters/libvisio/Makefile                    |   4 ++--
 converters/p5-JSON-Any/Makefile                 |   4 ++--
 converters/p5-JSON-XS-VersionOneAndTwo/Makefile |   4 ++--
 converters/py-jpCodecs/Makefile                 |   4 ++--
 converters/py-yenc/Makefile                     |   6 +++---
 converters/py-zfec/Makefile                     |  12 ++++++------
 converters/py-zhCodecs/Makefile                 |   4 ++--
 converters/qrencode/Makefile                    |   4 ++--
 converters/qrencode/options.mk                  |   4 ++--
 converters/recode/Makefile                      |   8 ++++----
 converters/rss2html/Makefile                    |   4 ++--
 converters/ruby-romkan/Makefile                 |   6 +++---
 converters/skf/Makefile                         |   4 ++--
 converters/smbchartool/Makefile                 |   8 ++++----
 converters/unoconv/Makefile                     |   4 ++--
 converters/wkhtmltopdf/Makefile                 |  14 +++++++-------
 converters/xdeview/Makefile                     |   6 +++---
 27 files changed, 85 insertions(+), 85 deletions(-)

diffs (truncated from 571 to 300 lines):

diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/autoconvert/Makefile
--- a/converters/autoconvert/Makefile   Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/autoconvert/Makefile   Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/08/16 20:45:33 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 17:14:24 rillig Exp $
 
 DISTNAME=      autoconvert-0.3.13
 PKGREVISION=   2
@@ -11,7 +11,7 @@
 
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake
-AUTO_MKDIRS=                   yes
+AUTO_MKDIRS=   yes
 
 INSTALLATION_DIRS=     share/examples/autoconvert
 
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/docx2txt/Makefile
--- a/converters/docx2txt/Makefile      Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/docx2txt/Makefile      Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/08/11 13:18:10 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 17:14:24 rillig Exp $
 #
 
 DISTNAME=      docx2txt-1.2
@@ -13,8 +13,8 @@
 LICENSE=       gnu-gpl-v3
 
 USE_LANGUAGES= # none
-USE_TOOLS+=     perl:run unzip:run
-REPLACE_PERL=   docx2txt.pl
+USE_TOOLS+=    perl:run unzip:run
+REPLACE_PERL=  docx2txt.pl
 
 BINDIR=                ${PREFIX}/bin
 EGDIR=         ${PREFIX}/share/doc/docx2txt
@@ -27,11 +27,11 @@
 SUBST_SED.fix-etc=     -e 's,"/etc,"${PKG_SYSCONFDIR},g'
 SUBST_SED.fix-etc+=    -e 's, /etc , ${PKG_SYSCONFDIR} ,g'
 
-SUBST_CLASSES+=         unzip
-SUBST_STAGE.unzip=      pre-configure
-SUBST_MESSAGE.unzip=    Hardcoding unzip path
-SUBST_FILES.unzip=      *.pl *.config
-SUBST_SED.unzip=        -e 's,/usr/bin/unzip,${TOOLS_PATH.unzip},'
+SUBST_CLASSES+=                unzip
+SUBST_STAGE.unzip=     pre-configure
+SUBST_MESSAGE.unzip=   Hardcoding unzip path
+SUBST_FILES.unzip=     *.pl *.config
+SUBST_SED.unzip=       -e 's,/usr/bin/unzip,${TOOLS_PATH.unzip},'
 
 SUBST_CLASSES+=                suffix
 SUBST_STAGE.suffix=    pre-configure
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/gbase/Makefile
--- a/converters/gbase/Makefile Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/gbase/Makefile Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/07/21 22:24:33 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/03 17:14:24 rillig Exp $
 
 DISTNAME=      gbase-0.5
 PKGREVISION=   15
@@ -17,7 +17,7 @@
 BUILD_TARGET=  gbase
 
 do-install:
-               ${INSTALL_PROGRAM} ${WRKSRC}/gbase ${DESTDIR}${PREFIX}/bin/gbase
+       ${INSTALL_PROGRAM} ${WRKSRC}/gbase ${DESTDIR}${PREFIX}/bin/gbase
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/hztty/Makefile
--- a/converters/hztty/Makefile Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/hztty/Makefile Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/02/25 12:56:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 17:14:24 rillig Exp $
 
 DISTNAME=      hztty-2.0
 CATEGORIES=    converters
@@ -10,7 +10,7 @@
 
 BUILD_TARGET.Interix=  svr4
 BUILD_TARGET.Linux=    linux
-BUILD_TARGET.*=        bsd
+BUILD_TARGET.*=                bsd
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/ish/Makefile
--- a/converters/ish/Makefile   Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/ish/Makefile   Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/03 00:20:11 asau Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 17:14:24 rillig Exp $
 
 DISTNAME=      ish-1.11
 CATEGORIES=    converters
@@ -8,7 +8,7 @@
 COMMENT=       Binary-to-text file-encoder
 
 INSTALLATION_DIRS=     bin
-MAKE_FILE=     makefile
-BUILD_TARGET=  ish
+MAKE_FILE=             makefile
+BUILD_TARGET=          ish
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/ja-dvi2tty/Makefile
--- a/converters/ja-dvi2tty/Makefile    Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/ja-dvi2tty/Makefile    Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/03 00:20:11 asau Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 17:14:24 rillig Exp $
 
 DISTNAME=      dvi2tty5.0
 PKGNAME=       ja-dvi2tty-5.0
@@ -6,10 +6,10 @@
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 #MASTER_SITES= ftp://ftp.web.ad.jp/pub/TeX/akiu/dviwares/dvi2tty/
 
-PATCH_SITES=   ${MASTER_SITE_LOCAL}
-#PATCH_SITES=  ftp://ftp.web.ad.jp/pub/TeX/akiu/dviwares/dvi2tty/
-PATCHFILES=    dvi2tty-ascii-jtex-patch \
-               dvi2tty.c-patch
+PATCH_SITES=           ${MASTER_SITE_LOCAL}
+#PATCH_SITES=          ftp://ftp.web.ad.jp/pub/TeX/akiu/dviwares/dvi2tty/
+PATCHFILES=            dvi2tty-ascii-jtex-patch \
+                       dvi2tty.c-patch
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/kcc/Makefile
--- a/converters/kcc/Makefile   Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/kcc/Makefile   Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/03/15 17:25:56 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 17:14:24 rillig Exp $
 
 DISTNAME=      kcc
 PKGNAME=       kcc-2.3
@@ -15,7 +15,7 @@
 INSTALL_MAKE_FLAGS+=   MANPATH=${DESTDIR}${PREFIX}/${PKGMANDIR}
 INSTALL_MAKE_FLAGS+=   JMANDIR=ja_JP.EUC
 
-INSTALL_TARGET=        install install.man
+INSTALL_TARGET=                install install.man
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/ja_JP.EUC/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/libiconv/builtin.mk
--- a/converters/libiconv/builtin.mk    Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/libiconv/builtin.mk    Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.23 2013/11/23 10:58:46 obache Exp $
+# $NetBSD: builtin.mk,v 1.24 2019/11/03 17:14:25 rillig Exp $
 
 BUILTIN_PKG:=  iconv
 
@@ -25,7 +25,7 @@
 IS_BUILTIN.iconv=      yes
 .  endif
 .endif
-MAKEVARS+=     IS_BUILTIN.iconv
+MAKEVARS+=             IS_BUILTIN.iconv
 
 ###
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -54,7 +54,7 @@
 .  endif
 BUILTIN_PKG.iconv=     libiconv-${BUILTIN_VERSION.iconv}
 .endif
-MAKEVARS+=     BUILTIN_PKG.iconv
+MAKEVARS+=             BUILTIN_PKG.iconv
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -112,7 +112,7 @@
 .    endfor
 .  endif  # PREFER.iconv
 .endif
-MAKEVARS+=     USE_BUILTIN.iconv
+MAKEVARS+=             USE_BUILTIN.iconv
 
 # If USE_GNU_ICONV is defined, then force the use of a GNU libiconv
 # implementation.
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/libiconv/hacks.mk
--- a/converters/libiconv/hacks.mk      Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/libiconv/hacks.mk      Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2010/11/05 16:43:55 shattered Exp $
+# $NetBSD: hacks.mk,v 1.4 2019/11/03 17:14:25 rillig Exp $
 
 .if !defined(LIBICONV_HACKS_MK)
 LIBICONV_HACKS_MK=     # defined
@@ -10,7 +10,7 @@
 .if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
 PKG_HACKS+=            sys_types_h-inttypes_h-conflict
 post-wrapper:
-               ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
+       ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
 # should match int8_t, int16_t, and int32_t (only)
 .endif
 
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/libmspub/Makefile
--- a/converters/libmspub/Makefile      Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/libmspub/Makefile      Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/08/22 12:22:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/03 17:14:25 rillig Exp $
 
 DISTNAME=      libmspub-0.1.4
 PKGREVISION=   9
@@ -11,10 +11,10 @@
 COMMENT=       Library for importing Microsoft Publisher content
 LICENSE=       mpl-1.1 OR gnu-lgpl-v2 OR gnu-gpl-v2
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config
+USE_LANGUAGES=         c c++
 CONFIGURE_ARGS+=       --without-docs
 
 BUILDLINK_TRANSFORM+=  rm:-Werror
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/libvisio/Makefile
--- a/converters/libvisio/Makefile      Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/libvisio/Makefile      Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2019/08/22 12:22:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2019/11/03 17:14:25 rillig Exp $
 
 DISTNAME=      libvisio-0.1.7
 PKGREVISION=   1
@@ -12,7 +12,7 @@
 LICENSE=       gnu-lgpl-v2.1 OR mpl-1.1 OR gnu-gpl-v2
 
 #BUILD_DEPENDS+=       doxygen>=1.8.9:../../devel/doxygen
-BUILD_DEPENDS+=        gperf-[0-9]*:../../devel/gperf
+BUILD_DEPENDS+=                gperf-[0-9]*:../../devel/gperf
 
 USE_LANGUAGES=         c c++11
 USE_LIBTOOL=           yes
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/p5-JSON-Any/Makefile
--- a/converters/p5-JSON-Any/Makefile   Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/p5-JSON-Any/Makefile   Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/08/11 13:18:12 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 17:14:25 rillig Exp $
 
 DISTNAME=      JSON-Any-1.39
 PKGNAME=       p5-${DISTNAME}
@@ -16,7 +16,7 @@
 
 # p5-JSON-XS appears to be the current "best of breed"
 # and is the preferred JSON dependency (see Makefile.PL)
-DEPENDS+=              p5-JSON-XS>=2.232:../../converters/p5-JSON-XS
+DEPENDS+=      p5-JSON-XS>=2.232:../../converters/p5-JSON-XS
 # for make test
 BUILD_DEPENDS+=        p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
 BUILD_DEPENDS+=        p5-Test-Without-Module-[0-9]*:../../devel/p5-Test-Without-Module
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/p5-JSON-XS-VersionOneAndTwo/Makefile
--- a/converters/p5-JSON-XS-VersionOneAndTwo/Makefile   Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/p5-JSON-XS-VersionOneAndTwo/Makefile   Sun Nov 03 17:14:24 2019 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:18:13 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 17:14:25 rillig Exp $
 
 DISTNAME=      JSON-XS-VersionOneAndTwo-0.31
 PKGNAME=       p5-${DISTNAME}
 PKGREVISION=   11
 CATEGORIES=    textproc perl5
-MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=../../authors/id/L/LB/LBROCARD/}
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=../../authors/id/L/LB/LBROCARD/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://metacpan.org/release/JSON-XS-VersionOneAndTwo
diff -r 3b8e06164407 -r 1225a3c2a9e0 converters/py-jpCodecs/Makefile
--- a/converters/py-jpCodecs/Makefile   Sun Nov 03 17:11:59 2019 +0000
+++ b/converters/py-jpCodecs/Makefile   Sun Nov 03 17:14:24 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/09/02 13:19:58 adam Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/03 17:14:25 rillig Exp $
 
 DISTNAME=      JapaneseCodecs-1.4.11
 PKGNAME=       ${PYPKGPREFIX}-jpCodecs-1.4.11
@@ -11,7 +11,7 @@
 HOMEPAGE=      http://www.asahi-net.or.jp/~rd6t-kjym/python/
 COMMENT=       Python Unicode codecs for Japanese charsets
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index