The php_pdo* packages have not kept step with PHP changes. The PDO

components are now built into PHP rather than maintained separately in
PECL. The old PECL versions are unmaintained and haven't been altered
for 3 years. This is confusing as the package versions report themselves
to be 5.2.9.1.0.2, etc. but they are in fact based on the 5.1.x code-base.

Therefore, we need to switch to building the PDO modules like any other
PHP module.

A side-effect of this is that the PECL version number will get stripped
off the end meaning that the new version numbers are just 5.2.9 instead
of 5.2.9.1.0.2 (for example). Unfortunately, 5.2.9 is considered to be
older than 5.2.9.1.0.2 meaning that it will appear as though a downgrade
has taken place. Therefore, while we are still using PHP 5.2.9, add .99 on
the end (i.e. 5.2.9.99) so that the package appears newer. When PHP 5.2.10
is released this can be removed (the module.mk file explicitly cgecks for
5.2.9 before adding the .99 suffix so that it will not alter 5.2.10 if the
hack is forgotten. However, for the record, when 5.2.10 is released,
php-pdo/module.mk can be removed along with the references to it in each
php-pdo*/Makefile

3 files changed, 14 insertions, 40 deletions

diff --git a/databases/php-pdo_dblib/Makefile b/databases/php-pdo_dblib/Makefile
index d86f695fa7c..5ebaad55a1f 100644
--- a/databases/php-pdo_dblib/Makefile
+++ b/databases/php-pdo_dblib/Makefile
@@ -1,11 +1,21 @@
-# $NetBSD: Makefile,v 1.8 2009/03/05 20:58:37 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/03/13 10:57:20 sborrill Exp $
 
-PDO_DRIVER=		dblib
-PDO_COMMENT=		FreeTDS/Sybase/MS SQL
-PDO_VERSION=		1.0
+MODNAME=		pdo_dblib
+CATEGORIES+=		databases
+COMMENT=		PHP extension for PHP Data Objects (FreeTDS/Sybase/MS SQL)
 
+PHP_VERSIONS_ACCEPTED=	5
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+USE_PHP_EXT_PATCHES=	yes
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../lang/php/ext.mk"
+# Remove the following line when PHP >= 5.2.10 is released
 .include "../../databases/php-pdo/module.mk"
 
+CONFIGURE_ARGS+=	--with-${MODNAME}
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_DIR}
 
 # requires 0.63 version to compile, doesn't compile with 0.61
@@ -13,6 +23,4 @@ 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_dblib/distinfo b/databases/php-pdo_dblib/distinfo
deleted file mode 100644
index c2da5af1250..00000000000
--- a/databases/php-pdo_dblib/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2009/03/05 17:53:32 wiz Exp $
-
-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
-SHA1 (patch-aa) = d15279210ffbbd51d1d041b05117488886175c7b
diff --git a/databases/php-pdo_dblib/patches/patch-aa b/databases/php-pdo_dblib/patches/patch-aa
deleted file mode 100644
index 07261d48fe1..00000000000
--- a/databases/php-pdo_dblib/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/03/05 17:29:38 jdolecek Exp $
-
---- config.m4.orig	2009-03-05 18:16:44.000000000 +0100
-+++ config.m4
-@@ -30,10 +30,10 @@ if test "$PHP_PDO_DBLIB" != "no"; then
- 
-   elif test "$PHP_PDO_DBLIB" != "no"; then
- 
--    if test -f $PHP_PDO_DBLIB/include/tds.h; then
-+    if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
-       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
-       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
--    elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then
-+    elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
-       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
-       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
-     else
-@@ -45,8 +45,8 @@ if test "$PHP_PDO_DBLIB" != "no"; then
-     PHP_LIBDIR=lib
-   fi
- 
--  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
--     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
-+  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-+     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
-   fi
- 
-   PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)