aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/Uses/pgsql.mk4
-rw-r--r--databases/postgresql-libpgeasy/Makefile2
-rw-r--r--databases/postgresql-libpqxx/Makefile2
-rw-r--r--databases/postgresql-libpqxx3/Makefile2
-rw-r--r--databases/postgresql-odbc/Makefile2
-rw-r--r--databases/postgresql-pllua/Makefile2
-rw-r--r--databases/postgresql-plproxy/Makefile15
-rw-r--r--databases/postgresql-plruby/Makefile8
-rw-r--r--databases/postgresql-relay/Makefile2
-rw-r--r--databases/postgresql-repmgr/Makefile5
-rw-r--r--databases/postgresql84-client/Makefile2
-rw-r--r--databases/postgresql84-contrib/Makefile7
-rw-r--r--databases/postgresql84-docs/Makefile5
-rw-r--r--databases/postgresql84-plperl/Makefile2
-rw-r--r--databases/postgresql84-plpython/Makefile2
-rw-r--r--databases/postgresql84-pltcl/Makefile2
-rw-r--r--databases/postgresql84-server/Makefile3
-rw-r--r--databases/postgresql90-client/Makefile2
-rw-r--r--databases/postgresql90-contrib/Makefile6
-rw-r--r--databases/postgresql90-docs/Makefile2
-rw-r--r--databases/postgresql90-plperl/Makefile8
-rw-r--r--databases/postgresql90-plpython/Makefile7
-rw-r--r--databases/postgresql90-pltcl/Makefile2
-rw-r--r--databases/postgresql91-client/Makefile2
-rw-r--r--databases/postgresql91-contrib/Makefile6
-rw-r--r--databases/postgresql91-docs/Makefile6
-rw-r--r--databases/postgresql91-plperl/Makefile2
-rw-r--r--databases/postgresql91-plpython/Makefile2
-rw-r--r--databases/postgresql91-pltcl/Makefile10
-rw-r--r--databases/postgresql91-server/Makefile3
-rw-r--r--databases/postgresql92-client/Makefile2
-rw-r--r--databases/postgresql92-contrib/Makefile6
-rw-r--r--databases/postgresql92-docs/Makefile2
-rw-r--r--databases/postgresql92-plperl/Makefile2
-rw-r--r--databases/postgresql92-plpython/Makefile2
-rw-r--r--databases/postgresql92-pltcl/Makefile2
-rw-r--r--databases/postgresql92-server/Makefile3
-rw-r--r--databases/postgresql93-client/Makefile2
-rw-r--r--databases/postgresql_autodoc/Makefile2
39 files changed, 61 insertions, 87 deletions
diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index 457d37a8d924..3cae60155002 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -64,13 +64,13 @@ _PGSQL_VER!= ${PG_CONFIG} --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]
. if defined(pgsql_ARGS)
. if ${pgsql_ARGS:M*+}
. for version in ${VALID_PGSQL_VER}
-. if ${pgsql_ARGS:S/+//} <= ${version:S/.//}
+. if ${pgsql_ARGS:S/+//} <= ${version}
_WANT_PGSQL_VER+=${version}
. endif
. endfor
. elif ${pgsql_ARGS:M*-}
. for version in ${VALID_PGSQL_VER}
-. if ${pgsql_ARGS:S/-//} >= ${version:S/.//}
+. if ${pgsql_ARGS:S/-//} >= ${version}
_WANT_PGSQL_VER+=${version}
. endif
. endfor
diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile
index 733753916455..25135cc0d6b2 100644
--- a/databases/postgresql-libpgeasy/Makefile
+++ b/databases/postgresql-libpgeasy/Makefile
@@ -15,7 +15,7 @@ COMMENT= Easy-to-use C interface to PostgreSQL
OPTIONS_DEFINE= DOCS EXAMPLES
-USES= gmake libtool pgsql
+USES+= gmake libtool pgsql
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
DOCSDIR= ${PREFIX}/share/doc/postgresql/${PORTNAME}
diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index 1842fd53e8e3..67cde41a5137 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -18,7 +18,7 @@ CONFLICTS= postgresql-libpqxx-3.* postgresql-libpqxx3-3.*
PORTSCOUT= limit:^2\.
USE_PYTHON_BUILD= yes
-USES= gmake libtool pgsql shebangfix
+USES+= gmake libtool pgsql shebangfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
PLIST_SUB= PORTVERSION=${PORTVERSION:R}
diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index 6f6576d086d2..84ef7ba7461c 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -16,7 +16,7 @@ COMMENT= New C++ interface for PostgreSQL
CONFLICTS= postgresql-libpqxx-[2-4].*
PORTSCOUT= limit:^2\.
-USES= gmake libtool pgsql pkgconfig shebangfix
+USES+= gmake libtool pgsql pkgconfig shebangfix
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
PLIST_SUB= PORTVERSION=${PORTVERSION}
diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile
index 2b3c16fdf4c9..a264c09a6898 100644
--- a/databases/postgresql-odbc/Makefile
+++ b/databases/postgresql-odbc/Makefile
@@ -15,7 +15,7 @@ COMMENT= PostgreSQL ODBC driver
LICENSE= LGPL20
-USES= libtool pgsql
+USES+= libtool pgsql
USE_OPENSSL= yes
USE_LDCONFIG= yes
diff --git a/databases/postgresql-pllua/Makefile b/databases/postgresql-pllua/Makefile
index a22c06582f2d..1dd024239a08 100644
--- a/databases/postgresql-pllua/Makefile
+++ b/databases/postgresql-pllua/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= postgresql-
MAINTAINER= sunghyuk@gmail.com
COMMENT= PL/Lua procedural language for PostgreSQL database
-USES= gmake lua pgsql:91-
+USES+= gmake lua pgsql:9.1-
INSTALL_TARGET= install-strip
SUB_FILES= pkg-message
diff --git a/databases/postgresql-plproxy/Makefile b/databases/postgresql-plproxy/Makefile
index 3c6bf158d971..d5527aab155f 100644
--- a/databases/postgresql-plproxy/Makefile
+++ b/databases/postgresql-plproxy/Makefile
@@ -12,24 +12,13 @@ COMMENT= PL/Proxy - database partitioning system
LICENSE= BSD
-USES= bison gmake
-USE_PGSQL= yes
+USES+= bison gmake pgsql
PORTSCOUT= site:http://pgfoundry.org/frs/?group_id=1000207
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/bin/postmaster)
-PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \
- ${SED} -En 's/.*PostgreSQL[^0-9]*([0-9]+)\.([0-9]+)\..*/\1\2/p'
-.elif exists(${LOCALBASE}/bin/pg_config)
-PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | \
- ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)[^0-9].*/\1\2/p'
-.else
-PGSQL_VER= ${DEFAULT_PGSQL_VER}
-.endif
-
-.if ${PGSQL_VER} > 91
+.if ${PGSQL_VER} > 9.1
PLIST_SUB+= NEW_CONTRIB_DIR="" OLD_CONTRIB_DIR="@comment "
.else
PLIST_SUB+= NEW_CONTRIB_DIR="@comment " OLD_CONTRIB_DIR=""
diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile
index 32fd82b425a6..0c7f1060c849 100644
--- a/databases/postgresql-plruby/Makefile
+++ b/databases/postgresql-plruby/Makefile
@@ -15,8 +15,8 @@ GH_ACCOUNT= CraigCottingham
GH_TAGNAME= ${GH_COMMIT}
GH_COMMIT= f8d9ced
-USES= uidfix tar:bzip2
-USE_PGSQL= server
+USES+= uidfix tar:bzip2 pgsql
+WANT_PGSQL= server
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
USE_RUBY_RDOC= yes
@@ -51,8 +51,6 @@ post-build:
cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc
.endif
-.include <bsd.port.pre.mk>
-
post-install:
@${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
${INSTALL_DATA} ${WRKDIR}/createlang.sql ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
@@ -67,4 +65,4 @@ post-install:
>> ${TMPPLIST}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/postgresql-relay/Makefile b/databases/postgresql-relay/Makefile
index f7d773df9e90..09e874c15e1f 100644
--- a/databases/postgresql-relay/Makefile
+++ b/databases/postgresql-relay/Makefile
@@ -14,7 +14,7 @@ PLIST_FILES= bin/postgresql-relay etc/postgresql-relay.conf-sample \
man/man8/postgresql-relay.8.gz
USE_RC_SUBR= postgresql-relay
-USES= perl5
+USES+= perl5
USE_PERL5= build
do-install:
diff --git a/databases/postgresql-repmgr/Makefile b/databases/postgresql-repmgr/Makefile
index ae7f8a664825..69153fe1c17d 100644
--- a/databases/postgresql-repmgr/Makefile
+++ b/databases/postgresql-repmgr/Makefile
@@ -15,9 +15,8 @@ LICENSE= GPLv3
RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync
-USES= gmake
-USE_PGSQL= server
-WANT_PGSQL_VER= 90+
+USES+= gmake pgsql:9.0+
+WANT_PGSQL= server
MAKE_ENV= USE_PGXS=1
OPTIONS_DEFINE= DOCS
diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index 45474043cf33..39835e985645 100644
--- a/databases/postgresql84-client/Makefile
+++ b/databases/postgresql84-client/Makefile
@@ -15,6 +15,6 @@ BUILD_DIRS= config src/include src/interfaces src/port \
CLIENT_ONLY= yes
COMPONENT= -client
USE_LDCONFIG= yes
-USES= readline
+USES+= readline
.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql84-contrib/Makefile b/databases/postgresql84-contrib/Makefile
index 97bf5bbe98ac..feff083af4c9 100644
--- a/databases/postgresql84-contrib/Makefile
+++ b/databases/postgresql84-contrib/Makefile
@@ -12,11 +12,10 @@ COMMENT= The contrib utilities from the PostgreSQL distribution
LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \
libxml2.so:${PORTSDIR}/textproc/libxml2
-USE_PGSQL= yes
-DEFAULT_PGSQL_VER=84
-MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
+USES+= pgsql:8.4
+MASTERDIR= ${.CURDIR}/../postgresql84-server
-USES= bison
+USES+= bison
BUILD_DIRS= src/port contrib
INSTALL_DIRS= contrib
diff --git a/databases/postgresql84-docs/Makefile b/databases/postgresql84-docs/Makefile
index 2ed42fa0d850..e4958428400c 100644
--- a/databases/postgresql84-docs/Makefile
+++ b/databases/postgresql84-docs/Makefile
@@ -9,10 +9,9 @@ DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= The PostgreSQL documentation set
-MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
+MASTERDIR= ${.CURDIR}/../../databases/postgresql84-server
-USE_PGSQL= yes
-WANT_PGSQL_VER?=84
+USES+= pgsql:8.4
NO_BUILD= YES
SLAVE_ONLY= YES
diff --git a/databases/postgresql84-plperl/Makefile b/databases/postgresql84-plperl/Makefile
index 58c84e6cca4a..3b8f49575338 100644
--- a/databases/postgresql84-plperl/Makefile
+++ b/databases/postgresql84-plperl/Makefile
@@ -1,6 +1,6 @@
# Created by: Palle Girgensohn <girgen@partitur.se>
# $FreeBSD$
-WANT_PGSQL_VER= 84
+WANT_PGSQL_VER= 8.4
.include "${.CURDIR}/../postgresql90-plperl/Makefile"
diff --git a/databases/postgresql84-plpython/Makefile b/databases/postgresql84-plpython/Makefile
index 21432d129dd9..b213c2e234a8 100644
--- a/databases/postgresql84-plpython/Makefile
+++ b/databases/postgresql84-plpython/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
USE_PYTHON= 2
-WANT_PGSQL_VER= 84
+WANT_PGSQL_VER= 8.4
.include "${.CURDIR}/../postgresql90-plpython/Makefile"
diff --git a/databases/postgresql84-pltcl/Makefile b/databases/postgresql84-pltcl/Makefile
index da81cca080e3..6abeadc992fe 100644
--- a/databases/postgresql84-pltcl/Makefile
+++ b/databases/postgresql84-pltcl/Makefile
@@ -1,6 +1,6 @@
# Created by: Palle Girgensohn <girgen@partitur.se>
# $FreeBSD$
-WANT_PGSQL_VER?=84
+WANT_PGSQL_VER?=8.4
.include "${.CURDIR}/../postgresql91-pltcl/Makefile"
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 6ce5c553b4e0..3a2cfae923ca 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -57,8 +57,7 @@ INSTALL_DIRS?= ${BUILD_DIRS}
SERVER_ONLY= yes
COMPONENT= -server
USE_RC_SUBR= postgresql
-USE_PGSQL= yes
-WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
+USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g}
USERS= ${PG_USER}
GROUPS= ${PG_GROUP}
SUB_FILES+= 502.pgsql
diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index 4b04da60f60a..85bf09cc1dad 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -16,6 +16,6 @@ INSTALL_DIRS= ${BUILD_DIRS}
CLIENT_ONLY= yes
COMPONENT= -client
USE_LDCONFIG= yes
-USES= readline
+USES+= readline
.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile
index 1af6aeb8e061..c6fca1cb6208 100644
--- a/databases/postgresql90-contrib/Makefile
+++ b/databases/postgresql90-contrib/Makefile
@@ -12,11 +12,9 @@ COMMENT= The contrib utilities from the PostgreSQL distribution
LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \
libxml2.so:${PORTSDIR}/textproc/libxml2
-USE_PGSQL= yes
-DEFAULT_PGSQL_VER=90
-MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
+MASTERDIR= ${.CURDIR}/../postgresql90-server
-USES= bison
+USES+= bison pgsql:9.0
BUILD_DIRS= src/port contrib
INSTALL_DIRS= contrib
diff --git a/databases/postgresql90-docs/Makefile b/databases/postgresql90-docs/Makefile
index 9d438b7b83a1..cc44c8dea0ce 100644
--- a/databases/postgresql90-docs/Makefile
+++ b/databases/postgresql90-docs/Makefile
@@ -1,7 +1,7 @@
# Created by: Palle Girgensohn <girgen@pingpong.net>
# $FreeBSD$
-WANT_PGSQL_VER=90
+WANT_PGSQL_VER= 9.0
COMPONENT= -docs
.include "${.CURDIR}/../postgresql91-docs/Makefile"
diff --git a/databases/postgresql90-plperl/Makefile b/databases/postgresql90-plperl/Makefile
index 642a66ec131d..e35abbd7c0b7 100644
--- a/databases/postgresql90-plperl/Makefile
+++ b/databases/postgresql90-plperl/Makefile
@@ -8,13 +8,13 @@ PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= Write SQL functions for PostgreSQL using Perl5
-RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql${WANT_PGSQL_VER}-server
+RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
+MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-WANT_PGSQL_VER?=90
+WANT_PGSQL_VER?=9.0
-USES= perl5 readline
+USES+= perl5 readline
CONFIGURE_ARGS= --with-perl
BUILD_DIRS= src/backend src/pl/plperl
diff --git a/databases/postgresql90-plpython/Makefile b/databases/postgresql90-plpython/Makefile
index ccf6f2a45cc4..3b61ed2b0134 100644
--- a/databases/postgresql90-plpython/Makefile
+++ b/databases/postgresql90-plpython/Makefile
@@ -7,11 +7,12 @@ PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= Module for using Python to write SQL functions
-USE_PGSQL= server
+USES+= pgsql:${WANT_PGSQL_VER}
+WANT_PGSQL= server
-MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server
+MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server
-WANT_PGSQL_VER?= 90
+WANT_PGSQL_VER?= 9.0
USE_PYTHON?= yes
CONFIGURE_ARGS= --with-python
diff --git a/databases/postgresql90-pltcl/Makefile b/databases/postgresql90-pltcl/Makefile
index 9c6906b5b939..e7b1065f41ef 100644
--- a/databases/postgresql90-pltcl/Makefile
+++ b/databases/postgresql90-pltcl/Makefile
@@ -1,6 +1,6 @@
# Created by: Palle Girgensohn <girgen@partitur.se>
# $FreeBSD$
-WANT_PGSQL_VER?=90
+WANT_PGSQL_VER?=9.0
.include "${.CURDIR}/../postgresql91-pltcl/Makefile"
diff --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile
index 7eec899450a0..93e41dd00496 100644
--- a/databases/postgresql91-client/Makefile
+++ b/databases/postgresql91-client/Makefile
@@ -16,6 +16,6 @@ INSTALL_DIRS= ${BUILD_DIRS}
CLIENT_ONLY= yes
COMPONENT= -client
USE_LDCONFIG= yes
-USES= readline
+USES+= readline
.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql91-contrib/Makefile b/databases/postgresql91-contrib/Makefile
index e3ccf61db488..9bbfc812746e 100644
--- a/databases/postgresql91-contrib/Makefile
+++ b/databases/postgresql91-contrib/Makefile
@@ -12,11 +12,9 @@ COMMENT= The contrib utilities from the PostgreSQL distribution
LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \
libxml2.so:${PORTSDIR}/textproc/libxml2
-USE_PGSQL= yes
-DEFAULT_PGSQL_VER=91
-MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
+MASTERDIR= ${.CURDIR}/../postgresql91-server
-USES= bison
+USES+= bison pgsql:9.1
BUILD_DIRS= src/port contrib
INSTALL_DIRS= contrib
diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile
index 17212693aab2..c2c3fd30f24f 100644
--- a/databases/postgresql91-docs/Makefile
+++ b/databases/postgresql91-docs/Makefile
@@ -9,10 +9,10 @@ DISTV= ${DISTVERSION:R}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= The PostgreSQL documentation set
-MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
+MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-USE_PGSQL= YES
-WANT_PGSQL_VER?=91
+USES+= pgsql:${WANT_PGSQL_VER}
+WANT_PGSQL_VER?=9.1
SLAVE_ONLY= YES
COMPONENT= -docs
diff --git a/databases/postgresql91-plperl/Makefile b/databases/postgresql91-plperl/Makefile
index 690f32e46b4c..13ea9ecd3b67 100644
--- a/databases/postgresql91-plperl/Makefile
+++ b/databases/postgresql91-plperl/Makefile
@@ -1,7 +1,7 @@
# Created by: Palle Girgensohn <girgen@partitur.se>
# $FreeBSD$
-WANT_PGSQL_VER= 91
+WANT_PGSQL_VER= 9.1
COMPONENT= -plperl
.include "${.CURDIR}/../postgresql90-plperl/Makefile"
diff --git a/databases/postgresql91-plpython/Makefile b/databases/postgresql91-plpython/Makefile
index f5fe4f38ee99..949444df6811 100644
--- a/databases/postgresql91-plpython/Makefile
+++ b/databases/postgresql91-plpython/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-WANT_PGSQL_VER= 91
+WANT_PGSQL_VER= 9.1
.include "${.CURDIR}/../postgresql90-plpython/Makefile"
diff --git a/databases/postgresql91-pltcl/Makefile b/databases/postgresql91-pltcl/Makefile
index 4efe62766e5e..5a26b7437557 100644
--- a/databases/postgresql91-pltcl/Makefile
+++ b/databases/postgresql91-pltcl/Makefile
@@ -9,15 +9,13 @@ PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER= pgsql@FreeBSD.org
COMMENT= Module for using Tcl to write SQL functions
-MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server
+MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-BUILD_DEPENDS= postgres:${POSTGRESQL_PORT}
-RUN_DEPENDS= postgres:${POSTGRESQL_PORT}
-POSTGRESQL_PORT?=${PORTSDIR}/databases/postgresql${WANT_PGSQL_VER}-server
+WANT_PGSQL_VER?=9.1
-WANT_PGSQL_VER?=91
+USES+= tcl pgsql:${WANT_PGSQL_VER}
+WANT_PGSQL= server
-USES= tcl
CONFIGURE_ARGS= --with-tcl --without-tk \
--with-tclconfig="${TCL_LIBDIR}" \
--with-includes="${TCL_INCLUDEDIR}"
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 2d53f5bb53dc..f1ae4d7dd9a6 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -63,8 +63,7 @@ BUILD_DIRS?= src/port ${INSTALL_DIRS}
COMPONENT= -server
SERVER_ONLY= yes
USE_RC_SUBR= postgresql
-USE_PGSQL= yes
-WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
+USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g}
USERS= ${PG_USER}
GROUPS= ${PG_GROUP}
SUB_FILES+= 502.pgsql
diff --git a/databases/postgresql92-client/Makefile b/databases/postgresql92-client/Makefile
index e3c91bf4f0df..27bb0d963dbf 100644
--- a/databases/postgresql92-client/Makefile
+++ b/databases/postgresql92-client/Makefile
@@ -16,6 +16,6 @@ INSTALL_DIRS= ${BUILD_DIRS}
CLIENT_ONLY= yes
COMPONENT= -client
USE_LDCONFIG= yes
-USES= readline
+USES+= readline
.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql92-contrib/Makefile b/databases/postgresql92-contrib/Makefile
index 25d22890634c..e1744a8bb3c7 100644
--- a/databases/postgresql92-contrib/Makefile
+++ b/databases/postgresql92-contrib/Makefile
@@ -12,11 +12,9 @@ COMMENT= The contrib utilities from the PostgreSQL distribution
LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \
libxml2.so:${PORTSDIR}/textproc/libxml2
-USE_PGSQL= yes
-DEFAULT_PGSQL_VER=92
-MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
+MASTERDIR= ${.CURDIR}/../postgresql92-server
-USES= bison
+USES+= bison pgsql:9.2
BUILD_DIRS= src/port contrib
INSTALL_DIRS= contrib
diff --git a/databases/postgresql92-docs/Makefile b/databases/postgresql92-docs/Makefile
index 71003c31ccac..5b6345ad2e78 100644
--- a/databases/postgresql92-docs/Makefile
+++ b/databases/postgresql92-docs/Makefile
@@ -1,7 +1,7 @@
# Created by: Palle Girgensohn <girgen@pingpong.net>
# $FreeBSD$
-WANT_PGSQL_VER=92
+WANT_PGSQL_VER=9.2
COMPONENT= -docs
.include "${.CURDIR}/../postgresql91-docs/Makefile"
diff --git a/databases/postgresql92-plperl/Makefile b/databases/postgresql92-plperl/Makefile
index a30fe0e5fe72..d85be6f89792 100644
--- a/databases/postgresql92-plperl/Makefile
+++ b/databases/postgresql92-plperl/Makefile
@@ -1,6 +1,6 @@
# Created by: Palle Girgensohn <girgen@partitur.se>
# $FreeBSD$
-WANT_PGSQL_VER= 92
+WANT_PGSQL_VER= 9.2
.include "${.CURDIR}/../postgresql90-plperl/Makefile"
diff --git a/databases/postgresql92-plpython/Makefile b/databases/postgresql92-plpython/Makefile
index 0fccab61ab19..53af6df32ada 100644
--- a/databases/postgresql92-plpython/Makefile
+++ b/databases/postgresql92-plpython/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-WANT_PGSQL_VER= 92
+WANT_PGSQL_VER= 9.2
.include "${.CURDIR}/../postgresql90-plpython/Makefile"
diff --git a/databases/postgresql92-pltcl/Makefile b/databases/postgresql92-pltcl/Makefile
index 32916acef9f0..28630810b880 100644
--- a/databases/postgresql92-pltcl/Makefile
+++ b/databases/postgresql92-pltcl/Makefile
@@ -1,6 +1,6 @@
# Created by: Palle Girgensohn <girgen@partitur.se>
# $FreeBSD$
-WANT_PGSQL_VER= 92
+WANT_PGSQL_VER= 9.2
.include "${.CURDIR}/../postgresql91-pltcl/Makefile"
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 6c6b78a8b5da..5440519a4dd0 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -63,8 +63,7 @@ BUILD_DIRS?= src/port ${INSTALL_DIRS}
SERVER_ONLY= yes
COMPONENT= -server
USE_RC_SUBR= postgresql
-USE_PGSQL= yes
-WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
+USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g}
USERS= ${PG_USER}
GROUPS= ${PG_GROUP}
SUB_FILES+= 502.pgsql
diff --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile
index c87d5cd80b32..4d768955057e 100644
--- a/databases/postgresql93-client/Makefile
+++ b/databases/postgresql93-client/Makefile
@@ -17,6 +17,6 @@ INSTALL_DIRS= ${BUILD_DIRS}
CLIENT_ONLY= yes
COMPONENT= -client
USE_LDCONFIG= yes
-USES= pkgconfig readline
+USES+= pkgconfig readline
.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql_autodoc/Makefile b/databases/postgresql_autodoc/Makefile
index 1bac97e1aca4..23c0f30d7531 100644
--- a/databases/postgresql_autodoc/Makefile
+++ b/databases/postgresql_autodoc/Makefile
@@ -13,7 +13,7 @@ BUILD_DEPENDS= p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-USES= gmake perl5
+USES+= gmake perl5
CONFIGURE_ARGS+=--datadir=${DATADIR}
WRKSRC= ${WRKDIR}/postgresql_autodoc