From 62b577313b0d65704b72bd2d1187e3bf4df38994 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 25 May 2004 09:19:42 +0000 Subject: Remove databases/postgresql-client because there can't be a -server, and having it installed prevents databases/postgresql7 from being installed, leading to some dependencies problems --- databases/Makefile | 1 - databases/libdbi-drivers/Makefile | 2 +- databases/p5-DBD-Pg-13/Makefile | 2 +- databases/p5-DBD-Pg/Makefile | 2 +- databases/pgadmin3-12/Makefile | 2 +- databases/pgadmin3/Makefile | 2 +- databases/pgbash/Makefile | 2 +- databases/postgresql-client/Makefile | 16 ---------------- 8 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 databases/postgresql-client/Makefile (limited to 'databases') diff --git a/databases/Makefile b/databases/Makefile index edba0b68ef60..8376699c3e1b 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -205,7 +205,6 @@ SUBDIR += php-sqlrelay SUBDIR += phpmyadmin SUBDIR += phppgadmin - SUBDIR += postgresql-client SUBDIR += postgresql-contrib SUBDIR += postgresql-devel SUBDIR += postgresql-docs diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile index f94360ec5ead..629168df3f95 100644 --- a/databases/libdbi-drivers/Makefile +++ b/databases/libdbi-drivers/Makefile @@ -33,7 +33,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if defined(WITH_PGSQL) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql-client +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 CONFIGURE_ARGS+= --with-pgsql PLIST_SUB+= PGSQL="" .else diff --git a/databases/p5-DBD-Pg-13/Makefile b/databases/p5-DBD-Pg-13/Makefile index b346380513a2..7de655aaf1e9 100644 --- a/databases/p5-DBD-Pg-13/Makefile +++ b/databases/p5-DBD-Pg-13/Makefile @@ -18,7 +18,7 @@ COMMENT= Provides access to PostgreSQL databases through the DBI LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} -POSTGRESQL_PORT?= databases/postgresql-client +POSTGRESQL_PORT?= databases/postgresql7 PERL_CONFIGURE= yes diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile index b346380513a2..7de655aaf1e9 100644 --- a/databases/p5-DBD-Pg/Makefile +++ b/databases/p5-DBD-Pg/Makefile @@ -18,7 +18,7 @@ COMMENT= Provides access to PostgreSQL databases through the DBI LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} -POSTGRESQL_PORT?= databases/postgresql-client +POSTGRESQL_PORT?= databases/postgresql7 PERL_CONFIGURE= yes diff --git a/databases/pgadmin3-12/Makefile b/databases/pgadmin3-12/Makefile index 2197ee511b50..ac3192554585 100644 --- a/databases/pgadmin3-12/Makefile +++ b/databases/pgadmin3-12/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ARGS= --with-wx=${X11BASE} CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -POSTGRESQL_PORT?= databases/postgresql-client +POSTGRESQL_PORT?= databases/postgresql7 .include diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 2197ee511b50..ac3192554585 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ARGS= --with-wx=${X11BASE} CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -POSTGRESQL_PORT?= databases/postgresql-client +POSTGRESQL_PORT?= databases/postgresql7 .include diff --git a/databases/pgbash/Makefile b/databases/pgbash/Makefile index 99831ca83396..70ce1c5f0a96 100644 --- a/databases/pgbash/Makefile +++ b/databases/pgbash/Makefile @@ -19,7 +19,7 @@ EXTRACT_ONLY= pgbash-7.3.tar.gz MAINTAINER= sascha@root-login.org COMMENT= SQL Bash Shell for PostgreSQL -LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql-client +LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql7 WRKSRC= ${WRKDIR}/pgbash-7.3/src/bash-2.05a diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile deleted file mode 100644 index 8398149f40e6..000000000000 --- a/databases/postgresql-client/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Ports collection makefile for: postgresql-client -# Date created: October 12, 2003 -# Whom: Edwin Groothuis -# -# $FreeBSD$ -# - -# The portname is set in MASTERDIR/Makefile - -MAINTAINER= girgen@pingpong.net -COMMENT= The most advanced open-source database available anywhere - client only - -WITHOUT_SERVER= yes -MASTERDIR= ${.CURDIR}/../../databases/postgresql7 - -.include "${MASTERDIR}/Makefile" -- cgit