Update the PHP PDO to latest available PECL versions (1.0/1.0.1/1.0.2).

Changes are bugfixes mostly.

Also rework php-pdo/module.mk somewhat, so that the base php-pdo package
can use it too.

14 files changed, 69 insertions, 55 deletions

diff --git a/databases/php-pdo/Makefile b/databases/php-pdo/Makefile
index 253e9f8699b..944a1a8ba3a 100644
--- a/databases/php-pdo/Makefile
+++ b/databases/php-pdo/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
-
-MODNAME=		PDO
-PKGMODNAME=		pdo
-PKGNAME=		php-${PKGMODNAME}-${PHP_BASE_VERS}.${PECL_VERSION}
-PKGREVISION=		# empty
-PECL_VERSION=		1.0RC1
-CATEGORIES+=		databases
-MAINTAINER=		tech-pkg@NetBSD.org
+# $NetBSD: Makefile,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
+
+PDO_DRIVER=		# empty
+PDO_VERSION=		1.0.2
+
+.include "../../databases/php-pdo/module.mk"
+
 COMMENT=		PHP extension for PHP Data Objects (base)
 
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}
diff --git a/databases/php-pdo/buildlink3.mk b/databases/php-pdo/buildlink3.mk
index 061cedf10c1..9716a32a51c 100644
--- a/databases/php-pdo/buildlink3.mk
+++ b/databases/php-pdo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
 BUILDLINK_DEPTH:=               ${BUILDLINK_DEPTH}+
 PHP_PDO_BUILDLINK3_MK:=    ${PHP_PDO_BUILDLINK3_MK}+
@@ -11,11 +11,10 @@ BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Nphp-pdo}
 BUILDLINK_PACKAGES+=    php-pdo
 
 .if !empty(PHP_PDO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php-pdo+=        php-pdo-*.1.0RC1
+BUILDLINK_DEPENDS.php-pdo+=        php-pdo-5.*
 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"
diff --git a/databases/php-pdo/distinfo b/databases/php-pdo/distinfo
index b28bba886bb..c26f86eebcc 100644
--- a/databases/php-pdo/distinfo
+++ b/databases/php-pdo/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
-SHA1 (php-PDO/PDO-1.0RC1.tgz) = 1d70df41f1f61294e6a90694aa43f38252059876
-RMD160 (php-PDO/PDO-1.0RC1.tgz) = b3603614c301862b3e77c634ab9a8d6718603e63
-Size (php-PDO/PDO-1.0RC1.tgz) = 46925 bytes
-SHA1 (patch-aa) = cfc560a992bd8706f79828f31b7210fcef14e25f
+SHA1 (php-PDO/PDO-1.0.2.tgz) = 0cab1adfde9214f6cb9edff022c51709ddbce3ba
+RMD160 (php-PDO/PDO-1.0.2.tgz) = 08d10eb3aa6622dbe209e64c35951957aade3033
+Size (php-PDO/PDO-1.0.2.tgz) = 49810 bytes
diff --git a/databases/php-pdo/module.mk b/databases/php-pdo/module.mk
index 3958416593a..7d6d51150fa 100644
--- a/databases/php-pdo/module.mk
+++ b/databases/php-pdo/module.mk
@@ -1,15 +1,19 @@
-# $NetBSD: module.mk,v 1.4 2005/10/10 14:29:05 tv Exp $
+# $NetBSD: module.mk,v 1.5 2005/12/03 17:24:28 jdolecek Exp $
 
 # Items common for all PDO drivers
 
+.if !empty(PDO_DRIVER)
+_PDO_SEP=		_
+.else
+_PDO_SEP=		# empty
+.endif
+
 PDO_DRIVER_TR=		${ECHO} ${PDO_DRIVER:Q} | ${TR} a-z A-Z
-MODNAME=		PDO_${PDO_DRIVER_TR:sh}
-PKGMODNAME=		pdo_${PDO_DRIVER}
-PKGNAME=		php-${PKGMODNAME}-${PHP_BASE_VERS}.${PECL_VERSION}
-PDO_VERSION?=		1.0RC1
+MODNAME=		PDO${_PDO_SEP}${PDO_DRIVER_TR:sh}
+PKGMODNAME=		pdo${_PDO_SEP}${PDO_DRIVER}
 PECL_VERSION?=		${PDO_VERSION}
+PKGNAME=		php-${PKGMODNAME}-${PHP_BASE_VERS}.${PECL_VERSION}
+
 CATEGORIES+=		databases
 MAINTAINER=		jdolecek@NetBSD.org
 COMMENT=		PHP PDO extension for ${PDO_COMMENT} databases
-
-.include "../../databases/php-pdo/buildlink3.mk"
diff --git a/databases/php-pdo_dblib/Makefile b/databases/php-pdo_dblib/Makefile
index a6b36ef5799..8ccb9b30843 100644
--- a/databases/php-pdo_dblib/Makefile
+++ b/databases/php-pdo_dblib/Makefile
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
 PDO_DRIVER=		dblib
 PDO_COMMENT=		FreeTDS/Sybase/MS SQL
+PDO_VERSION=		1.0
+
+.include "../../databases/php-pdo/module.mk"
 
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_DIR}/freetds
 
@@ -9,4 +12,4 @@ CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_DIR}/freetds
 BUILDLINK_DEPENDS.freetds+=	freetds>=0.63
 
 .include "../../databases/freetds/buildlink3.mk"
-.include "../../databases/php-pdo/module.mk"
+.include "../../databases/php-pdo/buildlink3.mk"
diff --git a/databases/php-pdo_dblib/distinfo b/databases/php-pdo_dblib/distinfo
index 251c7a619b7..6217c63efeb 100644
--- a/databases/php-pdo_dblib/distinfo
+++ b/databases/php-pdo_dblib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
-SHA1 (php-PDO_DBLIB/PDO_DBLIB-1.0RC1.tgz) = 6f3865932bb96fac3f49aa2c7f4d4fa8cf6164b9
-RMD160 (php-PDO_DBLIB/PDO_DBLIB-1.0RC1.tgz) = 5922102bcdfda827f6c504b3cfc802ed31053a43
-Size (php-PDO_DBLIB/PDO_DBLIB-1.0RC1.tgz) = 7953 bytes
+SHA1 (php-PDO_DBLIB/PDO_DBLIB-1.0.tgz) = ecefa1bd2bc06a18207059964b81bbc2509e303e
+RMD160 (php-PDO_DBLIB/PDO_DBLIB-1.0.tgz) = 4d8737691731d3261c19080ba6c0477ecae0414e
+Size (php-PDO_DBLIB/PDO_DBLIB-1.0.tgz) = 8184 bytes
diff --git a/databases/php-pdo_mysql/Makefile b/databases/php-pdo_mysql/Makefile
index e48043c29cb..cce33ddfe91 100644
--- a/databases/php-pdo_mysql/Makefile
+++ b/databases/php-pdo_mysql/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
 PDO_DRIVER=		mysql
 PDO_COMMENT=		MySQL
+PDO_VERSION=		1.0.1
+
+.include "../../databases/php-pdo/module.mk"
 
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.mysql-client}
 
 .include "../../mk/mysql.buildlink3.mk"
-.include "../../databases/php-pdo/module.mk"
+.include "../../databases/php-pdo/buildlink3.mk"
diff --git a/databases/php-pdo_mysql/distinfo b/databases/php-pdo_mysql/distinfo
index 4d9fb71f23e..bf4fd7609d8 100644
--- a/databases/php-pdo_mysql/distinfo
+++ b/databases/php-pdo_mysql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
-SHA1 (php-PDO_MYSQL/PDO_MYSQL-1.0RC1.tgz) = 310bdcb7443a2f80a2f65f4a5add383deafd265b
-RMD160 (php-PDO_MYSQL/PDO_MYSQL-1.0RC1.tgz) = 490484b27f5033a2ec72dfd07181629fb3c0ff3d
-Size (php-PDO_MYSQL/PDO_MYSQL-1.0RC1.tgz) = 11553 bytes
+SHA1 (php-PDO_MYSQL/PDO_MYSQL-1.0.1.tgz) = 3c60399aa71b4d065b9f0c597667f16d522eeff1
+RMD160 (php-PDO_MYSQL/PDO_MYSQL-1.0.1.tgz) = b7f09c74696cf293c971186fd1dcc5ab0de5681e
+Size (php-PDO_MYSQL/PDO_MYSQL-1.0.1.tgz) = 13002 bytes
diff --git a/databases/php-pdo_odbc/Makefile b/databases/php-pdo_odbc/Makefile
index 219c7051f8a..94d4a29910b 100644
--- a/databases/php-pdo_odbc/Makefile
+++ b/databases/php-pdo_odbc/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
 PDO_DRIVER=		odbc
 PDO_COMMENT=		ODBC
-PECL_VERSION?=		0.9
+PDO_VERSION=		1.0
+
+.include "../../databases/php-pdo/module.mk"
 
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}=unixodbc,${BUILDLINK_PREFIX.unixodbc}
 
 .include "../../databases/unixodbc/buildlink3.mk"
-.include "../../databases/php-pdo/module.mk"
+.include "../../databases/php-pdo/buildlink3.mk"
diff --git a/databases/php-pdo_odbc/distinfo b/databases/php-pdo_odbc/distinfo
index 1dfa94604de..0dba76e272f 100644
--- a/databases/php-pdo_odbc/distinfo
+++ b/databases/php-pdo_odbc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
-SHA1 (php-PDO_ODBC/PDO_ODBC-0.9.tgz) = cd53c65b68115aa5bfc777a52b975bd57d3f89aa
-RMD160 (php-PDO_ODBC/PDO_ODBC-0.9.tgz) = 56a162b264358e4c71cb7b150376561d71aa51a6
-Size (php-PDO_ODBC/PDO_ODBC-0.9.tgz) = 12838 bytes
+SHA1 (php-PDO_ODBC/PDO_ODBC-1.0.tgz) = 1a0f88fc5b06a24975368b86bfc69b2a53e00384
+RMD160 (php-PDO_ODBC/PDO_ODBC-1.0.tgz) = 5fc75c10e8aa0b78bc99a8c76b070fad4f2102c6
+Size (php-PDO_ODBC/PDO_ODBC-1.0.tgz) = 13019 bytes
diff --git a/databases/php-pdo_pgsql/Makefile b/databases/php-pdo_pgsql/Makefile
index 2894976d036..057fb2708ad 100644
--- a/databases/php-pdo_pgsql/Makefile
+++ b/databases/php-pdo_pgsql/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
 PDO_DRIVER=		pgsql
 PDO_COMMENT=		PostgreSQL
+PDO_VERSION=		1.0.1
+
+.include "../../databases/php-pdo/module.mk"
 
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${PGSQL_PREFIX}
 
 .include "../../mk/pgsql.buildlink3.mk"
-.include "../../databases/php-pdo/module.mk"
+.include "../../databases/php-pdo/buildlink3.mk"
diff --git a/databases/php-pdo_pgsql/distinfo b/databases/php-pdo_pgsql/distinfo
index a3c9c514d9b..db85c7138b9 100644
--- a/databases/php-pdo_pgsql/distinfo
+++ b/databases/php-pdo_pgsql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
-SHA1 (php-PDO_PGSQL/PDO_PGSQL-1.0RC1.tgz) = dabc5e1d28b863ac64f1df9d38928f5aa1914406
-RMD160 (php-PDO_PGSQL/PDO_PGSQL-1.0RC1.tgz) = eeb2bf6ceca3668d8c425dddfbfa4c7b1fe8d5e3
-Size (php-PDO_PGSQL/PDO_PGSQL-1.0RC1.tgz) = 11468 bytes
+SHA1 (php-PDO_PGSQL/PDO_PGSQL-1.0.1.tgz) = c2a22e5d701d029d104f62120c7c2ff95e8beb19
+RMD160 (php-PDO_PGSQL/PDO_PGSQL-1.0.1.tgz) = 51088de4660210053eebf87685621835b3a45157
+Size (php-PDO_PGSQL/PDO_PGSQL-1.0.1.tgz) = 13308 bytes
diff --git a/databases/php-pdo_sqlite/Makefile b/databases/php-pdo_sqlite/Makefile
index 1fb0768cfc3..4b9416a9b10 100644
--- a/databases/php-pdo_sqlite/Makefile
+++ b/databases/php-pdo_sqlite/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
 PDO_DRIVER=		sqlite
 PDO_COMMENT=		SQLite v3
+PDO_VERSION=		1.0
+
+.include "../../databases/php-pdo/module.mk"
 
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.sqlite3}
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../databases/php-pdo/module.mk"
+.include "../../databases/php-pdo/buildlink3.mk"
diff --git a/databases/php-pdo_sqlite/distinfo b/databases/php-pdo_sqlite/distinfo
index d83a908e61b..26264a6a108 100644
--- a/databases/php-pdo_sqlite/distinfo
+++ b/databases/php-pdo_sqlite/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/09 13:11:18 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
 
-SHA1 (php-PDO_SQLITE/PDO_SQLITE-1.0RC1.tgz) = 2837639b6aa58233311acb20b9c8dba00a095415
-RMD160 (php-PDO_SQLITE/PDO_SQLITE-1.0RC1.tgz) = 2d98d9e7e093d04aef4cbd30bbb4a69e976bedf8
-Size (php-PDO_SQLITE/PDO_SQLITE-1.0RC1.tgz) = 859745 bytes
+SHA1 (php-PDO_SQLITE/PDO_SQLITE-1.0.tgz) = acad8d84b0bca37511aa4bc072288e763174c60d
+RMD160 (php-PDO_SQLITE/PDO_SQLITE-1.0.tgz) = 9a98101e0a37a8869118da0cb686c502448d422b
+Size (php-PDO_SQLITE/PDO_SQLITE-1.0.tgz) = 866928 bytes