Index: head/games/ski/Makefile
===================================================================
--- head/games/ski/Makefile	(revision 495576)
+++ head/games/ski/Makefile	(revision 495577)
@@ -1,38 +1,38 @@
 # Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
 
 PORTNAME=	ski
 PORTVERSION=	6.12
 CATEGORIES=	games python
 MASTER_SITES=	http://catb.org/~esr/ski/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Skiing simulation with curses interface in python
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:3.2+:run
+USES=		python:3.2+,run
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man6/${PORTNAME}.6.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/appdata/${PORTNAME}.xml \
 		share/pixmaps/${PORTNAME}.png
 
 PORTDOCS=	NEWS README
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|; \
 		s|/usr/share/man|${PREFIX}/man|; \
 		s|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
 		${WRKSRC}/${PORTNAME}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net-mgmt/librenms-agent/Makefile
===================================================================
--- head/net-mgmt/librenms-agent/Makefile	(revision 495576)
+++ head/net-mgmt/librenms-agent/Makefile	(revision 495577)
@@ -1,50 +1,50 @@
 # Created by: Nicolas Goralski <nicolas@goralski.fr>
 # $FreeBSD$
 
 PORTNAME=	librenms-agent
 PORTVERSION=	0.3
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Agents and plugins for librenms
 
 LICENSE=	GPLv2
 
-USES=		shebangfix python:2.7:run php:cli
+USES=		shebangfix python:2.7,run php:cli
 NO_ARCH=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	librenms
 GH_TAGNAME=	fb678cb
 
 NO_BUILD=	yes
 
 SHEBANG_FILES=	agent-local/*
 
 RUN_DEPENDS+=	xinetd:security/xinetd \
 		bash:shells/bash
 
 LIB_DEPENDS+=	libstatgrab.so:devel/libstatgrab \
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/check_mk_agent_freebsd
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/mk_enplug
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/check_mk_xinetd
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/xinetd.d
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/check_mk_agent/plugins
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/check_mk_agent/repo
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/check_mk_agent/local
 	${INSTALL_SCRIPT} ${WRKSRC}/check_mk_agent_freebsd ${STAGEDIR}${PREFIX}/bin/check_mk_agent
 	${INSTALL_SCRIPT} ${WRKSRC}/mk_enplug ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/check_mk_xinetd ${STAGEDIR}${PREFIX}/etc/xinetd.d/check_mk
 	${INSTALL_SCRIPT} ${WRKSRC}/snmp/distro ${STAGEDIR}${PREFIX}/bin
 
 	@cd ${WRKSRC} ; \
 	for agent_local in $$( ${FIND} ./agent-local -type f ! -name README ); do \
 		${INSTALL_SCRIPT} "$$agent_local" ${STAGEDIR}${PREFIX}/lib/check_mk_agent/repo/ ; \
 	done
 
 .include <bsd.port.mk>
Index: head/sysutils/py-python-consul/Makefile
===================================================================
--- head/sysutils/py-python-consul/Makefile	(revision 495576)
+++ head/sysutils/py-python-consul/Makefile	(revision 495577)
@@ -1,30 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	python-consul
 PORTVERSION=	1.1.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Python client for consul
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/consul:sysutils/consul \
 				${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
 RUN_DEPENDS=	${LOCALBASE}/bin/consul:sysutils/consul \
 				${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${PY_FLAVOR}
 
-USES=	python:2.7-3.6+
+IGNORE=	${IGNORE_${FLAVOR}}
+IGNORE_py35=	Does not work with Python 3.5
+
+# 2.7 or 3.6+, but it cannot be expressed right now.
+USES=	python
 
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cablehead
 
 .include <bsd.port.mk>
Index: head/sysutils/xen-guest-tools/Makefile
===================================================================
--- head/sysutils/xen-guest-tools/Makefile	(revision 495576)
+++ head/sysutils/xen-guest-tools/Makefile	(revision 495577)
@@ -1,65 +1,65 @@
 # Created by: Evan Sarmiento <esarmiento@wayfair.com>
 # $FreeBSD$
 
 PORTNAME=	xen-guest-tools
 PORTVERSION=	4.6.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
 DISTNAME=	xen-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Xen tools within FreeBSD domU
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
 		${LOCALBASE}/lib/libglib-2.0.so:devel/glib20 \
 		${LOCALBASE}/lib/libargp.so:devel/argp-standalone \
 		${LOCALBASE}/lib/libyajl.so:devel/yajl
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than amd64 or i386
 CONFLICTS=	xen-tools-[0-9]*
 
-USES=		gmake python:2.7,configure perl5 gettext-runtime:build gettext-tools:build pkgconfig
+USES=		gmake python:2.7 perl5 gettext-runtime:build gettext-tools:build pkgconfig
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD} PYTHON_PATH=${PYTHON_CMD}
 CONFIGURE_ENV+=	APPEND_LIB="${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-I${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	lib/libxenstore.so.3.0 \
 		bin/xen-detect \
 		bin/xenstore \
 		bin/xenstore-control \
 		bin/xenstore-chmod \
 		bin/xenstore-exists \
 		bin/xenstore-list \
 		bin/xenstore-ls \
 		bin/xenstore-read \
 		bin/xenstore-rm \
 		bin/xenstore-write
 
 post-patch:
 	${REINPLACE_CMD} -e 's;86|x86_64;86no|x86_64no;' \
 		${WRKSRC}/tools/configure
 
 do-build:
 	cd ${WRKSRC}/tools && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C include
 	cd ${WRKSRC}/tools/misc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} xen-detect
 	cd ${WRKSRC}/tools/xenstore && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} clients
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/xen-detect ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/xenstore ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/xenstore-control ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/libxenstore.so.3.0 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-chmod
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-exists
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-list
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-ls
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-read
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-rm
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-write
 
 .include <bsd.port.mk>