From 5fac8f7d24d0a54607c3b5831918684056027e36 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 20 Sep 2002 10:39:06 +0000
Subject: buildlink1 -> buildlink2 and move the USE_BUILDLINK2 definition to
 the common Makefile.

---
 databases/mysql-client/Makefile        |  4 +---
 databases/mysql-client/Makefile.common |  3 ++-
 databases/mysql-server/Makefile        | 10 ++++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index c12034addf1..c4bbc8ca3fc 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/08/25 18:38:22 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/20 10:39:06 jlam Exp $
 #
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
@@ -6,8 +6,6 @@ PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL, a free SQL database (client)
 
-USE_BUILDLINK2=		YES
-
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=	--without-server
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 9b60c17d12b..11619aacc4c 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2002/08/25 18:38:22 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2002/09/20 10:39:07 jlam Exp $
 
 DISTNAME=		mysql-3.23.49
 CATEGORIES=		databases
@@ -15,6 +15,7 @@ EXTRACT_USING_PAX=	# defined
 
 MYSQL_DATADIR?=		/var/mysql
 
+USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR}
 CONFIGURE_ARGS+=	--with-named-z-libs=z
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 4a37d88d2bd..e1c75268739 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.28 2002/08/23 03:34:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.29 2002/09/20 10:39:07 jlam Exp $
 #
 
-.include "../mysql-client/Makefile.common"
-
 PKGNAME=		${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL, a free SQL database (server)
 
-DEPENDS+=		${DISTNAME:S/-/-client>=/}:../../databases/mysql-client
+.include "../mysql-client/Makefile.common"
 
-USE_BUILDLINK_ONLY=	YES
+DEPENDS+=		${DISTNAME:S/-/-client>=/}:../../databases/mysql-client
 
 # hardwire use of included mit-pthreads on NetBSD
 .if (${OPSYS} == "NetBSD")
@@ -45,5 +43,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/safe_mysqld.1 ${PREFIX}/man/man1
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
-.include "../../security/tcp_wrappers/buildlink.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3