pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
all: fix alignment of variable values
Module Name: pkgsrc-wip
Committed By: Roland Illig <roland.illig%gmx.de@localhost>
Pushed By: rillig
Date: Fri Feb 14 21:48:27 2020 +0100
Changeset: 7dd5b367631252c31b7a26d24be0e80b5a48f766
Modified Files:
arm-trusted-firmware-sun50i_a64-crust/Makefile
bluez-alsa/Makefile
bluez/Makefile
bluez/buildlink3.mk
compat32_expat/builtin.mk
compat32_fontconfig/Makefile
compat32_fontconfig/builtin.mk
compat32_freetype2/builtin.mk
compat32_libgcrypt/Makefile
compat32_libuuid/Makefile.common
compat32_libuuid/buildlink3.mk
compat32_libuuid/builtin.mk
compat32_libxslt/Makefile
compat32_libxslt/Makefile.common
compat32_libxslt/buildlink3.mk
compat32_mit-krb5/builtin.mk
compat32_png/hacks.mk
compat32_tiff/Makefile
dlt-daemon/Makefile
double-conversion/buildlink3.mk
eureka-devel/Makefile
findcrcs/Makefile
firefox69-2019Q4/Makefile
firefox69-2019Q4/mozilla-common.mk
gcc42/buildlink3.mk
gcc43/buildlink3.mk
ghc68/Makefile
go-gospel/buildlink3.mk
inn/options.mk
kea/Makefile
libdrm-dfbsd/builtin.mk
libdxfrw/buildlink3.mk
libevdev/Makefile
libevdev/buildlink3.mk
libinput/buildlink3.mk
libopenshot-audio/Makefile
libudev/Makefile
libudev/Makefile.common
libudev/buildlink3.mk
libxml++3/buildlink3.mk
lua-mpack/Makefile
merkaartor/Makefile
modular-xorg-server-dfbsd/Makefile
modular-xorg-server-dfbsd/options.mk
mtdev/Makefile
mtdev/buildlink3.mk
ncbi-blast+/Makefile
netkit-telnet/Makefile
nix/Makefile
nudoku/Makefile
oneko/Makefile
pack/Makefile
parole/Makefile
plplot/Makefile
powwow/Makefile
py-aiohttp-socks/Makefile
py-captcha/Makefile
py-carbon/Makefile
py-carbon/options.mk
py-graphite-web/Makefile
py-homeassistant/Makefile
py-influxdb/Makefile
py-mapcode/Makefile
py-mido/Makefile
py-weewx/Makefile
sara/Makefile
sbc/Makefile
sbc/buildlink3.mk
self-git/Makefile
slideml/Makefile
softether/Makefile
suitesparse/Makefile
trigger-rally/Makefile
u-boot-pinebook-crust/Makefile
udev/Makefile
uhd-git/Makefile
vulkan-loader/Makefile
wayland-protocols/buildlink3.mk
wolf4SDL/Makefile
workrave/Makefile
xnedit/Makefile
zodiac/Makefile
zoneminder/Makefile
Log Message:
all: fix alignment of variable values
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7dd5b367631252c31b7a26d24be0e80b5a48f766
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
arm-trusted-firmware-sun50i_a64-crust/Makefile | 2 +-
bluez-alsa/Makefile | 4 +-
bluez/Makefile | 8 +-
bluez/buildlink3.mk | 8 +-
compat32_expat/builtin.mk | 6 +-
compat32_fontconfig/Makefile | 3 +-
compat32_fontconfig/builtin.mk | 6 +-
compat32_freetype2/builtin.mk | 18 +--
compat32_libgcrypt/Makefile | 10 +-
compat32_libuuid/Makefile.common | 4 +-
compat32_libuuid/buildlink3.mk | 6 +-
compat32_libuuid/builtin.mk | 10 +-
compat32_libxslt/Makefile | 2 +-
compat32_libxslt/Makefile.common | 4 +-
compat32_libxslt/buildlink3.mk | 4 +-
compat32_mit-krb5/builtin.mk | 8 +-
compat32_png/hacks.mk | 2 +-
compat32_tiff/Makefile | 2 +-
dlt-daemon/Makefile | 10 +-
double-conversion/buildlink3.mk | 2 +-
eureka-devel/Makefile | 8 +-
findcrcs/Makefile | 6 +-
firefox69-2019Q4/Makefile | 10 +-
firefox69-2019Q4/mozilla-common.mk | 22 ++--
gcc42/buildlink3.mk | 2 +-
gcc43/buildlink3.mk | 2 +-
ghc68/Makefile | 8 +-
go-gospel/buildlink3.mk | 12 +-
inn/options.mk | 2 +-
kea/Makefile | 10 +-
libdrm-dfbsd/builtin.mk | 2 +-
libdxfrw/buildlink3.mk | 2 +-
libevdev/Makefile | 4 +-
libevdev/buildlink3.mk | 8 +-
libinput/buildlink3.mk | 8 +-
libopenshot-audio/Makefile | 8 +-
libudev/Makefile | 2 +-
libudev/Makefile.common | 6 +-
libudev/buildlink3.mk | 8 +-
libxml++3/buildlink3.mk | 2 +-
lua-mpack/Makefile | 2 +-
merkaartor/Makefile | 2 +-
modular-xorg-server-dfbsd/Makefile | 6 +-
modular-xorg-server-dfbsd/options.mk | 62 +++++-----
mtdev/Makefile | 2 +-
mtdev/buildlink3.mk | 8 +-
ncbi-blast+/Makefile | 14 +--
netkit-telnet/Makefile | 2 +-
nix/Makefile | 14 +--
nudoku/Makefile | 12 +-
oneko/Makefile | 6 +-
pack/Makefile | 154 ++++++++++++-------------
parole/Makefile | 16 +--
plplot/Makefile | 2 +-
powwow/Makefile | 2 +-
py-aiohttp-socks/Makefile | 2 +-
py-captcha/Makefile | 2 +-
py-carbon/Makefile | 24 ++--
py-carbon/options.mk | 4 +-
py-graphite-web/Makefile | 8 +-
py-homeassistant/Makefile | 2 +-
py-influxdb/Makefile | 16 +--
py-mapcode/Makefile | 8 +-
py-mido/Makefile | 4 +-
py-weewx/Makefile | 10 +-
sara/Makefile | 6 +-
sbc/Makefile | 4 +-
sbc/buildlink3.mk | 8 +-
self-git/Makefile | 8 +-
slideml/Makefile | 4 +-
softether/Makefile | 18 +--
suitesparse/Makefile | 4 +-
trigger-rally/Makefile | 46 ++++----
u-boot-pinebook-crust/Makefile | 4 +-
udev/Makefile | 4 +-
uhd-git/Makefile | 8 +-
vulkan-loader/Makefile | 2 +-
wayland-protocols/buildlink3.mk | 8 +-
wolf4SDL/Makefile | 20 ++--
workrave/Makefile | 2 +-
xnedit/Makefile | 18 +--
zodiac/Makefile | 2 +-
zoneminder/Makefile | 6 +-
83 files changed, 404 insertions(+), 403 deletions(-)
diffs:
diff --git a/arm-trusted-firmware-sun50i_a64-crust/Makefile b/arm-trusted-firmware-sun50i_a64-crust/Makefile
index b54197136d..bf6b4b8bbe 100644
--- a/arm-trusted-firmware-sun50i_a64-crust/Makefile
+++ b/arm-trusted-firmware-sun50i_a64-crust/Makefile
@@ -42,6 +42,6 @@ do-install:
# XXX kludge. pkgsrc passes down run path flags in LDFLAGS assuming
# gcc is used for linking, but here we call the linker directly.
-COMPILER_RPATH_FLAG=-R
+COMPILER_RPATH_FLAG= -R
.include "../../mk/bsd.pkg.mk"
diff --git a/bluez-alsa/Makefile b/bluez-alsa/Makefile
index eefc194d01..aa548b42dc 100644
--- a/bluez-alsa/Makefile
+++ b/bluez-alsa/Makefile
@@ -11,8 +11,8 @@ COMMENT= Stream audio from/to a Bluetooth device
LICENSE= mit
ONLY_FOR_PLATFORM= Linux-*-*
-USE_TOOLS+= autoconf automake pkg-config
-GNU_CONFIGURE= yes
+USE_TOOLS+= autoconf automake pkg-config
+GNU_CONFIGURE= yes
pre-configure:
cd ${WRKSRC} &&autoreconf -fiv
diff --git a/bluez/Makefile b/bluez/Makefile
index 76336b5850..4480a0b888 100644
--- a/bluez/Makefile
+++ b/bluez/Makefile
@@ -9,11 +9,11 @@ HOMEPAGE= http://www.bluez.org/
COMMENT= Bluetooth scan, pair, connect and power toggle
LICENSE= gnu-gpl-v2
-CONFLICTS= bluez-libs # v3
+CONFLICTS= bluez-libs # v3
ONLY_FOR_PLATFORM= Linux-*-*
-USE_TOOLS+= gmake pkg-config
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+USE_TOOLS+= gmake pkg-config
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-obex --disable-systemd --disable-udev
CONFIGURE_ARGS+= --disable-tools --enable-library
diff --git a/bluez/buildlink3.mk b/bluez/buildlink3.mk
index 9d2b0bbecc..c2acdf647a 100644
--- a/bluez/buildlink3.mk
+++ b/bluez/buildlink3.mk
@@ -1,15 +1,15 @@
# $NetBSD$
-BUILDLINK_TREE+= bluez
+BUILDLINK_TREE+= bluez
.if !defined(BLUEZ_BUILDLINK3_MK)
BLUEZ_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.bluez+= bluez>=5.0
-BUILDLINK_PKGSRCDIR.bluez?= ../../wip/bluez
+BUILDLINK_API_DEPENDS.bluez+= bluez>=5.0
+BUILDLINK_PKGSRCDIR.bluez?= ../../wip/bluez
.include "../../devel/glib2/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.endif # BLUEZ_BUILDLINK3_MK
-BUILDLINK_TREE+= -bluez
+BUILDLINK_TREE+= -bluez
diff --git a/compat32_expat/builtin.mk b/compat32_expat/builtin.mk
index 03362b7134..4da0fb48bb 100644
--- a/compat32_expat/builtin.mk
+++ b/compat32_expat/builtin.mk
@@ -18,7 +18,7 @@ IS_BUILTIN.expat= yes
IS_BUILTIN.expat= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.expat
+MAKEVARS+= IS_BUILTIN.expat
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -35,7 +35,7 @@ BUILTIN_VERSION.expat!= \
${H_EXPAT}
BUILTIN_PKG.expat= expat-${BUILTIN_VERSION.expat}
.endif
-MAKEVARS+= BUILTIN_PKG.expat
+MAKEVARS+= BUILTIN_PKG.expat
###
### Determine whether we should use the built-in implementation if it
@@ -62,7 +62,7 @@ USE_BUILTIN.expat!= \
. endif
. endif # PREFER.expat
.endif
-MAKEVARS+= USE_BUILTIN.expat
+MAKEVARS+= USE_BUILTIN.expat
###
### The section below only applies if we are not including this file
diff --git a/compat32_fontconfig/Makefile b/compat32_fontconfig/Makefile
index 2d00070819..d95eb67cdf 100644
--- a/compat32_fontconfig/Makefile
+++ b/compat32_fontconfig/Makefile
@@ -74,7 +74,8 @@ CONF_FILES+= ${EGDIR}/conf.d/README ${PKG_SYSCONFDIR32}/conf.d/README
TMPLDIR= ${PREFIX}/emul/netbsd32/share/fontconfig/conf.avail
MAKE_DIRS+= ${PKG_SYSCONFDIR32}/conf.d
# following list from ${WRKSRC}/conf.d/Makefile.am
-FC_STDCONF= 10-scale-bitmap-fonts.conf 10-hinting-full.conf \
+FC_STDCONF= \
+ 10-scale-bitmap-fonts.conf 10-hinting-full.conf \
10-hinting-medium.conf 10-hinting-none.conf 10-hinting-slight.conf \
20-unhint-small-vera.conf \
30-metric-aliases.conf 40-nonlatin.conf \
diff --git a/compat32_fontconfig/builtin.mk b/compat32_fontconfig/builtin.mk
index 87e41b838c..2adcf2184b 100644
--- a/compat32_fontconfig/builtin.mk
+++ b/compat32_fontconfig/builtin.mk
@@ -19,7 +19,7 @@ IS_BUILTIN.fontconfig= yes
IS_BUILTIN.fontconfig= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.fontconfig
+MAKEVARS+= IS_BUILTIN.fontconfig
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -36,7 +36,7 @@ BUILTIN_VERSION.fontconfig!= \
${H_FONTCONFIG}
BUILTIN_PKG.fontconfig= fontconfig-${BUILTIN_VERSION.fontconfig}
.endif
-MAKEVARS+= BUILTIN_PKG.fontconfig
+MAKEVARS+= BUILTIN_PKG.fontconfig
###
### Determine whether we should use the built-in implementation if it
@@ -64,7 +64,7 @@ USE_BUILTIN.fontconfig!= \
. endif
. endif # PREFER.fontconfig
.endif
-MAKEVARS+= USE_BUILTIN.fontconfig
+MAKEVARS+= USE_BUILTIN.fontconfig
###
### The section below only applies if we are not including this file
diff --git a/compat32_freetype2/builtin.mk b/compat32_freetype2/builtin.mk
index 4b9ce9e6da..42c068fd1b 100644
--- a/compat32_freetype2/builtin.mk
+++ b/compat32_freetype2/builtin.mk
@@ -40,7 +40,7 @@ BUILTIN_VERSION.freetype2!= \
${H_FREETYPE2}
BUILTIN_PKG.freetype2= freetype2-${BUILTIN_VERSION.freetype2}
.endif
-MAKEVARS+= BUILTIN_PKG.freetype2
+MAKEVARS+= BUILTIN_PKG.freetype2
###
### Determine whether we should use the built-in implementation if it
@@ -67,7 +67,7 @@ USE_BUILTIN.freetype2!= \
. endif
. endif # PREFER.freetype2
.endif
-MAKEVARS+= USE_BUILTIN.freetype2
+MAKEVARS+= USE_BUILTIN.freetype2
###
### The section below only applies if we are not including this file
@@ -85,13 +85,13 @@ BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
. if !empty(MACHINE_PLATFORM:MNetBSD-[67].*-*) && \
(("${BUILTIN_VERSION.freetype2}" == "2.4.5") || \
("${BUILTIN_VERSION.freetype2}" == "2.5.3"))
-_FT2_VER_MAP.2.5.3=17.2.11
-_FT2_VER_MAP.2.4.5=13.0.7
-SUBST_CLASSES+= fx-ft2-pc-version
-SUBST_STAGE.fx-ft2-pc-version= post-wrapper
-SUBST_MESSAGE.fx-ft2-pc-version=Fixes wrong module version in freetype2.pc
-SUBST_FILES.fx-ft2-pc-version= ${BUILDLINK_X11_DIR}/lib/pkgconfig/freetype2.pc
-SUBST_SED.fx-ft2-pc-version= -e 's|^\(Version:\).*|\1 ${_FT2_VER_MAP.${BUILTIN_VERSION.freetype2}}|'
+_FT2_VER_MAP.2.5.3= 17.2.11
+_FT2_VER_MAP.2.4.5= 13.0.7
+SUBST_CLASSES+= fx-ft2-pc-version
+SUBST_STAGE.fx-ft2-pc-version= post-wrapper
+SUBST_MESSAGE.fx-ft2-pc-version= Fixes wrong module version in freetype2.pc
+SUBST_FILES.fx-ft2-pc-version= ${BUILDLINK_X11_DIR}/lib/pkgconfig/freetype2.pc
+SUBST_SED.fx-ft2-pc-version= -e 's|^\(Version:\).*|\1 ${_FT2_VER_MAP.${BUILTIN_VERSION.freetype2}}|'
. endif
. endif
diff --git a/compat32_libgcrypt/Makefile b/compat32_libgcrypt/Makefile
index c597d6c0fb..bf91b73ea7 100644
--- a/compat32_libgcrypt/Makefile
+++ b/compat32_libgcrypt/Makefile
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.96 2018/11/02 23:08:29 adam Exp $
-DISTNAME= libgcrypt-1.8.4
-CATEGORIES= security
-MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-EXTRACT_SUFX= .tar.bz2
-ABI= 32
+DISTNAME= libgcrypt-1.8.4
+CATEGORIES= security
+MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgcrypt/
+EXTRACT_SUFX= .tar.bz2
+ABI= 32
GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/
PKGNAME= compat${ABI}_${DISTNAME}
diff --git a/compat32_libuuid/Makefile.common b/compat32_libuuid/Makefile.common
index 386614dc32..fd75705d34 100644
--- a/compat32_libuuid/Makefile.common
+++ b/compat32_libuuid/Makefile.common
@@ -33,6 +33,6 @@ TEST_TARGET= check
# XXX PR pkg/52877: configure is broken on netbsd6
.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0123456].*))
-USE_TOOLS+= ksh
-CONFIG_SHELL= ksh
+USE_TOOLS+= ksh
+CONFIG_SHELL= ksh
.endif
diff --git a/compat32_libuuid/buildlink3.mk b/compat32_libuuid/buildlink3.mk
index d52c3a20b6..22226824e6 100644
--- a/compat32_libuuid/buildlink3.mk
+++ b/compat32_libuuid/buildlink3.mk
@@ -6,9 +6,9 @@ BUILDLINK_TREE+= compat32_libuuid
COMPAT32_LIBUUID_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.compat32_libuuid+= compat32_libuuid>=2.18
-BUILDLINK_PKGSRCDIR.compat32_libuuid?= ../../wip/compat32_libuuid
-BUILDLINK_LIBDIRS.compat32_libuuid= emul/netbsd32/lib
-BUILDLINK_INCDIRS.compat32_libuuid= emul/netbsd32/include/uuid
+BUILDLINK_PKGSRCDIR.compat32_libuuid?= ../../wip/compat32_libuuid
+BUILDLINK_LIBDIRS.compat32_libuuid= emul/netbsd32/lib
+BUILDLINK_INCDIRS.compat32_libuuid= emul/netbsd32/include/uuid
.endif # COMPAT32_LIBUUID_BUILDLINK3_MK
BUILDLINK_TREE+= -compat32_libuuid
diff --git a/compat32_libuuid/builtin.mk b/compat32_libuuid/builtin.mk
index 3ed7440e35..dead329aee 100644
--- a/compat32_libuuid/builtin.mk
+++ b/compat32_libuuid/builtin.mk
@@ -22,7 +22,7 @@ IS_BUILTIN.libuuid= no
IS_BUILTIN.libuuid= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libuuid
+MAKEVARS+= IS_BUILTIN.libuuid
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -32,9 +32,9 @@ MAKEVARS+= IS_BUILTIN.libuuid
!empty(IS_BUILTIN.libuuid:M[yY][eE][sS])
. if empty(UUID_PC:M__nonexistent__)
BUILTIN_VERSION.libuuid!= ${SED} -n -e 's/Version: //p' ${UUID_PC}
-BUILTIN_PKG.libuuid= libuuid-${BUILTIN_VERSION.libuuid}
+BUILTIN_PKG.libuuid= libuuid-${BUILTIN_VERSION.libuuid}
. else
-BUILTIN_PKG.libuuid= libuuid-2.18 # whatever, as long as it is big enough
+BUILTIN_PKG.libuuid= libuuid-2.18 # whatever, as long as it is big enough
. endif
.endif
@@ -52,7 +52,7 @@ USE_BUILTIN.libuuid= ${IS_BUILTIN.libuuid}
USE_BUILTIN.libuuid= yes
. for _dep_ in ${BUILDLINK_API_DEPENDS.libuuid}
. if !empty(USE_BUILTIN.libuuid:M[yY][eE][sS])
-USE_BUILTIN.libuuid!= \
+USE_BUILTIN.libuuid!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libuuid:Q}; then \
${ECHO} yes; \
else \
@@ -63,7 +63,7 @@ USE_BUILTIN.libuuid!= \
. endif
. endif
.endif
-MAKEVARS+= USE_BUILTIN.libuuid
+MAKEVARS+= USE_BUILTIN.libuuid
###
### The section below only applies if we are not including this file
diff --git a/compat32_libxslt/Makefile b/compat32_libxslt/Makefile
index ffdc85e34b..537f1e2f39 100644
--- a/compat32_libxslt/Makefile
+++ b/compat32_libxslt/Makefile
@@ -8,7 +8,7 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
USE_LIBTOOL= yes
USE_TOOLS+= gmake perl
GNU_CONFIGURE= yes
-GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/
+GNU_CONFIGURE_PREFIX= ${PREFIX}/emul/netbsd32/
CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_PREFIX.compat32_libxml2}
CONFIGURE_ARGS+= --without-python
CONFIGURE_ARGS+= --with-html-subdir=libxslt
diff --git a/compat32_libxslt/Makefile.common b/compat32_libxslt/Makefile.common
index 62f4611595..1928cc7dbd 100644
--- a/compat32_libxslt/Makefile.common
+++ b/compat32_libxslt/Makefile.common
@@ -7,8 +7,8 @@ DISTNAME= libxslt-1.1.33
CATEGORIES= textproc
MASTER_SITES= ftp://xmlsoft.org/libxslt/
MASTER_SITES+= http://xmlsoft.org/sources/
-ABI?= 32
-PKGNAME= compat${ABI}_libxslt-1.1.33
+ABI?= 32
+PKGNAME= compat${ABI}_libxslt-1.1.33
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://xmlsoft.org/XSLT/
COMMENT= XSLT parser library from the GNOME project
diff --git a/compat32_libxslt/buildlink3.mk b/compat32_libxslt/buildlink3.mk
index 0f6f728057..bc72f4bdf8 100644
--- a/compat32_libxslt/buildlink3.mk
+++ b/compat32_libxslt/buildlink3.mk
@@ -7,8 +7,8 @@ COMPAT32_LIBXSLT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.compat32_libxslt+= compat32_libxslt>=1.1.8
BUILDLINK_ABI_DEPENDS.compat32_libxslt+= compat32_libxslt>=1.1.28nb2
-BUILDLINK_PKGSRCDIR.compat32_libxslt?= ../../wip/compat32_libxslt
-BUILDLINK.LIBDIRS.compat32_libxslt= emul/netbsd32/lib
+BUILDLINK_PKGSRCDIR.compat32_libxslt?= ../../wip/compat32_libxslt
+BUILDLINK.LIBDIRS.compat32_libxslt= emul/netbsd32/lib
.include "../../wip/compat32_libgcrypt/buildlink3.mk"
.include "../../wip/compat32_libxml2/buildlink3.mk"
diff --git a/compat32_mit-krb5/builtin.mk b/compat32_mit-krb5/builtin.mk
index c71a05ba16..9bcd095fcd 100644
--- a/compat32_mit-krb5/builtin.mk
+++ b/compat32_mit-krb5/builtin.mk
@@ -31,7 +31,7 @@ IS_BUILTIN.mit-krb5= no
IS_BUILTIN.mit-krb5= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.mit-krb5
+MAKEVARS+= IS_BUILTIN.mit-krb5
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -41,12 +41,12 @@ MAKEVARS+= IS_BUILTIN.mit-krb5
!empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS])
. if empty(SH_KRB5_CONFIG:M__nonexistent__)
BUILTIN_VERSION.mit-krb5!= ${SH_KRB5_CONFIG} --version | \
- ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//'
+ ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//'
. endif
BUILTIN_VERSION.mit-krb5?= 1.4.0
BUILTIN_PKG.mit-krb5= mit-krb5-${BUILTIN_VERSION.mit-krb5}
.endif
-MAKEVARS+= BUILTIN_PKG.mit-krb5
+MAKEVARS+= BUILTIN_PKG.mit-krb5
###
### Determine whether we should use the built-in implementation if it
@@ -73,7 +73,7 @@ USE_BUILTIN.mit-krb5!= \
. endif
. endif
.endif
-MAKEVARS+= USE_BUILTIN.mit-krb5
+MAKEVARS+= USE_BUILTIN.mit-krb5
###
### The section below only applies if we are not including this file
diff --git a/compat32_png/hacks.mk b/compat32_png/hacks.mk
index 81486c5ab6..556d5ca1bb 100644
--- a/compat32_png/hacks.mk
+++ b/compat32_png/hacks.mk
@@ -12,7 +12,7 @@ PNG_HACKS_MK= defined
# XXX: is there any good way to replace the default -O2 with multiple args?
#PKG_HACKS+= optimisation
#BUILDLINK_TRANSFORM+= opt:-O[2-9]*:-O2 -fno-ipa-sra
-CFLAGS+=-O2 -fno-ipa-sra
+CFLAGS+= -O2 -fno-ipa-sra
.endif
.endif # PNG_HACKS_MK
diff --git a/compat32_tiff/Makefile b/compat32_tiff/Makefile
index 8f47e415a4..ab7f8e24d5 100644
--- a/compat32_tiff/Makefile
+++ b/compat32_tiff/Makefile
@@ -3,7 +3,7 @@
DISTNAME= tiff-4.0.10
CATEGORIES= graphics
MASTER_SITES= https://download.osgeo.org/libtiff/
-ABI?= 32
+ABI?= 32
PKGNAME= compat${ABI}_tiff-4.0.10
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff --git a/dlt-daemon/Makefile b/dlt-daemon/Makefile
index e50f6af29a..2c2e0e565a 100644
--- a/dlt-daemon/Makefile
+++ b/dlt-daemon/Makefile
@@ -24,16 +24,16 @@ PKGCONFIG_OVERRIDE+= automotive-dlt.pc.in
ONLY_FOR_PLATFORM= Linux-*-*
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONFS= dlt.conf dlt_gateway.conf
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+CONFS= dlt.conf dlt_gateway.conf
.for f in ${CONFS}
-CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/examples/${PKGBASE}
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 share/examples/${PKGBASE}
-OWN_DIRS+= ${PKG_SYSCONFDIR}/xbps.d
+OWN_DIRS+= ${PKG_SYSCONFDIR}/xbps.d
post-install:
${MKDIR} ${DESTDIR}${EGDIR} &&\
diff --git a/double-conversion/buildlink3.mk b/double-conversion/buildlink3.mk
index 7ee793b8f3..b214eccf60 100644
--- a/double-conversion/buildlink3.mk
+++ b/double-conversion/buildlink3.mk
@@ -7,7 +7,7 @@ DOUBLE_CONVERSION_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.double-conversion+= double-conversion>=3.0.0
BUILDLINK_ABI_DEPENDS.double-conversion+= double-conversion>=3.0.0
-BUILDLINK_PKGSRCDIR.double-conversion?= ../../wip/double-conversion
+BUILDLINK_PKGSRCDIR.double-conversion?= ../../wip/double-conversion
.endif # DOUBLE_CONVERSION_BUILDLINK3_MK
diff --git a/eureka-devel/Makefile b/eureka-devel/Makefile
index 7ac1eccccf..077894f13c 100644
--- a/eureka-devel/Makefile
+++ b/eureka-devel/Makefile
@@ -1,8 +1,8 @@
# $NetBSD$
-GIT_REVISION= 8f033a12dcb8a93919734f98d2a6540ae2d05fa8
-PKGNAME= eureka-devel-0
-GIT_REPO= https://git.code.sf.net/p/eureka-editor/git
+GIT_REVISION= 8f033a12dcb8a93919734f98d2a6540ae2d05fa8
+PKGNAME= eureka-devel-0
+GIT_REPO= https://git.code.sf.net/p/eureka-editor/git
#GIT_EXTRACTDIR= eureka-124-source
#DISTNAME= eureka-124-source
@@ -19,7 +19,7 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= c++03
USE_TOOLS+= gmake
-#WRKSRC= ${WRKDIR}/eureka-1.24-source
+#WRKSRC= ${WRKDIR}/eureka-1.24-source
WRKSRC= ${WRKDIR}/git
# DOOMWADDIR is intentionally shared with other Doom packages
diff --git a/findcrcs/Makefile b/findcrcs/Makefile
index 8cf6298c17..fb98662474 100644
--- a/findcrcs/Makefile
+++ b/findcrcs/Makefile
@@ -10,9 +10,9 @@ HOMEPAGE= https://github.com/claunia/findcrcs/
COMMENT= Find and extract pieces of data by CRC, size and MD5
LICENSE= gnu-gpl-v3 AND apache-2.0
-USE_TOOLS+= gmake
-USE_LANGUAGES= c++
-TEST_TARGET= test
+USE_TOOLS+= gmake
+USE_LANGUAGES= c++
+TEST_TARGET= test
INSTALLATION_DIRS= bin share/doc/findcrcs
do-install:
diff --git a/firefox69-2019Q4/Makefile b/firefox69-2019Q4/Makefile
index 270a2deeb2..b67c5e223e 100644
--- a/firefox69-2019Q4/Makefile
+++ b/firefox69-2019Q4/Makefile
@@ -52,12 +52,12 @@ SUBST_FILES.dfly_malloc_h+= media/ffvpx/libavutil/mem.c
.include "mozilla-common.mk"
.include "options.mk"
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+= lib/firefox-sdk/sdk/bin/xpt.py
-CHECK_WRKREF_SKIP+=lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+= lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
MOZILLA= ${PKGBASE}
MOZILLA_ICON= ${WRKSRC}/${OBJDIR}/dist/${MOZILLA}/browser/chrome/icons/default/default48.png
diff --git a/firefox69-2019Q4/mozilla-common.mk b/firefox69-2019Q4/mozilla-common.mk
index b187adcc25..bdf7c0252f 100644
--- a/firefox69-2019Q4/mozilla-common.mk
+++ b/firefox69-2019Q4/mozilla-common.mk
@@ -10,11 +10,11 @@
PYTHON_VERSIONS_ACCEPTED= 27
PYTHON_FOR_BUILD_ONLY= tool
.if !empty(PYTHON_VERSION_DEFAULT:M37) || !empty(PYTHON_VERSION_DEFAULT:M36)
-TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
-ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
+TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
+ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
.else
-TOOL_DEPENDS+= python37-[0-9]*:../../lang/python37
-ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python3.7
+TOOL_DEPENDS+= python37-[0-9]*:../../lang/python37
+ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python3.7
.endif
HAS_CONFIGURE= yes
@@ -60,13 +60,13 @@ CXXFLAGS+= -mstackrealign
CXXFLAGS+= -D__HAVE_INLINE___ISINF
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
-CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
-#CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}modules/pdfium/update.sh
+CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
+CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
+CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh
+CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}intl/icu/source/configure
+CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
+CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
+#CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}modules/pdfium/update.sh
CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
CONFIGURE_ARGS+= --enable-release
diff --git a/gcc42/buildlink3.mk b/gcc42/buildlink3.mk
index dfb7b6a9e2..d4cd4aec7d 100644
--- a/gcc42/buildlink3.mk
+++ b/gcc42/buildlink3.mk
@@ -26,7 +26,7 @@ BUILDLINK_INCDIRS.gcc42+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc42}\//
. endif
.endif
-BUILDLINK_FILES_CMD.gcc42= \
+BUILDLINK_FILES_CMD.gcc42= \
(cd ${BUILDLINK_PREFIX.gcc42} && \
${FIND} bin libexec lib \( -type f -o -type l \) -print)
BUILDLINK_FNAME_TRANSFORM.gcc42= -e s:\buildlink:buildlink/gcc42:
diff --git a/gcc43/buildlink3.mk b/gcc43/buildlink3.mk
index c61ec46a45..c60800d0c1 100644
--- a/gcc43/buildlink3.mk
+++ b/gcc43/buildlink3.mk
@@ -26,7 +26,7 @@ BUILDLINK_INCDIRS.gcc43+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc43}\//
. endif
.endif
-BUILDLINK_FILES_CMD.gcc43= \
+BUILDLINK_FILES_CMD.gcc43= \
(cd ${BUILDLINK_PREFIX.gcc43} && \
${FIND} bin libexec lib \( -type f -o -type l \) -print)
BUILDLINK_FNAME_TRANSFORM.gcc43= -e s:\buildlink:buildlink/gcc43:
diff --git a/ghc68/Makefile b/ghc68/Makefile
index cb96199ab5..00f52c84d9 100644
--- a/ghc68/Makefile
+++ b/ghc68/Makefile
@@ -13,11 +13,11 @@ OWNER= kristerw%NetBSD.org@localhost
HOMEPAGE= https://www.haskell.org/ghc/
COMMENT= Compiler for the functional language Haskell
-SITES.ghc-6.4.2-src.tar.bz2=http://www.haskell.org/ghc/dist/6.4.2/
-SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz=${MASTER_SITE_LOCAL}
+SITES.ghc-6.4.2-src.tar.bz2= http://www.haskell.org/ghc/dist/6.4.2/
+SITES.ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz= ${MASTER_SITE_LOCAL}
# There is only an i386 bootstrap kit available.
-ONLY_FOR_PLATFORM= Darwin-*-i386 FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 SunOS-*-i386
+ONLY_FOR_PLATFORM= Darwin-*-i386 FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 SunOS-*-i386
CHECK_PORTABILITY_SKIP= distrib/prep-bin-dist-mingw
@@ -35,7 +35,7 @@ SUBST_STAGE.prefix= pre-configure
SUBST_FILES.prefix+= ../ghc-6.4.2/mk/bootstrap.mk
SUBST_FILES.prefix+= ../ghc-6.4.2/ghc/rts/package.conf.in
SUBST_FILES.prefix+= ../ghc-6.4.2/ghc/includes/Makefile
-SUBST_FILES.prefix+= ghc/includes/Makefile
+SUBST_FILES.prefix+= ghc/includes/Makefile
SUBST_FILES.prefix+= ../ghc-6.4.2/libraries/readline/package.conf.in
SUBST_FILES.prefix+= libraries/readline/configure
SUBST_FILES.prefix+= libraries/readline/readline.cabal
diff --git a/go-gospel/buildlink3.mk b/go-gospel/buildlink3.mk
index dc55e8c87d..9b96fdac79 100644
--- a/go-gospel/buildlink3.mk
+++ b/go-gospel/buildlink3.mk
@@ -1,18 +1,18 @@
# $NetBSD$
-BUILDLINK_TREE+= go-gospel
+BUILDLINK_TREE+= go-gospel
.if !defined(GO_GOSPEL_BUILDLINK3_MK)
GO_GOSPEL_BUILDLINK3_MK:=
-BUILDLINK_CONTENTS_FILTER.go-gospel= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-gospel?= build
+BUILDLINK_CONTENTS_FILTER.go-gospel= ${EGREP} gopkg/
+BUILDLINK_DEPMETHOD.go-gospel?= build
-BUILDLINK_API_DEPENDS.go-gospel+= go-gospel>=0.0.20190922
-BUILDLINK_PKGSRCDIR.go-gospel?= ../../wip/go-gospel
+BUILDLINK_API_DEPENDS.go-gospel+= go-gospel>=0.0.20190922
+BUILDLINK_PKGSRCDIR.go-gospel?= ../../wip/go-gospel
.include "../../security/go-crypto/buildlink3.mk"
.include "../../textproc/go-text/buildlink3.mk"
.endif # GO_GOSPEL_BUILDLINK3_MK
-BUILDLINK_TREE+= -go-gospel
+BUILDLINK_TREE+= -go-gospel
diff --git a/inn/options.mk b/inn/options.mk
index 97dd7dcb24..abb050729d 100644
--- a/inn/options.mk
+++ b/inn/options.mk
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --enable-ipv6
###
.if !empty(PKG_OPTIONS:Muucp)
CONFIGURE_ARGS+= --enable-uucp-rnews
-PKG_GROUPS+= uucp
+PKG_GROUPS+= uucp
.else
CONFIGURE_ARGS+= --disable-uucp-rnews
.endif
diff --git a/kea/Makefile b/kea/Makefile
index bdc84305a7..995a3afc27 100644
--- a/kea/Makefile
+++ b/kea/Makefile
@@ -17,11 +17,11 @@ USE_LIBTOOL= yes
USE_LANGUAGES= c c++
USE_TOOLS= autoconf automake bison flex
-CONFIGURE_ARGS+=--with-openssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=--enable-shell
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=--enable-generate-parser
+CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+= --enable-shell
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
+CONFIGURE_ARGS+= --enable-generate-parser
PY_PATCHPLIST= yes
diff --git a/libdrm-dfbsd/builtin.mk b/libdrm-dfbsd/builtin.mk
index ffe2489949..f1ee32ffef 100644
--- a/libdrm-dfbsd/builtin.mk
+++ b/libdrm-dfbsd/builtin.mk
@@ -1,6 +1,6 @@
# $NetBSD: builtin.mk,v 1.4 2018/06/01 15:05:43 maya Exp $
-BUILTIN_PKG:= libdrm
+BUILTIN_PKG:= libdrm
.for pcfile in libdrm libdrm_amdgpu libdrm_intel libdrm_nouveau libdrm_radeon
PKGCONFIG_FILE.libdrm+= ${X11BASE}/lib/pkgconfig/${pcfile}.pc
PKGCONFIG_FILE.libdrm+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/${pcfile}.pc
diff --git a/libdxfrw/buildlink3.mk b/libdxfrw/buildlink3.mk
index 7571eae45b..938050b1a0 100644
--- a/libdxfrw/buildlink3.mk
+++ b/libdxfrw/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libdxfrw
LIBDXFRW_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libdxfrw+= libdxfrw>=0.5.12
-BUILDLINK_PKGSRCDIR.libdxfrw?= ../../wip/libdxfrw
+BUILDLINK_PKGSRCDIR.libdxfrw?= ../../wip/libdxfrw
.endif # LIBDXFRW_BUILDLINK3_MK
BUILDLINK_TREE+= -libdxfrw
diff --git a/libevdev/Makefile b/libevdev/Makefile
index b873ccc2bd..3ed4bc82b6 100644
--- a/libevdev/Makefile
+++ b/libevdev/Makefile
@@ -11,7 +11,7 @@ COMMENT= Keyboard and mouse events, capability bits
LICENSE= mit
ONLY_FOR_PLATFORM= Linux-*-*
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
+USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/libevdev/buildlink3.mk b/libevdev/buildlink3.mk
index ad23116fe6..57736f274a 100644
--- a/libevdev/buildlink3.mk
+++ b/libevdev/buildlink3.mk
@@ -1,12 +1,12 @@
# $NetBSD$
-BUILDLINK_TREE+= libevdev
+BUILDLINK_TREE+= libevdev
.if !defined(LIBEVDEV_BUILDLINK3_MK)
LIBEVDEV_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libevdev+= libevdev>=1.8.0
-BUILDLINK_PKGSRCDIR.libevdev?= ../../wip/libevdev
+BUILDLINK_API_DEPENDS.libevdev+= libevdev>=1.8.0
+BUILDLINK_PKGSRCDIR.libevdev?= ../../wip/libevdev
.endif # LIBEVDEV_BUILDLINK3_MK
-BUILDLINK_TREE+= -libevdev
+BUILDLINK_TREE+= -libevdev
diff --git a/libinput/buildlink3.mk b/libinput/buildlink3.mk
index 6bfffc8789..abae402705 100644
--- a/libinput/buildlink3.mk
+++ b/libinput/buildlink3.mk
@@ -1,16 +1,16 @@
# $NetBSD$
-BUILDLINK_TREE+= libinput
+BUILDLINK_TREE+= libinput
.if !defined(LIBINPUT_BUILDLINK3_MK)
LIBINPUT_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libinput+= libinput>=0.8.0
-BUILDLINK_PKGSRCDIR.libinput?= ../../wip/libinput
+BUILDLINK_API_DEPENDS.libinput+= libinput>=0.8.0
+BUILDLINK_PKGSRCDIR.libinput?= ../../wip/libinput
.include "../../wip/libevdev/buildlink3.mk"
.include "../../wip/libudev/buildlink3.mk"
.include "../../wip/mtdev/buildlink3.mk"
.endif # LIBINPUT_BUILDLINK3_MK
-BUILDLINK_TREE+= -libinput
+BUILDLINK_TREE+= -libinput
diff --git a/libopenshot-audio/Makefile b/libopenshot-audio/Makefile
index 14e7a6d294..51a767f570 100644
--- a/libopenshot-audio/Makefile
+++ b/libopenshot-audio/Makefile
@@ -1,9 +1,9 @@
# $NetBSD$
-DISTNAME= libopenshot-audio-0.1.8
-CATEGORIES= devel audio
-MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenShot/}
-GITHUB_TAG= v${PKGVERSION_NOREV}
+DISTNAME= libopenshot-audio-0.1.8
+CATEGORIES= devel audio
+MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenShot/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= root%zta.lk@localhost
HOMEPAGE= https://github.com/OpenShot/libopenshot-audio/
diff --git a/libudev/Makefile b/libudev/Makefile
index 3ec3f322ce..6a6662df2d 100644
--- a/libudev/Makefile
+++ b/libudev/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-COMMENT= Device enumeration and database of constants
+COMMENT= Device enumeration and database of constants
CONFIGURE_ARGS+= --disable-programs
pre-configure:
diff --git a/libudev/Makefile.common b/libudev/Makefile.common
index 29417851c8..fdd0027d89 100644
--- a/libudev/Makefile.common
+++ b/libudev/Makefile.common
@@ -14,9 +14,9 @@ HOMEPAGE= https://wiki.gentoo.org/wiki/Project:Eudev
LICENSE= gnu-gpl-v2
ONLY_FOR_PLATFORM= Linux-*-*
-USE_TOOLS+= autoconf automake gmake pkg-config
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+USE_TOOLS+= autoconf automake gmake pkg-config
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-rootrundir=${VARBASE}/run
.include "../../mk/bsd.pkg.mk"
diff --git a/libudev/buildlink3.mk b/libudev/buildlink3.mk
index 458aae70b3..ffaacd69c4 100644
--- a/libudev/buildlink3.mk
+++ b/libudev/buildlink3.mk
@@ -1,12 +1,12 @@
# $NetBSD$
-BUILDLINK_TREE+= libudev
+BUILDLINK_TREE+= libudev
.if !defined(LIBUDEV_BUILDLINK3_MK)
LIBUDEV_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libudev+= libudev>=228
-BUILDLINK_PKGSRCDIR.libudev?= ../../wip/libudev
+BUILDLINK_API_DEPENDS.libudev+= libudev>=228
+BUILDLINK_PKGSRCDIR.libudev?= ../../wip/libudev
.endif # LIBUDEV_BUILDLINK3_MK
-BUILDLINK_TREE+= -libudev
+BUILDLINK_TREE+= -libudev
diff --git a/libxml++3/buildlink3.mk b/libxml++3/buildlink3.mk
index 59dbc5a060..8eb4aa049e 100644
--- a/libxml++3/buildlink3.mk
+++ b/libxml++3/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libxml++3
LIBXML++3_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libxml++3+= libxml++3>=3.0.1
-BUILDLINK_PKGSRCDIR.libxml++3?= ../../wip/libxml++3
+BUILDLINK_PKGSRCDIR.libxml++3?= ../../wip/libxml++3
# XXX
# XXX Uncomment and keep only the buildlink3 lines below which are directly
diff --git a/lua-mpack/Makefile b/lua-mpack/Makefile
index 27dd3d9672..c94cfccde2 100644
--- a/lua-mpack/Makefile
+++ b/lua-mpack/Makefile
@@ -13,7 +13,7 @@ LICENSE= mit
USE_LANGUAGES= c
INSTALLATION_DIRS+= ${LUA_CDIR}
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake pkg-config
MAKE_ENV+= DEPS_PREFIX=${PREFIX}
diff --git a/merkaartor/Makefile b/merkaartor/Makefile
index 6d031af675..b84d95629e 100644
--- a/merkaartor/Makefile
+++ b/merkaartor/Makefile
@@ -38,7 +38,7 @@ do-configure:
${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro && \
${MAKE} qmake
-CHECK_PORTABILITY_SKIP+= ci/travis-osx-install.sh
+CHECK_PORTABILITY_SKIP+= ci/travis-osx-install.sh
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../geography/gdal-lib/buildlink3.mk"
diff --git a/modular-xorg-server-dfbsd/Makefile b/modular-xorg-server-dfbsd/Makefile
index b81d996339..cbed3c40ef 100644
--- a/modular-xorg-server-dfbsd/Makefile
+++ b/modular-xorg-server-dfbsd/Makefile
@@ -22,10 +22,10 @@ CONFIGURE_ARGS+= --enable-xorg
CONFIGURE_ARGS+= --disable-xephyr
CONFIGURE_ARGS+= --disable-kdrive
CONFIGURE_ARGS.SunOS+= --disable-input-thread
-MESON_ARGS+= -Dxorg=true
-MESON_ARGS+= -Dxephyr=false
+MESON_ARGS+= -Dxorg=true
+MESON_ARGS+= -Dxephyr=false
.if ${OPSYS} == "SunOS"
-MESON_ARGS+= -Dinput_thread=false
+MESON_ARGS+= -Dinput_thread=false
.endif
.include "options.mk"
diff --git a/modular-xorg-server-dfbsd/options.mk b/modular-xorg-server-dfbsd/options.mk
index 20e4011e42..a58b6ef809 100644
--- a/modular-xorg-server-dfbsd/options.mk
+++ b/modular-xorg-server-dfbsd/options.mk
@@ -8,27 +8,27 @@ PKG_SUPPORTED_OPTIONS+= dri
PKG_SUGGESTED_OPTIONS+= dri
.endif
-PKG_SUPPORTED_OPTIONS+= devd
-PKG_SUPPORTED_OPTIONS+= xkb_evdev
+PKG_SUPPORTED_OPTIONS+= devd
+PKG_SUPPORTED_OPTIONS+= xkb_evdev
-PKG_SUPPORTED_OPTIONS+= revert_flink
-PKG_SUPPORTED_OPTIONS+= revert_randr_lease
-PKG_SUPPORTED_OPTIONS+= add_scfb_driver
-PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
+PKG_SUPPORTED_OPTIONS+= revert_flink
+PKG_SUPPORTED_OPTIONS+= revert_randr_lease
+PKG_SUPPORTED_OPTIONS+= add_scfb_driver
+PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
-PKG_SUPPORTED_OPTIONS+= allow_unprivileged
-PKG_SUPPORTED_OPTIONS+= vtsw_kdsetmode_xsrc
-PKG_SUPPORTED_OPTIONS+= always_add_wsfb
-PKG_SUPPORTED_OPTIONS+= sharevts_xsrc_netbsd
-PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
+PKG_SUPPORTED_OPTIONS+= allow_unprivileged
+PKG_SUPPORTED_OPTIONS+= vtsw_kdsetmode_xsrc
+PKG_SUPPORTED_OPTIONS+= always_add_wsfb
+PKG_SUPPORTED_OPTIONS+= sharevts_xsrc_netbsd
+PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
-PKG_SUPPORTED_OPTIONS+= modesetting_on_intel
-PKG_SUPPORTED_OPTIONS+= try_dev_wskbd
+PKG_SUPPORTED_OPTIONS+= modesetting_on_intel
+PKG_SUPPORTED_OPTIONS+= try_dev_wskbd
-PKG_SUPPORTED_OPTIONS+= ws_drivers_openbsd
+PKG_SUPPORTED_OPTIONS+= ws_drivers_openbsd
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= devd
+PKG_SUGGESTED_OPTIONS+= devd
.endif
.if ${OPSYS} == "DragonFly"
@@ -38,12 +38,12 @@ PKG_SUGGESTED_OPTIONS+= revert_randr_lease
# Add scfb driver in xf86AutoConfig.c
.if ${OPSYS} == "FreeBSD"
-PKG_SUGGESTED_OPTIONS+= add_scfb_driver
+PKG_SUGGESTED_OPTIONS+= add_scfb_driver
.endif
# Add modesetting driver in xf86AutoConfig.c
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= add_modesetting_driver
+PKG_SUGGESTED_OPTIONS+= add_modesetting_driver
.endif
.if ${OPSYS} == "NetBSD"
@@ -59,17 +59,17 @@ PKG_SUGGESTED_OPTIONS+= always_add_wsfb
.endif
.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+= sharevts_xsrc_netbsd
+PKG_SUGGESTED_OPTIONS+= sharevts_xsrc_netbsd
.endif
.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
+PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
.endif
# Patch from OpenBSD to aggressively use the modesetting driver on intel integrated graphics
# .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
+PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
.endif
# From NetBSD 1.20.4 but extended to amd64 and i386
@@ -80,7 +80,7 @@ PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
# From OpenBSD 6.5 xenocara xserver 1.19.7
# .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= ws_drivers_openbsd
+PKG_SUGGESTED_OPTIONS+= ws_drivers_openbsd
.endif
.include "../../mk/bsd.options.mk"
@@ -138,7 +138,7 @@ MESON_ARGS+= -Dipv6=false
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --enable-debug
MESON_ARGS+= --buildtype=debug
-# Debug flags -O0 -g3 recommended by:
+# Debug flags -O0 -g3 recommended by:
# https://www.x.org/wiki/Development/Documentation/ServerDebugging/
# CFLAGS+= -ggdb
CFLAGS+= -O0 -g3
@@ -153,17 +153,17 @@ CONFIGURE_ARGS+= --without-dtrace
.if !empty(PKG_OPTIONS:Mdevd)
# SUBST_CLASSES+= devd_config
-# SUBST_STAGE.devd_config= post-configure
+# SUBST_STAGE.devd_config= post-configure
# SUBST_MESSAGE.devd_config= Patching config/Makefile for devd
# SUBST_FILES.devd_config+= config/Makefile
# SUBST_SED.devd_config+= -e 's|config\.c|config.c devd.c|g'
# SUBST_SED.devd_config+= -e 's|config\.lo|config.lo devd.lo|g'
# SUBST_CLASSES+= devd_dix
# SUBST_STAGE.devd_dix= post-configure
-# SUBST_MESSAGE.devd_dix= Patching include/dix-config.h for devd
-# SUBST_FILES.devd_dix+= include/dix-config.h
+# SUBST_MESSAGE.devd_dix= Patching include/dix-config.h for devd
+# SUBST_FILES.devd_dix+= include/dix-config.h
# SUBST_SED.devd_dix+= -e 's|/\* \#undef CONFIG_UDEV \*/|\#define CONFIG_DEVD 1 |'
-CPPFLAGS+= -DCONFIG_DEVD=1
+CPPFLAGS+= -DCONFIG_DEVD=1
MESON_ARGS+= -Ddevd=true
.endif
@@ -180,11 +180,11 @@ CPPFLAGS+= -DREVERT_FLINK
.if !empty(PKG_OPTIONS:Mrevert_randr_lease)
CPPFLAGS+= -DREVERT_RANDR_LEASE
-SUBST_CLASSES+= lease
-SUBST_STAGE.lease= post-configure
-SUBST_MESSAGE.lease= Removing definition of XF86_LEASE_VERSION
-SUBST_FILES.lease+= hw/xfree86/modes/xf86Crtc.h
-SUBST_SED.lease+= -e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
+SUBST_CLASSES+= lease
+SUBST_STAGE.lease= post-configure
+SUBST_MESSAGE.lease= Removing definition of XF86_LEASE_VERSION
+SUBST_FILES.lease+= hw/xfree86/modes/xf86Crtc.h
+SUBST_SED.lease+= -e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
.endif
.if !empty(PKG_OPTIONS:Madd_scfb_driver)
diff --git a/mtdev/Makefile b/mtdev/Makefile
index 5c210bcf53..08c113b26d 100644
--- a/mtdev/Makefile
+++ b/mtdev/Makefile
@@ -10,6 +10,6 @@ COMMENT= Kernel multitouch event translation
LICENSE= mit
ONLY_FOR_PLATFORM= Linux-*-*
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/mtdev/buildlink3.mk b/mtdev/buildlink3.mk
index 34af5d58cb..671715eff7 100644
--- a/mtdev/buildlink3.mk
+++ b/mtdev/buildlink3.mk
@@ -1,12 +1,12 @@
# $NetBSD$
-BUILDLINK_TREE+= mtdev
+BUILDLINK_TREE+= mtdev
.if !defined(MTDEV_BUILDLINK3_MK)
MTDEV_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.mtdev+= mtdev>=1.1.0
-BUILDLINK_PKGSRCDIR.mtdev?= ../../wip/mtdev
+BUILDLINK_API_DEPENDS.mtdev+= mtdev>=1.1.0
+BUILDLINK_PKGSRCDIR.mtdev?= ../../wip/mtdev
.endif # MTDEV_BUILDLINK3_MK
-BUILDLINK_TREE+= -mtdev
+BUILDLINK_TREE+= -mtdev
diff --git a/ncbi-blast+/Makefile b/ncbi-blast+/Makefile
index 4580edee18..201f7f5a71 100644
--- a/ncbi-blast+/Makefile
+++ b/ncbi-blast+/Makefile
@@ -21,14 +21,14 @@ SUBST_SED.configure+= -e '/--infodir=DIR/d'
SUBST_SED.configure+= -e '/--mandir=DIR/d'
SUBST_FILES.configure+= ${WRKSRC}/src/build-system/configure
-USE_TOOLS+= bash gmake perl
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
+USE_TOOLS+= bash gmake perl
+USE_LANGUAGES= c c++
+GNU_CONFIGURE= yes
GNU_CONFIGURE_STRICT= no # doesn't know --enable-option-checking
-REPLACE_BASH= scripts/common/impl/define_random_macros.sh
-REPLACE_BASH+= src/app/blast/get_species_taxids.sh
-REPLACE_PERL= src/app/blast/legacy_blast.pl src/app/blast/update_blastdb.pl
-REPLACE_PYTHON= src/app/winmasker/windowmasker_2.2.22_adapter.py
+REPLACE_BASH= scripts/common/impl/define_random_macros.sh
+REPLACE_BASH+= src/app/blast/get_species_taxids.sh
+REPLACE_PERL= src/app/blast/legacy_blast.pl src/app/blast/update_blastdb.pl
+REPLACE_PYTHON= src/app/winmasker/windowmasker_2.2.22_adapter.py
# The test for amq can hang, but amq is not needed so just avoid the test
# configure chooses /usr/local/bin/ar with no flags
diff --git a/netkit-telnet/Makefile b/netkit-telnet/Makefile
index 1ca2d2f1b8..f05f6d104b 100644
--- a/netkit-telnet/Makefile
+++ b/netkit-telnet/Makefile
@@ -22,6 +22,6 @@ CONFIGURE_ARGS+= --installroot=${DESTDIR}
SUBST_CLASSES+= warn
SUBST_STAGE.warn= pre-configure
SUBST_FILES.warn= configure
-SUBST_SED.warn= -e s,^WARNINGS=,\#WARNINGS=,g
+SUBST_SED.warn= -e s,^WARNINGS=,\#WARNINGS=,g
.include "../../mk/bsd.pkg.mk"
diff --git a/nix/Makefile b/nix/Makefile
index 03e5291e5f..f6b879b4a1 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -28,13 +28,13 @@ CONFIGURE_ARGS+= --enable-gc
# s3 option needs s3-cpp, this was reported as a cause for error if
# left unchanged.
CONFIGURE_ENV+= ac_cv_header_aws_s3_S3Client_h=no
-#CONFIGURE_ENV+= EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
-#CONFIGURE_ENV+= EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
-#CONFIGURE_ENV+= EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include/readline
+#CONFIGURE_ENV+= EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
+#CONFIGURE_ENV+= EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
+#CONFIGURE_ENV+= EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editlinereadline:Q}/include/readline
CONFIGURE_ENV+= EDITLINE_CFLAGS="-DREADLINE"
CONFIGURE_ENV+= EDITLINE_LIBS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
-#CONFIGURE_ENV+= EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editline:Q}/include/readline
-#CONFIGURE_ENV+= EDITLINE_LIBS=${BUILDLINK_PREFIX.editline:Q}/lib
+#CONFIGURE_ENV+= EDITLINE_CFLAGS=${BUILDLINK_PREFIX.editline:Q}/include/readline
+#CONFIGURE_ENV+= EDITLINE_LIBS=${BUILDLINK_PREFIX.editline:Q}/lib
CONFIGURE_ENV+= LIBLZMA_CFLAGS=${BUILDLINK_PREFIX.lzmalib:Q}/include
CONFIGURE_ENV+= LIBLZMA_LIBS=${BUILDLINK_PREFIX.lzmalib:Q}/lib
CONFIGURE_ENV+= BOOST_ROOT=${BUILDLINK_PREFIX.boost:Q}/lib
@@ -73,8 +73,8 @@ SUBST_FILES.docbook2+= doc/manual/local.mk
SUBST_STAGE.docbook2= pre-configure
SUBST_SED.docbook2+= -e 's,http://docbook.org/xml/5.0/rng/docbook.rng,${PREFIX}/share/xsl/docbook,g'
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
#.if ${OPSYS} == "NetBSD"
#USE_BUILTIN.editline= yes
diff --git a/nudoku/Makefile b/nudoku/Makefile
index 189f95e329..95097916f0 100644
--- a/nudoku/Makefile
+++ b/nudoku/Makefile
@@ -11,12 +11,12 @@ COMMENT= Ncurses based sudoku game
LICENSE= gnu-gpl-v3
# Fix gettext includes
-SUBST_CLASSES+= includes
-SUBST_STAGE.includes= post-configure
-SUBST_MESSAGE.includes= Fix gettext includes
-SUBST_FILES.includes= src/main.c
-SUBST_FILES.includes+= src/sudoku.c
-SUBST_SED.includes+= -e 's,"gettext.h",<libintl.h>,'
+SUBST_CLASSES+= includes
+SUBST_STAGE.includes= post-configure
+SUBST_MESSAGE.includes= Fix gettext includes
+SUBST_FILES.includes= src/main.c
+SUBST_FILES.includes+= src/sudoku.c
+SUBST_SED.includes+= -e 's,"gettext.h",<libintl.h>,'
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
diff --git a/oneko/Makefile b/oneko/Makefile
index 8e9ffcbf9f..8511058f3b 100644
--- a/oneko/Makefile
+++ b/oneko/Makefile
@@ -13,9 +13,9 @@ LICENSE= 2-clause-bsd # and public-domain
USE_CMAKE= yes
USE_LANGUAGES= c
-RESTRICTED= Includes deriviatives from CARDCAPTOR SAKURA. See http://www.clamp-net.com/ -> INFORMATION
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
+RESTRICTED= Includes deriviatives from CARDCAPTOR SAKURA. See http://www.clamp-net.com/ -> INFORMATION
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
diff --git a/pack/Makefile b/pack/Makefile
index 05660529f5..42996267aa 100644
--- a/pack/Makefile
+++ b/pack/Makefile
@@ -10,83 +10,83 @@ HOMEPAGE= https://github.com/maralla/pack
COMMENT= Vim package manager
LICENSE= mit
-CARGO_CRATE_DEPENDS+= ansi_term-0.9.0
-CARGO_CRATE_DEPENDS+= arc-swap-0.4.4
-CARGO_CRATE_DEPENDS+= argon2rs-0.2.5
-CARGO_CRATE_DEPENDS+= arrayvec-0.4.10
-CARGO_CRATE_DEPENDS+= atty-0.2.6
-CARGO_CRATE_DEPENDS+= autocfg-0.1.7
-CARGO_CRATE_DEPENDS+= backtrace-0.3.11
-CARGO_CRATE_DEPENDS+= backtrace-sys-0.1.28
-CARGO_CRATE_DEPENDS+= bitflags-0.9.1
-CARGO_CRATE_DEPENDS+= bitflags-1.2.1
-CARGO_CRATE_DEPENDS+= blake2-rfc-0.2.18
-CARGO_CRATE_DEPENDS+= cc-1.0.48
-CARGO_CRATE_DEPENDS+= cfg-if-0.1.6
-CARGO_CRATE_DEPENDS+= clap-2.27.1
-CARGO_CRATE_DEPENDS+= cloudabi-0.0.3
-CARGO_CRATE_DEPENDS+= constant_time_eq-0.1.3
-CARGO_CRATE_DEPENDS+= crossbeam-channel-0.4.0
-CARGO_CRATE_DEPENDS+= crossbeam-utils-0.7.0
-CARGO_CRATE_DEPENDS+= dirs-1.0.5
-CARGO_CRATE_DEPENDS+= failure-0.1.5
-CARGO_CRATE_DEPENDS+= failure_derive-0.1.5
-CARGO_CRATE_DEPENDS+= fuchsia-cprng-0.1.1
-CARGO_CRATE_DEPENDS+= getrandom-0.1.13
-CARGO_CRATE_DEPENDS+= git2-0.10.2
-CARGO_CRATE_DEPENDS+= hermit-abi-0.1.5
-CARGO_CRATE_DEPENDS+= idna-0.2.0
-CARGO_CRATE_DEPENDS+= jobserver-0.1.17
-CARGO_CRATE_DEPENDS+= kernel32-sys-0.2.2
-CARGO_CRATE_DEPENDS+= lazy_static-1.4.0
-CARGO_CRATE_DEPENDS+= libc-0.2.66
-CARGO_CRATE_DEPENDS+= libgit2-sys-0.9.2
-CARGO_CRATE_DEPENDS+= libssh2-sys-0.2.11
-CARGO_CRATE_DEPENDS+= libz-sys-1.0.24
-CARGO_CRATE_DEPENDS+= log-0.4.8
-CARGO_CRATE_DEPENDS+= matches-0.1.6
-CARGO_CRATE_DEPENDS+= nodrop-0.1.13
-CARGO_CRATE_DEPENDS+= num_cpus-1.11.1
-CARGO_CRATE_DEPENDS+= openssl-probe-0.1.2
-CARGO_CRATE_DEPENDS+= openssl-sys-0.9.39
-CARGO_CRATE_DEPENDS+= percent-encoding-2.1.0
-CARGO_CRATE_DEPENDS+= pkg-config-0.3.14
-CARGO_CRATE_DEPENDS+= proc-macro2-0.4.30
-CARGO_CRATE_DEPENDS+= quote-0.6.12
-CARGO_CRATE_DEPENDS+= rand_core-0.3.1
-CARGO_CRATE_DEPENDS+= rand_core-0.4.0
-CARGO_CRATE_DEPENDS+= rand_os-0.1.3
-CARGO_CRATE_DEPENDS+= rdrand-0.4.0
-CARGO_CRATE_DEPENDS+= redox_syscall-0.1.37
-CARGO_CRATE_DEPENDS+= redox_termios-0.1.1
-CARGO_CRATE_DEPENDS+= redox_users-0.3.0
-CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.14
-CARGO_CRATE_DEPENDS+= same-file-0.1.3
-CARGO_CRATE_DEPENDS+= scoped_threadpool-0.1.9
-CARGO_CRATE_DEPENDS+= signal-hook-0.1.12
-CARGO_CRATE_DEPENDS+= signal-hook-registry-1.2.0
-CARGO_CRATE_DEPENDS+= simple-logging-2.0.2
-CARGO_CRATE_DEPENDS+= strsim-0.6.0
-CARGO_CRATE_DEPENDS+= syn-0.15.34
-CARGO_CRATE_DEPENDS+= synstructure-0.10.2
-CARGO_CRATE_DEPENDS+= termion-1.5.1
-CARGO_CRATE_DEPENDS+= textwrap-0.9.0
-CARGO_CRATE_DEPENDS+= thread-id-3.3.0
-CARGO_CRATE_DEPENDS+= unicode-bidi-0.3.4
-CARGO_CRATE_DEPENDS+= unicode-normalization-0.1.5
-CARGO_CRATE_DEPENDS+= unicode-width-0.1.4
-CARGO_CRATE_DEPENDS+= unicode-xid-0.1.0
-CARGO_CRATE_DEPENDS+= url-2.1.0
-CARGO_CRATE_DEPENDS+= vcpkg-0.2.2
-CARGO_CRATE_DEPENDS+= vec_map-0.8.0
-CARGO_CRATE_DEPENDS+= walkdir-1.0.7
-CARGO_CRATE_DEPENDS+= wasi-0.7.0
-CARGO_CRATE_DEPENDS+= winapi-0.2.8
-CARGO_CRATE_DEPENDS+= winapi-0.3.4
-CARGO_CRATE_DEPENDS+= winapi-build-0.1.1
-CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
-CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
-CARGO_CRATE_DEPENDS+= yaml-rust-0.3.5
+CARGO_CRATE_DEPENDS+= ansi_term-0.9.0
+CARGO_CRATE_DEPENDS+= arc-swap-0.4.4
+CARGO_CRATE_DEPENDS+= argon2rs-0.2.5
+CARGO_CRATE_DEPENDS+= arrayvec-0.4.10
+CARGO_CRATE_DEPENDS+= atty-0.2.6
+CARGO_CRATE_DEPENDS+= autocfg-0.1.7
+CARGO_CRATE_DEPENDS+= backtrace-0.3.11
+CARGO_CRATE_DEPENDS+= backtrace-sys-0.1.28
+CARGO_CRATE_DEPENDS+= bitflags-0.9.1
+CARGO_CRATE_DEPENDS+= bitflags-1.2.1
+CARGO_CRATE_DEPENDS+= blake2-rfc-0.2.18
+CARGO_CRATE_DEPENDS+= cc-1.0.48
+CARGO_CRATE_DEPENDS+= cfg-if-0.1.6
+CARGO_CRATE_DEPENDS+= clap-2.27.1
+CARGO_CRATE_DEPENDS+= cloudabi-0.0.3
+CARGO_CRATE_DEPENDS+= constant_time_eq-0.1.3
+CARGO_CRATE_DEPENDS+= crossbeam-channel-0.4.0
+CARGO_CRATE_DEPENDS+= crossbeam-utils-0.7.0
+CARGO_CRATE_DEPENDS+= dirs-1.0.5
+CARGO_CRATE_DEPENDS+= failure-0.1.5
+CARGO_CRATE_DEPENDS+= failure_derive-0.1.5
+CARGO_CRATE_DEPENDS+= fuchsia-cprng-0.1.1
+CARGO_CRATE_DEPENDS+= getrandom-0.1.13
+CARGO_CRATE_DEPENDS+= git2-0.10.2
+CARGO_CRATE_DEPENDS+= hermit-abi-0.1.5
+CARGO_CRATE_DEPENDS+= idna-0.2.0
+CARGO_CRATE_DEPENDS+= jobserver-0.1.17
+CARGO_CRATE_DEPENDS+= kernel32-sys-0.2.2
+CARGO_CRATE_DEPENDS+= lazy_static-1.4.0
+CARGO_CRATE_DEPENDS+= libc-0.2.66
+CARGO_CRATE_DEPENDS+= libgit2-sys-0.9.2
+CARGO_CRATE_DEPENDS+= libssh2-sys-0.2.11
+CARGO_CRATE_DEPENDS+= libz-sys-1.0.24
+CARGO_CRATE_DEPENDS+= log-0.4.8
+CARGO_CRATE_DEPENDS+= matches-0.1.6
+CARGO_CRATE_DEPENDS+= nodrop-0.1.13
+CARGO_CRATE_DEPENDS+= num_cpus-1.11.1
+CARGO_CRATE_DEPENDS+= openssl-probe-0.1.2
+CARGO_CRATE_DEPENDS+= openssl-sys-0.9.39
+CARGO_CRATE_DEPENDS+= percent-encoding-2.1.0
+CARGO_CRATE_DEPENDS+= pkg-config-0.3.14
+CARGO_CRATE_DEPENDS+= proc-macro2-0.4.30
+CARGO_CRATE_DEPENDS+= quote-0.6.12
+CARGO_CRATE_DEPENDS+= rand_core-0.3.1
+CARGO_CRATE_DEPENDS+= rand_core-0.4.0
+CARGO_CRATE_DEPENDS+= rand_os-0.1.3
+CARGO_CRATE_DEPENDS+= rdrand-0.4.0
+CARGO_CRATE_DEPENDS+= redox_syscall-0.1.37
+CARGO_CRATE_DEPENDS+= redox_termios-0.1.1
+CARGO_CRATE_DEPENDS+= redox_users-0.3.0
+CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.14
+CARGO_CRATE_DEPENDS+= same-file-0.1.3
+CARGO_CRATE_DEPENDS+= scoped_threadpool-0.1.9
+CARGO_CRATE_DEPENDS+= signal-hook-0.1.12
+CARGO_CRATE_DEPENDS+= signal-hook-registry-1.2.0
+CARGO_CRATE_DEPENDS+= simple-logging-2.0.2
+CARGO_CRATE_DEPENDS+= strsim-0.6.0
+CARGO_CRATE_DEPENDS+= syn-0.15.34
+CARGO_CRATE_DEPENDS+= synstructure-0.10.2
+CARGO_CRATE_DEPENDS+= termion-1.5.1
+CARGO_CRATE_DEPENDS+= textwrap-0.9.0
+CARGO_CRATE_DEPENDS+= thread-id-3.3.0
+CARGO_CRATE_DEPENDS+= unicode-bidi-0.3.4
+CARGO_CRATE_DEPENDS+= unicode-normalization-0.1.5
+CARGO_CRATE_DEPENDS+= unicode-width-0.1.4
+CARGO_CRATE_DEPENDS+= unicode-xid-0.1.0
+CARGO_CRATE_DEPENDS+= url-2.1.0
+CARGO_CRATE_DEPENDS+= vcpkg-0.2.2
+CARGO_CRATE_DEPENDS+= vec_map-0.8.0
+CARGO_CRATE_DEPENDS+= walkdir-1.0.7
+CARGO_CRATE_DEPENDS+= wasi-0.7.0
+CARGO_CRATE_DEPENDS+= winapi-0.2.8
+CARGO_CRATE_DEPENDS+= winapi-0.3.4
+CARGO_CRATE_DEPENDS+= winapi-build-0.1.1
+CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
+CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
+CARGO_CRATE_DEPENDS+= yaml-rust-0.3.5
INSTALLATION_DIRS= bin
diff --git a/parole/Makefile b/parole/Makefile
index 7cf13b8fc2..d3493020b1 100644
--- a/parole/Makefile
+++ b/parole/Makefile
@@ -4,18 +4,18 @@ DISTNAME= parole-${VERS}
VERS= 1.0.2
CATEGORIES= multimedia
MASTER_SITES= https://archive.be.xfce.org/src/apps/parole/1.0/
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://docs.xfce.org/apps/parole/start
COMMENT= Simple media player based on the GStreamer framework
-LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
-USE_TOOLS+= gmake pkg-config intltool
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${PREFIX}
+USE_TOOLS+= gmake pkg-config intltool
+USE_LIBTOOL= yes
+USE_LANGUAGES= c c++
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS+= --prefix=${PREFIX}
PKG_OPTIONS_VAR= PKG_OPTIONS.parole
PKG_SUPPORTED_OPTIONS= libnotify
diff --git a/plplot/Makefile b/plplot/Makefile
index faa3524eb2..afecc2209d 100644
--- a/plplot/Makefile
+++ b/plplot/Makefile
@@ -13,7 +13,7 @@ COMMENT= Scientific plotting library
USE_CMAKE= yes
USE_LANGUAGES= c c++ # fortran77
USE_TOOLS+= perl
-CHECK_PORTABILITY_SKIP+= plplot_test/test_single_tcl.sh
+CHECK_PORTABILITY_SKIP+= plplot_test/test_single_tcl.sh
CMAKE_ARGS+= -DENABLE_f77:BOOL=OFF
diff --git a/powwow/Makefile b/powwow/Makefile
index 53a2003876..b672421989 100644
--- a/powwow/Makefile
+++ b/powwow/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://hoopajoo.net/projects/powwow.html
COMMENT= Client to play MUDs
LICENSE= gnu-gpl-v2
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-bsd
.include "../../mk/curses.buildlink3.mk"
diff --git a/py-aiohttp-socks/Makefile b/py-aiohttp-socks/Makefile
index 7b07768def..5837171182 100644
--- a/py-aiohttp-socks/Makefile
+++ b/py-aiohttp-socks/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/romis2012/aiohttp-socks
COMMENT= SOCKS proxy connector for aiohttp
LICENSE= apache-2.0
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYTHON_VERSIONS_INCOMPATIBLE= 27
DEPENDS+= ${PYPKGPREFIX}-aiohttp>=2.3.2*:../../www/py-aiohttp
diff --git a/py-captcha/Makefile b/py-captcha/Makefile
index 224e508b2d..af7bf4c86a 100644
--- a/py-captcha/Makefile
+++ b/py-captcha/Makefile
@@ -13,7 +13,7 @@ LICENSE= mit
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_ACCEPTED= 27 # py-imaging
+PYTHON_VERSIONS_ACCEPTED= 27 # py-imaging
.include "../../graphics/py-imaging/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/py-carbon/Makefile b/py-carbon/Makefile
index a1ee8b52da..d52c142678 100644
--- a/py-carbon/Makefile
+++ b/py-carbon/Makefile
@@ -25,12 +25,12 @@ RCD_SCRIPTS= carbon-aggregator carbon-cache carbon-relay
FILES_SUBST+= GRAPHITE_USER=${GRAPHITE_USER} GRAPHITE_GROUP=${GRAPHITE_GROUP} \
GRAPHITE_DIR=${GRAPHITE_DIR}
-OWN_DIRS_PERMS+= ${GRAPHITE_DIR} ${WWW_USER} ${GRAPHITE_GROUP} 0775
-OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/lists ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/rrd ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/whisper ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${VARBASE}/run/graphite ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+= ${GRAPHITE_DIR} ${WWW_USER} ${GRAPHITE_GROUP} 0775
+OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/lists ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/rrd ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+= ${GRAPHITE_DIR}/whisper ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+= ${VARBASE}/run/graphite ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
SUBST_CLASSES+= dirs
@@ -41,11 +41,11 @@ SUBST_VARS.dirs= GRAPHITE_DIR GRAPHITE_EGDIR GRAPHITE_USER PREFIX \
PKG_SYSCONFDIR VARBASE
# NetBSD has posix_fallocate in libc, but fs can't actually use it.
-SUBST_CLASSES.NetBSD+= fallocate
-SUBST_STAGE.fallocate= pre-configure
-SUBST_MESSAGE.fallocate=Patching for NetBSD defaults
-SUBST_FILES.fallocate= conf/carbon.conf.example
-SUBST_SED.fallocate= -e 's,^\(WHISPER_FALLOCATE_CREATE *= *\)\(.*\),\1False,'
+SUBST_CLASSES.NetBSD+= fallocate
+SUBST_STAGE.fallocate= pre-configure
+SUBST_MESSAGE.fallocate= Patching for NetBSD defaults
+SUBST_FILES.fallocate= conf/carbon.conf.example
+SUBST_SED.fallocate= -e 's,^\(WHISPER_FALLOCATE_CREATE *= *\)\(.*\),\1False,'
PKG_SYSCONFSUBDIR= graphite
@@ -64,7 +64,7 @@ CONF_FILES+= ${GRAPHITE_EGDIR}/${file}.example \
${PKG_SYSCONFDIR}/${file}
.endfor
-PYSETUPINSTALLARGS= --prefix=${PREFIX} \
+PYSETUPINSTALLARGS= --prefix=${PREFIX} \
--install-lib=${PREFIX}/${PYSITELIB}
INSTALLATION_DIRS+= share/examples/graphite
diff --git a/py-carbon/options.mk b/py-carbon/options.mk
index 372b26cf02..9239c40473 100644
--- a/py-carbon/options.mk
+++ b/py-carbon/options.mk
@@ -18,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-txamqp-[0-9]*:../../net/py-txamqp
###
.if !empty(PKG_OPTIONS:Mldap)
DEPENDS+= ${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap
-PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap
+PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap
.endif
###
@@ -26,5 +26,5 @@ PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap
###
.if !empty(PKG_OPTIONS:Mmemcached)
DEPENDS+= ${PYPKGPREFIX}-memcached-[0-9]*:../../devel/py-memcached
-PYTHON_VERSIONS_ACCEPTED= 27 # py-memcached
+PYTHON_VERSIONS_ACCEPTED= 27 # py-memcached
.endif
diff --git a/py-graphite-web/Makefile b/py-graphite-web/Makefile
index 26a60cba5d..cd73eb306d 100644
--- a/py-graphite-web/Makefile
+++ b/py-graphite-web/Makefile
@@ -3,7 +3,7 @@
DISTNAME= graphite-web-1.1.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= www
-GITHUB_PROJECT= graphite-web
+GITHUB_PROJECT= graphite-web
MASTER_SITES= ${MASTER_SITE_GITHUB:=graphite-project/}
MAINTAINER= riz%NetBSD.org@localhost
@@ -28,8 +28,8 @@ BUILD_DEFS+= VARBASE GRAPHITE_DIR
REPLACE_SH+= bin/build-index.sh
-OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
-OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR}/webapp ${WWW_USER} ${GRAPHITE_GROUP} 0775
+OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR} ${GRAPHITE_USER} ${GRAPHITE_GROUP} 0755
+OWN_DIRS_PERMS+= ${GRAPHITE_LOG_DIR}/webapp ${WWW_USER} ${GRAPHITE_GROUP} 0775
SUBST_CLASSES+= dirs
SUBST_STAGE.dirs= pre-configure
@@ -59,7 +59,7 @@ CONF_FILES+= ${GRAPHITE_EGDIR}/${file}.example \
${PKG_SYSCONFDIR}/${file}
.endfor
-PYSETUPINSTALLARGS= --prefix=${PREFIX} \
+PYSETUPINSTALLARGS= --prefix=${PREFIX} \
--install-lib=${PREFIX}/${PYSITELIB}
INSTALLATION_DIRS+= share/examples/graphite
diff --git a/py-homeassistant/Makefile b/py-homeassistant/Makefile
index 708fa2fd21..415e6dd23a 100644
--- a/py-homeassistant/Makefile
+++ b/py-homeassistant/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://www.home-assistant.io/
COMMENT= Home automation server
LICENSE= apache-2.0
-#WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${VERSION}
+#WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${VERSION}
#EGG_INFODIR= homeassistant-${VERSION}-py${PYVERSSUFFIX}.egg-info
USE_LANGUAGES= # none
diff --git a/py-influxdb/Makefile b/py-influxdb/Makefile
index 3ebd7578b0..cea2686666 100644
--- a/py-influxdb/Makefile
+++ b/py-influxdb/Makefile
@@ -1,9 +1,9 @@
# $NetBSD$
-DISTNAME= influxdb-5.2.3
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= devel databases
-MASTER_SITES= ${MASTER_SITE_PYPI:=i/influxdb/}
+DISTNAME= influxdb-5.2.3
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES= devel databases
+MASTER_SITES= ${MASTER_SITE_PYPI:=i/influxdb/}
MAINTAINER= root%zta.lk@localhost
HOMEPAGE= https://github.com/influxdata/influxdb-python
@@ -12,10 +12,10 @@ LICENSE= mit
USE_LANGUAGES= # none
-DEPENDS+= ${PYPKGPREFIX}-requests>=2.6.0:../../devel/py-requests
-DEPENDS+= ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
-DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.10.0:../../time/py-dateutil
-DEPENDS+= ${PYPKGPREFIX}-pytz:../../time/py-pytz
+DEPENDS+= ${PYPKGPREFIX}-requests>=2.6.0:../../devel/py-requests
+DEPENDS+= ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
+DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.10.0:../../time/py-dateutil
+DEPENDS+= ${PYPKGPREFIX}-pytz:../../time/py-pytz
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-mapcode/Makefile b/py-mapcode/Makefile
index 3088c541c6..56eeb835f2 100644
--- a/py-mapcode/Makefile
+++ b/py-mapcode/Makefile
@@ -1,9 +1,9 @@
# $NetBSD$
-DISTNAME= mapcode-2.5.5.0
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= geography
-MASTER_SITES= ${MASTER_SITE_PYPI:=m/mapcode/}
+DISTNAME= mapcode-2.5.5.0
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES= geography
+MASTER_SITES= ${MASTER_SITE_PYPI:=m/mapcode/}
MAINTAINER= root%zta.lk@localhost
HOMEPAGE= https://github.com/mapcode-foundation/mapcode-python/
diff --git a/py-mido/Makefile b/py-mido/Makefile
index 06007ca091..98120cfa56 100644
--- a/py-mido/Makefile
+++ b/py-mido/Makefile
@@ -1,9 +1,9 @@
# $NetBSD$
DISTNAME= mido-1.2.9
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_PYPI:=m/mido/}
+MASTER_SITES= ${MASTER_SITE_PYPI:=m/mido/}
MAINTAINER= root%zta.lk@localhost
HOMEPAGE= https://mido.readthedocs.io/
diff --git a/py-weewx/Makefile b/py-weewx/Makefile
index 0ea871d4e5..89270ccc59 100644
--- a/py-weewx/Makefile
+++ b/py-weewx/Makefile
@@ -18,11 +18,11 @@ USE_LANGUAGES=
PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 3.9.2
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Substituting pkgsrc paths
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= setup.cfg
-SUBST_VARS.paths= PREFIX
+SUBST_CLASSES+= paths
+SUBST_MESSAGE.paths= Substituting pkgsrc paths
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= setup.cfg
+SUBST_VARS.paths= PREFIX
# These versions are probably higher than necessary, but there is little value
# in testing with versions older than are in pkgsrc.
diff --git a/sara/Makefile b/sara/Makefile
index 9700f3d0c9..caa80b620b 100644
--- a/sara/Makefile
+++ b/sara/Makefile
@@ -41,7 +41,7 @@ SUBST_SED.fping= -e 's,: $$(PROG),:,g'
SUBST_CLASSES+= path
SUBST_STAGE.path= pre-install
SUBST_FILES.path= sara perl/* perllib/* bin/* html/*.pl
-SUBST_SED.path= -e 's,config\/,${EGDIR}/,g'
+SUBST_SED.path= -e 's,config\/,${EGDIR}/,g'
SUBST_SED.path+= -e 's,perl.*\/,${PREFIX}/share/sara/,g'
SUBST_SED.path+= -e 's,rules/,${PREFIX}/share/sara/rules/,g'
SUBST_SED.path+= -e 's,`pwd`,\"${PREFIX}/share/sara/\",g'
@@ -54,8 +54,8 @@ SUBST_SED.defpath= -e 's,\"bin/,\"${PREFIX}/bin/,g'
SUBST_SED.defpath+= -e 's,config,${EGDIR}/,g'
REPLACE_PERL= bin/get_targets bin/faux_fping sara add_user \
- bin/*.sara* bin/*.sara.ext perl/*.pl perl/contrib/* html/*.pl \
- html/docs/*.pl plugins/*.pi bin/fwping
+ bin/*.sara* bin/*.sara.ext perl/*.pl perl/contrib/* html/*.pl \
+ html/docs/*.pl plugins/*.pi bin/fwping
INSTALLATION_DIRS= bin ${PKGMANDIR}/man8
diff --git a/sbc/Makefile b/sbc/Makefile
index d5710314b8..e41b2993bb 100644
--- a/sbc/Makefile
+++ b/sbc/Makefile
@@ -9,8 +9,8 @@ HOMEPAGE= https://en.wikipedia.org/wiki/SBC_(codec) # no own page
COMMENT= Bluetooth subband codec
LICENSE= gnu-gpl-v2
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
+USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-tester
.include "../../mk/bsd.pkg.mk"
diff --git a/sbc/buildlink3.mk b/sbc/buildlink3.mk
index 4c2cface1b..868229c0a8 100644
--- a/sbc/buildlink3.mk
+++ b/sbc/buildlink3.mk
@@ -1,12 +1,12 @@
# $NetBSD$
-BUILDLINK_TREE+= sbc
+BUILDLINK_TREE+= sbc
.if !defined(SBC_BUILDLINK3_MK)
SBC_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.sbc+= sbc>=1.4
-BUILDLINK_PKGSRCDIR.sbc?= ../../wip/sbc
+BUILDLINK_API_DEPENDS.sbc+= sbc>=1.4
+BUILDLINK_PKGSRCDIR.sbc?= ../../wip/sbc
.endif # SBC_BUILDLINK3_MK
-BUILDLINK_TREE+= -sbc
+BUILDLINK_TREE+= -sbc
diff --git a/self-git/Makefile b/self-git/Makefile
index 10e6a0eb55..8a299d3871 100644
--- a/self-git/Makefile
+++ b/self-git/Makefile
@@ -8,7 +8,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.selflanguage.org/
COMMENT= Prototype-based dynamic object-oriented programming language
# BSD?
-# LICENSE=
+# LICENSE=
USE_LANGUAGES= c c++
@@ -21,10 +21,10 @@ CXXFLAGS+= -I/usr/X11R7/include
.include "../../wip/mk/git-package.mk"
-USE_X11=yes
+USE_X11= yes
-X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/emul/netbsd32/lib
-X11_LDFLAGS+= -L${PREFIX}/emul/netbsd32/lib
+X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/emul/netbsd32/lib
+X11_LDFLAGS+= -L${PREFIX}/emul/netbsd32/lib
BUILTIN_INCLUDE_DIRS+= -I/usr/X11/include/
diff --git a/slideml/Makefile b/slideml/Makefile
index d6b4e2edb5..f6e81bd0e9 100644
--- a/slideml/Makefile
+++ b/slideml/Makefile
@@ -23,8 +23,8 @@ INSTALLATION_DIRS= bin
# Force using "curl" for fetching the distribution file. It is only available
# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
-DATA_DIR= ${DESTDIR}${PREFIX}/share/slideml
-DOC_DIR= ${DESTDIR}${PREFIX}/share/doc/slideml
+DATA_DIR= ${DESTDIR}${PREFIX}/share/slideml
+DOC_DIR= ${DESTDIR}${PREFIX}/share/doc/slideml
EG_DIR= ${DESTDIR}${PREFIX}/share/examples/slideml
do-install:
diff --git a/softether/Makefile b/softether/Makefile
index 0e7a10eee6..0d16bf44e8 100644
--- a/softether/Makefile
+++ b/softether/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
-NAME= softether
-VERSION=4.29-9680
+NAME= softether
+VERSION= 4.29-9680
PKGNAME= ${NAME}-${VERSION}
GITHUB_PROJECT= SoftEtherVPN_Stable
DISTNAME= softether-src-${GITHUB_RELEASE}
@@ -23,15 +23,15 @@ USE_TOOLS+= gmake
BUILD_TARGET= build
-BUILD_MAKE_FLAGS+= LDFLAGS="-L${PREFIX}/lib"
-BUILD_MAKE_FLAGS+= CFLAGS="-I${PREFIX}/include"
-BUILD_MAKE_FLAGS+= PREFIX="${PREFIX}"
+BUILD_MAKE_FLAGS+= LDFLAGS="-L${PREFIX}/lib"
+BUILD_MAKE_FLAGS+= CFLAGS="-I${PREFIX}/include"
+BUILD_MAKE_FLAGS+= PREFIX="${PREFIX}"
-INSTALL_MAKE_FLAGS+= PREFIX="${PREFIX}"
-INSTALL_MAKE_FLAGS+= _INSTALL_PREFIX="${DESTDIR}"
-INSTALLATION_DIRS+= bin share/doc/${NAME}
+INSTALL_MAKE_FLAGS+= PREFIX="${PREFIX}"
+INSTALL_MAKE_FLAGS+= _INSTALL_PREFIX="${DESTDIR}"
+INSTALLATION_DIRS+= bin share/doc/${NAME}
-DOC_FILES= README.TXT LICENSE.TXT AUTHORS.TXT WARNING.TXT
+DOC_FILES= README.TXT LICENSE.TXT AUTHORS.TXT WARNING.TXT
post-install:
.for x in ${DOC_FILES}
diff --git a/suitesparse/Makefile b/suitesparse/Makefile
index 5aa5330c4e..f6bf16be2b 100644
--- a/suitesparse/Makefile
+++ b/suitesparse/Makefile
@@ -48,8 +48,8 @@ WRKSRC= ${WRKDIR}/SuiteSparse
SVERSION= 1
.if defined (WITH_METIS)
-METIS= ${PREFIX}/lib/libmetis.a
-METIS_PATH= ${PREFIX}/include/metis
+METIS= ${PREFIX}/lib/libmetis.a
+METIS_PATH= ${PREFIX}/include/metis
CHOLMOD_CONFIG=
.else
CHOLMOD_CONFIG= -DNPARTITION
diff --git a/trigger-rally/Makefile b/trigger-rally/Makefile
index 039376b906..07a86c0bc3 100644
--- a/trigger-rally/Makefile
+++ b/trigger-rally/Makefile
@@ -16,28 +16,28 @@ BUILD_DIRS= src
BUILD_TARGET= build
MAKE_FILE= GNUmakefile
-SUBST_CLASSES+= fix-mk
-SUBST_STAGE.fix-mk= pre-configure
-SUBST_MESSAGE.fix-mk= Fixing makefile.
-SUBST_FILES.fix-mk= src/GNUmakefile
-SUBST_SED.fix-mk= -e "s,/games,/share/games/trigger-rally,g"
-SUBST_SED.fix-mk+= -e "s,$(prefix)/share,$(prefix),g"
-SUBST_SED.fix-mk+= -e "s,/usr/local,${PREFIX},g"
-SUBST_SED.fix-mk+= -e "s,-I'./include', -I'./include' -I${PREFIX}/include,g"
-
-SUBST_CLASSES+= fix-errors
-SUBST_STAGE.fix-errors= pre-configure
-SUBST_MESSAGE.fix-errors= Fixing compile time errors.
-SUBST_FILES.fix-errors= src/PEngine/util.cpp
-SUBST_FILES.fix-errors+= src/Trigger/main.cpp
-SUBST_SED.fix-errors= -e 's,ErrorStr(),Error(),g'
-
-SUBST_CLASSES+= fix-paths
-SUBST_STAGE.fix-paths= pre-configure
-SUBST_MESSAGE.fix-paths= Fixing game data paths.
-SUBST_FILES.fix-paths= src/Trigger/main.cpp
-SUBST_FILES.fix-paths+= bin/trigger-rally.config.defs
-SUBST_SED.fix-paths= -e 's,/usr/share/games/trigger-rally,${PREFIX}/share/games/trigger-rally,g'
+SUBST_CLASSES+= fix-mk
+SUBST_STAGE.fix-mk= pre-configure
+SUBST_MESSAGE.fix-mk= Fixing makefile.
+SUBST_FILES.fix-mk= src/GNUmakefile
+SUBST_SED.fix-mk= -e "s,/games,/share/games/trigger-rally,g"
+SUBST_SED.fix-mk+= -e "s,$(prefix)/share,$(prefix),g"
+SUBST_SED.fix-mk+= -e "s,/usr/local,${PREFIX},g"
+SUBST_SED.fix-mk+= -e "s,-I'./include', -I'./include' -I${PREFIX}/include,g"
+
+SUBST_CLASSES+= fix-errors
+SUBST_STAGE.fix-errors= pre-configure
+SUBST_MESSAGE.fix-errors= Fixing compile time errors.
+SUBST_FILES.fix-errors= src/PEngine/util.cpp
+SUBST_FILES.fix-errors+= src/Trigger/main.cpp
+SUBST_SED.fix-errors= -e 's,ErrorStr(),Error(),g'
+
+SUBST_CLASSES+= fix-paths
+SUBST_STAGE.fix-paths= pre-configure
+SUBST_MESSAGE.fix-paths= Fixing game data paths.
+SUBST_FILES.fix-paths= src/Trigger/main.cpp
+SUBST_FILES.fix-paths+= bin/trigger-rally.config.defs
+SUBST_SED.fix-paths= -e 's,/usr/share/games/trigger-rally,${PREFIX}/share/games/trigger-rally,g'
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/bin
@@ -48,7 +48,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/data/data.md5 ${DESTDIR}${PREFIX}/share/games/trigger-rally/
post-install:
- install -m 0755 -l s -o ${BINOWN} -g ${BINGRP} ${DESTDIR}${PREFIX}/share/games/trigger-rally/trigger-rally ${DESTDIR}${PREFIX}/bin/trigger-rally
+ install -m 0755 -l s -o ${BINOWN} -g ${BINGRP} ${DESTDIR}${PREFIX}/share/games/trigger-rally/trigger-rally ${DESTDIR}${PREFIX}/bin/trigger-rally
chmod +x ${DESTDIR}${PREFIX}/bin/trigger-rally
.include "../../devel/SDL2/buildlink3.mk"
diff --git a/u-boot-pinebook-crust/Makefile b/u-boot-pinebook-crust/Makefile
index a3871bc852..be570968c0 100644
--- a/u-boot-pinebook-crust/Makefile
+++ b/u-boot-pinebook-crust/Makefile
@@ -5,7 +5,7 @@ UBOOT_TARGET= pinebook
UBOOT_CONFIG= pinebook_defconfig
UBOOT_BIN= u-boot-sunxi-with-spl.bin
-UBOOT_INSTALLBOOT_PLIST=installboot.plist
+UBOOT_INSTALLBOOT_PLIST= installboot.plist
# Use anarsoul's fork of mainline U-Boot with Pinebook support patched in
MASTER_SITES= ${MASTER_SITE_GITHUB:=anarsoul/}
@@ -30,4 +30,4 @@ post-build:
.include "../../wip/arm-trusted-firmware-sun50i_a64-crust/buildlink3.mk"
.include "../../sysutils/u-boot/u-boot-arm64.mk"
-CHECK_PORTABILITY_SKIP+=tools/imx_cntr_image.sh
+CHECK_PORTABILITY_SKIP+= tools/imx_cntr_image.sh
diff --git a/udev/Makefile b/udev/Makefile
index 423b91c4a9..7cd607b785 100644
--- a/udev/Makefile
+++ b/udev/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
-PKGNAME= udev-243
-COMMENT= Hotplug daemon
+PKGNAME= udev-243
+COMMENT= Hotplug daemon
CONFIGURE_ARGS+= --disable-hwdb
pre-configure:
diff --git a/uhd-git/Makefile b/uhd-git/Makefile
index 804e4bfcce..26061a0df0 100644
--- a/uhd-git/Makefile
+++ b/uhd-git/Makefile
@@ -20,7 +20,7 @@ USE_TOOLS= cmake
WRKSRC= ${WRKDIR}/uhd/host
REPLACE_PYTHON= \
- uhd-firmware/x300/bin_to_coe.py \
+ uhd-firmware/x300/bin_to_coe.py \
utils/uhd_images_downloader.py.in \
utils/usrp2_card_burner.py \
utils/usrp2_card_burner_gui.py \
@@ -49,15 +49,15 @@ REPLACE_PYTHON= \
uhd-fpga/usrp3/top/python/bit_to_zynq_bin.py \
uhd-fpga/usrp3/top/python/check_inout.py \
uhd-fpga/usrp3/top/python/check_timing.py \
- uhd-fpga/usrp3/lib/io_port2/create-lvbitx.py \
+ uhd-fpga/usrp3/lib/io_port2/create-lvbitx.py \
REPLACE_PERL= uhd-fpga/usrp1/tb/makesine.pl
-REPLACE_BASH= \
+REPLACE_BASH= \
uhd-fpga/usrp2/top/impactor.sh \
uhd-fpga/usrp3/top/impactor.sh \
- uhd-fpga/usrp3/top/python/batch-build \
+ uhd-fpga/usrp3/top/python/batch-build \
INSTALLATION_DIRS+= share/uhd
INSTALLATION_DIRS+= share/uhd/firmware
diff --git a/vulkan-loader/Makefile b/vulkan-loader/Makefile
index c229548208..3f21dc78f0 100644
--- a/vulkan-loader/Makefile
+++ b/vulkan-loader/Makefile
@@ -22,7 +22,7 @@ USE_LANGUAGES= c c++
CMAKE_ARGS+= -DBUILD_WSI_WAYLAND_SUPPORT=OFF
CMAKE_ARGS+= -DBUILD_TESTS=ON
-PKGCONFIG_OVERRIDE+=loader/vulkan.pc.in
+PKGCONFIG_OVERRIDE+= loader/vulkan.pc.in
.include "../../devel/googletest/buildlink3.mk"
.include "../../lang/python/tool.mk"
diff --git a/wayland-protocols/buildlink3.mk b/wayland-protocols/buildlink3.mk
index e6369e375f..c9172fc9e6 100644
--- a/wayland-protocols/buildlink3.mk
+++ b/wayland-protocols/buildlink3.mk
@@ -1,12 +1,12 @@
# $NetBSD$
-BUILDLINK_TREE+= wayland-protocols
+BUILDLINK_TREE+= wayland-protocols
.if !defined(WAYLAND_PROTOCOLS_BUILDLINK3_MK)
WAYLAND_PROTOCOLS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.wayland-protocols+= wayland-protocols>=1.18
-BUILDLINK_PKGSRCDIR.wayland-protocols?= ../../wip/wayland-protocols
+BUILDLINK_API_DEPENDS.wayland-protocols+= wayland-protocols>=1.18
+BUILDLINK_PKGSRCDIR.wayland-protocols?= ../../wip/wayland-protocols
.endif # WAYLAND_PROTOCOLS_BUILDLINK3_MK
-BUILDLINK_TREE+= -wayland-protocols
+BUILDLINK_TREE+= -wayland-protocols
diff --git a/wolf4SDL/Makefile b/wolf4SDL/Makefile
index 53f7f72897..056a3814a5 100644
--- a/wolf4SDL/Makefile
+++ b/wolf4SDL/Makefile
@@ -29,16 +29,16 @@ WOLF4SDLBIN+= wolf4sdl-sod
WOLF4SDLBIN+= wolf4sdl-soddemo
WOLF4SDLBIN+= wolf4sdl
-CFLAGS.wolf4sdl= -DCARMACIZED
-CFLAGS.wolf4sdl-11= -DCARMACIZED -DAPOGEE_1_1
-CFLAGS.wolf4sdl-14= -DCARMACIZED
-CFLAGS.wolf4sdl-14gt= -DCARMACIZED -DGOODTIMES
-CFLAGS.wolf4sdl-10sw= -DUPLOAD -DAPOGEE_1_0
-CFLAGS.wolf4sdl-11sw= -DCARMACIZED -DUPLOAD -DAPOGEE_1_1
-CFLAGS.wolf4sdl-12sw= -DCARMACIZED -DUPLOAD -DAPOGEE_1_2
-CFLAGS.wolf4sdl-14sw= -DCARMACIZED -DUPLOAD
-CFLAGS.wolf4sdl-sod= -DCARMACIZED -DSPEAR
-CFLAGS.wolf4sdl-soddemo=-DCARMACIZED -DSPEAR -DSPEARDEMO
+CFLAGS.wolf4sdl= -DCARMACIZED
+CFLAGS.wolf4sdl-11= -DCARMACIZED -DAPOGEE_1_1
+CFLAGS.wolf4sdl-14= -DCARMACIZED
+CFLAGS.wolf4sdl-14gt= -DCARMACIZED -DGOODTIMES
+CFLAGS.wolf4sdl-10sw= -DUPLOAD -DAPOGEE_1_0
+CFLAGS.wolf4sdl-11sw= -DCARMACIZED -DUPLOAD -DAPOGEE_1_1
+CFLAGS.wolf4sdl-12sw= -DCARMACIZED -DUPLOAD -DAPOGEE_1_2
+CFLAGS.wolf4sdl-14sw= -DCARMACIZED -DUPLOAD
+CFLAGS.wolf4sdl-sod= -DCARMACIZED -DSPEAR
+CFLAGS.wolf4sdl-soddemo= -DCARMACIZED -DSPEAR -DSPEARDEMO
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= ${PKGMANDIR}/man6
diff --git a/workrave/Makefile b/workrave/Makefile
index bf29ee5d92..4f82fb1d33 100644
--- a/workrave/Makefile
+++ b/workrave/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.workrave.org/
COMMENT= Wrist break reminder program for prevention of RSI
LICENSE= gnu-gpl-v3
-PYTHON_VERSIONS_ACCEPTED= 27 # 1.10.1
+PYTHON_VERSIONS_ACCEPTED= 27 # 1.10.1
USE_LIBTOOL= YES
USE_TOOLS+= gmake pkg-config intltool
diff --git a/xnedit/Makefile b/xnedit/Makefile
index da6cc3c15b..033da47360 100644
--- a/xnedit/Makefile
+++ b/xnedit/Makefile
@@ -16,15 +16,15 @@ WRKSRC= ${WRKDIR}/xnedit
BUILD_TARGET= netbsd
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PREFIX}/share/doc/xnedit
-SUBST_CLASSES+= fix-include
-SUBST_STAGE.fix-include= pre-configure
-SUBST_MESSAGE.fix-include= Fixing include Xft.h.
-SUBST_FILES.fix-include= util/fontsel.c
-SUBST_FILES.fix-include+= source/textP.h
-SUBST_FILES.fix-include+= source/textDisp.h
-SUBST_FILES.fix-include+= source/nedit.h
-#SUBST_FILES.fix-include+= Microline/XmL/XmL.c
-SUBST_SED.fix-include= -e 's,Xft/Xft.h>,X11/&,'
+SUBST_CLASSES+= fix-include
+SUBST_STAGE.fix-include= pre-configure
+SUBST_MESSAGE.fix-include= Fixing include Xft.h.
+SUBST_FILES.fix-include= util/fontsel.c
+SUBST_FILES.fix-include+= source/textP.h
+SUBST_FILES.fix-include+= source/textDisp.h
+SUBST_FILES.fix-include+= source/nedit.h
+#SUBST_FILES.fix-include+= Microline/XmL/XmL.c
+SUBST_SED.fix-include= -e 's,Xft/Xft.h>,X11/&,'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/source/xnedit ${DESTDIR}${PREFIX}/bin
diff --git a/zodiac/Makefile b/zodiac/Makefile
index 70f10750a7..90bc0e2348 100644
--- a/zodiac/Makefile
+++ b/zodiac/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
GITHUB_PROJECT= zodiac
-GITHUB_TAG= v0.2.5
+GITHUB_TAG= v0.2.5
DISTNAME= ${GITHUB_TAG}
PKGNAME= ${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
CATEGORIES= textproc
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index bda72acdbb..f2017c4b7b 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -20,7 +20,7 @@ COMMENT= Video camera security and surveillance solution
LICENSE= gnu-gpl-v2
# NetBSD tar: Invalid header, starting valid header search.
-EXTRACT_USING= gtar
+EXTRACT_USING= gtar
DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
@@ -141,7 +141,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pdo_mysql-[0-9]*:../../databases/php-pdo_mysql
# \todo Somehow, this permission setup still fails.
# This directory contains state, so use OWN_DIRS instead of MAKE_DIRS.
-ZM_CACHE= ${VARBASE}/cache/zoneminder
+ZM_CACHE= ${VARBASE}/cache/zoneminder
OWN_DIRS_PERMS+= ${ZM_CACHE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
OWN_DIRS_PERMS+= ${ZM_CACHE}/temp ${REAL_ROOT_USER} ${APACHE_GROUP} 775
OWN_DIRS_PERMS+= ${ZM_CACHE}/images ${REAL_ROOT_USER} ${APACHE_GROUP} 775
@@ -200,7 +200,7 @@ SUBST_CLASSES+= script-path
SUBST_MESSAGE.script-path= Adjusting paths in scripts.
SUBST_STAGE.script-path= pre-configure
SUBST_FILES.script-path= ${REPLACE_PERL} ${EXTRA_PERL}
-SUBST_SED.script-path= -e "s|^\\([\$$]ENV{PATH} *= *'\\).*';\$$|\\1${PREFIX}/bin:/bin:/usr/bin';|g"
+SUBST_SED.script-path= -e "s|^\\([\$$]ENV{PATH} *= *'\\).*';\$$|\\1${PREFIX}/bin:/bin:/usr/bin';|g"
SUBST_CLASSES+= files
SUBST_STAGE.files= pre-configure
Home |
Main Index |
Thread Index |
Old Index