diff --git a/databases/p5-Bucardo/Makefile b/databases/p5-Bucardo/Makefile
index 90ee5ad69624..e399a0e79c3c 100644
--- a/databases/p5-Bucardo/Makefile
+++ b/databases/p5-Bucardo/Makefile
@@ -3,7 +3,8 @@
 PORTNAME=	Bucardo
 PORTVERSION=	5.6.0
 CATEGORIES=	databases perl5
-MASTER_SITES=	http://bucardo.org/downloads/ LOCAL/mat/${PORTNAME}
+MASTER_SITES=	http://bucardo.org/downloads/ \
+		LOCAL/mat/${PORTNAME}
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
@@ -13,13 +14,13 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DBI>=1.51:databases/p5-DBI \
+RUN_DEPENDS=	p5-boolean>=0:devel/p5-boolean \
 		p5-DBD-Pg>=2.0:databases/p5-DBD-Pg \
-		p5-Encode-Locale>=0:converters/p5-Encode-Locale \
-		p5-boolean>=0:devel/p5-boolean \
-		p5-DBIx-Safe>=1.2.4:databases/p5-DBIx-Safe
+		p5-DBI>=1.51:databases/p5-DBI \
+		p5-DBIx-Safe>=1.2.4:databases/p5-DBIx-Safe \
+		p5-Encode-Locale>=0:converters/p5-Encode-Locale
 
-USES=	perl5
+USES=		perl5
 USE_PERL5=	configure
 USE_RC_SUBR=	bucardo
 
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index 40a456ae1a81..7fe426c549f7 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitolite
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
 DISTVERSION=	3.6.12
 PORTEPOCH=	1
 CATEGORIES=	devel
@@ -16,27 +16,28 @@ RUN_DEPENDS=	git>=0:devel/git \
 		p5-JSON>=0:converters/p5-JSON
 
 USES=		cpe perl5 shebangfix
+CPE_VENDOR=	sitaram_chamarty
 USE_GITHUB=	yes
 GH_ACCOUNT=	sitaramc
 
-CONFLICTS=	gitolite-[^3]*
-
-CPE_VENDOR=	sitaram_chamarty
-NO_ARCH=	yes
-
 SHEBANG_REGEX=	.*
 bash_CMD=	/bin/sh
 
+CONFLICTS=	gitolite-[^3]*
+
+NO_ARCH=	yes
+
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	GITUSER DOCS CONTRIB
+OPTIONS_DEFINE=		CONTRIB DOCS GITUSER
 OPTIONS_DEFAULT=	CONTRIB
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 CONTRIB_DESC=	Install additionnal contrib files
 GITUSER_DESC=	Create git user as gitolite provider
 
-GITUSER_VARS=	USERS=git GROUPS=git
+GITUSER_VARS=	GROUPS=git \
+		USERS=git
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,#!/usr/bin/perl,#!${PERL},' \
@@ -56,14 +57,14 @@ do-install:
 	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/)
 	${RLN} ${STAGEDIR}${PREFIX}/libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite
 
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
-
 do-install-CONTRIB-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${PREFIX}/share/vim
 	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${MV} ${STAGEDIR}${DATADIR}/vim ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/mail/bulk_mailer/Makefile b/mail/bulk_mailer/Makefile
index 5576730d05be..c355c2144e2f 100644
--- a/mail/bulk_mailer/Makefile
+++ b/mail/bulk_mailer/Makefile
@@ -11,15 +11,18 @@ MASTER_SITES=	ftp://ftp.cs.utk.edu/pub/moore/bulk_mailer/ \
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Speeds delivery to mailing lists by sorting & batching addresses
 
-GNU_CONFIGURE=	YES
-OPTIONS_DEFINE=	DOCS
 LICENSE=	GPLv3
 
+GNU_CONFIGURE=	YES
+
 ALL_TARGET=	bulk_mailer
 
-PLIST_FILES=	bin/bulk_mailer man/man1/bulk_mailer.1.gz
+PLIST_FILES=	bin/bulk_mailer \
+		man/man1/bulk_mailer.1.gz
 PORTDOCS=	*
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${STAGEDIR}${PREFIX}/man/man1
diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index a6e13911f1d3..17146b3a6905 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -14,34 +14,36 @@ COMMENT=	Policyd v2 is a multi-platform policy server for popular MTAs
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Net-Server>=0:net/p5-Net-Server \
-		gsed:textproc/gsed \
-		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
+RUN_DEPENDS=	gsed:textproc/gsed \
+		p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap \
 		p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
-		p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap
+		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
+		p5-Net-Server>=0:net/p5-Net-Server
 
 USES=		perl5 shebangfix tar:xz
-NO_BUILD=	yes
 USE_RC_SUBR=	policyd2
-bash_CMD=	/bin/sh
 SHEBANG_FILES=	cbpadmin \
 		cbpolicyd \
 		database/convert-tsql \
 		database/whitelists/parse*
+bash_CMD=	/bin/sh
 
 WWWDIR=		${PREFIX}/www/policyd
+
+NO_BUILD=	yes
+
 PORTDOCS=	AUTHORS ChangeLog INSTALL TODO WISHLIST
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE WEBUI DOCS
-OPTIONS_DEFAULT=MYSQL WEBUI
-MYSQL_DESC=	Add a dependency on DBD::mysql
-PGSQL_DESC=	Add a dependency on DBD::Pg
-SQLITE_DESC=	Add a dependency on DBD:SQLite
-WEBUI_DESC=	Add a dependency on the corresponding PHP pdo driver
+OPTIONS_DEFINE=		DOCS MYSQL PGSQL SQLITE WEBUI
+OPTIONS_DEFAULT=	MYSQL WEBUI
+MYSQL_DESC=		Add a dependency on DBD::mysql
+PGSQL_DESC=		Add a dependency on DBD::Pg
+SQLITE_DESC=		Add a dependency on DBD:SQLite
+WEBUI_DESC=		Add a dependency on the corresponding PHP pdo driver
 
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
-SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
+SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 .include <bsd.port.options.mk>
 
diff --git a/net-mgmt/lg/Makefile b/net-mgmt/lg/Makefile
index 1d6584552e7b..736184b349d0 100644
--- a/net-mgmt/lg/Makefile
+++ b/net-mgmt/lg/Makefile
@@ -3,8 +3,9 @@
 PORTNAME=	lg
 PORTVERSION=	1.9.s20140622
 PORTREVISION=	1
-MASTER_SITES=	LOCAL/mat/lg GH
 CATEGORIES=	net-mgmt perl5
+MASTER_SITES=	LOCAL/mat/lg \
+		GH
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Looking Glass written in Perl as a CGI script
@@ -12,18 +13,19 @@ COMMENT=	Looking Glass written in Perl as a CGI script
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	DOCS
+USES=		perl5 shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cougar
 GH_TAGNAME=	0d53e4b
 
-USES=		perl5 shebangfix
-SHEBANG_FILES=	lg.cgi makeaslist.pl makedb.pl
 USE_PERL5=	run
+SHEBANG_FILES=	lg.cgi makeaslist.pl makedb.pl
 
-NO_BUILD=	yes
 NO_ARCH=	yes
+NO_BUILD=	yes
+
+OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/net/rubygem-epp-client-afnic/Makefile b/net/rubygem-epp-client-afnic/Makefile
index 3204ec64c2a9..17716f9bd634 100644
--- a/net/rubygem-epp-client-afnic/Makefile
+++ b/net/rubygem-epp-client-afnic/Makefile
@@ -11,12 +11,11 @@ COMMENT=	AFNIC EPP client library
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
-		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri \
 		rubygem-epp-client-base=${PORTVERSION}:net/rubygem-epp-client-base \
 		rubygem-epp-client-rgp=${PORTVERSION}:net/rubygem-epp-client-rgp \
 		rubygem-epp-client-secdns=${PORTVERSION}:net/rubygem-epp-client-secdns \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-epp-client-base/Makefile b/net/rubygem-epp-client-base/Makefile
index 99f02615a211..0b3f007e045e 100644
--- a/net/rubygem-epp-client-base/Makefile
+++ b/net/rubygem-epp-client-base/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MIT
 RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-epp-client-rgp/Makefile b/net/rubygem-epp-client-rgp/Makefile
index 06ebfb9a0d6c..081fbd72e206 100644
--- a/net/rubygem-epp-client-rgp/Makefile
+++ b/net/rubygem-epp-client-rgp/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MIT
 RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-epp-client-secdns/Makefile b/net/rubygem-epp-client-secdns/Makefile
index 91d524db63a8..b1b2ab8c324d 100644
--- a/net/rubygem-epp-client-secdns/Makefile
+++ b/net/rubygem-epp-client-secdns/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MIT
 RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-epp-client-smallregistry/Makefile b/net/rubygem-epp-client-smallregistry/Makefile
index 2f74caa8c419..1b54c3b63da3 100644
--- a/net/rubygem-epp-client-smallregistry/Makefile
+++ b/net/rubygem-epp-client-smallregistry/Makefile
@@ -11,11 +11,10 @@ COMMENT=	Smallregistry EPP client library
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
-		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri \
 		rubygem-epp-client-base=${PORTVERSION}:net/rubygem-epp-client-base \
 		rubygem-epp-client-secdns=${PORTVERSION}:net/rubygem-epp-client-secdns \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index c243351c6911..ef11828a681f 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -5,7 +5,8 @@ PORTNAME=	vtun
 PORTVERSION=	3.0.4
 PORTREVISION=	8
 CATEGORIES=	net
-MASTER_SITES=	SF LOCAL/mat/vtun
+MASTER_SITES=	SF \
+		LOCAL/mat/vtun
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
@@ -19,17 +20,17 @@ USE_RC_SUBR=	vtunclient vtund
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--localstatedir=/var \
-		--with-ssl-headers=${OPENSSLINC} \
-		--with-ssl-lib=${OPENSSLLIB} \
 		--with-lzo-headers=${LOCALBASE}/include/lzo \
-		--with-lzo-lib=${LOCALBASE}/lib
+		--with-lzo-lib=${LOCALBASE}/lib \
+		--with-ssl-headers=${OPENSSLINC} \
+		--with-ssl-lib=${OPENSSLLIB}
 CONFIGURE_ENV=	YACC=${YACC}
 
-CFLAGS+=	-ansi -Wno-pointer-sign
-
 ALL_TARGET=	vtund
 
-DOCS=		ChangeLog Credits FAQ README README.LZO README.Setup \
+CFLAGS+=	-ansi -Wno-pointer-sign
+
+PORTDOCS=	ChangeLog Credits FAQ README README.LZO README.Setup \
 		README.Shaper TODO
 
 OPTIONS_DEFINE=	DOCS
@@ -48,9 +49,11 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vtund
 	${INSTALL_DATA} ${WRKSRC}/vtund.conf ${STAGEDIR}${PREFIX}/etc/vtund.conf.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for doc in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
-.endfor
 	${RLN} ${STAGEDIR}${PREFIX}/man/man8/vtund.8 ${STAGEDIR}${PREFIX}/man/man1/vtun.1
 
+post-install-DOCS-on:
+.for doc in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/net/vtun/pkg-plist b/net/vtun/pkg-plist
index 7b56a84e5c40..72f0a45235b0 100644
--- a/net/vtun/pkg-plist
+++ b/net/vtun/pkg-plist
@@ -4,14 +4,6 @@ man/man5/vtund.conf.5.gz
 man/man8/vtund.8.gz
 man/man8/vtun.8.gz
 man/man1/vtun.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/Credits
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.LZO
-%%PORTDOCS%%%%DOCSDIR%%/README.Setup
-%%PORTDOCS%%%%DOCSDIR%%/README.Shaper
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 @dir /var/log/vtund
 @dir /var/lock/vtund
 @dir /var/lock
diff --git a/security/py-acme-tiny/Makefile b/security/py-acme-tiny/Makefile
index d0c764253f3f..39d98b13859d 100644
--- a/security/py-acme-tiny/Makefile
+++ b/security/py-acme-tiny/Makefile
@@ -11,21 +11,22 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python shebangfix ssl
-SHEBANG_FILES=	acme_tiny.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	diafygi
 
-NO_BUILD=	yes
+SHEBANG_FILES=	acme_tiny.py
 
 NO_ARCH=	yes
+NO_BUILD=	yes
 
 PLIST_FILES=	bin/acme_tiny
 
+PORTDOCS=	README.md
+
 OPTIONS_DEFINE=	DOCS
 
 DOCS_SUB_FILES=	pkg-message
-PORTDOCS=	README.md
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/acme_tiny.py ${STAGEDIR}${PREFIX}/bin/acme_tiny
diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile
index a0078b03ceba..e9eb0d109b40 100644
--- a/sysutils/munin-common/Makefile
+++ b/sysutils/munin-common/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	p5-Module-Build>=0:devel/p5-Module-Build \
 		p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 RUN_DEPENDS=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 
-USES=		gmake perl5 cpe
+USES=		cpe gmake perl5
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
diff --git a/sysutils/munin-contrib/Makefile b/sysutils/munin-contrib/Makefile
index fdc746605263..9d926fcbb57e 100644
--- a/sysutils/munin-contrib/Makefile
+++ b/sysutils/munin-contrib/Makefile
@@ -13,23 +13,25 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	munin-node>=0:sysutils/munin-node
 
-USES=	shebangfix uniquefiles:dirs python:env
-SHEBANG_REGEX=	./(${EXAMPLES_DIRS:ts|})/.*
-SHEBANG_LANG=	python3 expect gawk zsh
-ruby_OLD_CMD=	/opt/csw/bin/ruby
-zsh_CMD=	${LOCALBASE}/bin/zsh
-python3_CMD=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}
+USES=		python:env shebangfix uniquefiles:dirs
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	munin-monitoring
 GH_TAGNAME=	33270dd
 GH_TUPLE=	shuque:bind9stats:a920ded:bind9stats
 
-NO_BUILD=	yes
-NO_ARCH=	yes
+SHEBANG_REGEX=	./(${EXAMPLES_DIRS:ts|})/.*
+SHEBANG_LANG=	expect gawk python3 zsh
+python3_CMD=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}
+zsh_CMD=	${LOCALBASE}/bin/zsh
+ruby_OLD_CMD=	/opt/csw/bin/ruby
 
 # Most of the installed files are scripts, so give them a "correct" mode.
 BINMODE=	755
 
+NO_ARCH=	yes
+NO_BUILD=	yes
+
 SUB_FILES=	pkg-message
 
 EXAMPLES_DIRS=	plugins samples templates tools
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 7fc7d905dbe6..7bf8791d6621 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -10,22 +10,23 @@ PKGNAMESUFFIX=	-master
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Collector part of Munin
 
-BUILD_DEPENDS=	p5-Module-Build>=0:devel/p5-Module-Build \
-		munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
-		rrdtool>=0:databases/rrdtool \
+BUILD_DEPENDS=	munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
 		p5-CGI>=0:www/p5-CGI \
 		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
 		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
 		p5-HTML-Template>=0:www/p5-HTML-Template \
 		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
 		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Module-Build>=0:devel/p5-Module-Build \
 		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
-		p5-Params-Validate>=0:devel/p5-Params-Validate
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		rrdtool>=0:databases/rrdtool
 RUN_DEPENDS=	munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
-		rrdtool>=0:databases/rrdtool \
-		p5-CGI>=0:www/p5-CGI \
 		p5-CGI-Fast>=0:www/p5-CGI-Fast \
+		p5-CGI>=0:www/p5-CGI \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
 		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
+		p5-FCGI>=0:www/p5-FCGI \
 		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
 		p5-HTML-Template>=0:www/p5-HTML-Template \
 		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
@@ -33,22 +34,23 @@ RUN_DEPENDS=	munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
 		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
 		p5-Params-Validate>=0:devel/p5-Params-Validate \
 		p5-URI>=0:net/p5-URI \
-		p5-Date-Manip>=0:devel/p5-Date-Manip \
-		p5-FCGI>=0:www/p5-FCGI
+		rrdtool>=0:databases/rrdtool
 
-USES=		gmake perl5 cpe
+USES=		cpe gmake perl5
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
 ALL_TARGET=	infiles build-master build-man
 INSTALL_TARGET=	install-master-prime
+
 NO_ARCH=	yes
 
-SUB_FILES=	pkg-message
-PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
-
 PORTSCOUT=	ignore:1
 
+SUB_FILES=	pkg-message
+PLIST_SUB+=	WWWGRP=${WWWGRP} \
+		WWWOWN=${WWWOWN}
+
 post-install:
 	(cd ${WRKSRC}/build/doc; \
 		${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index d8df80f26b9d..3fa12f9cf447 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -10,58 +10,64 @@ PKGNAMESUFFIX=	-node
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Node-specific part of Munin
 
-BUILD_DEPENDS=	p5-Module-Build>=0:devel/p5-Module-Build \
+BUILD_DEPENDS=	bash:shells/bash \
+		munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
 		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
 		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Module-Build>=0:devel/p5-Module-Build \
+		p5-Net-Server>=0:net/p5-Net-Server
+RUN_DEPENDS=	bash:shells/bash \
 		munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
-		p5-Net-Server>=0:net/p5-Net-Server \
-		bash:shells/bash
-RUN_DEPENDS=	p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-Cache-Cache>=0:devel/p5-Cache-Cache \
 		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
-		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
-		munin-common>=${MUNIN_VERSION}:sysutils/munin-common \
-		p5-Net-Server>=0:net/p5-Net-Server \
-		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
-		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
 		p5-libwww>=0:www/p5-libwww \
-		bash:shells/bash
+		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
+		p5-Net-Server>=0:net/p5-Net-Server
+
+USES=		cpe gmake perl5 shebangfix
+USE_RC_SUBR=	munin-asyncd munin-node
 
-USES=		gmake perl5 shebangfix cpe
-REINPLACE_ARGS=	-i ""
 SHEBANG_FILES=	node/bin/munindoc node/sbin/munin-node \
-		node/sbin/munin-run node/sbin/munin-node-configure
+		node/sbin/munin-node-configure node/sbin/munin-run
 
 .include "${.CURDIR}/../munin-common/munin.mk"
 
-ALL_TARGET=	build-node build-plugins build/node/_bin/munin-async build/node/_bin/munin-asyncd
+ALL_TARGET=	build-node build-plugins build/node/_bin/munin-async \
+		build/node/_bin/munin-asyncd
 INSTALL_TARGET=	install-node-prime install-async-prime install-plugins-prime
+REINPLACE_ARGS=	-i ""
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	SNMP PERL PYTHON JAVA
-OPTIONS_DEFAULT=	SNMP PERL PYTHON
-OPTIONS_SUB=	yes
-SNMP_DESC=	Include SNMP plugins
-PERL_DESC=	Include all Perl modules (adds dependencies)
+PORTSCOUT=	ignore:1
+
+SUB_FILES=	pkg-message plugins.conf
+
+OPTIONS_DEFINE=		JAVA PERL PYTHON SNMP
+OPTIONS_DEFAULT=	PERL PYTHON SNMP
+OPTIONS_SUB=		yes
+
 JAVA_DESC=	Include JAVA plugins
+PERL_DESC=	Include all Perl modules (adds dependencies)
 PYTHON_DESC=	Include Python plugins
+SNMP_DESC=	Include SNMP plugins
+
+JAVA_USE=		JAVA=yes
+JAVA_INSTALL_TARGET=	install-plugins-java
+JAVA_VARS=		JAVA_BUILD=yes \
+			JAVA_RUN=yes
+
+PERL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
+			p5-Net-DNS>=0:dns/p5-Net-DNS \
+			p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+			p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+			p5-XML-Parser>=0:textproc/p5-XML-Parser
+
+PYTHON_USES=	python
 
 SNMP_BUILD_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 SNMP_RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
-PERL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
-		p5-Net-DNS>=0:dns/p5-Net-DNS \
-		p5-Net-IP>=0:net-mgmt/p5-Net-IP \
-		p5-XML-Parser>=0:textproc/p5-XML-Parser \
-		p5-XML-LibXML>=0:textproc/p5-XML-LibXML
-PYTHON_USES=	python
-JAVA_USE=	java=yes
-JAVA_INSTALL_TARGET=	install-plugins-java
-JAVA_BUILD=	yes
-JAVA_RUN=	yes
-
-SUB_FILES=	pkg-message plugins.conf
-USE_RC_SUBR=	munin-asyncd munin-node
-
-PORTSCOUT=	ignore:1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index 60cf9b5b8283..8b047208e790 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -43,8 +43,8 @@ LIBEVENT_STATIC_BUILD_DEPENDS=		${LOCALBASE}/lib/libevent.a:devel/libevent
 LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:devel/libevent
 LIBEVENT_STATIC_VARS=			LESTATIC=${LOCALBASE}/lib/libevent.a
 
-UTF8PROC_CONFIGURE_ENABLE=	utf8proc
 UTF8PROC_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
+UTF8PROC_CONFIGURE_ENABLE=	utf8proc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES \
diff --git a/textproc/ydiff/Makefile b/textproc/ydiff/Makefile
index ec5d28d58506..ae18aba0acbe 100644
--- a/textproc/ydiff/Makefile
+++ b/textproc/ydiff/Makefile
@@ -4,8 +4,8 @@
 PORTNAME=	ydiff
 DISTVERSION=	1.2
 PORTEPOCH=	1
-MASTER_SITES=	LOCAL/mat/ydiff
 CATEGORIES=	textproc
+MASTER_SITES=	LOCAL/mat/ydiff
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Diff readability enhancer for color terminals
@@ -14,9 +14,9 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python
-USE_PYTHON=	distutils autoplist concurrent noflavors
 USE_GITHUB=
 GH_ACCOUNT=	ymattw
+USE_PYTHON=	autoplist concurrent distutils noflavors
 
 NO_ARCH=	yes