Index: head/lang/python/Makefile
===================================================================
--- head/lang/python/Makefile	(revision 386378)
+++ head/lang/python/Makefile	(revision 386379)
@@ -1,83 +1,82 @@
 # Created by: jkh
 # $FreeBSD$
 
 PORTNAME=	python
 PORTVERSION=	${PYTHON_DEFAULT}
 PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	The "meta-port" for the default version of Python interpreter
 
 USES=			python:run
 NO_BUILD=		yes
-PYTHON_NO_DEPENDS=	yes
 
 PLIST_FILES=	bin/2to3 \
 		bin/idle \
 		bin/pydoc \
 		bin/python \
 		bin/python-config
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_MAJOR_VER} == 2
 RUN_DEPENDS+=	python2:${PORTSDIR}/lang/python2
 .elif ${PYTHON_MAJOR_VER} == 3
 RUN_DEPENDS+=	python3:${PORTSDIR}/lang/python3
 .endif
 
 do-install:
 	${LN} -sf python${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/python
 	${LN} -sf 2to3-${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/2to3
 .if ${PYTHON_MAJOR_VER} == 2
 .for file in idle pydoc
 	${LN} -sf ${file}${PYTHON_MAJOR_VER} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 .elif ${PYTHON_MAJOR_VER} == 3
 .for file in idle pydoc
 	${LN} -sf ${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 .endif
 	${LN} -sf python${PYTHON_MAJOR_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python-config
 
 # Major upgrade support
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
 
 .if defined(USE_PORTMASTER)
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
 .endif
 
 PKG_LIST=	${PKG_BIN} query -a '%n-%v'
 PKG_LIST_FILES=	${PKG_INFO} -l
 
 upgrade-site-packages:
 	@if [ ! -x ${PORTUPGRADE_CMD} ]; then \
 		${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \
 		${FALSE}; \
 	 fi
 
 	@GREP_ARGS="-q"; \
 	for ver in `echo ${_PYTHON_ALLBRANCHES:C/${PYTHON_VER}//}`; do \
 		GREP_ARGS="$${GREP_ARGS} -e lib/python$$ver"; \
 	done; \
 	UPD=""; \
 	for pkg in `${PKG_LIST}`; do \
 		${PKG_LIST_FILES} $${pkg} | ${GREP} $${GREP_ARGS} && \
 			UPD="$${UPD} $${pkg}"; \
 	done; \
 	if [ "$${UPD}" ]; then \
 		if [ -n ${PORTUPGRADE_ARGS} ]; then \
 			${PORTUPGRADE_CMD} ${PORTUPGRADE_ARGS} -f $${UPD}; \
 		else \
 			${PORTUPGRADE_CMD} -f $${UPD}; \
 		fi; \
 	fi; \
 
 .include <bsd.port.post.mk>
Index: head/lang/python2/Makefile
===================================================================
--- head/lang/python2/Makefile	(revision 386378)
+++ head/lang/python2/Makefile	(revision 386379)
@@ -1,52 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	python2
 PORTVERSION=	${PYTHON_MAJOR_VER}
 PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	The "meta-port" for version 2 of the Python interpreter
 
 USES=			python:run
 PYTHON_VERSION=		${PYTHON2_DEFAULT_VERSION}
 NO_BUILD=		yes
-PYTHON_NO_DEPENDS=	yes
 
 PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
 		bin/idle${PYTHON_MAJOR_VER} \
 		bin/pydoc${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER}-config \
 		libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
 .include <bsd.port.pre.mk>
 
 RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 
 do-install:
 .for file in idle pydoc python
 	${LN} -sf ${file}${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
 .endfor
 	${LN} -sf 2to3-${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
 	${LN} -sf python${PYTHON_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
 	${LN} -sf python-${PYTHON_VER}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
 # Major upgrade support
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
 
 .if defined(USE_PORTMASTER)
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
 .endif
 
 PKG_LIST=	${PKG_BIN} query -a '%n-%v'
 PKG_LIST_FILES=	${PKG_INFO} -l
 
 .include <bsd.port.post.mk>
Index: head/lang/python3/Makefile
===================================================================
--- head/lang/python3/Makefile	(revision 386378)
+++ head/lang/python3/Makefile	(revision 386379)
@@ -1,54 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	python3
 PORTVERSION=	${PYTHON_MAJOR_VER}
 PORTREVISION=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=
 DISTFILES=
 EXTRACT_ONLY=
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	The "meta-port" for version 3 of the Python interpreter
 
 USES=			python:run
 PYTHON_VERSION=		${PYTHON3_DEFAULT_VERSION}
 NO_BUILD=		yes
-PYTHON_NO_DEPENDS=	yes
 
 PLIST_FILES=	bin/2to3-${PYTHON_MAJOR_VER} \
 		bin/idle${PYTHON_MAJOR_VER} \
 		bin/pydoc${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER} \
 		bin/python${PYTHON_MAJOR_VER}-config \
 		libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
 .include <bsd.port.pre.mk>
 
 RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_PORTSDIR}
 
 do-install:
 	${LN} -sf python${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}
 	${LN} -sf 2to3-${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER}
 .for file in idle pydoc
 	${LN} -sf ${file}${PYTHON_VER} \
 		${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}
 .endfor
 	${LN} -sf python${PYTHON_VER}-config \
 		${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config
 	${LN} -sf python-${PYTHON_VER}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc
 
 # Major upgrade support
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portupgrade
 
 .if defined(USE_PORTMASTER)
 PORTUPGRADE_CMD=	${LOCALBASE}/sbin/portmaster
 .endif
 
 PKG_LIST=	${PKG_BIN} query -a '%n-%v'
 PKG_LIST_FILES=	${PKG_INFO} -l
 
 .include <bsd.port.post.mk>