[pkgsrc/trunk]: pkgsrc use mk/mysql.buildlink3.mk instead of databases/mysql-...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47b5a0954cdb
branches:  trunk
changeset: 482511:47b5a0954cdb
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Fri Oct 29 05:59:23 2004 +0000

description:
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

diffstat:

 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(-)

diffs (truncated from 367 to 300 lines):

diff -r b7a9a103b07f -r 47b5a0954cdb chat/ser/Makefile
--- a/chat/ser/Makefile Fri Oct 29 01:34:39 2004 +0000
+++ b/chat/ser/Makefile Fri Oct 29 05:59:23 2004 +0000
@@ -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.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 -r b7a9a103b07f -r 47b5a0954cdb databases/kmysqladmin/Makefile
--- a/databases/kmysqladmin/Makefile    Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/kmysqladmin/Makefile    Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 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 -r b7a9a103b07f -r 47b5a0954cdb databases/p5-DBD-mysql/Makefile
--- a/databases/p5-DBD-mysql/Makefile   Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/p5-DBD-mysql/Makefile   Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 
 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 -r b7a9a103b07f -r 47b5a0954cdb databases/php4-mysql/Makefile
--- a/databases/php4-mysql/Makefile     Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/php4-mysql/Makefile     Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 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 -r b7a9a103b07f -r 47b5a0954cdb databases/py-mysqldb/Makefile
--- a/databases/py-mysqldb/Makefile     Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/py-mysqldb/Makefile     Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 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 -r b7a9a103b07f -r 47b5a0954cdb databases/ruby-mysql/Makefile
--- a/databases/ruby-mysql/Makefile     Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/ruby-mysql/Makefile     Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 
 .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 -r b7a9a103b07f -r 47b5a0954cdb databases/sqlrelay/Makefile
--- a/databases/sqlrelay/Makefile       Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/sqlrelay/Makefile       Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 .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 -r b7a9a103b07f -r 47b5a0954cdb databases/tcl-fbsql/Makefile
--- a/databases/tcl-fbsql/Makefile      Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/tcl-fbsql/Makefile      Fri Oct 29 05:59:23 2004 +0000
@@ -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-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 -r b7a9a103b07f -r 47b5a0954cdb databases/xmysql/Makefile
--- a/databases/xmysql/Makefile Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/xmysql/Makefile Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 
 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 -r b7a9a103b07f -r 47b5a0954cdb databases/xmysqladmin/Makefile
--- a/databases/xmysqladmin/Makefile    Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/xmysqladmin/Makefile    Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 
 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 -r b7a9a103b07f -r 47b5a0954cdb databases/xsqlmenu/Makefile
--- a/databases/xsqlmenu/Makefile       Fri Oct 29 01:34:39 2004 +0000
+++ b/databases/xsqlmenu/Makefile       Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
        ${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 -r b7a9a103b07f -r 47b5a0954cdb mail/courier-authmysql/Makefile
--- a/mail/courier-authmysql/Makefile   Fri Oct 29 01:34:39 2004 +0000
+++ b/mail/courier-authmysql/Makefile   Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
                        ${ROOT_USER} ${ROOT_GROUP} 0600
 .endfor
 
-.include "../../databases/mysql-client/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 
 do-install:
        ${INSTALL_PROGRAM_DIR} ${AUTHLIBDIR}
diff -r b7a9a103b07f -r 47b5a0954cdb mail/exim3/Makefile
--- a/mail/exim3/Makefile       Fri Oct 29 01:34:39 2004 +0000
+++ b/mail/exim3/Makefile       Fri Oct 29 05:59:23 2004 +0000
@@ -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+=          ${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 -r b7a9a103b07f -r 47b5a0954cdb mail/teapop/Makefile
--- a/mail/teapop/Makefile      Fri Oct 29 01:34:39 2004 +0000
+++ b/mail/teapop/Makefile      Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 .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 -r b7a9a103b07f -r 47b5a0954cdb net/boinc3-seti/Makefile
--- a/net/boinc3-seti/Makefile  Fri Oct 29 01:34:39 2004 +0000
+++ b/net/boinc3-seti/Makefile  Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
        ${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 -r b7a9a103b07f -r 47b5a0954cdb net/entropy/Makefile
--- a/net/entropy/Makefile      Fri Oct 29 01:34:39 2004 +0000
+++ b/net/entropy/Makefile      Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 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 -r b7a9a103b07f -r 47b5a0954cdb net/flow-tools/Makefile
--- a/net/flow-tools/Makefile   Fri Oct 29 01:34:39 2004 +0000
+++ b/net/flow-tools/Makefile   Fri Oct 29 05:59:23 2004 +0000
@@ -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 @@
 
 # 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 -r b7a9a103b07f -r 47b5a0954cdb net/snort-mysql/Makefile