aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/postgresql84-client/Makefile3
-rw-r--r--databases/postgresql84-contrib/Makefile6
-rw-r--r--databases/postgresql84-server/Makefile3
-rw-r--r--databases/postgresql90-client/Makefile3
-rw-r--r--databases/postgresql90-contrib/Makefile7
-rw-r--r--databases/postgresql90-server/Makefile3
-rw-r--r--databases/postgresql91-client/Makefile3
-rw-r--r--databases/postgresql91-contrib/Makefile7
-rw-r--r--databases/postgresql91-server/Makefile3
-rw-r--r--databases/postgresql92-client/Makefile3
-rw-r--r--databases/postgresql92-contrib/Makefile7
-rw-r--r--databases/postgresql92-server/Makefile3
-rw-r--r--databases/postgresql93-client/Makefile3
-rw-r--r--databases/postgresql93-contrib/Makefile7
-rw-r--r--databases/postgresql93-server/Makefile3
15 files changed, 25 insertions, 39 deletions
diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index 7737e2d5ff2e..5458ecee2602 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?= ${DISTVERSION:R:S/.//}${COMPONENT}
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql84-contrib/Makefile b/databases/postgresql84-contrib/Makefile
index e6f938214adb..bdc215098889 100644
--- a/databases/postgresql84-contrib/Makefile
+++ b/databases/postgresql84-contrib/Makefile
@@ -4,13 +4,13 @@
PORTNAME= postgresql
PORTREVISION= 0
CATEGORIES= databases
-PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \
+ libxml2.so:${PORTSDIR}/textproc/libxml2
USE_PGSQL= yes
DEFAULT_PGSQL_VER=84
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 93fe02afcfb6..8d6c250d0324 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-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?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
COMMENT?= The most advanced open-source database available anywhere
diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index 717da0f556cb..ab5da238bd7f 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?= ${DISTVERSION:R:S/.//}${COMPONENT}
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile
index 6015c6a5cadb..891d0bd78dad 100644
--- a/databases/postgresql90-contrib/Makefile
+++ b/databases/postgresql90-contrib/Makefile
@@ -4,14 +4,13 @@
PORTNAME= postgresql
PORTREVISION= 0
CATEGORIES= databases
-PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt \
- xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \
+ libxml2.so:${PORTSDIR}/textproc/libxml2
USE_PGSQL= yes
DEFAULT_PGSQL_VER=90
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index e3317dbc7833..78d7bcdccc1f 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -3,8 +3,7 @@
DISTVERSION?= 9.0.14
PORTREVISION= 0
-PKGNAMESUFFIX?= ${DISTV:S/.//}-server
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile
index 42bea30cb02a..9ade2ae4bd60 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?= ${DISTVERSION:R:S/.//}${COMPONENT}
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql91-contrib/Makefile b/databases/postgresql91-contrib/Makefile
index 7b95d08d0b02..d389f3cdf2a6 100644
--- a/databases/postgresql91-contrib/Makefile
+++ b/databases/postgresql91-contrib/Makefile
@@ -3,14 +3,13 @@
PORTNAME= postgresql
CATEGORIES= databases
-PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt \
- xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \
+ libxml2.so:${PORTSDIR}/textproc/libxml2
USE_PGSQL= yes
DEFAULT_PGSQL_VER=91
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 3978f7fc7af6..ba6124052bb6 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?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
COMMENT?= The most advanced open-source database available anywhere
diff --git a/databases/postgresql92-client/Makefile b/databases/postgresql92-client/Makefile
index 0e69b4623d6f..44ce72afbd80 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?= ${DISTVERSION:R:S/.//}${COMPONENT}
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql92-contrib/Makefile b/databases/postgresql92-contrib/Makefile
index c3548774d873..258ae044ce88 100644
--- a/databases/postgresql92-contrib/Makefile
+++ b/databases/postgresql92-contrib/Makefile
@@ -3,14 +3,13 @@
PORTNAME= postgresql
CATEGORIES= databases
-PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt \
- xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \
+ libxml2.so:${PORTSDIR}/textproc/libxml2
USE_PGSQL= yes
DEFAULT_PGSQL_VER=92
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 52c661bcf3e0..31292c62080e 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?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
COMMENT?= The most advanced open-source database available anywhere
diff --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile
index ba318ae41afb..c5e5ca84080c 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?= ${DISTVERSION:R:S/.//}${COMPONENT}
COMMENT= PostgreSQL database (client)
diff --git a/databases/postgresql93-contrib/Makefile b/databases/postgresql93-contrib/Makefile
index 9d300791a8c7..ca83040460a6 100644
--- a/databases/postgresql93-contrib/Makefile
+++ b/databases/postgresql93-contrib/Makefile
@@ -4,14 +4,13 @@
PORTNAME= postgresql
PORTREVISION= 0
CATEGORIES= databases
-PKGNAMESUFFIX?= ${DISTV:S/.//}-contrib
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt \
- xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \
+ libxml2.so:${PORTSDIR}/textproc/libxml2
USE_PGSQL= yes
DEFAULT_PGSQL_VER=93
diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile
index efeb4483c613..8ff807a73875 100644
--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@@ -3,8 +3,7 @@
DISTVERSION?= 9.3.1
PORTREVISION?= 0
-PKGNAMESUFFIX?= ${DISTV:S/.//}-server
-DISTV= ${DISTVERSION:R}
+PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org