pkgsrc-WIP-changes archive

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

wip/*: fix variable alignment in commented assignments



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sun Jan 28 19:05:28 2018 +0000
Changeset:	6287c09134ad9f92c94fb0fc126479f7e9efbacc

Modified Files:
	ReZound/Makefile
	adms/Makefile
	aegisub/Makefile
	agile/Makefile
	analizo/Makefile
	antlr/Makefile
	apel-git/Makefile
	avr-binutils/buildlink3.mk
	avr-gdb/Makefile
	avr-libc/Makefile
	ballerburg/Makefile
	bamtools/Makefile
	binutils-gold-git/Makefile
	bitlbee/Makefile
	calcurse/Makefile
	cde/Makefile
	chromium/options.mk
	classic-mac-font-pack/Makefile
	collectd-web/Makefile
	coturn/Makefile
	darkcoin/Makefile
	debootstrap/Makefile
	dwarf_fortress/Makefile
	emacs-nox11-git/Makefile
	es40-firmware/Makefile
	ffmpeg-git/options.mk
	firebird/Makefile
	freeswitch-core/options.mk
	fs-uae-dev/Makefile
	garden/Makefile
	gcc42/Makefile
	gcc43/Makefile
	gcc44/Makefile
	gcc44/buildlink3.mk
	gcc45/Makefile
	gcc45/buildlink3.mk
	gcc46/Makefile
	gcc7snapshot/options.mk
	geant/Makefile
	ghmm/options.mk
	gjs/Makefile
	gnome-applets/Makefile
	gnome-terminal/Makefile
	gplbasic/Makefile
	islamic-menus/Makefile
	java-swt/Makefile
	jemboss-standalone/Makefile
	kde-runtime4/Makefile
	kmymoney4/Makefile
	libftdi1/Makefile
	libgda4/options.mk
	libgtop/Makefile
	libreoffice-git/Makefile
	libsocialweb/options.mk
	linux-kernel/Makefile
	litecoin/Makefile
	ltrace/Makefile
	meta-tracker/Makefile
	mpg123-svn/Makefile
	mplayer-mt/options.mk
	mplayer-snapshot-share/options.mk
	mtr-current/options.mk
	ninka/Makefile
	nspr-hg/Makefile
	nss-hg/Makefile
	ntimed-git/Makefile
	openxcom/Makefile
	p5-Date-Range/Makefile
	p5-Net-SMS-Clickatell/Makefile
	pike-core/Makefile.common
	piwik/Makefile
	plasma-desktop/Makefile
	plasma-integration/hacks.mk
	py-easymodeler/Makefile
	py-etmtk/Makefile
	py-fedmsg/Makefile
	py-jabber-icqt/Makefile
	py-scitools/Makefile
	py-sydent/Makefile
	py-twilio/Makefile
	rsem/Makefile
	rtcmix/Makefile
	rust/Makefile
	rustc/Makefile
	sbcl-git/Makefile
	semanticscuttle/Makefile
	sickle/Makefile
	simutrans-data/Makefile
	sselp/Makefile
	supertuxkart/Makefile
	swarp/Makefile
	texlive2013/Makefile
	udunits2/Makefile
	vcflib/Makefile
	vreng/Makefile
	wmname/Makefile
	xmlsysinfo/Makefile
	xmms2/options.mk
	xspread/Makefile

Log Message:
wip/*: fix variable alignment in commented assignments

pkglint -Wall -F -o align -r

(pkglint version 554023c, which already has some fixes for edge
cases discovered during the manual review of these changes)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6287c09134ad9f92c94fb0fc126479f7e9efbacc

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

diffstat:
 ReZound/Makefile                  |  2 +-
 adms/Makefile                     |  2 +-
 aegisub/Makefile                  |  2 +-
 agile/Makefile                    |  6 +++---
 analizo/Makefile                  |  4 ++--
 antlr/Makefile                    | 14 +++++++-------
 apel-git/Makefile                 |  2 +-
 avr-binutils/buildlink3.mk        |  4 ++--
 avr-gdb/Makefile                  |  2 +-
 avr-libc/Makefile                 |  2 +-
 ballerburg/Makefile               |  2 +-
 bamtools/Makefile                 |  2 +-
 binutils-gold-git/Makefile        | 14 +++++++-------
 bitlbee/Makefile                  |  2 +-
 calcurse/Makefile                 |  4 ++--
 cde/Makefile                      |  2 +-
 chromium/options.mk               |  2 +-
 classic-mac-font-pack/Makefile    | 14 +++++++-------
 collectd-web/Makefile             |  6 +++---
 coturn/Makefile                   |  4 ++--
 darkcoin/Makefile                 |  2 +-
 debootstrap/Makefile              |  2 +-
 dwarf_fortress/Makefile           | 14 +++++++-------
 emacs-nox11-git/Makefile          |  6 +++---
 es40-firmware/Makefile            |  2 +-
 ffmpeg-git/options.mk             |  8 ++++----
 firebird/Makefile                 |  2 +-
 freeswitch-core/options.mk        | 12 ++++++------
 fs-uae-dev/Makefile               |  2 +-
 garden/Makefile                   |  4 ++--
 gcc42/Makefile                    | 14 +++++++-------
 gcc43/Makefile                    |  2 +-
 gcc44/Makefile                    |  2 +-
 gcc44/buildlink3.mk               |  4 ++--
 gcc45/Makefile                    |  2 +-
 gcc45/buildlink3.mk               |  4 ++--
 gcc46/Makefile                    |  2 +-
 gcc7snapshot/options.mk           |  8 ++++----
 geant/Makefile                    |  2 +-
 ghmm/options.mk                   |  2 +-
 gjs/Makefile                      |  2 +-
 gnome-applets/Makefile            | 12 ++++++------
 gnome-terminal/Makefile           |  2 +-
 gplbasic/Makefile                 |  6 +++---
 islamic-menus/Makefile            |  2 +-
 java-swt/Makefile                 |  8 ++++----
 jemboss-standalone/Makefile       |  8 ++++----
 kde-runtime4/Makefile             |  2 +-
 kmymoney4/Makefile                |  2 +-
 libftdi1/Makefile                 |  4 ++--
 libgda4/options.mk                | 10 +++++-----
 libgtop/Makefile                  | 26 +++++++++++++-------------
 libreoffice-git/Makefile          | 12 ++++++------
 libsocialweb/options.mk           |  2 +-
 linux-kernel/Makefile             |  2 +-
 litecoin/Makefile                 |  2 +-
 ltrace/Makefile                   | 16 ++++++++--------
 meta-tracker/Makefile             |  2 +-
 mpg123-svn/Makefile               |  6 +++---
 mplayer-mt/options.mk             |  2 +-
 mplayer-snapshot-share/options.mk |  2 +-
 mtr-current/options.mk            |  8 ++++----
 ninka/Makefile                    | 12 ++++++------
 nspr-hg/Makefile                  |  2 +-
 nss-hg/Makefile                   |  2 +-
 ntimed-git/Makefile               |  2 +-
 openxcom/Makefile                 |  2 +-
 p5-Date-Range/Makefile            |  2 +-
 p5-Net-SMS-Clickatell/Makefile    |  2 +-
 pike-core/Makefile.common         |  2 +-
 piwik/Makefile                    |  2 +-
 plasma-desktop/Makefile           |  2 +-
 plasma-integration/hacks.mk       |  2 +-
 py-easymodeler/Makefile           |  2 +-
 py-etmtk/Makefile                 |  2 +-
 py-fedmsg/Makefile                |  2 +-
 py-jabber-icqt/Makefile           |  2 +-
 py-scitools/Makefile              |  2 +-
 py-sydent/Makefile                |  2 +-
 py-twilio/Makefile                |  2 +-
 rsem/Makefile                     |  2 +-
 rtcmix/Makefile                   |  2 +-
 rust/Makefile                     |  4 ++--
 rustc/Makefile                    |  2 +-
 sbcl-git/Makefile                 |  2 +-
 semanticscuttle/Makefile          |  2 +-
 sickle/Makefile                   |  4 ++--
 simutrans-data/Makefile           |  2 +-
 sselp/Makefile                    |  4 ++--
 supertuxkart/Makefile             | 10 +++++-----
 swarp/Makefile                    |  4 ++--
 texlive2013/Makefile              |  2 +-
 udunits2/Makefile                 | 12 ++++++------
 vcflib/Makefile                   |  8 ++++----
 vreng/Makefile                    |  2 +-
 wmname/Makefile                   |  4 ++--
 xmlsysinfo/Makefile               |  2 +-
 xmms2/options.mk                  |  2 +-
 xspread/Makefile                  |  2 +-
 99 files changed, 222 insertions(+), 222 deletions(-)

diffs:
diff --git a/ReZound/Makefile b/ReZound/Makefile
index a0cb3700f4..1d48c760eb 100644
--- a/ReZound/Makefile
+++ b/ReZound/Makefile
@@ -12,7 +12,7 @@ COMMENT=		Audio editor with graphical interface
 LICENSE=		gnu-gpl-v2
 
 # needs real bison and not yacc
-#BUILD_DEPENDS+= 	bison-[0-9]*:../../devel/bison
+#BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-jack
diff --git a/adms/Makefile b/adms/Makefile
index b28e5e5151..2def9cea35 100644
--- a/adms/Makefile
+++ b/adms/Makefile
@@ -17,7 +17,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++ fortran77
 
-#LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+#LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib
 
 pre-configure:
 	cd ${WRKSRC} && autoreconf -f
diff --git a/aegisub/Makefile b/aegisub/Makefile
index a0f1fe96aa..d0543f960d 100644
--- a/aegisub/Makefile
+++ b/aegisub/Makefile
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGES=	c c++
 
-#CONFIGURE_DIRS=		build
+#CONFIGURE_DIRS=	build
 #CONFIGURE_SCRIPT=	../configure
 PKGCONFIG_OVERRIDE+=	vendor/csri/csri.pc.in
 
diff --git a/agile/Makefile b/agile/Makefile
index ed1a2485bb..f8cff3e6d3 100644
--- a/agile/Makefile
+++ b/agile/Makefile
@@ -17,9 +17,9 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	bash:run
 USE_LANGUAGES=	c c++ fortran
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.agile
-PKG_SUPPORTED_OPTIONS=		pyext
-#PKG_SUGGESTED_OPTIONS=      pyext
+PKG_OPTIONS_VAR=	PKG_OPTIONS.agile
+PKG_SUPPORTED_OPTIONS=	pyext
+#PKG_SUGGESTED_OPTIONS=	pyext
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/analizo/Makefile b/analizo/Makefile
index aa6830aec7..94abc98901 100644
--- a/analizo/Makefile
+++ b/analizo/Makefile
@@ -23,8 +23,8 @@ DEPENDS+=	p5-YAML>=0.72:../../textproc/p5-YAML
 WRKSRC=		${WRKDIR}/analizo
 
 #PERL5_PACKLIST=	auto/analizo_1.16.0/
-USE_TOOLS+=	perl
-USE_LANGUAGES=	c c++
+USE_TOOLS+=		perl
+USE_LANGUAGES=		c c++
 
 REPLACE_PERL+=	Makefile.PL analizo lib/Analizo/scripts/analizo-metrics 	\
 				lib/Analizo/scripts/analizo-graph
diff --git a/antlr/Makefile b/antlr/Makefile
index 27eae1af97..e69012c7df 100644
--- a/antlr/Makefile
+++ b/antlr/Makefile
@@ -7,17 +7,17 @@
 ###########################################################
 # Unconverted and partially converted FreeBSD port syntax:
 
-#CONFLICTS=	pccts-[0-9]*
-#USE_JAVA=	yes
-#JAVA_VERSION=	1.6+
+#CONFLICTS=		pccts-[0-9]*
+#USE_JAVA=		yes
+#JAVA_VERSION=		1.6+
 #PORT_CLASSPATH=	${WRKSRC}/antlrall.jar:.
-#SUB_FILES=	antlr.sh
+#SUB_FILES=		antlr.sh
 #OPTIONS_DEFINE=	PYTHON DOCS
-#OPTIONS_SUB=	yes
+#OPTIONS_SUB=		yes
 #.if ${PORT_OPTIONS:MPYTHON}
 # Unknown tool: USE_TOOLS=	python
-#PORTDOCS+=	python-runtime.html
-#ANTLR_PYTHON=	${WRKSRC}/lib/python
+#PORTDOCS+=		python-runtime.html
+#ANTLR_PYTHON=		${WRKSRC}/lib/python
 #.endif
 #post-configure:
 #.if ${PORT_OPTIONS:MPYTHON}
diff --git a/apel-git/Makefile b/apel-git/Makefile
index 868a797e41..6e2fb2a4a7 100644
--- a/apel-git/Makefile
+++ b/apel-git/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 GIT_REPOSITORIES=	master
 GIT_REPO.master=	http://git.chise.org/git/elisp/apel.git
 GIT_MODULE.master=	apel
-#_GIT_FLAGS+=             --quiet --depth 1
+#_GIT_FLAGS+=		--quiet --depth 1
 
 WRKSRC=			${WRKDIR}/${PKGBASE}
 INFO_FILES=		yes
diff --git a/avr-binutils/buildlink3.mk b/avr-binutils/buildlink3.mk
index b0313b4704..763b0215f9 100644
--- a/avr-binutils/buildlink3.mk
+++ b/avr-binutils/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	avr-binutils
 .if !defined(AVR_BINUTILS_BUILDLINK3_MK)
 AVR_BINUTILS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.avr-binutils+=	avr-binutils>=2.23
-BUILDLINK_PKGSRCDIR.avr-binutils?=	../../cross/avr-binutils
+BUILDLINK_API_DEPENDS.avr-binutils+=		avr-binutils>=2.23
+BUILDLINK_PKGSRCDIR.avr-binutils?=		../../cross/avr-binutils
 #BUILDLINK_FNAME_TRANSFORM.avr-binutils+=	-e "s,${AVR_TARGET}/lib,lib/,g"
 
 .endif # AVR_BINUTILS_BUILDLINK3_MK
diff --git a/avr-gdb/Makefile b/avr-gdb/Makefile
index 1fe03e146e..80118b7586 100644
--- a/avr-gdb/Makefile
+++ b/avr-gdb/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--with-curses
 CONFIGURE_ENV+=		gdb_cv_var_elf=yes
 MAKE_ENV+=		gdb_cv_var_elf=yes
 # Native gdb has following lines also activated
-#CONFIGURE_ENV+=		gdb_cv_struct_lwp=yes
+#CONFIGURE_ENV+=	gdb_cv_struct_lwp=yes
 #MAKE_ENV+=		gdb_cv_struct_lwp=yes
 
 
diff --git a/avr-libc/Makefile b/avr-libc/Makefile
index 4125254ac7..f4ee383639 100644
--- a/avr-libc/Makefile
+++ b/avr-libc/Makefile
@@ -26,7 +26,7 @@ BUILD_DEPENDS+=		web2c-[0-9]*:../../print/web2c
 # tex not found
 BUILD_DEPENDS+=		tex-tetex-[0-9]*:../../print/tex-tetex
 # mkfmt tex.fmt not found
-#BUILD_DEPENDS+=		teTeX-texmf-[0-9]*:../../print/teTeX3-texmf
+#BUILD_DEPENDS+=	teTeX-texmf-[0-9]*:../../print/teTeX3-texmf
 
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
diff --git a/ballerburg/Makefile b/ballerburg/Makefile
index c1bde67e53..ae607c4c59 100644
--- a/ballerburg/Makefile
+++ b/ballerburg/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE=	http://baller.tuxfamily.org/
 COMMENT=	Classical castle combat game
 LICENSE=	gnu-gpl-v3
 
-#USE_TOOLS+=     intltool gmake cmake pkg-config msgfmt msgmerge xgettext
+#USE_TOOLS+=	intltool gmake cmake pkg-config msgfmt msgmerge xgettext
 USE_LANGUAGES=	c c++
 
 USE_CMAKE=	yes
diff --git a/bamtools/Makefile b/bamtools/Makefile
index e3b4d238aa..3854fd3699 100644
--- a/bamtools/Makefile
+++ b/bamtools/Makefile
@@ -45,7 +45,7 @@ SUBST_STAGE.bamtools_lib=	post-patch
 SUBST_FILES.bamtools_lib=	${WRKSRC}/src/api/CMakeLists.txt
 SUBST_SED.bamtools_lib=		-e 's|lib/bamtools|lib|g'
 
-#SUBST_CLASSES+=		bluetooth
+#SUBST_CLASSES+=	bluetooth
 #SUBST_STAGE.bluetooth=	post-patch
 #SUBST_FILES.bluetooth=	${WRKSRC}/Commands/Legoctl/Makefile
 #SUBST_SED.bluetooth=	-e 's|-lbluetooth||g'
diff --git a/binutils-gold-git/Makefile b/binutils-gold-git/Makefile
index 9ff462bbcc..0c88bb0342 100644
--- a/binutils-gold-git/Makefile
+++ b/binutils-gold-git/Makefile
@@ -1,14 +1,14 @@
 # $NetBSD: Makefile,v 1.11 2015/03/15 14:22:19 bsiegert Exp $
 #
 
-DISTNAME=		binutils-gold-8.0
-CATEGORIES=		devel
-GIT_REPOSITORIES=	binutils-gold
-#GIT_REPO.binutils-gold=		git://sourceware.org/git/binutils-gdb.git # broken?
-#GIT_REPO.binutils-gold=		http://sourceware.org/git/binutils-gdb.git # broken?
-GIT_REPO.binutils-gold=	https://github.com/wallento/binutils-gdb.git
+DISTNAME=			binutils-gold-8.0
+CATEGORIES=			devel
+GIT_REPOSITORIES=		binutils-gold
+#GIT_REPO.binutils-gold=	git://sourceware.org/git/binutils-gdb.git # broken?
+#GIT_REPO.binutils-gold=	http://sourceware.org/git/binutils-gdb.git # broken?
+GIT_REPO.binutils-gold=		https://github.com/wallento/binutils-gdb.git
 #GIT_DEEP_CLONE.binutils-gold=	yes # server dies on shallow clones
-WRKSRC=			${WRKDIR}/binutils-gold
+WRKSRC=				${WRKDIR}/binutils-gold
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.gnu.org/software/binutils/
diff --git a/bitlbee/Makefile b/bitlbee/Makefile
index 7f2280f783..65a1745d5b 100644
--- a/bitlbee/Makefile
+++ b/bitlbee/Makefile
@@ -97,7 +97,7 @@ RCD_SCRIPTS=		bitlbee
 RCD_SCRIPT_SRC.bitlbee=	${FILESDIR}/bitlbee.sh
 
 # see https://savannah.gnu.org/support/index.php?107660
-#BUILDLINK_ABI_DEPENDS.gnutls+= gnutls<2.12.0
+#BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls<2.12.0
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/calcurse/Makefile b/calcurse/Makefile
index b1eaf4a2f6..5f2326aea0 100644
--- a/calcurse/Makefile
+++ b/calcurse/Makefile
@@ -14,8 +14,8 @@ GNU_CONFIGURE=	yes
 
 # force to use ncurses from pkgsrc
 #INCOMPAT_CURSES=	NetBSD-*-*
-REPLACE_PYTHON=	contrib/caldav/calcurse-caldav
-FAKE_NCURSES=	yes
+REPLACE_PYTHON=		contrib/caldav/calcurse-caldav
+FAKE_NCURSES=		yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/cde/Makefile b/cde/Makefile
index d99c736fbe..e701464015 100644
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -33,7 +33,7 @@ IMAKE_DEFINES+=		-DCDEProjectRoot=${PREFIX}/dt
 IMAKE_DEFINES+=		-DCdeInstallationTop=${PREFIX}/dt
 IMAKE_DEFINES+=		-DCdeConfigurationTop=${PKG_SYSCONFDIR}
 IMAKE_DEFINES+=		-DCdeLogfileTop=${VARBASE}/dt
-#IMAKE_DEFINES+=		-DTclLibrary=${BUILDLINK_PREFIX.tcl}/lib
+#IMAKE_DEFINES+=	-DTclLibrary=${BUILDLINK_PREFIX.tcl}/lib
 IMAKE_DEFINES+=		-DUseInstalledX11=YES
 #IMAKE_DEFINES+=	-DKornShell=${TOOLS_PATH.ksh}
 IMAKE_DEFINES+=		-DDtKornShell=${PREFIX}/dt/bin/dtksh
diff --git a/chromium/options.mk b/chromium/options.mk
index da98cebbe6..dc70e26b6f 100644
--- a/chromium/options.mk
+++ b/chromium/options.mk
@@ -24,7 +24,7 @@ GN_ARGS+=		is_debug=true
 # Dynamic link build causes link errors in pkgsrc.
 GN_ARGS+=		is_component_build=false
 GN_BOOTSTRAP_FLAGS+=	--debug
-#GN_VERBOSE=    -v
+#GN_VERBOSE=		-v
 .else
 BUILDTYPE=		Release
 GN_ARGS+=		is_debug=false \
diff --git a/classic-mac-font-pack/Makefile b/classic-mac-font-pack/Makefile
index 973cc2588b..13800cf34d 100644
--- a/classic-mac-font-pack/Makefile
+++ b/classic-mac-font-pack/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	fonts
 # Cairo, Chicago, Geneva, London, Los Angeles, Monaco, New York, San
 # Francisco, Toronto, Venice), Apple Garamond, Charcoal, and Motter Tektura.
 
-#DISTFILES+=	alexandria.zip
+#DISTFILES+=			alexandria.zip
 # File is invalid?
 DISTFILES+=			Chicago.zip
 SITES.Chicago.zip=		http://moorstation.org/typoasis/designers/casady_greene/
@@ -23,23 +23,23 @@ SITES.MONACO.TTF=		http://www.webdevkungfu.com/files/
 # Cf. http://www.gringod.com/wp-upload/software/Fonts/Monaco_Linux.ttf
 # This binhex file yields a StuffIt archive, which there is no practical way
 # to extract in the general case.
-#DISTFILES+=	NewYork_TT.hqx
-#SITES.NewYork_TT.hqx=	http://www.masterstech-home.com/The_Library/Font_Samples/Font_Sample_Files/Mac/N/
+#DISTFILES+=			NewYork_TT.hqx
+#SITES.NewYork_TT.hqx=		http://www.masterstech-home.com/The_Library/Font_Samples/Font_Sample_Files/Mac/N/
 # bmake doesn't like this filename??
-#DISTFILES+=	Fernando%20Regular%20(2).ttf
+#DISTFILES+=			Fernando%20Regular%20(2).ttf
 #SITES.Fernando%20Regular%20(2).ttf=	http://ufonts.com/bin/
 # Brampton is not yet complete.
 DISTFILES+=			Brampton.tgz
 SITES.Brampton.tgz=		http://christtrekker.users.sourceforge.net/fnt/
-#DISTFILES+=	genoa.zip
+#DISTFILES+=			genoa.zip
 
 # This next one has Apple Garamond.
 # I don't think it is freely distributable though.
-#DISTFILES+=	macfonts.tar.gz
+#DISTFILES+=		macfonts.tar.gz
 #SITES.macfonts.tar.gz=	http://ubuntu-debs.googlecode.com/files/
 DISTFILES+=		virtue.zip
 SITES.virtue.zip=	http://www.scootergraphics.com/virtue/
-#DISTFILES+=	Mottek.zip
+#DISTFILES+=		Mottek.zip
 #SITES.Mottek.zip=	http://www.searchfreefonts.com/assets/downloads/
 
 OWNER=		christtrekker%users.sourceforge.net@localhost
diff --git a/collectd-web/Makefile b/collectd-web/Makefile
index dad8236837..fd6994f922 100644
--- a/collectd-web/Makefile
+++ b/collectd-web/Makefile
@@ -15,7 +15,7 @@ NO_CONFIGURE=		yes
 NO_BUILD=		yes
 USE_TOOLS+=		pax unzip
 AUTO_MKDIRS=		yes
-#EXTRACT_ONLY=   # empty
+#EXTRACT_ONLY=		# empty
 REPLACE_PERL+=		cgi-bin/*.pl
 REPLACE_PERL+=		cgi-bin/*.cgi
 INSTALLATION_DIRS=	share/collectd-web
@@ -29,8 +29,8 @@ DEPENDS+=	p5-HTTP-Parser>=0.06:../../www/p5-HTTP-Parser
 DEPENDS+=	p5-JSON>=2.94:../../converters/p5-JSON
 DEPENDS+=	p5-RRD-Simple>=1.44:../../databases/p5-RRD-Simple
 DEPENDS+=	p5-CGI>=4.36:../../www/p5-CGI
-#DEPENDS+=       cgic>=2.02:../../www/cgic
-#DEPENDS+=       fcgi>=2.4.0:../../www/fcgi
+#DEPENDS+=	cgic>=2.02:../../www/cgic
+#DEPENDS+=	fcgi>=2.4.0:../../www/fcgi
 
 do-install:
 	cd ${WRKSRC} && pax -rw -pe . ${DESTDIR}${PREFIX}/${INSTALLATION_DIRS}
diff --git a/coturn/Makefile b/coturn/Makefile
index 63eee5c4bd..9e30118356 100644
--- a/coturn/Makefile
+++ b/coturn/Makefile
@@ -29,8 +29,8 @@ CONFIGURE_ENV+=		TURNDBDIR=${PREFIX}/share/turnserver
 CONFIGURE_ENV+=		TURNINCLUDEDIR=${PREFIX}/include/turn
 
 INSTALLATION_DIRS+=	bin include lib ${PKGMANDIR}/man1 share/doc share/examples/etc share/examples/scripts share/turnserver
-#CONF_FILES+=            ${PREFIX}/etc/turnserver.conf.default
-#RCD_SCRIPTS=                  turnserver
+#CONF_FILES+=		${PREFIX}/etc/turnserver.conf.default
+#RCD_SCRIPTS=		turnserver
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 HAS_CONFIGURE=	yes
diff --git a/darkcoin/Makefile b/darkcoin/Makefile
index 3219b39c0f..36c0c822e4 100644
--- a/darkcoin/Makefile
+++ b/darkcoin/Makefile
@@ -20,7 +20,7 @@ AUTO_MKDIRS=	yes
 HAS_CONFIGURE=	yes
 GNU_CONFIGURE=	yes
 
-#CXXFLAGS+=	-std=c++0x
+#CXXFLAGS+=		-std=c++0x
 CXXFLAGS+=		-Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/dash -L${BUILDLINK_PREFIX.boost-libs}/lib/dash
 CXXFLAGS+=		-I${BUILDLINK_PREFIX.boost-libs}/include/boost
 CFLAGS+=		-fPIC
diff --git a/debootstrap/Makefile b/debootstrap/Makefile
index ceee3b4b14..dc2558266d 100644
--- a/debootstrap/Makefile
+++ b/debootstrap/Makefile
@@ -20,7 +20,7 @@ DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=	coreutils-[0-9]*:../../sysutils/coreutils
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-#WRKSRC=		${WRKDIR}/debootstrap.git
+#WRKSRC=	${WRKDIR}/debootstrap.git
 USE_LANGUAGES=	# none
 
 USE_TOOLS+=	gmake xzcat tar bash:run
diff --git a/dwarf_fortress/Makefile b/dwarf_fortress/Makefile
index c3d2886393..4c0375790d 100644
--- a/dwarf_fortress/Makefile
+++ b/dwarf_fortress/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.bay12games.com/dwarves/
 COMMENT=	Single-player fantasy game in a randomly generated, persistent world
 LICENSE=	unlicense
 
-#UNPRIVILEGED= yes
+#UNPRIVILEGED=	yes
 
 EMUL_PLATFORMS=		linux-i386 linux-x86_64
 EMUL_MODULES.linux=	base compat expat gtk2 png libSDL glx x11 locale
@@ -47,12 +47,12 @@ pre-install:
 
 # png no longer seems to be broken.
 #
-#SUBST_CLASSES+= fix-paths
-#SUBST_MESSAGE.fix-paths= Fixing pngs to bmps.
-#SUBST_STAGE.fix-paths= post-configure
-#SUBST_FILES.fix-paths= libs/Dwarf_Fortress
-#SUBST_FILES.fix-paths+= data/init/init.txt
-#SUBST_SED.fix-paths= -e 's,\.png,.bmp,g'
+#SUBST_CLASSES+=		fix-paths
+#SUBST_MESSAGE.fix-paths=	Fixing pngs to bmps.
+#SUBST_STAGE.fix-paths=		post-configure
+#SUBST_FILES.fix-paths=		libs/Dwarf_Fortress
+#SUBST_FILES.fix-paths+=	data/init/init.txt
+#SUBST_SED.fix-paths=		-e 's,\.png,.bmp,g'
 
 
 # Need import SUSE OpenAL
diff --git a/emacs-nox11-git/Makefile b/emacs-nox11-git/Makefile
index 21b02d1f5e..7ca5bb7624 100644
--- a/emacs-nox11-git/Makefile
+++ b/emacs-nox11-git/Makefile
@@ -45,10 +45,10 @@ CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN:Q}
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		GAMEDATAMODE
 
-#SUBST_CLASSES+=			test_equal
-#SUBST_STAGE.test_equal=		pre-configure
+#SUBST_CLASSES+=		test_equal
+#SUBST_STAGE.test_equal=	pre-configure
 #SUBST_MESSAGE.test_equal=	Fixing bashisms in test(1) usage.
-#SUBST_FILES.test_equal=		mac/make-package
+#SUBST_FILES.test_equal=	mac/make-package
 #SUBST_SED.test_equal=		-e 's/ == / = /g'
 
 MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
diff --git a/es40-firmware/Makefile b/es40-firmware/Makefile
index a845eac24f..e4edff6681 100644
--- a/es40-firmware/Makefile
+++ b/es40-firmware/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://h18002.www1.hp.com/alphaserver/es40/
 COMMENT=	AlphaServer ES40 firmware image
-#LICENSE=		unknown
+#LICENSE=	unknown
 
 RESTRICTED=		No redistribution allowed
 NO_BIN_ON_CDROM=	${RESTRICTED}
diff --git a/ffmpeg-git/options.mk b/ffmpeg-git/options.mk
index ab6c7552f1..5499c18881 100644
--- a/ffmpeg-git/options.mk
+++ b/ffmpeg-git/options.mk
@@ -2,10 +2,10 @@
 
 # Global and legacy options
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS=	faac lame ass libvpx theora vorbis x264 xvid \
-			opencore-amr x11
-PKG_SUGGESTED_OPTIONS=	lame ass libvpx theora vorbis x264 xvid
+PKG_OPTIONS_VAR=		PKG_OPTIONS.ffmpeg
+PKG_SUPPORTED_OPTIONS=		faac lame ass libvpx theora vorbis x264 xvid \
+				opencore-amr x11
+PKG_SUGGESTED_OPTIONS=		lame ass libvpx theora vorbis x264 xvid
 #PKG_OPTIONS_OPTIONAL_GROUPS=	aac-decoder
 #PKG_OPTIONS_GROUP.aac-decoder=	faac
 
diff --git a/firebird/Makefile b/firebird/Makefile
index 44ca8691af..2aee3af720 100644
--- a/firebird/Makefile
+++ b/firebird/Makefile
@@ -16,7 +16,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-#RCD_SCRIPTS=            000.firebird.sh
+#RCD_SCRIPTS=		000.firebird.sh
 
 CONFIGURE_ARGS+=	--with-editline \
 			--with-system-editline \
diff --git a/freeswitch-core/options.mk b/freeswitch-core/options.mk
index fdf7ea88c1..fc066bc17f 100644
--- a/freeswitch-core/options.mk
+++ b/freeswitch-core/options.mk
@@ -31,8 +31,8 @@ SUBST_SED.callcenter=		-e 's:\#applications/mod_callcenter:applications/mod_call
 
 PLIST.callcenter=		yes
 
-#CONF_FILES+=            ${EGDIR}/autoload_configs/callcenter.conf.xml \
-#			${PKG_SYSCONFDIR}/autoload_configs/callcenter.conf.xml
+#CONF_FILES+=	${EGDIR}/autoload_configs/callcenter.conf.xml \
+#		${PKG_SYSCONFDIR}/autoload_configs/callcenter.conf.xml
 .endif
 
 .if !empty(PKG_OPTIONS:Mcidlookup)
@@ -44,8 +44,8 @@ SUBST_SED.cidlookup=		-e 's:\#applications/mod_cidlookup:applications/mod_cidloo
 
 PLIST.cidlookup=		yes
 
-#CONF_FILES+=            ${EGDIR}/autoload_configs/cidlookup.conf.xml \
-#			${PKG_SYSCONFDIR}/autoload_configs/cidlookup.conf.xml
+#CONF_FILES+=	${EGDIR}/autoload_configs/cidlookup.conf.xml \
+#		${PKG_SYSCONFDIR}/autoload_configs/cidlookup.conf.xml
 .endif
 
 .if !empty(PKG_OPTIONS:Mavmd)
@@ -78,8 +78,8 @@ SUBST_SED.memcache=	-e 's:\#applications/mod_memcache:applications/mod_memcache:
 
 PLIST.memcache=		yes
 
-#CONF_FILES+=            ${EGDIR}/autoload_configs/memcache.conf.xml \
-#			${PKG_SYSCONFDIR}/autoload_configs/memcache.conf.xml
+#CONF_FILES+=	${EGDIR}/autoload_configs/memcache.conf.xml \
+#		${PKG_SYSCONFDIR}/autoload_configs/memcache.conf.xml
 .endif
 
 # TODO: Include all remaining modules in options.mk to provide a more customizable package.
diff --git a/fs-uae-dev/Makefile b/fs-uae-dev/Makefile
index 41f75f71aa..01b9ee959f 100644
--- a/fs-uae-dev/Makefile
+++ b/fs-uae-dev/Makefile
@@ -14,7 +14,7 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config zip
 GNU_CONFIGURE=		yes
 
-#CONFIGURE_ARGS += --enable-lua
+#CONFIGURE_ARGS +=	--enable-lua
 # patchelf is sometimes used, for something with steam or so?
 #BUILD_DEPENDS +=	patchelf-*:../../devel/patchelf
 
diff --git a/garden/Makefile b/garden/Makefile
index 6c1d7b97f8..69eaf9e77a 100644
--- a/garden/Makefile
+++ b/garden/Makefile
@@ -12,10 +12,10 @@ LICENSE=	gnu-gpl-v3
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 
-#DEPENDS+=       doxygen>=1.8.2:../../devel/doxygen
+#DEPENDS+=	doxygen>=1.8.2:../../devel/doxygen
 
 # Patches can be omitted with
-#CFLAGS += -fgnu89-inline
+#CFLAGS +=	-fgnu89-inline
 
 .include "../../devel/allegro/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/gcc42/Makefile b/gcc42/Makefile
index 5fd6586363..4ef0b6986a 100644
--- a/gcc42/Makefile
+++ b/gcc42/Makefile
@@ -82,7 +82,7 @@ BUILD_OBJC?=	YES
 
 LANGS=			'c'
 #.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
-#LANGS+='ada'
+#LANGS+=		'ada'
 #.endif
 .if !empty(BUILD_CXX:M[Yy][Ee][Ss])
 LANGS+=			'c++'
@@ -91,7 +91,7 @@ LANGS+=			'c++'
 LANGS+=			'fortran'
 .endif
 #.if !empty(BUILD_JAVA:M[Yy][Ee][Ss])
-#LANGS+='java'
+#LANGS+=		'java'
 #.endif
 .if !empty(BUILD_OBJC:M[Yy][Ee][Ss])
 LANGS+=			'objc'
@@ -143,15 +143,15 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 # Ada bootstrap compiler section
 # An Ada compiler is required to build the Ada compiler. You
 # may specify:
-#USE_GCC42ADA	=# Define to use gcc-3.4.x-ada
+#USE_GCC42ADA	=	# Define to use gcc-3.4.x-ada
 # Or, you may specify the path of any gcc/gnat Ada compiler
 # by providing the full path of the compiler (example) below:
-#ALT_GCC=	prefix/bin/gcc
+#ALT_GCC=		prefix/bin/gcc
 #.  if defined(ALT_GCC)
 #.     if exists(${ALT_GCC})
-#ALT_GCC_RTS!=	${ALT_GCC} --print-file-name=adalib
+#ALT_GCC_RTS!=		${ALT_GCC} --print-file-name=adalib
 #.        if !empty(ALT_GCC_RTS)
-#RALT_GCC_RTS=	${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%}
+#RALT_GCC_RTS=		${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%}
 #.        else
 #PKG_SKIP_REASON+=	"${ALT_GCC} does not appear to be an Ada compiler"
 #.        endif
@@ -176,7 +176,7 @@ CFLAGS+=		-I${BUILDLINK_DIR}/include
 GCC_PLATFORM=		${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//}
 CONFIGURE_ARGS+=	--host=${GCC_PLATFORM:Q}
 #ABI_BASELINE_PAIR=	${GCC_PLATFORM:C/--/-/}
-#MAKE_ENV+=	ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR:Q}
+#MAKE_ENV+=		ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR:Q}
 .endif # NetBSD
 
 #post-patch:
diff --git a/gcc43/Makefile b/gcc43/Makefile
index eab2331de0..cfe5b58e21 100644
--- a/gcc43/Makefile
+++ b/gcc43/Makefile
@@ -88,7 +88,7 @@ CFLAGS+=		-I${BUILDLINK_DIR}/include
 
 # Somone should fix this so it will match the NetBSD system compiler
 #.if ${OPSYS} == "NetBSD"
-#GCC_PLATFORM=	${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
+#GCC_PLATFORM=		${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
 #CONFIGURE_ARGS+=	--host=${GCC_PLATFORM:Q}
 #MAKE_ENV+=		AR=/usr/bin/ar
 #.endif # NetBSD
diff --git a/gcc44/Makefile b/gcc44/Makefile
index 3367e233f1..acd7d82334 100644
--- a/gcc44/Makefile
+++ b/gcc44/Makefile
@@ -91,7 +91,7 @@ CFLAGS+=		-I${BUILDLINK_DIR}/include
 
 # Somone should fix this so it will match the NetBSD system compiler
 #.if ${OPSYS} == "NetBSD"
-#GCC_PLATFORM=	${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
+#GCC_PLATFORM=		${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
 #CONFIGURE_ARGS+=	--host=${GCC_PLATFORM:Q}
 #MAKE_ENV+=		AR=/usr/bin/ar
 #.endif # NetBSD
diff --git a/gcc44/buildlink3.mk b/gcc44/buildlink3.mk
index d38b8f43ef..805ddb4029 100644
--- a/gcc44/buildlink3.mk
+++ b/gcc44/buildlink3.mk
@@ -15,10 +15,10 @@ BUILDLINK_PKGSRCDIR.gcc44?=	../../wip/gcc44
 .if exists(${_GCC44_PREFIX}/bin/gcc)
 
 # logic for detecting the ADA compiler (not yet supported)
-#gcc44_GNAT1!=${_GCC44_PREFIX}/bin/gcc -print-prog-name=gnat1
+#gcc44_GNAT1!=		${_GCC44_PREFIX}/bin/gcc -print-prog-name=gnat1
 #.  if exists(${gcc44_GNAT1})
 #CONFIGURE_ENV+=	ADAC=${_GCC44_PREFIX}/bin/gcc
-#MAKE_ENV+=	ADAC=${_GCC44_PREFIX}/bin/gcc
+#MAKE_ENV+=		ADAC=${_GCC44_PREFIX}/bin/gcc
 #.  endif
 
 # add libraries
diff --git a/gcc45/Makefile b/gcc45/Makefile
index 3d2c426d0e..be58c3ce12 100644
--- a/gcc45/Makefile
+++ b/gcc45/Makefile
@@ -116,7 +116,7 @@ CFLAGS+=		-I${BUILDLINK_DIR}/include
 
 # Somone should fix this so it will match the NetBSD system compiler
 #.if ${OPSYS} == "NetBSD"
-#GCC_PLATFORM=	${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
+#GCC_PLATFORM=		${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
 #CONFIGURE_ARGS+=	--host=${GCC_PLATFORM:Q}
 #MAKE_ENV+=		AR=/usr/bin/ar
 #.endif # NetBSD
diff --git a/gcc45/buildlink3.mk b/gcc45/buildlink3.mk
index e5689d99d8..520db72ea9 100644
--- a/gcc45/buildlink3.mk
+++ b/gcc45/buildlink3.mk
@@ -15,10 +15,10 @@ BUILDLINK_PKGSRCDIR.gcc45?=	../../wip/gcc45
 .if exists(${_GCC45_PREFIX}/bin/gcc)
 
 # logic for detecting the ADA compiler (not yet supported)
-#gcc45_GNAT1!=${_GCC45_PREFIX}/bin/gcc -print-prog-name=gnat1
+#gcc45_GNAT1!=		${_GCC45_PREFIX}/bin/gcc -print-prog-name=gnat1
 #.  if exists(${gcc45_GNAT1})
 #CONFIGURE_ENV+=	ADAC=${_GCC45_PREFIX}/bin/gcc
-#MAKE_ENV+=	ADAC=${_GCC45_PREFIX}/bin/gcc
+#MAKE_ENV+=		ADAC=${_GCC45_PREFIX}/bin/gcc
 #.  endif
 
 # add libraries
diff --git a/gcc46/Makefile b/gcc46/Makefile
index 098904578e..0c11a2f4bf 100644
--- a/gcc46/Makefile
+++ b/gcc46/Makefile
@@ -121,7 +121,7 @@ CFLAGS+=		-I${BUILDLINK_DIR}/include
 
 # Someone should fix this so it will match the NetBSD system compiler
 #.if ${OPSYS} == "NetBSD"
-#GCC_PLATFORM=	${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
+#GCC_PLATFORM=		${MACHINE_ARCH}--${LOWER_OPSYS}${APPEND_ELF}
 #CONFIGURE_ARGS+=	--host=${GCC_PLATFORM:Q}
 #MAKE_ENV+=		AR=/usr/bin/ar
 #.endif # NetBSD
diff --git a/gcc7snapshot/options.mk b/gcc7snapshot/options.mk
index d03dd2f8f8..89185dc4b7 100644
--- a/gcc7snapshot/options.mk
+++ b/gcc7snapshot/options.mk
@@ -81,10 +81,10 @@ LIBS.SunOS+=		-lgmp
 ### Graphite Support
 ###
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL16 =		isl-0.16.1
-SITES.${ISL16}.tar.bz2 = ftp://ftp.fu-berlin.de/unix/languages/gcc/infrastructure/
-#SITES.${ISL16}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES +=	${ISL16}.tar.bz2
+ISL16 =				isl-0.16.1
+SITES.${ISL16}.tar.bz2 =	ftp://ftp.fu-berlin.de/unix/languages/gcc/infrastructure/
+#SITES.${ISL16}.tar.bz2 =	${MASTER_SITE_GNU:=gcc/infrastructure/}
+DISTFILES +=			${ISL16}.tar.bz2
 .endif
 
 ###
diff --git a/geant/Makefile b/geant/Makefile
index fce27dcbfe..6e3bf72786 100644
--- a/geant/Makefile
+++ b/geant/Makefile
@@ -45,7 +45,7 @@ MAKE_ENV+=	G4UI_USE_TERMINAL=1
 MAKE_FLAGS+=	ECHO=echo
 
 # It should be:
-#REPLACE_CSH=	examples/extended/biasing/B02/setupPI.csh
+#REPLACE_CSH=		examples/extended/biasing/B02/setupPI.csh
 # skip it for now:
 CHECK_INTERPRETER_SKIP=	geant/examples/extended/biasing/B02/setupPI.csh \
 			geant/examples/extended/medical/electronScattering2/run.csh
diff --git a/ghmm/options.mk b/ghmm/options.mk
index 522ddee51f..a4384672e2 100644
--- a/ghmm/options.mk
+++ b/ghmm/options.mk
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+=	--enable-gsl
 
 .if !empty(PKG_OPTIONS:Matlas)
 CONFIGURE_ARGS+=	--enable-atlas
-#DEPENDS+=      atlas>=3.11.11:../../wip/atlas
+#DEPENDS+=		atlas>=3.11.11:../../wip/atlas
 .else
 CONFIGURE_ENV+=		ac_cv_prog_MAGICK_CONFIG=no
 .endif
diff --git a/gjs/Makefile b/gjs/Makefile
index 1c5d182aa5..0894154cd0 100644
--- a/gjs/Makefile
+++ b/gjs/Makefile
@@ -29,7 +29,7 @@ SUBST_MESSAGE.fix-python=	Fixing dynamic python
 SUBST_FILES.fix-python+=	scripts/make-tests
 SUBST_SED.fix-python+=		-e 's,/usr/bin/env python,${PYTHONBIN},'
 
-#SUBST_CLASSES+=			libjs
+#SUBST_CLASSES+=		libjs
 #SUBST_STAGE.libjs=		pre-configure
 #SUBST_MESSAGE.fix-python=	Convert libjs to libmozjs24
 #SUBST_FILES.fix-python+=	scripts/make-tests
diff --git a/gnome-applets/Makefile b/gnome-applets/Makefile
index 3049619d23..1c50b5a161 100644
--- a/gnome-applets/Makefile
+++ b/gnome-applets/Makefile
@@ -26,13 +26,13 @@ CONFIGURE_ARGS+=	--disable-cpufreq
 
 EGDIR=			${PREFIX}/share/examples/gnome-applets
 
-GCONF_SCHEMAS=	charpick.schemas
-GCONF_SCHEMAS+=	drivemount.schemas
-GCONF_SCHEMAS+=	geyes.schemas
+GCONF_SCHEMAS=		charpick.schemas
+GCONF_SCHEMAS+=		drivemount.schemas
+GCONF_SCHEMAS+=		geyes.schemas
 #GCONF_SCHEMAS+=	gswitchit.schemas
-GCONF_SCHEMAS+=	mixer.schemas
-GCONF_SCHEMAS+=	multiload.schemas
-GCONF_SCHEMAS+=	stickynotes.schemas
+GCONF_SCHEMAS+=		mixer.schemas
+GCONF_SCHEMAS+=		multiload.schemas
+GCONF_SCHEMAS+=		stickynotes.schemas
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/gnome-terminal/Makefile b/gnome-terminal/Makefile
index 9e0096165e..29c3b73408 100644
--- a/gnome-terminal/Makefile
+++ b/gnome-terminal/Makefile
@@ -23,7 +23,7 @@ USE_LIBTOOL=		YES
 
 GCONF_SCHEMAS=	gnome-terminal.schemas
 
-#PYTHON_FOR_BUILD_ONLY=	YES
+#PYTHON_FOR_BUILD_ONLY=		YES
 #PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 2.32.1
 
 .include "../../x11/gnome-desktop3/buildlink3.mk"
diff --git a/gplbasic/Makefile b/gplbasic/Makefile
index 5a1b52629d..b23e29c894 100644
--- a/gplbasic/Makefile
+++ b/gplbasic/Makefile
@@ -10,9 +10,9 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=		http://www.xs4all.nl/~lennartb/basic.html
 COMMENT=		Basic interpreter for Unix
 
-BUILD_TARGET=		gplbasic
-#USE_TOOLS+=		gmake
-#WRKSRC=			${WRKDIR}/bastard_src-0.17
+BUILD_TARGET=	gplbasic
+#USE_TOOLS+=	gmake
+#WRKSRC=	${WRKDIR}/bastard_src-0.17
 
 INSTALLATION_DIRS=	bin
 
diff --git a/islamic-menus/Makefile b/islamic-menus/Makefile
index 97bf897121..a34c107563 100644
--- a/islamic-menus/Makefile
+++ b/islamic-menus/Makefile
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_TOOLS+=	gmake intltool msgfmt
 USE_LANGUAGES=	# none
 
-#INSTALL_MAKE_FLAGS=    PREFIX=${DESTDIR}${PREFIX}
+#INSTALL_MAKE_FLAGS=	PREFIX=${DESTDIR}${PREFIX}
 
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/java-swt/Makefile b/java-swt/Makefile
index c93e9a11da..f48289a181 100644
--- a/java-swt/Makefile
+++ b/java-swt/Makefile
@@ -23,10 +23,10 @@ USE_TOOLS=		gmake unzip
 
 PLIST_SUBST+=	SHLIB_VERSION=${SHLIB_VERSION}
 
-#SUBST_CLASSES+=	    foo
-#SUBST_STAGE.foo=    post-patch
-#SUBST_FILES.foo=    make_gtk.mak
-#SUBST_SED.foo=	    -e s,@PKG_JVM_HOME@,${PKG_JAVA_HOME},
+#SUBST_CLASSES+=	foo
+#SUBST_STAGE.foo=	post-patch
+#SUBST_FILES.foo=	make_gtk.mak
+#SUBST_SED.foo=		-e s,@PKG_JVM_HOME@,${PKG_JAVA_HOME},
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-patch
diff --git a/jemboss-standalone/Makefile b/jemboss-standalone/Makefile
index 1b269117d7..d0936d061e 100644
--- a/jemboss-standalone/Makefile
+++ b/jemboss-standalone/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	dprice%cs.nmsu.edu@localhost
 HOMEPAGE=	http://www.emboss.org/
 COMMENT=	Standalone Interface for EMBOSS
 
-DEPENDS+=		emboss-java>=0.0.3:../../wip/emboss-java
+DEPENDS+=	emboss-java>=0.0.3:../../wip/emboss-java
 #DEPENDS+=	jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
-DEPENDS+=		xerces-j>=1.2.0:../../textproc/xerces-j
-#DEPENDS+=		iasp>=2.1.1:../../www/iasp
-DEPENDS+=		apache-ant>=1.5.3.1:../../devel/apache-ant
+DEPENDS+=	xerces-j>=1.2.0:../../textproc/xerces-j
+#DEPENDS+=	iasp>=2.1.1:../../www/iasp
+DEPENDS+=	apache-ant>=1.5.3.1:../../devel/apache-ant
 
 DIST_SUBDIR=		emboss/emboss-2.9.0
 
diff --git a/kde-runtime4/Makefile b/kde-runtime4/Makefile
index c9d494fbd9..c57920e0ae 100644
--- a/kde-runtime4/Makefile
+++ b/kde-runtime4/Makefile
@@ -50,7 +50,7 @@ PLIST.polkit=	yes
 PLIST.x11=	yes
 .endif
 
-#SUBST_CLASSES+=		htdig
+#SUBST_CLASSES+=	htdig
 #SUBST_STAGE.htdig=	post-patch
 #SUBST_MESSAGE.htdig=	Fix htdig paths.
 #SUBST_FILES.htdig=	khelpcenter/searchhandlers/khc_htsearch.pl
diff --git a/kmymoney4/Makefile b/kmymoney4/Makefile
index 681d88730b..2f8b37c9b9 100644
--- a/kmymoney4/Makefile
+++ b/kmymoney4/Makefile
@@ -15,7 +15,7 @@ CONFLICTS+=	kmymoney2-[0-9]*
 
 BUILD_DEPENDS+=	automoc4-[0-9]*:../../devel/automoc4
 
-#MAKE_JOBS_SAFE=no
+#MAKE_JOBS_SAFE=	no
 BUILD_MAKE_FLAGS+=	VERBOSE=yes
 
 USE_CMAKE=		yes
diff --git a/libftdi1/Makefile b/libftdi1/Makefile
index a47c6cd1f7..69f369a7d0 100644
--- a/libftdi1/Makefile
+++ b/libftdi1/Makefile
@@ -16,10 +16,10 @@ USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config #cmake
 USE_LANGUAGES=	c c++
 
-BUILD_DEPENDS+=	libusb1-[0-9]*:../../devel/libusb1
+BUILD_DEPENDS+=		libusb1-[0-9]*:../../devel/libusb1
 # It is better off to have doxygen, but
 # clang segfaults while packaging print/luatex
-#BUILD_DEPENDS+=doxygen-[0-9]*:../../devel/doxygen
+#BUILD_DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
 
 #CONFIGURE_ARGS+=	--without-examples
 #CONFIGURE_ARGS+=	--without-docs
diff --git a/libgda4/options.mk b/libgda4/options.mk
index bdafd6ec89..6465adfb1e 100644
--- a/libgda4/options.mk
+++ b/libgda4/options.mk
@@ -1,11 +1,11 @@
 # $NetBSD: options.mk,v 1.6 2015/06/07 14:24:48 yrmt Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.libgda4				# XXX libgda4, to have mk.conf options on a per libgda basis.
-PKG_SUPPORTED_OPTIONS=	bdb jdbc ldap mdb mysql postgres web
-PKG_SUPPORTED_OPTIONS+=	json
-PKG_SUPPORTED_OPTIONS+=	crypto						# XXX some wrong
+PKG_OPTIONS_VAR=		PKG_OPTIONS.libgda4				# XXX libgda4, to have mk.conf options on a per libgda basis.
+PKG_SUPPORTED_OPTIONS=		bdb jdbc ldap mdb mysql postgres web
+PKG_SUPPORTED_OPTIONS+=		json
+PKG_SUPPORTED_OPTIONS+=		crypto						# XXX some wrong
 #PKG_SUPPORTED_OPTIONS+=	bdbsql oracle				# XXX todo
-PKG_SUPPORTED_OPTIONS+=	fam gui ui xslt
+PKG_SUPPORTED_OPTIONS+=		fam gui ui xslt
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/libgtop/Makefile b/libgtop/Makefile
index 79bc17d284..58e2d90a29 100644
--- a/libgtop/Makefile
+++ b/libgtop/Makefile
@@ -45,31 +45,31 @@ CPPFLAGS.NetBSD+=	-D_KMEMUSER
 .include "../../mk/bsd.prefs.mk"
 
 #INSTALL_MAKE_FLAGS+=	libgtop_postinstall=true
-#PLIST_VARS+=	server suid.h
+#PLIST_VARS+=		server suid.h
 #.if ${OPSYS} == "AIX"
-#PLIST.server=	yes
-#PLIST.suid.h=	yes
-#SPECIAL_PERMS=	bin/libgtop_server2 ${REAL_ROOT_USER} system 2755
+#PLIST.server=		yes
+#PLIST.suid.h=		yes
+#SPECIAL_PERMS=		bin/libgtop_server2 ${REAL_ROOT_USER} system 2755
 #.elif ${OPSYS} == "DragonFly" || \
 #      ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || \
 #      ${OPSYS} == "OpenBSD"
-#PLIST.server=	yes
-#PLIST.suid.h=	yes
-#SPECIAL_PERMS=	bin/libgtop_server2 ${REAL_ROOT_USER} kmem 2755
+#PLIST.server=		yes
+#PLIST.suid.h=		yes
+#SPECIAL_PERMS=		bin/libgtop_server2 ${REAL_ROOT_USER} kmem 2755
 #.elif ${OPSYS} == "Linux"
 ##PLIST.server=	no
 ##PLIST.suid.h=	no
 #.elif ${OPSYS} == "SunOS"
-#PLIST.server=	yes
-#SPECIAL_PERMS=	bin/libgtop_server2 ${REAL_ROOT_USER} sys 2755
+#PLIST.server=		yes
+#SPECIAL_PERMS=		bin/libgtop_server2 ${REAL_ROOT_USER} sys 2755
 #.elif ${OPSYS} == "Darwin"
-#PLIST.server=	yes
+#PLIST.server=		yes
 #.else
-#PLIST.server=	yes
-#PLIST.suid.h=	yes
+#PLIST.server=		yes
+#PLIST.suid.h=		yes
 #.endif
 
-#PLIST_VARS+=    glibtop_private.h
+#PLIST_VARS+=	glibtop_private.h
 #.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 #PLIST.glibtop_private.h= yes
 #.endif
diff --git a/libreoffice-git/Makefile b/libreoffice-git/Makefile
index 2dba63c1ef..96a270fa21 100644
--- a/libreoffice-git/Makefile
+++ b/libreoffice-git/Makefile
@@ -85,11 +85,11 @@ DIST_SUBDIR=	libreoffice
 #SITES.${md}=		http://dev-www.libreoffice.org/src/
 #.endfor
 
-#DISTFILES+=e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-#SITES.e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip=http://www.numbertext.org/linux/
+#DISTFILES+=	e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
+#SITES.e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip= http://www.numbertext.org/linux/
 
-#DISTFILES+=185d60944ea767075d27247c3162b3bc-unowinreg.dll
-#SITES.185d60944ea767075d27247c3162b3bc-unowinreg.dll=http://download.go-oo.org/extern/
+#DISTFILES+=	185d60944ea767075d27247c3162b3bc-unowinreg.dll
+#SITES.185d60944ea767075d27247c3162b3bc-unowinreg.dll= http://download.go-oo.org/extern/
 
 .include "options.mk"
 
@@ -196,8 +196,8 @@ LO_PROGRAMS=		sbase scalc sdraw simpress smath soffice swriter
 LO_DESKTOP_FILES=	calc.desktop draw.desktop impress.desktop math.desktop \
 			startcenter.desktop writer.desktop
 
-#OBJDIR=			pkgsrcbuild
-#CONFIGURE_DIRS=		${OBJDIR}
+#OBJDIR=		pkgsrcbuild
+#CONFIGURE_DIRS=	${OBJDIR}
 CONFIGURE_SCRIPT=	${WRKSRC}core/autogen.sh
 
 #LD_LIBRARY_PATH+=	${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program
diff --git a/libsocialweb/options.mk b/libsocialweb/options.mk
index d2429411d9..63a47d5792 100644
--- a/libsocialweb/options.mk
+++ b/libsocialweb/options.mk
@@ -3,7 +3,7 @@
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libsocialweb
 PKG_SUPPORTED_OPTIONS+=		facebook flickr lastfm photobucket plurk smugmug
 PKG_SUPPORTED_OPTIONS+=		twitter vimeo youtube sina myspace
-#PKG_SUPPORTED_OPTIONS+=		vala	# XXX broken
+#PKG_SUPPORTED_OPTIONS+=	vala	# XXX broken
 
 PKG_SUGGESTED_OPTIONS+=		facebook flickr lastfm photobucket plurk smugmug
 PKG_SUGGESTED_OPTIONS+=		twitter vimeo youtube sina myspace
diff --git a/linux-kernel/Makefile b/linux-kernel/Makefile
index 31411a98e9..19856625fa 100644
--- a/linux-kernel/Makefile
+++ b/linux-kernel/Makefile
@@ -24,7 +24,7 @@ LINUXBASE?=	${PREFIX}
 # XXX can not  set LOCALBASE because
 #  PREFIX is used in patch for depmod
 #  PKG_TOOLS_BIN is changed
-#LOCALBASE=		/
+#LOCALBASE=	/
 
 NO_MTREE=	YES
 
diff --git a/litecoin/Makefile b/litecoin/Makefile
index bb3165753d..5c2175d841 100644
--- a/litecoin/Makefile
+++ b/litecoin/Makefile
@@ -26,7 +26,7 @@ BUILDLINK_TRANSFORM+=	l:db_cxx:db4_cxx
 BOOST_LDFLAGS=		-Wl,-R${BUILDLINK_TRANSFORM.boost-libs}/lib -Wl,-L${BUILDLINK_PREFIX.boost-libs}/lib
 #LDFLAGS+=		${BOOST_LDFLAGS:Q}
 #LDFLAGS+=		${PREFIX}/qt4/lib
-#CPPFLAGS+=     	-I${PREFIX}/qt4/include/
+#CPPFLAGS+=		-I${PREFIX}/qt4/include/
 
 CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
 CONFIGURE_ARGS+=	--enable-hardening
diff --git a/ltrace/Makefile b/ltrace/Makefile
index 5a075d4a9f..c2b083af14 100644
--- a/ltrace/Makefile
+++ b/ltrace/Makefile
@@ -12,15 +12,15 @@ COMMENT=		Track runtime library calls in dynamically linked programs
 
 ONLY_FOR_PLATFORM=	Linux-*-*
 
-WRKSRC=			${WRKDIR}/ltrace-0.3.36
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+WRKSRC=				${WRKDIR}/ltrace-0.3.36
+USE_TOOLS+=			gmake
+GNU_CONFIGURE=			yes
+CONFIGURE_ARGS+=		--sysconfdir=${PKG_SYSCONFDIR:Q}
 # maybe following should be done in devel/libelf/buildlink3.mk instead
-#CFLAGS+=		-I${BUILDLINK_PREFIX.libelf}/include/libelf
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.libelf}/include/libelf
-#CPPFLAGS+=		-I${BUILDLINK_DIR}/include/libelf
-#CFLAGS+=		-I${BUILDLINK_DIR}/include/libelf
+#CFLAGS+=			-I${BUILDLINK_PREFIX.libelf}/include/libelf
+CPPFLAGS+=			-I${BUILDLINK_PREFIX.libelf}/include/libelf
+#CPPFLAGS+=			-I${BUILDLINK_DIR}/include/libelf
+#CFLAGS+=			-I${BUILDLINK_DIR}/include/libelf
 # if this uses BUILDLINK_INCDIRS or CFLAGS for this. the build fails because
 # it uses -I- which makes it ignore this include directory
 #BUILDLINK_INCDIRS.libelf+=	include/libelf
diff --git a/meta-tracker/Makefile b/meta-tracker/Makefile
index 312f6b8ecc..d1c1c07939 100644
--- a/meta-tracker/Makefile
+++ b/meta-tracker/Makefile
@@ -25,7 +25,7 @@ PKGCONFIG_OVERRIDE+=	src/libtracker-sparql/tracker-sparql.pc.in
 PKGCONFIG_OVERRIDE+=	src/libtracker-miner/tracker-miner.pc.in
 PKGCONFIG_OVERRIDE+=	src/libtracker-control/tracker-control.pc.in
 
-#TRACKER_VERSION= ${PKGVERSION:C/\.[0-9]+$//}
+#TRACKER_VERSION=	${PKGVERSION:C/\.[0-9]+$//}
 # strip last .digit (but not safe if it is missing)
 # PLIST_SUBST+=	TRACKER_VERSION=tracker-${PKGVERSION_NOREV:C/\.[0-9]+$//}
 
diff --git a/mpg123-svn/Makefile b/mpg123-svn/Makefile
index 358956a05d..b90f676d35 100644
--- a/mpg123-svn/Makefile
+++ b/mpg123-svn/Makefile
@@ -49,8 +49,8 @@ pre-configure:
 .include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.fast.prefs.mk"
 
-#YESTERDAY!=	expr `date +%s` - 86399
-#MPG123_VERSION!=${DATE} -r ${YESTERDAY} +%Y%m%d
-#MPG123_TAG!=	${DATE} +%Y%m%d
+#YESTERDAY!=		expr `date +%s` - 86399
+#MPG123_VERSION!=	${DATE} -r ${YESTERDAY} +%Y%m%d
+#MPG123_TAG!=		${DATE} +%Y%m%d
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mplayer-mt/options.mk b/mplayer-mt/options.mk
index 3ed524a165..5d7d24686b 100644
--- a/mplayer-mt/options.mk
+++ b/mplayer-mt/options.mk
@@ -42,7 +42,7 @@ PKG_SUPPORTED_OPTIONS+=	vidix
 .endif
 
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/videoio.h)
-PKG_SUPPORTED_OPTIONS+=	v4l2
+PKG_SUPPORTED_OPTIONS+=		v4l2
 #PKG_SUGGESTED_OPTIONS+=	v4l2
 .endif
 
diff --git a/mplayer-snapshot-share/options.mk b/mplayer-snapshot-share/options.mk
index cadc3ea13b..349933c770 100644
--- a/mplayer-snapshot-share/options.mk
+++ b/mplayer-snapshot-share/options.mk
@@ -228,7 +228,7 @@ CONFIGURE_ARGS+=	--disable-runtime-cpudetection
 EVAL_PREFIX+=			PREFIX.win32-codecs=win32-codecs
 PREFIX.win32-codecs_DEFAULT=	${LOCALBASE}
 CONFIGURE_ARGS+=		--enable-win32dll
-#CONFIGURE_ARGS+=	--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
+#CONFIGURE_ARGS+=		--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
 DEPENDS+=			win32-codecs>=011227:../../multimedia/win32-codecs
 .else
 CONFIGURE_ARGS+=		--disable-win32dll
diff --git a/mtr-current/options.mk b/mtr-current/options.mk
index ab87757700..d0c7e67943 100644
--- a/mtr-current/options.mk
+++ b/mtr-current/options.mk
@@ -1,9 +1,9 @@
 # $NetBSD: options.mk,v 1.2 2013/06/20 07:25:59 yvs4sf Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.mtr
-PKG_SUPPORTED_OPTIONS=	gtk
-PKG_SUPPORTED_OPTIONS+=	inet6
-PKG_SUGGESTED_OPTIONS=	inet6
+PKG_OPTIONS_VAR=		PKG_OPTIONS.mtr
+PKG_SUPPORTED_OPTIONS=		gtk
+PKG_SUPPORTED_OPTIONS+=		inet6
+PKG_SUGGESTED_OPTIONS=		inet6
 #PKG_SUPPORTED_OPTIONS+=	ipinfo
 #PKG_SUGGESTED_OPTIONS+=	ipinfo
 
diff --git a/ninka/Makefile b/ninka/Makefile
index 361a2f2676..44d8ea56f8 100644
--- a/ninka/Makefile
+++ b/ninka/Makefile
@@ -14,12 +14,12 @@ GIT_REPO.ninka=		https://github.com/dmgerman/ninka
 GIT_REVISION.ninka=	81f185261c8863c5b84344ee31192870be939faf
 PKGREVISION=		0
 
-DEPENDS+=	p5-Getopt-Long>=2.38:../../devel/p5-Getopt-Long
-DEPENDS+=	p5-DBI-[0-9]*:../../databases/p5-DBI
-DEPENDS+=	p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
-DEPENDS+=	p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
-DEPENDS+=	p5-Spreadsheet-WriteExcel-[0-9]*:../../math/p5-Spreadsheet-WriteExcel
-DEPENDS+=	p5-IO-CaptureOutput-[0-9]*:../../devel/p5-IO-CaptureOutput
+DEPENDS+=		p5-Getopt-Long>=2.38:../../devel/p5-Getopt-Long
+DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
+DEPENDS+=		p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
+DEPENDS+=		p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
+DEPENDS+=		p5-Spreadsheet-WriteExcel-[0-9]*:../../math/p5-Spreadsheet-WriteExcel
+DEPENDS+=		p5-IO-CaptureOutput-[0-9]*:../../devel/p5-IO-CaptureOutput
 #BUILD_DEPENDS+=	p5-Test-Strict-[0-9]*:../../devel/p5-Test-Strict
 
 NO_CHECKSUM=	yes
diff --git a/nspr-hg/Makefile b/nspr-hg/Makefile
index db16036dca..3d1e8dce37 100644
--- a/nspr-hg/Makefile
+++ b/nspr-hg/Makefile
@@ -15,7 +15,7 @@ LICENSE=	mpl-2.0
 HG_REPOSITORIES=	nspr
 HG_REPO.nspr=		https://hg.mozilla.org/projects/nspr
 WRKSRC=			${WRKDIR}/nspr
-#WRKSRC=                        ${WRKDIR}
+#WRKSRC=		${WRKDIR}
 
 CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}js/src/configure
 CHECK_PORTABILITY_SKIP+=	${MOZILLA_DIR}configure
diff --git a/nss-hg/Makefile b/nss-hg/Makefile
index ecb5f164a0..1e151f5a7f 100644
--- a/nss-hg/Makefile
+++ b/nss-hg/Makefile
@@ -16,7 +16,7 @@ LICENSE=		mpl-2.0
 HG_REPOSITORIES=	nss
 HG_REPO.nss=		https://hg.mozilla.org/projects/nss
 WRKSRC=			${WRKDIR}/nss
-#WRKSRC=			${WRKDIR}
+#WRKSRC=		${WRKDIR}
 
 USE_LANGUAGES=		c c++
 
diff --git a/ntimed-git/Makefile b/ntimed-git/Makefile
index 938c1812d7..9709a2ff8a 100644
--- a/ntimed-git/Makefile
+++ b/ntimed-git/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		yes
 # https://github.com/bsdphk/Ntimed/issues/25
 USE_TOOLS+=		gmake
 
-REPLACE_PYTHON+=	plotgen.py
+REPLACE_PYTHON+=		plotgen.py
 #PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 20150109
 
 INSTALLATION_DIRS+=	sbin share/doc/ntimed
diff --git a/openxcom/Makefile b/openxcom/Makefile
index 6e622cdc7c..d922bc0c23 100644
--- a/openxcom/Makefile
+++ b/openxcom/Makefile
@@ -16,7 +16,7 @@ HOMEPAGE=	http://www.openxcom.org/
 COMMENT=	Open-source clone of UFO: Enemy Unknown/X-Com: UFO Defense
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	timidity-[0-9]*:../../audio/timidity
+DEPENDS+=		timidity-[0-9]*:../../audio/timidity
 # Docs say this is needed, but it builds fine without
 #BUILD_DEPENDS+=	docbook2X-[0-9]*:../../wip/docbook2X
 
diff --git a/p5-Date-Range/Makefile b/p5-Date-Range/Makefile
index 340103eee5..f587fb2ec8 100644
--- a/p5-Date-Range/Makefile
+++ b/p5-Date-Range/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	http://search.cpan.org/dist/Date-Range/
 COMMENT=	Date::Range - deal with a range of dates
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	p5-Date-Simple>=0.03:../../devel/p5-Date-Simple
+DEPENDS+=		p5-Date-Simple>=0.03:../../devel/p5-Date-Simple
 #BUILD_DEPENDS+=	{perl>=5.7.3,p5-Test-Simple>=0.4}:../../devel/p5-Test-Simple
 
 USE_LANGUAGES=	# empty
diff --git a/p5-Net-SMS-Clickatell/Makefile b/p5-Net-SMS-Clickatell/Makefile
index c3370ff043..ec0cbd49b7 100644
--- a/p5-Net-SMS-Clickatell/Makefile
+++ b/p5-Net-SMS-Clickatell/Makefile
@@ -12,7 +12,7 @@ LICENSE=	${PERL5_LICENSE}
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Net/SMS/Clickatell/.packlist
 
-#DEPENDS+=       p5-OptArgs>=0.1.18:../../wip/p5-OptArgs
+#DEPENDS+=	p5-OptArgs>=0.1.18:../../wip/p5-OptArgs
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pike-core/Makefile.common b/pike-core/Makefile.common
index 2f84920181..31fc20fb54 100644
--- a/pike-core/Makefile.common
+++ b/pike-core/Makefile.common
@@ -23,7 +23,7 @@ BUILD_DIRS=		src
 
 USE_TOOLS+=		bison autoconf
 GNU_CONFIGURE=		yes
-#CONFIGURE_DIRS=		src
+#CONFIGURE_DIRS=	src
 #BUILD_DIRS=		${CONFIGURE_DIRS}
 PTHREAD_OPTS+=		require
 
diff --git a/piwik/Makefile b/piwik/Makefile
index 6f159a9fe3..dbd355d165 100644
--- a/piwik/Makefile
+++ b/piwik/Makefile
@@ -42,7 +42,7 @@ DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 DEPENDS+=	mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
 
 PHP_VERSIONS_ACCEPTED=	54 55 56
-#PHP_VERSION_REQD= 56
+#PHP_VERSION_REQD=	56
 
 # Add line to ${PREFIX}/etc/php.ini for above
 # extension=json.so
diff --git a/plasma-desktop/Makefile b/plasma-desktop/Makefile
index 778213edcb..19e3d712b2 100644
--- a/plasma-desktop/Makefile
+++ b/plasma-desktop/Makefile
@@ -39,7 +39,7 @@ CONF_FILES+=	${PREFIX}/share/examples/plasma-desktop/org.kde.fontinst.conf \
 CONF_FILES+=	${PREFIX}/share/examples/plasma-desktop/org.kde.kcontrol.kcmclock.conf \
 		${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
 
-MAKE_DIRS+=	${PKG_SYSCONFDIR}/dbus-1/system.d
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/dbus-1/system.d
 INSTALLATION_DIRS+=	share/examples/plasma-desktop
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/plasma-integration/hacks.mk b/plasma-integration/hacks.mk
index 6a89854605..9c686b8489 100644
--- a/plasma-integration/hacks.mk
+++ b/plasma-integration/hacks.mk
@@ -4,4 +4,4 @@
 # ld: BFD (NetBSD Binutils nb1) 2.27 assertion fail
 # /usr/src/external/gpl3/binutils/lib/libbfd/../../dist/bfd/elflink.c:2694
 # unless -lexecinfo preceeds -lQt5Widgets
-BUILDLINK_TRANSFORM.NetBSD+=l:Qt5Widgets:execinfo:Qt5Widgets
+BUILDLINK_TRANSFORM.NetBSD+=	l:Qt5Widgets:execinfo:Qt5Widgets
diff --git a/py-easymodeler/Makefile b/py-easymodeler/Makefile
index 2d07f01994..5abbca581a 100644
--- a/py-easymodeler/Makefile
+++ b/py-easymodeler/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple ODE Tools for Modelers
 ICENSE=		modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-#DEPENDS+=       ${PYPKGPREFIX}-sas7bdat>=2.0.4:../../wip/py-sas7bdat
+#DEPENDS+=	${PYPKGPREFIX}-sas7bdat>=2.0.4:../../wip/py-sas7bdat
 
 
 USE_LANGUAGES=	# none
diff --git a/py-etmtk/Makefile b/py-etmtk/Makefile
index ad3297cbac..d9426f3be0 100644
--- a/py-etmtk/Makefile
+++ b/py-etmtk/Makefile
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 USE_LANGUAGES=	# none
 
-#PYTHON_VERSIONS_ACCEPTED= 27
+#PYTHON_VERSIONS_ACCEPTED=	27
 
 post-extract:
 	${MV} ${WRKSRC}/etm ${WRKSRC}/etm${PYVERSSUFFIX}
diff --git a/py-fedmsg/Makefile b/py-fedmsg/Makefile
index be49a04339..7b090e3a3a 100644
--- a/py-fedmsg/Makefile
+++ b/py-fedmsg/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-requests>=2.5.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-zmq>=14.4.1:../../net/py-zmq
 DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-psutil>=2.1.3:../../sysutils/py-psutil
-#DEPENDS+=    	${PYPKGPREFIX}-cryptography>=1.0.1:../../security/py-cryptography
+#DEPENDS+=	${PYPKGPREFIX}-cryptography>=1.0.1:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-arrow>=0.4.2:../../time/py-arrow
 DEPENDS+=	${PYPKGPREFIX}-kitchen>=1.2.1:../../wip/py-kitchen
diff --git a/py-jabber-icqt/Makefile b/py-jabber-icqt/Makefile
index f9bfd02d0f..94361e4b09 100644
--- a/py-jabber-icqt/Makefile
+++ b/py-jabber-icqt/Makefile
@@ -48,7 +48,7 @@ PLIST_SUBST+=		TRANSPORTDIR=${TRANSPORTDIR}
 MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE}
 
-#INSTALLATION_DIRS+= ${TRANSPORTDIR}
+#INSTALLATION_DIRS+=	${TRANSPORTDIR}
 
 .include "../../wip/jabberd/transports.mk"
 
diff --git a/py-scitools/Makefile b/py-scitools/Makefile
index 0e46345e14..39ed76a0f6 100644
--- a/py-scitools/Makefile
+++ b/py-scitools/Makefile
@@ -28,7 +28,7 @@ post-extract:
 	${MV} ${WRKSRC}/bin/scitools ${WRKSRC}/bin/scitools${PYVERSSUFFIX}
 
 #optional dependency:
-#DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
+#DEPENDS+=			${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 #PYTHON_VERSIONED_DEPENDENCIES=	Pmw X
 #.include "../../lang/python/versioned_dependencies.mk"
 #PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 35 35 34 34 # py-Numeric
diff --git a/py-sydent/Makefile b/py-sydent/Makefile
index 89f354b334..c2953c9a15 100644
--- a/py-sydent/Makefile
+++ b/py-sydent/Makefile
@@ -6,7 +6,7 @@ GITHUB_PROJECT=	sydent
 MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 GITHUB_TAG=	3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe
-#EXTRACT_SUFX=   .zip
+#EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kethzer.dr%gmail.com@localhost
 HOMEPAGE=	https://github.com/matrix-org/
diff --git a/py-twilio/Makefile b/py-twilio/Makefile
index 8ad5018553..744f2a0980 100644
--- a/py-twilio/Makefile
+++ b/py-twilio/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/t/twilio/
 COMMENT=	Twilio API client and TwiML generator
 LICENSE=	mit
 
-#EGG_NAME=       ${PKGVERSION}
+#EGG_NAME=	${PKGVERSION}
 
 DEPENDS+=	${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
diff --git a/rsem/Makefile b/rsem/Makefile
index 544221d590..76a71d6f5a 100644
--- a/rsem/Makefile
+++ b/rsem/Makefile
@@ -6,7 +6,7 @@
 ###########################################################
 # Test new versions with Trinity before upgrading
 
-#DISTVERSIONPREFIX=v
+#DISTVERSIONPREFIX=	v
 
 DISTNAME=	rsem-${PORTVERSION}
 CATEGORIES=	biology
diff --git a/rtcmix/Makefile b/rtcmix/Makefile
index ad6ce04ad0..9563d4c58b 100644
--- a/rtcmix/Makefile
+++ b/rtcmix/Makefile
@@ -13,7 +13,7 @@ LICENSE=	apache-2.0
 GNU_CONFIGURE=		yes
 # Html documentation and man pages are incomplete.
 # http://rtcmix.org/reference/
-#CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/${PKGBASE}/html
+#CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGBASE}/html
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/${PKGBASE}
 USE_LANGUAGES=		c c++
 USE_TOOLS=		gmake autoconf perl
diff --git a/rust/Makefile b/rust/Makefile
index 8e6e403b23..d6974257e9 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -82,13 +82,13 @@ BUILDLINK_TRANSFORM.NetBSD+=	rm:-Wl,--enable-new-dtags
 .if defined(PLUS_BOOTSTRAPS)
 
 # When adding a target here, also add it to available.mk
-RUST_MACHINES= \
+RUST_MACHINES=		\
 	i686-apple-darwin \
 	x86_64-apple-darwin \
 	i686-unknown-linux-gnu \
 	x86_64-unknown-linux-gnu \
 	x86_64-unknown-netbsd
-#RUST_MACHINES+= x86_64-sun-solaris
+#RUST_MACHINES+=	x86_64-sun-solaris
 
 .for MACHINE in ${RUST_MACHINES}
 RUSTCS+=	rustc-${RUST_STAGE0_VER}-${MACHINE}.tar.gz
diff --git a/rustc/Makefile b/rustc/Makefile
index 4ef365b74e..f0b23db8e4 100755
--- a/rustc/Makefile
+++ b/rustc/Makefile
@@ -140,7 +140,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 #DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
 #RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
 #RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-#SITES.${RUST_CARGO0}= \
+#SITES.${RUST_CARGO0}=	\
 #	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
 #.endif
 
diff --git a/sbcl-git/Makefile b/sbcl-git/Makefile
index d251e1c040..a784e59f5d 100644
--- a/sbcl-git/Makefile
+++ b/sbcl-git/Makefile
@@ -57,7 +57,7 @@ SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		install.sh src/runtime/runtime.c doc/sbcl.1
 SUBST_SED.fix-paths=		-e 's,@PREFIX@,${PREFIX},g'
-#SUBST_SED.fix-paths+=           -e 's,/var/log,${VARBASE}/log,g'
+#SUBST_SED.fix-paths+=		-e 's,/var/log,${VARBASE}/log,g'
 
 SUBST_CLASSES+=			fix-gtar
 SUBST_STAGE.fix-gtar=		pre-configure
diff --git a/semanticscuttle/Makefile b/semanticscuttle/Makefile
index 7fda2c5481..618d618dc4 100644
--- a/semanticscuttle/Makefile
+++ b/semanticscuttle/Makefile
@@ -19,7 +19,7 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-[0-9]*:../../www/ap-php
 
 USE_TOOLS+=	pax
-#NO_BUILD=   yes
+#NO_BUILD=	yes
 
 DOCDIR=		${PREFIX}/share/doc/semanticscuttle
 EGDIR=		${PREFIX}/share/examples/semanticscuttle
diff --git a/sickle/Makefile b/sickle/Makefile
index 5bfcdb53f6..5f54ea0432 100644
--- a/sickle/Makefile
+++ b/sickle/Makefile
@@ -9,9 +9,9 @@
 
 ## Created by: Dan Siercks
 ## $FreeBSD$
-#DISTVERSIONPREFIX=      v
+#DISTVERSIONPREFIX=	v
 ## Requires libz
-#PLIST_FILES=	bin/sickle
+#PLIST_FILES=		bin/sickle
 #do-install:
 #	${INSTALL_PROGRAM} ${WRKSRC}/sickle \
 #		${DESTDIR}${PREFIX}/bin
diff --git a/simutrans-data/Makefile b/simutrans-data/Makefile
index 84a75327fc..56a50309f5 100644
--- a/simutrans-data/Makefile
+++ b/simutrans-data/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Game data for Simutrans
 NO_BUILD=	yes
 
 
-#DEPENDS+=       unzip-[0-9]*:../../archivers/unzip
+#DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 
 post-extract:
 		${FIND} ${WRKDIR} -type f -exec ${CHMOD} 0644 {} \;
diff --git a/sselp/Makefile b/sselp/Makefile
index 6cf83277e7..42055284ef 100644
--- a/sselp/Makefile
+++ b/sselp/Makefile
@@ -20,14 +20,14 @@ SUBST_MESSAGE.makefile=	Fixing config.mk
 SUBST_FILES.makefile=	config.mk
 SUBST_SED.makefile+=	-e 's,/usr/local,${PREFIX},g'
 # no manual avaiable
-#SUBST_SED.makefile+=   -e 's,share/man,${PKGMANDIR},g'
+#SUBST_SED.makefile+=	-e 's,share/man,${PKGMANDIR},g'
 SUBST_SED.makefile+=	-e 's,/usr/X11R6,${X11BASE},g'
 SUBST_SED.makefile+=	-e 's,^CFLAGS = ,CFLAGS += ,'
 SUBST_SED.makefile+=	-e 's,^LDFLAGS = ,LDFLAGS += ,'
 SUBST_SED.makefile+=	-e 's/cc/${CC:Q}/'
 
 # no manual avaiable
-#INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1
+#INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/supertuxkart/Makefile b/supertuxkart/Makefile
index 90f7b63e08..8392451759 100644
--- a/supertuxkart/Makefile
+++ b/supertuxkart/Makefile
@@ -13,12 +13,12 @@ HOMEPAGE=	http://supertuxkart.sourceforge.net/
 COMMENT=	Free 3D kart racing game
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/supertuxkart-${VERSION}
-USE_CMAKE=	yes
-#USE_LIBTOOL=	yes
+WRKSRC=			${WRKDIR}/supertuxkart-${VERSION}
+USE_CMAKE=		yes
+#USE_LIBTOOL=		yes
 #USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	cmake
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		cmake
 
 CXXFLAGS+=	-DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_
 
diff --git a/swarp/Makefile b/swarp/Makefile
index 81665508e3..4b05eb22fa 100644
--- a/swarp/Makefile
+++ b/swarp/Makefile
@@ -20,14 +20,14 @@ SUBST_MESSAGE.makefile=	Fixing config.mk
 SUBST_FILES.makefile=	config.mk
 SUBST_SED.makefile+=	-e 's,/usr/local,${PREFIX},g'
 # no manual avaiable
-#SUBST_SED.makefile+=   -e 's,share/man,${PKGMANDIR},g'
+#SUBST_SED.makefile+=	-e 's,share/man,${PKGMANDIR},g'
 SUBST_SED.makefile+=	-e 's,/usr/X11R6,${X11BASE},g'
 SUBST_SED.makefile+=	-e 's,^CFLAGS = ,CFLAGS += ,'
 SUBST_SED.makefile+=	-e 's,^LDFLAGS = ,LDFLAGS += ,'
 SUBST_SED.makefile+=	-e 's/cc/${CC:Q}/'
 
 # no manual avaiable
-#INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1
+#INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/texlive2013/Makefile b/texlive2013/Makefile
index defdab3ad5..91ed2c71eb 100644
--- a/texlive2013/Makefile
+++ b/texlive2013/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	texlive-20130530-source
 #PKGNAME=	${DISTNAME:S/-source//}
 PKGNAME=	texlive2013-0.2
 #LICENSE=	texlive-license
-#BROKEN=		Still getting ERROR: [check-interpreter.mk], and NOT fixed yet.
+#BROKEN=	Still getting ERROR: [check-interpreter.mk], and NOT fixed yet.
 
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
diff --git a/udunits2/Makefile b/udunits2/Makefile
index 1ee3a08a84..aa1401d272 100644
--- a/udunits2/Makefile
+++ b/udunits2/Makefile
@@ -11,13 +11,13 @@
 ## $FreeBSD: head/science/udunits/Makefile 383158 2015-04-03 17:28:32Z sunpoet $
 #		LOCAL/sunpoet
 #OPTIONS_DEFINE=	DOCS
-#CPPFLAGS+=	-I${LOCALBASE}/include
+#CPPFLAGS+=		-I${LOCALBASE}/include
 #INSTALL_TARGET=	install-strip
-#LDFLAGS+=	-L${LOCALBASE}/lib
-#USE_LDCONFIG=	yes
-#INFO=		udunits2 udunits2lib udunits2prog
-#PORTDATA=	*
-#PORTDOCS=	*
+#LDFLAGS+=		-L${LOCALBASE}/lib
+#USE_LDCONFIG=		yes
+#INFO=			udunits2 udunits2lib udunits2prog
+#PORTDATA=		*
+#PORTDOCS=		*
 #post-patch:
 #	@${REINPLACE_CMD} -e '/install-data-hook$$/d' ${WRKSRC}/lib/Makefile.in
 #regression-test test: build
diff --git a/vcflib/Makefile b/vcflib/Makefile
index fd4e75b9e3..f5445b32b4 100644
--- a/vcflib/Makefile
+++ b/vcflib/Makefile
@@ -44,10 +44,10 @@ PORTVERSION=	790904320065e603c6af5b8a32f635134354467c
 DATADIR=	${PREFIX}/share/vcflib
 DOCSDIR=	${PREFIX}/share/doc/vcflib
 
-#SUBST_CLASSES+=         ldflags
-#SUBST_FILES.ldflags=    ${WRKSRC}/Makefile.external-libs
-#SUBST_STAGE.ldflags=    post-patch
-#SUBST_SED.ldflags=      -e "s|LDFLAGS =|LDFLAGS = ${COMPILER_RPATH_FLAG}${PREFIX}/lib|g"
+#SUBST_CLASSES+=	ldflags
+#SUBST_FILES.ldflags=	${WRKSRC}/Makefile.external-libs
+#SUBST_STAGE.ldflags=	post-patch
+#SUBST_SED.ldflags=	-e "s|LDFLAGS =|LDFLAGS = ${COMPILER_RPATH_FLAG}${PREFIX}/lib|g"
 
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib
 
diff --git a/vreng/Makefile b/vreng/Makefile
index 222ec38bf8..50b11ad3a0 100644
--- a/vreng/Makefile
+++ b/vreng/Makefile
@@ -24,7 +24,7 @@ CXXFLAGS+=	-D_POSIX_PTHREAD_SEMANTICS
 CFLAGS+=	-D_POSIX_PTHREAD_SEMANTICS
 
 #CONFIGURE_ENV+=
-#CONFIGURE_ARGS+= --enable-ocaml
+#CONFIGURE_ARGS+=	--enable-ocaml
 CONFIGURE_ARGS+=	--with-GL-prefix=${LOCALBASE}
 CONFIGURE_ENV+=		PERLPATH=${LOCALBASE}/bin/perl
 
diff --git a/wmname/Makefile b/wmname/Makefile
index 1784a94795..111b9e51dd 100644
--- a/wmname/Makefile
+++ b/wmname/Makefile
@@ -19,14 +19,14 @@ SUBST_MESSAGE.makefile=	Fixing config.mk
 SUBST_FILES.makefile=	config.mk
 SUBST_SED.makefile+=	-e 's,/usr/local,${PREFIX},g'
 # no manual avaiable
-#SUBST_SED.makefile+=   -e 's,share/man,${PKGMANDIR},g'
+#SUBST_SED.makefile+=	-e 's,share/man,${PKGMANDIR},g'
 SUBST_SED.makefile+=	-e 's,/usr/X11R6,${X11BASE},g'
 SUBST_SED.makefile+=	-e 's,^CFLAGS = ,CFLAGS += ,'
 SUBST_SED.makefile+=	-e 's,^LDFLAGS = ,LDFLAGS += ,'
 SUBST_SED.makefile+=	-e 's/cc/${CC:Q}/'
 
 # no manual avaiable
-#INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1
+#INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xmlsysinfo/Makefile b/xmlsysinfo/Makefile
index 3486e10aab..3b0b25a6ae 100644
--- a/xmlsysinfo/Makefile
+++ b/xmlsysinfo/Makefile
@@ -15,7 +15,7 @@ BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.0
 USE_LANGUAGES+=	c c++
 
 #DEPENDS+=	libxml2>=2.0.0:../../textproc/libxml2
-#DEPENDS+=      zlib>=1.2.0:../../devel/zlib
+#DEPENDS+=	zlib>=1.2.0:../../devel/zlib
 
 GNU_CONFIGURE=	YES
 #USE_LIBTOOL=	YES
diff --git a/xmms2/options.mk b/xmms2/options.mk
index 8d0bd54830..605f70997b 100644
--- a/xmms2/options.mk
+++ b/xmms2/options.mk
@@ -256,7 +256,7 @@ WITHOUT_PLUGINS+=	tremor
 .endif
 
 .if !empty(PKG_OPTIONS:Mvalgrind)
-BUILD_DEPENDS+=	valgrind-[0-9]*:../../devel/valgrind
+BUILD_DEPENDS+=		valgrind-[0-9]*:../../devel/valgrind
 #PLIST.valgrind=	yes
 .endif
 
diff --git a/xspread/Makefile b/xspread/Makefile
index dcee219b9c..f746dd77e9 100644
--- a/xspread/Makefile
+++ b/xspread/Makefile
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 GNU_CONFIGURE=		yes
 CONFIGURE_HAS_MANDIR=	no
 
-#CONFIGURE_ENV+=		CPPFLAGS="-I${X11BASE}/include"
+#CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include"
 MAKE_ENV+=		LOCAL_LDFLAGS="${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib"
 
 PKGMANDIR?=		man


Home | Main Index | Thread Index | Old Index