Make portlint happier with my ports (reorder variables)

17 files changed, 49 insertions, 44 deletions

diff --git a/archivers/par2cmdline-tbb/Makefile b/archivers/par2cmdline-tbb/Makefile
index eb5114e165ed..dc50e9ccae82 100644
--- a/archivers/par2cmdline-tbb/Makefile
+++ b/archivers/par2cmdline-tbb/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Tools for using Parity v2 Archive files (tbb version)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtbb.so:devel/tbb
-
 ONLY_FOR_ARCHS=		amd64 i386
 
+LIB_DEPENDS=	libtbb.so:devel/tbb
+
 GNU_CONFIGURE=	yes
 USES=		autoreconf
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index c4e909a2bf15..51ddb6e3ce1a 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -23,17 +23,18 @@ LICENSE_NAME_SpecialAuth=	Special authorization from developer
 LICENSE_FILE_SpecialAuth=	${FILESDIR}/SpecialAuth.mbox
 LICENSE_PERMS_SpecialAuth=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LEGAL_TEXT=	Special authorization granted to distribute version 3.x under GPLv3
-
 NOT_FOR_ARCHS=		aarch64 mips mips64
 NOT_FOR_ARCHS_REASON=	fails to compile: error: Add your platform to the list
 
+LEGAL_TEXT=	Special authorization granted to distribute version 3.x under GPLv3
+
 NO_WRKSUBDIR=	yes
 
+USES=		dos2unix cmake zip
+
 USE_LDCONFIG=	yes
 USE_GCC=	any
 
-USES=		dos2unix cmake zip
 DOS2UNIX_REGEX=	.*\.(cpp|h|txt)
 
 # XXX Do not provide Samples for the following reason :
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 60205b1ed74a..f5a9a078a791 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -16,9 +16,9 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libosg.so:graphics/osg
 
+USES=		alias cmake compiler:c++11-lib cpe jpeg openal:al,alut tar:bzip2
 USE_XORG=	ice sm x11 xext xi xmu xt
 USE_GL=		gl glu glut
-USES=		alias cmake compiler:c++11-lib cpe jpeg openal:al,alut tar:bzip2
 
 .include <bsd.port.pre.mk>
 
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index 86a8038f1a0f..2cdf4c39371e 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -31,6 +31,8 @@ LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
 		libcurl.so:ftp/curl \
 		libgtest.so:devel/googletest
 
+USES=		cmake compiler:c++11-lib iconv openal pkgconfig
+
 USE_GITHUB=	yes
 GH_PROJECT=	dolphin
 
@@ -40,8 +42,6 @@ USE_SDL=	sdl2
 USE_WX=		3.0+
 USE_XORG=	ice sm x11 xext xi xrandr
 
-USES=		cmake compiler:c++11-lib iconv openal pkgconfig
-
 CMAKE_ARGS+=	-DTRY_X11:BOOL=ON \
 		-DUSE_UPNP:BOOL=ON \
 		-DDISABLE_WX:BOOL=OFF \
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index 0ed8320e3e48..247710b81d78 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -13,11 +13,14 @@ COMMENT=	Playstation (PSX) emulator
 
 LICENSE=	GPLv2
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 		libcdio.so:sysutils/libcdio
 
-ONLY_FOR_ARCHS=	i386 amd64
+USES=		autoreconf desktop-file-utils dos2unix iconv gmake libtool \
+		pkgconfig tar:bzip2
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -32,8 +35,6 @@ USE_XORG=	x11 xv xext xxf86vm xtst
 USE_SDL=	sdl
 USE_GL=	gl
 
-USES=		autoreconf desktop-file-utils dos2unix iconv gmake libtool \
-		pkgconfig tar:bzip2
 DOS2UNIX_REGEX=	.*\.(c|h|cpp|hpp|am)
 
 PORTDOCS=	ChangeLog README
diff --git a/games/blobby/Makefile b/games/blobby/Makefile
index 17c8ad4b700d..742eb577b245 100644
--- a/games/blobby/Makefile
+++ b/games/blobby/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Official continuation of the famous Blobby Volley 1.x game
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libphysfs.so:devel/physfs
-BUILD_DEPENDS=	zip:archivers/zip \
-		${LOCALBASE}/include/boost/crc.hpp:devel/boost-libs
-
 BROKEN_powerpc64=	fails to build: cc1plus: unrecognized command line option "-std=c++11"
 NOT_FOR_ARCHS=		aarch64
 NOT_FOR_ARCHS_REASON=	fails to compile: I can't tell what endian-ness to use for your architecture
 
+LIB_DEPENDS=	libphysfs.so:devel/physfs
+BUILD_DEPENDS=	zip:archivers/zip \
+		${LOCALBASE}/include/boost/crc.hpp:devel/boost-libs
+
 USES=		cmake dos2unix localbase:ldflags pkgconfig
 DOS2UNIX_REGEX=	.*\.(c|h|cpp)
 CMAKE_ARGS=	-DDATADIR:PATH="${DATADIR}"
diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile
index 2f53284d85e6..7ec7d148458d 100644
--- a/games/cosmosmash/Makefile
+++ b/games/cosmosmash/Makefile
@@ -18,9 +18,9 @@ LIB_DEPENDS=	libflatzebra-0.1.so:devel/flatzebra \
 		libmikmod.so:audio/libmikmod \
 		libaudiofile.so:audio/libaudiofile
 
+USES=		iconv pkgconfig desktop-file-utils
 USE_SDL=	sdl image mixer
 USE_XORG=	x11 xau xdmcp
-USES=		iconv pkgconfig desktop-file-utils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib `${SDL_CONFIG} --libs`
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index ac1fedc008b2..62314c729d68 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -12,6 +12,9 @@ COMMENT=	FlightGear scenery, textures, and aircraft models
 
 LICENSE=	GPLv2
 
+BROKEN_aarch64=		Fails to install: runaway process
+BROKEN_mips64=		Fails to install: runaway process
+
 NO_BUILD=	yes
 USES=		tar:bzip2
 WRKSRC=		${WRKDIR}/fgdata
@@ -20,9 +23,6 @@ DATADIR=	${PREFIX}/share/flightgear
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	%%DATADIR%%
 
-BROKEN_aarch64=		Fails to install: runaway process
-BROKEN_mips64=		Fails to install: runaway process
-
 post-patch:
 	@${RM} ${WRKSRC}/COPYING
 
diff --git a/games/flightgear-mb339-pan/Makefile b/games/flightgear-mb339-pan/Makefile
index 9aa76563fd4c..d1eb593f9ff1 100644
--- a/games/flightgear-mb339-pan/Makefile
+++ b/games/flightgear-mb339-pan/Makefile
@@ -11,12 +11,12 @@ DISTNAME=	mb339pan_${PORTVERSION}
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Simulation of the MB-339 PAN aerobatic jet
 
+BROKEN_powerpc64=	fails to build: runaway process
+
 RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:games/flightgear-data
 
 RESTRICTED=	Redistribution prohibited
 
-BROKEN_powerpc64=	fails to build: runaway process
-
 NO_BUILD=	yes
 USES=		zip
 WRKSRC=	${WRKDIR}/${PORTNAME}
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 4d71ee35b3e4..7e4904ba6ad1 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
 MAINTAINER=	martymac@FreeBSD.org
-COMMENT=	The FlightGear flight simulator
+COMMENT=	FlightGear flight simulator
 
 LICENSE=	GPLv2
 
@@ -27,11 +27,11 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \
 		${LOCALBASE}/lib/libSimGearCore.a:devel/simgear \
 		${LOCALBASE}/share/flightgear/version:games/flightgear-data
 
+USES=		alias cmake compiler cpe dos2unix jpeg openal:al,alut sqlite \
+		tar:bzip2
 USE_XORG=	ice sm x11 xext xft xi xinerama xmu xt
 USE_GL=		gl glew glu glut
 
-USES=		alias cmake compiler cpe dos2unix jpeg openal:al,alut sqlite \
-		tar:bzip2
 DOS2UNIX_REGEX=	.*\.(c|h|cxx|cpp|hxx|hpp)
 CMAKE_ARGS+=	-DENABLE_JS_SERVER:BOOL=ON \
 		-DSYSTEM_SQLITE:BOOL=ON \
diff --git a/games/jfsw/Makefile b/games/jfsw/Makefile
index 1cf0be56e38f..2bfcf2dbaf1e 100644
--- a/games/jfsw/Makefile
+++ b/games/jfsw/Makefile
@@ -17,6 +17,9 @@ LICENSE_PERMS_BuildLic=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-acc
 
 LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 
+USES=		alias dos2unix gmake pkgconfig:build
+DOS2UNIX_REGEX=	.*(\.(c|h)|Makefile)(\.deps)?
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonof
 GH_PROJECT=	jfbuild:build jfaudiolib:audio jfmact:mact
@@ -30,9 +33,6 @@ USE_GL=		gl
 USE_GNOME=	gtk20
 USE_SDL=	mixer sdl
 
-USES=		alias dos2unix gmake pkgconfig:build
-DOS2UNIX_REGEX=	.*(\.(c|h)|Makefile)(\.deps)?
-
 NO_CDROM=	Must be distributed only through the Internet and free of charge
 
 MAKE_ENV+=	DATADIR="${DATADIR}" \
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 597f29f10b25..6c8ef6a34785 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -22,12 +22,14 @@ LIB_DEPENDS=	libclanCore.so:devel/clanlib1 \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
+
+USES=		autoreconf gmake iconv jpeg pkgconfig python:2.7,run shebangfix
+SHEBANG_FILES=	openalchemist-config
+
 USE_GNOME=	pygtk2
 USE_XORG=	xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice
 USE_GL=		gl glu
 USE_SDL=	sdl gfx
-USES=		autoreconf gmake iconv jpeg pkgconfig python:2.7,run shebangfix
-SHEBANG_FILES=	openalchemist-config
 
 PORTDOCS=	AUTHORS ChangeLog README TODO
 
diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 1148d600bb1a..547144161afe 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Pencil - a traditional 2D animation software
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libming.so:graphics/ming \
-		libpng.so:graphics/png
-
 BROKEN_armv6=		fails to compile: no matching function for call to 'qMax'
 BROKEN_armv7=		fails to compile: no matching function for call to 'qMax'
 
+LIB_DEPENDS=	libming.so:graphics/ming \
+		libpng.so:graphics/png
+
 USES=		qmake zip
 USE_QT4=	gui opengl xml moc_build rcc_build
 USE_GL=		gl
diff --git a/multimedia/sms1xxx-kmod/Makefile b/multimedia/sms1xxx-kmod/Makefile
index 69f4e143a49d..4b8749534d88 100644
--- a/multimedia/sms1xxx-kmod/Makefile
+++ b/multimedia/sms1xxx-kmod/Makefile
@@ -15,6 +15,8 @@ COMMENT=	Native FreeBSD driver for Siano-based USB DVB devices
 
 LICENSE=	GPLv2
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 WRKSRC=	${WRKDIR}/siano-${PORTVERSION}
 
 NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
@@ -30,8 +32,6 @@ DEBUG_ALL_TARGET=	debug
 STELLAR_DESC=	Build Terratec Cinergy Piranha FW
 NOVA_DESC=	Build Hauppauge WinTV MiniStick FW
 
-ONLY_FOR_ARCHS=	amd64 i386
-
 SUB_FILES=	pkg-message
 
 PORTDOCS=	CHANGELOG README COPYING
diff --git a/net/grsync/Makefile b/net/grsync/Makefile
index c7f26f786ffa..635e4859d581 100644
--- a/net/grsync/Makefile
+++ b/net/grsync/Makefile
@@ -15,18 +15,18 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	rsync:net/rsync \
 		bash:shells/bash
 
-USE_GNOME=	gtk20 intltool
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--disable-unity
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 USES=		desktop-file-utils gettext gmake \
 		pkgconfig shared-mime-info shebangfix
+USE_GNOME=	gtk20 intltool
 SHEBANG_FILES=	src/grsync-batch
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-unity
 
 INSTALLS_ICONS=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index da772e01d1ad..60d4442a8b62 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -19,12 +19,13 @@ RUN_DEPENDS=	ldapadd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \
 		ldapmodrdn:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client \
 		ldappasswd:net/openldap${OPENLDAP_VER}${OPENLDAP_FLAVOUR}-client
 
+NO_ARCH=	yes
+
 OPTIONS_DEFINE=	SASL
 SASL_VARS=	OPENLDAP_FLAVOUR=-sasl WANT_OPENLDAP_SASL=yes
 
-NO_ARCH=	yes
-USE_OPENLDAP=	yes
 USES=		iconv tar:tgz
+USE_OPENLDAP=	yes
 LIBDIR=	${PREFIX}/lib/${PORTNAME}
 MAKE_ENV+=	MANDIR=${MANPREFIX}/man \
 		ETCDIR=${ETCDIR}
diff --git a/sysutils/backupchecker/Makefile b/sysutils/backupchecker/Makefile
index 0ab7835d89d5..3c68a715a267 100644
--- a/sysutils/backupchecker/Makefile
+++ b/sysutils/backupchecker/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Fully automated backup checker
 
 LICENSE=	GPLv3
 
-USE_GITHUB=	yes
-
 NO_ARCH=	yes
+
 USES=		python:3.3+
+USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils optsuffix
 
 PORTDOCS=	README.md