From 6ed0a6c63a00dde2851134137177e915a923d28c Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 20 Jan 2004 14:11:49 +0000
Subject: Remove USE_BUILDLINK2 from Makefile.common and distribute the setting
 to all of the package Makefiles that include Makefile.common.

---
 databases/postgresql-client/Makefile | 4 +++-
 databases/postgresql-docs/Makefile   | 4 +++-
 databases/postgresql-lib/Makefile    | 4 +++-
 databases/postgresql-plperl/Makefile | 4 +++-
 databases/postgresql-pltcl/Makefile  | 4 +++-
 databases/postgresql-server/Makefile | 4 +++-
 databases/postgresql/Makefile.common | 3 +--
 databases/py-postgresql/Makefile     | 4 +++-
 databases/tcl-postgresql/Makefile    | 4 +++-
 databases/tk-postgresql/Makefile     | 6 ++++--
 10 files changed, 29 insertions(+), 12 deletions(-)

(limited to 'databases')

diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 2c6e3790469..99c8473ce14 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2003/11/12 03:39:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 14:11:49 jlam Exp $
 
 PKGNAME=		postgresql-client-${BASE_VERS}
 PKGREVISION=		1
 SVR4_PKGNAME=		pstgc
 COMMENT=		PostgreSQL database client programs
 
+USE_BUILDLINK2=		yes
+
 .include "../../databases/postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index bc04de45117..9540090b67f 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2003/09/18 16:25:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 14:11:50 jlam Exp $
 
 PKGNAME=		postgresql-docs-${BASE_VERS}
 SVR4_PKGNAME=		pstgd
 COMMENT=		PostgreSQL database system documentation
 
+USE_BUILDLINK2=		yes
+
 .include "../../databases/postgresql/Makefile.common"
 
 BUILD_DIRS=		${WRKSRC}/doc
diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile
index 408f7c468e1..6a243e71a74 100644
--- a/databases/postgresql-lib/Makefile
+++ b/databases/postgresql-lib/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2003/11/12 03:39:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 14:11:50 jlam Exp $
 
 PKGNAME=		postgresql-lib-${BASE_VERS}
 PKGREVISIO=		1
 SVR4_PKGNAME=		pstgl
 COMMENT=		PostgreSQL database headers and libraries
 
+USE_BUILDLINK2=		yes
+
 .include "../../databases/postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
diff --git a/databases/postgresql-plperl/Makefile b/databases/postgresql-plperl/Makefile
index b64e9dc1fd3..99578a3d49a 100644
--- a/databases/postgresql-plperl/Makefile
+++ b/databases/postgresql-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/11/12 03:39:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 14:11:50 jlam Exp $
 
 PKGNAME=		postgresql-plperl-${BASE_VERS}
 PKGREVISION=		1
@@ -6,6 +6,8 @@ COMMENT=		PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=		postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
 
+USE_BUILDLINK2=		yes
+
 .include "../postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index f5cf8f28ee3..0b81dc3ea58 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/11/12 03:39:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 14:11:50 jlam Exp $
 
 PKGNAME=		postgresql-pltcl-${BASE_VERS}
 PKGREVISION=		1
@@ -6,6 +6,8 @@ COMMENT=		PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=		postgresql-server>=${BASE_VERS}:../../databases/postgresql-server
 
+USE_BUILDLINK2=		yes
+
 .include "../postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 573856da884..892e29d5961 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/11/14 01:46:39 explorer Exp $
+# $NetBSD: Makefile,v 1.37 2004/01/20 14:11:50 jlam Exp $
 
 PKGNAME=		postgresql-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
@@ -10,6 +10,8 @@ DEPENDS+=		postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
 # mips has no TAS implementation
 NOT_FOR_PLATFORM=	*-*-mips
 
+USE_BUILDLINK2=		yes
+
 .include "../../databases/postgresql/Makefile.common"
 
 USE_PKGINSTALL=		yes
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index 5524cdd01b4..bd8902cdc39 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2003/08/18 00:26:24 cjs Exp $
+# $NetBSD: Makefile.common,v 1.40 2004/01/20 14:11:49 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -39,7 +39,6 @@ BASE_VERS?=		${DIST_VERS}
 BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-lib>=${BASE_VERS}
 BUILDLINK_DEPENDS.tcl-postgresql?=	tcl-postgresql>=${BASE_VERS}
 
-USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 PKG_SYSCONFSUBDIR=	postgresql
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index 6d2281177cc..a68b22b3727 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/08/18 10:09:50 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/20 14:11:50 jlam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-postgresql-3.3
 PKGREVISION=	2
@@ -7,6 +7,8 @@ CATEGORIES=	databases
 MAINTAINER=	darcy@NetBSD.org
 COMMENT=	Python interface to PostgreSQL
 
+USE_BUILDLINK2=		yes
+
 .include "../postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-python
diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile
index 185d59f1f02..cabde011092 100644
--- a/databases/tcl-postgresql/Makefile
+++ b/databases/tcl-postgresql/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2003/11/12 03:39:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 14:11:50 jlam Exp $
 
 PKGNAME=		tcl-postgresql-${BASE_VERS}
 PKGREVISION=		1
 COMMENT=		Tcl interface to PostgreSQL
 
+USE_BUILDLINK2=		yes
+
 .include "../postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile
index 850eaf2cdfa..eb37f3d57d3 100644
--- a/databases/tk-postgresql/Makefile
+++ b/databases/tk-postgresql/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 14:11:50 jlam Exp $
 
 PKGNAME=		tk-postgresql-${BASE_VERS}
 PKGREVISION=		1
 COMMENT=		Tk interface to PostgreSQL
 
+USE_BUILDLINK2=		yes
+
 .include "../postgresql/Makefile.common"
 
-USE_X11=		YES
+USE_X11=		yes
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-tcl
 CONFIGURE_ARGS+=	--with-tk
-- 
cgit v1.2.3