diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 03c4c8f832b3..bf0cc459c8fb 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -30,7 +30,7 @@ SHEBANG_FILES=	examples/lightning_detector/bom libgeda/docs/*.dox \
 		gnetlist/docs/*.dox
 USE_GNOME=	gtk20
 USE_PERL5=	run
-USE_PYTHON=	run
+USE_PYTHON_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libstroke=${LOCALBASE}
 USE_LDCONFIG=	yes
diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index 02bf01670783..bdbbe921d827 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -16,18 +16,18 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/serial:${PORTSDIR}/comms/py-serial \
 		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
 
-USE_PYTHON=	YES
-USE_PYDISTUTILS=	YES
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
-
 pre-configure:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/chirpui/mainapp.py
 
+post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA}  ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
+	@${RMDIR} ${STAGEDIR}${PREFIX}/share/chirp/images
+	@${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/py-stltools/Makefile b/graphics/py-stltools/Makefile
index 07a62961d704..7532aa145ff2 100644
--- a/graphics/py-stltools/Makefile
+++ b/graphics/py-stltools/Makefile
@@ -15,9 +15,8 @@ LICENSE=		BSD2CLAUSE
 RUN_DEPENDS=		${PYNUMPY}
 
 USES=			zip
-USE_PYTHON=		YES
-PYTHON_VERSION=		python2.7
-USE_PYDISTUTILS=	YES
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
 
 DOCS=			README.txt
 EXAMPLES=		test/cube.stl test/cube_bin.stl
diff --git a/graphics/py-stltools/pkg-plist b/graphics/py-stltools/pkg-plist
index b5bd9e460db3..4254fa7bec6f 100644
--- a/graphics/py-stltools/pkg-plist
+++ b/graphics/py-stltools/pkg-plist
@@ -2,10 +2,6 @@ bin/stl2pdf
 bin/stl2pov
 bin/stl2ps
 bin/stlinfo
-%%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/stltools/__init__.py
 %%PYTHON_SITELIBDIR%%/stltools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/stltools/__init__.pyo
@@ -28,6 +24,5 @@ bin/stlinfo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube.stl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube_bin.stl
 @dirrm %%PYTHON_SITELIBDIR%%/stltools
-@dirrm %%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/textproc/cdiff/Makefile b/textproc/cdiff/Makefile
index 6940bcdc61fa..a4917274f154 100644
--- a/textproc/cdiff/Makefile
+++ b/textproc/cdiff/Makefile
@@ -18,9 +18,9 @@ GH_ACCOUNT=	ymattw
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	67c9831
 
-USE_PYTHON=
-USE_PYDISTUTILS=
-PYDISTUTILS_AUTOPLIST=
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/textproc/mate-doc-utils/Makefile b/textproc/mate-doc-utils/Makefile
index 26e662c66ad6..5f6a09460043 100644
--- a/textproc/mate-doc-utils/Makefile
+++ b/textproc/mate-doc-utils/Makefile
@@ -22,7 +22,7 @@ PORTSCOUT=	limitw:1,even
 USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_MATE=	autogen common:build intlhack
 USE_GNOME=	gnomehier libxml2 libxslt
-USE_PYTHON=	build
+USE_PYTHON_BUILD=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	aclocal:env autoconf:env automake:env