Index: head/databases/Makefile
===================================================================
--- head/databases/Makefile
+++ head/databases/Makefile
@@ -723,6 +723,10 @@
     SUBDIR += py-flask-sqlalchemy
     SUBDIR += py-forgetsql
     SUBDIR += py-gdbm
+    SUBDIR += py32-gdbm
+    SUBDIR += py33-gdbm
+    SUBDIR += py34-gdbm
+    SUBDIR += py35-gdbm
     SUBDIR += py-geoalchemy
     SUBDIR += py-geoalchemy2
     SUBDIR += py-hiredis
@@ -766,6 +770,10 @@
     SUBDIR += py-sqlalchemy-migrate
     SUBDIR += py-sqlalchemy06
     SUBDIR += py-sqlite3
+    SUBDIR += py32-sqlite3
+    SUBDIR += py33-sqlite3
+    SUBDIR += py34-sqlite3
+    SUBDIR += py35-sqlite3
     SUBDIR += py-sqlite3dbm
     SUBDIR += py-sqlkit
     SUBDIR += py-sqlobject
Index: head/databases/py-gdbm/Makefile
===================================================================
--- head/databases/py-gdbm/Makefile
+++ head/databases/py-gdbm/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	gdbm
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases python
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
-COMMENT=	Python bindings to the GNU dbm library
+COMMENT=	Python bindings to the GNU dbm library (Python ${PYTHON_VER})
 
 LICENSE=	PSFL
 
Index: head/databases/py-sqlite3/Makefile
===================================================================
--- head/databases/py-sqlite3/Makefile
+++ head/databases/py-sqlite3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sqlite3
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases python
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
-COMMENT=	Standard Python binding to the SQLite3 library
+COMMENT=	Standard Python binding to the SQLite3 library (Python ${PYTHON_VER}) 
 
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKDIR}/Python-${PORTVERSION}/LICENSE
Index: head/databases/py32-gdbm/Makefile
===================================================================
--- head/databases/py32-gdbm/Makefile
+++ head/databases/py32-gdbm/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-gdbm
+
+PYTHON_VERSION=	python3.2
+
+.include "${MASTERDIR}/Makefile"
Index: head/databases/py32-sqlite3/Makefile
===================================================================
--- head/databases/py32-sqlite3/Makefile
+++ head/databases/py32-sqlite3/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-sqlite3
+
+PYTHON_VERSION=	python3.2
+
+.include "${MASTERDIR}/Makefile"
Index: head/databases/py33-gdbm/Makefile
===================================================================
--- head/databases/py33-gdbm/Makefile
+++ head/databases/py33-gdbm/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-gdbm
+
+PYTHON_VERSION=	python3.3
+
+.include "${MASTERDIR}/Makefile"
Index: head/databases/py33-sqlite3/Makefile
===================================================================
--- head/databases/py33-sqlite3/Makefile
+++ head/databases/py33-sqlite3/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-sqlite3
+
+PYTHON_VERSION=	python3.3
+
+.include "${MASTERDIR}/Makefile"
Index: head/databases/py34-gdbm/Makefile
===================================================================
--- head/databases/py34-gdbm/Makefile
+++ head/databases/py34-gdbm/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-gdbm
+
+PYTHON_VERSION=	python3.4
+
+.include "${MASTERDIR}/Makefile"
Index: head/databases/py34-sqlite3/Makefile
===================================================================
--- head/databases/py34-sqlite3/Makefile
+++ head/databases/py34-sqlite3/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-sqlite3
+
+PYTHON_VERSION=	python3.4
+
+.include "${MASTERDIR}/Makefile"
Index: head/databases/py35-gdbm/Makefile
===================================================================
--- head/databases/py35-gdbm/Makefile
+++ head/databases/py35-gdbm/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-gdbm
+
+PYTHON_VERSION=	python3.5
+
+.include "${MASTERDIR}/Makefile"
Index: head/databases/py35-sqlite3/Makefile
===================================================================
--- head/databases/py35-sqlite3/Makefile
+++ head/databases/py35-sqlite3/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-sqlite3
+
+PYTHON_VERSION=	python3.5
+
+.include "${MASTERDIR}/Makefile"
Index: head/lang/python32/Makefile
===================================================================
--- head/lang/python32/Makefile
+++ head/lang/python32/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	python32
 PORTVERSION=	3.2.5
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -30,6 +30,9 @@
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
 
+SUB_FILES=		pkg-message
+SUB_LIST=		PYTHON_SUFFIX=${PORTVERSION:R:S/.//g}
+
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
Index: head/lang/python32/files/pkg-message.in
===================================================================
--- head/lang/python32/files/pkg-message.in
+++ head/lang/python32/files/pkg-message.in
@@ -0,0 +1,10 @@
+===========================================================================
+
+Note that some standard Python modules are provided as separate ports
+as they require additional dependencies. They are available as:
+
+py%%PYTHON_SUFFIX%%-gdbm       databases/py%%PYTHON_SUFFIX%%-gdbm
+py%%PYTHON_SUFFIX%%-sqlite3    databases/py%%PYTHON_SUFFIX%%-sqlite3
+py%%PYTHON_SUFFIX%%-tkinter    x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter
+
+===========================================================================
Index: head/lang/python32/pkg-message
===================================================================
--- head/lang/python32/pkg-message
+++ head/lang/python32/pkg-message
@@ -1,10 +0,0 @@
-===========================================================================
-
-Note that some standard Python modules are provided as separate ports
-as they require additional dependencies. They are available as:
-
-gdbm            databases/py-gdbm
-sqlite3         databases/py-sqlite3
-tkinter         x11-toolkits/py-tkinter
-
-===========================================================================
Index: head/lang/python33/Makefile
===================================================================
--- head/lang/python33/Makefile
+++ head/lang/python33/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	python33
 PORTVERSION=	3.3.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -30,6 +30,9 @@
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
 
+SUB_FILES=		pkg-message
+SUB_LIST=		PYTHON_SUFFIX=${PORTVERSION:R:S/.//g}
+
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
Index: head/lang/python33/files/pkg-message.in
===================================================================
--- head/lang/python33/files/pkg-message.in
+++ head/lang/python33/files/pkg-message.in
@@ -0,0 +1,10 @@
+===========================================================================
+
+Note that some standard Python modules are provided as separate ports
+as they require additional dependencies. They are available as:
+
+py%%PYTHON_SUFFIX%%-gdbm       databases/py%%PYTHON_SUFFIX%%-gdbm
+py%%PYTHON_SUFFIX%%-sqlite3    databases/py%%PYTHON_SUFFIX%%-sqlite3
+py%%PYTHON_SUFFIX%%-tkinter    x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter
+
+===========================================================================
Index: head/lang/python33/pkg-message
===================================================================
--- head/lang/python33/pkg-message
+++ head/lang/python33/pkg-message
@@ -1,10 +0,0 @@
-===========================================================================
-
-Note that some standard Python modules are provided as separate ports
-as they require additional dependencies. They are available as:
-
-gdbm            databases/py-gdbm
-sqlite3         databases/py-sqlite3
-tkinter         x11-toolkits/py-tkinter
-
-===========================================================================
Index: head/lang/python34/Makefile
===================================================================
--- head/lang/python34/Makefile
+++ head/lang/python34/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	python34
 PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 DISTNAME=	Python-${PORTVERSION}
@@ -32,6 +32,9 @@
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
 
+SUB_FILES=		pkg-message
+SUB_LIST=		PYTHON_SUFFIX=${PORTVERSION:R:S/.//g}
+
 PLIST_SUB=		ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
 
Index: head/lang/python34/files/pkg-message.in
===================================================================
--- head/lang/python34/files/pkg-message.in
+++ head/lang/python34/files/pkg-message.in
@@ -0,0 +1,10 @@
+===========================================================================
+
+Note that some standard Python modules are provided as separate ports
+as they require additional dependencies. They are available as:
+
+py%%PYTHON_SUFFIX%%-gdbm       databases/py%%PYTHON_SUFFIX%%-gdbm
+py%%PYTHON_SUFFIX%%-sqlite3    databases/py%%PYTHON_SUFFIX%%-sqlite3
+py%%PYTHON_SUFFIX%%-tkinter    x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter
+
+===========================================================================
Index: head/lang/python35/Makefile
===================================================================
--- head/lang/python35/Makefile
+++ head/lang/python35/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	python
 DISTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
-PKGNAMESUFFIX=	35
+PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 DISTNAME=	Python-${DISTVERSION}
 DIST_SUBDIR=	python
 
@@ -24,9 +25,9 @@
 CPE_VERSION=	${DISTVERSION}
 
 # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
-PYTHON_VER=		${DISTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-PYTHON_VERSION=		python${PYTHON_VER}
 PYTHON_PORTVERSION=	${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
+PYTHON_VER=		${PYTHON_PORTVERSION:R}
+PYTHON_VERSION=		python${PYTHON_VER}
 PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
 
 DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
@@ -38,6 +39,9 @@
 MAKE_ARGS+=		LIBPC="${PREFIX}/libdata/pkgconfig"			# Until pathfix gets support for files other than Makefile.in
 MAKE_JOBS_UNSAFE=	yes							# Parser/pgen build bug. See Issue: 200622, 201974
 
+SUB_FILES=		pkg-message
+SUB_LIST=		PYTHON_SUFFIX=${PYTHON_SUFFIX}
+
 PLIST_SUB=		XYDOT=${PYTHON_VER} XY=${PYTHON_SUFFIX} \
 			XYZDOT=${PYTHON_PORTVERSION} ABI=${ABIFLAGS} \
 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. http://bugs.python.org/issue19554
Index: head/lang/python35/files/pkg-message.in
===================================================================
--- head/lang/python35/files/pkg-message.in
+++ head/lang/python35/files/pkg-message.in
@@ -0,0 +1,10 @@
+===========================================================================
+
+Note that some standard Python modules are provided as separate ports
+as they require additional dependencies. They are available as:
+
+py%%PYTHON_SUFFIX%%-gdbm       databases/py%%PYTHON_SUFFIX%%-gdbm
+py%%PYTHON_SUFFIX%%-sqlite3    databases/py%%PYTHON_SUFFIX%%-sqlite3
+py%%PYTHON_SUFFIX%%-tkinter    x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter
+
+===========================================================================
Index: head/x11-toolkits/Makefile
===================================================================
--- head/x11-toolkits/Makefile
+++ head/x11-toolkits/Makefile
@@ -193,6 +193,10 @@
     SUBDIR += py-qt4-gui
     SUBDIR += py-sexy
     SUBDIR += py-tkinter
+    SUBDIR += py32-tkinter
+    SUBDIR += py33-tkinter
+    SUBDIR += py34-tkinter
+    SUBDIR += py35-tkinter
     SUBDIR += py-tktreectrl
     SUBDIR += py-traitsbackendwx
     SUBDIR += py-traitsgui
Index: head/x11-toolkits/py-tkinter/Makefile
===================================================================
--- head/x11-toolkits/py-tkinter/Makefile
+++ head/x11-toolkits/py-tkinter/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	tkinter
 PORTVERSION=	${PYTHON_PORTVERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
-COMMENT=	Python bindings to the Tk widget set
+COMMENT=	Python bindings to the Tk widget set (Python ${PYTHON_VER})
 
 LICENSE=	PSFL
 
Index: head/x11-toolkits/py32-tkinter/Makefile
===================================================================
--- head/x11-toolkits/py32-tkinter/Makefile
+++ head/x11-toolkits/py32-tkinter/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-tkinter
+
+PYTHON_VERSION=	python3.2
+
+.include "${MASTERDIR}/Makefile"
Index: head/x11-toolkits/py33-tkinter/Makefile
===================================================================
--- head/x11-toolkits/py33-tkinter/Makefile
+++ head/x11-toolkits/py33-tkinter/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-tkinter
+
+PYTHON_VERSION=	python3.3
+
+.include "${MASTERDIR}/Makefile"
Index: head/x11-toolkits/py34-tkinter/Makefile
===================================================================
--- head/x11-toolkits/py34-tkinter/Makefile
+++ head/x11-toolkits/py34-tkinter/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-tkinter
+
+PYTHON_VERSION=	python3.4
+
+.include "${MASTERDIR}/Makefile"
Index: head/x11-toolkits/py35-tkinter/Makefile
===================================================================
--- head/x11-toolkits/py35-tkinter/Makefile
+++ head/x11-toolkits/py35-tkinter/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-tkinter
+
+PYTHON_VERSION=	python3.5
+
+.include "${MASTERDIR}/Makefile"