Index: head/databases/postgresql10-pltcl/Makefile
===================================================================
--- head/databases/postgresql10-pltcl/Makefile	(revision 448137)
+++ head/databases/postgresql10-pltcl/Makefile	(revision 448138)
@@ -1,30 +1,30 @@
 # Created by: Palle Girgensohn <girgen@partitur.se>
 # $FreeBSD$
 
 PORTNAME=	postgresql
 CATEGORIES=	databases tcl
-PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Tcl to write SQL functions
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 
 WANT_PGSQL_VER?=10
 
 USES+=		tcl pgsql:${WANT_PGSQL_VER}
 WANT_PGSQL=	server
 
 CONFIGURE_ARGS=	--with-tcl --without-tk \
 		--with-tclconfig="${TCL_LIBDIR}" \
 		--with-includes="${TCL_INCLUDEDIR}"
 
 CONFIGURE_ENV+=	TCLSH="${TCLSH}"
 MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
 
 BUILD_DIRS=	src/backend src/pl/tcl
 INSTALL_DIRS=	src/pl/tcl
 SLAVE_ONLY=	yes
 COMPONENT=	-pltcl
 
 .include "${MASTERDIR}/Makefile"
Index: head/databases/postgresql95-plperl/Makefile
===================================================================
--- head/databases/postgresql95-plperl/Makefile	(revision 448137)
+++ head/databases/postgresql95-plperl/Makefile	(revision 448138)
@@ -1,26 +1,26 @@
 # Created by: Palle Girgensohn <girgen@partitur.se>
 # $FreeBSD$
 
 PORTNAME=	postgresql
 PORTREVISION=	1
 CATEGORIES=	databases perl5
-PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Write SQL functions for PostgreSQL using Perl5
 
 RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 
 WANT_PGSQL_VER?=9.5
 
 USES+=		perl5 readline
 CONFIGURE_ARGS=	--with-perl
 
 BUILD_DIRS=	src/backend src/pl/plperl
 INSTALL_DIRS=	src/pl/plperl
 SLAVE_ONLY=	yes
 COMPONENT=	-plperl
 
 .include "${MASTERDIR}/Makefile"
Index: head/databases/postgresql95-plpython/Makefile
===================================================================
--- head/databases/postgresql95-plpython/Makefile	(revision 448137)
+++ head/databases/postgresql95-plpython/Makefile	(revision 448138)
@@ -1,25 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
 CATEGORIES=	databases python
-PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
 
 USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
 
 MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server
 
 WANT_PGSQL_VER?=	9.5
 WANT_PYTHON_USE?=	python
 
 CONFIGURE_ARGS=	--with-python
 COMPONENT=	-plpython
 
 BUILD_DIRS=	src/backend src/pl/plpython
 INSTALL_DIRS=	src/pl/plpython
 SLAVE_ONLY=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: head/databases/postgresql96-docs/Makefile
===================================================================
--- head/databases/postgresql96-docs/Makefile	(revision 448137)
+++ head/databases/postgresql96-docs/Makefile	(revision 448138)
@@ -1,45 +1,45 @@
 # Created by: Palle Girgensohn <girgen@pingpong.net>
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX?=	${DISTV:S/.//}-docs
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S,.,,}-docs
 DISTV=	${DISTVERSION:R}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The PostgreSQL documentation set
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 WANT_PGSQL_VER?=9.6
 
 SLAVE_ONLY=	YES
 COMPONENT=	-docs
 
 PGDOCSREL?=	${DOCSDIR_REL}/release-${PGSQL_VER}
 PGDOCSDIR?=	${PREFIX}/${PGDOCSREL}
 
 sgmldir=	${LOCALBASE}/share/sgml
 dbdir=		${sgmldir}/docbook
 
 BUILD_DEPENDS+=	onsgmls:textproc/opensp			\
 		openjade:textproc/openjade			\
 		${sgmldir}/iso8879/catalog:textproc/iso8879	\
 		${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \
 		docbook-sgml>0:textproc/docbook-sgml
 CONFIGURE_ARGS= --without-readline
 NO_ARCH=	yes
 
 do-build:
 	${MAKE_CMD} -C ${WRKSRC} html
 
 do-install:
 	@ ${MKDIR} ${STAGEDIR}${PGDOCSDIR}
 	( cd ${WRKSRC}/doc/src/sgml/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} )
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST}
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type d) | ${SORT} -r | \
 	     ${SED} 's,.*,@unexec rmdir %D/& 2>/dev/null || true,' >>${TMPPLIST}
 
 
 .include "${MASTERDIR}/Makefile"
Index: head/databases/postgresql96-pltcl/Makefile
===================================================================
--- head/databases/postgresql96-pltcl/Makefile	(revision 448137)
+++ head/databases/postgresql96-pltcl/Makefile	(revision 448138)
@@ -1,30 +1,30 @@
 # Created by: Palle Girgensohn <girgen@partitur.se>
 # $FreeBSD$
 
 PORTNAME=	postgresql
 CATEGORIES=	databases tcl
-PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Tcl to write SQL functions
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 
 WANT_PGSQL_VER?=9.6
 
 USES+=		tcl pgsql:${WANT_PGSQL_VER}
 WANT_PGSQL=	server
 
 CONFIGURE_ARGS=	--with-tcl --without-tk \
 		--with-tclconfig="${TCL_LIBDIR}" \
 		--with-includes="${TCL_INCLUDEDIR}"
 
 CONFIGURE_ENV+=	TCLSH="${TCLSH}"
 MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
 
 BUILD_DIRS=	src/backend src/pl/tcl
 INSTALL_DIRS=	src/pl/tcl
 SLAVE_ONLY=	yes
 COMPONENT=	-pltcl
 
 .include "${MASTERDIR}/Makefile"