From 2ae04471606a4d6042768295533b8a8238773142 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 15 May 2001 15:59:22 +0000
Subject: Fix dependencies and post-extract target.  "Make build" in
 databases/postgresql should now correctly trigger the full build and
 installation of PostgreSQL.

---
 databases/postgresql/Makefile        |  8 ++++----
 databases/postgresql/Makefile.common | 20 +++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'databases')

diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index f51e2bac5da..fe82d277d79 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2001/05/14 14:52:36 jlam Exp $
+# $NetBSD: Makefile,v 1.65 2001/05/15 15:59:22 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 
@@ -6,9 +6,9 @@ PKGNAME=	postgresql-${PG_VERS}
 PG_PKG_VERS=	# empty
 COMMENT=	Robust, next generation, object-relational DBMS
 
-DEPENDS+=	postgresql-client>=${PG_BASE_VERS}:../../postgresql-client
-DEPENDS+=	postgresql-server>=${PG_BASE_VERS}:../../postgresql-server
-DEPENDS+=	postgresql-docs>=${PG_BASE_VERS}:../../postgresql-docs
+DEPENDS+=	postgresql-client>=${PG_BASE_VERS}:../../databases/postgresql-client
+DEPENDS+=	postgresql-server>=${PG_BASE_VERS}:../../databases/postgresql-server
+DEPENDS+=	postgresql-docs>=${PG_BASE_VERS}:../../databases/postgresql-docs
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	# defined
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index c254cef5079..1cbd9814335 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2001/05/14 15:45:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.14 2001/05/15 15:59:22 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution.
@@ -23,6 +23,8 @@ MASTER_SITES=		http://www.postgresql.org/ftpsite/v${PG_DIST_VERS}/ \
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.postgresql.org/
 
+CONFLICTS+=		postgresql-[0-6]* postgresql-7.0*
+
 DISTINFO_FILE=		${.CURDIR}/../../databases/postgresql/distinfo
 COMMON_FILESDIR=	${.CURDIR}/../../databases/postgresql/files
 PATCHDIR=		${.CURDIR}/../../databases/postgresql/patches
@@ -83,9 +85,13 @@ CFLAGS+=		-I${WRKINCDIR}
 
 post-extract:
 	${MKDIR} -p ${WRKINCDIR}
-	${RM} -f ${WRKSRC}/src/Makefile.custom
-	${CP} -f ${COMMON_FILESDIR}/Makefile.custom			\
-		${WRKSRC}/src/Makefile.custom
-	${RM} -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile
-	${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpq			\
-		${WRKSRC}/src/interfaces/libpq/GNUmakefile
+	if [ -d ${WRKSRC}/src ]; then					\
+		${RM} -f ${WRKSRC}/src/Makefile.custom;			\
+		${CP} -f ${COMMON_FILESDIR}/Makefile.custom		\
+			${WRKSRC}/src/Makefile.custom;			\
+	fi
+	if [ -d ${WRKSRC}/src/interfaces/libpq ]; then			\
+		${RM} -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
+		${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpq		\
+			${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
+	fi
-- 
cgit v1.2.3