diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index 7d484286e09f..1c1f0f215849 100644
--- a/databases/postgresql84-client/Makefile
+++ b/databases/postgresql84-client/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX=	-client
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql84-contrib/Makefile b/databases/postgresql84-contrib/Makefile
index 3eaa526c3f84..492125af795c 100644
--- a/databases/postgresql84-contrib/Makefile
+++ b/databases/postgresql84-contrib/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
-PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX=	-contrib
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
diff --git a/databases/postgresql84-docs/Makefile b/databases/postgresql84-docs/Makefile
index b96cb182116b..7f07bc78e719 100644
--- a/databases/postgresql84-docs/Makefile
+++ b/databases/postgresql84-docs/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX?=        ${DISTV:S/.//}-docs
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX=	-docs
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The PostgreSQL documentation set
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 677a08db8001..d774953ed381 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,8 +7,7 @@ PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	-server
 
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
@@ -24,6 +23,7 @@ DIST_SUBDIR=	postgresql
 ICU_PATCHFILE?=	pg-840-icu-2009-09-15.diff.gz
 
 UNIQUENAME?=	${PORTNAME}${DISTVERSION:R:S/.//}
+LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 USE_BZIP2=	yes
diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index 856be70da40f..7562647fee5f 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX=	-client
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile
index 3d6a3e1fb322..5cff5cada007 100644
--- a/databases/postgresql90-contrib/Makefile
+++ b/databases/postgresql90-contrib/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
-PKGNAMESUFFIX?=        ${DISTV:S/.//}-contrib
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX=	-contrib
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
diff --git a/databases/postgresql90-plperl/Makefile b/databases/postgresql90-plperl/Makefile
index 3fd127237e3e..6fc45b719255 100644
--- a/databases/postgresql90-plperl/Makefile
+++ b/databases/postgresql90-plperl/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases perl5
-PKGNAMESUFFIX?=	${DISTV:S/.//}-plperl
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX=	-plperl
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Write SQL functions for PostgreSQL using Perl5
diff --git a/databases/postgresql90-plpython/Makefile b/databases/postgresql90-plpython/Makefile
index 0e21cbbde52c..183d860c16bd 100644
--- a/databases/postgresql90-plpython/Makefile
+++ b/databases/postgresql90-plpython/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases python
-PKGNAMESUFFIX?=	${DISTV:S/.//}-plpython
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX=	-plpython
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 7d5133e265a9..75b5932a942f 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -3,8 +3,7 @@
 
 DISTVERSION?=	9.0.13
 PORTREVISION=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	-server
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
diff --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile
index 5d58768dc282..00977c164637 100644
--- a/databases/postgresql91-client/Makefile
+++ b/databases/postgresql91-client/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX=	-client
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile
index 52bd9197b6b1..8a8c62fef5dc 100644
--- a/databases/postgresql91-docs/Makefile
+++ b/databases/postgresql91-docs/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-docs
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX=	-docs
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The PostgreSQL documentation set
diff --git a/databases/postgresql91-pltcl/Makefile b/databases/postgresql91-pltcl/Makefile
index 738bc311002d..30521adb5902 100644
--- a/databases/postgresql91-pltcl/Makefile
+++ b/databases/postgresql91-pltcl/Makefile
@@ -4,10 +4,10 @@
 PORTNAME=	postgresql
 PORTREVISION=	3
 CATEGORIES=	databases tcl
-PKGNAMESUFFIX?= ${DISTV:S/.//}-pltcl
+PKGNAMESUFFIX=	-pltcl
 
 MAINTAINER=	pgsql@FreeBSD.org
-COMMENT=	Module for using Tcl to write SQL functions
+COMMENT=	A module for using Tcl to write SQL functions
 
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
 
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 452043bea08e..c5356f8edf1a 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -7,8 +7,7 @@ PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	-server
 
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
@@ -25,8 +24,10 @@ ICU_PATCHFILE?=	pg-910-icu-2012-12-19.diff.gz
 
 .if !defined(SLAVE_ONLY)
 UNIQUENAME?=	${PORTNAME}${DISTVERSION:R:S/.//}
+LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 .else # Contrib has different options from -client/-server
 UNIQUENAME?=	${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX}
+LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}
 .endif
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
diff --git a/databases/postgresql92-client/Makefile b/databases/postgresql92-client/Makefile
index cf0d461f9d20..55b98e32b26e 100644
--- a/databases/postgresql92-client/Makefile
+++ b/databases/postgresql92-client/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX=	-client
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql92-contrib/Makefile b/databases/postgresql92-contrib/Makefile
index 83ffcc3d491e..d614f3a48605 100644
--- a/databases/postgresql92-contrib/Makefile
+++ b/databases/postgresql92-contrib/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases
-PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX=	-contrib
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index fafaf4afe096..832377b62c35 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -7,8 +7,7 @@ PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	-server
 
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
@@ -25,8 +24,10 @@ ICU_PATCHFILE?=	pg-910-icu-2012-12-19.diff.gz
 
 .if !defined(SLAVE_ONLY)
 UNIQUENAME?=	${PORTNAME}${DISTVERSION:R:S/.//}
+LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 .else # Contrib has different options from -client/-server
 UNIQUENAME?=	${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX}
+LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}
 .endif
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
diff --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile
index 6aca865407b2..cacadac97219 100644
--- a/databases/postgresql93-client/Makefile
+++ b/databases/postgresql93-client/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX?=	${DISTV:S/.//}-client
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX=	-client
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql93-contrib/Makefile b/databases/postgresql93-contrib/Makefile
index dafdab90ab4c..8b31f49cb7e8 100644
--- a/databases/postgresql93-contrib/Makefile
+++ b/databases/postgresql93-contrib/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
-PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX=	-contrib
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile
index 808577168c16..2c4dde4e4aae 100644
--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@@ -3,8 +3,7 @@
 
 DISTVERSION?=	9.3.0
 PORTREVISION?=	1
-PKGNAMESUFFIX?=	${DISTV:S/.//}-server
-DISTV=	${DISTVERSION:R}
+PKGNAMESUFFIX?=	-server
 
 MAINTAINER?=	pgsql@FreeBSD.org