CVS commit: pkgsrc/converters

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/converters
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Sun, 3 Nov 2019 17:14:27 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Nov  3 17:14:27 UTC 2019

Modified Files:
        pkgsrc/converters/autoconvert: Makefile
        pkgsrc/converters/docx2txt: Makefile
        pkgsrc/converters/gbase: Makefile
        pkgsrc/converters/hztty: Makefile
        pkgsrc/converters/ish: Makefile
        pkgsrc/converters/ja-dvi2tty: Makefile
        pkgsrc/converters/kcc: Makefile
        pkgsrc/converters/libiconv: builtin.mk hacks.mk
        pkgsrc/converters/libmspub: Makefile
        pkgsrc/converters/libvisio: Makefile
        pkgsrc/converters/p5-JSON-Any: Makefile
        pkgsrc/converters/p5-JSON-XS-VersionOneAndTwo: Makefile
        pkgsrc/converters/py-jpCodecs: Makefile
        pkgsrc/converters/py-yenc: Makefile
        pkgsrc/converters/py-zfec: Makefile
        pkgsrc/converters/py-zhCodecs: Makefile
        pkgsrc/converters/qrencode: Makefile options.mk
        pkgsrc/converters/recode: Makefile
        pkgsrc/converters/rss2html: Makefile
        pkgsrc/converters/ruby-romkan: Makefile
        pkgsrc/converters/skf: Makefile
        pkgsrc/converters/smbchartool: Makefile
        pkgsrc/converters/unoconv: Makefile
        pkgsrc/converters/wkhtmltopdf: Makefile
        pkgsrc/converters/xdeview: Makefile

Log Message:
converters: 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.15 -r1.16 pkgsrc/converters/autoconvert/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/docx2txt/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/converters/gbase/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/converters/hztty/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/converters/ish/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/converters/ja-dvi2tty/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/kcc/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/converters/libiconv/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/libiconv/hacks.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/converters/libmspub/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/converters/libvisio/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/converters/p5-JSON-Any/Makefile
cvs rdiff -u -r1.14 -r1.15 \
    pkgsrc/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/converters/py-jpCodecs/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/py-yenc/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/converters/py-zfec/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/converters/py-zhCodecs/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/converters/qrencode/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/qrencode/options.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/converters/recode/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/converters/rss2html/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/converters/ruby-romkan/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/converters/skf/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/converters/smbchartool/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/unoconv/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/wkhtmltopdf/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/converters/xdeview/Makefile

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

Modified files:

Index: pkgsrc/converters/autoconvert/Makefile
diff -u pkgsrc/converters/autoconvert/Makefile:1.15 pkgsrc/converters/autoconvert/Makefile:1.16
--- pkgsrc/converters/autoconvert/Makefile:1.15 Wed Aug 16 20:45:33 2017
+++ pkgsrc/converters/autoconvert/Makefile      Sun Nov  3 17:14:24 2019
@@ -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 @@ COMMENT=      Intelligent Chinese encoding co
 
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake
-AUTO_MKDIRS=                   yes
+AUTO_MKDIRS=   yes
 
 INSTALLATION_DIRS=     share/examples/autoconvert
 

Index: pkgsrc/converters/docx2txt/Makefile
diff -u pkgsrc/converters/docx2txt/Makefile:1.7 pkgsrc/converters/docx2txt/Makefile:1.8
--- pkgsrc/converters/docx2txt/Makefile:1.7     Sun Aug 11 13:18:10 2019
+++ pkgsrc/converters/docx2txt/Makefile Sun Nov  3 17:14:24 2019
@@ -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 @@ COMMENT=      Convert Microsoft .docx documen
 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_FILES.fix-etc=        *.pl README
 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

Index: pkgsrc/converters/gbase/Makefile
diff -u pkgsrc/converters/gbase/Makefile:1.17 pkgsrc/converters/gbase/Makefile:1.18
--- pkgsrc/converters/gbase/Makefile:1.17       Sun Jul 21 22:24:33 2019
+++ pkgsrc/converters/gbase/Makefile    Sun Nov  3 17:14:24 2019
@@ -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 @@ INSTALLATION_DIRS+=   bin
 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"

Index: pkgsrc/converters/hztty/Makefile
diff -u pkgsrc/converters/hztty/Makefile:1.13 pkgsrc/converters/hztty/Makefile:1.14
--- pkgsrc/converters/hztty/Makefile:1.13       Thu Feb 25 12:56:10 2016
+++ pkgsrc/converters/hztty/Makefile    Sun Nov  3 17:14:24 2019
@@ -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 @@ COMMENT=      Turns a tty session between Big
 
 BUILD_TARGET.Interix=  svr4
 BUILD_TARGET.Linux=    linux
-BUILD_TARGET.*=        bsd
+BUILD_TARGET.*=                bsd
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 

Index: pkgsrc/converters/ish/Makefile
diff -u pkgsrc/converters/ish/Makefile:1.14 pkgsrc/converters/ish/Makefile:1.15
--- pkgsrc/converters/ish/Makefile:1.14 Wed Oct  3 00:20:11 2012
+++ pkgsrc/converters/ish/Makefile      Sun Nov  3 17:14:24 2019
@@ -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 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 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"

Index: pkgsrc/converters/ja-dvi2tty/Makefile
diff -u pkgsrc/converters/ja-dvi2tty/Makefile:1.14 pkgsrc/converters/ja-dvi2tty/Makefile:1.15
--- pkgsrc/converters/ja-dvi2tty/Makefile:1.14  Wed Oct  3 00:20:11 2012
+++ pkgsrc/converters/ja-dvi2tty/Makefile       Sun Nov  3 17:14:24 2019
@@ -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 @@ CATEGORIES=   japanese converters
 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

Index: pkgsrc/converters/kcc/Makefile
diff -u pkgsrc/converters/kcc/Makefile:1.7 pkgsrc/converters/kcc/Makefile:1.8
--- pkgsrc/converters/kcc/Makefile:1.7  Sun Mar 15 17:25:56 2015
+++ pkgsrc/converters/kcc/Makefile      Sun Nov  3 17:14:24 2019
@@ -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+=  BINPATH=${DESTDIR}$
 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"

Index: pkgsrc/converters/libiconv/builtin.mk
diff -u pkgsrc/converters/libiconv/builtin.mk:1.23 pkgsrc/converters/libiconv/builtin.mk:1.24
--- pkgsrc/converters/libiconv/builtin.mk:1.23  Sat Nov 23 10:58:46 2013
+++ pkgsrc/converters/libiconv/builtin.mk       Sun Nov  3 17:14:25 2019
@@ -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=     no
 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 @@ BUILTIN_VERSION.iconv=        1.9.2           # latest v
 .  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 @@ USE_BUILTIN.iconv=  no
 .    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.

Index: pkgsrc/converters/libiconv/hacks.mk
diff -u pkgsrc/converters/libiconv/hacks.mk:1.3 pkgsrc/converters/libiconv/hacks.mk:1.4
--- pkgsrc/converters/libiconv/hacks.mk:1.3     Fri Nov  5 16:43:55 2010
+++ pkgsrc/converters/libiconv/hacks.mk Sun Nov  3 17:14:25 2019
@@ -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 @@ LIBICONV_HACKS_MK=    # defined
 .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
 

Index: pkgsrc/converters/libmspub/Makefile
diff -u pkgsrc/converters/libmspub/Makefile:1.38 pkgsrc/converters/libmspub/Makefile:1.39
--- pkgsrc/converters/libmspub/Makefile:1.38    Thu Aug 22 12:22:55 2019
+++ pkgsrc/converters/libmspub/Makefile Sun Nov  3 17:14:25 2019
@@ -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 @@ HOMEPAGE=   https://wiki.documentfoundatio
 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

Index: pkgsrc/converters/libvisio/Makefile
diff -u pkgsrc/converters/libvisio/Makefile:1.63 pkgsrc/converters/libvisio/Makefile:1.64
--- pkgsrc/converters/libvisio/Makefile:1.63    Thu Aug 22 12:22:56 2019
+++ pkgsrc/converters/libvisio/Makefile Sun Nov  3 17:14:25 2019
@@ -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 @@ COMMENT=      Library and tools for parsing t
 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

Index: pkgsrc/converters/p5-JSON-Any/Makefile
diff -u pkgsrc/converters/p5-JSON-Any/Makefile:1.31 pkgsrc/converters/p5-JSON-Any/Makefile:1.32
--- pkgsrc/converters/p5-JSON-Any/Makefile:1.31 Sun Aug 11 13:18:12 2019
+++ pkgsrc/converters/p5-JSON-Any/Makefile      Sun Nov  3 17:14:25 2019
@@ -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 @@ PERL5_MODULE_TYPE=    Module::Install::Bund
 
 # 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

Index: pkgsrc/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
diff -u pkgsrc/converters/p5-JSON-XS-VersionOneAndTwo/Makefile:1.14 pkgsrc/converters/p5-JSON-XS-VersionOneAndTwo/Makefile:1.15
--- pkgsrc/converters/p5-JSON-XS-VersionOneAndTwo/Makefile:1.14 Sun Aug 11 13:18:13 2019
+++ pkgsrc/converters/p5-JSON-XS-VersionOneAndTwo/Makefile      Sun Nov  3 17:14:25 2019
@@ -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

Index: pkgsrc/converters/py-jpCodecs/Makefile
diff -u pkgsrc/converters/py-jpCodecs/Makefile:1.25 pkgsrc/converters/py-jpCodecs/Makefile:1.26
--- pkgsrc/converters/py-jpCodecs/Makefile:1.25 Mon Sep  2 13:19:58 2019
+++ pkgsrc/converters/py-jpCodecs/Makefile      Sun Nov  3 17:14:25 2019
@@ -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 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 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"

Index: pkgsrc/converters/py-yenc/Makefile
diff -u pkgsrc/converters/py-yenc/Makefile:1.7 pkgsrc/converters/py-yenc/Makefile:1.8
--- pkgsrc/converters/py-yenc/Makefile:1.7      Mon Sep  2 13:19:58 2019
+++ pkgsrc/converters/py-yenc/Makefile  Sun Nov  3 17:14:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/09/02 13:19:58 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 17:14:25 rillig Exp $
 
 DISTNAME=      yenc-${DISTVERSION}
 DISTVERSION=   0.4.0
@@ -13,9 +13,9 @@ PYDISTUTILSPKG=       yes
 MAINTAINER=    pkgsrc128%fastmail.us@localhost
 HOMEPAGE=      http://www.golug.it/yenc.html
 COMMENT=       Python module for yenc decoding module in C
-LICENSE=        gnu-lgpl-v2.1
+LICENSE=       gnu-lgpl-v2.1
 
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 0.4.0
+PYTHON_VERSIONS_ACCEPTED=      27 # as of 0.4.0
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/converters/py-zfec/Makefile
diff -u pkgsrc/converters/py-zfec/Makefile:1.23 pkgsrc/converters/py-zfec/Makefile:1.24
--- pkgsrc/converters/py-zfec/Makefile:1.23     Mon Sep  2 13:19:58 2019
+++ pkgsrc/converters/py-zfec/Makefile  Sun Nov  3 17:14:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/09/02 13:19:58 adam Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/03 17:14:25 rillig Exp $
 
 DISTNAME=      zfec-1.4.24
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -20,12 +20,12 @@ DEPENDS+=   ${PYPKGPREFIX}-expat-[0-9]*:..
 
 CFLAGS.SunOS+= -std=c99 -D_XOPEN_SOURCE=600
 
-REPLACE_INTERPRETER+=  python
-REPLACE.python.old=    /usr/bin/env python
-REPLACE.python.new=    ${PYTHONBIN}
-REPLACE_FILES.python=  zfec/cmdline_zfec.py zfec/cmdline_zunfec.py zfec/test/test_zfec.py
+REPLACE_INTERPRETER+=  python
+REPLACE.python.old=    /usr/bin/env python
+REPLACE.python.new=    ${PYTHONBIN}
+REPLACE_FILES.python=  zfec/cmdline_zfec.py zfec/cmdline_zunfec.py zfec/test/test_zfec.py
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-darcsver
+PYTHON_VERSIONS_ACCEPTED=      27 # py-darcsver
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/converters/py-zhCodecs/Makefile
diff -u pkgsrc/converters/py-zhCodecs/Makefile:1.26 pkgsrc/converters/py-zhCodecs/Makefile:1.27
--- pkgsrc/converters/py-zhCodecs/Makefile:1.26 Mon Sep  2 13:19:59 2019
+++ pkgsrc/converters/py-zhCodecs/Makefile      Sun Nov  3 17:14:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/09/02 13:19:59 adam Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 17:14:26 rillig Exp $
 
 DISTNAME=      ChineseCodecs1.2.0
 PKGNAME=       ${PYPKGPREFIX}-zhCodecs-1.2.0
@@ -14,7 +14,7 @@ COMMENT=      Python Unicode codecs for Chine
 WRKSRC=                ${WRKDIR}/${DISTNAME}/Python
 PYDISTUTILSPKG=        # defined
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 post-extract:
        @${CHMOD} 711 ${WRKSRC}/chinesetw

Index: pkgsrc/converters/qrencode/Makefile
diff -u pkgsrc/converters/qrencode/Makefile:1.14 pkgsrc/converters/qrencode/Makefile:1.15
--- pkgsrc/converters/qrencode/Makefile:1.14    Wed Feb 13 15:16:00 2019
+++ pkgsrc/converters/qrencode/Makefile Sun Nov  3 17:14:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/02/13 15:16:00 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 17:14:26 rillig Exp $
 #
 
 DISTNAME=      qrencode-4.0.2
@@ -18,7 +18,7 @@ USE_LIBTOOL=  yes
 
 # The tests are not actually installed anyway, and at least
 # one of these tests requires SDL.
-CONFIGURE_ARGS+= --without-tests
+CONFIGURE_ARGS+=       --without-tests
 
 PKGCONFIG_OVERRIDE+=   libqrencode.pc.in
 

Index: pkgsrc/converters/qrencode/options.mk
diff -u pkgsrc/converters/qrencode/options.mk:1.1 pkgsrc/converters/qrencode/options.mk:1.2
--- pkgsrc/converters/qrencode/options.mk:1.1   Sun Jun  9 13:48:50 2013
+++ pkgsrc/converters/qrencode/options.mk       Sun Nov  3 17:14:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2013/06/09 13:48:50 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 17:14:26 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qrencode
 PKG_SUPPORTED_OPTIONS= static
@@ -9,5 +9,5 @@ PKG_SUGGESTED_OPTIONS+= # blank
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=       --enable-static=yes
 .else
-CONFIGURE_ARGS+=        --enable-static=no
+CONFIGURE_ARGS+=       --enable-static=no
 .endif

Index: pkgsrc/converters/recode/Makefile
diff -u pkgsrc/converters/recode/Makefile:1.31 pkgsrc/converters/recode/Makefile:1.32
--- pkgsrc/converters/recode/Makefile:1.31      Wed Oct  3 00:20:16 2012
+++ pkgsrc/converters/recode/Makefile   Sun Nov  3 17:14:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2012/10/03 00:20:16 asau Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 17:14:26 rillig Exp $
 #
 
 DISTNAME=              recode-3.6
@@ -11,9 +11,9 @@ HOMEPAGE=             http://www.gnu.org/software/r
 COMMENT=               Convert files between character sets and usages
 LICENSE=               gnu-gpl-v2 AND gnu-lgpl-v2.1
 
-USE_PKGLOCALEDIR=      yes
-GNU_CONFIGURE=         yes
-USE_LIBTOOL=           yes
+USE_PKGLOCALEDIR=              yes
+GNU_CONFIGURE=                 yes
+USE_LIBTOOL=                   yes
 BROKEN_GETTEXT_DETECTION=      yes
 
 INFO_FILES=            yes

Index: pkgsrc/converters/rss2html/Makefile
diff -u pkgsrc/converters/rss2html/Makefile:1.36 pkgsrc/converters/rss2html/Makefile:1.37
--- pkgsrc/converters/rss2html/Makefile:1.36    Thu Aug 22 12:22:57 2019
+++ pkgsrc/converters/rss2html/Makefile Sun Nov  3 17:14:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/08/22 12:22:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/03 17:14:26 rillig Exp $
 #
 
 DISTNAME=              rss2html-0.8.2
@@ -11,7 +11,7 @@ MAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 COMMENT=               RSS to HTML converter
 
 GNU_CONFIGURE= YES
-USE_TOOLS+=            gmake
+USE_TOOLS+=    gmake
 
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1 share/doc/rss2html
 

Index: pkgsrc/converters/ruby-romkan/Makefile
diff -u pkgsrc/converters/ruby-romkan/Makefile:1.16 pkgsrc/converters/ruby-romkan/Makefile:1.17
--- pkgsrc/converters/ruby-romkan/Makefile:1.16 Thu Jun  4 13:56:25 2015
+++ pkgsrc/converters/ruby-romkan/Makefile      Sun Nov  3 17:14:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/06/04 13:56:25 taca Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 17:14:26 rillig Exp $
 
 DISTNAME=      ruby-romkan-0.4
 PKGNAME=       ${RUBY_PKGPREFIX}-romkan-0.4
@@ -11,8 +11,8 @@ HOMEPAGE=     http://0xcc.net/ruby-romkan/
 COMMENT=       Romaji <-> Kana conversion library for Ruby
 LICENSE=       ruby-license
 
-NO_CONFIGURE=  yes
-DOCS=          romkan.html romkan.html.ja romkan.en.rd romkan.ja.rd
+NO_CONFIGURE=          yes
+DOCS=                  romkan.html romkan.html.ja romkan.en.rd romkan.ja.rd
 INSTALLATION_DIRS=     ${RUBY_DOC}/romkan ${RUBY_VENDORLIB}
 
 do-build:

Index: pkgsrc/converters/skf/Makefile
diff -u pkgsrc/converters/skf/Makefile:1.57 pkgsrc/converters/skf/Makefile:1.58
--- pkgsrc/converters/skf/Makefile:1.57 Sun Aug 11 13:18:16 2019
+++ pkgsrc/converters/skf/Makefile      Sun Nov  3 17:14:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2019/08/11 13:18:16 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2019/11/03 17:14:27 rillig Exp $
 
 DISTNAME=      skf_${VERSION}.4
 VERSION=       2.00
@@ -24,7 +24,7 @@ MAKE_JOBS_SAFE=               no
 
 REPLACE_PERL=  scripts/parse_uni.p
 
-PLIST_SUBST+=  VERSION=${VERSION}
+PLIST_SUBST+=          VERSION=${VERSION}
 PRINT_PLIST_AWK+=      {gsub(/${VERSION}/, "$${VERSION}");}
 
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/converters/smbchartool/Makefile
diff -u pkgsrc/converters/smbchartool/Makefile:1.14 pkgsrc/converters/smbchartool/Makefile:1.15
--- pkgsrc/converters/smbchartool/Makefile:1.14 Sun Aug 11 13:18:16 2019
+++ pkgsrc/converters/smbchartool/Makefile      Sun Nov  3 17:14:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:18:16 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 17:14:27 rillig Exp $
 #
 
 DISTNAME=      smbchartool-2.3a
@@ -7,9 +7,9 @@ CATEGORIES=     converters japanese
 MASTER_SITES=  ftp://ftp.samba.gr.jp/pub/samba-jp/tool/
 DIST_SUBDIR=   smbchartool-2.3anb5
 
-PATCH_SITES=   http://www.miraclelinux.com/technet/samba30/download/
-PATCHFILES=    smbchartool-2.3a_3.0a.diff.gz
-PATCH_DIST_STRIP= -p1
+PATCH_SITES=           http://www.miraclelinux.com/technet/samba30/download/
+PATCHFILES=            smbchartool-2.3a_3.0a.diff.gz
+PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost
 HOMEPAGE=      http://www.miraclelinux.com/technet/samba30/migration.html

Index: pkgsrc/converters/unoconv/Makefile
diff -u pkgsrc/converters/unoconv/Makefile:1.3 pkgsrc/converters/unoconv/Makefile:1.4
--- pkgsrc/converters/unoconv/Makefile:1.3      Thu Apr 25 07:32:40 2019
+++ pkgsrc/converters/unoconv/Makefile  Sun Nov  3 17:14:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/04/25 07:32:40 maya Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 17:14:27 rillig Exp $
 
 DISTNAME=      unoconv-0.7
 PKGREVISION=   1
@@ -12,7 +12,7 @@ LICENSE=      gnu-gpl-v2
 
 USE_TOOLS+=    gmake
 
-REPLACE_PYTHON+=unoconv
+REPLACE_PYTHON+=       unoconv
 
 BUILD_DEPENDS+=        asciidoc-[0-9]*:../../textproc/asciidoc
 DEPENDS+=      libreoffice>=5.3.4.2nb1:../../misc/libreoffice

Index: pkgsrc/converters/wkhtmltopdf/Makefile
diff -u pkgsrc/converters/wkhtmltopdf/Makefile:1.7 pkgsrc/converters/wkhtmltopdf/Makefile:1.8
--- pkgsrc/converters/wkhtmltopdf/Makefile:1.7  Sun Aug 11 13:18:16 2019
+++ pkgsrc/converters/wkhtmltopdf/Makefile      Sun Nov  3 17:14:27 2019
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2019/08/11 13:18:16 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 17:14:27 rillig Exp $
 
-DISTNAME=       wkhtmltox-0.12.4
+DISTNAME=      wkhtmltox-0.12.4
 PKGNAME=       wkhtmltopdf-0.12.4
 PKGREVISION=   4
-MASTER_SITES=   ${MASTER_SITE_GITHUB:=wkhtmltopdf/}
-GITHUB_PROJECT= wkhtmltopdf
-GITHUB_RELEASE= ${PKGVERSION_NOREV}
-EXTRACT_SUFX=   .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=wkhtmltopdf/}
+GITHUB_PROJECT=        wkhtmltopdf
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
+EXTRACT_SUFX=  .tar.bz2
 
 CATEGORIES=    www print converters
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -18,7 +18,7 @@ USE_LANGUAGES+=       c c++ gnu++98
 USE_TOOLS+=    perl
 #USE_LIBTOOL=  yes
 
-BUILDLINK_TRANSFORM+=   opt:-std=gnu++11:-std=gnu++98 
+BUILDLINK_TRANSFORM+=  opt:-std=gnu++11:-std=gnu++98 
 
 SUBST_CLASSES+=                x11
 SUBST_MESSAGE.x11=     Fixing x11 options.

Index: pkgsrc/converters/xdeview/Makefile
diff -u pkgsrc/converters/xdeview/Makefile:1.46 pkgsrc/converters/xdeview/Makefile:1.47
--- pkgsrc/converters/xdeview/Makefile:1.46     Mon Mar 12 11:16:13 2018
+++ pkgsrc/converters/xdeview/Makefile  Sun Nov  3 17:14:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2018/03/12 11:16:13 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2019/11/03 17:14:27 rillig Exp $
 
 DISTNAME=      uudeview-0.5.20
 PKGNAME=       xdeview-0.5.20
@@ -10,10 +10,10 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.fpx.de/fp/Software/UUDeview/
 COMMENT=       X11 program for uu/xx/Base64/BinHex de-/encoding
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-tcl=${LOCALBASE:Q}
 CONFIGURE_ARGS+=       --enable-tk=${LOCALBASE:Q}
-LDFLAGS+=      -s -lX11
+LDFLAGS+=              -s -lX11
 
 BUILD_TARGET=  xdeview
 INSTALL_TARGET=        install-tcl

Prev by Date: CVS commit: pkgsrc/multimedia
Next by Date: CVS commit: pkgsrc/lang/erlang
Previous by Thread: CVS commit: pkgsrc/multimedia
Next by Thread: CVS commit: pkgsrc/lang/erlang
Indexes:

Home | Main Index | Thread Index | Old Index