pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers archivers: align variable assignments
details: https://anonhg.NetBSD.org/pkgsrc/rev/8383a45dc803
branches: trunk
changeset: 403890:8383a45dc803
user: rillig <rillig%pkgsrc.org@localhost>
date: Sat Nov 02 22:54:25 2019 +0000
description:
archivers: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
diffstat:
archivers/bsdtar/Makefile | 14 +++++++-------
archivers/bzip2/builtin.mk | 8 ++++----
archivers/dar/Makefile | 4 ++--
archivers/fastjar/Makefile | 4 ++--
archivers/lha/Makefile | 16 ++++++++--------
archivers/libarchive/builtin.mk | 8 ++++----
archivers/libcomprex/Makefile | 16 ++++++++--------
archivers/libunrar/buildlink3.mk | 4 ++--
archivers/nulib2/Makefile | 4 ++--
archivers/ocaml-bz2/Makefile | 8 ++++----
archivers/ocaml-decompress/buildlink3.mk | 4 ++--
archivers/ocaml-zip/Makefile | 8 ++++----
archivers/pax/Makefile | 4 ++--
archivers/py-czipfile/Makefile | 4 ++--
archivers/rox-archive/Makefile | 4 ++--
archivers/rzip/Makefile | 4 ++--
archivers/sarab/Makefile | 8 ++++----
archivers/szip/Makefile | 4 ++--
archivers/torrentzip/Makefile | 6 +++---
archivers/unace-bin/Makefile | 4 ++--
archivers/unace/Makefile | 4 ++--
archivers/unarj/Makefile | 8 ++++----
archivers/upx/Makefile | 16 ++++++++--------
archivers/xbin/Makefile | 12 ++++++------
archivers/xz/builtin.mk | 24 ++++++++++++------------
archivers/zutils/Makefile | 12 ++++++------
archivers/zziplib/Makefile | 4 ++--
27 files changed, 108 insertions(+), 108 deletions(-)
diffs (truncated from 667 to 300 lines):
diff -r 756bc91abba8 -r 8383a45dc803 archivers/bsdtar/Makefile
--- a/archivers/bsdtar/Makefile Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/bsdtar/Makefile Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/02/13 12:50:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/02 22:54:25 rillig Exp $
.include "../../archivers/libarchive/Makefile.common"
.include "../../mk/bsd.prefs.mk"
@@ -8,7 +8,7 @@
# Explicitly do not depend on libtool as this can be used
# as bootstrap dependency.
-#USE_LIBTOOL= yes
+#USE_LIBTOOL= yes
CONFIGURE_ARGS+= --enable-bsdtar=static
CONFIGURE_ARGS+= --disable-bsdcpio
CONFIGURE_ARGS+= --disable-shared
@@ -24,17 +24,17 @@
CHECK_BUILTIN.openssl:= no
.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
-CPPFLAGS+= -I${WRKDIR}/bzip2
-LDFLAGS+= -L${WRKDIR}/bzip2
+CPPFLAGS+= -I${WRKDIR}/bzip2
+LDFLAGS+= -L${WRKDIR}/bzip2
.endif
.if empty(USE_BUILTIN.zlib:M[yY][eE][sS])
-CPPFLAGS+= -I${WRKDIR}/zlib
-LDFLAGS+= -L${WRKDIR}/zlib
+CPPFLAGS+= -I${WRKDIR}/zlib
+LDFLAGS+= -L${WRKDIR}/zlib
.endif
.if empty(USE_BUILTIN.openssl:M[yY][eE][sS])
CONFIGURE_ARGS+= --without-openssl
.else
-LDFLAGS+= -lcrypto
+LDFLAGS+= -lcrypto
.endif
.if empty(USE_BUILTIN.xz:M[yY][eE][sS])
CONFIGURE_ARGS+= --without-lzma
diff -r 756bc91abba8 -r 8383a45dc803 archivers/bzip2/builtin.mk
--- a/archivers/bzip2/builtin.mk Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/bzip2/builtin.mk Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2013/11/23 10:51:09 obache Exp $
+# $NetBSD: builtin.mk,v 1.10 2019/11/02 22:54:26 rillig Exp $
BUILTIN_PKG:= bzip2
@@ -18,7 +18,7 @@
IS_BUILTIN.bzip2= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.bzip2
+MAKEVARS+= IS_BUILTIN.bzip2
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -43,7 +43,7 @@
BUILTIN_PKG.bzip2= bzip2-${BUILTIN_VERSION.bzip2}
.endif
-MAKEVARS+= BUILTIN_PKG.bzip2
+MAKEVARS+= BUILTIN_PKG.bzip2
###
### Determine whether we should use the built-in implementation if it
@@ -80,7 +80,7 @@
. endfor
. endif # PREFER.bzip2
.endif
-MAKEVARS+= USE_BUILTIN.bzip2
+MAKEVARS+= USE_BUILTIN.bzip2
# if USE_BZIP2 is defined, then force the use of a true bzip2
# implementation.
diff -r 756bc91abba8 -r 8383a45dc803 archivers/dar/Makefile
--- a/archivers/dar/Makefile Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/dar/Makefile Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2019/07/06 16:29:10 bsiegert Exp $
+# $NetBSD: Makefile,v 1.56 2019/11/02 22:54:26 rillig Exp $
DISTNAME= dar-2.4.13
PKGREVISION= 1
@@ -35,7 +35,7 @@
## Our threading check here is the same as the one used in devel/perl5.
#
CHECK_BUILTIN.pthread:=yes
-. include "../../mk/pthread.builtin.mk"
+.include "../../mk/pthread.builtin.mk"
CHECK_BUILTIN.pthread:=no
## XXX I'm following the USE_FEATURES semantics used in security/openssl.
diff -r 756bc91abba8 -r 8383a45dc803 archivers/fastjar/Makefile
--- a/archivers/fastjar/Makefile Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/fastjar/Makefile Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/09/18 11:17:41 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/02 22:54:26 rillig Exp $
DISTNAME= fastjar-0.98
PKGREVISION= 1
@@ -12,7 +12,7 @@
GNU_CONFIGURE= YES
-INFO_FILES= YES
+INFO_FILES= YES
INSTALLATION_DIRS= ${PKGMANDIR}/man1
post-install:
diff -r 756bc91abba8 -r 8383a45dc803 archivers/lha/Makefile
--- a/archivers/lha/Makefile Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/lha/Makefile Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2016/02/25 09:28:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.41 2019/11/02 22:54:26 rillig Exp $
DISTNAME= lha-114i
PKGNAME= lha-114.9
@@ -11,18 +11,18 @@
COMMENT= Archive files using LZW compression (.lzh files)
LICENSE= lha-license
-RESTRICTED= Other than for-free distribution of the unmodified source \
+RESTRICTED= Other than for-free distribution of the unmodified source \
over a network, redistribution terms are complex.
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
MAKE_FLAGS+= MAKE=${MAKE_PROGRAM:Q}
-OPSYSVARS+= LHA_CPPFLAGS
-LHA_CPPFLAGS= -DSYSTIME_HAS_NO_TM -DMKTIME -DUSESTRCASECMP -DSYSV_SYSTEM_DIR
+OPSYSVARS+= LHA_CPPFLAGS
+LHA_CPPFLAGS= -DSYSTIME_HAS_NO_TM -DMKTIME -DUSESTRCASECMP -DSYSV_SYSTEM_DIR
LHA_CPPFLAGS.Darwin+= -DHAVE_NO_LCHOWN
-MAKE_FLAGS+= MACHINE=${LHA_CPPFLAGS:Q}
+MAKE_FLAGS+= MACHINE=${LHA_CPPFLAGS:Q}
INSTALLATION_DIRS= bin ${PKGMANDIR}/ja_JP.EUC/man1
diff -r 756bc91abba8 -r 8383a45dc803 archivers/libarchive/builtin.mk
--- a/archivers/libarchive/builtin.mk Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/libarchive/builtin.mk Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2019/04/10 08:24:03 adam Exp $
+# $NetBSD: builtin.mk,v 1.11 2019/11/02 22:54:26 rillig Exp $
BUILTIN_PKG:= libarchive
@@ -17,7 +17,7 @@
IS_BUILTIN.libarchive= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libarchive
+MAKEVARS+= IS_BUILTIN.libarchive
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -60,7 +60,7 @@
IS_BUILTIN.libarchive= no
. endif
.endif
-MAKEVARS+= BUILTIN_PKG.libarchive
+MAKEVARS+= BUILTIN_PKG.libarchive
###
### Determine whether we should use the built-in implementation if it
@@ -87,7 +87,7 @@
. endif
. endif # PREFER.libarchive
.endif
-MAKEVARS+= USE_BUILTIN.libarchive
+MAKEVARS+= USE_BUILTIN.libarchive
###
### The section below only applies if we are not including this file
diff -r 756bc91abba8 -r 8383a45dc803 archivers/libcomprex/Makefile
--- a/archivers/libcomprex/Makefile Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/libcomprex/Makefile Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/08/22 12:22:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/02 22:54:26 rillig Exp $
DISTNAME= libcomprex-0.3.3
PKGREVISION= 20
@@ -9,14 +9,14 @@
HOMEPAGE= http://gnupdate.sourceforge.net/components/libcomprex/index.xml
COMMENT= Library to handle (de)compression of files
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
-USE_PKGLOCALEDIR= yes
-PKGCONFIG_OVERRIDE= libcomprex.pc.in
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+USE_PKGLOCALEDIR= yes
+PKGCONFIG_OVERRIDE= libcomprex.pc.in
+GNU_CONFIGURE= yes
BROKEN_GETTEXT_DETECTION= yes
-CONFIGURE_ENV+= ac_cv_lib_curl_curl_formparse=yes
-REPLACE_SH= comprex-config.in
+CONFIGURE_ENV+= ac_cv_lib_curl_curl_formparse=yes
+REPLACE_SH= comprex-config.in
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff -r 756bc91abba8 -r 8383a45dc803 archivers/libunrar/buildlink3.mk
--- a/archivers/libunrar/buildlink3.mk Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/libunrar/buildlink3.mk Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/12/14 16:02:55 bsiegert Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/02 22:54:26 rillig Exp $
BUILDLINK_TREE+= libunrar
@@ -6,7 +6,7 @@
LIBUNRAR_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libunrar+= libunrar>=5.6.8
-BUILDLINK_PKGSRCDIR.libunrar?= ../../archivers/libunrar
+BUILDLINK_PKGSRCDIR.libunrar?= ../../archivers/libunrar
.endif # LIBUNRAR_BUILDLINK3_MK
BUILDLINK_TREE+= -libunrar
diff -r 756bc91abba8 -r 8383a45dc803 archivers/nulib2/Makefile
--- a/archivers/nulib2/Makefile Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/nulib2/Makefile Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/01/23 05:15:22 zafer Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/02 22:54:26 rillig Exp $
#
DISTNAME= nulibdist-220
@@ -19,7 +19,7 @@
.include "../../mk/bsd.prefs.mk"
-CONFIGURE_ARGS+=--cache-file=${WRKDIR}/config.cache
+CONFIGURE_ARGS+= --cache-file=${WRKDIR}/config.cache
CFLAGS+= -D__unix__
diff -r 756bc91abba8 -r 8383a45dc803 archivers/ocaml-bz2/Makefile
--- a/archivers/ocaml-bz2/Makefile Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/ocaml-bz2/Makefile Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/11/12 16:10:17 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 22:54:26 rillig Exp $
PKGNAME= ocaml-bz2-${VERSION}
DISTNAME= camlbz2-${VERSION}
@@ -12,9 +12,9 @@
HOMEPAGE= http://camlbz2.forge.ocamlcore.org/
LICENSE= gnu-lgpl-v2.1
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-MAKE_JOBS_SAFE= no
+GNU_CONFIGURE= yes
+USE_TOOLS+= gmake
+MAKE_JOBS_SAFE= no
OCAML_USE_FINDLIB= yes
.include "../../mk/ocaml.mk"
diff -r 756bc91abba8 -r 8383a45dc803 archivers/ocaml-decompress/buildlink3.mk
--- a/archivers/ocaml-decompress/buildlink3.mk Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/ocaml-decompress/buildlink3.mk Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/03/12 18:00:02 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/02 22:54:27 rillig Exp $
BUILDLINK_TREE+= ocaml-decompress
@@ -6,7 +6,7 @@
OCAML_DECOMPRESS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-decompress+= ocaml-decompress>=0.8.1
-BUILDLINK_PKGSRCDIR.ocaml-decompress?= ../../archivers/ocaml-decompress
+BUILDLINK_PKGSRCDIR.ocaml-decompress?= ../../archivers/ocaml-decompress
.endif # OCAML_DECOMPRESS_BUILDLINK3_MK
diff -r 756bc91abba8 -r 8383a45dc803 archivers/ocaml-zip/Makefile
--- a/archivers/ocaml-zip/Makefile Sat Nov 02 22:49:23 2019 +0000
+++ b/archivers/ocaml-zip/Makefile Sat Nov 02 22:54:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2018/11/12 16:10:17 jaapb Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/02 22:54:27 rillig Exp $
#
VERSION= 1.07
Home |
Main Index |
Thread Index |
Old Index