pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/*: normalize whitespace
Module Name: pkgsrc-wip
Committed By: Roland Illig <roland.illig%gmx.de@localhost>
Pushed By: rillig
Date: Wed May 22 21:15:05 2019 +0200
Changeset: eb01f1204b184b0dc891b15089b65d4dc1f7a937
Modified Files:
MesaLib-dfbsd-meson/Makefile
MesaLib-dfbsd-meson/builtin.mk
MesaLib-dfbsd-meson/options.mk
MesaLib-dfbsd/Makefile
MesaLib-dfbsd/builtin.mk
R-cellranger/Makefile
R-getopt/Makefile
R-optparse/Makefile
am-utils-git/Makefile
am-utils/Makefile
arduino-builder/Makefile
arphic-ukai-ttf/Makefile
arphic-uming-ttf/Makefile
avrdude/options.mk
bareos-clientonly/Makefile
bareos/Makefile
bareos/Makefile.common
bareos/options.mk
barrier/Makefile
bdf2psf/Makefile
bugzilla/Makefile
c-graph/Makefile
canu/Makefile
cddlib/Makefile
cfiles/Makefile
chronograf/Makefile
cinnamon-screensaver/Makefile
clementine/Makefile
ctags-git/Makefile
dbus-dfbsd/Makefile
dbus-dfbsd/options.mk
ddate/Makefile
dillo-devel/Makefile
edelib/Makefile
efl121/Makefile
efl121/buildlink3.mk
electrum/Makefile
enlightenment0224/Makefile
epix/Makefile
fbida/Makefile
flnews-devel/options.mk
free42/Makefile
freebsd-svn/Makefile
freerdp/Makefile
fxt/Makefile
ganglia-webfrontend/options.mk
gcc9snapshot/options.mk
gdb/Makefile
gdsreader/Makefile
gerris/Makefile
givaro/Makefile
glib2/Makefile
glib2/modules.mk
glib2/schemas.mk
glista/Makefile
go-bytebufferpool/buildlink3.mk
go-compress/buildlink3.mk
go-cpuid/buildlink3.mk
go-dotenv/buildlink3.mk
go-fasthttp/buildlink3.mk
go-junit-report/Makefile
go-junit-report/buildlink3.mk
go-kr-text/buildlink3.mk
go-paths-helper/Makefile
go-pkgconfig/buildlink3.mk
go-properties-map/Makefile
go-properties-map/buildlink3.mk
go-tcplisten/buildlink3.mk
go-xxhash/buildlink3.mk
gromacs/Makefile
gromacs/options.mk
gromacs2018/Makefile
gromacs2018/options.mk
guile-bytestructures/Makefile
guile-commonmark/Makefile
guile-gcrypt/Makefile
guile-git/Makefile
guile-haunt/Makefile
guile-json/Makefile
guile-reader/Makefile
guile-sqlite3/Makefile
guile-syntax-highlight/Makefile
harmony/Makefile
heimdal/Makefile
heimdal/builtin.mk
hmmer/Makefile
influxdb/Makefile
inkscape-snapshot/Makefile
ircII-current/options.mk
kapacitor/Makefile
kde-runtime4/Makefile
kicad-footprints/Makefile
kicad-i18n/Makefile
kicad-packages3d/Makefile
kicad-symbols/Makefile
kicad-templates/Makefile
lapack/Makefile.common
laszip/Makefile
libalkimia/Makefile
libc++-abi/Makefile
libdrm-dfbsd-meson/Makefile
libdrm-dfbsd-meson/builtin.mk
libdrm-dfbsd/Makefile
libdrm-dfbsd/builtin.mk
libosmocore/Makefile
libvirt490/Makefile
lld-netbsd/Makefile
lxqt-common/Makefile
mes-nyacc/Makefile
mescc-tools/Makefile
micropolis/Makefile
miniircd/Makefile
minizip192/Makefile
minizip192/buildlink3.mk
modular-xorg-server-dfbsd-meson/Makefile
modular-xorg-server-dfbsd-meson/options.mk
modular-xorg-server-dfbsd/options.mk
mona/Makefile
mothur/Makefile
muscle/Makefile
navit-git/Makefile
navit/Makefile
nominatim/Makefile
ocaml-cairo/Makefile
ocaml-lablgtk3/Makefile
ocaml-lablgtk3/options.mk
ocaml/Makefile
ocaml/Makefile.common
ocaml/hacks.mk
opengrok/Makefile
openmpi/options.mk
p5-Mojo-JWT/Makefile
p5-Mojolicious/Makefile
pacman/Makefile
pbzx/Makefile
pike8.0-GTK2/Makefile
pike8.0-Gdbm/Makefile
pike8.0-Image_Freetype/Makefile
pike8.0-Image_SVG/Makefile
pike8.0-Image_TIFF/Makefile
pike8.0-Image_WebP/Makefile
pike8.0-Java/Makefile
pike8.0-Mysql/Makefile
pike8.0-Odbc/Makefile
pike8.0/Makefile
pike8.0/builtin_module.mk
pike8.0/version.mk
psybnc/Makefile
py-adal/Makefile
py-algopy/Makefile
py-anvio/Makefile
py-codecov/Makefile
py-conan/Makefile
py-dependency/Makefile
py-distro/Makefile
py-energyflow/Makefile
py-geom/Makefile
py-ggplot/Makefile
py-gts/Makefile
py-halp/Makefile
py-hyperbolic/Makefile
py-lempel-Ziv_Complexity/Makefile
py-libtunepimp/Makefile
py-libvirt490/Makefile
py-math3d/Makefile
py-node-semver/Makefile
py-ore-algebra/Makefile
py-patch/Makefile
py-peru/Makefile
py-ranger/Makefile
py-semver/Makefile
py-shapely/Makefile
py-webapp3/Makefile
q2pro/Makefile
qodem/Makefile
qstat214/Makefile
revealjs/Makefile
rpm5/Makefile
rsem/Makefile
ruby-rack-flash3/Makefile
ruby-rake-compiler/Makefile
ruby-rinku/Makefile
ruby-simple-navigation/Makefile
ruby-sinatra-simple-navigation/Makefile
ruby-taskwarrior-web/Makefile
ruby-vegas/Makefile
ruby-versionomy/Makefile
rust-bin/Makefile
shaarli/Makefile
smplayer/Makefile
spacefm/options.mk
spamassassin-cvs/Makefile
spectra/Makefile
spot/Makefile
spotifyd/Makefile
symmetrica/Makefile
tbb/Makefile
tealdeer/Makefile
telegraf/Makefile
termbox/Makefile
terminology/Makefile
tor-dev/Makefile
toxic-git/Makefile
tracy/Makefile
trinity/Makefile
uptimed/Makefile
valgrind-netbsd/Makefile
vcflib/Makefile
virtualbox/Makefile
wla-dx/Makefile
wla-dx/options.mk
xbps/Makefile
xf86-input-mouse-dfbsd/Makefile
xf86-video-ati-dfbsd/Makefile
xssp/Makefile
zlua/Makefile
Log Message:
wip/*: normalize whitespace
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eb01f1204b184b0dc891b15089b65d4dc1f7a937
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
MesaLib-dfbsd-meson/Makefile | 10 +-
MesaLib-dfbsd-meson/builtin.mk | 4 +-
MesaLib-dfbsd-meson/options.mk | 8 +-
MesaLib-dfbsd/Makefile | 10 +-
MesaLib-dfbsd/builtin.mk | 4 +-
R-cellranger/Makefile | 2 +-
R-getopt/Makefile | 8 +-
R-optparse/Makefile | 8 +-
am-utils-git/Makefile | 4 +-
am-utils/Makefile | 20 +--
arduino-builder/Makefile | 16 +--
arphic-ukai-ttf/Makefile | 6 +-
arphic-uming-ttf/Makefile | 4 +-
avrdude/options.mk | 12 +-
bareos-clientonly/Makefile | 14 +-
bareos/Makefile | 28 ++--
bareos/Makefile.common | 34 ++---
bareos/options.mk | 2 +-
barrier/Makefile | 6 +-
bdf2psf/Makefile | 4 +-
bugzilla/Makefile | 2 +-
c-graph/Makefile | 2 +-
canu/Makefile | 2 +-
cddlib/Makefile | 2 +-
cfiles/Makefile | 10 +-
chronograf/Makefile | 32 ++---
cinnamon-screensaver/Makefile | 2 +-
clementine/Makefile | 16 +--
ctags-git/Makefile | 4 +-
dbus-dfbsd/Makefile | 2 +-
dbus-dfbsd/options.mk | 4 +-
ddate/Makefile | 4 +-
dillo-devel/Makefile | 10 +-
edelib/Makefile | 4 +-
efl121/Makefile | 4 +-
efl121/buildlink3.mk | 6 +-
electrum/Makefile | 10 +-
enlightenment0224/Makefile | 4 +-
epix/Makefile | 4 +-
fbida/Makefile | 2 +-
flnews-devel/options.mk | 8 +-
free42/Makefile | 4 +-
freebsd-svn/Makefile | 6 +-
freerdp/Makefile | 10 +-
fxt/Makefile | 2 +-
ganglia-webfrontend/options.mk | 10 +-
gcc9snapshot/options.mk | 6 +-
gdb/Makefile | 20 +--
gdsreader/Makefile | 2 +-
gerris/Makefile | 2 +-
givaro/Makefile | 2 +-
glib2/Makefile | 4 +-
glib2/modules.mk | 2 +-
glib2/schemas.mk | 2 +-
glista/Makefile | 2 +-
go-bytebufferpool/buildlink3.mk | 2 +-
go-compress/buildlink3.mk | 2 +-
go-cpuid/buildlink3.mk | 2 +-
go-dotenv/buildlink3.mk | 2 +-
go-fasthttp/buildlink3.mk | 2 +-
go-junit-report/Makefile | 6 +-
go-junit-report/buildlink3.mk | 2 +-
go-kr-text/buildlink3.mk | 2 +-
go-paths-helper/Makefile | 4 +-
go-pkgconfig/buildlink3.mk | 2 +-
go-properties-map/Makefile | 8 +-
go-properties-map/buildlink3.mk | 2 +-
go-tcplisten/buildlink3.mk | 2 +-
go-xxhash/buildlink3.mk | 2 +-
gromacs/Makefile | 2 +-
gromacs/options.mk | 2 +-
gromacs2018/Makefile | 2 +-
gromacs2018/options.mk | 2 +-
guile-bytestructures/Makefile | 4 +-
guile-commonmark/Makefile | 2 +-
guile-gcrypt/Makefile | 4 +-
guile-git/Makefile | 4 +-
guile-haunt/Makefile | 4 +-
guile-json/Makefile | 4 +-
guile-reader/Makefile | 2 +-
guile-sqlite3/Makefile | 6 +-
guile-syntax-highlight/Makefile | 4 +-
harmony/Makefile | 2 +-
heimdal/Makefile | 10 +-
heimdal/builtin.mk | 5 +-
hmmer/Makefile | 16 +--
influxdb/Makefile | 36 ++---
inkscape-snapshot/Makefile | 8 +-
ircII-current/options.mk | 4 +-
kapacitor/Makefile | 40 +++---
kde-runtime4/Makefile | 2 +-
kicad-footprints/Makefile | 4 +-
kicad-i18n/Makefile | 6 +-
kicad-packages3d/Makefile | 4 +-
kicad-symbols/Makefile | 4 +-
kicad-templates/Makefile | 4 +-
lapack/Makefile.common | 4 +-
laszip/Makefile | 4 +-
libalkimia/Makefile | 4 +-
libc++-abi/Makefile | 2 +-
libdrm-dfbsd-meson/Makefile | 16 +--
libdrm-dfbsd-meson/builtin.mk | 2 +-
libdrm-dfbsd/Makefile | 4 +-
libdrm-dfbsd/builtin.mk | 2 +-
libosmocore/Makefile | 6 +-
libvirt490/Makefile | 82 +++++------
lld-netbsd/Makefile | 2 +-
lxqt-common/Makefile | 2 +-
mes-nyacc/Makefile | 4 +-
mescc-tools/Makefile | 2 +-
micropolis/Makefile | 6 +-
miniircd/Makefile | 2 +-
minizip192/Makefile | 12 +-
minizip192/buildlink3.mk | 4 +-
modular-xorg-server-dfbsd-meson/Makefile | 6 +-
modular-xorg-server-dfbsd-meson/options.mk | 68 ++++-----
modular-xorg-server-dfbsd/options.mk | 14 +-
mona/Makefile | 4 +-
mothur/Makefile | 22 +--
muscle/Makefile | 2 +-
navit-git/Makefile | 16 +--
navit/Makefile | 8 +-
nominatim/Makefile | 8 +-
ocaml-cairo/Makefile | 2 +-
ocaml-lablgtk3/Makefile | 6 +-
ocaml-lablgtk3/options.mk | 2 +-
ocaml/Makefile | 14 +-
ocaml/Makefile.common | 14 +-
ocaml/hacks.mk | 12 +-
opengrok/Makefile | 2 +-
openmpi/options.mk | 2 +-
p5-Mojo-JWT/Makefile | 2 +-
p5-Mojolicious/Makefile | 2 +-
pacman/Makefile | 20 +--
pbzx/Makefile | 2 +-
pike8.0-GTK2/Makefile | 6 +-
pike8.0-Gdbm/Makefile | 2 +-
pike8.0-Image_Freetype/Makefile | 10 +-
pike8.0-Image_SVG/Makefile | 12 +-
pike8.0-Image_TIFF/Makefile | 10 +-
pike8.0-Image_WebP/Makefile | 12 +-
pike8.0-Java/Makefile | 8 +-
pike8.0-Mysql/Makefile | 2 +-
pike8.0-Odbc/Makefile | 2 +-
pike8.0/Makefile | 40 +++---
pike8.0/builtin_module.mk | 36 ++---
pike8.0/version.mk | 6 +-
psybnc/Makefile | 2 +-
py-adal/Makefile | 2 +-
py-algopy/Makefile | 2 +-
py-anvio/Makefile | 8 +-
py-codecov/Makefile | 6 +-
py-conan/Makefile | 40 +++---
py-dependency/Makefile | 2 +-
py-distro/Makefile | 2 +-
py-energyflow/Makefile | 2 +-
py-geom/Makefile | 2 +-
py-ggplot/Makefile | 2 +-
py-gts/Makefile | 2 +-
py-halp/Makefile | 2 +-
py-hyperbolic/Makefile | 2 +-
py-lempel-Ziv_Complexity/Makefile | 4 +-
py-libtunepimp/Makefile | 2 +-
py-libvirt490/Makefile | 14 +-
py-math3d/Makefile | 4 +-
py-node-semver/Makefile | 2 +-
py-ore-algebra/Makefile | 2 +-
py-patch/Makefile | 2 +-
py-peru/Makefile | 6 +-
py-ranger/Makefile | 12 +-
py-semver/Makefile | 2 +-
py-shapely/Makefile | 4 +-
py-webapp3/Makefile | 6 +-
q2pro/Makefile | 2 +-
qodem/Makefile | 2 +-
qstat214/Makefile | 10 +-
revealjs/Makefile | 4 +-
rpm5/Makefile | 4 +-
rsem/Makefile | 18 +--
ruby-rack-flash3/Makefile | 2 +-
ruby-rake-compiler/Makefile | 2 +-
ruby-rinku/Makefile | 6 +-
ruby-simple-navigation/Makefile | 2 +-
ruby-sinatra-simple-navigation/Makefile | 2 +-
ruby-taskwarrior-web/Makefile | 22 +--
ruby-vegas/Makefile | 2 +-
ruby-versionomy/Makefile | 2 +-
rust-bin/Makefile | 2 +-
shaarli/Makefile | 8 +-
smplayer/Makefile | 10 +-
spacefm/options.mk | 22 +--
spamassassin-cvs/Makefile | 2 +-
spectra/Makefile | 2 +-
spot/Makefile | 2 +-
spotifyd/Makefile | 6 +-
symmetrica/Makefile | 6 +-
tbb/Makefile | 10 +-
tealdeer/Makefile | 218 ++++++++++++++---------------
telegraf/Makefile | 28 ++--
termbox/Makefile | 2 +-
terminology/Makefile | 20 +--
tor-dev/Makefile | 2 +-
toxic-git/Makefile | 2 +-
tracy/Makefile | 4 +-
trinity/Makefile | 32 ++---
uptimed/Makefile | 2 +-
valgrind-netbsd/Makefile | 10 +-
vcflib/Makefile | 8 +-
virtualbox/Makefile | 2 +-
wla-dx/Makefile | 4 +-
wla-dx/options.mk | 6 +-
xbps/Makefile | 10 +-
xf86-input-mouse-dfbsd/Makefile | 4 +-
xf86-video-ati-dfbsd/Makefile | 6 +-
xssp/Makefile | 6 +-
zlua/Makefile | 2 +-
216 files changed, 914 insertions(+), 913 deletions(-)
diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index 2c7c0af890..9e53d1fd54 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -118,11 +118,11 @@ SUBST_SED.wrapper-bug+= -e 's,libglapi_tmp_rename\.la,libglapi.la,g'
SUBST_SED.wrapper-bug+= -e 's,libglapi_tmp_rename_la,libglapi_la,g'
# Replace /etc/drirc.d with ${PREFIX}/etc/drirc.d
-SUBST_CLASSES+= drirc
-SUBST_STAGE.drirc= pre-configure
-SUBST_MESSAGE.drirc= Fixing hardcoded /etc/drirc.d references
-SUBST_FILES.drirc+= src/util/xmlconfig.c
-SUBST_SED.drirc+= -e 's|/etc|${PREFIX}/etc|g'
+SUBST_CLASSES+= drirc
+SUBST_STAGE.drirc= pre-configure
+SUBST_MESSAGE.drirc= Fixing hardcoded /etc/drirc.d references
+SUBST_FILES.drirc+= src/util/xmlconfig.c
+SUBST_SED.drirc+= -e 's|/etc|${PREFIX}/etc|g'
CFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
CXXFLAGS.SunOS+= -Drestrict=__restrict__
diff --git a/MesaLib-dfbsd-meson/builtin.mk b/MesaLib-dfbsd-meson/builtin.mk
index f9bab9d959..71884e4b32 100644
--- a/MesaLib-dfbsd-meson/builtin.mk
+++ b/MesaLib-dfbsd-meson/builtin.mk
@@ -22,7 +22,7 @@ IS_BUILTIN.MesaLib= yes
IS_BUILTIN.MesaLib= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.MesaLib
+MAKEVARS+= IS_BUILTIN.MesaLib
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -67,7 +67,7 @@ USE_BUILTIN.MesaLib!= \
. endif
. endif # PREFER.MesaLib
.endif
-MAKEVARS+= USE_BUILTIN.MesaLib
+MAKEVARS+= USE_BUILTIN.MesaLib
###
### The section below only applies if we are not including this file
diff --git a/MesaLib-dfbsd-meson/options.mk b/MesaLib-dfbsd-meson/options.mk
index 7f80b2ca17..80c71bb4b7 100644
--- a/MesaLib-dfbsd-meson/options.mk
+++ b/MesaLib-dfbsd-meson/options.mk
@@ -336,14 +336,14 @@ DRI_DRIVERS+= nouveau
.if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --with-platforms=x11
-MESON_ARGS+= -Dplatforms=x11
+MESON_ARGS+= -Dplatforms=x11
#.elif ${OPSYS} == "Linux"
#.include "../../wip/wayland/buildlink3.mk"
#CONFIGURE_ARGS+= --with-platforms=x11,drm,wayland
#PLIST.wayland= yes
.else
CONFIGURE_ARGS+= --with-platforms=x11,drm
-MESON_ARGS+= -Dplatforms=x11,drm
+MESON_ARGS+= -Dplatforms=x11,drm
.endif
.if !empty(PKG_OPTIONS:Mllvm)
@@ -372,10 +372,10 @@ MESON_ARGS+= -Dgallium-vdpau=false
# XA is useful for accelerating xf86-video-vmware
.if !empty(PKG_OPTIONS:Mxa)
CONFIGURE_ARGS+= --enable-xa
-MESON_ARGS+= -Dgallium-xa=true
+MESON_ARGS+= -Dgallium-xa=true
PLIST.xatracker= yes
.else
-MESON_ARGS+= -Dgallium-xa=false
+MESON_ARGS+= -Dgallium-xa=false
.endif
# AMD Radeon r300
diff --git a/MesaLib-dfbsd/Makefile b/MesaLib-dfbsd/Makefile
index 8e55d8e514..b0bd248eab 100644
--- a/MesaLib-dfbsd/Makefile
+++ b/MesaLib-dfbsd/Makefile
@@ -62,11 +62,11 @@ SUBST_SED.wrapper-bug+= -e 's,libglapi_tmp_rename\.la,libglapi.la,g'
SUBST_SED.wrapper-bug+= -e 's,libglapi_tmp_rename_la,libglapi_la,g'
# Replace /etc/drirc.d with ${PREFIX}/etc/drirc.d
-SUBST_CLASSES+= drirc
-SUBST_STAGE.drirc= pre-configure
-SUBST_MESSAGE.drirc= Fixing hardcoded /etc/drirc.d references
-SUBST_FILES.drirc+= src/util/xmlconfig.c
-SUBST_SED.drirc+= -e 's|/etc|${PREFIX}/etc|g'
+SUBST_CLASSES+= drirc
+SUBST_STAGE.drirc= pre-configure
+SUBST_MESSAGE.drirc= Fixing hardcoded /etc/drirc.d references
+SUBST_FILES.drirc+= src/util/xmlconfig.c
+SUBST_SED.drirc+= -e 's|/etc|${PREFIX}/etc|g'
CFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
CXXFLAGS.SunOS+= -Drestrict=__restrict__
diff --git a/MesaLib-dfbsd/builtin.mk b/MesaLib-dfbsd/builtin.mk
index f9bab9d959..71884e4b32 100644
--- a/MesaLib-dfbsd/builtin.mk
+++ b/MesaLib-dfbsd/builtin.mk
@@ -22,7 +22,7 @@ IS_BUILTIN.MesaLib= yes
IS_BUILTIN.MesaLib= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.MesaLib
+MAKEVARS+= IS_BUILTIN.MesaLib
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -67,7 +67,7 @@ USE_BUILTIN.MesaLib!= \
. endif
. endif # PREFER.MesaLib
.endif
-MAKEVARS+= USE_BUILTIN.MesaLib
+MAKEVARS+= USE_BUILTIN.MesaLib
###
### The section below only applies if we are not including this file
diff --git a/R-cellranger/Makefile b/R-cellranger/Makefile
index 074dd56f77..6c30f9af31 100644
--- a/R-cellranger/Makefile
+++ b/R-cellranger/Makefile
@@ -11,7 +11,7 @@ LICENSE= gnu-gpl-v2
R_PKGNAME= cellranger
R_PKGVER= 1.1.0
-DEPENDS+= R-rematch>=1.0.1:../../wip/R-rematch
+DEPENDS+= R-rematch>=1.0.1:../../wip/R-rematch
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/R-getopt/Makefile b/R-getopt/Makefile
index 3bae10b3fc..08b587ea0c 100644
--- a/R-getopt/Makefile
+++ b/R-getopt/Makefile
@@ -13,10 +13,10 @@ R_PKGVER= 1.20.2
REPLACE_R= exec/example.R
-REPLACE_INTERPRETER+= R
-REPLACE.R.old= /path/to/Rscript
-REPLACE.R.new= ${PREFIX}/bin/R
-REPLACE_FILES.R= ${REPLACE_R}
+REPLACE_INTERPRETER+= R
+REPLACE.R.old= /path/to/Rscript
+REPLACE.R.new= ${PREFIX}/bin/R
+REPLACE_FILES.R= ${REPLACE_R}
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/R-optparse/Makefile b/R-optparse/Makefile
index 4346e0834d..9a48b195c8 100644
--- a/R-optparse/Makefile
+++ b/R-optparse/Makefile
@@ -15,10 +15,10 @@ DEPENDS+= R-getopt>=1.20.2:../../wip/R-getopt
REPLACE_R= exec/example.R exec/display_file.R
-REPLACE_INTERPRETER+= R
-REPLACE.R.old= /usr/bin/env Rscript
-REPLACE.R.new= ${PREFIX}/bin/R
-REPLACE_FILES.R= ${REPLACE_R}
+REPLACE_INTERPRETER+= R
+REPLACE.R.old= /usr/bin/env Rscript
+REPLACE.R.new= ${PREFIX}/bin/R
+REPLACE_FILES.R= ${REPLACE_R}
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
diff --git a/am-utils-git/Makefile b/am-utils-git/Makefile
index 310bc10442..13908cc088 100644
--- a/am-utils-git/Makefile
+++ b/am-utils-git/Makefile
@@ -29,8 +29,8 @@ PKGDOCDIR= ${PREFIX}/share/doc/${PKGBASE}
INSTALLATION_DIRS+= ${EGDIR} ${PKGDOCDIR} etc/amd
EXTRA_DOC_FILES= COPYING FAQ ChangeLog BUGS AUTHORS \
- README.attrcache README.autofs README.ldap \
- README.osx README.y2k NEWS README INSTALL
+ README.attrcache README.autofs README.ldap \
+ README.osx README.y2k NEWS README INSTALL
EXAMPLE_CONF_FILES= amd.conf lostaltmail.conf
pre-configure:
diff --git a/am-utils/Makefile b/am-utils/Makefile
index a039d0c66a..7a29276463 100644
--- a/am-utils/Makefile
+++ b/am-utils/Makefile
@@ -5,14 +5,14 @@ DISTNAME= am-utils-6.2
PKGNAME= am-utils-6.2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.am-utils.org/pub/am-utils/ \
- ftp://ftp.cs.umn.edu/pub/am-utils \
- ftp://ftp.cise.ufl.edu/pub/mirrors/am-utils \
- ftp://ftp.fu-berlin.de/unix/network/am-utils \
- ftp://ftp.tu-darmstadt.de/pub/networking/filesystems/am-utils/ \
- ftp://sunsite.org.uk/package/am-utils \
- ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils \
- ftp://core.ring.gr.jp/pub/net/am-utils/ \
- ftp://ftp.ring.gr.jp/pub/net/am-utils/
+ ftp://ftp.cs.umn.edu/pub/am-utils \
+ ftp://ftp.cise.ufl.edu/pub/mirrors/am-utils \
+ ftp://ftp.fu-berlin.de/unix/network/am-utils \
+ ftp://ftp.tu-darmstadt.de/pub/networking/filesystems/am-utils/ \
+ ftp://sunsite.org.uk/package/am-utils \
+ ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils \
+ ftp://core.ring.gr.jp/pub/net/am-utils/ \
+ ftp://ftp.ring.gr.jp/pub/net/am-utils/
MAINTAINER= cheusov%NetBSD.org@localhost
HOMEPAGE= http://www.am-utils.org/
@@ -39,8 +39,8 @@ PKGDOCDIR= ${PREFIX}/share/doc/${PKGBASE}
INSTALLATION_DIRS+= ${EGDIR} ${PKGDOCDIR} etc/amd
EXTRA_DOC_FILES= COPYING FAQ ChangeLog BUGS AUTHORS \
- README.attrcache README.autofs README.ldap \
- README.osx README.y2k NEWS README INSTALL
+ README.attrcache README.autofs README.ldap \
+ README.osx README.y2k NEWS README INSTALL
EXAMPLE_CONF_FILES= amd.conf lostaltmail.conf
post-patch:
diff --git a/arduino-builder/Makefile b/arduino-builder/Makefile
index b558595220..87f141b8e4 100644
--- a/arduino-builder/Makefile
+++ b/arduino-builder/Makefile
@@ -14,19 +14,19 @@ COMMENT= Command line tool able to build arduino sketches
#LICENSE= # TODO: (see mk/license.mk)
-GO_SRCPATH= github.com/arduino/arduino-builder
+GO_SRCPATH= github.com/arduino/arduino-builder
GO_DIST_BASE= ${GITHUB_PROJECT}-${DISTNAME}
USE_LANGUAGES= c++ go
-DEPENDS+= go>=1.8.0:../../lang/go
-DEPENDS+= go-errors>=0:../../devel/go-errors
-DEPENDS+= go-testify>=0:../../devel/go-testify
-DEPENDS+= grpc>=0:../../net/grpc
-DEPENDS+= protobuf>=0:../../devel/protobuf
-DEPENDS+= go-fsnotify>=0:../../devel/go-fsnotify
-DEPENDS+= go-properties-map>=0:../../wip/go-properties-map
+DEPENDS+= go>=1.8.0:../../lang/go
+DEPENDS+= go-errors>=0:../../devel/go-errors
+DEPENDS+= go-testify>=0:../../devel/go-testify
+DEPENDS+= grpc>=0:../../net/grpc
+DEPENDS+= protobuf>=0:../../devel/protobuf
+DEPENDS+= go-fsnotify>=0:../../devel/go-fsnotify
+DEPENDS+= go-properties-map>=0:../../wip/go-properties-map
.include "../../lang/go/go-package.mk"
.include "../../wip/go-properties-map/buildlink3.mk"
diff --git a/arphic-ukai-ttf/Makefile b/arphic-ukai-ttf/Makefile
index f4a3f72a79..bc7fa52943 100644
--- a/arphic-ukai-ttf/Makefile
+++ b/arphic-ukai-ttf/Makefile
@@ -17,13 +17,13 @@ USE_X11BASE= yes
NO_CONFIGURE= yes
NO_BUILD= yes
USE_LANGUAGES= # none
-EXTRACT_SUFX= .tar.xz
+EXTRACT_SUFX= .tar.xz
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
INSTALLATION_DIRS= ${DOCDIR} ${FONTDIR}
-FONTDIR= ${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf= ${FONTDIR}
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
+FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= ukai.ttc
INSTALL_DOCS= COPYING
diff --git a/arphic-uming-ttf/Makefile b/arphic-uming-ttf/Makefile
index d1cac688be..1e36637c98 100644
--- a/arphic-uming-ttf/Makefile
+++ b/arphic-uming-ttf/Makefile
@@ -22,8 +22,8 @@ EXTRACT_SUFX= .tar.xz
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
INSTALLATION_DIRS= ${DOCDIR} ${FONTDIR}
-FONTDIR= ${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf= ${FONTDIR}
+FONTDIR= ${PREFIX}/share/fonts/X11/TTF
+FONTS_DIRS.ttf= ${FONTDIR}
INSTALL_FONTS= uming.ttc
diff --git a/avrdude/options.mk b/avrdude/options.mk
index 67dcdcd9e0..a3dbefe85f 100644
--- a/avrdude/options.mk
+++ b/avrdude/options.mk
@@ -10,15 +10,15 @@ PLIST_VARS+= doc
.if !empty(PKG_OPTIONS:Mdoc)
CONFIGURE_ARGS+= --enable-doc
-BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
-BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
-BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
-TEXINFO_REQD= 4.9
-USE_TOOLS+= makeinfo texi2html yacc lex
+BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
+BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
+BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
+TEXINFO_REQD= 4.9
+USE_TOOLS+= makeinfo texi2html yacc lex
# DragonFly has stripped makeinfo in the base - without texi2dvi.
.if ${OPSYS} == "DragonFly"
-BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
+BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
.endif
PLIST.doc= yes
diff --git a/bareos-clientonly/Makefile b/bareos-clientonly/Makefile
index 226fc1d33c..a147731c1f 100644
--- a/bareos-clientonly/Makefile
+++ b/bareos-clientonly/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.77 2018/12/09 18:52:45 adam Exp $
-PKGNAME= ${DISTNAME:S/-/-clientonly-/}
+PKGNAME= ${DISTNAME:S/-/-clientonly-/}
COMMENT= Backup Archiving REcovery Open Sourced - client
@@ -19,16 +19,16 @@ RCD_SCRIPTS= bareos-fd
# non WIP .include "${.CURDIR}/../../sysutils/bareos/Makefile.common"
.include "${.CURDIR}/../bareos/Makefile.common"
-CONFIG_TEMPLATES!=${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.client 2>/dev/null | sed -e 's/ /\\ /g'
+CONFIG_TEMPLATES!= ${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.client 2>/dev/null | sed -e 's/ /\\ /g'
CONF_FILES?=
.for l in ${CONFIG_TEMPLATES}
-CONF_FILES+=${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//}
+CONF_FILES+= ${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//}
.endfor
-BUILD_DEFS+=VARBASE # to keep pkglint happy
+BUILD_DEFS+= VARBASE # to keep pkglint happy
MAKE_DIRS?=
-MAKE_DIRS+=${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
-MAKE_DIRS+=${VARBASE}/db/${PKG_SYSCONFSUBDIR}
-MAKE_DIRS+=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
+MAKE_DIRS+= ${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
+MAKE_DIRS+= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}
+MAKE_DIRS+= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
diff --git a/bareos/Makefile b/bareos/Makefile
index 5effa772bf..08ab963db0 100644
--- a/bareos/Makefile
+++ b/bareos/Makefile
@@ -14,12 +14,12 @@ USE_TOOLS+= perl:run
REPLACE_PERL?=
REPLACE_PERL+= core/src/cats/make_catalog_backup.pl.in
-SUBST_CLASSES+= fix-paths
-SUBST_STAGE.fix-paths= pre-configure
-SUBST_MESSAGE.fix-paths= Fixing paths.
+SUBST_CLASSES+= fix-paths
+SUBST_STAGE.fix-paths= pre-configure
+SUBST_MESSAGE.fix-paths= Fixing paths.
SUBST_FILES.fix-paths?=
-SUBST_FILES.fix-paths+= core/src/cats/make_catalog_backup.pl.in
-SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_FILES.fix-paths+= core/src/cats/make_catalog_backup.pl.in
+SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g'
.include "options.mk"
.include "Makefile.common"
@@ -28,22 +28,22 @@ SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g'
BUILD_DEFS+= VARBASE
# spool directory
-MAKE_DIRS_PERMS+= ${VARBASE}/${PKG_SYSCONFSUBDIR} \
- ${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+MAKE_DIRS_PERMS+= ${VARBASE}/${PKG_SYSCONFSUBDIR} \
+ ${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
post-install: # should go away once we find out how to set the run link path in CMakefiles
${LN} -fs ${PKG_SYSCONFSUBDIR}/backends/libbareossd-gentape.so ${DESTDIR:Q}/${BAREOS_LIBDIR:Q}/libbareossd-gentape.so
-CONFIG_TEMPLATES!=${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.common 2>/dev/null | sed -e 's/ /\\ /g'
+CONFIG_TEMPLATES!= ${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.common 2>/dev/null | sed -e 's/ /\\ /g'
CONF_FILES?=
.for l in ${CONFIG_TEMPLATES}
-CONF_FILES+=${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//}
+CONF_FILES+= ${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//}
.endfor
MAKE_DIRS?=
-MAKE_DIRS+=${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
-MAKE_DIRS+=${VARBASE}/db/${PKG_SYSCONFSUBDIR}
-MAKE_DIRS+=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/bsr
-MAKE_DIRS+=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/storage
-MAKE_DIRS+=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
+MAKE_DIRS+= ${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
+MAKE_DIRS+= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}
+MAKE_DIRS+= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}/bsr
+MAKE_DIRS+= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}/storage
+MAKE_DIRS+= ${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
diff --git a/bareos/Makefile.common b/bareos/Makefile.common
index 3c1777ec8d..51a389abf3 100644
--- a/bareos/Makefile.common
+++ b/bareos/Makefile.common
@@ -3,11 +3,11 @@
# used by wip/bareos-clientonly/Makefile
GITHUB_PROJECT= bareos
-VERSION= 18.2.6
+VERSION= 18.2.6
GITHUB_TAG= Release/${VERSION}
DISTNAME= bareos-${VERSION}
-WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG:C/\//-/}
+WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG:C/\//-/}
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=bareos/}
EXTRACT_SUFX= .zip
@@ -23,7 +23,7 @@ USE_LANGUAGES+= c c++
USE_TOOLS+= awk
USE_CMAKE= yes
-CONFIGURE_DIRS+= core
+CONFIGURE_DIRS+= core
BUILD_DEFS+= VARBASE
@@ -39,15 +39,15 @@ BUILD_DEFS+= BAREOS_PIDDIR BAREOS_WORKINGDIR
# user/group information
BAREOS_GROUP?= bareos
-BAREOS_SD_USER?= bareossd
-PKG_GECOS.${BAREOS_SD_USER}=Bareos Storage User
-PKG_HOME.${BAREOS_SD_USER}=${BAREOS_WORKINGDIR}
-PKG_SHELL.${BAREOS_SD_USER}=/bin/sh
+BAREOS_SD_USER?= bareossd
+PKG_GECOS.${BAREOS_SD_USER}= Bareos Storage User
+PKG_HOME.${BAREOS_SD_USER}= ${BAREOS_WORKINGDIR}
+PKG_SHELL.${BAREOS_SD_USER}= /bin/sh
-BAREOS_DIR_USER?= bareosdir
-PKG_GECOS.${BAREOS_DIR_USER}=Bareos Director User
-PKG_HOME.${BAREOS_DIR_USER}=${BAREOS_WORKINGDIR}
-PKG_SHELL.${BAREOS_DIR_USER}=/bin/sh
+BAREOS_DIR_USER?= bareosdir
+PKG_GECOS.${BAREOS_DIR_USER}= Bareos Director User
+PKG_HOME.${BAREOS_DIR_USER}= ${BAREOS_WORKINGDIR}
+PKG_SHELL.${BAREOS_DIR_USER}= /bin/sh
PKG_GROUPS= ${BAREOS_GROUP}
PKG_USERS= ${BAREOS_DIR_USER}:${BAREOS_GROUP} ${BAREOS_SD_USER}:${BAREOS_GROUP}
@@ -55,12 +55,12 @@ PKG_USERS= ${BAREOS_DIR_USER}:${BAREOS_GROUP} ${BAREOS_SD_USER}:${BAREOS_GROUP}
CONFIG_TEMPLATE_PATH= share/examples/${PKG_SYSCONFSUBDIR}/configtemplates
# variables to substitute
-FILES_SUBST+= BAREOS_ETCDIR=${PKG_SYSCONFDIR}
-FILES_SUBST+= BAREOS_PIDDIR=${BAREOS_PIDDIR}
-FILES_SUBST+= BAREOS_LOGDIR=${BAREOS_LOGDIR}
-FILES_SUBST+= BAREOS_GROUP=${BAREOS_GROUP}
-FILES_SUBST+= BAREOS_DIR_USER=${BAREOS_DIR_USER}
-FILES_SUBST+= BAREOS_SD_USER=${BAREOS_SD_USER}
+FILES_SUBST+= BAREOS_ETCDIR=${PKG_SYSCONFDIR}
+FILES_SUBST+= BAREOS_PIDDIR=${BAREOS_PIDDIR}
+FILES_SUBST+= BAREOS_LOGDIR=${BAREOS_LOGDIR}
+FILES_SUBST+= BAREOS_GROUP=${BAREOS_GROUP}
+FILES_SUBST+= BAREOS_DIR_USER=${BAREOS_DIR_USER}
+FILES_SUBST+= BAREOS_SD_USER=${BAREOS_SD_USER}
# cmake arguments
CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
diff --git a/bareos/options.mk b/bareos/options.mk
index 18248aadd6..0dad583a51 100644
--- a/bareos/options.mk
+++ b/bareos/options.mk
@@ -23,5 +23,5 @@ CMAKE_ARGS+= -Dmysql=yes
.endif
.if !empty(PKG_OPTIONS:Mscsi-crypto)
-CMAKE_ARGS+= -Dscsi-crypto=yes
+CMAKE_ARGS+= -Dscsi-crypto=yes
.endif
diff --git a/barrier/Makefile b/barrier/Makefile
index 12b3105d56..48f9aff168 100644
--- a/barrier/Makefile
+++ b/barrier/Makefile
@@ -13,14 +13,14 @@ COMMENT= Let a user share a mouse and keyboard among computers
LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/barrier-2.1.1
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++11
# Main configuration is CMake, but subdirectories are GNU configure.
# We need to set GNU_CONFIGURE=yes for config.{guess,sub} overrides to kick in.
# We override the do-configure target to prevent pkgsrc from running both
# configuration mechanisms.
USE_CMAKE= yes
-USE_CMAKE= yes
-GNU_CONFIGURE= yes
+USE_CMAKE= yes
+GNU_CONFIGURE= yes
CONFIG_SUB_OVERRIDE+= ext/gmock/build-aux/config.sub
CONFIG_SUB_OVERRIDE+= ext/gtest/build-aux/config.sub
diff --git a/bdf2psf/Makefile b/bdf2psf/Makefile
index 4e57fa6996..6d953dba7a 100644
--- a/bdf2psf/Makefile
+++ b/bdf2psf/Makefile
@@ -19,8 +19,8 @@ REPLACE_PERL= Fonts/bdf2psf
SHAREDIR= ${PREFIX}/share/${PKGBASE}
-AUTO_MKDIRS= yes
-INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${SHAREDIR}/fontsets
+AUTO_MKDIRS= yes
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${SHAREDIR}/fontsets
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/Fonts/bdf2psf ${DESTDIR}${PREFIX}/bin
diff --git a/bugzilla/Makefile b/bugzilla/Makefile
index 77e74d2340..8cf21f8521 100644
--- a/bugzilla/Makefile
+++ b/bugzilla/Makefile
@@ -116,7 +116,7 @@ INSTALLATION_DIRS+= ${BZDIR}/${i}
.endfor
FILES_SUBST+= WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
- BZDIR=${BZDIR}
+ BZDIR=${BZDIR}
do-configure:
(cd ${WRKSRC}; ./checksetup.pl)
diff --git a/c-graph/Makefile b/c-graph/Makefile
index 35d1170b5b..4b24c0c510 100644
--- a/c-graph/Makefile
+++ b/c-graph/Makefile
@@ -10,7 +10,7 @@ COMMENT= Convolution Theorem Visualization
LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
-INFO_FILES=yes
+INFO_FILES= yes
USE_LANGUAGES= c fortran
.include "../../mk/bsd.pkg.mk"
diff --git a/canu/Makefile b/canu/Makefile
index e16d64b3a3..1f9278d40a 100644
--- a/canu/Makefile
+++ b/canu/Makefile
@@ -57,7 +57,7 @@ GCC_REQD+= 4.8
WRKSRC= ${WRKDIR}/canu-${PKGVERSION_NOREV}/src
MAKE_ENV+= DESTDIR=${WRKSRC}
-TMP_INST= ${WRKSRC}${PREFIX}/${OPSYS}-${MACHINE_ARCH:S/x86_64/amd64/}
+TMP_INST= ${WRKSRC}${PREFIX}/${OPSYS}-${MACHINE_ARCH:S/x86_64/amd64/}
SITE_PERL_REL= lib/perl5/site_perl
JAVAJARDIR= share/java/classes
INSTALLATION_DIRS= bin ${JAVAJARDIR}
diff --git a/cddlib/Makefile b/cddlib/Makefile
index a2b4e6f525..bd39b869af 100644
--- a/cddlib/Makefile
+++ b/cddlib/Makefile
@@ -8,7 +8,7 @@ GITHUB_RELEASE= 0.94j
MAINTAINER= jihbed.research%gmail.com@localhost
HOMEPAGE= https://github.com/cddlib/cddlib
COMMENT= Efficient implementation of the Double Description Method
-LICENSE= gnu-gpl-v2
+LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
diff --git a/cfiles/Makefile b/cfiles/Makefile
index ef0582682c..8d5f16f8d6 100644
--- a/cfiles/Makefile
+++ b/cfiles/Makefile
@@ -25,11 +25,11 @@ SUBST_STAGE.gcc= pre-configure
SUBST_FILES.gcc+= Makefile
SUBST_SED.gcc+= -e 's|CC = gcc|CC = cc|g'
-SUBST_CLASSES+= ncurses
-SUBST_STAGE.ncurses= pre-configure
-SUBST_MESSAGE.ncurses= Link with the proper curses type
-SUBST_FILES.ncurses= Makefile
-SUBST_SED.ncurses= -e 's|LIBS = -lncursesw|LIBS = -l${BUILDLINK_LIBNAME.curses}|g'
+SUBST_CLASSES+= ncurses
+SUBST_STAGE.ncurses= pre-configure
+SUBST_MESSAGE.ncurses= Link with the proper curses type
+SUBST_FILES.ncurses= Makefile
+SUBST_SED.ncurses= -e 's|LIBS = -lncursesw|LIBS = -l${BUILDLINK_LIBNAME.curses}|g'
SUBST_CLASSES+= install
SUBST_STAGE.install= pre-configure
diff --git a/chronograf/Makefile b/chronograf/Makefile
index 6f6cba06c0..8f2a2d03c9 100644
--- a/chronograf/Makefile
+++ b/chronograf/Makefile
@@ -3,22 +3,22 @@
# TODO give startup scripts more attention
# TODO consider changing default internal paths to reflect ${PREFIX}
-GITHUB_PROJECT= chronograf
-PKGVERSION_NOREV= 1.7.7
-DISTNAME= chronograf-1.7.7
-GITHUB_TAG= ${PKGVERSION_NOREV}
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=influxdata/}
-MAINTAINER= william%welliver.org@localhost
-HOMEPAGE= https://www.influxdata.com/
-COMMENT= Monitoring and visualization UI for the TICK stack
-LICENSE= gnu-agpl-v3
+GITHUB_PROJECT= chronograf
+PKGVERSION_NOREV= 1.7.7
+DISTNAME= chronograf-1.7.7
+GITHUB_TAG= ${PKGVERSION_NOREV}
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=influxdata/}
+MAINTAINER= william%welliver.org@localhost
+HOMEPAGE= https://www.influxdata.com/
+COMMENT= Monitoring and visualization UI for the TICK stack
+LICENSE= gnu-agpl-v3
# despite being the default value, this explicit declaration is required for things
# to build properly.
-EXTRACT_SUFX= .tar.gz
+EXTRACT_SUFX= .tar.gz
-CHRONOGRAF_DISTNAME= ${DISTNAME}${EXTRACT_SUFX}
+CHRONOGRAF_DISTNAME= ${DISTNAME}${EXTRACT_SUFX}
CHRONOGRAF_DEPENDENCIES_DIR= chronograf-dependencies-${PKGVERSION_NOREV}
CHRONOGRAF_DEPENDENCIES= ${CHRONOGRAF_DEPENDENCIES_DIR}${EXTRACT_SUFX}
@@ -30,7 +30,7 @@ SITES.${CHRONOGRAF_DEPENDENCIES}= https://bitbucket.org/hww3/influxdb/downloads/
.endif
EXTRACT_DIR.${CHRONOGRAF_DISTNAME}= ${WRKDIR}/src/github.com/influxdata
-WRKSRC= ${WRKDIR}/src/github.com/influxdata/chronograf
+WRKSRC= ${WRKDIR}/src/github.com/influxdata/chronograf
USE_TOOLS+= gmake curl
USE_LANGUAGES+= c c++
@@ -43,8 +43,8 @@ BUILD_DEPENDS+= yarn-1.7.*:../../devel/yarn
# go language executables don't have SSP support
CHECK_SSP_SKIP= bin/*
-PKGSRC_MAKE_ENV+= GOPATH=${WRKDIR}
-PKGSRC_MAKE_ENV+= GO_BIN=${GO_BIN}
+PKGSRC_MAKE_ENV+= GOPATH=${WRKDIR}
+PKGSRC_MAKE_ENV+= GO_BIN=${GO_BIN}
PKGSRC_MAKE_ENV+= PYTHON=${PREFIX}/bin/python2.7
PKGSRC_MAKE_ENV+= YARN_DISABLE_SELF_UPDATE_CHECK="true"
@@ -76,7 +76,7 @@ INSTALLATION_DIRS+= bin etc/chronograf share/doc/chronograf share/examples/chron
DOC_FILES+= LICENSE LICENSE_OF_DEPENDENCIES.md README.md CHANGELOG.md platform_migrate.md agpl-3.0.md
BIN_FILES+= chronograf chronoctl
-GO_BIN= ${PREFIX}/go110/bin/go
+GO_BIN= ${PREFIX}/go110/bin/go
CPPFLAGS+= -I${PREFIX}/include/node
CFLAGS+= -I${PREFIX}/include/node
diff --git a/cinnamon-screensaver/Makefile b/cinnamon-screensaver/Makefile
index c38a65d7b0..7220eb1950 100644
--- a/cinnamon-screensaver/Makefile
+++ b/cinnamon-screensaver/Makefile
@@ -22,7 +22,7 @@ PLIST_VARS+= pam
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+= --disable-pam
+CONFIGURE_ARGS+= --disable-pam
.else
PLIST.pam= yes
CONFIGURE_ARGS+= --with-pam-prefix=/etc/pam.d \
diff --git a/clementine/Makefile b/clementine/Makefile
index b228e56bf1..bd01bfc078 100644
--- a/clementine/Makefile
+++ b/clementine/Makefile
@@ -25,14 +25,14 @@ CFLAGS+= -Wno-inconsistent-missing-override \
CMAKE_ARGS+= -DENABLE_SPOTIFY_BLOB=OFF \
-DCRYPTOPP_LIBS=${LOCALBASE}/lib/libcryptopp.so \
- -DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
- -DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \
- -DCRYPTOPP_LDFLAGS=-lcryptopp \
- -DCRYPTOPP_LIBRARIES=cryptopp \
- -DCRYPTOPP_LIBRARY_DIRS=${LOCALBASE}/lib \
- -DCRYPTOPP_cryptopp_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
- -DCRYPTOPP_cryptopp_LIBDIR=${LOCALBASE}/lib \
- -DCRYPTOPP_FOUND=1 \
+ -DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
+ -DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \
+ -DCRYPTOPP_LDFLAGS=-lcryptopp \
+ -DCRYPTOPP_LIBRARIES=cryptopp \
+ -DCRYPTOPP_LIBRARY_DIRS=${LOCALBASE}/lib \
+ -DCRYPTOPP_cryptopp_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
+ -DCRYPTOPP_cryptopp_LIBDIR=${LOCALBASE}/lib \
+ -DCRYPTOPP_FOUND=1 \
-DENABLE_DBUS=ON \
-DBUILD_WERROR=OFF
diff --git a/ctags-git/Makefile b/ctags-git/Makefile
index 0b6040a54a..d7c5e20651 100644
--- a/ctags-git/Makefile
+++ b/ctags-git/Makefile
@@ -2,8 +2,8 @@
DISTNAME= ctags-2712201801
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=universal-ctags/}
-GITHUB_TAG= 5728abe4112092437a517e94e30e139ccda63d5a
+MASTER_SITES= ${MASTER_SITE_GITHUB:=universal-ctags/}
+GITHUB_TAG= 5728abe4112092437a517e94e30e139ccda63d5a
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://ctags.io/
diff --git a/dbus-dfbsd/Makefile b/dbus-dfbsd/Makefile
index b04c53e613..e0d27ffa60 100644
--- a/dbus-dfbsd/Makefile
+++ b/dbus-dfbsd/Makefile
@@ -74,7 +74,7 @@ CONFIGURE_ARGS+= --disable-selinux
# CONFIGURE_ARGS+= --disable-systemd
.endif
-PLIST_VARS+= linux
+PLIST_VARS+= linux
DBUS_CONF_DIR= ${PKG_SYSCONFBASE}/dbus-1
OWN_DIRS+= ${DBUS_CONF_DIR}/services
diff --git a/dbus-dfbsd/options.mk b/dbus-dfbsd/options.mk
index b5a71ff1d4..42fb0621b8 100644
--- a/dbus-dfbsd/options.mk
+++ b/dbus-dfbsd/options.mk
@@ -22,7 +22,7 @@ PKG_SUPPORTED_OPTIONS+= kqueue
PKG_SUGGESTED_OPTIONS+= kqueue
.endif
-PLIST_VARS+= launchd
+PLIST_VARS+= launchd
# We may want to make it SUGGESTED once we have a framework for
# launchd support. See PR/49591.
PKG_SUPPORTED_OPTIONS.Darwin+= launchd
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --disable-verbose-mode
.endif
.if !empty(PKG_OPTIONS:Mkqueue)
-CONFIGURE_ARGS+= --enable-kqueue
+CONFIGURE_ARGS+= --enable-kqueue
.else
CONFIGURE_ARGS+= --disable-kqueue
.endif
diff --git a/ddate/Makefile b/ddate/Makefile
index dabd9733a7..64242413e2 100644
--- a/ddate/Makefile
+++ b/ddate/Makefile
@@ -5,8 +5,8 @@ VERSION= 2.12r
PKGNAME= ddate-${VERSION}
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/misc/} \
- http://www.kernel.org/pub/linux/utils/util-linux/ \
- ftp://ftp.fr.kernel.org/pub/linux/utils/util-linux/
+ http://www.kernel.org/pub/linux/utils/util-linux/ \
+ ftp://ftp.fr.kernel.org/pub/linux/utils/util-linux/
MAINTAINER= lkundrak%skosi.org@localhost
HOMEPAGE= http://freshmeat.net/projects/util-linux/
diff --git a/dillo-devel/Makefile b/dillo-devel/Makefile
index 683c1acb60..14921bb88c 100644
--- a/dillo-devel/Makefile
+++ b/dillo-devel/Makefile
@@ -19,11 +19,11 @@ REPLACE_PERL+= dpid/dpidc dillo-install-hyphenation
USE_TOOLS+= autoconf perl:run wget:run
PKG_SYSCONFSUBDIR= dillo
-EGDIR= ${PREFIX}/share/examples/dillo
-CONF_FILES= ${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
-CONF_FILES+= ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
-CONF_FILES+= ${EGDIR}/keysrc ${PKG_SYSCONFDIR}/keysrc
-CONF_FILES+= ${EGDIR}/domainrc ${PKG_SYSCONFDIR}/domainrc
+EGDIR= ${PREFIX}/share/examples/dillo
+CONF_FILES= ${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
+CONF_FILES+= ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
+CONF_FILES+= ${EGDIR}/keysrc ${PKG_SYSCONFDIR}/keysrc
+CONF_FILES+= ${EGDIR}/domainrc ${PKG_SYSCONFDIR}/domainrc
INSTALLATION_DIRS= share/doc/dillo ${EGDIR}
diff --git a/edelib/Makefile b/edelib/Makefile
index 04b46edc84..2186f8433f 100644
--- a/edelib/Makefile
+++ b/edelib/Makefile
@@ -33,8 +33,8 @@ PLIST_VARS+= shlibs statlibs
# Solaris /bin/sh is really bad, so use TOOLS_PLATFORM.sh if it's been defined.
.if ${OPSYS} == "SunOS"
REPLACE_SH+= autogen.sh configure \
- src/tinyscheme/gen-c-string.sh \
- test/abicheck.sh tools/geniconmap
+ src/tinyscheme/gen-c-string.sh \
+ test/abicheck.sh tools/geniconmap
.else
# doxygen doesn't build from pkgsrc on Solaris now - handle this better later
BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
diff --git a/efl121/Makefile b/efl121/Makefile
index 058e617aa3..a2c2b0d058 100644
--- a/efl121/Makefile
+++ b/efl121/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://download.enlightenment.org/rel/libs/efl/
COMMENT= Enlightenment foundation libraries
LICENSE= 2-clause-bsd
-DEPENDS+= xz-[0-9]*:../../archivers/xz
+DEPENDS+= xz-[0-9]*:../../archivers/xz
DEPENDS+= glib2-[0-9]*:../../devel/glib2
DEPENDS+= gstreamer1-[0-9]*:../../multimedia/gstreamer1
DEPENDS+= LuaJIT2-[0-9]*:../../lang/LuaJIT2
@@ -21,7 +21,7 @@ DEPENDS+= fribidi-[0-9]*:../../converters/fribidi
DEPENDS+= png-[0-9]*:../../graphics/png
DEPENDS+= poppler-cpp-[0-9]*:../../print/poppler-cpp
DEPENDS+= libspectre-[0-9]*:../../print/libspectre
-DEPENDS+= MesaLib-[0-9]*:../../graphics/MesaLib
+DEPENDS+= MesaLib-[0-9]*:../../graphics/MesaLib
DEPENDS+= giflib-[0-9]*:../../graphics/giflib
DEPENDS+= tiff-[0-9]*:../../graphics/tiff
DEPENDS+= libraw-[0-9]*:../../graphics/libraw
diff --git a/efl121/buildlink3.mk b/efl121/buildlink3.mk
index 8eaecfbbbc..374c3b88f6 100644
--- a/efl121/buildlink3.mk
+++ b/efl121/buildlink3.mk
@@ -1,9 +1,9 @@
# $NetBSD: buildlink3.mk,v 1.17 2018/08/16 18:54:28 adam Exp $
-BUILDLINK_TREE+= efl
+BUILDLINK_TREE+= efl
-BUILDLINK_ABI_DEPENDS.efl?= efl>=1.21.0nb1
-BUILDLINK_PKGSRCDIR.efl?= ../../wip/efl121
+BUILDLINK_ABI_DEPENDS.efl?= efl>=1.21.0nb1
+BUILDLINK_PKGSRCDIR.efl?= ../../wip/efl121
.include "../../converters/libiconv/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
diff --git a/electrum/Makefile b/electrum/Makefile
index 450e0e5d0b..7ad95e7bce 100644
--- a/electrum/Makefile
+++ b/electrum/Makefile
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.10 2015/04/13 23:22:01 othyro Exp $
-ELECT_VER= 3.3.4
-DISTNAME= Electrum-${ELECT_VER}
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
-CATEGORIES= finance python
-MASTER_SITES= http://download.electrum.org/${ELECT_VER}/
+ELECT_VER= 3.3.4
+DISTNAME= Electrum-${ELECT_VER}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
+CATEGORIES= finance python
+MASTER_SITES= http://download.electrum.org/${ELECT_VER}/
MAINTAINER= kyuupichan%gmail.com@localhost
HOMEPAGE= http://electrum.org/
diff --git a/enlightenment0224/Makefile b/enlightenment0224/Makefile
index c67579dacd..d56f76ddd3 100644
--- a/enlightenment0224/Makefile
+++ b/enlightenment0224/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE= https://download.enlightenment.org/rel/apps/enlightenment/
COMMENT= Enlightenment desktop
LICENSE= 2-clause-bsd
-DEPENDS+= efl121-[0-9]*:../../wip/efl121
-DEPENDS+= terminology-[0-9]*:../../wip/terminology
+DEPENDS+= efl121-[0-9]*:../../wip/efl121
+DEPENDS+= terminology-[0-9]*:../../wip/terminology
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/epix/Makefile b/epix/Makefile
index c906943a23..30db6e2ae1 100644
--- a/epix/Makefile
+++ b/epix/Makefile
@@ -11,8 +11,8 @@ LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-USE_TOOLS= bash:run ghostscript gmake makeinfo
-INFO_FILES= yes
+USE_TOOLS= bash:run ghostscript gmake makeinfo
+INFO_FILES= yes
BUILD_DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex
BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
diff --git a/fbida/Makefile b/fbida/Makefile
index 8db5ad9f42..973a119817 100644
--- a/fbida/Makefile
+++ b/fbida/Makefile
@@ -27,7 +27,7 @@ post-extract:
done
# Depend on this, purely for fetching the distfile.
-DEPENDS+= jpeg>=9c:../../graphics/jpeg
+DEPENDS+= jpeg>=9c:../../graphics/jpeg
# not used, even though the configure output claims it
#.include "../../graphics/ImageMagick/buildlink3.mk"
diff --git a/flnews-devel/options.mk b/flnews-devel/options.mk
index 0600f9e236..43af90a143 100644
--- a/flnews-devel/options.mk
+++ b/flnews-devel/options.mk
@@ -21,12 +21,12 @@ FLNEWS_OPT_DISABLE_IP6= 1
# nls: Optional support for National Language Support (NLS)
# Requires an OS with X/Open XSI extension API (SUSv2) and the gencat utility
# Note: Only locales with UTF-8, ISO-8859-1 or US-ASCII codeset are supported!
-PLIST_VARS+= nls
+PLIST_VARS+= nls
.if !empty(PKG_OPTIONS:Mnls)
-PLIST.nls= yes
-FLNEWS_OPT_DISABLE_NLS= 0
+PLIST.nls= yes
+FLNEWS_OPT_DISABLE_NLS= 0
.else
-FLNEWS_OPT_DISABLE_NLS= 1
+FLNEWS_OPT_DISABLE_NLS= 1
.endif
# xdbe: Optional support for X11 Double Buffer Extension (XDBE)
diff --git a/free42/Makefile b/free42/Makefile
index 0f23c17759..06d6fe090b 100644
--- a/free42/Makefile
+++ b/free42/Makefile
@@ -24,8 +24,8 @@ BUILD_TARGET= free42${VARIANT}
CXXFLAGS.NetBSD+= -DNO_SINCOS
MAKE_ENV.Linux+= AUDIO_ALSA=1
-INSTALLATION_DIRS+= bin
-INSTALLATION_DIRS+= share/doc/free42
+INSTALLATION_DIRS+= bin
+INSTALLATION_DIRS+= share/doc/free42
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${BUILD_DIRS}/${BUILD_TARGET} \
diff --git a/freebsd-svn/Makefile b/freebsd-svn/Makefile
index 3b111cbf08..aa9215ed9e 100644
--- a/freebsd-svn/Makefile
+++ b/freebsd-svn/Makefile
@@ -9,12 +9,12 @@ BROKEN_GETTEXT_DETECTION= yes
.include "../../devel/subversion/Makefile.common"
-CONFLICTS+= subversion-[0-9]* subversion-base-[0-9]*
+CONFLICTS+= subversion-[0-9]* subversion-base-[0-9]*
DISTINFO_FILE= ${.CURDIR}/../../wip/freebsd-svn/distinfo
-PATCHFILES+= extra-patch-fbsd-template
-PATCH_SITES+= https://svnweb.freebsd.org/ports/head/devel/subversion19/files/
+PATCHFILES+= extra-patch-fbsd-template
+PATCH_SITES+= https://svnweb.freebsd.org/ports/head/devel/subversion19/files/
USE_TOOLS+= msgfmt
diff --git a/freerdp/Makefile b/freerdp/Makefile
index 625d61426f..d44e16f4c4 100644
--- a/freerdp/Makefile
+++ b/freerdp/Makefile
@@ -14,11 +14,11 @@ LICENSE= apache-2.0
TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
-USE_CMAKE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config
-#USE_OLD_DES_API=yes
-CMAKE_ARGS+= -DWITH_WAYLAND=OFF
+USE_CMAKE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= pkg-config
+#USE_OLD_DES_API= yes
+CMAKE_ARGS+= -DWITH_WAYLAND=OFF
PKGCONFIG_OVERRIDE+= freerdp.pc.in
diff --git a/fxt/Makefile b/fxt/Makefile
index 1808f35977..2637b8f6c5 100644
--- a/fxt/Makefile
+++ b/fxt/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
WRKSRC= ${WRKDIR}/fxt
USE_TOOLS+= gmake perl
-MAKE_FILE= makefile
+MAKE_FILE= makefile
USE_LANGUAGES= c++
#Minimal configuration
diff --git a/ganglia-webfrontend/options.mk b/ganglia-webfrontend/options.mk
index e485009b0f..7a7dc7d0c2 100644
--- a/ganglia-webfrontend/options.mk
+++ b/ganglia-webfrontend/options.mk
@@ -26,9 +26,9 @@ BUILD_DEFS+= APACHE_USER APACHE_GROUP
###
.if !empty(PKG_OPTIONS:Mnginx)
DEPENDS+= nginx-[0-9]*:../../www/nginx
-NGINX_USER?= nginx
-NGINX_GROUP?= nginx
-WWW_USER?= ${NGINX_USER}
-WWW_GROUP?= ${NGINX_USER}
-BUILD_DEFS+= NGINX_USER NGINX_GROUP
+NGINX_USER?= nginx
+NGINX_GROUP?= nginx
+WWW_USER?= ${NGINX_USER}
+WWW_GROUP?= ${NGINX_USER}
+BUILD_DEFS+= NGINX_USER NGINX_GROUP
.endif
diff --git a/gcc9snapshot/options.mk b/gcc9snapshot/options.mk
index cbf0c1b31f..d6386b80b4 100644
--- a/gcc9snapshot/options.mk
+++ b/gcc9snapshot/options.mk
@@ -76,9 +76,9 @@ LIBS.SunOS+= -lgmp
### Graphite Support
###
.if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL16= isl-0.16.1
-SITES.${ISL16}.tar.bz2= ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES+= ${ISL16}.tar.bz2
+ISL16= isl-0.16.1
+SITES.${ISL16}.tar.bz2= ${MASTER_SITE_GNU:=gcc/infrastructure/}
+DISTFILES+= ${ISL16}.tar.bz2
.endif
.if !empty(PKG_OPTIONS:Mgcc-objc++)
diff --git a/gdb/Makefile b/gdb/Makefile
index 66b766483c..4f66385fab 100644
--- a/gdb/Makefile
+++ b/gdb/Makefile
@@ -12,16 +12,16 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++11
BROKEN_GETTEXT_DETECTION= yes
-GNU_CONFIGURE= YES
-USE_PKGLOCALEDIR= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= bash gmake msgfmt makeinfo perl:build
+GNU_CONFIGURE= YES
+USE_PKGLOCALEDIR= YES
+USE_LIBTOOL= YES
+USE_TOOLS+= bash gmake msgfmt makeinfo perl:build
REPLACE_LOCALEDIR_PATTERNS+= Make-in
-REPLACE_BASH+= gdb/gcore.in
-INSTALL_TARGET= install install-info
-TEST_TARGET= check
-INFO_FILES= yes
-CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
+REPLACE_BASH+= gdb/gcore.in
+INSTALL_TARGET= install install-info
+TEST_TARGET= check
+INFO_FILES= yes
+CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
# In gdb/configure, depcomp is parsed with sed.
SUBST_CLASSES+= fix-depcomp
@@ -67,7 +67,7 @@ TARGET_STR= ${MACHINE_ARCH}--dragonfly
BUILD_DEFS+= ${TARGET_STR}
## Remove "-pc" string, without this, getting following message:
## *** Gdb does not support native target i386-pc-dragonfly"
-CONFIGURE_ARGS+= --target=${TARGET_STR}
+CONFIGURE_ARGS+= --target=${TARGET_STR}
TEST_ENV= DEJAGNU=${WRKDIR}/../files/dragonfly-default.exp
.endif
diff --git a/gdsreader/Makefile b/gdsreader/Makefile
index aa71189d4b..02f2b94143 100644
--- a/gdsreader/Makefile
+++ b/gdsreader/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE}
-AUTO_MKDIRS= yes
+AUTO_MKDIRS= yes
INSTALLATION_DIRS= bin ${EXAMPLESDIR}
do-install:
diff --git a/gerris/Makefile b/gerris/Makefile
index 43824c2bcc..b306d035d8 100644
--- a/gerris/Makefile
+++ b/gerris/Makefile
@@ -13,7 +13,7 @@ COMMENT= Software solution of the PDE describing fluid flow
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config pax
-USE_LANGUAGES+= c c++
+USE_LANGUAGES+= c c++
PKGCONFIG_OVERRIDE+= src/gerris2D.pc.in
PKGCONFIG_OVERRIDE+= src/gerris2D3.pc.in
diff --git a/givaro/Makefile b/givaro/Makefile
index e4401e7237..3ef7279692 100644
--- a/givaro/Makefile
+++ b/givaro/Makefile
@@ -11,7 +11,7 @@ COMMENT= C++ library for arithmetic and algebraic computations
LICENSE= cecill-2.0
GNU_CONFIGURE= yes
-USE_LIBTOOL=yes
+USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
diff --git a/glib2/Makefile b/glib2/Makefile
index 8b2c732a52..8750b9366c 100644
--- a/glib2/Makefile
+++ b/glib2/Makefile
@@ -32,8 +32,8 @@ CHECK_WRKREF_SKIP+= bin/gtester-report
# need pcre utf8 + unicode-properties
BUILDLINK_API_DEPENDS.pcre+= pcre>=8.31
# to avoid pkg-config dependency, explicitly specify pcre location
-CONFIGURE_ARGS+= PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
-CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
+CONFIGURE_ARGS+= PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
+CONFIGURE_ARGS+= PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib -L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
# needs gz_header structure
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2.1
diff --git a/glib2/modules.mk b/glib2/modules.mk
index e563a7c701..a6cd710137 100644
--- a/glib2/modules.mk
+++ b/glib2/modules.mk
@@ -12,7 +12,7 @@ GIO_QUERYMODULES= ${BUILDLINK_PREFIX.glib2}/bin/gio-querymodules
FILES_SUBST+= GIO_MODULES_DIR=${GIO_MODULES_DIR:Q}
FILES_SUBST+= GIO_QUERYMODULES=${GIO_QUERYMODULES:Q}
-GIO_MODULES_DIR=${BUILDLINK_PREFIX.glib2}/lib/gio/modules
+GIO_MODULES_DIR= ${BUILDLINK_PREFIX.glib2}/lib/gio/modules
INSTALL_TEMPLATES+= ../../devel/glib2/files/modules.tmpl
DEINSTALL_TEMPLATES+= ../../devel/glib2/files/modules.tmpl
diff --git a/glib2/schemas.mk b/glib2/schemas.mk
index 14a916074a..604e8ba7d3 100644
--- a/glib2/schemas.mk
+++ b/glib2/schemas.mk
@@ -12,7 +12,7 @@ GLIB_COMPILE_SCHEMAS= ${BUILDLINK_PREFIX.glib2}/bin/glib-compile-schemas
FILES_SUBST+= GLIB_SCHEMAS_DIR=${GLIB_SCHEMAS_DIR:Q}
FILES_SUBST+= GLIB_COMPILE_SCHEMAS=${GLIB_COMPILE_SCHEMAS:Q}
-GLIB_SCHEMAS_DIR=${BUILDLINK_PREFIX.glib2}/share/glib-2.0/schemas
+GLIB_SCHEMAS_DIR= ${BUILDLINK_PREFIX.glib2}/share/glib-2.0/schemas
INSTALL_TEMPLATES+= ../../devel/glib2/files/schemas.tmpl
DEINSTALL_TEMPLATES+= ../../devel/glib2/files/schemas.tmpl
diff --git a/glista/Makefile b/glista/Makefile
index fe456283e8..4af4aaf901 100644
--- a/glista/Makefile
+++ b/glista/Makefile
@@ -11,7 +11,7 @@ COMMENT= Simple task list management utility
PKG_DESTDIR_SUPPORT= user-destdir
-USE_DIRS+= xdg-1.4
+USE_DIRS+= xdg-1.4
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
diff --git a/go-bytebufferpool/buildlink3.mk b/go-bytebufferpool/buildlink3.mk
index 05eebff1bb..5021a990cf 100644
--- a/go-bytebufferpool/buildlink3.mk
+++ b/go-bytebufferpool/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-bytebufferpool= ${EGREP} gopkg/
BUILDLINK_DEPMETHOD.go-bytebufferpool?= build
BUILDLINK_API_DEPENDS.go-bytebufferpool+= go-bytebufferpool>=1.0.0
-BUILDLINK_PKGSRCDIR.go-bytebufferpool?= ../../wip/go-bytebufferpool
+BUILDLINK_PKGSRCDIR.go-bytebufferpool?= ../../wip/go-bytebufferpool
.endif # GO_BYTEBUFFERPOOL_BUILDLINK3_MK
BUILDLINK_TREE+= -go-bytebufferpool
diff --git a/go-compress/buildlink3.mk b/go-compress/buildlink3.mk
index 886a289a54..256145bff2 100644
--- a/go-compress/buildlink3.mk
+++ b/go-compress/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-compress
GO_COMPRESS_BUILDLINK3_MK:=
BUILDLINK_CONTENTS_FILTER.go-compress= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-compress?= build
+BUILDLINK_DEPMETHOD.go-compress?= build
BUILDLINK_API_DEPENDS.go-compress+= go-compress>=1.5.0
BUILDLINK_PKGSRCDIR.go-compress?= ../../wip/go-compress
diff --git a/go-cpuid/buildlink3.mk b/go-cpuid/buildlink3.mk
index 036fe72aa0..a3341876e0 100644
--- a/go-cpuid/buildlink3.mk
+++ b/go-cpuid/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-cpuid= ${EGREP} gopkg/
BUILDLINK_DEPMETHOD.go-cpuid?= build
BUILDLINK_API_DEPENDS.go-cpuid+= go-cpuid>=1.2.1
-BUILDLINK_PKGSRCDIR.go-cpuid?= ../../wip/go-cpuid
+BUILDLINK_PKGSRCDIR.go-cpuid?= ../../wip/go-cpuid
.endif # GO_CPUID_BUILDLINK3_MK
BUILDLINK_TREE+= -go-cpuid
diff --git a/go-dotenv/buildlink3.mk b/go-dotenv/buildlink3.mk
index 1dd5b1cd12..ca78026ca6 100644
--- a/go-dotenv/buildlink3.mk
+++ b/go-dotenv/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-dotenv= ${EGREP} gopkg/
BUILDLINK_DEPMETHOD.go-dotenv?= build
BUILDLINK_API_DEPENDS.go-dotenv+= go-dotenv>=20180121
-BUILDLINK_PKGSRCDIR.go-dotenv?= ../../wip/go-dotenv
+BUILDLINK_PKGSRCDIR.go-dotenv?= ../../wip/go-dotenv
.endif # GO_DOTENV_BUILDLINK3_MK
BUILDLINK_TREE+= -go-dotenv
diff --git a/go-fasthttp/buildlink3.mk b/go-fasthttp/buildlink3.mk
index 97301176b8..b64c254f74 100644
--- a/go-fasthttp/buildlink3.mk
+++ b/go-fasthttp/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-fasthttp
GO_FASTHTTP_BUILDLINK3_MK:=
BUILDLINK_CONTENTS_FILTER.go-fasthttp= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-fasthttp?= build
+BUILDLINK_DEPMETHOD.go-fasthttp?= build
BUILDLINK_API_DEPENDS.go-fasthttp+= go-fasthttp>=1.3.0
BUILDLINK_PKGSRCDIR.go-fasthttp?= ../../wip/go-fasthttp
diff --git a/go-junit-report/Makefile b/go-junit-report/Makefile
index dd866b7e00..4bed54e551 100644
--- a/go-junit-report/Makefile
+++ b/go-junit-report/Makefile
@@ -1,9 +1,9 @@
# $NetBSD$
GITHUB_PROJECT= go-junit-report
-GITHUB_TAG= af01ea7f8024089b458d804d5cdf190f962a9a0c
-#DISTNAME= go-junit-report
-DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG}
+GITHUB_TAG= af01ea7f8024089b458d804d5cdf190f962a9a0c
+#DISTNAME= go-junit-report
+DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG}
PKGREVISION= 1
CATEGORIES= wip
diff --git a/go-junit-report/buildlink3.mk b/go-junit-report/buildlink3.mk
index b099ff26c5..d660daffd6 100644
--- a/go-junit-report/buildlink3.mk
+++ b/go-junit-report/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-junit-report
GO_JUNIT_REPORT_BUILDLINK3_MK:=
BUILDLINK_CONTENTS_FILTER.go-junit-report= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-junit-report?= build
+BUILDLINK_DEPMETHOD.go-junit-report?= build
BUILDLINK_API_DEPENDS.go-junit-report+= go-junit-report>=1.3.0
BUILDLINK_PKGSRCDIR.go-junit-report?= ../../wip/go-junit-report
diff --git a/go-kr-text/buildlink3.mk b/go-kr-text/buildlink3.mk
index b4a4faf623..3f0092c364 100644
--- a/go-kr-text/buildlink3.mk
+++ b/go-kr-text/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-kr-text
GO_KR_TEXT_BUILDLINK3_MK=
BUILDLINK_CONTENTS_FILTER.go-kr-text= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-kr-text?= build
+BUILDLINK_DEPMETHOD.go-kr-text?= build
BUILDLINK_API_DEPENDS.go-kr-text+= go-kr-text>=0.0
BUILDLINK_PKGSRCDIR.go-kr-text?= ../../wip/go-kr-text
diff --git a/go-paths-helper/Makefile b/go-paths-helper/Makefile
index 4bfd5784d7..8673261fe7 100644
--- a/go-paths-helper/Makefile
+++ b/go-paths-helper/Makefile
@@ -1,8 +1,8 @@
# $NetBSD$
GITHUB_PROJECT= go-paths-helper
-GITHUB_TAG= c3c98d1bf2e1069f60ab84bff3a2eb3c5422f3b0
-DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG}
+GITHUB_TAG= c3c98d1bf2e1069f60ab84bff3a2eb3c5422f3b0
+DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG}
PKGREVISION= 1
CATEGORIES= wip
diff --git a/go-pkgconfig/buildlink3.mk b/go-pkgconfig/buildlink3.mk
index fbe065f75e..11498f57d1 100644
--- a/go-pkgconfig/buildlink3.mk
+++ b/go-pkgconfig/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-pkgconfig
GO_PKGCONFIG_BUILDLINK3_MK:=
BUILDLINK_CONTENTS_FILTER.go-pkgconfig= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-pkgconfig?= build
+BUILDLINK_DEPMETHOD.go-pkgconfig?= build
BUILDLINK_API_DEPENDS.go-pkgconfig+= go-pkgconfig>=0.0.0
BUILDLINK_PKGSRCDIR.go-pkgconfig?= ../../wip/go-pkgconfig
diff --git a/go-properties-map/Makefile b/go-properties-map/Makefile
index e6e33cbfe4..7b07941d01 100644
--- a/go-properties-map/Makefile
+++ b/go-properties-map/Makefile
@@ -1,8 +1,8 @@
# $NetBSD$
GITHUB_PROJECT= go-properties-map
-GITHUB_TAG= ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41
-DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG}
+GITHUB_TAG= ad37f0cfeff29fadeabe6b2f7f852d8db1fb5c41
+DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG}
PKGREVISION= 1
CATEGORIES= wip
@@ -14,10 +14,10 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/arduino/go-properties-map
COMMENT= TODO: Short description of the package
LICENSE= mit
-USE_LANGUAGES= go
+USE_LANGUAGES= go
GO_DIST_BASE= ${GITHUB_PROJECT}-${GITHUB_TAG}
-GO_SRCPATH= github.com/arduino/go-properties-map
+GO_SRCPATH= github.com/arduino/go-properties-map
DEPENDS+= go-paths-helper>=0:../../wip/go-paths-helper
diff --git a/go-properties-map/buildlink3.mk b/go-properties-map/buildlink3.mk
index 3c18866985..e31234f8d6 100644
--- a/go-properties-map/buildlink3.mk
+++ b/go-properties-map/buildlink3.mk
@@ -8,7 +8,7 @@ BUILDLINK_CONTENTS_FILTER.go-properties-map= ${EGREP} gopkg/
BUILDLINK_DEPMETHOD.go-properties-map?= build
BUILDLINK_API_DEPENDS.go-properties-map+= go-properties-map>=0
-BUILDLINK_PKGSRCDIR.go-properties-map?= ../../wip/go-properties-map
+BUILDLINK_PKGSRCDIR.go-properties-map?= ../../wip/go-properties-map
.include "../../wip/go-paths-helper/buildlink3.mk"
.endif # GO_PROPERTIES_MAP_BUILDLINK3_MK
diff --git a/go-tcplisten/buildlink3.mk b/go-tcplisten/buildlink3.mk
index 36a8d347e3..9b375811a6 100644
--- a/go-tcplisten/buildlink3.mk
+++ b/go-tcplisten/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-tcplisten
GO_TCPLISTEN_BUILDLINK3_MK:=
BUILDLINK_CONTENTS_FILTER.go-tcplisten= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-tcplisten?= build
+BUILDLINK_DEPMETHOD.go-tcplisten?= build
BUILDLINK_API_DEPENDS.go-tcplisten+= go-tcplisten>=0.0.0
BUILDLINK_PKGSRCDIR.go-tcplisten?= ../../wip/go-tcplisten
diff --git a/go-xxhash/buildlink3.mk b/go-xxhash/buildlink3.mk
index e8f0184d98..b56dfd0324 100644
--- a/go-xxhash/buildlink3.mk
+++ b/go-xxhash/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-xxhash= ${EGREP} gopkg/
BUILDLINK_DEPMETHOD.go-xxhash?= build
BUILDLINK_API_DEPENDS.go-xxhash+= go-xxhash>=2.0.0
-BUILDLINK_PKGSRCDIR.go-xxhash?= ../../wip/go-xxhash
+BUILDLINK_PKGSRCDIR.go-xxhash?= ../../wip/go-xxhash
.endif # GO_XXHASH_BUILDLINK3_MK
BUILDLINK_TREE+= -go-xxhash
diff --git a/gromacs/Makefile b/gromacs/Makefile
index 0ff19eaec9..a6f9980cef 100644
--- a/gromacs/Makefile
+++ b/gromacs/Makefile
@@ -19,7 +19,7 @@ USE_CMAKE= yes
USE_TOOLS+= perl:run
REPLACE_PERL= scripts/demux.pl scripts/xplor2gmx.pl
-CHECK_INTERPRETER_SKIP+= share/gromacs/tutor/gmxdemo/demo
+CHECK_INTERPRETER_SKIP+= share/gromacs/tutor/gmxdemo/demo
.include "../../mk/bsd.prefs.mk"
diff --git a/gromacs/options.mk b/gromacs/options.mk
index c0e3f3653e..a7660f3965 100644
--- a/gromacs/options.mk
+++ b/gromacs/options.mk
@@ -20,7 +20,7 @@ PLIST_SUBST+= MPI=
# X support:
.if !empty(PKG_OPTIONS:Mx11)
CONFIGURE_ARGS+= --with-x
-PLIST.x11= yes
+PLIST.x11= yes
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
diff --git a/gromacs2018/Makefile b/gromacs2018/Makefile
index 4c91529d8e..6b2c64c32a 100644
--- a/gromacs2018/Makefile
+++ b/gromacs2018/Makefile
@@ -19,7 +19,7 @@ USE_CMAKE= yes
USE_TOOLS+= perl:run
REPLACE_PERL= scripts/demux.pl scripts/xplor2gmx.pl
-CHECK_INTERPRETER_SKIP+= share/gromacs/tutor/gmxdemo/demo
+CHECK_INTERPRETER_SKIP+= share/gromacs/tutor/gmxdemo/demo
.include "../../mk/bsd.prefs.mk"
diff --git a/gromacs2018/options.mk b/gromacs2018/options.mk
index 817bb512fa..cea1e5dec6 100644
--- a/gromacs2018/options.mk
+++ b/gromacs2018/options.mk
@@ -20,7 +20,7 @@ PLIST_SUBST+= MPI=
# X support:
.if !empty(PKG_OPTIONS:Mx11)
CONFIGURE_ARGS+= --with-x
-PLIST.x11= yes
+PLIST.x11= yes
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
diff --git a/guile-bytestructures/Makefile b/guile-bytestructures/Makefile
index abc669ed28..2b929bd6fa 100644
--- a/guile-bytestructures/Makefile
+++ b/guile-bytestructures/Makefile
@@ -18,8 +18,8 @@ USE_LANGUAGES= c
USE_TOOLS+= automake autoconf autoreconf pkg-config
GNU_CONFIGURE= yes
-GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
-CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
+GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
+CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
pre-configure:
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -I${PREFIX}/guile/2.2/share/aclocal -vif
diff --git a/guile-commonmark/Makefile b/guile-commonmark/Makefile
index 4928d4acb6..f1a6dbceee 100644
--- a/guile-commonmark/Makefile
+++ b/guile-commonmark/Makefile
@@ -11,7 +11,7 @@ COMMENT= Implementation of CommonMark for Guile
LICENSE= gnu-lgpl-v3
USE_TOOLS+= pkg-config
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
diff --git a/guile-gcrypt/Makefile b/guile-gcrypt/Makefile
index 4b1ebcccc9..cca0d6af13 100644
--- a/guile-gcrypt/Makefile
+++ b/guile-gcrypt/Makefile
@@ -17,8 +17,8 @@ USE_LANGUAGES= # none
USE_TOOLS+= automake autoconf autoreconf pkg-config makeinfo
GNU_CONFIGURE= YES
-GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
-CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
+GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
+CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
CONFIGURE_ARGS+= --with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt}
pre-configure:
diff --git a/guile-git/Makefile b/guile-git/Makefile
index 4a20fca674..dfb3743c7b 100644
--- a/guile-git/Makefile
+++ b/guile-git/Makefile
@@ -15,8 +15,8 @@ USE_LANGUAGES= c
USE_TOOLS+= automake autoconf autoreconf pkg-config
DEPENDS+= guile-bytestructures>=1.0.5:../../wip/guile-bytestructures
-GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
-CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
+GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
+CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
CONFIGURE_ENV+= LIBGIT2_LIBDIR=${BUILDLINK_PREFIX.libgit2}/lib
pre-configure:
diff --git a/guile-haunt/Makefile b/guile-haunt/Makefile
index 7a068ed41c..07465648b1 100644
--- a/guile-haunt/Makefile
+++ b/guile-haunt/Makefile
@@ -10,10 +10,10 @@ HOMEPAGE= https://files.dthompson.us/haunt/
COMMENT= Functional static web site generator
LICENSE= gnu-gpl-v3
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
-USE_TOOLS+= automake autoconf autoreconf pkg-config
+USE_TOOLS+= automake autoconf autoreconf pkg-config
DEPENDS+= guile-commonmark-[0-9]*:../../wip/guile-commonmark
INFO_FILES= YES
diff --git a/guile-json/Makefile b/guile-json/Makefile
index 9dd315e156..fc495424a6 100644
--- a/guile-json/Makefile
+++ b/guile-json/Makefile
@@ -10,8 +10,8 @@ COMMENT= JSON module for Guile
LICENSE= gnu-gpl-v3
USE_LANGUAGES= # none
-USE_TOOLS+= automake autoconf autoreconf pkg-config makeinfo
-GNU_CONFIGURE= YES
+USE_TOOLS+= automake autoconf autoreconf pkg-config makeinfo
+GNU_CONFIGURE= YES
GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
diff --git a/guile-reader/Makefile b/guile-reader/Makefile
index f656851c8d..08b1786bda 100644
--- a/guile-reader/Makefile
+++ b/guile-reader/Makefile
@@ -11,7 +11,7 @@ COMMENT= Extensible reader framework for GNU Guile.
USE_TOOLS+= pkg-config automake autoconf autoreconf gmake
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
# --with-guilemoduledir=/usr/pkg/guile/2.2/share/guile/site/2.2'.
diff --git a/guile-sqlite3/Makefile b/guile-sqlite3/Makefile
index 4d227e583a..c329139678 100644
--- a/guile-sqlite3/Makefile
+++ b/guile-sqlite3/Makefile
@@ -2,7 +2,7 @@
DISTNAME= v0.1.0
DIST_SUBDIR= ${PKGNAME_NOREV}
-PKGNAME= guile-sqlite3-${DISTNAME:S/v//}
+PKGNAME= guile-sqlite3-${DISTNAME:S/v//}
CATEGORIES= databases
MASTER_SITES= https://notabug.org/guile-sqlite3/guile-sqlite3/archive/
@@ -13,8 +13,8 @@ LICENSE= gnu-lgpl-v3 AND gnu-gpl-v2
WRKSRC= ${WRKDIR}/guile-sqlite3
USE_LANGUAGES= c
-USE_TOOLS+= automake autoconf autoreconf pkg-config
-GNU_CONFIGURE= YES
+USE_TOOLS+= automake autoconf autoreconf pkg-config
+GNU_CONFIGURE= YES
# not all sqlite3.pc files provide the pkg-config variable, set path manually
# see also patch-configure.ac
diff --git a/guile-syntax-highlight/Makefile b/guile-syntax-highlight/Makefile
index b3b802e1b9..79664ac146 100644
--- a/guile-syntax-highlight/Makefile
+++ b/guile-syntax-highlight/Makefile
@@ -9,10 +9,10 @@ HOMEPAGE= https://dthompson.us/projects/guile-syntax-highlight.html
COMMENT= General-purpose syntax highlighting library for GNU Guile
LICENSE= gnu-lgpl-v3
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config
.include "../../lang/guile22/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/harmony/Makefile b/harmony/Makefile
index fbc8c4eaff..3d01e51b2e 100644
--- a/harmony/Makefile
+++ b/harmony/Makefile
@@ -142,7 +142,7 @@ INSTALLATION_DIRS+= ${BZDIR}/${i}
.endfor
FILES_SUBST+= WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
- BZDIR=${BZDIR}
+ BZDIR=${BZDIR}
do-configure:
(cd ${WRKSRC}; ./checksetup.pl)
diff --git a/heimdal/Makefile b/heimdal/Makefile
index 7c44aa4d04..5fd30e95f3 100644
--- a/heimdal/Makefile
+++ b/heimdal/Makefile
@@ -3,8 +3,8 @@
DISTNAME= heimdal-7.5.0
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GITHUB:=heimdal/}
-GITHUB_PROJECT= heimdal
-GITHUB_RELEASE= ${DISTNAME}
+GITHUB_PROJECT= heimdal
+GITHUB_RELEASE= ${DISTNAME}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.h5l.org/
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}
CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editlinereadline}
.endif
-PLIST_VARS+= glob vis
+PLIST_VARS+= glob vis
.if ${OPSYS} == "SunOS"
PLIST.vis= yes
PLIST.glob= yes
@@ -76,8 +76,8 @@ PLIST.glob= yes
# Linux does not have include/vis.h and expected include/glob.h.
.if ${OPSYS} == "Linux"
-PLIST.vis= yes
-PLIST.glob= yes
+PLIST.vis= yes
+PLIST.glob= yes
# Without this I get undefined references to pthread_getspecific
PTHREAD_AUTO_VARS= yes
.endif
diff --git a/heimdal/builtin.mk b/heimdal/builtin.mk
index 569efb0f15..7f34ea6bca 100644
--- a/heimdal/builtin.mk
+++ b/heimdal/builtin.mk
@@ -21,7 +21,7 @@ IS_BUILTIN.heimdal= no
IS_BUILTIN.heimdal= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.heimdal
+MAKEVARS+= IS_BUILTIN.heimdal
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -50,6 +50,7 @@ _BLTN_HEIMDAL_0.4e= NetBSD-1.6[A-H]-* \
_BLTN_HEIMDAL_0.3f= NetBSD-1.5X-*
_BLTN_HEIMDAL_0.3e= NetBSD-1.5[UVW]-* \
NetBSD-1.5.*-*
+
. for _heimdal_version_ in ${_BLTN_HEIMDAL_VERSIONS}
. for _pattern_ in ${_BLTN_HEIMDAL_${_heimdal_version_}}
. if !empty(MACHINE_PLATFORM:M${_pattern_})
@@ -61,7 +62,7 @@ BUILTIN_VERSION.heimdal?= 0.2t
. endif
BUILTIN_PKG.heimdal= heimdal-${BUILTIN_VERSION.heimdal}
.endif
-MAKEVARS+= BUILTIN_PKG.heimdal
+MAKEVARS+= BUILTIN_PKG.heimdal
###
### Determine whether we should use the built-in implementation if it
diff --git a/hmmer/Makefile b/hmmer/Makefile
index 81a3d2ccf0..a47d34d892 100644
--- a/hmmer/Makefile
+++ b/hmmer/Makefile
@@ -8,14 +8,14 @@
###########################################################
# Unconverted and partially converted FreeBSD port syntax:
-#TEST_TARGET= check
-#SHEBANG_GLOB= *.pl
+#TEST_TARGET= check
+#SHEBANG_GLOB= *.pl
#OPTIONS_DEFINE= DOCS EXAMPLES TEST
-#DOCFILES= Userguide.pdf
-#EXAMPLES= 7LESS_DROME HBB_HUMAN MADE1.hmm MADE1.sto \
-# Pkinase.hmm Pkinase.sto dna_target.fa fn3.hmm fn3.sto \
-# globins4.hmm globins4.sto globins45.fa
-#TEST_VARS= use_perl5=build
+#DOCFILES= Userguide.pdf
+#EXAMPLES= 7LESS_DROME HBB_HUMAN MADE1.hmm MADE1.sto \
+# Pkinase.hmm Pkinase.sto dna_target.fa fn3.hmm fn3.sto \
+# globins4.hmm globins4.sto globins45.fa
+#TEST_VARS= use_perl5=build
#post-build-TEST-on: do-test
#post-install:
# @${STRIP} ${DESTDIR}${PREFIX}/bin/*
@@ -36,7 +36,7 @@ COMMENT= Profile hidden Markov models for biological sequence analysis
LICENSE= modified-bsd
# Requires SSE2 or AltiVec instructions
-ONLY_FOR_PLATFORM= *-*-x86_64 *-*-i386 *-*-ia64 *-*-powerpc *-*-powerpc64
+ONLY_FOR_PLATFORM= *-*-x86_64 *-*-i386 *-*-ia64 *-*-powerpc *-*-powerpc64
USE_LANGUAGES= c c++
USE_TOOLS+= gmake perl:test
diff --git a/influxdb/Makefile b/influxdb/Makefile
index 25f2cb06a6..3810963fdb 100644
--- a/influxdb/Makefile
+++ b/influxdb/Makefile
@@ -1,33 +1,33 @@
# $NetBSD$
-GITHUB_PROJECT= influxdb
-PKGVERSION_NOREV= 1.6.5
-DISTNAME= influxdb-1.6.5
-GITHUB_TAG= v${PKGVERSION_NOREV}
-CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_GITHUB:=influxdata/}
-MAINTAINER= william%welliver.org@localhost
-HOMEPAGE= https://www.influxdata.com/
-COMMENT= Time-series Database
-LICENSE= mit
+GITHUB_PROJECT= influxdb
+PKGVERSION_NOREV= 1.6.5
+DISTNAME= influxdb-1.6.5
+GITHUB_TAG= v${PKGVERSION_NOREV}
+CATEGORIES= databases
+MASTER_SITES= ${MASTER_SITE_GITHUB:=influxdata/}
+MAINTAINER= william%welliver.org@localhost
+HOMEPAGE= https://www.influxdata.com/
+COMMENT= Time-series Database
+LICENSE= mit
# despite being the default value, this explicit declaration is required for things
# to build properly.
-EXTRACT_SUFX= .tar.gz
+EXTRACT_SUFX= .tar.gz
-IFDB_DISTNAME= ${DISTNAME}${EXTRACT_SUFX}
+IFDB_DISTNAME= ${DISTNAME}${EXTRACT_SUFX}
IFDB_DEPENDENCIES= influxdb-dependencies-${PKGVERSION_NOREV}.tar.gz
-DISTFILES= ${IFDB_DISTNAME}
+DISTFILES= ${IFDB_DISTNAME}
.if !defined(BOOTSTRAP)
-DISTFILES+= ${IFDB_DEPENDENCIES}
+DISTFILES+= ${IFDB_DEPENDENCIES}
SITES.influxdb-dependencies-${PKGVERSION_NOREV}.tar.gz= https://bitbucket.org/hww3/influxdb/downloads/
.endif
-#EXTRACT_ONLY= ${IFDB_DISTNAME}
-EXTRACT_DIR.${IFDB_DISTNAME}= ${WRKDIR}/src/github.com/influxdata
+#EXTRACT_ONLY= ${IFDB_DISTNAME}
+EXTRACT_DIR.${IFDB_DISTNAME}= ${WRKDIR}/src/github.com/influxdata
EXTRACT_DIR.${IFDB_DEPENDENCIES}= ${WRKDIR}/src/github.com/influxdata
-WRKSRC= ${WRKDIR}/src/github.com/influxdata/influxdb
-USE_TOOLS+= gmake curl
+WRKSRC= ${WRKDIR}/src/github.com/influxdata/influxdb
+USE_TOOLS+= gmake curl
BUILD_DEPENDS+= go19-1.9.*:../../lang/go19
BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
diff --git a/inkscape-snapshot/Makefile b/inkscape-snapshot/Makefile
index dcadf18dd8..c4341b44a9 100644
--- a/inkscape-snapshot/Makefile
+++ b/inkscape-snapshot/Makefile
@@ -62,10 +62,10 @@ REPLACE_PYTHON+= share/extensions/Barcode/*.py
REPLACE_PYTHON+= share/extensions/ink2canvas/*.py
REPLACE_PYTHON+= share/extensions/test/*.test.py
-CHECK_INTERPRETER_SKIP+=share/inkscape/extensions/genpofiles.sh
-CHECK_INTERPRETER_SKIP+=share/inkscape/extensions/simplepath.rb
-CHECK_PORTABILITY_SKIP+=packaging/macosx/Resources/bin/inkscape
-CHECK_PORTABILITY_SKIP+=packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
+CHECK_INTERPRETER_SKIP+= share/inkscape/extensions/genpofiles.sh
+CHECK_INTERPRETER_SKIP+= share/inkscape/extensions/simplepath.rb
+CHECK_PORTABILITY_SKIP+= packaging/macosx/Resources/bin/inkscape
+CHECK_PORTABILITY_SKIP+= packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
PKG_OPTIONS_VAR= PKG_OPTIONS.inkscape
PKG_SUPPORTED_OPTIONS= gnome
diff --git a/ircII-current/options.mk b/ircII-current/options.mk
index ed0f1a09aa..fc20990c4c 100644
--- a/ircII-current/options.mk
+++ b/ircII-current/options.mk
@@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.2 2015/09/30 08:25:37 tnn Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.ircII
-PKG_SUPPORTED_OPTIONS= # only socks group
+PKG_OPTIONS_VAR= PKG_OPTIONS.ircII
+PKG_SUPPORTED_OPTIONS= # only socks group
PKG_OPTIONS_OPTIONAL_GROUPS= socks
PKG_OPTIONS_GROUP.socks= socks4 dante
diff --git a/kapacitor/Makefile b/kapacitor/Makefile
index a930c9b335..828ec636d8 100644
--- a/kapacitor/Makefile
+++ b/kapacitor/Makefile
@@ -1,25 +1,25 @@
# $NetBSD$
-GITHUB_PROJECT= kapacitor
-PKGVERSION_NOREV= 1.5.2
-DISTNAME= kapacitor-1.5.2
-GITHUB_TAG= v${PKGVERSION_NOREV}
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=influxdata/}
-MAINTAINER= william%welliver.org@localhost
-HOMEPAGE= https://www.influxdata.com/
-COMMENT= Framework for processing, monitoring, and alerting on time series data
-LICENSE= mit
+GITHUB_PROJECT= kapacitor
+PKGVERSION_NOREV= 1.5.2
+DISTNAME= kapacitor-1.5.2
+GITHUB_TAG= v${PKGVERSION_NOREV}
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=influxdata/}
+MAINTAINER= william%welliver.org@localhost
+HOMEPAGE= https://www.influxdata.com/
+COMMENT= Framework for processing, monitoring, and alerting on time series data
+LICENSE= mit
# despite being the default value, this explicit declaration is required for things
# to build properly.
-EXTRACT_SUFX= .tar.gz
+EXTRACT_SUFX= .tar.gz
-KAPACITOR_DISTNAME= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES= ${KAPACITOR_DISTNAME}
+KAPACITOR_DISTNAME= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES= ${KAPACITOR_DISTNAME}
EXTRACT_DIR.${KAPACITOR_DISTNAME}= ${WRKDIR}/src/github.com/influxdata
-WRKSRC= ${WRKDIR}/src/github.com/influxdata/kapacitor
+WRKSRC= ${WRKDIR}/src/github.com/influxdata/kapacitor
USE_TOOLS+= gmake
BUILD_DEPENDS+= go110-1.10.*:../../lang/go110
@@ -31,9 +31,9 @@ PKGSRC_MAKE_ENV+= GOPATH=${WRKDIR}
PKG_SYSCONFSUBDIR= kapacitor
-REPLACE.kapacitor.old= /etc/kapacitor
-REPLACE.kapacitor.new= ${PKG_SYSCONFDIR}
-REPLACE_FILES.kapacitor= share/examples/kapacitor/kapacitor.conf
+REPLACE.kapacitor.old= /etc/kapacitor
+REPLACE.kapacitor.new= ${PKG_SYSCONFDIR}
+REPLACE_FILES.kapacitor= share/examples/kapacitor/kapacitor.conf
DATADIR= ${VARBASE}/lib/kapacitor
LOGDIR= ${VARBASE}/log/kapacitor
@@ -44,7 +44,7 @@ FILES_SUBST+= KAPACITOR_GROUP=${KAPACITOR_GROUP:Q}
FILES_SUBST+= DATADIR=${DATADIR:Q}
FILES_SUBST+= LOGDIR=${LOGDIR:Q}
-KAPACITOR_USER?= kapacitor
+KAPACITOR_USER?= kapacitor
KAPACITOR_GROUP?= kapacitor
OWN_DIRS_PERMS+= ${DATADIR} ${KAPACITOR_USER} ${KAPACITOR_GROUP} 0700
OWN_DIRS_PERMS+= ${LOGDIR} ${KAPACITOR_USER} ${KAPACITOR_GROUP} 0700
@@ -58,8 +58,8 @@ INSTALLATION_DIRS+= bin etc/kapacitor share/doc/kapacitor share/kapacitor/telegr
DOC_FILES+= LICENSE LICENSE_OF_DEPENDENCIES.md DESIGN.md README.md CHANGELOG.md
BIN_FILES+= kapacitor kapacitord
-CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/kapacitor.conf ${PKG_SYSCONFDIR}/kapacitor.conf
-CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/logrotate.d/kapacitor ${PKG_SYSCONFDIR}/../logrotate.d/kapacitor
+CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/kapacitor.conf ${PKG_SYSCONFDIR}/kapacitor.conf
+CONF_FILES+= ${PREFIX}/share/examples/${PKGBASE}/logrotate.d/kapacitor ${PKG_SYSCONFDIR}/../logrotate.d/kapacitor
GO_BIN= ${PREFIX}/go110/bin/go
diff --git a/kde-runtime4/Makefile b/kde-runtime4/Makefile
index 770697c3e0..b196feaeec 100644
--- a/kde-runtime4/Makefile
+++ b/kde-runtime4/Makefile
@@ -69,7 +69,7 @@ REPLACE_PERL+= \
kioslave/info/kde-info2html
CONF_FILES+= ${PREFIX}/share/examples/kde-runtime4/kde-information.menu \
- ${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
+ ${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf \
${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
diff --git a/kicad-footprints/Makefile b/kicad-footprints/Makefile
index a2f41f4b68..795d0b3fca 100644
--- a/kicad-footprints/Makefile
+++ b/kicad-footprints/Makefile
@@ -5,8 +5,8 @@ V= 5.1.0
DISTNAME= kicad-footprints-${V}
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=KiCad/}
-GITHUB_TAG= ${PKGVERSION_NOREV}
-EXTRACT_SUFX= .zip
+GITHUB_TAG= ${PKGVERSION_NOREV}
+EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://kicad-pcb.org/
diff --git a/kicad-i18n/Makefile b/kicad-i18n/Makefile
index 2c1100f737..ca66c579df 100644
--- a/kicad-i18n/Makefile
+++ b/kicad-i18n/Makefile
@@ -5,8 +5,8 @@ V= 5.1.0
DISTNAME= kicad-i18n-${V}
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=KiCad/}
-GITHUB_TAG= ${PKGVERSION_NOREV}
-EXTRACT_SUFX= .zip
+GITHUB_TAG= ${PKGVERSION_NOREV}
+EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -18,7 +18,7 @@ CMAKE_ARGS+= -DKICAD_REPO_NAME=stable -DKICAD_BUILD_VERSION=${V}
USE_CMAKE= yes
BUILD_DIRS= obj
CONFIGURE_DIRS= ${BUILD_DIRS}
-CMAKE_ARG_PATH= ..
+CMAKE_ARG_PATH= ..
pre-configure:
cd ${WRKSRC} && mkdir ${BUILD_DIRS}
diff --git a/kicad-packages3d/Makefile b/kicad-packages3d/Makefile
index b7ad3c6405..392fc87ded 100644
--- a/kicad-packages3d/Makefile
+++ b/kicad-packages3d/Makefile
@@ -5,8 +5,8 @@ V= 5.1.0
DISTNAME= kicad-packages3d-${V}
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=KiCad/}
-GITHUB_TAG= ${PKGVERSION_NOREV}
-EXTRACT_SUFX= .zip
+GITHUB_TAG= ${PKGVERSION_NOREV}
+EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://kicad-pcb.org/
diff --git a/kicad-symbols/Makefile b/kicad-symbols/Makefile
index ed7bcd04f5..167b617671 100644
--- a/kicad-symbols/Makefile
+++ b/kicad-symbols/Makefile
@@ -5,8 +5,8 @@ V= 5.1.0
DISTNAME= kicad-symbols-${V}
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=KiCad/}
-GITHUB_TAG= ${PKGVERSION_NOREV}
-EXTRACT_SUFX= .zip
+GITHUB_TAG= ${PKGVERSION_NOREV}
+EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://kicad-pcb.org/
diff --git a/kicad-templates/Makefile b/kicad-templates/Makefile
index 3ea7d07ebf..c0b6168572 100644
--- a/kicad-templates/Makefile
+++ b/kicad-templates/Makefile
@@ -5,8 +5,8 @@ V= 5.1.0
DISTNAME= kicad-templates-${V}
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=KiCad/}
-GITHUB_TAG= ${PKGVERSION_NOREV}
-EXTRACT_SUFX= .zip
+GITHUB_TAG= ${PKGVERSION_NOREV}
+EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://kicad-pcb.org/
diff --git a/lapack/Makefile.common b/lapack/Makefile.common
index c8e55d339d..45b1a30223 100644
--- a/lapack/Makefile.common
+++ b/lapack/Makefile.common
@@ -17,8 +17,8 @@ HOMEPAGE= http://www.netlib.org/lapack/
LICENSE= modified-bsd
# All parts are in the same section (now wip, later math).
-PATCHDIR= ${.CURDIR}/../lapack/patches
-DISTINFO_FILE= ${.CURDIR}/../lapack/distinfo
+PATCHDIR= ${.CURDIR}/../lapack/patches
+DISTINFO_FILE= ${.CURDIR}/../lapack/distinfo
USE_LANGUAGES= c fortran
USE_CMAKE= yes
diff --git a/laszip/Makefile b/laszip/Makefile
index f0a86cf744..8e0859ebf6 100644
--- a/laszip/Makefile
+++ b/laszip/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
-VERSION= 3.3.1
-PKGNAME= laszip-${VERSION}
+VERSION= 3.3.1
+PKGNAME= laszip-${VERSION}
DISTNAME= laszip-src-${VERSION}
CATEGORIES= geography
MASTER_SITES= https://github.com/LASzip/LASzip/releases/download/${VERSION}/
diff --git a/libalkimia/Makefile b/libalkimia/Makefile
index 3e64bbb1d0..23a26cfd86 100644
--- a/libalkimia/Makefile
+++ b/libalkimia/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE= http://community.kde.org/Alkimia/libalkimia
COMMENT= Common finance routines for kde4 applications
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
-#BUILD_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
+BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
+#BUILD_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/libc++-abi/Makefile b/libc++-abi/Makefile
index 07f92f0c66..13c46da2d6 100644
--- a/libc++-abi/Makefile
+++ b/libc++-abi/Makefile
@@ -15,7 +15,7 @@ USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
-CONFIGURE_DIRS= ${WRKDIR}/build
+CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
diff --git a/libdrm-dfbsd-meson/Makefile b/libdrm-dfbsd-meson/Makefile
index 5a139241cd..33d36663ba 100644
--- a/libdrm-dfbsd-meson/Makefile
+++ b/libdrm-dfbsd-meson/Makefile
@@ -90,8 +90,8 @@ CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
PTHREADSTUBS_LIBS=-L${PREFIX}/lib
CONFIGURE_ARGS+= --disable-manpages
CONFIGURE_ARGS+= --disable-valgrind
-MESON_ARGS+= -Dman-pages=false
-MESON_ARGS+= -Dvalgrind=false
+MESON_ARGS+= -Dman-pages=false
+MESON_ARGS+= -Dvalgrind=false
LDFLAGS.NetBSD+= -lpci
@@ -122,22 +122,22 @@ PKG_SUGGESTED_OPTIONS+= invert_atomic_add_unless
# PKG_SUGGESTED_OPTIONS+= libkms
# .endif
-PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
+PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
+PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
.endif
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= libkms
+PLIST_VARS+= libkms
.if !empty(PKG_OPTIONS:Mlibkms)
PKGCONFIG_OVERRIDE+= libkms.pc.in
-PLIST.libkms= yes
+PLIST.libkms= yes
CONFIGURE_ARGS+= --enable-libkms
-MESON_ARGS+= -Dlibkms=true
+MESON_ARGS+= -Dlibkms=true
.else
CONFIGURE_ARGS+= --disable-libkms
-MESON_ARGS+= -Dlibkms=false
+MESON_ARGS+= -Dlibkms=false
.endif
.if !empty(PKG_OPTIONS:Minvert_atomic_add_unless)
diff --git a/libdrm-dfbsd-meson/builtin.mk b/libdrm-dfbsd-meson/builtin.mk
index ffe2489949..f1ee32ffef 100644
--- a/libdrm-dfbsd-meson/builtin.mk
+++ b/libdrm-dfbsd-meson/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/libdrm-dfbsd/Makefile b/libdrm-dfbsd/Makefile
index f7a2348fcc..143cc861bf 100644
--- a/libdrm-dfbsd/Makefile
+++ b/libdrm-dfbsd/Makefile
@@ -68,10 +68,10 @@ PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= libkms
+PLIST_VARS+= libkms
.if !empty(PKG_OPTIONS:Mlibkms)
PKGCONFIG_OVERRIDE+= libkms.pc.in
-PLIST.libkms= yes
+PLIST.libkms= yes
CONFIGURE_ARGS+= --enable-libkms
.else
#CONFIGURE_ARGS+= --disable-libkms
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/libosmocore/Makefile b/libosmocore/Makefile
index f9973c7184..446d660d9b 100644
--- a/libosmocore/Makefile
+++ b/libosmocore/Makefile
@@ -20,9 +20,9 @@ PKGCONFIG_OVERRIDE+= libosmogsm.pc.in
PKGCONFIG_OVERRIDE+= libosmosim.pc.in
PKGCONFIG_OVERRIDE+= libosmovty.pc.in
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYTHONBIN}
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYTHONBIN}
# libosmocore.so: undefined reference to `__cpu_model'
CONFIGURE_ENV.NetBSD+= osmo_cv_cc_has_builtin=false
diff --git a/libvirt490/Makefile b/libvirt490/Makefile
index f51ad54639..d96d7f9aaa 100644
--- a/libvirt490/Makefile
+++ b/libvirt490/Makefile
@@ -1,46 +1,46 @@
# $NetBSD: Makefile,v 1.0 2019/12/02 19:27:26 andyb Exp $
-DISTNAME= libvirt-4.9.0
-PKGREVISION= 5
-CATEGORIES= sysutils
-MASTER_SITES= http://libvirt.org/sources/
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= andyb%m42.one@localhost
-HOMEPAGE= http://libvirt.org/
-COMMENT= Virtualisation toolkit for host operating systems
-LICENSE= gnu-lgpl-v2
-
-GNU_CONFIGURE= yes
-#CONFIGURE_ARGS+= --with-vbox=no --sysconfdir=${EGDIR} --localstatedir=${VARBASE}
-CONFIGURE_ARGS+= --without-macvtap
-USE_TOOLS+= gmake pkg-config perl gcc
-USE_LIBTOOL= yes
-
-#BUILD_DEFS+= VARBASE
-
-#PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # py-xml
-
-#PY_PATCHPLIST= yes
-#REPLACE_PYTHON+= docs/apibuild.py
-#REPLACE_PYTHON+= src/esx/esx_vi_generator.py
-#REPLACE_PYTHON+= src/hyperv/hyperv_wmi_generator.py
-#REPLACE_PYTHON+= src/util/virkeycode-mapgen.py
-
-#EGDIR= ${PREFIX}/share/examples
-#CONF_FILES+= ${EGDIR}/libvirt/libvirtd.conf ${PKG_SYSCONFDIR}/libvirt/libvirtd.
-#CONF_FILES+= ${EGDIR}/libvirt/qemu/networks/autostart/default.xml ${PKG_SYSCONF
-#CONF_FILES+= ${EGDIR}/libvirt/qemu/networks/default.xml ${PKG_SYSCONFDIR}/libvi
-#CONF_FILES+= ${EGDIR}/logrotate.d/libvirtd ${PKG_SYSCONFDIR}/logrotate.d/libvir
-#CONF_FILES+= ${EGDIR}/logrotate.d/libvirtd.lxc ${PKG_SYSCONFDIR}/logrotate.d/li
-#CONF_FILES+= ${EGDIR}/logrotate.d/libvirtd.qemu ${PKG_SYSCONFDIR}/logrotate.d/l
-#CONF_FILES+= ${EGDIR}/logrotate.d/libvirtd.uml ${PKG_SYSCONFDIR}/logrotate.d/li
-#CONF_FILES+= ${EGDIR}/sasl2/libvirt.conf ${PKG_SYSCONFDIR}/sasl2/libvirt.conf
-
-#AUTO_MKDIRS= yes
-#RCD_SCRIPTS= libvirtd
-
-GNUTLS_LIBS+= ${PREFIX}/include/gnutls
+DISTNAME= libvirt-4.9.0
+PKGREVISION= 5
+CATEGORIES= sysutils
+MASTER_SITES= http://libvirt.org/sources/
+EXTRACT_SUFX= .tar.xz
+
+MAINTAINER= andyb%m42.one@localhost
+HOMEPAGE= http://libvirt.org/
+COMMENT= Virtualisation toolkit for host operating systems
+LICENSE= gnu-lgpl-v2
+
+GNU_CONFIGURE= yes
+#CONFIGURE_ARGS+= --with-vbox=no --sysconfdir=${EGDIR} --localstatedir=${VARBASE}
+CONFIGURE_ARGS+= --without-macvtap
+USE_TOOLS+= gmake pkg-config perl gcc
+USE_LIBTOOL= yes
+
+#BUILD_DEFS+= VARBASE
+
+#PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # py-xml
+
+#PY_PATCHPLIST= yes
+#REPLACE_PYTHON+= docs/apibuild.py
+#REPLACE_PYTHON+= src/esx/esx_vi_generator.py
+#REPLACE_PYTHON+= src/hyperv/hyperv_wmi_generator.py
+#REPLACE_PYTHON+= src/util/virkeycode-mapgen.py
+
+#EGDIR= ${PREFIX}/share/examples
+#CONF_FILES+= ${EGDIR}/libvirt/libvirtd.conf ${PKG_SYSCONFDIR}/libvirt/libvirtd.
+#CONF_FILES+= ${EGDIR}/libvirt/qemu/networks/autostart/default.xml ${PKG_SYSCONF
+#CONF_FILES+= ${EGDIR}/libvirt/qemu/networks/default.xml ${PKG_SYSCONFDIR}/libvi
+#CONF_FILES+= ${EGDIR}/logrotate.d/libvirtd ${PKG_SYSCONFDIR}/logrotate.d/libvir
+#CONF_FILES+= ${EGDIR}/logrotate.d/libvirtd.lxc ${PKG_SYSCONFDIR}/logrotate.d/li
+#CONF_FILES+= ${EGDIR}/logrotate.d/libvirtd.qemu ${PKG_SYSCONFDIR}/logrotate.d/l
+#CONF_FILES+= ${EGDIR}/logrotate.d/libvirtd.uml ${PKG_SYSCONFDIR}/logrotate.d/li
+#CONF_FILES+= ${EGDIR}/sasl2/libvirt.conf ${PKG_SYSCONFDIR}/sasl2/libvirt.conf
+
+#AUTO_MKDIRS= yes
+#RCD_SCRIPTS= libvirtd
+
+GNUTLS_LIBS+= ${PREFIX}/include/gnutls
#.include "options.mk"
diff --git a/lld-netbsd/Makefile b/lld-netbsd/Makefile
index 7e56477bb2..287208c9c8 100644
--- a/lld-netbsd/Makefile
+++ b/lld-netbsd/Makefile
@@ -20,7 +20,7 @@ USE_LANGUAGES= c c++11
USE_CMAKE= yes
GCC_REQD+= 4.8
-WRKSRC= ${WRKDIR}/${PKGBASE}
+WRKSRC= ${WRKDIR}/${PKGBASE}
CONFIGURE_DIRS= ${WRKDIR}/build
CMAKE_ARG_PATH= ${WRKSRC}
diff --git a/lxqt-common/Makefile b/lxqt-common/Makefile
index 82be3cc30e..ff730d697b 100644
--- a/lxqt-common/Makefile
+++ b/lxqt-common/Makefile
@@ -48,7 +48,7 @@ CONF_FILES+= ${EGDIR}/xdg/autostart/lxqt-compton.desktop \
SUBST_CLASSES+= conf
SUBST_FILES.conf= autostart/CMakeLists.txt \
- config/CMakeLists.txt \
+ config/CMakeLists.txt \
menu/CMakeLists.txt
SUBST_SED.conf= -e 's,$${LXQT_ETC_XDG_DIR}/,${EGDIR}/xdg/,'
SUBST_STAGE.conf= post-patch
diff --git a/mes-nyacc/Makefile b/mes-nyacc/Makefile
index a5699938c7..729ea69f95 100644
--- a/mes-nyacc/Makefile
+++ b/mes-nyacc/Makefile
@@ -16,9 +16,9 @@ GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
INFO_FILES= yes
-GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
+GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/2.2
CONFIGURE_ARGS+= --prefix=${PREFIX}/guile/2.2
-CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
+CONFIGURE_ARGS+= --libdir=${PREFIX}/guile/2.2/lib
CONFIGURE_ARGS+= --site_scm_dir=${PREFIX}/guile/2.2/share/guile/2.2
CONFIGURE_ARGS+= --site_scm_go_dir=${PREFIX}/guile/2.2/lib/guile/2.2/site-ccache
diff --git a/mescc-tools/Makefile b/mescc-tools/Makefile
index 82e55a92e4..d5e2392676 100644
--- a/mescc-tools/Makefile
+++ b/mescc-tools/Makefile
@@ -15,7 +15,7 @@ NO_CONFIGURE= YES
WRKSRC= ${WRKDIR}/mescc-tools-Release_0.6.1
-MAKE_FILE= makefile
+MAKE_FILE= makefile
INSTALL_MAKE_FLAGS+= PREFIX=${PREFIX}
TEST_TARGET= test
diff --git a/micropolis/Makefile b/micropolis/Makefile
index 6242745cec..209776c1d0 100644
--- a/micropolis/Makefile
+++ b/micropolis/Makefile
@@ -13,9 +13,9 @@ LICENSE= gnu-gpl-v3
USE_TOOLS+= bash:run pkg-config
-PATCH_SITES= http://git.zerfleddert.de/micropolis/patches/
-PATCHFILES= micropolis_git-1530263971-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.patch
-PATCH_DIST_STRIP= -p1
+PATCH_SITES= http://git.zerfleddert.de/micropolis/patches/
+PATCHFILES= micropolis_git-1530263971-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.patch
+PATCH_DIST_STRIP= -p1
WRKSRC= ${WRKDIR}/micropolis-activity
diff --git a/miniircd/Makefile b/miniircd/Makefile
index be56064412..e0924e0155 100644
--- a/miniircd/Makefile
+++ b/miniircd/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2
NO_BUILD= yes
BUILD_DEFS+= VARBASE MINIIRCD_USER MINIIRCD_GROUP MINIIRCD_DIR
-FILES_SUBST+= PYTHONBIN=${PYTHONBIN}
+FILES_SUBST+= PYTHONBIN=${PYTHONBIN}
FILES_SUBST+= MINIIRCD_USER=${MINIIRCD_USER} MINIIRCD_GROUP=${MINIIRCD_GROUP}
FILES_SUBST+= MINIIRCD_DIR=${MINIIRCD_DIR}
diff --git a/minizip192/Makefile b/minizip192/Makefile
index 5c1ca1b37c..4f65026b80 100644
--- a/minizip192/Makefile
+++ b/minizip192/Makefile
@@ -8,14 +8,14 @@ GITHUB_RELEASE= 20190228
DIST_SUBDIR= ${GITHUB_PROJECT}
PKGNAME= minizip-19.2
-MAINTAINER= pkgls%gmx.net@localhost
+MAINTAINER= pkgls%gmx.net@localhost
HOMEPAGE= https://github.com/bsfd80/qtxqfsts/
-COMMENT= Zip manipulation library written in C
-LICENSE= zlib
+COMMENT= Zip manipulation library written in C
+LICENSE= zlib
-USE_CMAKE= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= cmake gmake
+USE_CMAKE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= cmake gmake
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/minizip192/buildlink3.mk b/minizip192/buildlink3.mk
index 0152656fc5..913e2e2c0c 100644
--- a/minizip192/buildlink3.mk
+++ b/minizip192/buildlink3.mk
@@ -1,6 +1,6 @@
# $NetBSD: buildlink3.mk,v 1.17 2018/08/16 18:54:28 adam Exp $
-BUILDLINK_TREE+= minizip192
+BUILDLINK_TREE+= minizip192
BUILDLINK_PKGSRCDIR.minizip-git?= ../../wip/minizip192
@@ -10,4 +10,4 @@ BUILDLINK_PKGSRCDIR.minizip-git?= ../../wip/minizip192
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/cmake/buildlink3.mk"
-BUILDLINK_TREE+= -minizip192
+BUILDLINK_TREE+= -minizip192
diff --git a/modular-xorg-server-dfbsd-meson/Makefile b/modular-xorg-server-dfbsd-meson/Makefile
index 3d91f220e5..3decf2b4bc 100644
--- a/modular-xorg-server-dfbsd-meson/Makefile
+++ b/modular-xorg-server-dfbsd-meson/Makefile
@@ -20,10 +20,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-meson/options.mk b/modular-xorg-server-dfbsd-meson/options.mk
index 2cf2e8ec50..c713c959ad 100644
--- a/modular-xorg-server-dfbsd-meson/options.mk
+++ b/modular-xorg-server-dfbsd-meson/options.mk
@@ -8,30 +8,30 @@ 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+= allow_unprivileged
PKG_SUPPORTED_OPTIONS+= otherid_xsrc_netbsd
-PKG_SUPPORTED_OPTIONS+= strict_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+= fallback_not_wsdisplay
-PKG_SUPPORTED_OPTIONS+= kbd_by_masking_bits
-PKG_SUPPORTED_OPTIONS+= usl_vt_switching
-PKG_SUPPORTED_OPTIONS+= openbsd_more_calls
-PKG_SUPPORTED_OPTIONS+= randr_backlight
-PKG_SUPPORTED_OPTIONS+= ws_drivers_openbsd
+PKG_SUPPORTED_OPTIONS+= fallback_not_wsdisplay
+PKG_SUPPORTED_OPTIONS+= kbd_by_masking_bits
+PKG_SUPPORTED_OPTIONS+= usl_vt_switching
+PKG_SUPPORTED_OPTIONS+= openbsd_more_calls
+PKG_SUPPORTED_OPTIONS+= randr_backlight
+PKG_SUPPORTED_OPTIONS+= ws_drivers_openbsd
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= devd
+PKG_SUGGESTED_OPTIONS+= devd
.endif
.if ${OPSYS} == "DragonFly"
@@ -41,12 +41,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"
@@ -54,17 +54,17 @@ PKG_SUGGESTED_OPTIONS+= allow_unprivileged
.endif
.if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+= otherid_xsrc_netbsd
+PKG_SUGGESTED_OPTIONS+= otherid_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
@@ -74,31 +74,31 @@ PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
# From OpenBSD 6.5 xenocara xserver 1.19.6
.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= fallback_not_wsdisplay
+PKG_SUGGESTED_OPTIONS+= fallback_not_wsdisplay
.endif
.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= kbd_by_masking_bits
+PKG_SUGGESTED_OPTIONS+= kbd_by_masking_bits
.endif
# Implement VT switching based on the USL compat interface
.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= usl_vt_switching
+PKG_SUGGESTED_OPTIONS+= usl_vt_switching
.endif
.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= openbsd_more_calls
+PKG_SUGGESTED_OPTIONS+= openbsd_more_calls
.endif
# From OpenBSD 6.5 xenocara xserver 1.19.6
.if ${OPSYS} == "OpenBSD"
-PKG_SUGGESTED_OPTIONS+= randr_backlight
+PKG_SUGGESTED_OPTIONS+= randr_backlight
.endif
# From OpenBSD 6.5 xenocara xserver 1.19.6
# .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"
@@ -181,7 +181,7 @@ CONFIGURE_ARGS+= --without-dtrace
# 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
@@ -198,11 +198,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/modular-xorg-server-dfbsd/options.mk b/modular-xorg-server-dfbsd/options.mk
index dceb32b235..97b5c2a971 100644
--- a/modular-xorg-server-dfbsd/options.mk
+++ b/modular-xorg-server-dfbsd/options.mk
@@ -4,7 +4,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
PKG_SUPPORTED_OPTIONS= inet6 debug dtrace
PKG_SUPPORTED_OPTIONS+= revert_flink
PKG_SUPPORTED_OPTIONS+= revert_randr_lease
-PKG_SUPPORTED_OPTIONS+= allow_unprivileged
+PKG_SUPPORTED_OPTIONS+= allow_unprivileged
PKG_SUGGESTED_OPTIONS= inet6
.if ${OPSYS} == "DragonFly"
@@ -18,7 +18,7 @@ PKG_SUGGESTED_OPTIONS+= allow_unprivileged
PKG_SUPPORTED_OPTIONS+= devd
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= devd
+PKG_SUGGESTED_OPTIONS+= devd
.endif
.if ${X11_TYPE} == "modular"
@@ -115,11 +115,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:Mallow_unprivileged)
diff --git a/mona/Makefile b/mona/Makefile
index e00967c36f..3381683dc0 100644
--- a/mona/Makefile
+++ b/mona/Makefile
@@ -12,9 +12,9 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/mona-1.4
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL= yes
USE_TOOLS+= bison
-MAKE_FILE= makefile
+MAKE_FILE= makefile
USE_LANGUAGES= c c++
.include "../../mk/bsd.pkg.mk"
diff --git a/mothur/Makefile b/mothur/Makefile
index ff1c729820..091fec7afe 100644
--- a/mothur/Makefile
+++ b/mothur/Makefile
@@ -33,7 +33,7 @@ LICENSE= gnu-gpl-v3
# Just assuming C and C++: Adjust this!
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
-BUILD_TARGET= mothur
+BUILD_TARGET= mothur
PORTVERSION= 1.40.5
DATADIR= ${PREFIX}/share/mothur
@@ -43,17 +43,17 @@ EXAMPLESDIR= ${PREFIX}/share/examples/mothur
DEPENDS+= vsearch>=0:../../wip/vsearch
-SUBST_CLASSES+= thread1
-SUBST_STAGE.thread1= post-patch
-SUBST_SED.thread1= -e "s|thread[*]|std::thread*|g"
-SUBST_FILES.thread1= ${WRKSRC}/source/*.cpp
-SUBST_FILES.thread1+= ${WRKSRC}/source/*/*.cpp
+SUBST_CLASSES+= thread1
+SUBST_STAGE.thread1= post-patch
+SUBST_SED.thread1= -e "s|thread[*]|std::thread*|g"
+SUBST_FILES.thread1= ${WRKSRC}/source/*.cpp
+SUBST_FILES.thread1+= ${WRKSRC}/source/*/*.cpp
-SUBST_CLASSES+= thread2
-SUBST_STAGE.thread2= post-patch
-SUBST_SED.thread2= -e "s|new thread(|new std::thread(|g"
-SUBST_FILES.thread2= ${WRKSRC}/source/*.cpp
-SUBST_FILES.thread2+= ${WRKSRC}/source/*/*.cpp
+SUBST_CLASSES+= thread2
+SUBST_STAGE.thread2= post-patch
+SUBST_SED.thread2= -e "s|new thread(|new std::thread(|g"
+SUBST_FILES.thread2= ${WRKSRC}/source/*.cpp
+SUBST_FILES.thread2+= ${WRKSRC}/source/*/*.cpp
# Sets OPSYS, OS_VERSION, MACHINE_ARCH, etc..
diff --git a/muscle/Makefile b/muscle/Makefile
index 1293d15b86..100303d59f 100644
--- a/muscle/Makefile
+++ b/muscle/Makefile
@@ -23,7 +23,7 @@ DEPENDS+= dos2unix>0:../../converters/dos2unix
LICENSE= public-domain
-ONLY_FOR_PLATFORM= *-*-x86_64 *-*-i386
+ONLY_FOR_PLATFORM= *-*-x86_64 *-*-i386
USE_LANGUAGES= c c++
diff --git a/navit-git/Makefile b/navit-git/Makefile
index 029e691394..dd9917f4ca 100644
--- a/navit-git/Makefile
+++ b/navit-git/Makefile
@@ -9,23 +9,23 @@ HOMEPAGE= https://github.com/navit-gps/navit
COMMENT= GPS car navigation system
LICENSE= gnu-gpl-v2
-GIT_REPOSITORIES= navit-gps
-GIT_REPO.navit-gps= https://github.com/navit-gps/navit.git
-GIT_REVISION= 07de185df5dc96356a21016b544137b84b4fc023
-_GIT_FLAGS?= --depth 1
+GIT_REPOSITORIES= navit-gps
+GIT_REPO.navit-gps= https://github.com/navit-gps/navit.git
+GIT_REVISION= 07de185df5dc96356a21016b544137b84b4fc023
+_GIT_FLAGS?= --depth 1
CONFLICTS= navit-[0-9]*
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CFLAGS.NetBSD+= -DUSE_SYS_ENDIAN_H
+CFLAGS.NetBSD+= -DUSE_SYS_ENDIAN_H
USE_TOOLS+= cmake pkg-config
-CMAKE_ARGS+= -DLIB_DIR=${PREFIX}/lib/navit
-CMAKE_ARGS+= -DMAN_DIR=${PREFIX}/${PKGMANDIR}/man1
-CMAKE_ARGS+= -DUSE_PLUGINS=0
+CMAKE_ARGS+= -DLIB_DIR=${PREFIX}/lib/navit
+CMAKE_ARGS+= -DMAN_DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_ARGS+= -DUSE_PLUGINS=0
CMAKE_ARGS+= -DSAMPLE_MAP=1
CMAKE_ARGS+= -DSVG2PNG=0
CMAKE_ARGS+= -DUSE_NATIVE_LANGUAGE_SUPPORT=1
diff --git a/navit/Makefile b/navit/Makefile
index 9ece48036c..527e2d3693 100644
--- a/navit/Makefile
+++ b/navit/Makefile
@@ -13,13 +13,13 @@ LICENSE= gnu-gpl-v2
USE_CMAKE= yes
USE_LANGUAGES= c c++
-CFLAGS.NetBSD+= -DUSE_SYS_ENDIAN_H
+CFLAGS.NetBSD+= -DUSE_SYS_ENDIAN_H
USE_TOOLS+= cmake pkg-config
-CMAKE_ARGS+= -DLIB_DIR=${PREFIX}/lib/navit
-CMAKE_ARGS+= -DMAN_DIR=${PREFIX}/${PKGMANDIR}/man1
-CMAKE_ARGS+= -DUSE_PLUGINS=0
+CMAKE_ARGS+= -DLIB_DIR=${PREFIX}/lib/navit
+CMAKE_ARGS+= -DMAN_DIR=${PREFIX}/${PKGMANDIR}/man1
+CMAKE_ARGS+= -DUSE_PLUGINS=0
CMAKE_ARGS+= -DSAMPLE_MAP=1
CMAKE_ARGS+= -DSVG2PNG=0
CMAKE_ARGS+= -DUSE_NATIVE_LANGUAGE_SUPPORT=1
diff --git a/nominatim/Makefile b/nominatim/Makefile
index 9f75391723..9155509b15 100644
--- a/nominatim/Makefile
+++ b/nominatim/Makefile
@@ -49,10 +49,10 @@ INSTALLATION_DIRS+= ${NDIR}/website
SUBST_CLASSES+= paths
SUBST_FILES.paths+= ${WRKSRC}/settings/defaults.php
-SUBST_SED.paths+= -e "s|@CMAKE_SOURCE_DIR@|${NDIR}|g"
-SUBST_SED.paths+= -e "s|@CMAKE_BINARY_DIR@|${NDIR}|g"
-SUBST_SED.paths+= -e "s|CONST_InstallPath.'/module'|'${MODDIR}'|g"
-SUBST_STAGE.paths= post-configure
+SUBST_SED.paths+= -e "s|@CMAKE_SOURCE_DIR@|${NDIR}|g"
+SUBST_SED.paths+= -e "s|@CMAKE_BINARY_DIR@|${NDIR}|g"
+SUBST_SED.paths+= -e "s|CONST_InstallPath.'/module'|'${MODDIR}'|g"
+SUBST_STAGE.paths= post-configure
.include "../../lang/python/application.mk"
diff --git a/ocaml-cairo/Makefile b/ocaml-cairo/Makefile
index 9ed1a624e2..294ed7d089 100644
--- a/ocaml-cairo/Makefile
+++ b/ocaml-cairo/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/Chris00/ocaml-cairo/
COMMENT= Bindings for OCaml to the cairo library
#LICENSE= # TODO: (see mk/license.mk)
-OCAML_USE_DUNE= yes
+OCAML_USE_DUNE= yes
OCAML_FINDLIB_DIRS= cairo2
OPAM_INSTALL_FILES= cairo2
diff --git a/ocaml-lablgtk3/Makefile b/ocaml-lablgtk3/Makefile
index 4e3b7ef42d..4db66f9873 100644
--- a/ocaml-lablgtk3/Makefile
+++ b/ocaml-lablgtk3/Makefile
@@ -18,10 +18,10 @@ GNU_CONFIGURE= yes
OCAML_USE_FINDLIB= yes
OCAML_FINDLIB_DIRS= lablgtk3
-MAKE_JOBS_SAFE= no
-BUILD_TARGET= world
+MAKE_JOBS_SAFE= no
+BUILD_TARGET= world
INSTALLATION_DIRS= bin
-CONFIGURE_ENV+= OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
+CONFIGURE_ENV+= OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
.include "../../mk/ocaml.mk"
diff --git a/ocaml-lablgtk3/options.mk b/ocaml-lablgtk3/options.mk
index 94a59e1479..e27ac9d9e2 100644
--- a/ocaml-lablgtk3/options.mk
+++ b/ocaml-lablgtk3/options.mk
@@ -3,7 +3,7 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.lablgtk3
PKG_SUPPORTED_OPTIONS= gtksourceview3 gtkspell
PKG_SUGGESTED_OPTIONS= gtksourceview3 gtkspell
-PLIST_VARS+= gtkspell gtksourceview
+PLIST_VARS+= gtkspell gtksourceview
.include "../../mk/bsd.options.mk"
diff --git a/ocaml/Makefile b/ocaml/Makefile
index bba83c2eb3..16af7e4a2f 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -9,8 +9,8 @@ MAKE_JOBS_SAFE= no
UNLIMIT_RESOURCES= stacksize
USE_TOOLS+= bash
-USE_LANGUAGES+= c
-USE_LIBTOOL= yes
+USE_LANGUAGES+= c
+USE_LIBTOOL= yes
USE_GNU_CONFIGURE_HOST= no
#USE_GCC_RUNTIME= yes
@@ -37,12 +37,12 @@ PLIST.ocaml-stub= yes
.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
!empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
(${MACHINE_ARCH} == "x86_64")
-BUILD_TARGET+= opt opt.opt
+BUILD_TARGET+= opt opt.opt
PLIST.ocaml-opt= yes
. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
(${MACHINE_ARCH} != "aarch64")
-PLIST.ocaml-prof=yes
+PLIST.ocaml-prof= yes
. endif
.endif
@@ -56,20 +56,20 @@ PLIST.ocaml-prof=yes
(!empty(MACHINE_PLATFORM:MNetBSD-*-*) && empty(MACHINE_PLATFORM:MNetBSD-*-powerpc)) || \
!empty(MACHINE_PLATFORM:MDarwin-*-*) || \
!empty(MACHINE_PLATFORM:MSunOS-*-*)
-PLIST.ocaml-nat= yes
+PLIST.ocaml-nat= yes
. endif
.endif
# Spacetime profiling is only available for native code on 64-bit targets.
.if (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "aarch64")
-PLIST.ocaml-spacetime= yes
+PLIST.ocaml-spacetime= yes
.endif
# clock_gettime(2), required by POSIX, is necessary for the
# instrumented_runtime feature.
# It is missing on macOS before 10.12.
.if ${OPSYS} != "Darwin" || ${OS_VERSION:R:R} >= 16
-PLIST.instrumented_runtime=yes
+PLIST.instrumented_runtime= yes
.endif
# This is needed because ${WRKSRC}/build/partial-install.sh uses
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
index a85e77d8b7..a912132024 100644
--- a/ocaml/Makefile.common
+++ b/ocaml/Makefile.common
@@ -13,12 +13,12 @@ HOMEPAGE= https://ocaml.org/
COMMENT= The latest implementation of the Caml dialect of ML
LICENSE= gnu-gpl-v2
-USE_LANGUAGES+= c99
+USE_LANGUAGES+= c99
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-#CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q}
-#CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
-#CONFIGURE_ENV+= LDFLAGS=${LDFLAGS:Q}
+#CONFIGURE_ENV+= BDB_LIBS=${BDB_LINK:Q}
+#CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
+#CONFIGURE_ENV+= LDFLAGS=${LDFLAGS:Q}
#CONFIGURE_ARGS+= -prefix ${PREFIX}
#CONFIGURE_ARGS+= -with-pthread
#CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q}
@@ -26,8 +26,8 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-x
#CPPFLAGS+= -DDB_DBM_HSEARCH
-#DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
-#PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
+#DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
+#PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
.include "../../mk/bsd.prefs.mk"
@@ -40,7 +40,7 @@ INSTALL_UNSTRIPPED= yes
#CONFIGURE_ENV+= ASPP="${CC} -arch ${MACHINE_ARCH} -c"
#CONFIGURE_ENV+= AS="as -arch ${MACHINE_ARCH}"
#.else
-#CONFIGURE_ENV+= CC="${CC} ${CFLAGS}"
+#CONFIGURE_ENV+= CC="${CC} ${CFLAGS}"
#.endif
.include "../../mk/bdb.buildlink3.mk"
diff --git a/ocaml/hacks.mk b/ocaml/hacks.mk
index f81eeb9fdc..93a66b79b2 100644
--- a/ocaml/hacks.mk
+++ b/ocaml/hacks.mk
@@ -15,12 +15,12 @@ OCAML_HACKS_MK= defined
### itself.
###
.if !empty(MACHINE_PLATFORM:MDarwin-[0-9].*-*)
-PKG_HACKS+= no_compact_unwind
-SUBST_CLASSES+= no_compact_unwind
-SUBST_MESSAGE.no_compact_unwind= Removing -no_compact_unwind from linker options
-SUBST_FILES.no_compact_unwind= configure
-SUBST_SED.no_compact_unwind= -e 's/-Wl,-no_compact_unwind//g'
-SUBST_STAGE.no_compact_unwind= pre-configure
+PKG_HACKS+= no_compact_unwind
+SUBST_CLASSES+= no_compact_unwind
+SUBST_MESSAGE.no_compact_unwind= Removing -no_compact_unwind from linker options
+SUBST_FILES.no_compact_unwind= configure
+SUBST_SED.no_compact_unwind= -e 's/-Wl,-no_compact_unwind//g'
+SUBST_STAGE.no_compact_unwind= pre-configure
.endif
### [ Wed Oct 7 9:16:42 GMT 2009 : dmcmahill ]
diff --git a/opengrok/Makefile b/opengrok/Makefile
index 415360d4cf..ab6ba3d16c 100644
--- a/opengrok/Makefile
+++ b/opengrok/Makefile
@@ -20,7 +20,7 @@ MESSAGE_SUBST+= PKG_JAVA_HOME=${PKG_JAVA_HOME}
USE_JAVA= yes
USE_JAVA2= yes
-NO_BUILD= yes
+NO_BUILD= yes
CONF_FILES= ${PREFIX}/share/examples/opengrok/paths.tsv \
${PREFIX}/share/opengrok/var/opengrok/paths.tsv
diff --git a/openmpi/options.mk b/openmpi/options.mk
index 60f6e43a8f..d8bf58d84d 100644
--- a/openmpi/options.mk
+++ b/openmpi/options.mk
@@ -2,7 +2,7 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.openmpi
PKG_SUPPORTED_OPTIONS= debug f90 java
-PKG_SUGGESTED_OPTIONS+= f90
+PKG_SUGGESTED_OPTIONS+= f90
.include "../../mk/bsd.options.mk"
diff --git a/p5-Mojo-JWT/Makefile b/p5-Mojo-JWT/Makefile
index a364ddc251..eb0f6e34be 100644
--- a/p5-Mojo-JWT/Makefile
+++ b/p5-Mojo-JWT/Makefile
@@ -15,7 +15,7 @@ COMMENT= JSON Web Token the Mojo way
LICENSE= ${PERL_LICENSE}
USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Mojo/JWT/.packlist
+PERL5_PACKLIST= auto/Mojo/JWT/.packlist
PERL5_MODULE_TYPE= Module::Build
diff --git a/p5-Mojolicious/Makefile b/p5-Mojolicious/Makefile
index e8e4a29fc6..d43d26efeb 100644
--- a/p5-Mojolicious/Makefile
+++ b/p5-Mojolicious/Makefile
@@ -15,7 +15,7 @@ COMMENT= Perl web framework: The Web In A Box!
LICENSE= artistic-2.0
USE_LANGUAGES= # empty
-PERL5_PACKLIST= auto/Mojolicious/.packlist
+PERL5_PACKLIST= auto/Mojolicious/.packlist
REPLACE_PERL+= script/*
diff --git a/pacman/Makefile b/pacman/Makefile
index fbc16ab5ae..0a3244a8f5 100644
--- a/pacman/Makefile
+++ b/pacman/Makefile
@@ -8,22 +8,22 @@ MAINTAINER= root%zta.lk@localhost
HOMEPAGE= https://www.archlinux.org/pacman/
COMMENT= Simple library-based package manager
LICENSE= gnu-gpl-v2
-PKGREVISION= 2
+PKGREVISION= 2
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
-USE_TOOLS+= perl
-USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
+USE_TOOLS+= perl
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= lib/libalpm/libalpm.pc.in
-EGDIR= ${PREFIX}/share/examples/pacman
+EGDIR= ${PREFIX}/share/examples/pacman
-CONF_FILES= ${EGDIR}/pacman.conf ${PKG_SYSCONFDIR}/pacman.conf \
- ${EGDIR}/makepkg.conf ${PKG_SYSCONFDIR}/makepkg.conf \
- ${EGDIR}/bash_completion-pacman \
- ${PKG_SYSCONFDIR}/bash_completion.d/pacman
+CONF_FILES= ${EGDIR}/pacman.conf ${PKG_SYSCONFDIR}/pacman.conf \
+ ${EGDIR}/makepkg.conf ${PKG_SYSCONFDIR}/makepkg.conf \
+ ${EGDIR}/bash_completion-pacman \
+ ${PKG_SYSCONFDIR}/bash_completion.d/pacman
post-install:
${MKDIR} -p ${DESTDIR}${EGDIR}
diff --git a/pbzx/Makefile b/pbzx/Makefile
index 628cab3406..c09f315868 100644
--- a/pbzx/Makefile
+++ b/pbzx/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= pbzx-1.0.2
-CATEGORIES= archivers
+CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GITHUB:=NiklasRosenstein/}
GITHUB_TAG= v${PKGVERSION_NOREV}
diff --git a/pike8.0-GTK2/Makefile b/pike8.0-GTK2/Makefile
index 7aa884b164..6a83ab85b8 100644
--- a/pike8.0-GTK2/Makefile
+++ b/pike8.0-GTK2/Makefile
@@ -6,9 +6,9 @@ MODULE_TYPE= post_module
.include "../../wip/pike${PIKEVERSUFFIX}/builtin_module.mk"
-CFLAGS+= -I../..
-EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
-PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
+CFLAGS+= -I../..
+EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
+PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
# the GTK2 module uses headers from the Image module, but these aren't installed
# by default, so we just make them available
diff --git a/pike8.0-Gdbm/Makefile b/pike8.0-Gdbm/Makefile
index 5c6d2fad20..278ff768e6 100644
--- a/pike8.0-Gdbm/Makefile
+++ b/pike8.0-Gdbm/Makefile
@@ -5,7 +5,7 @@ PIKEVERSUFFIX= 8.0
.include "../../wip/pike${PIKEVERSUFFIX}/builtin_module.mk"
-#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/_Image_TIFF.pmod
+#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/_Image_TIFF.pmod
.include "../../databases/gdbm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pike8.0-Image_Freetype/Makefile b/pike8.0-Image_Freetype/Makefile
index 03778d0147..618bbb65f2 100644
--- a/pike8.0-Image_Freetype/Makefile
+++ b/pike8.0-Image_Freetype/Makefile
@@ -1,14 +1,14 @@
# $NetBSD$
-MODULENAME= Image_FreeType
-INTERNAL_MODULENAME= _Image_FreeType
-PIKEVERSUFFIX= 8.0
+MODULENAME= Image_FreeType
+INTERNAL_MODULENAME= _Image_FreeType
+PIKEVERSUFFIX= 8.0
-EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
+EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
.include "../../wip/pike${PIKEVERSUFFIX}/builtin_module.mk"
-#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
+#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
# the Image_Freetype module uses headers from the Image module, but these aren't installed
# by default, so we just make them available
diff --git a/pike8.0-Image_SVG/Makefile b/pike8.0-Image_SVG/Makefile
index b61483e365..556d36d815 100644
--- a/pike8.0-Image_SVG/Makefile
+++ b/pike8.0-Image_SVG/Makefile
@@ -1,15 +1,15 @@
# $NetBSD$
-MODULENAME= Image_SVG
-INTERNAL_MODULENAME= _Image_SVG
-MODULE_TYPE= post_module
-PIKEVERSUFFIX= 8.0
+MODULENAME= Image_SVG
+INTERNAL_MODULENAME= _Image_SVG
+MODULE_TYPE= post_module
+PIKEVERSUFFIX= 8.0
-EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
+EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
.include "../../wip/pike${PIKEVERSUFFIX}/builtin_module.mk"
-#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
+#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
# the Image_SVG module uses headers from the Image module, but these aren't installed
# by default, so we just make them available
diff --git a/pike8.0-Image_TIFF/Makefile b/pike8.0-Image_TIFF/Makefile
index 99cad16ad7..9c4a01135f 100644
--- a/pike8.0-Image_TIFF/Makefile
+++ b/pike8.0-Image_TIFF/Makefile
@@ -1,14 +1,14 @@
# $NetBSD$
-MODULENAME= Image_TIFF
-INTERNAL_MODULENAME= _Image_TIFF
-PIKEVERSUFFIX= 8.0
+MODULENAME= Image_TIFF
+INTERNAL_MODULENAME= _Image_TIFF
+PIKEVERSUFFIX= 8.0
-EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
+EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
.include "../../wip/pike${PIKEVERSUFFIX}/builtin_module.mk"
-PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/_Image_TIFF.pmod
+PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/_Image_TIFF.pmod
# the Image_Freetype module uses headers from the Image module, but these aren't installed
# by default, so we just make them available
diff --git a/pike8.0-Image_WebP/Makefile b/pike8.0-Image_WebP/Makefile
index ec6a6be9f5..89dd20379e 100644
--- a/pike8.0-Image_WebP/Makefile
+++ b/pike8.0-Image_WebP/Makefile
@@ -1,15 +1,15 @@
# $NetBSD$
-MODULENAME= Image_WebP
-INTERNAL_MODULENAME= _Image_WebP
-MODULE_TYPE= post_module
-PIKEVERSUFFIX= 8.0
+MODULENAME= Image_WebP
+INTERNAL_MODULENAME= _Image_WebP
+MODULE_TYPE= post_module
+PIKEVERSUFFIX= 8.0
-EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
+EXTRACT_ELEMENTS+= ${DISTNAME}/src/modules/Image
.include "../../wip/pike${PIKEVERSUFFIX}/builtin_module.mk"
-#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
+#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
# the Image_WebP module uses headers from the Image module, but these aren't installed
# by default, so we just make them available
diff --git a/pike8.0-Java/Makefile b/pike8.0-Java/Makefile
index e71602f794..235ad7abde 100644
--- a/pike8.0-Java/Makefile
+++ b/pike8.0-Java/Makefile
@@ -5,14 +5,14 @@
MODULENAME= Java
PIKEVERSUFFIX= 8.0
-USE_JAVA= yes
-USE_JAVA2= 7
+USE_JAVA= yes
+USE_JAVA2= 7
.include "../../wip/pike${PIKEVERSUFFIX}/builtin_module.mk"
-PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/Java.pmod
+PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/Java.pmod
-EXTRACT_ELEMENTS = ${DISTNAME}/src/modules/${MODULENAME} ${DISTNAME}/refdoc
+EXTRACT_ELEMENTS = ${DISTNAME}/src/modules/${MODULENAME} ${DISTNAME}/refdoc
.include "../../devel/libffi/buildlink3.mk"
.if ${OPSYS} != "Darwin"
diff --git a/pike8.0-Mysql/Makefile b/pike8.0-Mysql/Makefile
index 498adf75cb..bd6b989125 100644
--- a/pike8.0-Mysql/Makefile
+++ b/pike8.0-Mysql/Makefile
@@ -5,7 +5,7 @@ PIKEVERSUFFIX= 8.0
.include "../../wip/pike${PIKEVERSUFFIX}/builtin_module.mk"
-#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
+#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
.include "../../mk/mysql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pike8.0-Odbc/Makefile b/pike8.0-Odbc/Makefile
index e513faf389..928f48561b 100644
--- a/pike8.0-Odbc/Makefile
+++ b/pike8.0-Odbc/Makefile
@@ -5,7 +5,7 @@ PIKEVERSUFFIX= 8.0
.include "../../wip/pike${PIKEVERSUFFIX}/builtin_module.mk"
-#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
+#PIKE_MODULE_OVERLAPPING_FILES+= lib/pike${PIKEVERSUFFIX}/modules/GTK2.pmod
.include "../../databases/unixodbc/buildlink3.mk"
diff --git a/pike8.0/Makefile b/pike8.0/Makefile
index 0145ae2531..1c9e7b4f1b 100644
--- a/pike8.0/Makefile
+++ b/pike8.0/Makefile
@@ -3,48 +3,48 @@
.include "./version.mk"
NAME= pike${PIKEVERSUFFIX}
-PKGNAME= ${NAME}-${PIKE_VERSION}
-DISTNAME= Pike-v${PIKE_VERSION}
+PKGNAME= ${NAME}-${PIKE_VERSION}
+DISTNAME= Pike-v${PIKE_VERSION}
-CATEGORIES= lang
-MASTER_SITES= http://pike.lysator.liu.se/pub/pike/${PIKE_RELEASE_TYPE}/${PIKE_VERSION}/
+CATEGORIES= lang
+MASTER_SITES= http://pike.lysator.liu.se/pub/pike/${PIKE_RELEASE_TYPE}/${PIKE_VERSION}/
LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2.1 OR mpl-1.1
#LICENSE+= gnu-lgpl-v2.1
#LICENSE+= mpl-v1.1
-MAINTAINER= william%welliver.org@localhost
-HOMEPAGE= http://pike.lysator.liu.se/
-COMMENT= Dynamic language with a syntax similar to Java and C
+MAINTAINER= william%welliver.org@localhost
+HOMEPAGE= http://pike.lysator.liu.se/
+COMMENT= Dynamic language with a syntax similar to Java and C
CHECK_SSP= no
.if defined(PKGSRC_USE_SSP)
# do not add flags to everything
-PKGSRC_USE_SSP= no
+PKGSRC_USE_SSP= no
.endif
-BUILD_DEPENDS+= pkgconf-[0-9]*:../../devel/pkgconf
-BUILD_DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
-MAKE_JOBS_SAFE= no
-GNU_CONFIGURE= yes
+BUILD_DEPENDS+= pkgconf-[0-9]*:../../devel/pkgconf
+BUILD_DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
+MAKE_JOBS_SAFE= no
+GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= src/configure
-#CONFIGURE_ARGS+= --without-machine-code
-CFLAGS+= -O
+#CONFIGURE_ARGS+= --without-machine-code
+CFLAGS+= -O
BUILD_MAKE_FLAGS+=
-USE_TOOLS+=gmake
-USE_LANGUAGES= c c++
+USE_TOOLS+= gmake
+USE_LANGUAGES= c c++
-SHARED_DOCS_LOC= ${PREFIX}/share/doc/${NAME}
+SHARED_DOCS_LOC= ${PREFIX}/share/doc/${NAME}
INSTALL_SHARED_DOCS= ANNOUNCE CHANGES COMMITTERS COPYING COPYRIGHT README README-GIT
INSTALL_TARGET_ARGS+= INSTALLARGS="buildroot='${DESTDIR}' prefix='${PREFIX}' include_prefix='${PREFIX}/include/${NAME}' lib_prefix='${PREFIX}/lib/${NAME}' --verbose --traditional"
INSTALL_TARGET_ARGS+= buildroot='${DESTDIR}' prefix='${PREFIX}'
.if (defined(ABI))
-CONFIGURE_ARGS+= --with-abi=${ABI}
+CONFIGURE_ARGS+= --with-abi=${ABI}
.endif
FILES_SUBST+= NAME="${NAME}"
-REPLACE_INTERPRETER+= pike
+REPLACE_INTERPRETER+= pike
REPLACE.pike.old= pike
REPLACE.pike.new= ${PREFIX}/bin/pike${PIKEVERSUFFIX}
REPLACE_FILES.pike= lib/modules/Tools.pmod/Standalone.pmod/cgrep.pike
@@ -53,7 +53,7 @@ REPLACE_FILES.pike+= lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike
REPLACE_FILES.pike+= lib/modules/Tools.pmod/Standalone.pmod/rsif.pike
# remove any dumped modules from the list, as their generation is not deterministic
-PRINT_PLIST_AWK+= /^lib\/.*(\.pike\.o|\.pmod\.o)$$/ { next; }
+PRINT_PLIST_AWK+= /^lib\/.*(\.pike\.o|\.pmod\.o)$$/ { next; }
# add the dumped modules from this build
#GENERATE_PLIST+= cd ${DESTDIR}/${PREFIX} && find . -name \*.o -print | sed -e 's~^\./~~' ;
diff --git a/pike8.0/builtin_module.mk b/pike8.0/builtin_module.mk
index 0073b0c786..3a15c0cb6e 100644
--- a/pike8.0/builtin_module.mk
+++ b/pike8.0/builtin_module.mk
@@ -4,12 +4,12 @@
.if !defined(PIKE8.0_BUILTIN_MODULE_MK)
PIKE8.0_BUILTIN_MODULE_MK:=
-PIKEVERSUFFIX= 8.0
+PIKEVERSUFFIX= 8.0
.include "../../wip/pike${PIKEVERSUFFIX}/version.mk"
INTERNAL_MODULENAME?= ${MODULENAME}
-MODULE_TYPE?= module
+MODULE_TYPE?= module
# if set to yes, build a module modref. most bundled modules already have this included
# in the main pike build, so it's not usually necessary to include a second one.
@@ -24,29 +24,29 @@ CHECK_MODULE_ENABLED?= yes
.error MODULE_TYPE must be module or post_module
.endif
NAME= pike${PIKEVERSUFFIX}-${MODULENAME}
-PKGNAME= ${NAME}-${PIKE_VERSION}
-DISTNAME= Pike-v${PIKE_VERSION}
+PKGNAME= ${NAME}-${PIKE_VERSION}
+DISTNAME= Pike-v${PIKE_VERSION}
-PIKE_EXECUTABLE = pike${PIKEVERSUFFIX}
+PIKE_EXECUTABLE = pike${PIKEVERSUFFIX}
CHECK_SSP= no
.if defined(PKGSRC_USE_SSP)
# do not add flags to everything
-PKGSRC_USE_SSP= no
+PKGSRC_USE_SSP= no
.endif
-CATEGORIES= lang
-MASTER_SITES= http://pike.lysator.liu.se/pub/pike/${PIKE_RELEASE_TYPE}/${PIKE_VERSION}/
+CATEGORIES= lang
+MASTER_SITES= http://pike.lysator.liu.se/pub/pike/${PIKE_RELEASE_TYPE}/${PIKE_VERSION}/
LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2.1 OR mpl-1.1
-MAINTAINER= william%welliver.org@localhost
-HOMEPAGE= http://pike.lysator.liu.se/
-COMMENT= ${MODULENAME} module for Pike ${PIKEVERSUFFIX}
+MAINTAINER= william%welliver.org@localhost
+HOMEPAGE= http://pike.lysator.liu.se/
+COMMENT= ${MODULENAME} module for Pike ${PIKEVERSUFFIX}
-BUILD_DEPENDS+= pkgconf-[0-9]*:../../devel/pkgconf
-MAKE_JOBS_SAFE= no
-USE_TOOLS+=gmake
-USE_LANGUAGES= c c++
-SHARED_DOCS_LOC= ${PREFIX}/share/doc/${NAME}
+BUILD_DEPENDS+= pkgconf-[0-9]*:../../devel/pkgconf
+MAKE_JOBS_SAFE= no
+USE_TOOLS+= gmake
+USE_LANGUAGES= c c++
+SHARED_DOCS_LOC= ${PREFIX}/share/doc/${NAME}
PIKE_MODULE_SRC= src/${MODULE_TYPE}s/${INTERNAL_MODULENAME}
PIKE_MODULE_OVERLAPPING_FILES =
@@ -54,7 +54,7 @@ PIKE_MODULE_OVERLAPPING_FILES =
SYSTEM_MODULE_PATH!= pike${PIKEVERSUFFIX} -x module --query=system_module_path
SYSTEM_DOC_PATH= ${PREFIX}/share/pike${PIKEVERSUFFIX}/refdoc
-EXTRACT_ELEMENTS+= ${DISTNAME}/src/${MODULE_TYPE}s/${INTERNAL_MODULENAME} ${DISTNAME}/refdoc
+EXTRACT_ELEMENTS+= ${DISTNAME}/src/${MODULE_TYPE}s/${INTERNAL_MODULENAME} ${DISTNAME}/refdoc
FILES_SUBST+= NAME="${NAME}"
FILES_SUBST+= MODULENAME="${MODULENAME}"
FILES_SUBST+= MODULENAME="${INTERNAL_MODULENAME}"
@@ -62,7 +62,7 @@ FILES_SUBST+= PIKEVERSUFFIX="${PIKEVERSUFFIX}"
FILES_SUBST+= PIKE_EXECUTABLE="${PIKE_EXECUTABLE}"
# remove any dumped modules from the list, as their generation is not deterministic
-PRINT_PLIST_AWK+= /^lib\/.*(\.pike\.o|\.pmod\.o)$$/ { next; }
+PRINT_PLIST_AWK+= /^lib\/.*(\.pike\.o|\.pmod\.o)$$/ { next; }
# add the dumped modules from this build
#GENERATE_PLIST+= cd ${DESTDIR}/${PREFIX} && find . -name \*.o -print | sed -e 's~^\./~~' ;
diff --git a/pike8.0/version.mk b/pike8.0/version.mk
index 0a3676fffd..13b4648d2a 100644
--- a/pike8.0/version.mk
+++ b/pike8.0/version.mk
@@ -1,4 +1,4 @@
# $NetBSD$
-PIKE_VERSION= 8.0.702
-PIKEVERSUFFIX= 8.0
-PIKE_RELEASE_TYPE = all
+PIKE_VERSION= 8.0.702
+PIKEVERSUFFIX= 8.0
+PIKE_RELEASE_TYPE = all
diff --git a/psybnc/Makefile b/psybnc/Makefile
index 29311988ff..de481aea47 100644
--- a/psybnc/Makefile
+++ b/psybnc/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS+= glib-[0-9]*:../../devel/glib
USE_TOOLS+= gmake
CONF_FILES= share/examples/psybnc/psybnc.conf \
- ${PKG_SYSCONFDIR}/psybnc.conf
+ ${PKG_SYSCONFDIR}/psybnc.conf
SUBST_CLASSES+= prefix
SUBST_FILES.prefix= tools/autoconf.c
diff --git a/py-adal/Makefile b/py-adal/Makefile
index a17bfb69f9..5943321f3c 100644
--- a/py-adal/Makefile
+++ b/py-adal/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= https://files.pythonhosted.org/packages/82/43/a1e4b7368eec9653660e
MAINTAINER= kamelderouiche%yahoo.com@localhost
HOMEPAGE= https://github.com/AzureAD/azure-activedirectory-library-for-python
-COMMENT= Microsoft Azure Active Directory Authentication Library for Python
+COMMENT= Microsoft Azure Active Directory Authentication Library for Python
LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-requests>=2.21.0:../../devel/py-requests
diff --git a/py-algopy/Makefile b/py-algopy/Makefile
index 2b6339f794..f1d0fb49da 100644
--- a/py-algopy/Makefile
+++ b/py-algopy/Makefile
@@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
USE_LANGUAGES= # none
-PYDISTUTILSPKG = yes
+PYDISTUTILSPKG = yes
do-test:
${RUN} cd ${WRKSRC}/algopy; ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_tests.py
diff --git a/py-anvio/Makefile b/py-anvio/Makefile
index 788fe90326..76b86c5d45 100644
--- a/py-anvio/Makefile
+++ b/py-anvio/Makefile
@@ -59,10 +59,10 @@ REPLACE_PYTHON= tests/server/run_server_tests.py
REPLACE_R= sandbox/anvi-script-gen_stats_for_single_copy_genes.R
-REPLACE_INTERPRETER+= R
-REPLACE.R.old= /usr/bin/env Rscript
-REPLACE.R.new= ${PREFIX}/bin/R
-REPLACE_FILES.R= ${REPLACE_R}
+REPLACE_INTERPRETER+= R
+REPLACE.R.old= /usr/bin/env Rscript
+REPLACE.R.new= ${PREFIX}/bin/R
+REPLACE_FILES.R= ${REPLACE_R}
PYTHON_VERSIONS_INCOMPATIBLE= 27
diff --git a/py-codecov/Makefile b/py-codecov/Makefile
index 583d059910..dcf88cc3bd 100644
--- a/py-codecov/Makefile
+++ b/py-codecov/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= codecov-2.0.15
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_PYPI:=c/codecov/}
@@ -13,8 +13,8 @@ LICENSE= apache-2.0
post-install:
cd ${DESTDIR}${PREFIX}/bin && ${MV} codecov codecov-${PYVERSSUFFIX}
-DEPENDS+= ${PYPKGPREFIX}-requests>=2.7.9:../../devel/py-requests
-DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
+DEPENDS+= ${PYPKGPREFIX}-requests>=2.7.9:../../devel/py-requests
+DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-conan/Makefile b/py-conan/Makefile
index 0ce0df60e9..bc770e283e 100644
--- a/py-conan/Makefile
+++ b/py-conan/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= conan-1.14.4
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= pkgtools
MASTER_SITES= ${MASTER_SITE_PYPI:=c/conan/}
@@ -17,25 +17,25 @@ post-install:
do ${MV} $$b $$b-${PYVERSSUFFIX}; \
done
-DEPENDS+= ${PYPKGPREFIX}-JWT>=1.4.0<2.0.0:../../textproc/py-JWT
-DEPENDS+= ${PYPKGPREFIX}-requests>=2.7.0<3.0.0:../../devel/py-requests
-DEPENDS+= ${PYPKGPREFIX}-colorama>=0.3.3<0.5.0:../../comms/py-colorama
-DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11<3.14.0:../../textproc/py-yaml
-DEPENDS+= ${PYPKGPREFIX}-patch-1.16:../../wip/py-patch
-DEPENDS+= ${PYPKGPREFIX}-fasteners>=0.14.1:../../devel/py-fasteners
-DEPENDS+= ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
-DEPENDS+= ${PYPKGPREFIX}-node-semver-0.6.1:../../wip/py-node-semver
-DEPENDS+= ${PYPKGPREFIX}-distro>=1.0.2<1.2.0:../../wip/py-distro
-DEPENDS+= ${PYPKGPREFIX}-pylint>=1.9.3:../../wip/py-pylint
-DEPENDS+= ${PYPKGPREFIX}-future-0.16.0{,nb[0-9]*}:../../devel/py-future
-DEPENDS+= ${PYPKGPREFIX}-pygments>=2.0<3.0:../../textproc/py-pygments
-DEPENDS+= ${PYPKGPREFIX}-astroid>=1.6.5:../../devel/py-astroid
-DEPENDS+= ${PYPKGPREFIX}-deprecation>=2.0<2.1:../../devel/py-deprecation
-DEPENDS+= ${PYPKGPREFIX}-tqdm>=4.28.1<5:../../misc/py-tqdm
-DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.3<3:../../textproc/py-jinja2
-DEPENDS+= ${PYPKGPREFIX}-bottle>=0.12.8<0.13:../../www/py-bottle
-DEPENDS+= ${PYPKGPREFIX}-pluginbase>=0.5<1.0:../../wip/py-pluginbase
-DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+= ${PYPKGPREFIX}-JWT>=1.4.0<2.0.0:../../textproc/py-JWT
+DEPENDS+= ${PYPKGPREFIX}-requests>=2.7.0<3.0.0:../../devel/py-requests
+DEPENDS+= ${PYPKGPREFIX}-colorama>=0.3.3<0.5.0:../../comms/py-colorama
+DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11<3.14.0:../../textproc/py-yaml
+DEPENDS+= ${PYPKGPREFIX}-patch-1.16:../../wip/py-patch
+DEPENDS+= ${PYPKGPREFIX}-fasteners>=0.14.1:../../devel/py-fasteners
+DEPENDS+= ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
+DEPENDS+= ${PYPKGPREFIX}-node-semver-0.6.1:../../wip/py-node-semver
+DEPENDS+= ${PYPKGPREFIX}-distro>=1.0.2<1.2.0:../../wip/py-distro
+DEPENDS+= ${PYPKGPREFIX}-pylint>=1.9.3:../../wip/py-pylint
+DEPENDS+= ${PYPKGPREFIX}-future-0.16.0{,nb[0-9]*}:../../devel/py-future
+DEPENDS+= ${PYPKGPREFIX}-pygments>=2.0<3.0:../../textproc/py-pygments
+DEPENDS+= ${PYPKGPREFIX}-astroid>=1.6.5:../../devel/py-astroid
+DEPENDS+= ${PYPKGPREFIX}-deprecation>=2.0<2.1:../../devel/py-deprecation
+DEPENDS+= ${PYPKGPREFIX}-tqdm>=4.28.1<5:../../misc/py-tqdm
+DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.3<3:../../textproc/py-jinja2
+DEPENDS+= ${PYPKGPREFIX}-bottle>=0.12.8<0.13:../../www/py-bottle
+DEPENDS+= ${PYPKGPREFIX}-pluginbase>=0.5<1.0:../../wip/py-pluginbase
+DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
diff --git a/py-dependency/Makefile b/py-dependency/Makefile
index 706dd9be95..9e12126c41 100644
--- a/py-dependency/Makefile
+++ b/py-dependency/Makefile
@@ -12,7 +12,7 @@ LICENSE= isc
USE_LANGUAGES= # none
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-distro/Makefile b/py-distro/Makefile
index 0d197c812a..dfef71f9d3 100644
--- a/py-distro/Makefile
+++ b/py-distro/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= distro-1.1.0
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_PYPI:=d/distro/}
diff --git a/py-energyflow/Makefile b/py-energyflow/Makefile
index bd9b1a6533..f209034d55 100644
--- a/py-energyflow/Makefile
+++ b/py-energyflow/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= # none
-PYTHON_VERSION_DEFAULT= 37
+PYTHON_VERSION_DEFAULT= 37
.include "../../lang/python/egg.mk"
.include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-geom/Makefile b/py-geom/Makefile
index be6ac30619..cc1819096d 100644
--- a/py-geom/Makefile
+++ b/py-geom/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
USE_LANGUAGES= # none
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-ggplot/Makefile b/py-ggplot/Makefile
index 6f3053a517..034d53a137 100644
--- a/py-ggplot/Makefile
+++ b/py-ggplot/Makefile
@@ -13,7 +13,7 @@ LICENSE= modified-bsd
DEPENDS+= ${PYPKGPREFIX}-brewer2mpl>=1.4.1:../../graphics/py-brewer2mpl
DEPENDS+= ${PYPKGPREFIX}-cycler>=0.10.0:../../graphics/py-cycler
DEPENDS+= ${PYPKGPREFIX}-matplotlib>=2.2.2:../../graphics/py-matplotlib
-DEPENDS+= ${PYPKGPREFIX}-patsy>=0.3.0:../../math/py-patsy
+DEPENDS+= ${PYPKGPREFIX}-patsy>=0.3.0:../../math/py-patsy
DEPENDS+= ${PYPKGPREFIX}-pandas>=0.23.4:../../math/py-pandas
DEPENDS+= ${PYPKGPREFIX}-scipy>=1.1.0:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
diff --git a/py-gts/Makefile b/py-gts/Makefile
index 09517d9318..67c2a279f1 100644
--- a/py-gts/Makefile
+++ b/py-gts/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python bindings for GNU Triangulated Surface Library
LICENSE= gnu-lgpl-v2
USE_TOOLS+= pkg-config
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG= yes
PY_PATCHPLIST= yes
DOCDIR= ${PREFIX}/share/doc/py-gts
diff --git a/py-halp/Makefile b/py-halp/Makefile
index 0757ebd4c5..3d5fa55f91 100644
--- a/py-halp/Makefile
+++ b/py-halp/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= # none
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-hyperbolic/Makefile b/py-hyperbolic/Makefile
index b877025ef5..94497c2441 100644
--- a/py-hyperbolic/Makefile
+++ b/py-hyperbolic/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
USE_LANGUAGES= # none
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/egg.mk"
.include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-lempel-Ziv_Complexity/Makefile b/py-lempel-Ziv_Complexity/Makefile
index ae7c506571..a534f3200c 100644
--- a/py-lempel-Ziv_Complexity/Makefile
+++ b/py-lempel-Ziv_Complexity/Makefile
@@ -12,8 +12,8 @@ LICENSE= mit
USE_LANGUAGES= # none
-PYDISTUTILSPKG = yes
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYDISTUTILSPKG = yes
+PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-libtunepimp/Makefile b/py-libtunepimp/Makefile
index 27f94248a4..5157f7b5e1 100644
--- a/py-libtunepimp/Makefile
+++ b/py-libtunepimp/Makefile
@@ -5,7 +5,7 @@ PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
PKGREVISION= 1
CATEGORIES= audio devel
MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
- http://ftp.musicbrainz.org/pub/musicbrainz/
+ http://ftp.musicbrainz.org/pub/musicbrainz/
MAINTAINER= jfranz%bsdprojects.net@localhost
HOMEPAGE= http://musicbrainz.org/products/tunepimp/index.html
diff --git a/py-libvirt490/Makefile b/py-libvirt490/Makefile
index caaa64a9f1..a2f6664c2a 100644
--- a/py-libvirt490/Makefile
+++ b/py-libvirt490/Makefile
@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.32 2018/11/30 09:59:40 adam Exp $
-DISTNAME= libvirt-python-4.9.0
-CATEGORIES= sysutils python
-MASTER_SITES= https://libvirt.org/sources/python/
+DISTNAME= libvirt-python-4.9.0
+CATEGORIES= sysutils python
+MASTER_SITES= https://libvirt.org/sources/python/
-MAINTAINER= andyb%m42.one@localhost
-HOMEPAGE= https://libvirt.org/sources/python/
-COMMENT= libvirt python library
-LICENSE= gnu-lgpl-v2
+MAINTAINER= andyb%m42.one@localhost
+HOMEPAGE= https://libvirt.org/sources/python/
+COMMENT= libvirt python library
+LICENSE= gnu-lgpl-v2
#DEPENDS+= ${PYPKGPREFIX}-backcall-[0-9]*:../../devel/py-backcall
#DEPENDS+= ${PYPKGPREFIX}-decorator-[0-9]*:../../devel/py-decorator
diff --git a/py-math3d/Makefile b/py-math3d/Makefile
index fce6488715..b18debe4a9 100644
--- a/py-math3d/Makefile
+++ b/py-math3d/Makefile
@@ -12,9 +12,9 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= # none
-PYDISTUTILSPKG = yes
+PYDISTUTILSPKG = yes
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/extension.mk"
.include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-node-semver/Makefile b/py-node-semver/Makefile
index 6d6c82cb7a..e470b95ecf 100644
--- a/py-node-semver/Makefile
+++ b/py-node-semver/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= node-semver-0.6.1
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_PYPI:=n/node-semver/}
diff --git a/py-ore-algebra/Makefile b/py-ore-algebra/Makefile
index 766cfc7eb0..f1f6c53fb8 100644
--- a/py-ore-algebra/Makefile
+++ b/py-ore-algebra/Makefile
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/src
USE_LANGUAGES= # none
-PYDISTUTILSPKG = yes
+PYDISTUTILSPKG = yes
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-patch/Makefile b/py-patch/Makefile
index c88956416e..24e6a81b76 100644
--- a/py-patch/Makefile
+++ b/py-patch/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= patch-1.16
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_PYPI:=p/patch/}
EXTRACT_SUFX= .zip
diff --git a/py-peru/Makefile b/py-peru/Makefile
index 16b98b7458..cdb321913e 100644
--- a/py-peru/Makefile
+++ b/py-peru/Makefile
@@ -25,9 +25,9 @@ REPLACE_PYTHON+= peru/resources/plugins/curl/curl_plugin.py\
peru/resources/plugins/empty/empty_plugin.py \
peru/resources/plugins/git/git_plugin.py \
peru/resources/plugins/hg/hg_plugin.py \
- peru/resources/plugins/noop_cache/noop_cache_plugin.py \
- peru/resources/plugins/print/print_plugin.py \
- peru/resources/plugins/svn/svn_plugin.py
+ peru/resources/plugins/noop_cache/noop_cache_plugin.py \
+ peru/resources/plugins/print/print_plugin.py \
+ peru/resources/plugins/svn/svn_plugin.py
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
diff --git a/py-ranger/Makefile b/py-ranger/Makefile
index 48c2478e0d..2bc0478d31 100644
--- a/py-ranger/Makefile
+++ b/py-ranger/Makefile
@@ -1,14 +1,14 @@
# $NetBSD$
-GITHUB_PROJECT= ranger
-RANGER_VERSION= 1.9.2
-DISTNAME= ${GITHUB_PROJECT}-${RANGER_VERSION}
+GITHUB_PROJECT= ranger
+RANGER_VERSION= 1.9.2
+DISTNAME= ${GITHUB_PROJECT}-${RANGER_VERSION}
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=ranger/}
-GITHUB_TAG= v${RANGER_VERSION}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=ranger/}
+GITHUB_TAG= v${RANGER_VERSION}
-MAINTAINER= jake.slazenger%yandex.com@localhost
+MAINTAINER= jake.slazenger%yandex.com@localhost
HOMEPAGE= http://ranger.github.io/
COMMENT= VIM-inspired filemanager for the console
LICENSE= gnu-gpl-v3
diff --git a/py-semver/Makefile b/py-semver/Makefile
index 921898046d..784fef3cd6 100644
--- a/py-semver/Makefile
+++ b/py-semver/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= semver-2.7.6
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel
MASTER_SITES= https://pypi.python.org/packages/f4/03/9a0285f0c3a63202794616df78e9702a1bb170a467abe31df1c65b939042/
diff --git a/py-shapely/Makefile b/py-shapely/Makefile
index b65fa946b2..4e058202b7 100644
--- a/py-shapely/Makefile
+++ b/py-shapely/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE= https://github.com/sgillies/shapely
COMMENT= Geometric objects, predicates, and operations
LICENSE= 2-clause-bsd
-INSTALLATION_DIRS= share/doc/py-shapely
-PYTHON_VERSIONS_INCOMPATIBLE= 36 37
+INSTALLATION_DIRS= share/doc/py-shapely
+PYTHON_VERSIONS_INCOMPATIBLE= 36 37
post-install:
${INSTALL_DATA} ${WRKSRC}/docs/manual.txt ${DESTDIR}${PREFIX}/share/doc/py-shapely
diff --git a/py-webapp3/Makefile b/py-webapp3/Makefile
index 53568e9ddd..22370a2ef0 100644
--- a/py-webapp3/Makefile
+++ b/py-webapp3/Makefile
@@ -1,14 +1,14 @@
# $NetBSD$
DISTNAME= webapp3-1.0.2
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES= www python
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES= www python
MASTER_SITES= https://files.pythonhosted.org/packages/e6/aa/250684200e7804c22d76e1c34805d341782a05a61c50c0d808e142ca58c3/
MAINTAINER= kamelderouiche%yahoo.com@localhost
HOMEPAGE= https://pypi.org/project/webapp3/
COMMENT= Python web framework compatible with Google App Engines webapp
-LICENSE= apache-2.0
+LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-six>=1.12.0:../../lang/py-six
DEPENDS+= ${PYPKGPREFIX}-WebOb>=1.8.5:../../www/py-WebOb
diff --git a/q2pro/Makefile b/q2pro/Makefile
index 0d6219d032..b9ff9e2732 100644
--- a/q2pro/Makefile
+++ b/q2pro/Makefile
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .zip
DIST_SUBDIR= ${GITHUB_PROJECT}
DEPENDS+= openal-soft-[0-9]*:../../audio/openal-soft
-DEPENDS+= SDL2-[0-9]*:../../devel/SDL2
+DEPENDS+= SDL2-[0-9]*:../../devel/SDL2
MAINTAINER= pkgls%gmx.net@localhost
HOMEPAGE= https://github.com/bsfd80/qtxqfsts/
diff --git a/qodem/Makefile b/qodem/Makefile
index 446a947d6f..328523985e 100644
--- a/qodem/Makefile
+++ b/qodem/Makefile
@@ -11,7 +11,7 @@ LICENSE= cc0-1.0-universal
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-sdl --disable-upnp
+CONFIGURE_ARGS+= --disable-sdl --disable-upnp
.include "../../devel/ncursesw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/qstat214/Makefile b/qstat214/Makefile
index 389680b07f..1eafa176ba 100644
--- a/qstat214/Makefile
+++ b/qstat214/Makefile
@@ -15,14 +15,14 @@ COMMENT= QStat is a program displays information about game servers
LICENSE= artistic-2.0
DEPENDS+= automake-[0-9]*:../../devel/automake
-DEPENDS+= autoconf-[0-9]*:../../devel/autoconf
+DEPENDS+= autoconf-[0-9]*:../../devel/autoconf
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_LANGUAGES= c c++
USE_TOOLS+= gmake automake autoconf autoheader autom4te aclocal intltool pkg-config which
-WRKSRC= ${WRKDIR}/qstat-2.14
+WRKSRC= ${WRKDIR}/qstat-2.14
pre-configure:
cd ${WRKSRC} && \
diff --git a/revealjs/Makefile b/revealjs/Makefile
index a82bd815d9..50790a7bf1 100644
--- a/revealjs/Makefile
+++ b/revealjs/Makefile
@@ -3,7 +3,7 @@
VERSION= 3.7.0
DISTNAME= reveal.js-${VERSION}
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GITHUB:=hakimel/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=hakimel/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/hakimel/reveal.js/
@@ -14,7 +14,7 @@ NO_BUILD= yes
INSTALL_DIR= ${PREFIX}/share/
-SUBST_CLASSES+= path
+SUBST_CLASSES+= path
SUBST_STAGE.path= post-patch
SUBST_FILES.path= test/examples/*.html
diff --git a/rpm5/Makefile b/rpm5/Makefile
index ba5cdbf6fa..7bfdc30f14 100644
--- a/rpm5/Makefile
+++ b/rpm5/Makefile
@@ -40,9 +40,9 @@ pre-configure:
RPM5_DBI_FILES= Basenames Conflictname Dirnames Group Installtid Name Packages \
- Providename Provideversion Requirename Requireversion Triggername \
+ Providename Provideversion Requirename Requireversion Triggername \
Filemd5s Pubkeys Sha1header Sigmd5 \
- __db.001 __db.002 __db.003 __db.004 __db.005
+ __db.001 __db.002 __db.003 __db.004 __db.005
RPM5_ETCDIR= /etc/${PKGSRCNAME}
RPM5_LIBDIR= /var/lib/${PKGSRCNAME}
diff --git a/rsem/Makefile b/rsem/Makefile
index 76a71d6f5a..1ea4bda21e 100644
--- a/rsem/Makefile
+++ b/rsem/Makefile
@@ -27,15 +27,15 @@ USE_LANGUAGES= c c++
# Should be unbundled in the future.
USE_TOOLS+= gmake perl:run
REPLACE_PERL= convert-sam-for-rsem \
- extract-transcript-to-gene-map-from-trinity \
- rsem-calculate-expression \
- rsem-control-fdr \
- rsem-generate-data-matrix \
- rsem-generate-ngvector \
- rsem-plot-transcript-wiggles \
- rsem-prepare-reference \
- rsem-run-ebseq \
- rsem_perl_utils.pm
+ extract-transcript-to-gene-map-from-trinity \
+ rsem-calculate-expression \
+ rsem-control-fdr \
+ rsem-generate-data-matrix \
+ rsem-generate-ngvector \
+ rsem-plot-transcript-wiggles \
+ rsem-prepare-reference \
+ rsem-run-ebseq \
+ rsem_perl_utils.pm
REPLACE_PYTHON= rsem-refseq-extract-primary-assembly \
rsem-gff3-to-gtf
diff --git a/ruby-rack-flash3/Makefile b/ruby-rack-flash3/Makefile
index 75fc7f87c6..a7658def1f 100644
--- a/ruby-rack-flash3/Makefile
+++ b/ruby-rack-flash3/Makefile
@@ -8,7 +8,7 @@ HOMEPAGE= https://github.com/treeder/rack-flash
COMMENT= Flash hash implementation for Rack apps
LICENSE= mit
-DEPENDS+= ${RUBY_PKGPREFIX}-rack>=2.0.0:../../www/ruby-rack
+DEPENDS+= ${RUBY_PKGPREFIX}-rack>=2.0.0:../../www/ruby-rack
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ruby-rake-compiler/Makefile b/ruby-rake-compiler/Makefile
index c261af13ed..d866d9cd99 100644
--- a/ruby-rake-compiler/Makefile
+++ b/ruby-rake-compiler/Makefile
@@ -8,7 +8,7 @@ HOMEPAGE= https://github.com/rake-compiler/rake-compiler
COMMENT= Build extensions (C, Java) with Rake
LICENSE= mit
-DEPENDS+= ${RUBY_PKGPREFIX}-base:../../lang/${RUBY_PKGPREFIX}-base
+DEPENDS+= ${RUBY_PKGPREFIX}-base:../../lang/${RUBY_PKGPREFIX}-base
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ruby-rinku/Makefile b/ruby-rinku/Makefile
index c9f2538792..364e405d35 100644
--- a/ruby-rinku/Makefile
+++ b/ruby-rinku/Makefile
@@ -9,9 +9,9 @@ COMMENT= Drop-in replacement for Rails 'auto_link'
LICENSE= mit
# minitest now included in ruby-base
-#DEPENDS+= ${RUBY_PKGPREFIX}-minitest>=5.0.0:../../devel/ruby-minitest
-DEPENDS+= ${RUBY_PKGPREFIX}-base:../../lang/${RUBY_PKGPREFIX}-base
-DEPENDS+= ${RUBY_PKGPREFIX}-rake-compiler:../../wip/ruby-rake-compiler
+#DEPENDS+= ${RUBY_PKGPREFIX}-minitest>=5.0.0:../../devel/ruby-minitest
+DEPENDS+= ${RUBY_PKGPREFIX}-base:../../lang/${RUBY_PKGPREFIX}-base
+DEPENDS+= ${RUBY_PKGPREFIX}-rake-compiler:../../wip/ruby-rake-compiler
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ruby-simple-navigation/Makefile b/ruby-simple-navigation/Makefile
index d9f6bdabdf..8b0d65a374 100644
--- a/ruby-simple-navigation/Makefile
+++ b/ruby-simple-navigation/Makefile
@@ -8,7 +8,7 @@ HOMEPAGE= https://github.com/codeplant/simple-navigation
COMMENT= Create navigations for Rails, Sinatra or Padrino applications
LICENSE= mit
-DEPENDS+= ${RUBY_PKGPREFIX}-activesupport32>=3.2.0:../../devel/ruby-activesupport32
+DEPENDS+= ${RUBY_PKGPREFIX}-activesupport32>=3.2.0:../../devel/ruby-activesupport32
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ruby-sinatra-simple-navigation/Makefile b/ruby-sinatra-simple-navigation/Makefile
index 2bc46b66f8..4762d27039 100644
--- a/ruby-sinatra-simple-navigation/Makefile
+++ b/ruby-sinatra-simple-navigation/Makefile
@@ -8,7 +8,7 @@ HOMEPAGE= https://github.com/codeplant/sinatra-simple-navigation
COMMENT= Create navigations for Sinatra or Padrino applications
LICENSE= mit
-DEPENDS+= ${RUBY_PKGPREFIX}-simple-navigation>=4.0.0:../../wip/ruby-simple-navigation
+DEPENDS+= ${RUBY_PKGPREFIX}-simple-navigation>=4.0.0:../../wip/ruby-simple-navigation
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ruby-taskwarrior-web/Makefile b/ruby-taskwarrior-web/Makefile
index 62878680e7..f27c2f1e68 100644
--- a/ruby-taskwarrior-web/Makefile
+++ b/ruby-taskwarrior-web/Makefile
@@ -8,18 +8,18 @@ HOMEPAGE= http://theunraveler.github.io/taskwarrior-web/
COMMENT= Lightweight web interface for Taskwarrior
LICENSE= mit
-RUBYGEM_OPTIONS+= --format-executable
+RUBYGEM_OPTIONS+= --format-executable
-DEPENDS+= ${RUBY_PKGPREFIX}-activesupport32>=3.2.0:../../devel/ruby-activesupport32
-DEPENDS+= ${RUBY_PKGPREFIX}-json>=1.8.0:../../textproc/ruby-json
-DEPENDS+= ${RUBY_PKGPREFIX}-parseconfig>=1.0.7:../../devel/ruby-parseconfig
-DEPENDS+= ${RUBY_PKGPREFIX}-rack-flash3>=1.0.0:../../wip/ruby-rack-flash3
-DEPENDS+= ${RUBY_PKGPREFIX}-rinku:../../wip/ruby-rinku
-DEPENDS+= ${RUBY_PKGPREFIX}-sinatra>=2.0.0:../../www/ruby-sinatra
-DEPENDS+= ${RUBY_PKGPREFIX}-sinatra-simple-navigation:../../wip/ruby-sinatra-simple-navigation
-DEPENDS+= ${RUBY_PKGPREFIX}-vegas:../../wip/ruby-vegas
-DEPENDS+= ${RUBY_PKGPREFIX}-versionomy:../../wip/ruby-versionomy
-DEPENDS+= taskwarrior-[0-9]*:../../time/taskwarrior
+DEPENDS+= ${RUBY_PKGPREFIX}-activesupport32>=3.2.0:../../devel/ruby-activesupport32
+DEPENDS+= ${RUBY_PKGPREFIX}-json>=1.8.0:../../textproc/ruby-json
+DEPENDS+= ${RUBY_PKGPREFIX}-parseconfig>=1.0.7:../../devel/ruby-parseconfig
+DEPENDS+= ${RUBY_PKGPREFIX}-rack-flash3>=1.0.0:../../wip/ruby-rack-flash3
+DEPENDS+= ${RUBY_PKGPREFIX}-rinku:../../wip/ruby-rinku
+DEPENDS+= ${RUBY_PKGPREFIX}-sinatra>=2.0.0:../../www/ruby-sinatra
+DEPENDS+= ${RUBY_PKGPREFIX}-sinatra-simple-navigation:../../wip/ruby-sinatra-simple-navigation
+DEPENDS+= ${RUBY_PKGPREFIX}-vegas:../../wip/ruby-vegas
+DEPENDS+= ${RUBY_PKGPREFIX}-versionomy:../../wip/ruby-versionomy
+DEPENDS+= taskwarrior-[0-9]*:../../time/taskwarrior
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ruby-vegas/Makefile b/ruby-vegas/Makefile
index b210d9a364..d04b3ac772 100644
--- a/ruby-vegas/Makefile
+++ b/ruby-vegas/Makefile
@@ -8,7 +8,7 @@ HOMEPAGE= http://code.quirkey.com/vegas/
COMMENT= Sinatra/Rack app wrapper
LICENSE= mit
-DEPENDS+= ${RUBY_PKGPREFIX}-rack>=2.0.0:../../www/ruby-rack
+DEPENDS+= ${RUBY_PKGPREFIX}-rack>=2.0.0:../../www/ruby-rack
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ruby-versionomy/Makefile b/ruby-versionomy/Makefile
index 6c57fe0e65..01c04c9957 100644
--- a/ruby-versionomy/Makefile
+++ b/ruby-versionomy/Makefile
@@ -8,7 +8,7 @@ HOMEPAGE= https://github.com/dazuma/versionomy
COMMENT= Generalized version number library
LICENSE= modified-bsd
-DEPENDS+= ${RUBY_PKGPREFIX}-blockenspiel>=0.5.0:../../wip/ruby-blockenspiel
+DEPENDS+= ${RUBY_PKGPREFIX}-blockenspiel>=0.5.0:../../wip/ruby-blockenspiel
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/rust-bin/Makefile b/rust-bin/Makefile
index 0f6e51eadd..2663960a5b 100644
--- a/rust-bin/Makefile
+++ b/rust-bin/Makefile
@@ -25,7 +25,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR} share/doc/cargo/bash_completion.d
.include "../../mk/bsd.prefs.mk"
-PLIST_VARS+= darwin nondarwin
+PLIST_VARS+= darwin nondarwin
.if ${OPSYS} == "Darwin"
PLIST.darwin= yes
.else
diff --git a/shaarli/Makefile b/shaarli/Makefile
index 8467e4c98b..49f3097752 100644
--- a/shaarli/Makefile
+++ b/shaarli/Makefile
@@ -36,14 +36,14 @@ MESSAGE_SUBST+= DOCDIR=${DOCDIR}
MESSAGE_SUBST+= VARBASE=${VARBASE}
OWN_DIRS_PERMS+= ${VARBASE}/shaarli \
- ${WWW_USER} ${WWW_GROUP} 0770
+ ${WWW_USER} ${WWW_GROUP} 0770
OWN_DIRS_PERMS+= ${VARBASE}/shaarli/data \
- ${WWW_USER} ${WWW_GROUP} 0750
+ ${WWW_USER} ${WWW_GROUP} 0750
OWN_DIRS_PERMS+= ${VARBASE}/shaarli/tmp \
- ${WWW_USER} ${WWW_GROUP} 0750
+ ${WWW_USER} ${WWW_GROUP} 0750
CONF_FILES+= ${EGDIR}/apache.conf \
- ${PKG_SYSCONFDIR}/apache.conf
+ ${PKG_SYSCONFDIR}/apache.conf
SUBST_CLASSES+= files
SUBST_STAGE.files= do-configure
diff --git a/smplayer/Makefile b/smplayer/Makefile
index 9be2c00eb9..285bc94df7 100644
--- a/smplayer/Makefile
+++ b/smplayer/Makefile
@@ -32,11 +32,11 @@ SUBST_SED.dirs= -e "s|share/man|${PKGMANDIR}|g"
SUBST_SED.dirs+= -e "s|doc/packages|doc|1"
SUBST_STAGE.dirs= pre-build
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-configure
-SUBST_SED.paths+= -e 's,/usr/local,${PREFIX},g'
-SUBST_FILES.paths+= Makefile
-SUBST_MESSAGE.paths= Fixing header search paths.
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_SED.paths+= -e 's,/usr/local,${PREFIX},g'
+SUBST_FILES.paths+= Makefile
+SUBST_MESSAGE.paths= Fixing header search paths.
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/spacefm/options.mk b/spacefm/options.mk
index 65faceddf9..3bef860468 100644
--- a/spacefm/options.mk
+++ b/spacefm/options.mk
@@ -1,27 +1,27 @@
# $NetBSD: Makefile,v 0.3 2019/02/27 15:15:10 andyb Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.spacefm
+PKG_OPTIONS_VAR= PKG_OPTIONS.spacefm
-PKG_OPTIONS_REQUIRED_GROUPS= gtk
-PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
+PKG_OPTIONS_REQUIRED_GROUPS= gtk
+PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
-PKG_SUGGESTED_OPTIONS= gtk2
+PKG_SUGGESTED_OPTIONS= gtk2
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= gtk3
+PLIST_VARS+= gtk3
.if !empty(PKG_OPTIONS:Mgtk2)
-CONFIGURE_ARGS+= --with-gtk2
-GTK_CFLAGS= $(pkg-config --cflags gtk+-2.0)
-GTK_LIBS= $(pkg-config --libs gtk+-2.0)
+CONFIGURE_ARGS+= --with-gtk2
+GTK_CFLAGS= $(pkg-config --cflags gtk+-2.0)
+GTK_LIBS= $(pkg-config --libs gtk+-2.0)
.include "../../x11/gtk2/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mgtk3)
-CONFIGURE_ARGS+= --with-gtk3
-GTK_CFLAGS= $(pkg-config --cflags gtk+-3.0)
-GTK_LIBS= $(pkg-config --libs gtk+-3.0)
+CONFIGURE_ARGS+= --with-gtk3
+GTK_CFLAGS= $(pkg-config --cflags gtk+-3.0)
+GTK_LIBS= $(pkg-config --libs gtk+-3.0)
.include "../../x11/gtk3/buildlink3.mk"
PLIST.gtk3= yes
diff --git a/spamassassin-cvs/Makefile b/spamassassin-cvs/Makefile
index c4ce09fa6c..729f83e136 100644
--- a/spamassassin-cvs/Makefile
+++ b/spamassassin-cvs/Makefile
@@ -126,7 +126,7 @@ RULE_SUBDIR= ${RULESDIR:S,^${PREFIX}/,,}
CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf \
${RULESDIR}/user_prefs.template \
- ${PKG_SYSCONFDIR}/user_prefs.template
+ ${PKG_SYSCONFDIR}/user_prefs.template
SUPPORT_FILES_PERMS+= ${EGDIR}/netbsd_lists.cf \
${PKG_SYSCONFDIR}/netbsd_lists.cf ${SHAREOWN} \
${SHAREGRP} ${SHAREMODE}
diff --git a/spectra/Makefile b/spectra/Makefile
index d67d0467cf..56867a5cd3 100644
--- a/spectra/Makefile
+++ b/spectra/Makefile
@@ -14,7 +14,7 @@ LICENSE= mpl-2.0
WRKSRC= ${WRKDIR}/spectra-0.7.0
-NO_BUILD= yes
+NO_BUILD= yes
USE_TOOLS+= pax
USE_LANGUAGES= c++ fortran
diff --git a/spot/Makefile b/spot/Makefile
index 862736149b..c244dc21fd 100644
--- a/spot/Makefile
+++ b/spot/Makefile
@@ -10,7 +10,7 @@ COMMENT= Library for omega automata manipulation and model checking
LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL= yes
USE_TOOLS+= pkg-config perl
USE_LANGUAGES= c c++
diff --git a/spotifyd/Makefile b/spotifyd/Makefile
index 49d6df6657..438b5bdcc1 100644
--- a/spotifyd/Makefile
+++ b/spotifyd/Makefile
@@ -20,8 +20,8 @@ LIBRESPOT_REV= a41ab28540537e5f277fc9556bbcc16e08f065d5
DISTFILES+= librespot-${LIBRESPOT_REV}.tar.gz
SITES.librespot-${LIBRESPOT_REV}.tar.gz= -https://github.com/librespot-org/librespot/archive/${LIBRESPOT_REV}.tar.gz
-RUST_TREMOR_REV=5958cc302e78f535dad90e9665da981ddff4000a
-DISTFILES+= rust-tremor-${RUST_TREMOR_REV}.tar.gz
+RUST_TREMOR_REV= 5958cc302e78f535dad90e9665da981ddff4000a
+DISTFILES+= rust-tremor-${RUST_TREMOR_REV}.tar.gz
SITES.rust-tremor-${RUST_TREMOR_REV}.tar.gz= -https://github.com/plietar/rust-tremor/archive/${RUST_TREMOR_REV}.tar.gz
RUST_MDNS_REV= 66a74033da6c9f1a06e7b0a29f4544fd189d6479
@@ -345,7 +345,7 @@ CARGO_CRATE_DEPENDS+= xdg-2.2.0
MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
INSTALLATION_DIRS+= bin
-MAKE_ENV+= RUSTFLAGS="-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pulseaudio}/lib -C link-arg=-L${BUILDLINK_PREFIX.pulseaudio}/lib"
+MAKE_ENV+= RUSTFLAGS="-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pulseaudio}/lib -C link-arg=-L${BUILDLINK_PREFIX.pulseaudio}/lib"
# TODO investigate why this is needed
CHECK_WRKREF_SKIP+= bin/spotifyd
diff --git a/symmetrica/Makefile b/symmetrica/Makefile
index 22b2baa8de..11a30f4e2d 100644
--- a/symmetrica/Makefile
+++ b/symmetrica/Makefile
@@ -15,11 +15,11 @@ WRKSRC= ${WRKDIR}
VERSION= 2.0
NO_CONFIGURE= yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
MAKE_FILE= makefile
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake
-INSTALLATION_DIRS+= bin include/symmetrica
+INSTALLATION_DIRS+= bin include/symmetrica
do-build:
cd ${WRKSRC} && ${GMAKE}
diff --git a/tbb/Makefile b/tbb/Makefile
index 93ebe6725f..fcb5f09f82 100644
--- a/tbb/Makefile
+++ b/tbb/Makefile
@@ -23,10 +23,10 @@
# Best guess translation of REINPLACE above. Replace 1 with a
# meaningful name. Assuming post-patch: Change if necessary.
-#SUBST_CLASSES+= 1
-#SUBST_STAGE.1= post-patch
-#SUBST_SED.1+= -e '/^CONLY =/s|^CONLY =.*|CONLY = ${CC}|'
-#SUBST_SED.1+= -e '/^CPLUS =/s|^CPLUS =.*|CPLUS = ${CXX}|'
+#SUBST_CLASSES+= 1
+#SUBST_STAGE.1= post-patch
+#SUBST_SED.1+= -e '/^CONLY =/s|^CONLY =.*|CONLY = ${CC}|'
+#SUBST_SED.1+= -e '/^CPLUS =/s|^CPLUS =.*|CPLUS = ${CXX}|'
#SUBST_FILES.1+= ${WRKSRC}/build/FreeBSD.${COMPILER_TYPE}.inc
DISTNAME= tbb-${PV}
@@ -40,7 +40,7 @@ HOMEPAGE= http://threadingbuildingblocks.org/
COMMENT= Library that provides thread building blocks
LICENSE= apache-2.0
-ONLY_FOR_PLATFORM= *-*-aarch64 *-*-x86_64 *-*-earmv6 *-*-earmv7 *-*-i386
+ONLY_FOR_PLATFORM= *-*-aarch64 *-*-x86_64 *-*-earmv6 *-*-earmv7 *-*-i386
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pax
diff --git a/tealdeer/Makefile b/tealdeer/Makefile
index e2af1181c8..b9aa147fdf 100644
--- a/tealdeer/Makefile
+++ b/tealdeer/Makefile
@@ -12,115 +12,115 @@ LICENSE= mit OR apache-2.0
USE_LANGUAGES= c # rust
-CARGO_CRATE_DEPENDS+= adler32-1.0.3
-CARGO_CRATE_DEPENDS+= aho-corasick-0.6.8
-CARGO_CRATE_DEPENDS+= ansi_term-0.10.2
-CARGO_CRATE_DEPENDS+= assert_cli-0.5.4
-CARGO_CRATE_DEPENDS+= atty-0.2.11
-CARGO_CRATE_DEPENDS+= backtrace-0.3.9
-CARGO_CRATE_DEPENDS+= backtrace-sys-0.1.24
-CARGO_CRATE_DEPENDS+= bitflags-0.9.1
-CARGO_CRATE_DEPENDS+= bitflags-1.0.4
-CARGO_CRATE_DEPENDS+= build_const-0.2.1
-CARGO_CRATE_DEPENDS+= bytecount-0.3.2
-CARGO_CRATE_DEPENDS+= cargo_metadata-0.2.3
-CARGO_CRATE_DEPENDS+= cargo_metadata-0.5.8
-CARGO_CRATE_DEPENDS+= cc-1.0.25
-CARGO_CRATE_DEPENDS+= cfg-if-0.1.6
-CARGO_CRATE_DEPENDS+= clippy-0.0.174
-CARGO_CRATE_DEPENDS+= clippy_lints-0.0.174
-CARGO_CRATE_DEPENDS+= colored-1.6.1
-CARGO_CRATE_DEPENDS+= crc-1.8.1
-CARGO_CRATE_DEPENDS+= curl-0.4.18
-CARGO_CRATE_DEPENDS+= curl-sys-0.4.13
-CARGO_CRATE_DEPENDS+= difference-1.0.0
-CARGO_CRATE_DEPENDS+= docopt-0.8.3
-CARGO_CRATE_DEPENDS+= either-1.5.0
-CARGO_CRATE_DEPENDS+= env_logger-0.5.13
-CARGO_CRATE_DEPENDS+= environment-0.1.1
-CARGO_CRATE_DEPENDS+= error-chain-0.11.0
-CARGO_CRATE_DEPENDS+= filetime-0.2.1
-CARGO_CRATE_DEPENDS+= flate2-1.0.4
-CARGO_CRATE_DEPENDS+= fuchsia-zircon-0.3.3
-CARGO_CRATE_DEPENDS+= fuchsia-zircon-sys-0.3.3
-CARGO_CRATE_DEPENDS+= getopts-0.2.18
-CARGO_CRATE_DEPENDS+= glob-0.2.11
-CARGO_CRATE_DEPENDS+= humantime-1.1.1
-CARGO_CRATE_DEPENDS+= idna-0.1.5
-CARGO_CRATE_DEPENDS+= if_chain-0.1.3
-CARGO_CRATE_DEPENDS+= itertools-0.6.5
-CARGO_CRATE_DEPENDS+= itoa-0.4.3
-CARGO_CRATE_DEPENDS+= kernel32-sys-0.2.2
-CARGO_CRATE_DEPENDS+= lazy_static-0.2.11
-CARGO_CRATE_DEPENDS+= lazy_static-1.1.0
-CARGO_CRATE_DEPENDS+= libc-0.2.43
-CARGO_CRATE_DEPENDS+= libz-sys-1.0.24
-CARGO_CRATE_DEPENDS+= log-0.4.5
-CARGO_CRATE_DEPENDS+= matches-0.1.8
-CARGO_CRATE_DEPENDS+= memchr-2.1.0
-CARGO_CRATE_DEPENDS+= miniz-sys-0.1.11
-CARGO_CRATE_DEPENDS+= miniz_oxide-0.2.0
-CARGO_CRATE_DEPENDS+= miniz_oxide_c_api-0.2.0
-CARGO_CRATE_DEPENDS+= openssl-probe-0.1.2
-CARGO_CRATE_DEPENDS+= openssl-sys-0.9.39
-CARGO_CRATE_DEPENDS+= percent-encoding-1.0.1
-CARGO_CRATE_DEPENDS+= pkg-config-0.3.14
-CARGO_CRATE_DEPENDS+= proc-macro2-0.4.20
-CARGO_CRATE_DEPENDS+= pulldown-cmark-0.0.15
-CARGO_CRATE_DEPENDS+= pulldown-cmark-0.1.2
-CARGO_CRATE_DEPENDS+= quick-error-1.2.2
-CARGO_CRATE_DEPENDS+= quine-mc_cluskey-0.2.4
-CARGO_CRATE_DEPENDS+= quote-0.6.8
-CARGO_CRATE_DEPENDS+= rand-0.4.3
-CARGO_CRATE_DEPENDS+= redox_syscall-0.1.40
-CARGO_CRATE_DEPENDS+= redox_termios-0.1.1
-CARGO_CRATE_DEPENDS+= regex-0.2.11
-CARGO_CRATE_DEPENDS+= regex-1.0.5
-CARGO_CRATE_DEPENDS+= regex-syntax-0.4.2
-CARGO_CRATE_DEPENDS+= regex-syntax-0.5.6
-CARGO_CRATE_DEPENDS+= regex-syntax-0.6.2
-CARGO_CRATE_DEPENDS+= remove_dir_all-0.5.1
-CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.9
-CARGO_CRATE_DEPENDS+= ryu-0.2.6
-CARGO_CRATE_DEPENDS+= same-file-1.0.3
-CARGO_CRATE_DEPENDS+= schannel-0.1.14
-CARGO_CRATE_DEPENDS+= semver-0.6.0
-CARGO_CRATE_DEPENDS+= semver-0.9.0
-CARGO_CRATE_DEPENDS+= semver-parser-0.7.0
-CARGO_CRATE_DEPENDS+= serde-1.0.80
-CARGO_CRATE_DEPENDS+= serde_derive-1.0.80
-CARGO_CRATE_DEPENDS+= serde_json-1.0.32
-CARGO_CRATE_DEPENDS+= skeptic-0.13.3
-CARGO_CRATE_DEPENDS+= socket2-0.3.8
-CARGO_CRATE_DEPENDS+= strsim-0.6.0
-CARGO_CRATE_DEPENDS+= syn-0.15.13
-CARGO_CRATE_DEPENDS+= tar-0.4.17
-CARGO_CRATE_DEPENDS+= tempdir-0.3.7
-CARGO_CRATE_DEPENDS+= termcolor-1.0.4
-CARGO_CRATE_DEPENDS+= termion-1.5.1
-CARGO_CRATE_DEPENDS+= thread_local-0.3.6
-CARGO_CRATE_DEPENDS+= time-0.1.40
-CARGO_CRATE_DEPENDS+= toml-0.4.8
-CARGO_CRATE_DEPENDS+= ucd-util-0.1.1
-CARGO_CRATE_DEPENDS+= unicode-bidi-0.3.4
-CARGO_CRATE_DEPENDS+= unicode-normalization-0.1.7
-CARGO_CRATE_DEPENDS+= unicode-width-0.1.5
-CARGO_CRATE_DEPENDS+= unicode-xid-0.1.0
-CARGO_CRATE_DEPENDS+= url-1.7.1
-CARGO_CRATE_DEPENDS+= utf8-ranges-1.0.1
-CARGO_CRATE_DEPENDS+= utime-0.2.1
-CARGO_CRATE_DEPENDS+= vcpkg-0.2.6
-CARGO_CRATE_DEPENDS+= version_check-0.1.5
-CARGO_CRATE_DEPENDS+= walkdir-2.2.5
-CARGO_CRATE_DEPENDS+= winapi-0.2.8
-CARGO_CRATE_DEPENDS+= winapi-0.3.6
-CARGO_CRATE_DEPENDS+= winapi-build-0.1.1
-CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
-CARGO_CRATE_DEPENDS+= winapi-util-0.1.1
-CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
-CARGO_CRATE_DEPENDS+= wincolor-1.0.1
-CARGO_CRATE_DEPENDS+= xattr-0.2.2
-CARGO_CRATE_DEPENDS+= xdg-2.1.0
+CARGO_CRATE_DEPENDS+= adler32-1.0.3
+CARGO_CRATE_DEPENDS+= aho-corasick-0.6.8
+CARGO_CRATE_DEPENDS+= ansi_term-0.10.2
+CARGO_CRATE_DEPENDS+= assert_cli-0.5.4
+CARGO_CRATE_DEPENDS+= atty-0.2.11
+CARGO_CRATE_DEPENDS+= backtrace-0.3.9
+CARGO_CRATE_DEPENDS+= backtrace-sys-0.1.24
+CARGO_CRATE_DEPENDS+= bitflags-0.9.1
+CARGO_CRATE_DEPENDS+= bitflags-1.0.4
+CARGO_CRATE_DEPENDS+= build_const-0.2.1
+CARGO_CRATE_DEPENDS+= bytecount-0.3.2
+CARGO_CRATE_DEPENDS+= cargo_metadata-0.2.3
+CARGO_CRATE_DEPENDS+= cargo_metadata-0.5.8
+CARGO_CRATE_DEPENDS+= cc-1.0.25
+CARGO_CRATE_DEPENDS+= cfg-if-0.1.6
+CARGO_CRATE_DEPENDS+= clippy-0.0.174
+CARGO_CRATE_DEPENDS+= clippy_lints-0.0.174
+CARGO_CRATE_DEPENDS+= colored-1.6.1
+CARGO_CRATE_DEPENDS+= crc-1.8.1
+CARGO_CRATE_DEPENDS+= curl-0.4.18
+CARGO_CRATE_DEPENDS+= curl-sys-0.4.13
+CARGO_CRATE_DEPENDS+= difference-1.0.0
+CARGO_CRATE_DEPENDS+= docopt-0.8.3
+CARGO_CRATE_DEPENDS+= either-1.5.0
+CARGO_CRATE_DEPENDS+= env_logger-0.5.13
+CARGO_CRATE_DEPENDS+= environment-0.1.1
+CARGO_CRATE_DEPENDS+= error-chain-0.11.0
+CARGO_CRATE_DEPENDS+= filetime-0.2.1
+CARGO_CRATE_DEPENDS+= flate2-1.0.4
+CARGO_CRATE_DEPENDS+= fuchsia-zircon-0.3.3
+CARGO_CRATE_DEPENDS+= fuchsia-zircon-sys-0.3.3
+CARGO_CRATE_DEPENDS+= getopts-0.2.18
+CARGO_CRATE_DEPENDS+= glob-0.2.11
+CARGO_CRATE_DEPENDS+= humantime-1.1.1
+CARGO_CRATE_DEPENDS+= idna-0.1.5
+CARGO_CRATE_DEPENDS+= if_chain-0.1.3
+CARGO_CRATE_DEPENDS+= itertools-0.6.5
+CARGO_CRATE_DEPENDS+= itoa-0.4.3
+CARGO_CRATE_DEPENDS+= kernel32-sys-0.2.2
+CARGO_CRATE_DEPENDS+= lazy_static-0.2.11
+CARGO_CRATE_DEPENDS+= lazy_static-1.1.0
+CARGO_CRATE_DEPENDS+= libc-0.2.43
+CARGO_CRATE_DEPENDS+= libz-sys-1.0.24
+CARGO_CRATE_DEPENDS+= log-0.4.5
+CARGO_CRATE_DEPENDS+= matches-0.1.8
+CARGO_CRATE_DEPENDS+= memchr-2.1.0
+CARGO_CRATE_DEPENDS+= miniz-sys-0.1.11
+CARGO_CRATE_DEPENDS+= miniz_oxide-0.2.0
+CARGO_CRATE_DEPENDS+= miniz_oxide_c_api-0.2.0
+CARGO_CRATE_DEPENDS+= openssl-probe-0.1.2
+CARGO_CRATE_DEPENDS+= openssl-sys-0.9.39
+CARGO_CRATE_DEPENDS+= percent-encoding-1.0.1
+CARGO_CRATE_DEPENDS+= pkg-config-0.3.14
+CARGO_CRATE_DEPENDS+= proc-macro2-0.4.20
+CARGO_CRATE_DEPENDS+= pulldown-cmark-0.0.15
+CARGO_CRATE_DEPENDS+= pulldown-cmark-0.1.2
+CARGO_CRATE_DEPENDS+= quick-error-1.2.2
+CARGO_CRATE_DEPENDS+= quine-mc_cluskey-0.2.4
+CARGO_CRATE_DEPENDS+= quote-0.6.8
+CARGO_CRATE_DEPENDS+= rand-0.4.3
+CARGO_CRATE_DEPENDS+= redox_syscall-0.1.40
+CARGO_CRATE_DEPENDS+= redox_termios-0.1.1
+CARGO_CRATE_DEPENDS+= regex-0.2.11
+CARGO_CRATE_DEPENDS+= regex-1.0.5
+CARGO_CRATE_DEPENDS+= regex-syntax-0.4.2
+CARGO_CRATE_DEPENDS+= regex-syntax-0.5.6
+CARGO_CRATE_DEPENDS+= regex-syntax-0.6.2
+CARGO_CRATE_DEPENDS+= remove_dir_all-0.5.1
+CARGO_CRATE_DEPENDS+= rustc-demangle-0.1.9
+CARGO_CRATE_DEPENDS+= ryu-0.2.6
+CARGO_CRATE_DEPENDS+= same-file-1.0.3
+CARGO_CRATE_DEPENDS+= schannel-0.1.14
+CARGO_CRATE_DEPENDS+= semver-0.6.0
+CARGO_CRATE_DEPENDS+= semver-0.9.0
+CARGO_CRATE_DEPENDS+= semver-parser-0.7.0
+CARGO_CRATE_DEPENDS+= serde-1.0.80
+CARGO_CRATE_DEPENDS+= serde_derive-1.0.80
+CARGO_CRATE_DEPENDS+= serde_json-1.0.32
+CARGO_CRATE_DEPENDS+= skeptic-0.13.3
+CARGO_CRATE_DEPENDS+= socket2-0.3.8
+CARGO_CRATE_DEPENDS+= strsim-0.6.0
+CARGO_CRATE_DEPENDS+= syn-0.15.13
+CARGO_CRATE_DEPENDS+= tar-0.4.17
+CARGO_CRATE_DEPENDS+= tempdir-0.3.7
+CARGO_CRATE_DEPENDS+= termcolor-1.0.4
+CARGO_CRATE_DEPENDS+= termion-1.5.1
+CARGO_CRATE_DEPENDS+= thread_local-0.3.6
+CARGO_CRATE_DEPENDS+= time-0.1.40
+CARGO_CRATE_DEPENDS+= toml-0.4.8
+CARGO_CRATE_DEPENDS+= ucd-util-0.1.1
+CARGO_CRATE_DEPENDS+= unicode-bidi-0.3.4
+CARGO_CRATE_DEPENDS+= unicode-normalization-0.1.7
+CARGO_CRATE_DEPENDS+= unicode-width-0.1.5
+CARGO_CRATE_DEPENDS+= unicode-xid-0.1.0
+CARGO_CRATE_DEPENDS+= url-1.7.1
+CARGO_CRATE_DEPENDS+= utf8-ranges-1.0.1
+CARGO_CRATE_DEPENDS+= utime-0.2.1
+CARGO_CRATE_DEPENDS+= vcpkg-0.2.6
+CARGO_CRATE_DEPENDS+= version_check-0.1.5
+CARGO_CRATE_DEPENDS+= walkdir-2.2.5
+CARGO_CRATE_DEPENDS+= winapi-0.2.8
+CARGO_CRATE_DEPENDS+= winapi-0.3.6
+CARGO_CRATE_DEPENDS+= winapi-build-0.1.1
+CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
+CARGO_CRATE_DEPENDS+= winapi-util-0.1.1
+CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
+CARGO_CRATE_DEPENDS+= wincolor-1.0.1
+CARGO_CRATE_DEPENDS+= xattr-0.2.2
+CARGO_CRATE_DEPENDS+= xdg-2.1.0
MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
diff --git a/telegraf/Makefile b/telegraf/Makefile
index 3579bcc423..27e4498363 100644
--- a/telegraf/Makefile
+++ b/telegraf/Makefile
@@ -1,23 +1,23 @@
# $NetBSD$
-GITHUB_PROJECT= telegraf
-PKGVERSION_NOREV= 1.9.2
-DISTNAME= telegraf-1.9.2
-GITHUB_TAG= ${PKGVERSION_NOREV}
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=influxdata/}
-MAINTAINER= william%welliver.org@localhost
-HOMEPAGE= https://www.influxdata.com/
-COMMENT= Plugin-driven server agent for collecting & reporting metrics
-LICENSE= mit
+GITHUB_PROJECT= telegraf
+PKGVERSION_NOREV= 1.9.2
+DISTNAME= telegraf-1.9.2
+GITHUB_TAG= ${PKGVERSION_NOREV}
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=influxdata/}
+MAINTAINER= william%welliver.org@localhost
+HOMEPAGE= https://www.influxdata.com/
+COMMENT= Plugin-driven server agent for collecting & reporting metrics
+LICENSE= mit
# despite being the default value, this explicit declaration is required for things
# to build properly.
-EXTRACT_SUFX= .tar.gz
+EXTRACT_SUFX= .tar.gz
TELEGRAF_DEPENDENCIES_DIR= telegraf-dependencies-${PKGVERSION_NOREV}
-TELEGRAF_DEPENDENCIES= ${TELEGRAF_DEPENDENCIES_DIR}${EXTRACT_SUFX}
-TELEGRAF_DISTNAME= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES= ${TELEGRAF_DISTNAME}
+TELEGRAF_DEPENDENCIES= ${TELEGRAF_DEPENDENCIES_DIR}${EXTRACT_SUFX}
+TELEGRAF_DISTNAME= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES= ${TELEGRAF_DISTNAME}
.if !defined(BOOTSTRAP)
DISTFILES+= ${TELEGRAF_DEPENDENCIES}
diff --git a/termbox/Makefile b/termbox/Makefile
index 5247063ea9..08b9f1c08f 100644
--- a/termbox/Makefile
+++ b/termbox/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
PYTHON_FOR_BUILD_ONLY= yes
-TOOL_DEPENDS+= waf>=1.8.4:../../devel/waf
+TOOL_DEPENDS+= waf>=1.8.4:../../devel/waf
.include "../../devel/waf/waf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/terminology/Makefile b/terminology/Makefile
index ba6ab901d0..ed28e1aa15 100644
--- a/terminology/Makefile
+++ b/terminology/Makefile
@@ -1,18 +1,18 @@
# $NetBSD: Makefile,v 0.2 2018/09/06 16:15:10 andyb Exp $
-DISTNAME= terminology-1.2.1
-CATEGORIES= wip
-MASTER_SITES= https://download.enlightenment.org/rel/apps/terminology/
-EXTRACT_SUFX= .tar.xz
+DISTNAME= terminology-1.2.1
+CATEGORIES= wip
+MASTER_SITES= https://download.enlightenment.org/rel/apps/terminology/
+EXTRACT_SUFX= .tar.xz
-MAINTAINER= andyb%m42.one@localhost
-HOMEPAGE= https://download.enlightenment.org/rel/apps/terminology/
-COMMENT= Enlightenment terminal
-LICENSE= 2-clause-bsd
+MAINTAINER= andyb%m42.one@localhost
+HOMEPAGE= https://download.enlightenment.org/rel/apps/terminology/
+COMMENT= Enlightenment terminal
+LICENSE= 2-clause-bsd
-DEPENDS+= efl121-[0-9]*:../../wip/efl121
+DEPENDS+= efl121-[0-9]*:../../wip/efl121
-INSTALLATION_DIRS= share/doc/terminology
+INSTALLATION_DIRS= share/doc/terminology
post-install:
${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING \
diff --git a/tor-dev/Makefile b/tor-dev/Makefile
index 8a1805ead7..9b29997c4a 100644
--- a/tor-dev/Makefile
+++ b/tor-dev/Makefile
@@ -51,7 +51,7 @@ FILES_SUBST+= TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP}
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
-CHECK_PORTABILITY_SKIP+=contrib/*
+CHECK_PORTABILITY_SKIP+= contrib/*
.include "options.mk"
diff --git a/toxic-git/Makefile b/toxic-git/Makefile
index 66760ff2a9..2945d7c5af 100644
--- a/toxic-git/Makefile
+++ b/toxic-git/Makefile
@@ -15,7 +15,7 @@ USE_LANGUAGES+= c
SUBST_CLASSES+= makefile
SUBST_STAGE.makefile= post-patch
-SUBST_MESSAGE.makefile= Fixing variable for manpath
+SUBST_MESSAGE.makefile= Fixing variable for manpath
SUBST_SED.makefile= -e 's|share/man|${PKGMANDIR}|g'
SUBST_FILES.makefile= cfg/global_vars.mk
diff --git a/tracy/Makefile b/tracy/Makefile
index cec26a7298..d2984e40e3 100644
--- a/tracy/Makefile
+++ b/tracy/Makefile
@@ -15,8 +15,8 @@ LICENSE= modified-bsd
WRKSRC= ${WRKDIR}/wolfpld-tracy-59ed5775d973
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake pkg-config
-INSTALLATION_DIRS= bin
+USE_TOOLS+= gmake pkg-config
+INSTALLATION_DIRS= bin
do-build:
cd ${WRKSRC}/profiler/build/unix && ${GMAKE} release
diff --git a/trinity/Makefile b/trinity/Makefile
index 1b4d9bd9fe..f3bd45f57b 100644
--- a/trinity/Makefile
+++ b/trinity/Makefile
@@ -30,7 +30,7 @@ DEPENDS+= fastool>=0.1.4:../../wip/fastool
DEPENDS+= p5-transdecoder>=5.3.0:../../wip/p5-transdecoder
DEPENDS+= Trimmomatic>=0.38:../../wip/trimmomatic
DEPENDS+= rsem>=1.2.30:../../wip/rsem
-DEPENDS+= ncbi-blast+>=2.7.1:../../biology/ncbi-blast+
+DEPENDS+= ncbi-blast+>=2.7.1:../../biology/ncbi-blast+
DISTNAME= trinity-${PV}
CATEGORIES= biology
@@ -47,21 +47,21 @@ USE_LANGUAGES= c c++
USE_JAVA= run
USE_TOOLS+= bash cmake gmake pax perl
-REPLACE_BASH= util/*/*.sh
-REPLACE_BASH+= util/*/*/*.sh
-REPLACE_BASH+= Analysis/*/*/*.sh
-REPLACE_PERL= Trinity util/misc/Monarch
-REPLACE_PERL+= util/*.pl util/*/*.pl util/*/*/*.pl util/*/*/*/*.pl
-REPLACE_PERL+= Chrysalis/analysis/*.pl
-REPLACE_PERL+= Analysis/*/*.pl Analysis/*/*/*.pl Analysis/*/*/*/*.pl
-REPLACE_PERL+= Analysis/*/*.cgi Analysis/*/PtR
-REPLACE_PERL+= PerlLib/*.pm PerlLib/*/*.pm PerlLib/*.ph PerlLib/*.pl
-REPLACE_PYTHON= util/support_scripts/trinity_installer.py
-REPLACE_PYTHON+=util/misc/alt_GG_read_partitioning_JCornish/genwig2.py
-REPLACE_PYTHON+=util/misc/sim_test_framework/run_Trinity_eval.sh
-REPLACE_PYTHON+=util/misc/TPM_weighted_gene_length.py
-REPLACE_PYTHON+=Analysis/SuperTranscripts/*.py
-REPLACE_PYTHON+=Analysis/SuperTranscripts/*/*.py
+REPLACE_BASH= util/*/*.sh
+REPLACE_BASH+= util/*/*/*.sh
+REPLACE_BASH+= Analysis/*/*/*.sh
+REPLACE_PERL= Trinity util/misc/Monarch
+REPLACE_PERL+= util/*.pl util/*/*.pl util/*/*/*.pl util/*/*/*/*.pl
+REPLACE_PERL+= Chrysalis/analysis/*.pl
+REPLACE_PERL+= Analysis/*/*.pl Analysis/*/*/*.pl Analysis/*/*/*/*.pl
+REPLACE_PERL+= Analysis/*/*.cgi Analysis/*/PtR
+REPLACE_PERL+= PerlLib/*.pm PerlLib/*/*.pm PerlLib/*.ph PerlLib/*.pl
+REPLACE_PYTHON= util/support_scripts/trinity_installer.py
+REPLACE_PYTHON+= util/misc/alt_GG_read_partitioning_JCornish/genwig2.py
+REPLACE_PYTHON+= util/misc/sim_test_framework/run_Trinity_eval.sh
+REPLACE_PYTHON+= util/misc/TPM_weighted_gene_length.py
+REPLACE_PYTHON+= Analysis/SuperTranscripts/*.py
+REPLACE_PYTHON+= Analysis/SuperTranscripts/*/*.py
REPLACE_RSCRIPT+= Analysis/*/*.Rscript
REPLACE_RSCRIPT+= util/misc/*.Rscript
diff --git a/uptimed/Makefile b/uptimed/Makefile
index 1ea0e67843..d27e2d30d1 100644
--- a/uptimed/Makefile
+++ b/uptimed/Makefile
@@ -14,7 +14,7 @@ COMMENT= Keeps track of current and past system uptimes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= automake patch
+USE_TOOLS+= automake patch
EGDIR= share/examples/${PKGBASE}
INSTALLATION_DIRS= bin sbin lib ${PKGMANDIR}/man2 ${PKGMANDIR}/man8
diff --git a/valgrind-netbsd/Makefile b/valgrind-netbsd/Makefile
index 9a6648aead..4ab7713aa9 100644
--- a/valgrind-netbsd/Makefile
+++ b/valgrind-netbsd/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.22 2016/01/16 20:30:11 ryoon Exp $
#
-PKGSRC_USE_SSP= no
+PKGSRC_USE_SSP= no
DISTNAME= valgrind-3.14.0
CATEGORIES= devel
@@ -52,10 +52,10 @@ CONFIGURE_ARGS+= --enable-only64bit
#CFLAGS+= -fsanitize-coverage=trace-pc
-CFLAGS+= -O0 -g -ggdb
-CXXFLAGS+= -O0 -g -ggdb
-INSTALL_UNSTRIPPED= yes
-BUILDLINK_TRANSFORM+= rm:-s
+CFLAGS+= -O0 -g -ggdb
+CXXFLAGS+= -O0 -g -ggdb
+INSTALL_UNSTRIPPED= yes
+BUILDLINK_TRANSFORM+= rm:-s
#CFLAGS+= -fsanitize=address
#LDFLAGS+= -fsanitize=address
diff --git a/vcflib/Makefile b/vcflib/Makefile
index 6927b6f4c0..0f8a355f5a 100644
--- a/vcflib/Makefile
+++ b/vcflib/Makefile
@@ -19,10 +19,10 @@ SUBST_STAGE.ldflags= post-patch
SUBST_SED.ldflags= -e "s|LDFLAGS =|LDFLAGS = ${COMPILER_RPATH_FLAG}${PREFIX}/lib|g"
CXXFLAGS+= -I${PREFIX}/include/smithwaterman \
- -I${PREFIX}/include/multichoose \
- -I${PREFIX}/include/filevercmp \
- -I${PREFIX}/include/fastahack \
- -I${PREFIX}/include/intervaltree \
+ -I${PREFIX}/include/multichoose \
+ -I${PREFIX}/include/filevercmp \
+ -I${PREFIX}/include/fastahack \
+ -I${PREFIX}/include/intervaltree \
-DVERSION='"${PORTVERSION}"'
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
MAKE_FLAGS= LIB_PATH+=${COMPILER_RPATH_FLAG}${PREFIX}/lib
diff --git a/virtualbox/Makefile b/virtualbox/Makefile
index 78808082b7..bde9cb124c 100644
--- a/virtualbox/Makefile
+++ b/virtualbox/Makefile
@@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/VirtualBox-${PKGVERSION_NOREV}
HAS_CONFIGURE= yes
USE_LANGUAGES+= c c++
-PYTHON_VERSIONS_ACCEPTED= 27
+PYTHON_VERSIONS_ACCEPTED= 27
.include "../../mk/bsd.prefs.mk"
diff --git a/wla-dx/Makefile b/wla-dx/Makefile
index 154bdca3e4..c1fdb9d3ff 100644
--- a/wla-dx/Makefile
+++ b/wla-dx/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
-DISTNAME= wla-dx-9.7
-CATEGORIES= devel
+DISTNAME= wla-dx-9.7
+CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=vhelin/}
GITHUB_TAG= v${PKGVERSION_NOREV}
diff --git a/wla-dx/options.mk b/wla-dx/options.mk
index 50686aa48b..63e22ad83a 100644
--- a/wla-dx/options.mk
+++ b/wla-dx/options.mk
@@ -1,7 +1,7 @@
# $NetBSD$
-PKG_OPTIONS_VAR= PKG_OPTIONS.wla-dx
-PKG_SUPPORTED_OPTIONS= doc
+PKG_OPTIONS_VAR= PKG_OPTIONS.wla-dx
+PKG_SUPPORTED_OPTIONS= doc
PKG_SUGGESTED_OPTIONS=
PLIST_VARS+= doc
@@ -10,6 +10,6 @@ PLIST_VARS+= doc
.if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DEPENDS+= py[0-9]*-sphinx-[0-9]*:../../textproc/py-sphinx
+BUILD_DEPENDS+= py[0-9]*-sphinx-[0-9]*:../../textproc/py-sphinx
PLIST.doc= yes
.endif
diff --git a/xbps/Makefile b/xbps/Makefile
index ac1005b6c6..a1c1f6b0e9 100644
--- a/xbps/Makefile
+++ b/xbps/Makefile
@@ -9,16 +9,16 @@ HOMEPAGE= https://github.com/void-linux/xbps/
COMMENT= The X Binary Package System
LICENSE= 2-clause-bsd
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONFS= xbps.conf 00-repository-main.conf
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+CONFS= xbps.conf 00-repository-main.conf
.for f in ${CONFS}
-CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/xbps.d/${f}
+CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/xbps.d/${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
USE_TOOLS+= pkg-config gmake
GNU_CONFIGURE= yes
diff --git a/xf86-input-mouse-dfbsd/Makefile b/xf86-input-mouse-dfbsd/Makefile
index ea9fb95e71..0f8a01a03a 100644
--- a/xf86-input-mouse-dfbsd/Makefile
+++ b/xf86-input-mouse-dfbsd/Makefile
@@ -15,12 +15,12 @@ GNU_CONFIGURE= YES
USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-CFLAGS.DragonFly+= -Wno-array-bounds
+CFLAGS.DragonFly+= -Wno-array-bounds
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-SUBST_CLASSES+= freebsdusb
+SUBST_CLASSES+= freebsdusb
SUBST_STAGE.freebsdusb= post-extract
SUBST_MESSAGE.freebsdusb= Patching src/Makefile.in for DragonFly or FreeBSD compatible USB
SUBST_FILES.freebsdusb+= src/Makefile.in
diff --git a/xf86-video-ati-dfbsd/Makefile b/xf86-video-ati-dfbsd/Makefile
index b14ce9c23a..1ad19a0758 100644
--- a/xf86-video-ati-dfbsd/Makefile
+++ b/xf86-video-ati-dfbsd/Makefile
@@ -40,11 +40,11 @@ USE_TOOLS+= gmake pkg-config autoconf automake autoreconf
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.xf86-video-ati
-PKG_SUPPORTED_OPTIONS= debug
-PKG_SUPPORTED_OPTIONS+= revert_gbm_bo
+PKG_SUPPORTED_OPTIONS= debug
+PKG_SUPPORTED_OPTIONS+= revert_gbm_bo
.if ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= revert_gbm_bo
+PKG_SUGGESTED_OPTIONS+= revert_gbm_bo
.endif
.include "../../mk/bsd.options.mk"
diff --git a/xssp/Makefile b/xssp/Makefile
index dbd7e845a2..652358a52c 100644
--- a/xssp/Makefile
+++ b/xssp/Makefile
@@ -40,9 +40,9 @@ SUBST_STAGE.cmath= pre-configure
SUBST_SED.cmath+= -e 's|tr1/cmath.hpp|units/cmath.hpp|g'
SUBST_FILES.cmath+= ${WRKSRC}/src/hssp-nt.cpp
-CXXFLAGS+= -Wno-unused-const-variable
-CXXFLAGS+= -Wno-unknown-pragmas
-CXXFLAGS+= -Wno-error=sign-compare # Boost header
+CXXFLAGS+= -Wno-unused-const-variable
+CXXFLAGS+= -Wno-unknown-pragmas
+CXXFLAGS+= -Wno-error=sign-compare # Boost header
# Work around "could not find a version of the library" configure error
CONFIGURE_ARGS+= --with-boost-libdir=${PREFIX}/lib
diff --git a/zlua/Makefile b/zlua/Makefile
index 0474ecb9f7..4958154b05 100644
--- a/zlua/Makefile
+++ b/zlua/Makefile
@@ -2,7 +2,7 @@
DISTNAME= z.lua-0.0.0.20190131
PKGNAME= ${DISTNAME:S/z.lua/zlua/}
-CATEGORIES= shells
+CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GITHUB:=skywind3000/}
GITHUB_PROJECT= z.lua
GITHUB_TAG= 9fe0fc67a002ce122b10e85e047ef136a4544096
Home |
Main Index |
Thread Index |
Old Index