[pkgsrc/trunk]: pkgsrc/databases Don't abuse b3. It should not do things like...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8560ced7876
branches:  trunk
changeset: 555585:e8560ced7876
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Mar 05 20:58:37 2009 +0000

description:
Don't abuse b3. It should not do things like include bsd.pkg.mk, so fix
up the packages that use it instead.

diffstat:

 databases/php-pdo/buildlink3.mk   |  5 ++---
 databases/php-pdo_dblib/Makefile  |  5 ++++-
 databases/php-pdo_mysql/Makefile  |  5 ++++-
 databases/php-pdo_odbc/Makefile   |  5 ++++-
 databases/php-pdo_pgsql/Makefile  |  5 ++++-
 databases/php-pdo_sqlite/Makefile |  5 ++++-
 6 files changed, 22 insertions(+), 8 deletions(-)

diffs (96 lines):

diff -r e673426f4980 -r e8560ced7876 databases/php-pdo/buildlink3.mk
--- a/databases/php-pdo/buildlink3.mk   Thu Mar 05 20:37:25 2009 +0000
+++ b/databases/php-pdo/buildlink3.mk   Thu Mar 05 20:58:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:40 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/05 20:58:37 joerg Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 PHP_PDO_BUILDLINK3_MK:=                ${PHP_PDO_BUILDLINK3_MK}+
@@ -18,5 +18,4 @@
 BUILDLINK_INCDIRS.php-pdo?=    include/php/ext/pdo
 .endif  # PHP_PDO_BUILDLINK3_MK
 
-.include "../../lang/php/ext.mk"
-.include "../../mk/bsd.pkg.mk"
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r e673426f4980 -r e8560ced7876 databases/php-pdo_dblib/Makefile
--- a/databases/php-pdo_dblib/Makefile  Thu Mar 05 20:37:25 2009 +0000
+++ b/databases/php-pdo_dblib/Makefile  Thu Mar 05 20:58:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/03/05 20:58:37 joerg Exp $
 
 PDO_DRIVER=            dblib
 PDO_COMMENT=           FreeTDS/Sybase/MS SQL
@@ -13,3 +13,6 @@
 
 .include "../../databases/freetds/buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r e673426f4980 -r e8560ced7876 databases/php-pdo_mysql/Makefile
--- a/databases/php-pdo_mysql/Makefile  Thu Mar 05 20:37:25 2009 +0000
+++ b/databases/php-pdo_mysql/Makefile  Thu Mar 05 20:58:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/06/12 02:14:19 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/03/05 20:58:37 joerg Exp $
 
 PDO_DRIVER=            mysql
 PDO_COMMENT=           MySQL
@@ -12,3 +12,6 @@
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r e673426f4980 -r e8560ced7876 databases/php-pdo_odbc/Makefile
--- a/databases/php-pdo_odbc/Makefile   Thu Mar 05 20:37:25 2009 +0000
+++ b/databases/php-pdo_odbc/Makefile   Thu Mar 05 20:58:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/11/06 21:36:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.6 2009/03/05 20:58:37 joerg Exp $
 
 PDO_DRIVER=            odbc
 PDO_COMMENT=           ODBC
@@ -12,3 +12,6 @@
 
 .include "../../databases/unixodbc/buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r e673426f4980 -r e8560ced7876 databases/php-pdo_pgsql/Makefile
--- a/databases/php-pdo_pgsql/Makefile  Thu Mar 05 20:37:25 2009 +0000
+++ b/databases/php-pdo_pgsql/Makefile  Thu Mar 05 20:58:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:19 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/03/05 20:58:37 joerg Exp $
 
 PDO_DRIVER=            pgsql
 PDO_COMMENT=           PostgreSQL
@@ -13,3 +13,6 @@
 
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r e673426f4980 -r e8560ced7876 databases/php-pdo_sqlite/Makefile
--- a/databases/php-pdo_sqlite/Makefile Thu Mar 05 20:37:25 2009 +0000
+++ b/databases/php-pdo_sqlite/Makefile Thu Mar 05 20:58:37 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/06/12 02:14:19 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2009/03/05 20:58:37 joerg Exp $
 
 PDO_DRIVER=            sqlite
 PDO_COMMENT=           SQLite v3
@@ -12,3 +12,6 @@
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"