Author: jgh
Date: Mon Oct 7 19:04:04 2013
New Revision: 329725
URL: http://svnweb.freebsd.org/changeset/ports/329725
Log:
- Fix pkg name collision
Reviewed by: crees@
With hat: pgsql@
Modified:
head/databases/postgresql84-client/Makefile
head/databases/postgresql84-contrib/Makefile
head/databases/postgresql84-docs/Makefile
head/databases/postgresql84-server/Makefile
head/databases/postgresql90-client/Makefile
head/databases/postgresql90-contrib/Makefile
head/databases/postgresql90-plperl/Makefile
head/databases/postgresql90-plpython/Makefile
head/databases/postgresql90-server/Makefile
head/databases/postgresql91-client/Makefile
head/databases/postgresql91-contrib/Makefile
head/databases/postgresql91-docs/Makefile
head/databases/postgresql91-pltcl/Makefile
head/databases/postgresql91-server/Makefile
head/databases/postgresql92-client/Makefile
head/databases/postgresql92-contrib/Makefile
head/databases/postgresql92-server/Makefile
head/databases/postgresql93-client/Makefile
head/databases/postgresql93-contrib/Makefile
head/databases/postgresql93-server/Makefile
Modified: head/databases/postgresql84-client/Makefile
==============================================================================
--- head/databases/postgresql84-client/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql84-client/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
PORTNAME= postgresql
PORTREVISION= 0
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX?= ${DISTV:S/.//}-client
+DISTV= ${DISTVERSION:R}
COMMENT= PostgreSQL database (client)
Modified: head/databases/postgresql84-contrib/Makefile
==============================================================================
--- head/databases/postgresql84-contrib/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql84-contrib/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -4,7 +4,8 @@
PORTNAME= postgresql
PORTREVISION= 0
CATEGORIES= databases
-PKGNAMESUFFIX= -contrib
+PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
+DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql at FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
Modified: head/databases/postgresql84-docs/Makefile
==============================================================================
--- head/databases/postgresql84-docs/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql84-docs/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
PORTNAME= postgresql
PORTREVISION= 0
-PKGNAMESUFFIX= -docs
+PKGNAMESUFFIX?= ${DISTV:S/.//}-docs
+DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql at FreeBSD.org
COMMENT= The PostgreSQL documentation set
Modified: head/databases/postgresql84-server/Makefile
==============================================================================
--- head/databases/postgresql84-server/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql84-server/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -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 at 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
Modified: head/databases/postgresql90-client/Makefile
==============================================================================
--- head/databases/postgresql90-client/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql90-client/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
PORTNAME= postgresql
PORTREVISION= 0
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX?= ${DISTV:S/.//}-client
+DISTV= ${DISTVERSION:R}
COMMENT= PostgreSQL database (client)
Modified: head/databases/postgresql90-contrib/Makefile
==============================================================================
--- head/databases/postgresql90-contrib/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql90-contrib/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -4,7 +4,8 @@
PORTNAME= postgresql
PORTREVISION= 0
CATEGORIES= databases
-PKGNAMESUFFIX= -contrib
+PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
+DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql at FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
Modified: head/databases/postgresql90-plperl/Makefile
==============================================================================
--- head/databases/postgresql90-plperl/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql90-plperl/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
PORTNAME= postgresql
CATEGORIES= databases perl5
-PKGNAMESUFFIX= -plperl
+PKGNAMESUFFIX?= ${DISTV:S/.//}-plperl
+DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql at FreeBSD.org
COMMENT= Write SQL functions for PostgreSQL using Perl5
Modified: head/databases/postgresql90-plpython/Makefile
==============================================================================
--- head/databases/postgresql90-plpython/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql90-plpython/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -2,7 +2,8 @@
PORTNAME= postgresql
CATEGORIES= databases python
-PKGNAMESUFFIX= -plpython
+PKGNAMESUFFIX?= ${DISTV:S/.//}-plpython
+DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql at FreeBSD.org
COMMENT= Module for using Python to write SQL functions
Modified: head/databases/postgresql90-server/Makefile
==============================================================================
--- head/databases/postgresql90-server/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql90-server/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
DISTVERSION?= 9.0.13
PORTREVISION= 0
-PKGNAMESUFFIX?= -server
+PKGNAMESUFFIX?= ${DISTV:S/.//}-server
+DISTV= ${DISTVERSION:R}
MAINTAINER?= pgsql at FreeBSD.org
Modified: head/databases/postgresql91-client/Makefile
==============================================================================
--- head/databases/postgresql91-client/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql91-client/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= postgresql
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX?= ${DISTV:S/.//}-client
+DISTV= ${DISTVERSION:R}
COMMENT= PostgreSQL database (client)
Modified: head/databases/postgresql91-contrib/Makefile
==============================================================================
--- head/databases/postgresql91-contrib/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql91-contrib/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
PORTNAME= postgresql
CATEGORIES= databases
-PKGNAMESUFFIX= -contrib
+PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
+DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql at FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
Modified: head/databases/postgresql91-docs/Makefile
==============================================================================
--- head/databases/postgresql91-docs/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql91-docs/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
PORTNAME= postgresql
PORTREVISION= 0
-PKGNAMESUFFIX= -docs
+PKGNAMESUFFIX?= ${DISTV:S/.//}-docs
+DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql at FreeBSD.org
COMMENT= The PostgreSQL documentation set
Modified: head/databases/postgresql91-pltcl/Makefile
==============================================================================
--- head/databases/postgresql91-pltcl/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql91-pltcl/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -4,10 +4,10 @@
PORTNAME= postgresql
PORTREVISION= 3
CATEGORIES= databases tcl
-PKGNAMESUFFIX= -pltcl
+PKGNAMESUFFIX?= ${DISTV:S/.//}-pltcl
MAINTAINER= pgsql at 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
Modified: head/databases/postgresql91-server/Makefile
==============================================================================
--- head/databases/postgresql91-server/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql91-server/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -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 at FreeBSD.org
COMMENT?= The most advanced open-source database available anywhere
@@ -24,10 +25,8 @@ ICU_PATCHFILE?= pg-910-icu-2012-12-19.di
.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}
Modified: head/databases/postgresql92-client/Makefile
==============================================================================
--- head/databases/postgresql92-client/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql92-client/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= postgresql
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX?= ${DISTV:S/.//}-client
+DISTV= ${DISTVERSION:R}
COMMENT= PostgreSQL database (client)
Modified: head/databases/postgresql92-contrib/Makefile
==============================================================================
--- head/databases/postgresql92-contrib/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql92-contrib/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
PORTNAME= postgresql
CATEGORIES= databases
-PKGNAMESUFFIX= -contrib
+PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
+DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql at FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
Modified: head/databases/postgresql92-server/Makefile
==============================================================================
--- head/databases/postgresql92-server/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql92-server/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -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 at FreeBSD.org
COMMENT?= The most advanced open-source database available anywhere
@@ -24,10 +25,8 @@ ICU_PATCHFILE?= pg-910-icu-2012-12-19.di
.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}
Modified: head/databases/postgresql93-client/Makefile
==============================================================================
--- head/databases/postgresql93-client/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql93-client/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
PORTNAME= postgresql
PORTREVISION= 0
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX?= ${DISTV:S/.//}-client
+DISTV= ${DISTVERSION:R}
COMMENT= PostgreSQL database (client)
Modified: head/databases/postgresql93-contrib/Makefile
==============================================================================
--- head/databases/postgresql93-contrib/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql93-contrib/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -4,7 +4,8 @@
PORTNAME= postgresql
PORTREVISION= 0
CATEGORIES= databases
-PKGNAMESUFFIX= -contrib
+PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
+DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql at FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
Modified: head/databases/postgresql93-server/Makefile
==============================================================================
--- head/databases/postgresql93-server/Makefile Mon Oct 7 19:01:37 2013 (r329724)
+++ head/databases/postgresql93-server/Makefile Mon Oct 7 19:04:04 2013 (r329725)
@@ -3,7 +3,8 @@
DISTVERSION?= 9.3.0
PORTREVISION?= 1
-PKGNAMESUFFIX?= -server
+PKGNAMESUFFIX?= ${DISTV:S/.//}-server
+DISTV= ${DISTVERSION:R}
MAINTAINER?= pgsql at FreeBSD.org