pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases The php_pdo* packages have not kept step wit...
details: https://anonhg.NetBSD.org/pkgsrc/rev/530f64e88af7
branches: trunk
changeset: 555928:530f64e88af7
user: sborrill <sborrill%pkgsrc.org@localhost>
date: Fri Mar 13 10:57:20 2009 +0000
description:
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
diffstat:
databases/php-pdo/Makefile | 24 ++++++++++++----------
databases/php-pdo/buildlink3.mk | 4 +-
databases/php-pdo/distinfo | 6 -----
databases/php-pdo/module.mk | 33 +++++--------------------------
databases/php-pdo/patches/patch-aa | 27 --------------------------
databases/php-pdo_dblib/Makefile | 20 +++++++++++++-----
databases/php-pdo_dblib/distinfo | 6 -----
databases/php-pdo_dblib/patches/patch-aa | 28 ---------------------------
databases/php-pdo_mysql/Makefile | 19 ++++++++++++-----
databases/php-pdo_odbc/Makefile | 20 +++++++++++++-----
databases/php-pdo_odbc/distinfo | 5 ----
databases/php-pdo_pgsql/Makefile | 19 +++++++++++------
databases/php-pdo_pgsql/distinfo | 5 ----
databases/php-pdo_sqlite/Makefile | 18 +++++++++++-----
databases/php-pdo_sqlite/distinfo | 5 ----
15 files changed, 86 insertions(+), 153 deletions(-)
diffs (truncated from 383 to 300 lines):
diff -r af9301b8804f -r 530f64e88af7 databases/php-pdo/Makefile
--- a/databases/php-pdo/Makefile Fri Mar 13 10:11:14 2009 +0000
+++ b/databases/php-pdo/Makefile Fri Mar 13 10:57:20 2009 +0000
@@ -1,28 +1,30 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:19 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/03/13 10:57:20 sborrill Exp $
-PDO_DRIVER= # empty
-PDO_VERSION= 1.0.2
+MODNAME= pdo
+CATEGORIES+= databases
+COMMENT= PHP extension for PHP Data Objects (base)
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"
-COMMENT= PHP extension for PHP Data Objects (base)
+CONFIGURE_ARGS+= --with-${MODNAME}
-CONFIGURE_ARGS+= --with-${PKGMODNAME}
-
-PLIST_SRC+= ${.CURDIR}/../../databases/php-pdo/PLIST.pdo
+INSTALLATION_DIRS+= include/php/ext/pdo
PDO_INCLUDES= php_pdo_driver.h php_pdo.h
-
-INSTALLATION_DIRS+= include/php/ext/pdo
+PLIST_SRC+= ${.CURDIR}/../../databases/php-pdo/PLIST.pdo
post-install:
.for inc in ${PDO_INCLUDES}
${INSTALL_DATA} ${WRKSRC}/${inc} ${DESTDIR}${PREFIX}/include/php/ext/pdo/${inc}
.endfor
-
-.include "../../lang/php/ext.mk"
+
.include "../../mk/bsd.pkg.mk"
diff -r af9301b8804f -r 530f64e88af7 databases/php-pdo/buildlink3.mk
--- a/databases/php-pdo/buildlink3.mk Fri Mar 13 10:11:14 2009 +0000
+++ b/databases/php-pdo/buildlink3.mk Fri Mar 13 10:57:20 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/05 20:58:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/03/13 10:57:20 sborrill Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PHP_PDO_BUILDLINK3_MK:= ${PHP_PDO_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@
.if !empty(PHP_PDO_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.php-pdo+= ${PHP_PKG_PREFIX}-pdo-5.*
-BUILDLINK_ABI_DEPENDS.php-pdo?= ${PHP_PKG_PREFIX}-pdo>=5.1.1.1.0.2nb1
+BUILDLINK_ABI_DEPENDS.php-pdo?= ${PHP_PKG_PREFIX}-pdo>=5.2.9
BUILDLINK_PKGSRCDIR.php-pdo?= ../../databases/php-pdo
BUILDLINK_INCDIRS.php-pdo?= include/php/ext/pdo
.endif # PHP_PDO_BUILDLINK3_MK
diff -r af9301b8804f -r 530f64e88af7 databases/php-pdo/distinfo
--- a/databases/php-pdo/distinfo Fri Mar 13 10:11:14 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2007/09/04 23:21:27 jdolecek Exp $
-
-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
-SHA1 (patch-aa) = 49cdde51d81b5a7938ff36eabc3b663ea5858689
diff -r af9301b8804f -r 530f64e88af7 databases/php-pdo/module.mk
--- a/databases/php-pdo/module.mk Fri Mar 13 10:11:14 2009 +0000
+++ b/databases/php-pdo/module.mk Fri Mar 13 10:57:20 2009 +0000
@@ -1,28 +1,7 @@
-# $NetBSD: module.mk,v 1.7 2006/06/02 18:27:55 joerg Exp $
-
-# Items common for all PDO drivers
-
-.if !empty(PDO_DRIVER)
-_PDO_SEP= _
-.else
-_PDO_SEP= # empty
-.endif
+# $NetBSD: module.mk,v 1.8 2009/03/13 10:57:20 sborrill Exp $
-PDO_DRIVER_TR= ${ECHO} ${PDO_DRIVER:Q} | ${TR} a-z A-Z
-MODNAME= PDO${_PDO_SEP}${PDO_DRIVER_TR:sh}
-PKGMODNAME= pdo${_PDO_SEP}${PDO_DRIVER}
-PECL_VERSION?= ${PDO_VERSION}
-PKGNAME= ${PHP_PKG_PREFIX}-${PKGMODNAME}-${PHP_BASE_VERS}.${PECL_VERSION}
-
-CONFLICTS= php-pdo${_PDO_SEP}${PDO_DRIVER}-[0-9]*
-
-CATEGORIES+= databases
-MAINTAINER= jdolecek%NetBSD.org@localhost
-COMMENT= PHP PDO extension for ${PDO_COMMENT} databases
-
-# needed due to (broken?) PDO_* configure checks
-CONFIGURE_ENV+= PHP_PDO_SHARED="1"
-
-PHP_VERSIONS_ACCEPTED= 5
-
-.include "../../lang/php/phpversion.mk"
+# This file is now only needed to patch up PKGNAME until PHP 5.2.10 or later is
+# released.
+.if "${PHP_BASE_VERS}" == "5.2.9"
+PKGNAME= ${PHP_PKG_PREFIX}-${MODNAME}-${PHP_BASE_VERS}.99
+.endif
diff -r af9301b8804f -r 530f64e88af7 databases/php-pdo/patches/patch-aa
--- a/databases/php-pdo/patches/patch-aa Fri Mar 13 10:11:14 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/09/04 23:21:27 jdolecek Exp $
-
---- config.m4.orig 2006-05-02 04:47:43.000000000 +0200
-+++ config.m4
-@@ -34,22 +34,6 @@ if test "$PHP_PDO" != "no"; then
-
- PHP_PDO_PEAR_CHECK
-
-- if test "$ext_shared" = "yes" ; then
-- case $host_alias in
-- *darwin*)
-- if test "$pdo_running_under_pear" = "1"; then
-- AC_MSG_ERROR([
--Due to the way that loadable modules work on OSX/Darwin, you need to
--compile the PDO package statically into the PHP core.
--
--Please follow the instructions at: http://netevil.org/node.php?nid=202
--for more detail on this issue.
-- ])
-- fi
-- ext_shared=no
-- ;;
-- esac
-- fi
- PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared)
- ifdef([PHP_ADD_EXTENSION_DEP],
- [
diff -r af9301b8804f -r 530f64e88af7 databases/php-pdo_dblib/Makefile
--- a/databases/php-pdo_dblib/Makefile Fri Mar 13 10:11:14 2009 +0000
+++ b/databases/php-pdo_dblib/Makefile Fri Mar 13 10:57:20 2009 +0000
@@ -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 $
+
+MODNAME= pdo_dblib
+CATEGORIES+= databases
+COMMENT= PHP extension for PHP Data Objects (FreeTDS/Sybase/MS SQL)
+
+PHP_VERSIONS_ACCEPTED= 5
-PDO_DRIVER= dblib
-PDO_COMMENT= FreeTDS/Sybase/MS SQL
-PDO_VERSION= 1.0
+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 @@
.include "../../databases/freetds/buildlink3.mk"
.include "../../databases/php-pdo/buildlink3.mk"
-
-.include "../../lang/php/ext.mk"
.include "../../mk/bsd.pkg.mk"
diff -r af9301b8804f -r 530f64e88af7 databases/php-pdo_dblib/distinfo
--- a/databases/php-pdo_dblib/distinfo Fri Mar 13 10:11:14 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r af9301b8804f -r 530f64e88af7 databases/php-pdo_dblib/patches/patch-aa
--- a/databases/php-pdo_dblib/patches/patch-aa Fri Mar 13 10:11:14 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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)
diff -r af9301b8804f -r 530f64e88af7 databases/php-pdo_mysql/Makefile
--- a/databases/php-pdo_mysql/Makefile Fri Mar 13 10:11:14 2009 +0000
+++ b/databases/php-pdo_mysql/Makefile Fri Mar 13 10:57:20 2009 +0000
@@ -1,17 +1,24 @@
-# $NetBSD: Makefile,v 1.7 2009/03/05 20:58:37 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/03/13 10:57:20 sborrill Exp $
-PDO_DRIVER= mysql
-PDO_COMMENT= MySQL
-PDO_VERSION= 1.0.1
+MODNAME= pdo_mysql
+CATEGORIES+= databases
+COMMENT= PHP extension for PHP Data Objects (MySQL)
+
+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_PREFIX.mysql-client}
.include "../../mk/mysql.buildlink3.mk"
.include "../../databases/php-pdo/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
-.include "../../lang/php/ext.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r af9301b8804f -r 530f64e88af7 databases/php-pdo_odbc/Makefile
--- a/databases/php-pdo_odbc/Makefile Fri Mar 13 10:11:14 2009 +0000
+++ b/databases/php-pdo_odbc/Makefile Fri Mar 13 10:57:20 2009 +0000
@@ -1,17 +1,25 @@
-# $NetBSD: Makefile,v 1.6 2009/03/05 20:58:37 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/03/13 10:57:20 sborrill Exp $
+
+MODNAME= pdo_odbc
+CATEGORIES+= databases
+COMMENT= PHP extension for PHP Data Objects (ODBC)
+
+PHP_VERSIONS_ACCEPTED= 5
-PDO_DRIVER= odbc
-PDO_COMMENT= ODBC
-PDO_VERSION= 1.0
+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}=unixodbc,${BUILDLINK_PREFIX.unixodbc}
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 -r af9301b8804f -r 530f64e88af7 databases/php-pdo_odbc/distinfo
--- a/databases/php-pdo_odbc/distinfo Fri Mar 13 10:11:14 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/12/03 17:24:28 jdolecek Exp $
-
-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 -r af9301b8804f -r 530f64e88af7 databases/php-pdo_pgsql/Makefile
--- a/databases/php-pdo_pgsql/Makefile Fri Mar 13 10:11:14 2009 +0000
Home |
Main Index |
Thread Index |
Old Index