From a1cc7c413693678373ea86a90f2540a3787b9396 Mon Sep 17 00:00:00 2001
From: tv <tv>
Date: Thu, 24 Mar 2005 17:46:00 +0000
Subject: USE_BUILDLINK3 is no longer optional (and cannot be turned off).  Per
 mail to tech-pkg:

=====

* USE_BUILDLINK3=YES will be unconditional.  (In fact, USE_BUILDLINK3 will
  be ignored altogether by mk/; but see below.)

* NO_BUILDLINK and NO_WRAPPER will be ignored by mk/.  If a build happens,
  these phases will happen.

* The existing NO_BUILD will imply the previous NO_BUILDLINK and NO_WRAPPER.
  If no build happens, those phases are not needed.

* NO_TOOLS will be ignored by mk/.  The tools phase, which provides much
  more than just the C compiler, will always happen regardless of package.
  This will make metapackage builds only slightly slower, in trade for far
  less user error.
---
 mk/pgsql.buildlink3.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'mk/pgsql.buildlink3.mk')

diff --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk
index 3d647350f7e..d1b4c69ffe7 100644
--- a/mk/pgsql.buildlink3.mk
+++ b/mk/pgsql.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.7 2005/03/17 21:44:58 jlam Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.8 2005/03/24 17:46:01 tv Exp $
 
 .if !defined(PGVERSION_MK)
 PGVERSION_MK=	defined
@@ -76,9 +76,7 @@ PGSQL_TYPE=		none
 PKG_SKIP_REASON+=	"${_PGSQL_VERSION} is not a valid package"
 .endif
 
-.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
-.  include "${PGPKGSRCDIR}/buildlink3.mk"
+.include "${PGPKGSRCDIR}/buildlink3.mk"
 PGSQL_PREFIX=	${BUILDLINK_PREFIX.${PGSQL_TYPE}}
-.endif
 
 .endif	# PGVERSION_MK
-- 
cgit v1.2.3