Fix whitespace issues (mixed tab/spaces, alignment) in a few ports.

This round is @FreeBSD.org residents except teams.

19 files changed, 71 insertions, 71 deletions

diff --git a/sysutils/cfengine-masterfiles311/Makefile b/sysutils/cfengine-masterfiles311/Makefile
index 381925312076..016b63230639 100644
--- a/sysutils/cfengine-masterfiles311/Makefile
+++ b/sysutils/cfengine-masterfiles311/Makefile
@@ -15,10 +15,10 @@ LICENSE=	GPLv3
 
 CPE_VENDOR=	gnu
 
-CONFLICTS=      cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[02-9]-*
+CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[02-9]-*
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	311
-CONFLICTS+=     cfengine-masterfiles-3.*
+CONFLICTS+=	cfengine-masterfiles-3.*
 .endif
 
 RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
diff --git a/sysutils/cfengine36/Makefile b/sysutils/cfengine36/Makefile
index 820f9332ee60..546ec9c18993 100644
--- a/sysutils/cfengine36/Makefile
+++ b/sysutils/cfengine36/Makefile
@@ -13,11 +13,11 @@ MAINTAINER=	cy@FreeBSD.org
 #		skreuzer@FreeBSD.org is also committer for this port
 COMMENT=	Systems administration tool for networks
 
-CONFLICTS=      cfengine-2* cfengine3[0-57-9]-* cfengine31[0-9]-*
+CONFLICTS=	cfengine-2* cfengine3[0-57-9]-* cfengine31[0-9]-*
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	36
 PORTEPOCH?=	2
-CONFLICTS+=     cfengine-3.*
+CONFLICTS+=	cfengine-3.*
 .endif
 
 LICENSE=	GPLv3
diff --git a/sysutils/cfengine38/Makefile b/sysutils/cfengine38/Makefile
index 50d06ae04b1c..37f9245a36eb 100644
--- a/sysutils/cfengine38/Makefile
+++ b/sysutils/cfengine38/Makefile
@@ -16,10 +16,10 @@ LICENSE=	GPLv3
 
 CPE_VENDOR=	gnu
 
-CONFLICTS=      cfengine-2* cfengine3[0-79]-* cfengine31[0-9]-*
+CONFLICTS=	cfengine-2* cfengine3[0-79]-* cfengine31[0-9]-*
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	38
-CONFLICTS+=     cfengine-3.*
+CONFLICTS+=	cfengine-3.*
 .endif
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 9e951acc2996..5374b9d72547 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	db2x_xsltproc:textproc/docbook2X \
 CONFLICTS?=	conky-awesome-[0-9]*
 SLAVEDIRS=	sysutils/conky-awesome
 
-USES=           cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \
+USES=		cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \
 		localbase lua:51 pkgconfig tar:bzip2
 CMAKE_ARGS+=	-DBUILD_PORT_MONITORS:BOOL=false \
 		-DBUILD_IBM:BOOL=false \
diff --git a/sysutils/istatserver/Makefile b/sysutils/istatserver/Makefile
index 0c65e2c7f6cf..c3b83de1052c 100644
--- a/sysutils/istatserver/Makefile
+++ b/sysutils/istatserver/Makefile
@@ -31,9 +31,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/resource/istatserver_generated.conf \
 	${STAGEDIR}${PREFIX}/etc/istatserver/istatserver_generated.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/resource/istatserver.1 \
-	 		${STAGEDIR}${MANPREFIX}/man/man1
+			${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/resource/istatserver.conf.5 \
-	 		${STAGEDIR}${MANPREFIX}/man/man5
+			${STAGEDIR}${MANPREFIX}/man/man5
 	@${ECHO_CMD} '@postexec ${CHOWN} -R ${USERS}:${GROUPS} %D/etc/istatserver' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/sysutils/patchelf/Makefile b/sysutils/patchelf/Makefile
index ae5764fa7186..33bcd499b383 100644
--- a/sysutils/patchelf/Makefile
+++ b/sysutils/patchelf/Makefile
@@ -8,15 +8,15 @@ CATEGORIES=	sysutils
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Utility to modify the dynamic linker
 
-LICENSE=       GPLv3+
-LICENSE_FILE=  ${WRKSRC}/COPYING
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=          autoreconf gmake
-GNU_CONFIGURE= yes
+USES=		autoreconf gmake
+GNU_CONFIGURE=	yes
 
-USE_GITHUB=    yes
-GH_ACCOUNT=    NixOS
-GH_PROJECT=    patchelf
+USE_GITHUB=	yes
+GH_ACCOUNT=	NixOS
+GH_PROJECT=	patchelf
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 52eddca972db..954ea2326f2b 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -86,8 +86,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure
 
 # Bug 191029:	Users can choose whether to use sockets or named pipes.
-# 		Choose sockets if you don't know what the difference is.
-# 		Choose named pipes if your environment is heterogeneous,
+#		Choose sockets if you don't know what the difference is.
+#		Choose named pipes if your environment is heterogeneous,
 #		using both screen 4.0.3 and 4.2.1.
 # Bug 191017
 post-configure-NAMED_PIPES-on:
diff --git a/sysutils/syslog-ng310/Makefile b/sysutils/syslog-ng310/Makefile
index 4b61fbea7512..4fc2d0c793d3 100644
--- a/sysutils/syslog-ng310/Makefile
+++ b/sysutils/syslog-ng310/Makefile
@@ -99,12 +99,12 @@ MONGO_PLIST_FILES=		lib/syslog-ng/libafmongodb.so
 
 JSON_CONFIGURE_ENABLE=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
-JSON_PLIST_FILES= 		lib/syslog-ng/libjson-plugin.so \
+JSON_PLIST_FILES=		lib/syslog-ng/libjson-plugin.so \
 				share/syslog-ng/include/scl/cim/template.conf
 
 JAVA_CONFIGURE_ENABLE=		java
 JAVA_USE_JAVA=			yes
-JAVA_PLIST_FILES= 		lib/syslog-ng/libmod-java.so \
+JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
@@ -137,11 +137,11 @@ JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-1.2.16.jar \
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_CONFIGURE_WITH=		python=2.7
 PYTHON_USES=			python:2.7
-PYTHON_PLIST_FILES= 		lib/syslog-ng/libmod-python.so
+PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so
 
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
-CURL_PLIST_FILES= 		lib/syslog-ng/libhttp.so
+CURL_PLIST_FILES=		lib/syslog-ng/libhttp.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/syslog-ng311/Makefile b/sysutils/syslog-ng311/Makefile
index 60acfa533443..b7dc9818b908 100644
--- a/sysutils/syslog-ng311/Makefile
+++ b/sysutils/syslog-ng311/Makefile
@@ -106,12 +106,12 @@ MONGO_PLIST_FILES=		lib/syslog-ng/libafmongodb.so
 
 JSON_CONFIGURE_ENABLE=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
-JSON_PLIST_FILES= 		lib/syslog-ng/libjson-plugin.so \
+JSON_PLIST_FILES=		lib/syslog-ng/libjson-plugin.so \
 				share/syslog-ng/include/scl/cim/template.conf
 
 JAVA_CONFIGURE_ENABLE=		java
 JAVA_USE_JAVA=			yes
-JAVA_PLIST_FILES= 		lib/syslog-ng/libmod-java.so \
+JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
@@ -144,11 +144,11 @@ JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-1.2.16.jar \
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_CONFIGURE_WITH=		python=2.7
 PYTHON_USES=			python:2.7
-PYTHON_PLIST_FILES= 		lib/syslog-ng/libmod-python.so
+PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so
 
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
-CURL_PLIST_FILES= 		lib/syslog-ng/libhttp.so
+CURL_PLIST_FILES=		lib/syslog-ng/libhttp.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/syslog-ng312/Makefile b/sysutils/syslog-ng312/Makefile
index d5235adcf314..513e943953b4 100644
--- a/sysutils/syslog-ng312/Makefile
+++ b/sysutils/syslog-ng312/Makefile
@@ -102,12 +102,12 @@ MONGO_PLIST_FILES=		lib/syslog-ng/libafmongodb.so
 
 JSON_CONFIGURE_ENABLE=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
-JSON_PLIST_FILES= 		lib/syslog-ng/libjson-plugin.so \
+JSON_PLIST_FILES=		lib/syslog-ng/libjson-plugin.so \
 				share/syslog-ng/include/scl/cim/template.conf
 
 JAVA_CONFIGURE_ENABLE=		java
 JAVA_USE_JAVA=			yes
-JAVA_PLIST_FILES= 		lib/syslog-ng/libmod-java.so \
+JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
@@ -140,11 +140,11 @@ JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-1.2.16.jar \
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_CONFIGURE_WITH=		python=2.7
 PYTHON_USES=			python:2.7
-PYTHON_PLIST_FILES= 		lib/syslog-ng/libmod-python.so
+PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so
 
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
-CURL_PLIST_FILES= 		lib/syslog-ng/libhttp.so
+CURL_PLIST_FILES=		lib/syslog-ng/libhttp.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/syslog-ng36/Makefile b/sysutils/syslog-ng36/Makefile
index da46443840f9..e05780d63169 100644
--- a/sysutils/syslog-ng36/Makefile
+++ b/sysutils/syslog-ng36/Makefile
@@ -120,7 +120,7 @@ CONFIGURE_ARGS+=	--disable-sql
 .if ${PORT_OPTIONS:MJSON}
 LIB_DEPENDS+=		libjson-c.so:devel/json-c
 CONFIGURE_ARGS+=	--enable-json
-PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.so
+PLIST_FILES+=		lib/syslog-ng/libjson-plugin.so
 .else
 CONFIGURE_ARGS+=        --disable-json
 .endif
diff --git a/sysutils/syslog-ng37/Makefile b/sysutils/syslog-ng37/Makefile
index ed46689884b9..14c3e439a1b3 100644
--- a/sysutils/syslog-ng37/Makefile
+++ b/sysutils/syslog-ng37/Makefile
@@ -95,28 +95,28 @@ MONGO_PLIST_FILES=		lib/syslog-ng/libafmongodb.so
 
 JSON_CONFIGURE_ENABLE=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
-JSON_PLIST_FILES= 		lib/syslog-ng/libjson-plugin.so
+JSON_PLIST_FILES=		lib/syslog-ng/libjson-plugin.so
 
 JAVA_CONFIGURE_ENABLE=		java
 JAVA_BROKEN=			Unsupported maven downloads.
 JAVA_USE_JAVA=			yes
 JAVA_BUILD_DEPENDS=		gradle:devel/gradle
 JAVA_BUILD_DEPENDS=		bash:shells/bash
-JAVA_PLIST_FILES= 		lib/syslog-ng/libmod-java.so \
-			lib/syslog-ng/java-modules/syslog-ng-core.jar \
-			lib/syslog-ng/java-modules/log4j-1.2.16.jar \
-			lib/syslog-ng/java-modules/elastic.jar \
-			lib/syslog-ng/java-modules/http.jar \
-			lib/syslog-ng/java-modules/kafka.jar \
-			lib/syslog-ng/java-modules/java-modules.jar \
-			lib/syslog-ng/java-modules/hdfs.jar \
-			lib/syslog-ng/java-modules/syslog-ng-common.jar \
-			lib/syslog-ng/java-modules/dummy.jar
+JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
+				lib/syslog-ng/java-modules/syslog-ng-core.jar \
+				lib/syslog-ng/java-modules/log4j-1.2.16.jar \
+				lib/syslog-ng/java-modules/elastic.jar \
+				lib/syslog-ng/java-modules/http.jar \
+				lib/syslog-ng/java-modules/kafka.jar \
+				lib/syslog-ng/java-modules/java-modules.jar \
+				lib/syslog-ng/java-modules/hdfs.jar \
+				lib/syslog-ng/java-modules/syslog-ng-common.jar \
+				lib/syslog-ng/java-modules/dummy.jar
 
 PYTHON_CONFIGURE_ON=		--enable-python --with-python=2.7
 PYTHON_CONFIGURE_OFF=		--disable-python
 PYTHON_USES=			python:2.7
-PYTHON_PLIST_FILES= 		lib/syslog-ng/libmod-python.so
+PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/syslog-ng39/Makefile b/sysutils/syslog-ng39/Makefile
index f97d3ef6aa47..427d6eb83c29 100644
--- a/sysutils/syslog-ng39/Makefile
+++ b/sysutils/syslog-ng39/Makefile
@@ -95,12 +95,12 @@ MONGO_PLIST_FILES=		lib/syslog-ng/libafmongodb.so
 
 JSON_CONFIGURE_ENABLE=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
-JSON_PLIST_FILES= 		lib/syslog-ng/libjson-plugin.so \
+JSON_PLIST_FILES=		lib/syslog-ng/libjson-plugin.so \
 				share/syslog-ng/include/scl/cim/template.conf
 
 JAVA_CONFIGURE_ENABLE=		java
 JAVA_USE_JAVA=			yes
-JAVA_PLIST_FILES= 		lib/syslog-ng/libmod-java.so \
+JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
@@ -134,11 +134,11 @@ JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-1.2.16.jar \
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_CONFIGURE_WITH=		python=2.7
 PYTHON_USES=			python:2.7
-PYTHON_PLIST_FILES= 		lib/syslog-ng/libmod-python.so
+PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so
 
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
-CURL_PLIST_FILES= 		lib/syslog-ng/libcurl.so
+CURL_PLIST_FILES=		lib/syslog-ng/libcurl.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile
index f51f7e21bb88..195798e0af78 100644
--- a/sysutils/u-boot-master/Makefile
+++ b/sysutils/u-boot-master/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
-DISTVERSIONPREFIX= ports-v
+DISTVERSIONPREFIX=	ports-v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 
@@ -96,9 +96,9 @@ UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}}
 
 # Each u-boot family has different files to include, bring them in.
 .for i in ${UBOOT_PLIST}
-PLIST_FILES+= ${UBOOT_DIR}/${i}
+PLIST_FILES+=	${UBOOT_DIR}/${i}
 .endfor
-PLIST_FILES+= ${UBOOT_DIR}/README
+PLIST_FILES+=	${UBOOT_DIR}/README
 
 do-configure:
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
diff --git a/sysutils/u-boot-nanopi-m1plus/Makefile b/sysutils/u-boot-nanopi-m1plus/Makefile
index 888b5c50bda1..285dcdad2ed7 100644
--- a/sysutils/u-boot-nanopi-m1plus/Makefile
+++ b/sysutils/u-boot-nanopi-m1plus/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-MAINTAINER=    manu@FreeBSD.org
-MASTERDIR=     ${.CURDIR}/../u-boot-master
+MAINTAINER=	manu@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-MODEL=         nanopi_m1plus
-BOARD_CONFIG=  nanopi_m1_plus_defconfig
-FAMILY=                allwinner
+MODEL=		nanopi_m1plus
+BOARD_CONFIG=	nanopi_m1_plus_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-nanopi-neo-air/Makefile b/sysutils/u-boot-nanopi-neo-air/Makefile
index e6b964a441b0..bf0d5628d38e 100644
--- a/sysutils/u-boot-nanopi-neo-air/Makefile
+++ b/sysutils/u-boot-nanopi-neo-air/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-MAINTAINER=    manu@FreeBSD.org
-MASTERDIR=     ${.CURDIR}/../u-boot-master
+MAINTAINER=	manu@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-MODEL=         nanopi_neo_air
-BOARD_CONFIG=  nanopi_neo_air_defconfig
-FAMILY=                allwinner
+MODEL=		nanopi_neo_air
+BOARD_CONFIG=	nanopi_neo_air_defconfig
+FAMILY=		allwinner
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-zedboard/Makefile b/sysutils/u-boot-zedboard/Makefile
index fc289df7151a..7ca568b49ebd 100644
--- a/sysutils/u-boot-zedboard/Makefile
+++ b/sysutils/u-boot-zedboard/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-MAINTAINER=     imp@FreeBSD.org
-MASTERDIR=      ${.CURDIR}/../u-boot-master
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-MODEL=          zedboard
-BOARD_CONFIG=   zynq_zed_defconfig
-FAMILY=         zynq_7000
+MODEL=		zedboard
+BOARD_CONFIG=	zynq_zed_defconfig
+FAMILY=		zynq_7000
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/u-boot-zybo/Makefile b/sysutils/u-boot-zybo/Makefile
index ef61d1a0b253..082c1707a859 100644
--- a/sysutils/u-boot-zybo/Makefile
+++ b/sysutils/u-boot-zybo/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-MAINTAINER=     imp@FreeBSD.org
-MASTERDIR=      ${.CURDIR}/../u-boot-master
+MAINTAINER=	imp@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../u-boot-master
 
-MODEL=          zybo
-BOARD_CONFIG=   zynq_zybo_defconfig
-FAMILY=         zynq_7000
+MODEL=		zybo
+BOARD_CONFIG=	zynq_zybo_defconfig
+FAMILY=		zynq_7000
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile
index 901823e04b5f..52ce43c51ccf 100644
--- a/sysutils/xen-tools/Makefile
+++ b/sysutils/xen-tools/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	xen
 PKGNAMESUFFIX=	-tools
 PORTVERSION=	4.7.2
-PORTREVISION=   2
+PORTREVISION=	2
 CATEGORIES=	sysutils emulators
 MASTER_SITES=	http://downloads.xenproject.org/release/xen/${PORTVERSION}/