Index: Mk/Uses/apache.mk
===================================================================
--- Mk/Uses/apache.mk
+++ Mk/Uses/apache.mk
@@ -299,9 +299,9 @@
 APACHEINCLUDEDIR=	include/apache${APACHE_VERSION:S/.//}
 APACHEETCDIR=		etc/apache${APACHE_VERSION:S/.//}
 .if ${APACHE_VERSION} == 2.5
-APACHE_PORT?=		www/apache${APACHE_VERSION:S/.//}-devel
+_APACHE_PORT?=		www/apache${APACHE_VERSION:S/.//}-devel
 .else
-APACHE_PORT?=		www/apache${APACHE_VERSION:S/.//}
+_APACHE_PORT?=		www/apache${APACHE_VERSION:S/.//}
 .endif
 
 PLIST_SUB+=	APACHEMODDIR="${APACHEMODDIR}" \
@@ -320,11 +320,11 @@
 .endif
 
 .if defined(_APACHE_BUILD_DEP)
-BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}
+BUILD_DEPENDS+=	${APXS}:${_APACHE_PORT}
 .endif
 
 .if defined(_APACHE_RUN_DEP)
-RUN_DEPENDS+=	${APXS}:${APACHE_PORT}
+RUN_DEPENDS+=	${APXS}:${_APACHE_PORT}
 .endif
 
 PLIST_SUB+=	AP_NAME="${SHORTMODNAME}"
Index: Mk/Uses/pyqt.mk
===================================================================
--- Mk/Uses/pyqt.mk
+++ Mk/Uses/pyqt.mk
@@ -217,7 +217,6 @@
 DISTINFO_FILE=	${PYQT_DISTINFO_FILE}
 LICENSE?=	${PYQT_LICENSE}
 HAS_CONFIGURE=	yes
-QT_NONSTANDARD=	yes  # Do not add unknown arguments to CONFIGURE_ARGS.
 
 .if ${_PYQT_VERSION} > 4
 # PyQt5's configure.py generates .pro files and calls qmake to generate the
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1318,8 +1318,8 @@
 # Start of pre-makefile section.
 .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
 
-.if defined(PORTNAME)
-.include "${PORTSDIR}/Mk/bsd.sanity.mk"
+.if defined(_PREMKINCLUDED)
+DEV_ERROR+=	"you cannot include bsd.port[.pre].mk twice"
 .endif
 
 _PREMKINCLUDED=	yes
@@ -2008,6 +2008,10 @@
 .include "${USESDIR}/${f:C/\:.*//}.mk"
 .endfor
 
+.if defined(PORTNAME)
+.include "${PORTSDIR}/Mk/bsd.sanity.mk"
+.endif
+
 .if defined(USE_LOCALE)
 CONFIGURE_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
 MAKE_ENV+=		LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
Index: Mk/bsd.sanity.mk
===================================================================
--- Mk/bsd.sanity.mk
+++ Mk/bsd.sanity.mk
@@ -102,10 +102,6 @@
 DEV_ERROR+=	"All LIB_DEPENDS should use the new format and start out with lib.  \(libfoo.so vs foo.so\)"
 .endif
 
-.if defined(_PREMKINCLUDED)
-DEV_ERROR+=	"you cannot include bsd.port[.pre].mk twice"
-.endif
-
 .if defined(LICENSE)
 .if ${LICENSE:MBSD}
 DEV_WARNING+=	"LICENSE must not contain BSD, instead use BSD[234]CLAUSE"
@@ -182,7 +178,7 @@
 		INSTALLS_EGGINFO USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \
 		USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT \
 		USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD
-SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX MLINKS \
+SANITY_DEPRECATED=	MLINKS \
 			USE_MYSQL WANT_MYSQL_VER \
 			PYDISTUTILS_INSTALLNOSINGLE \
 			USE_APACHE USE_APACHE_BUILD USE_APACHE_RUN
@@ -224,7 +220,6 @@
 PYTHON_PY3K_PLIST_HACK_ALT=	USE_PYTHON=py3kplist
 PYDISTUTILS_NOEGGINFO_ALT=	USE_PYTHON=noegginfo
 USE_PYTHON_PREFIX_ALT=		USE_PYTHON=pythonprefix
-PYTHON_PKGNAMESUFFIX_ALT=	PYTHON_PKGNAMEPREFIX
 NO_INSTALL_MANPAGES_ALT=	USES=imake:noman
 UNIQUENAME_ALT=		PKGBASE
 LATEST_LINK_ALT=	PKGBASE
Index: net-mgmt/riemann/Makefile
===================================================================
--- net-mgmt/riemann/Makefile
+++ net-mgmt/riemann/Makefile
@@ -9,7 +9,7 @@
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Monitors distributed systems
 
-LICENSE=	EPL APACHE20 CDDL MIT BSD3CLAUSE LGPL2+ BSD2CLAUSE GPLv2+
+LICENSE=	EPL APACHE20 CDDL MIT BSD3CLAUSE LGPL20+ BSD2CLAUSE GPLv2+
 LICENSE_COMB=	multi
 
 USES=		tar:bzip2