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.

4 files changed, 24 insertions, 24 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"