From 158484ab169d85767b9cf8cdbeff0d61cc8f13e0 Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek@pkgsrc.org>
Date: Fri, 29 Oct 2004 05:59:23 +0000
Subject: use mk/mysql.buildlink3.mk instead of
 databases/mysql-client/buildlink3.mk, so that we'd not force dependance on
 specific MySQL version, and instead pick the currently installed
 mysql*-client (or install the default if there is no mysql-client package
 installed yet)

this makes package buildable with arbitrary MySQL version, such as 3.23.x,
4.0.x or 4.1.x
---
 databases/kmysqladmin/Makefile  | 4 ++--
 databases/p5-DBD-mysql/Makefile | 4 ++--
 databases/php4-mysql/Makefile   | 4 ++--
 databases/py-mysqldb/Makefile   | 4 ++--
 databases/ruby-mysql/Makefile   | 4 ++--
 databases/sqlrelay/Makefile     | 4 ++--
 databases/tcl-fbsql/Makefile    | 4 ++--
 databases/xmysql/Makefile       | 4 ++--
 databases/xmysqladmin/Makefile  | 4 ++--
 databases/xsqlmenu/Makefile     | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'databases')

diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 0eeb2b9726e..56338b164c6 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:13:18 tv Exp $
+# $NetBSD: Makefile,v 1.18 2004/10/29 05:59:23 jdolecek Exp $
 
 DISTNAME=	kmysqladmin-0.5.1
 PKGREVISION=	7
@@ -16,7 +16,7 @@ MYSQLDIR=		${BUILDLINK_PREFIX.mysql-client}
 CONFIGURE_ARGS+=	--with-mysql-includes=${MYSQLDIR}/include/mysql
 CONFIGURE_ARGS+=	--with-mysql-libs=${MYSQLDIR}/lib/mysql
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../x11/kde2/kde2.mk"
 .include "../../x11/kdebase2/buildlink3.mk"
 
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index a20b554b369..550fc413e3b 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/10/03 00:13:22 tv Exp $
+# $NetBSD: Makefile,v 1.24 2004/10/29 05:59:23 jdolecek Exp $
 #
 
 DISTNAME=		DBD-mysql-2.9004
@@ -21,7 +21,7 @@ PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/DBD/mysql/.packlist
 
 MAKE_PARAMS+=		--nocatchstderr
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../databases/p5-DBI/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/php4-mysql/Makefile b/databases/php4-mysql/Makefile
index b39fe378983..f7131d9107b 100644
--- a/databases/php4-mysql/Makefile
+++ b/databases/php4-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/08/27 06:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/29 05:59:23 jdolecek Exp $
 
 MODNAME=		mysql
 CATEGORIES+=		databases
@@ -17,5 +17,5 @@ EVAL_PREFIX+=		MYSQLDIR=mysql-client
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${MYSQLDIR}
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile
index b9df84b4699..60cc75edfc1 100644
--- a/databases/py-mysqldb/Makefile
+++ b/databases/py-mysqldb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:13:23 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/29 05:59:23 jdolecek Exp $
 
 DISTNAME=	MySQL-python-0.9.2
 PKGNAME=	${PYPKGPREFIX}-mysqldb-0.9.2
@@ -14,7 +14,7 @@ USE_BUILDLINK3=	yes
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../lang/python/extension.mk"
 
 # To pickup python version info
diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index 12678df1a85..f54c4eccdb1 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:23 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/29 05:59:24 jdolecek Exp $
 #
 
 DISTNAME=	mysql-ruby-2.4.5
@@ -40,5 +40,5 @@ post-install:
 
 .include "../../lang/ruby-base/Makefile.common"
 .include "../../lang/ruby-base/buildlink3.mk"
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 9b1db3fbfcc..5d70ac89829 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:13:23 tv Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/29 05:59:24 jdolecek Exp $
 
 DISTNAME=		sqlrelay-0.33.1
 PKGREVISION=		1
@@ -24,7 +24,7 @@ SQLRELAY.${_db_}?=	YES
 .endfor
 
 .if defined(SQLRELAY.mysql) && ${SQLRELAY.mysql} == "YES"
-.  include "../../databases/mysql-client/buildlink3.mk"
+.  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_DIR}
 .endif
 
diff --git a/databases/tcl-fbsql/Makefile b/databases/tcl-fbsql/Makefile
index 06447ce3312..26d071b64ca 100644
--- a/databases/tcl-fbsql/Makefile
+++ b/databases/tcl-fbsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:23 tv Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/29 05:59:24 jdolecek Exp $
 
 DISTNAME=		fbsql.c
 PKGNAME=		tcl-fbsql-1.06
@@ -24,6 +24,6 @@ do-extract:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fbsql.so ${PREFIX}/lib/tcl
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index da53df83974..5457e5d5ff6 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:13:24 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/10/29 05:59:24 jdolecek Exp $
 #
 
 DISTNAME=	xmysql-1.10
@@ -18,7 +18,7 @@ MAKE_ENV+=	X11PREFIX=${X11PREFIX}
 
 ALL_TARGET=	xmysql
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 221cf7467d5..215374d5471 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:13:24 tv Exp $
+# $NetBSD: Makefile,v 1.17 2004/10/29 05:59:24 jdolecek Exp $
 #
 
 DISTNAME=	xmysqladmin-1.0
@@ -22,7 +22,7 @@ MAKE_ENV+=	X11PREFIX=${X11PREFIX}
 
 ALL_TARGET=	xmysqladmin
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile
index dd016d30e52..a5ffc9e2b82 100644
--- a/databases/xsqlmenu/Makefile
+++ b/databases/xsqlmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:24 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/29 05:59:24 jdolecek Exp $
 #
 
 DISTNAME=	xsqlmenu-2.10
@@ -22,7 +22,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/xsqlmenu.lsm ${PREFIX}/share/doc/xsqlmenu
 	${INSTALL_DATA} ${WRKSRC}/[A-Z][A-Z]* ${PREFIX}/share/doc/xsqlmenu
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
-- 
cgit v1.2.3