- Fix pkg name collision

Reviewed by: crees@
With hat: pgsql@

20 files changed, 40 insertions, 26 deletions

diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index 1c1f0f215849..7d484286e09f 100644
--- a/databases/postgresql84-client/Makefile
+++ b/databases/postgresql84-client/Makefile
@@ -3,7 +3,8 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX?=	${DISTV:S/.//}-client
+DISTV=	${DISTVERSION:R}
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql84-contrib/Makefile b/databases/postgresql84-contrib/Makefile
index 492125af795c..3eaa526c3f84 100644
--- a/databases/postgresql84-contrib/Makefile
+++ b/databases/postgresql84-contrib/Makefile
@@ -4,7 +4,8 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
-PKGNAMESUFFIX=	-contrib
+PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
+DISTV=	${DISTVERSION:R}
 
 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 7f07bc78e719..b96cb182116b 100644
--- a/databases/postgresql84-docs/Makefile
+++ b/databases/postgresql84-docs/Makefile
@@ -3,7 +3,8 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX=	-docs
+PKGNAMESUFFIX?=        ${DISTV:S/.//}-docs
+DISTV= ${DISTVERSION:R}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The PostgreSQL documentation set
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index d774953ed381..677a08db8001 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,7 +7,8 @@ PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	${DISTV:S/.//}-server
+DISTV=	${DISTVERSION:R}
 
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
@@ -23,7 +24,6 @@ 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 7562647fee5f..856be70da40f 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -3,7 +3,8 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX?=	${DISTV:S/.//}-client
+DISTV=	${DISTVERSION:R}
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile
index 5cff5cada007..3d6a3e1fb322 100644
--- a/databases/postgresql90-contrib/Makefile
+++ b/databases/postgresql90-contrib/Makefile
@@ -4,7 +4,8 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
-PKGNAMESUFFIX=	-contrib
+PKGNAMESUFFIX?=        ${DISTV:S/.//}-contrib
+DISTV= ${DISTVERSION:R}
 
 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 6fc45b719255..3fd127237e3e 100644
--- a/databases/postgresql90-plperl/Makefile
+++ b/databases/postgresql90-plperl/Makefile
@@ -3,7 +3,8 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases perl5
-PKGNAMESUFFIX=	-plperl
+PKGNAMESUFFIX?=	${DISTV:S/.//}-plperl
+DISTV=	${DISTVERSION:R}
 
 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 183d860c16bd..0e21cbbde52c 100644
--- a/databases/postgresql90-plpython/Makefile
+++ b/databases/postgresql90-plpython/Makefile
@@ -2,7 +2,8 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases python
-PKGNAMESUFFIX=	-plpython
+PKGNAMESUFFIX?=	${DISTV:S/.//}-plpython
+DISTV= ${DISTVERSION:R}
 
 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 75b5932a942f..7d5133e265a9 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -3,7 +3,8 @@
 
 DISTVERSION?=	9.0.13
 PORTREVISION=	0
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	${DISTV:S/.//}-server
+DISTV=	${DISTVERSION:R}
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
diff --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile
index 00977c164637..5d58768dc282 100644
--- a/databases/postgresql91-client/Makefile
+++ b/databases/postgresql91-client/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX?=	${DISTV:S/.//}-client
+DISTV=	${DISTVERSION:R}
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql91-contrib/Makefile b/databases/postgresql91-contrib/Makefile
index 2085093d1d26..7f02e9a79ed4 100644
--- a/databases/postgresql91-contrib/Makefile
+++ b/databases/postgresql91-contrib/Makefile
@@ -3,7 +3,8 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases
-PKGNAMESUFFIX=	-contrib
+PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
+DISTV=	${DISTVERSION:R}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile
index 8a8c62fef5dc..52bd9197b6b1 100644
--- a/databases/postgresql91-docs/Makefile
+++ b/databases/postgresql91-docs/Makefile
@@ -3,7 +3,8 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX=	-docs
+PKGNAMESUFFIX?=	${DISTV:S/.//}-docs
+DISTV=	${DISTVERSION:R}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The PostgreSQL documentation set
diff --git a/databases/postgresql91-pltcl/Makefile b/databases/postgresql91-pltcl/Makefile
index 30521adb5902..738bc311002d 100644
--- a/databases/postgresql91-pltcl/Makefile
+++ b/databases/postgresql91-pltcl/Makefile
@@ -4,10 +4,10 @@
 PORTNAME=	postgresql
 PORTREVISION=	3
 CATEGORIES=	databases tcl
-PKGNAMESUFFIX=	-pltcl
+PKGNAMESUFFIX?= ${DISTV:S/.//}-pltcl
 
 MAINTAINER=	pgsql@FreeBSD.org
-COMMENT=	A module for using Tcl to write SQL functions
+COMMENT=	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 c5356f8edf1a..452043bea08e 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -7,7 +7,8 @@ PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	${DISTV:S/.//}-server
+DISTV=	${DISTVERSION:R}
 
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
@@ -24,10 +25,8 @@ 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 55b98e32b26e..cf0d461f9d20 100644
--- a/databases/postgresql92-client/Makefile
+++ b/databases/postgresql92-client/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX?=	${DISTV:S/.//}-client
+DISTV=	${DISTVERSION:R}
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql92-contrib/Makefile b/databases/postgresql92-contrib/Makefile
index d614f3a48605..83ffcc3d491e 100644
--- a/databases/postgresql92-contrib/Makefile
+++ b/databases/postgresql92-contrib/Makefile
@@ -3,7 +3,8 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases
-PKGNAMESUFFIX=	-contrib
+PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
+DISTV=	${DISTVERSION:R}
 
 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 832377b62c35..fafaf4afe096 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -7,7 +7,8 @@ PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	${DISTV:S/.//}-server
+DISTV=	${DISTVERSION:R}
 
 MAINTAINER?=	pgsql@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
@@ -24,10 +25,8 @@ 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 cacadac97219..6aca865407b2 100644
--- a/databases/postgresql93-client/Makefile
+++ b/databases/postgresql93-client/Makefile
@@ -3,7 +3,8 @@
 
 PORTNAME=	postgresql
 PORTREVISION=	0
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX?=	${DISTV:S/.//}-client
+DISTV=	${DISTVERSION:R}
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql93-contrib/Makefile b/databases/postgresql93-contrib/Makefile
index 8b31f49cb7e8..dafdab90ab4c 100644
--- a/databases/postgresql93-contrib/Makefile
+++ b/databases/postgresql93-contrib/Makefile
@@ -4,7 +4,8 @@
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
-PKGNAMESUFFIX=	-contrib
+PKGNAMESUFFIX?=	${DISTV:S/.//}-contrib
+DISTV= ${DISTVERSION:R}
 
 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 2c4dde4e4aae..808577168c16 100644
--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@@ -3,7 +3,8 @@
 
 DISTVERSION?=	9.3.0
 PORTREVISION?=	1
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	${DISTV:S/.//}-server
+DISTV=	${DISTVERSION:R}
 
 MAINTAINER?=	pgsql@FreeBSD.org