57 files changed, 138 insertions, 138 deletions

diff --git a/archivers/c-blosc/Makefile b/archivers/c-blosc/Makefile
index 1343bb45d0c6..ba8c28164509 100644
--- a/archivers/c-blosc/Makefile
+++ b/archivers/c-blosc/Makefile
@@ -28,7 +28,7 @@ PLIST_SUB=	VERSION="${PORTVERSION:R:R}" \
 CMAKE_ARGS=	-DBUILD_SHARED=ON
 
 OPTIONS_DEFINE=	STATIC TEST AVX2 LZ4 SNAPPY ZLIB ZSTD
-OPTIONS_DEFAULT= 	STATIC LZ4 SNAPPY ZLIB ZSTD
+OPTIONS_DEFAULT=STATIC LZ4 SNAPPY ZLIB ZSTD
 OPTIONS_SUB=	yes
 
 AVX2_DESC=	Attempt to build with AVX2 instructions
diff --git a/archivers/go-compress/Makefile b/archivers/go-compress/Makefile
index 008ea0e0e9af..62df9d4ec5a1 100644
--- a/archivers/go-compress/Makefile
+++ b/archivers/go-compress/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	compress
 PORTVERSION=	1.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers
-PKGNAMEPREFIX=  go-
+PKGNAMEPREFIX=	go-
 
 MAINTAINER=	guy.tabrar@me.com
 COMMENT=	Go optimised compression packages
@@ -16,10 +16,10 @@ BUILD_DEPENDS=	go-cpuid>=0:devel/go-cpuid \
 		go-crc32>=0:devel/go-crc32
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GITHUB= 	yes
-GH_ACCOUNT= 	klauspost
-USES= 		go
-GO_PKGNAME= 	github.com/klauspost/compress
+USE_GITHUB=	yes
+GH_ACCOUNT=	klauspost
+USES=		go
+GO_PKGNAME=	github.com/klauspost/compress
 GO_TARGET=	${GO_PKGNAME}/flate \
 		${GO_PKGNAME}/gzip \
 		${GO_PKGNAME}/snappy \
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index cb7f194f08ae..a3c33d886eb3 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -5,19 +5,19 @@ PORTNAME=	festival
 PORTVERSION=	2.4
 CATEGORIES=	audio accessibility
 MASTER_SITES=	FESTIVAL
-DISTFILES=	${DISTNAME}-release.tar.gz 	\
+DISTFILES=	${DISTNAME}-release.tar.gz	\
 		speech_tools-${PORTVERSION}-release.tar.gz
 DIST_SUBDIR=	festival
 
 PATCHFILES=	src_modules_diphone_diphone.h.diff?id=b58a836:debian	\
 		src_modules_diphone_di_io.cc.diff?id=b58a836:debian	\
 		src_modules_diphone_diphone.cc.diff?id=b58a836:debian	\
-		src_modules_donovan_t2s.h.diff?id=b58a836:debian		\
-		src_modules_UniSyn_diphone_UniSyn_diphone.cc.diff?id=b58a836:debian \
+		src_modules_donovan_t2s.h.diff?id=b58a836:debian	\
+		src_modules_UniSyn_diphone_UniSyn_diphone.cc.diff?id=b58a836:debian	\
 		festival_el_utf8.diff?id=b58a836:debian	\
 		lintianspellpatch.diff?id=b58a836:debian	\
 		hts21compat.diff?id=b58a836:debian	\
-		languagespatch.diff?id=b58a836:debian \
+		languagespatch.diff?id=b58a836:debian	\
 		${SPT_PATCHES:C/.*/patch-speech__tools_\0:netbsd/}
 PATCH_SITES=	ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/audio/festival/patches/:netbsd	\
 		http://anonscm.debian.org/cgit/tts/festival.git/plain/debian/patches/:debian
@@ -30,7 +30,7 @@ OPTIONS_DEFAULT=NAS ESD
 ESD_DESC=	${ESOUND_DESC}
 
 CXXFLAGS+=	-DFTLIBDIR=${LOCALBASE}/share/festival/lib
-CONFIGURE_WRKSRC=	${WRKDIR}/festival
+CONFIGURE_WRKSRC=${WRKDIR}/festival
 USES=		gmake
 SPEECHTOOLS=	${WRKSRC}/speech_tools
 FESTIVAL=	${WRKSRC}/festival
diff --git a/audio/libg722/Makefile b/audio/libg722/Makefile
index ba776c79da0e..791f96e42703 100644
--- a/audio/libg722/Makefile
+++ b/audio/libg722/Makefile
@@ -1,11 +1,11 @@
 # Created by: sobomax
 # $FreeBSD$
 
-PORTNAME=     	libg722
+PORTNAME=	libg722
 DISTVERSIONPREFIX=	v_
 DISTVERSION=	1_0_2
-#PORTREVISION= 	1
-CATEGORIES= 	audio
+#PORTREVISION=	1
+CATEGORIES=	audio
 
 MAINTAINER=	ports@sippysoft.com
 COMMENT=	Software G.722 decoding/encoding library
diff --git a/audio/py-gmusicproxy/Makefile b/audio/py-gmusicproxy/Makefile
index 85b736e83068..d8c222320cc0 100644
--- a/audio/py-gmusicproxy/Makefile
+++ b/audio/py-gmusicproxy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmusicproxy
 PORTVERSION=	1.0.8
-DISTVERSIONPREFIX= v
+DISTVERSIONPREFIX=	v
 CATEGORIES=	audio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/comms/sms_client/Makefile b/comms/sms_client/Makefile
index f1f24e3eec21..e466ae7b6648 100644
--- a/comms/sms_client/Makefile
+++ b/comms/sms_client/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple UNIX SMS client to send messages to phones or pagers
 
 LICENSE=	BSD3CLAUSE
 
-USES= 		tar:xz
+USES=		tar:xz
 HAS_CONFIGURE=	yes
 SPOOL=		${STAGEDIR}${PREFIX}/var/spool/sms
 
diff --git a/comms/telldus-core/Makefile b/comms/telldus-core/Makefile
index 10031e275fc5..5f9234ba33ca 100644
--- a/comms/telldus-core/Makefile
+++ b/comms/telldus-core/Makefile
@@ -47,10 +47,10 @@ post-patch:
 
 post-install:
 	cd ${STAGEDIR}${PREFIX}/etc && \
-		 ${MV} tellstick.conf tellstick.conf.sample
+		${MV} tellstick.conf tellstick.conf.sample
 	# This file is actually empty but allows us to simply use @sample to 
 	# make sure it stays between upgrades if modified
 	cd ${STAGEDIR}/var/telldus && \
-		 ${MV} telldus-core.conf telldus-core.conf.sample
+		${MV} telldus-core.conf telldus-core.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/databases/cockroach/Makefile b/databases/cockroach/Makefile
index 556a4cd73782..29feb65ed4b5 100644
--- a/databases/cockroach/Makefile
+++ b/databases/cockroach/Makefile
@@ -30,7 +30,7 @@ GROUPS=		cockroach
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DCMAKE_CXX_FLAGS=-DNDEBUG)|-DCMAKE_CXX_FLAGS=-DNDEBUG) -DFAIL_ON_WARNINGS=OFF|g' \
-	  	${WRKSRC}/src/github.com/cockroachdb/cockroach/build/common.mk
+		${WRKSRC}/src/github.com/cockroachdb/cockroach/build/common.mk
 
 do-build:
 	@${SETENV} -i PATH="${PATH}" \
diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index 20853a223c04..35d848d663a9 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -76,7 +76,7 @@ INFLUXD_PIDDIR=	/var/run/${PORTNAME}/
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == "FreeBSD" && ((${OSVERSION} >= 1100513 && ${OSVERSION} < 1200000) || \
-    	${OSVERSION} >= 1200015)
+	${OSVERSION} >= 1200015)
 SUB_LIST+=	INFLUXD_LOGCMD="daemon"
 .else
 SUB_LIST+=	INFLUXD_LOGCMD="logger"
@@ -94,7 +94,7 @@ post-patch:
 		internal LICENSE_OF_DEPENDENCIES.md Makefile man models \
 		monitor nightly.sh node.go pkg QUERIES.md README.md \
 		scripts services stress tcp test.sh tests TODO.md toml tsdb uuid \
- 		${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
+		${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 
 do-build:
 		@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT} && \
diff --git a/databases/pgfouine/Makefile b/databases/pgfouine/Makefile
index d949eb09d386..bdeddbed99c6 100644
--- a/databases/pgfouine/Makefile
+++ b/databases/pgfouine/Makefile
@@ -29,8 +29,8 @@ do-install:
 	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/include/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS	${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog 	${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/THANKS 	${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog	${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/THANKS	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/rpm-specific/sources/pgfouine-tutorial.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 6b87e5a93cc9..3d9ce08f41b8 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -50,7 +50,7 @@ TITLE?=		My CVS Repository
 .if exists(${PREFIX}/www/cgi-bin)
 DIRPREFIX=	www
 .elif exists(${PREFIX}/www/apache24/cgi-bin)
-DIRPREFIX=      www/apache24
+DIRPREFIX=	www/apache24
 .elif exists(${PREFIX}/www/apache22/cgi-bin)
 DIRPREFIX=	www/apache22
 .elif exists(${PREFIX}/apache/cgi-bin)
@@ -58,9 +58,9 @@ DIRPREFIX=	apache
 .else
 DIRPREFIX=	share/apache
 .endif
-CGIDIR?=        ${DIRPREFIX}/cgi-bin
-ICONSDIR?=      ${DIRPREFIX}/icons
-CSSDIR?=        ${DIRPREFIX}/data/css
+CGIDIR?=	${DIRPREFIX}/cgi-bin
+ICONSDIR?=	${DIRPREFIX}/icons
+CSSDIR?=	${DIRPREFIX}/data/css
 
 CONFFILES=	cvsweb.conf \
 		cvsweb.conf-freebsd \
diff --git a/devel/go-cpuid/Makefile b/devel/go-cpuid/Makefile
index 4317ca12b68c..d5a8095fcc3a 100644
--- a/devel/go-cpuid/Makefile
+++ b/devel/go-cpuid/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	cpuid
 PORTVERSION=	1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
-PKGNAMEPREFIX=  go-
+PKGNAMEPREFIX=	go-
 
 MAINTAINER=	guy.tabrar@me.com
 COMMENT=	Cpuid provides information about the CPU running the current program
@@ -12,9 +12,9 @@ COMMENT=	Cpuid provides information about the CPU running the current program
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_GITHUB= 	yes
-GH_ACCOUNT= 	klauspost
-USES= 		go
-GO_PKGNAME= 	github.com/klauspost/cpuid
+USE_GITHUB=	yes
+GH_ACCOUNT=	klauspost
+USES=		go
+GO_PKGNAME=	github.com/klauspost/cpuid
 
 .include <bsd.port.mk>
diff --git a/devel/go-crc32/Makefile b/devel/go-crc32/Makefile
index ea5b4b210b8c..2157abb35e3a 100644
--- a/devel/go-crc32/Makefile
+++ b/devel/go-crc32/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	crc32
 PORTVERSION=	1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
-PKGNAMEPREFIX=  go-
+PKGNAMEPREFIX=	go-
 
 MAINTAINER=	guy.tabrar@me.com
 COMMENT=	CRC32 hash with x64 optimizations for go
@@ -12,9 +12,9 @@ COMMENT=	CRC32 hash with x64 optimizations for go
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_GITHUB= 	yes
-GH_ACCOUNT= 	klauspost
-USES= 		go
-GO_PKGNAME= 	github.com/klauspost/crc32
+USE_GITHUB=	yes
+GH_ACCOUNT=	klauspost
+USES=		go
+GO_PKGNAME=	github.com/klauspost/crc32
 
 .include <bsd.port.mk>
diff --git a/devel/libsysinfo/Makefile b/devel/libsysinfo/Makefile
index 3d443054de89..a36f85effdac 100644
--- a/devel/libsysinfo/Makefile
+++ b/devel/libsysinfo/Makefile
@@ -3,8 +3,9 @@
 
 PORTNAME=	libsysinfo
 PORTVERSION=	0.0.3
+DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
-PORTREVSION=	1
 
 MAINTAINER=	imp@bsdimp.com
 COMMENT=	GNU libc's sysinfo port for FreeBSD
@@ -13,7 +14,6 @@ LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bsdimp
-DISTVERSIONPREFIX= v
 
 USES=		uidfix
 USE_LDCONFIG=	yes
diff --git a/devel/lua-MessagePack/Makefile b/devel/lua-MessagePack/Makefile
index 4aba20d4c2db..0146653ba1ad 100644
--- a/devel/lua-MessagePack/Makefile
+++ b/devel/lua-MessagePack/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	MessagePack
 PORTVERSION=	0.3.5
 CATEGORIES=	devel
-PKGNAMEPREFIX=  ${LUA_PKGNAMEPREFIX}
+PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	oleksii.tsai@gmail.com
 COMMENT=	Efficient binary serialization format
diff --git a/devel/luajava/Makefile b/devel/luajava/Makefile
index 8f5ef855e8d2..cfd96527b776 100644
--- a/devel/luajava/Makefile
+++ b/devel/luajava/Makefile
@@ -23,9 +23,9 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.pre.mk>
 
 .if ${JAVA_PORT_VERSION} == 1.7
-PLIST_SUB+= 	JDK17=""
+PLIST_SUB+=	JDK17=""
 .else
-PLIST_SUB+= 	JDK17="@comment "
+PLIST_SUB+=	JDK17="@comment "
 .endif
 
 post-patch:
diff --git a/dns/adsuck/Makefile b/dns/adsuck/Makefile
index 10ea6841aad6..b997c317ba6f 100644
--- a/dns/adsuck/Makefile
+++ b/dns/adsuck/Makefile
@@ -17,7 +17,7 @@ LICENSE=	ISCL
 LIB_DEPENDS+=	libevent.so:devel/libevent \
 		libldns.so:dns/ldns
 
-CFLAGS+= 	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
 
 USE_RC_SUBR=	adsuck
 
diff --git a/editors/the/Makefile b/editors/the/Makefile
index e1f453ba2c9c..93cde8bca85f 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -67,15 +67,15 @@ post-extract:
 pre-install:
 	${MKDIR}				${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html	${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/the64.gif    	${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/the64.gif	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/the64.png	${STAGEDIR}${DOCSDIR}
 
 do-install-XCURSES-on:
 	${STRIP_CMD}	${STAGEDIR}${PREFIX}/bin/xthe
-	${LN} -sf xthe 	${STAGEDIR}${PREFIX}/bin/the
+	${LN} -sf xthe	${STAGEDIR}${PREFIX}/bin/the
 
 do-install-NCURSES-on:
 	${STRIP_CMD}	${STAGEDIR}${PREFIX}/bin/nthe
-	${LN} -sf nthe 	${STAGEDIR}${PREFIX}/bin/the
+	${LN} -sf nthe	${STAGEDIR}${PREFIX}/bin/the
 
 .include <bsd.port.mk>
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index 542db08bed67..82ef624ee082 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -81,7 +81,7 @@ LIRC_CMAKE_BOOL=	ENABLE_LIRC
 
 post-patch:
 	@${REINPLACE_CMD} -e '/SET.*LIRC_CLIENT_LIBRARY/ s|lirc_client|${LOCALBASE}/lib/lib&.so|; \
-       		s|share/man|man|' ${WRKSRC}/CMakeLists.txt
+		s|share/man|man|' ${WRKSRC}/CMakeLists.txt
 
 maint-gen-distfile:
 	@if [ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
diff --git a/games/gnarr/Makefile b/games/gnarr/Makefile
index c38563fe74e3..752ba5c7d6bc 100644
--- a/games/gnarr/Makefile
+++ b/games/gnarr/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	daniel.ryslink@dialtelecom.cz
 COMMENT=	Program for generating battle cries
 
 NO_BUILD=	yes
-USES= 		perl5 shebangfix
+USES=		perl5 shebangfix
 SHEBANG_FILES=	gnarr
 
 .include <bsd.port.mk>
diff --git a/graphics/dcraw-m/Makefile b/graphics/dcraw-m/Makefile
index 7981603908c5..ac9bbc12c021 100644
--- a/graphics/dcraw-m/Makefile
+++ b/graphics/dcraw-m/Makefile
@@ -21,13 +21,13 @@ GH_TAGNAME=	1392579
 
 USES=		jpeg pkgconfig
 
-CFLAGS += 	-Wall -I${LOCALBASE}/include \
+CFLAGS+=	-Wall -I${LOCALBASE}/include \
 		`MagickWand-config --cflags --cppflags` \
 		-DMAGICKCORE_HDRI_ENABLE=0 \
 		-DMAGICKCORE_QUANTUM_DEPTH=16
-LDFLAGS +=	`MagickWand-config --ldflags --libs` -lm -llcms2 -ljpeg \
+LDFLAGS+=	`MagickWand-config --ldflags --libs` -lm -llcms2 -ljpeg \
 		-ljasper
-LIBS    +=      -L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/dcraw-m
 
diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index dd382f995216..b10bf86b73d0 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -52,10 +52,10 @@ post-patch:
 	@${RM} -r ${WRKSRC}/thirdparty/curl \
 		${WRKSRC}/thirdparty/freetype \
 		${WRKSRC}/thirdparty/harfbuzz \
-	 	${WRKSRC}/thirdparty/jbig2dec \
-	 	${WRKSRC}/thirdparty/libjpeg \
-	 	${WRKSRC}/thirdparty/openjpeg \
-	 	${WRKSRC}/thirdparty/zlib
+		${WRKSRC}/thirdparty/jbig2dec \
+		${WRKSRC}/thirdparty/libjpeg \
+		${WRKSRC}/thirdparty/openjpeg \
+		${WRKSRC}/thirdparty/zlib
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf
diff --git a/java/berkeley-db/Makefile b/java/berkeley-db/Makefile
index c44830c7fb72..9bffd23f1903 100644
--- a/java/berkeley-db/Makefile
+++ b/java/berkeley-db/Makefile
@@ -47,7 +47,7 @@ post-build:	test
 	#
 	# Please, review the reported failures (if any) and consider
 	# reporting them to the developers via:
-	# 	http://forums.oracle.com/forums/forum.jspa?forumID=273
+	#	http://forums.oracle.com/forums/forum.jspa?forumID=273
 	# You can re-run the tests without rebuilding the port by
 	# simply doing `make test'
 	#
@@ -57,7 +57,7 @@ post-build:
 	# Doing `make test' now might be useful (if time-consuming).
 	# Please, review the reported failures (if any) and consider
 	# reporting them via
-	# 	http://forums.oracle.com/forums/forum.jspa?forumID=273
+	#	http://forums.oracle.com/forums/forum.jspa?forumID=273
 	#
 .endif
 
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 3a81f65c8b5f..445bb09aa85c 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -1,22 +1,22 @@
 # Created by: Hirohisa Yamaguchi <umq@ueo.co.jp>
 # $FreeBSD$
 
-PORTNAME=		opendkim
-PORTVERSION=		2.10.3
-PORTREVISION=		7
-CATEGORIES=		mail security
-MASTER_SITES=		SF/${PORTNAME} \
-			SF/${PORTNAME}/Previous%20Releases \
-			ftp://ftpmirror.uk/freebsd-ports/${PORTNAME}/
+PORTNAME=	opendkim
+PORTVERSION=	2.10.3
+PORTREVISION=	7
+CATEGORIES=	mail security
+MASTER_SITES=	SF/${PORTNAME} \
+		SF/${PORTNAME}/Previous%20Releases \
+		ftp://ftpmirror.uk/freebsd-ports/${PORTNAME}/
 
-MAINTAINER=		freebsd-ports@dan.me.uk
-COMMENT=		DKIM library and milter implementation
+MAINTAINER=	freebsd-ports@dan.me.uk
+COMMENT=	DKIM library and milter implementation
 
-LICENSE=		BSD3CLAUSE SENDMAIL
-LICENSE_COMB=		multi
+LICENSE=	BSD3CLAUSE SENDMAIL
+LICENSE_COMB=	multi
 
 LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
-LICENSE_GROUPS_SENDMAIL=	FSF OSI
+LICENSE_GROUPS_SENDMAIL=FSF OSI
 LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
 LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
@@ -120,19 +120,19 @@ CONFIGURE_ARGS+=	--with-milter=${MILTERBASE}
 .if ${PORT_OPTIONS:MLUA_ONLY_SIGNING} || \
     ${PORT_OPTIONS:MRBL}
 .if !${PORT_OPTIONS:MLUA}
-IGNORE= options LUA_ONLY_SIGNING and RBL require LUA as well
+IGNORE=	options LUA_ONLY_SIGNING and RBL require LUA as well
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MREPUTATION}
 .if !${PORT_OPTIONS:MCURL} || !${PORT_OPTIONS:MJANSSON}
-IGNORE= option REPUTATION requires CURL and JANSSON as well
+IGNORE=	option REPUTATION requires CURL and JANSSON as well
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MSTATSEXT}
 .if !${PORT_OPTIONS:MSTATS} || !${PORT_OPTIONS:MLUA}
-IGNORE= option STATSEXT requires STATS and LUA as well
+IGNORE=	option STATSEXT requires STATS and LUA as well
 .endif
 .endif
 
diff --git a/multimedia/libtuner/Makefile b/multimedia/libtuner/Makefile
index c26bc4cc805d..4bbaeed53201 100644
--- a/multimedia/libtuner/Makefile
+++ b/multimedia/libtuner/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	multi
 BROKEN_powerpc64=	fails to compile: tuner_iic_device.cpp: EINVAL was not declared in this scope
 
 MAKE_ARGS+=	INSTALLDIR=${STAGEDIR}${PREFIX}
-MAKE_ARGS+= 	-D LIBTUNER_ENABLE_IIC
+MAKE_ARGS+=	-D LIBTUNER_ENABLE_IIC
 USE_LDCONFIG=	${PREFIX}/lib/libtuner
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/dnsmap/Makefile b/net-mgmt/dnsmap/Makefile
index 2c8a456a4196..e9a25768c032 100644
--- a/net-mgmt/dnsmap/Makefile
+++ b/net-mgmt/dnsmap/Makefile
@@ -27,7 +27,7 @@ do-install:
 	 ${INSTALL_SCRIPT}   ${WRKSRC}/${PORTNAME}-bulk.sh    ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-bulk
 	 ${MKDIR}	     ${STAGEDIR}${DATADIR}
 	 ${INSTALL_DATA}     ${WRKSRC}/wordlist_TLAs.txt      ${STAGEDIR}${DATADIR}
-	 ${MKDIR}  	     ${STAGEDIR}${DOCSDIR}
+	 ${MKDIR}	     ${STAGEDIR}${DOCSDIR}
 	 ${INSTALL_DATA}     ${PORTDOCS:S|^|${WRKSRC}/|}      ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile
index 2d674bacf287..5a4ca7de242e 100644
--- a/net-mgmt/observium/Makefile
+++ b/net-mgmt/observium/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	dirkx@webweaving.org
 COMMENT=	Autodiscovering PHP/MySQL/SNMP based network monitoring
 
-LICENSE=        EULA
+LICENSE=	EULA
 LICENSE_NAME=	"Observium License Version 1.0"
 LICENSE_FILE=	${WRKSRC}/LICENSE.COMMUNITY
-LICENSE_PERMS=  dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/net-mgmt/p5-Cisco-CopyConfig/Makefile b/net-mgmt/p5-Cisco-CopyConfig/Makefile
index 9b3e76350baa..413fef32853b 100644
--- a/net-mgmt/p5-Cisco-CopyConfig/Makefile
+++ b/net-mgmt/p5-Cisco-CopyConfig/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=       Cisco-CopyConfig
+PORTNAME=	Cisco-CopyConfig
 PORTVERSION=	1.4
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
diff --git a/net-mgmt/py-snmp_passpersist/Makefile b/net-mgmt/py-snmp_passpersist/Makefile
index a123b91bfadc..f48b2608d733 100644
--- a/net-mgmt/py-snmp_passpersist/Makefile
+++ b/net-mgmt/py-snmp_passpersist/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	snmp_passpersist
-PORTVERSION=    1.3.0
-CATEGORIES=     net-mgmt python
-PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
+PORTVERSION=	1.3.0
+CATEGORIES=	net-mgmt python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=     surajravi@gmail.com
+MAINTAINER=	surajravi@gmail.com
 COMMENT=	Python client library for Net-SNMP pass persist backend
 
 LICENSE=	GPLv3
diff --git a/net/aslookup/Makefile b/net/aslookup/Makefile
index 88142d5869f9..70770850b1b5 100644
--- a/net/aslookup/Makefile
+++ b/net/aslookup/Makefile
@@ -19,9 +19,9 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aslookup ${STAGEDIR}${PREFIX}/bin
-	@if [ ! -d ${STAGEDIR}${PREFIX}/share/doc/aslookup ]; then 	\
+	@if [ ! -d ${STAGEDIR}${PREFIX}/share/doc/aslookup ]; then \
 		${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/aslookup; fi
-	${INSTALL_DATA} ${WRKSRC}/readme-eng.txt ${WRKSRC}/readme-jp.txt   \
+	${INSTALL_DATA} ${WRKSRC}/readme-eng.txt ${WRKSRC}/readme-jp.txt \
 		${STAGEDIR}${PREFIX}/share/doc/aslookup
 
 .include <bsd.port.mk>
diff --git a/net/bwn-firmware-kmod/Makefile b/net/bwn-firmware-kmod/Makefile
index bcc746ffd866..6c5483e7e8ec 100644
--- a/net/bwn-firmware-kmod/Makefile
+++ b/net/bwn-firmware-kmod/Makefile
@@ -19,7 +19,7 @@ FIRMWARES=								\
 	ucode ucode5 ucode11 ucode13 ucode14 ucode15			\
 	pcm5 a0g1initvals5 a0g0initvals5				\
 	b0g0initvals5 b0g0initvals13 a0g1bsinitvals5 a0g0bsinitvals5	\
-	b0g0bsinitvals5 						\
+	b0g0bsinitvals5							\
 	lp0initvals13 lp0initvals14 lp0initvals15 lp0bsinitvals13	\
 	lp0bsinitvals14 lp0bsinitvals15					\
 	n0initvals11 n0bsinitvals11					\
@@ -28,7 +28,7 @@ FIRMWARES_LP=								\
 	ucode ucode5 ucode11 ucode13 ucode14 ucode15			\
 	pcm5 a0g1initvals5 a0g0initvals5				\
 	b0g0initvals5 b0g0initvals13 a0g1bsinitvals5 a0g0bsinitvals5	\
-	b0g0bsinitvals5 						\
+	b0g0bsinitvals5							\
 	lp0initvals13 lp0initvals14 lp0initvals15 lp0bsinitvals13	\
 	lp0bsinitvals14 lp0bsinitvals15					\
 	n0initvals11 n0bsinitvals11
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index d7ab2014b63d..0db0d5ef86b3 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -55,7 +55,7 @@ OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
 
 ALL_MODULES_DESC=	Build all modules
-X11_DESC=		graphics/ImageMagick[-nox11] dependency
+X11_DESC=	graphics/ImageMagick[-nox11] dependency
 8K_DESC=	8kHz Audio Files
 16K_DESC=	16kHz Audio Files
 32K_DESC=	32kHz Audio Files
@@ -75,8 +75,8 @@ ALL_MODULES_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 				libmemcached.so:databases/libmemcached \
 				libSoundTouch.so:audio/soundtouch \
 				libasound.so:audio/alsa-lib \
-	     			libportaudio.so:audio/portaudio \
-	      			libmp4v2.so:multimedia/mp4v2 \
+				libportaudio.so:audio/portaudio \
+				libmp4v2.so:multimedia/mp4v2 \
 				libshout.so:audio/libshout \
 				libmpg123.so:audio/mpg123 \
 				libmp3lame.so:audio/lame \
diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile
index cf8cc0ef0076..21fc7aa2d7e8 100644
--- a/net/glusterfs/Makefile
+++ b/net/glusterfs/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--enable-glupy \
 		--disable-georeplication \
 		ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
-		ac_cv_func_setfsuid=no 	ac_cv_func_fdatasync=no \
+		ac_cv_func_setfsuid=no ac_cv_func_fdatasync=no \
 		ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
 CPPFLAGS+=	-I"${LOCALBASE}/include"
 LDFLAGS+=	-L"${LOCALBASE}/lib" -largp
diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 862891c4fe00..eb64b0fc345e 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -69,7 +69,7 @@ SQLITE_CONFIGURE_ON=		--with-sqlite3-h="${LOCALBASE}/include" \
 
 MYSQL_USES=			mysql
 MYSQL_CONFIGURE_ENABLE=		mysql
-MYSQL_CONFIGURE_ON= 		--with-mysql-cfg="${LOCALBASE}/bin/mysql_config"
+MYSQL_CONFIGURE_ON=		--with-mysql-cfg="${LOCALBASE}/bin/mysql_config"
 
 JS_CONFIGURE_ENABLE=		libjs
 JS_CONFIGURE_ON=		--with-js-h="${LOCALBASE}/include/js-1.7" \
@@ -91,7 +91,7 @@ FFMPEGTHUMBNAILER_LIB_DEPENDS=		libffmpegthumbnailer.so:multimedia/ffmpegthumbna
 # CURL is only useful in combination with EXTERNAL_TRANSCODING
 CURL_IMPLIES=			EXTERNAL_TRANSCODING
 CURL_CONFIGURE_ENABLE=		curl
-CURL_CONFIGURE_ON= 		--with-curl-cfg="${LOCALBASE}/bin/curl-config"
+CURL_CONFIGURE_ON=		--with-curl-cfg="${LOCALBASE}/bin/curl-config"
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
 
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg
diff --git a/security/cisco-torch/Makefile b/security/cisco-torch/Makefile
index d7922bdf0d1e..ed098af1f377 100644
--- a/security/cisco-torch/Makefile
+++ b/security/cisco-torch/Makefile
@@ -33,8 +33,8 @@ FILELIST=	brutefile.txt \
 
 do-install:
 	${INSTALL_SCRIPT}   ${WRKSRC}/cisco-torch.pl ${STAGEDIR}${PREFIX}/bin/cisco-torch
-	${MKDIR} 	    ${STAGEDIR}${DATADIR}/include
-	${MKDIR} 	    ${STAGEDIR}${DATADIR}/tftproot
+	${MKDIR}	    ${STAGEDIR}${DATADIR}/include
+	${MKDIR}	    ${STAGEDIR}${DATADIR}/tftproot
 	${MKDIR}            ${STAGEDIR}${ETCDIR}
 .for i in ${FILELIST}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR}
diff --git a/security/dotdotpwn/Makefile b/security/dotdotpwn/Makefile
index 137b2c4d5d6f..ab4ab09cf24d 100644
--- a/security/dotdotpwn/Makefile
+++ b/security/dotdotpwn/Makefile
@@ -20,7 +20,7 @@ GH_ACCOUNT=	wireghoul
 OPTIONS_DEFINE=	DOCS NMAP
 OPTIONS_SUB=	yes
 NMAP_DESC=	ENABLE OS DETECTION FEATURE - REQUIRES NMAP
-OPTIONS_DEFAULT=	NMAP
+OPTIONS_DEFAULT=NMAP
 
 OSDETECTION_RUN_DEPENDS=	nmap:security/nmap
 
@@ -35,7 +35,7 @@ PORTDOCS=	README.txt  TODO.txt  CHANGELOG.txt  LICENSE.txt AUTHORS.txt EXAMPLES.
 
 do-install:
 	${INSTALL_SCRIPT}   ${WRKSRC}/dotdotpwn.pl ${STAGEDIR}${PREFIX}/bin/dotdotpwn
-	${MKDIR} 	    ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/DotDotPwn
+	${MKDIR}	    ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/DotDotPwn
 	${MKDIR}	    ${STAGEDIR}${DATADIR}/DotDotPwn
 	(cd ${WRKSRC}/DotDotPwn  && ${COPYTREE_SHARE} \*   ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/DotDotPwn)
 	${INSTALL_DATA} ${WRKSRC}/DotDotPwn/User-Agents.txt ${STAGEDIR}${DATADIR}
diff --git a/security/fakeident/Makefile b/security/fakeident/Makefile
index 6b45c658507c..954c851e34f7 100644
--- a/security/fakeident/Makefile
+++ b/security/fakeident/Makefile
@@ -6,8 +6,8 @@ PORTVERSION=	1.7
 PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	# empty
-DISTFILES=      # empty
-EXTRACT_ONLY=   # empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	dean@odyssey.apana.org.au
 COMMENT=	Tool that replies with a standard answer to incoming identd requests
diff --git a/security/highwayhash/Makefile b/security/highwayhash/Makefile
index 5fcaba8d12ea..4871fe2360ea 100644
--- a/security/highwayhash/Makefile
+++ b/security/highwayhash/Makefile
@@ -26,7 +26,7 @@ post-patch:
 		s|LIBDIR|XLIBDIR|; \
 		s| -O3||; \
 		s|install -m0755 high|${INSTALL_DATA} high|; \
-       		s|install -m0755 lib|${INSTALL_LIB} lib|' \
+		s|install -m0755 lib|${INSTALL_LIB} lib|' \
 		${WRKSRC}/Makefile
 
 post-install:
diff --git a/security/pixiewps/Makefile b/security/pixiewps/Makefile
index 36becde466f5..d4437d81fb48 100644
--- a/security/pixiewps/Makefile
+++ b/security/pixiewps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pixiewps
 PORTVERSION=	1.2.2
-DISTVERSIONPREFIX= v
+DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	franz@bett.ag
diff --git a/security/py-pymacaroons-pynacl/Makefile b/security/py-pymacaroons-pynacl/Makefile
index 05c11bcd570b..c2022d02ed9a 100644
--- a/security/py-pymacaroons-pynacl/Makefile
+++ b/security/py-pymacaroons-pynacl/Makefile
@@ -20,7 +20,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
-USES=           python
+USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
diff --git a/security/vuls/Makefile b/security/vuls/Makefile
index 338008083688..08af434bea9d 100644
--- a/security/vuls/Makefile
+++ b/security/vuls/Makefile
@@ -135,7 +135,7 @@ post-patch:
 do-build:
 	@cd ${GO_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} \
-	 	${GO_CMD} build -v -x -ldflags "-X main.version=${PORTVERSION}" \
+		${GO_CMD} build -v -x -ldflags "-X main.version=${PORTVERSION}" \
 		-o ${WRKSRC}/${PORTNAME}
 
 do-install:
diff --git a/sysutils/abduco/Makefile b/sysutils/abduco/Makefile
index cbe1f2ed8ac4..ec7d52e4f686 100644
--- a/sysutils/abduco/Makefile
+++ b/sysutils/abduco/Makefile
@@ -16,7 +16,7 @@ MAKE_ARGS=	CPPFLAGS="${CPPFLAGS}" STRIP="${STRIP_CMD}" \
 PLIST_FILES=	bin/abduco \
 		man/man1/abduco.1.gz
 
-MAKE_JOBS_UNSAFE= 	yes
+MAKE_JOBS_UNSAFE=	yes
 
 pre-everything::
 	@${ECHO_MSG} "You can build abduco with your own config.h using the ABDUCO_CONF knob:"
diff --git a/sysutils/goss/Makefile b/sysutils/goss/Makefile
index 6424315b26c0..776e8cb1f1d4 100644
--- a/sysutils/goss/Makefile
+++ b/sysutils/goss/Makefile
@@ -4,13 +4,13 @@ PORTNAME=		goss
 PORTVERSION=		0.3.4
 DISTVERSIONPREFIX=	v
 PORTREVISION=		1
-CATEGORIES=	 	sysutils
+CATEGORIES=		sysutils
 
-MAINTAINER=	 	englishm@llnw.com
+MAINTAINER=		englishm@llnw.com
 COMMENT=		Quick and Easy server validation
 
 LICENSE=		APACHE20
-LICENSE_FILE=	 	${WRKSRC}/LICENSE
+LICENSE_FILE=		${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=		go:lang/go
 
@@ -19,8 +19,8 @@ ONLY_FOR_ARCHS_REASON=	go-ps only supports amd64
 
 USE_RC_SUBR=		goss
 
-USE_GITHUB=	 	yes
-GH_ACCOUNT=	 	aelsabbahy
+USE_GITHUB=		yes
+GH_ACCOUNT=		aelsabbahy
 GH_SUBDIR=		src/github.com/aelsabbahy/${PORTNAME}
 GH_TUPLE=		achanda:go-sysctl:6be7678:achanda/src/github.com/achanda/go-sysctl \
 			aelsabbahy:go-ps:4433868:gops/src/github.com/aelsabbahy/go-ps \
diff --git a/sysutils/jtop/Makefile b/sysutils/jtop/Makefile
index 7fc9a5bab9fc..ed8d74dca423 100644
--- a/sysutils/jtop/Makefile
+++ b/sysutils/jtop/Makefile
@@ -14,6 +14,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
 PLIST_FILES=	bin/jtop man/man1/jtop.1.gz
-SHEBANG_FILES= 	jtop.pl
+SHEBANG_FILES=	jtop.pl
 
 .include <bsd.port.mk>
diff --git a/sysutils/p5-Giovanni/Makefile b/sysutils/p5-Giovanni/Makefile
index 152b1d1a2f54..100c97aa6711 100644
--- a/sysutils/p5-Giovanni/Makefile
+++ b/sysutils/p5-Giovanni/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dch@skunkwerks.at
 COMMENT=	PERL-based software deployment tool inspired by capistrano
 
-LICENSE=        ART10 GPLv1+
-LICENSE_COMB=   dual
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	\
 		p5-Config-GitLike>=0:devel/p5-Config-GitLike \
diff --git a/sysutils/qjail4/Makefile b/sysutils/qjail4/Makefile
index 4267f7ee420a..2cadc5eb72c2 100644
--- a/sysutils/qjail4/Makefile
+++ b/sysutils/qjail4/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	qjail
 PORTVERSION=	4.9
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}
-PKGNAMESUFFIX=  4
+PKGNAMESUFFIX=	4
 
 MAINTAINER=	qjail1@a1poweruser.com
 COMMENT=	Utility to quickly deploy and manage jails
diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
index 3e875954db1f..dce2938a0ffa 100644
--- a/textproc/refdb/Makefile
+++ b/textproc/refdb/Makefile
@@ -31,7 +31,7 @@ XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 OPTIONS_DEFINE=		DOCS CATALOG
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
-OPTIONS_EXCLUDE=	CATALOG 	# may not be implemented correctly
+OPTIONS_EXCLUDE=	CATALOG		# may not be implemented correctly
 CATALOG_DESC=		Install SGML catalog
 
 OPTIONS_DEFAULT=	PGSQL
diff --git a/textproc/sr-aspell/Makefile b/textproc/sr-aspell/Makefile
index f1715d62b974..bfe06d949cd1 100644
--- a/textproc/sr-aspell/Makefile
+++ b/textproc/sr-aspell/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	textproc
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Aspell Serbian dictionary
 
-DICT=	 	sr
+DICT=		sr
 
 .include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/textproc/te-aspell/Makefile b/textproc/te-aspell/Makefile
index 394c0108e96f..46df8a46b43c 100644
--- a/textproc/te-aspell/Makefile
+++ b/textproc/te-aspell/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	textproc
 MAINTAINER=	prudhvi-krishna-bsd@surapaneni.in
 COMMENT=	Aspell Telugu dictionary
 
-DICT=	 	te
+DICT=		te
 
 .include "${.CURDIR}/../../textproc/aspell/Makefile.inc"
 .include <bsd.port.post.mk>
diff --git a/www/bigbluebutton/Makefile b/www/bigbluebutton/Makefile
index 82786a834c80..ce5cb8bdcb7d 100644
--- a/www/bigbluebutton/Makefile
+++ b/www/bigbluebutton/Makefile
@@ -34,7 +34,7 @@ USE_JAVA=	yes
 JAVA_EXTRACT=	yes
 NO_BUILD=	yes
 DIST_SUBDIR=	${PORTNAME}
-USE_RC_SUBR=   	openoffice
+USE_RC_SUBR=	openoffice
 SOFFICEBIN?=	${PREFIX}/bin/openoffice-4.0.1
 RED5_HOME?=	${PREFIX}/red5
 RED5_LOGS?=	${RED5_HOME}/log
diff --git a/www/domoticz/Makefile b/www/domoticz/Makefile
index 4b1661cae4fa..337cdaefa6e7 100644
--- a/www/domoticz/Makefile
+++ b/www/domoticz/Makefile
@@ -69,9 +69,9 @@ LIB_DEPENDS+=	libmosquitto.so:net/mosquitto
 .endif
 
 .if ${PORT_OPTIONS:MSSQLITE}
-CMAKE_ARGS+= 	-DUSE_BUILTIN_SQLITE="YES"
+CMAKE_ARGS+=	-DUSE_BUILTIN_SQLITE="YES"
 .else
-CMAKE_ARGS+= 	-DUSE_BUILTIN_SQLITE="NO"
+CMAKE_ARGS+=	-DUSE_BUILTIN_SQLITE="NO"
 USES+=		sqlite
 .endif
 
diff --git a/www/go-fasthttp/Makefile b/www/go-fasthttp/Makefile
index e4780ec83480..3ebad20c003a 100644
--- a/www/go-fasthttp/Makefile
+++ b/www/go-fasthttp/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	fasthttp
 PORTVERSION=	20160617
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www net
-PKGNAMEPREFIX=  go-
+PKGNAMEPREFIX=	go-
 
 MAINTAINER=	guy.tabrar@me.com
 COMMENT=	Fast HTTP package for Go, tuned for high performance
@@ -17,9 +17,9 @@ BUILD_DEPENDS=	go-compress>=0:archivers/go-compress \
 		go-crc32>=0:devel/go-crc32
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GITHUB= 	yes
-GH_ACCOUNT= 	valyala
-USES= 		go
-GO_PKGNAME= 	github.com/valyala/fasthttp
+USE_GITHUB=	yes
+GH_ACCOUNT=	valyala
+USES=		go
+GO_PKGNAME=	github.com/valyala/fasthttp
 
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Plugin-SmartURI/Makefile b/www/p5-Catalyst-Plugin-SmartURI/Makefile
index 28d5d6f2e324..85b01b17bce9 100644
--- a/www/p5-Catalyst-Plugin-SmartURI/Makefile
+++ b/www/p5-Catalyst-Plugin-SmartURI/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	p5-Catalyst-Runtime>=0:www/p5-Catalyst-Runtime	\
 		p5-Class-C3-Componentised>=0:devel/p5-Class-C3-Componentised	\
 		p5-Class-Load>=0:devel/p5-Class-Load		\
-		p5-Moose>=0:devel/p5-Moose 				\
+		p5-Moose>=0:devel/p5-Moose			\
 		p5-URI-SmartURI>=0:net/p5-URI-SmartURI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/www/py-django-caching-app-plugins/Makefile b/www/py-django-caching-app-plugins/Makefile
index 5588e340c2b5..b8f8a7d545e8 100644
--- a/www/py-django-caching-app-plugins/Makefile
+++ b/www/py-django-caching-app-plugins/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	ports@caomhin.org
 COMMENT=	Django app for writing pluggable reusable django applications
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=   ${WRKSRC}/LICENSE.rst
+LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18
 
-USES=   python
-USE_PYTHON= distutils autoplist
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/x11-fm/sunflower/Makefile b/x11-fm/sunflower/Makefile
index 163f066d16e5..4fc555dd4ac7 100644
--- a/x11-fm/sunflower/Makefile
+++ b/x11-fm/sunflower/Makefile
@@ -1,35 +1,35 @@
 # $FreeBSD$
 
-PORTNAME=       sunflower
+PORTNAME=	sunflower
 DISTVERSION=	0.3-61
 PORTREVISION=	1
-CATEGORIES=     x11-fm python
+CATEGORIES=	x11-fm python
 MASTER_SITES=	http://sunflower-fm.org/pub/
 
-MAINTAINER=     bsd@abinet.ru
+MAINTAINER=	bsd@abinet.ru
 COMMENT=	Twin-panel file manager
 
-LICENSE=        GPLv3
+LICENSE=	GPLv3
 
-RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet \
 		${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1:devel/py-setproctitle \
 		${PYTHON_PKGNAMEPREFIX}dbus>=1.2.0:devel/py-dbus
 
-WRKSRC=         ${WRKDIR}/Sunflower
+WRKSRC=		${WRKDIR}/Sunflower
 
-USES=           desktop-file-utils gettext python:2.7 shebangfix tar:tgz
+USES=		desktop-file-utils gettext python:2.7 shebangfix tar:tgz
 USE_GNOME=	gtk20 pygtk2 pygobject
-NO_ARCH=        yes
+NO_ARCH=	yes
 INSTALLS_ICONS=	yes
 SHEBANG_FILES=	Sunflower.py
 
 OPTIONS_DEFINE=	VTE
-OPTIONS_DEFAULT=	VTE
+OPTIONS_DEFAULT=VTE
 
 VTE_DESC=	Use VTE terminal widget
-VTE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vte>0:x11-toolkits/py-vte
+VTE_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}vte>0:x11-toolkits/py-vte
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/Sunflower.py
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index a85bab226461..4c503573276b 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -15,7 +15,7 @@ USES=		perl5 gmake
 USE_PERL5=	build
 USE_XORG=	x11
 
-SUB_FILES= 	pkg-message
+SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile
diff --git a/x11/rofi/Makefile b/x11/rofi/Makefile
index 081b9c165090..9afe187ea7be 100644
--- a/x11/rofi/Makefile
+++ b/x11/rofi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Window switcher, run dialog and dmenu replacement
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS= 	checkmk:devel/check \
+BUILD_DEPENDS=	checkmk:devel/check \
 		${LOCALBASE}/bin/flex:textproc/flex
 LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
 		libxcb-ewmh.so:x11/xcb-util-wm \