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
---
 chat/ser/Makefile               | 4 ++--
 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 ++--
 mail/courier-authmysql/Makefile | 4 ++--
 mail/exim3/Makefile             | 4 ++--
 mail/teapop/Makefile            | 4 ++--
 net/boinc3-seti/Makefile        | 4 ++--
 net/entropy/Makefile            | 4 ++--
 net/flow-tools/Makefile         | 4 ++--
 net/snort-mysql/Makefile        | 4 ++--
 www/ap-auth-mysql/Makefile      | 4 ++--
 www/ap2-auth-mysql/Makefile     | 4 ++--
 x11/qt3-mysql/Makefile          | 4 ++--
 21 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/chat/ser/Makefile b/chat/ser/Makefile
index 66247647cd0..e164c072989 100644
--- a/chat/ser/Makefile
+++ b/chat/ser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:13:15 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/29 05:59:23 jdolecek Exp $
 #
 
 DISTNAME=	ser-0.8.10_src
@@ -20,7 +20,7 @@ MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
 MAKE_ENV+= BUILDLINK_PREFIX.mysql-client=${BUILDLINK_PREFIX.mysql-client:Q}
 MAKE_ENV+= BUILDLINK_PREFIX.expat=${BUILDLINK_PREFIX.expat:Q}
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
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"
diff --git a/mail/courier-authmysql/Makefile b/mail/courier-authmysql/Makefile
index f8876cee9ba..91994ced090 100644
--- a/mail/courier-authmysql/Makefile
+++ b/mail/courier-authmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/29 05:59:24 jdolecek Exp $
 
 PKGNAME=	courier-authmysql-${BASE_VERS}
 PKGREVISION=	1
@@ -22,7 +22,7 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}	\
 			${ROOT_USER} ${ROOT_GROUP} 0600
 .endfor
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${AUTHLIBDIR}
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 3894e038c55..7a5615610e4 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.14 2004/10/29 05:59:24 jdolecek Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	3
@@ -56,7 +56,7 @@ LOOKUP_LIBS+=		-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql
 LOOKUP_LIBS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
 LOOKUP_LIBS+=		-lmysqlclient
 MAKE_ENV+=		LOOKUP_MYSQL=YES
-.  include "../../databases/mysql-client/buildlink3.mk"
+.  include "../../mk/mysql.buildlink3.mk"
 .endif
 .if defined(EXIM_DB.pgsql) && ${EXIM_DB.pgsql} == "YES"
 LOOKUP_INCLUDE+=	-I${PGSQL_PREFIX}/include/postgresql
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index ad5a1b8fded..56d945b6e16 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/10/03 00:12:55 tv Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/29 05:59:24 jdolecek Exp $
 
 DISTNAME=	teapop-0.3.8
 PKGREVISION=	1
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--disable-vpop
 .endif
 
 .if defined(TEAPOP_WITH_MYSQL)
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
 LDFLAGS+=	${BUILDLINK_LDFLAGS.mysql-client}
 .endif
diff --git a/net/boinc3-seti/Makefile b/net/boinc3-seti/Makefile
index 879b8ba0eb7..c5181c5a912 100644
--- a/net/boinc3-seti/Makefile
+++ b/net/boinc3-seti/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:17:49 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/29 05:59:24 jdolecek Exp $
 #
 
 DISTNAME=		seti_boinc-client-cvs-2004-07-15
@@ -40,5 +40,5 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/app_info.xml ${SBDIR}
 
 .include "../../net/boinc3-libs/buildlink3.mk"
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/entropy/Makefile b/net/entropy/Makefile
index 208fead6fe6..8b4be86e6c9 100644
--- a/net/entropy/Makefile
+++ b/net/entropy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/28 00:59:18 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/10/29 05:59:24 jdolecek Exp $
 #
 
 DISTNAME=		entropy-${ENTROPY_VERSION}
@@ -43,7 +43,7 @@ ENTROPY_STORE_TYPE?=	tree
 CONFIGURE_ARGS+=	--with-tree
 .elif ${ENTROPY_STORE_TYPE} == "mysql"
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .elif ${ENTROPY_STORE_TYPE} != "monolithic"
 .error unknown ENTROPY_STORE_TYPE: ${ENTROPY_STORE_TYPE}
 .endif
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index 25cb64d5638..fc406b229bc 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/29 05:59:24 jdolecek Exp $
 
 DISTNAME=	flow-tools-0.67
 PKGREVISION=	1
@@ -43,7 +43,7 @@ PKG_SUPPORTED_OPTIONS=	mysql postgresql
 
 # MySQL support.
 .if !empty(PKG_OPTIONS:Mmysql)
-.  include "../../databases/mysql-client/buildlink3.mk"
+.  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
 .endif
 
diff --git a/net/snort-mysql/Makefile b/net/snort-mysql/Makefile
index e821c993815..4c99e4158f0 100644
--- a/net/snort-mysql/Makefile
+++ b/net/snort-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:17:58 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/29 05:59:24 jdolecek Exp $
 
 .include "../../net/snort/Makefile.common"
 
@@ -18,6 +18,6 @@ DISTINFO_FILE=	${PKGDIR}/distinfo
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
 LDFLAGS+=		${BUILDLINK_LDFLAGS.mysql-client}
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile
index bbb831a4480..15e53fc74b6 100644
--- a/www/ap-auth-mysql/Makefile
+++ b/www/ap-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:18:24 tv Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/29 05:59:24 jdolecek Exp $
 #
 
 DISTNAME=		libapache-mod-auth-mysql_4.3.1
@@ -30,7 +30,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/DIRECTIVES ${PREFIX}/share/doc/mod_auth_mysql
 	${INSTALL_DATA} ${WRKSRC}/USAGE ${PREFIX}/share/doc/mod_auth_mysql
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/apache.mk"
 .include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
index 96cf807b47e..4ac2476cfae 100644
--- a/www/ap2-auth-mysql/Makefile
+++ b/www/ap2-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:24 tv Exp $
+# $NetBSD: Makefile,v 1.8 2004/10/29 05:59:24 jdolecek Exp $
 #
 
 DISTNAME=		mod_auth_mysql.c
@@ -44,6 +44,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mysql-group-auth.txt ${DOC_DIR}
 
 .include "../../www/apache2/buildlink3.mk"
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index 5236092af23..b2c0a436784 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/10/28 10:32:23 gavan Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/29 05:59:24 jdolecek Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
@@ -26,5 +26,5 @@ do-install:
 		${SQLDRVDIR}
 
 .include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3