Don't abuse b3. It should not do things like include bsd.pkg.mk, so fix

up the packages that use it instead.

6 files changed, 22 insertions, 8 deletions

diff --git a/databases/php-pdo/buildlink3.mk b/databases/php-pdo/buildlink3.mk
index 3c65c4e063e..a9e7ecb4ece 100644
--- a/databases/php-pdo/buildlink3.mk
+++ b/databases/php-pdo/buildlink3.mk
@@ -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_PKGSRCDIR.php-pdo?=	../../databases/php-pdo
 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 --git a/databases/php-pdo_dblib/Makefile b/databases/php-pdo_dblib/Makefile
index 7ae3327000a..d86f695fa7c 100644
--- a/databases/php-pdo_dblib/Makefile
+++ b/databases/php-pdo_dblib/Makefile
@@ -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 @@ BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.63
 
 .include "../../databases/freetds/buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-pdo_mysql/Makefile b/databases/php-pdo_mysql/Makefile
index 84aa6090dc7..06fdc0c497e 100644
--- a/databases/php-pdo_mysql/Makefile
+++ b/databases/php-pdo_mysql/Makefile
@@ -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 @@ CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.mysql-client}
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-pdo_odbc/Makefile b/databases/php-pdo_odbc/Makefile
index b6fb083f063..0b3ca44274f 100644
--- a/databases/php-pdo_odbc/Makefile
+++ b/databases/php-pdo_odbc/Makefile
@@ -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 @@ BROKEN=		module kills Apache1 or CLI PHP on startup due to threaded unixodbc
 
 .include "../../databases/unixodbc/buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-pdo_pgsql/Makefile b/databases/php-pdo_pgsql/Makefile
index f8cb183da83..915d535d3e3 100644
--- a/databases/php-pdo_pgsql/Makefile
+++ b/databases/php-pdo_pgsql/Makefile
@@ -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 @@ CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${PGSQL_PREFIX}
 
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/php-pdo_sqlite/Makefile b/databases/php-pdo_sqlite/Makefile
index 34a26fbc153..55e8d7d607d 100644
--- a/databases/php-pdo_sqlite/Makefile
+++ b/databases/php-pdo_sqlite/Makefile
@@ -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 @@ CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.sqlite3}
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
+
+.include "../../lang/php/ext.mk"
+.include "../../mk/bsd.pkg.mk"