Wed Oct 7 05:00:59 2009 UTC ()
Remove use of temporary workaround for version problem of php-pdo*
packages when they switched to use bundled files in php-5.2.9.

Now we don't need this workaround any more and code itself already
no operation.

No functional change.


(taca)
diff -r1.8 -r1.9 pkgsrc/databases/php-pdo/Makefile
diff -r1.9 -r1.10 pkgsrc/databases/php-pdo_dblib/Makefile
diff -r1.8 -r1.9 pkgsrc/databases/php-pdo_mysql/Makefile
diff -r1.7 -r1.8 pkgsrc/databases/php-pdo_odbc/Makefile
diff -r1.10 -r1.11 pkgsrc/databases/php-pdo_pgsql/Makefile
diff -r1.7 -r1.8 pkgsrc/databases/php-pdo_sqlite/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/databases/php-pdo/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/php-pdo/Makefile 2009/03/13 10:57:20 1.8
+++ pkgsrc/databases/php-pdo/Makefile 2009/10/07 05:00:58 1.9
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.8 2009/03/13 10:57:20 sborrill Exp $ 1# $NetBSD: Makefile,v 1.9 2009/10/07 05:00:58 taca Exp $
2 2
3MODNAME= pdo 3MODNAME= pdo
4CATEGORIES+= databases 4CATEGORIES+= databases
5COMMENT= PHP extension for PHP Data Objects (base) 5COMMENT= PHP extension for PHP Data Objects (base)
6 6
7PHP_VERSIONS_ACCEPTED= 5 7PHP_VERSIONS_ACCEPTED= 5
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10USE_PHP_EXT_PATCHES= yes 10USE_PHP_EXT_PATCHES= yes
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14.include "../../lang/php/ext.mk" 14.include "../../lang/php/ext.mk"
15# Remove the following line when PHP >= 5.2.10 is released 
16.include "../../databases/php-pdo/module.mk" 
17 15
18CONFIGURE_ARGS+= --with-${MODNAME} 16CONFIGURE_ARGS+= --with-${MODNAME}
19 17
20INSTALLATION_DIRS+= include/php/ext/pdo 18INSTALLATION_DIRS+= include/php/ext/pdo
21 19
22PDO_INCLUDES= php_pdo_driver.h php_pdo.h 20PDO_INCLUDES= php_pdo_driver.h php_pdo.h
23PLIST_SRC+= ${.CURDIR}/../../databases/php-pdo/PLIST.pdo 21PLIST_SRC+= ${.CURDIR}/../../databases/php-pdo/PLIST.pdo
24 22
25post-install: 23post-install:
26.for inc in ${PDO_INCLUDES} 24.for inc in ${PDO_INCLUDES}
27 ${INSTALL_DATA} ${WRKSRC}/${inc} ${DESTDIR}${PREFIX}/include/php/ext/pdo/${inc} 25 ${INSTALL_DATA} ${WRKSRC}/${inc} ${DESTDIR}${PREFIX}/include/php/ext/pdo/${inc}
28.endfor 26.endfor
29  27
cvs diff -r1.9 -r1.10 pkgsrc/databases/php-pdo_dblib/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/php-pdo_dblib/Makefile 2009/03/13 10:57:20 1.9
+++ pkgsrc/databases/php-pdo_dblib/Makefile 2009/10/07 05:00:58 1.10
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.9 2009/03/13 10:57:20 sborrill Exp $ 1# $NetBSD: Makefile,v 1.10 2009/10/07 05:00:58 taca Exp $
2 2
3MODNAME= pdo_dblib 3MODNAME= pdo_dblib
4CATEGORIES+= databases 4CATEGORIES+= databases
5COMMENT= PHP extension for PHP Data Objects (FreeTDS/Sybase/MS SQL) 5COMMENT= PHP extension for PHP Data Objects (FreeTDS/Sybase/MS SQL)
6 6
7PHP_VERSIONS_ACCEPTED= 5 7PHP_VERSIONS_ACCEPTED= 5
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10USE_PHP_EXT_PATCHES= yes 10USE_PHP_EXT_PATCHES= yes
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14.include "../../lang/php/ext.mk" 14.include "../../lang/php/ext.mk"
15# Remove the following line when PHP >= 5.2.10 is released 
16.include "../../databases/php-pdo/module.mk" 
17 15
18CONFIGURE_ARGS+= --with-${MODNAME} 16CONFIGURE_ARGS+= --with-${MODNAME}
19CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${BUILDLINK_DIR} 17CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${BUILDLINK_DIR}
20 18
21# requires 0.63 version to compile, doesn't compile with 0.61 19# requires 0.63 version to compile, doesn't compile with 0.61
22BUILDLINK_API_DEPENDS.freetds+= freetds>=0.63 20BUILDLINK_API_DEPENDS.freetds+= freetds>=0.63
23 21
24.include "../../databases/freetds/buildlink3.mk" 22.include "../../databases/freetds/buildlink3.mk"
25.include "../../databases/php-pdo/buildlink3.mk" 23.include "../../databases/php-pdo/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/databases/php-pdo_mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/php-pdo_mysql/Makefile 2009/03/13 10:57:20 1.8
+++ pkgsrc/databases/php-pdo_mysql/Makefile 2009/10/07 05:00:58 1.9
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1# $NetBSD: Makefile,v 1.8 2009/03/13 10:57:20 sborrill Exp $ 1# $NetBSD: Makefile,v 1.9 2009/10/07 05:00:58 taca Exp $
2 2
3MODNAME= pdo_mysql 3MODNAME= pdo_mysql
4CATEGORIES+= databases 4CATEGORIES+= databases
5COMMENT= PHP extension for PHP Data Objects (MySQL) 5COMMENT= PHP extension for PHP Data Objects (MySQL)
6 6
7PHP_VERSIONS_ACCEPTED= 5 7PHP_VERSIONS_ACCEPTED= 5
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10USE_PHP_EXT_PATCHES= yes 10USE_PHP_EXT_PATCHES= yes
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14.include "../../lang/php/ext.mk" 14.include "../../lang/php/ext.mk"
15# Remove the following line when PHP >= 5.2.10 is released 
16.include "../../databases/php-pdo/module.mk" 
17 15
18CONFIGURE_ARGS+= --with-${MODNAME} 16CONFIGURE_ARGS+= --with-${MODNAME}
19CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.mysql-client} 17CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.mysql-client}
20 18
21.include "../../mk/mysql.buildlink3.mk" 19.include "../../mk/mysql.buildlink3.mk"
22.include "../../databases/php-pdo/buildlink3.mk" 20.include "../../databases/php-pdo/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
24 22
cvs diff -r1.7 -r1.8 pkgsrc/databases/php-pdo_odbc/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/php-pdo_odbc/Makefile 2009/03/13 10:57:20 1.7
+++ pkgsrc/databases/php-pdo_odbc/Makefile 2009/10/07 05:00:58 1.8
@@ -1,25 +1,23 @@ @@ -1,25 +1,23 @@
1# $NetBSD: Makefile,v 1.7 2009/03/13 10:57:20 sborrill Exp $ 1# $NetBSD: Makefile,v 1.8 2009/10/07 05:00:58 taca Exp $
2 2
3MODNAME= pdo_odbc 3MODNAME= pdo_odbc
4CATEGORIES+= databases 4CATEGORIES+= databases
5COMMENT= PHP extension for PHP Data Objects (ODBC) 5COMMENT= PHP extension for PHP Data Objects (ODBC)
6 6
7PHP_VERSIONS_ACCEPTED= 5 7PHP_VERSIONS_ACCEPTED= 5
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10USE_PHP_EXT_PATCHES= yes 10USE_PHP_EXT_PATCHES= yes
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14.include "../../lang/php/ext.mk" 14.include "../../lang/php/ext.mk"
15# Remove the following line when PHP >= 5.2.10 is released 
16.include "../../databases/php-pdo/module.mk" 
17 15
18CONFIGURE_ARGS+= --with-${MODNAME} 16CONFIGURE_ARGS+= --with-${MODNAME}
19CONFIGURE_ARGS+= --with-${PKGMODNAME}=unixodbc,${BUILDLINK_PREFIX.unixodbc} 17CONFIGURE_ARGS+= --with-${PKGMODNAME}=unixodbc,${BUILDLINK_PREFIX.unixodbc}
20 18
21BROKEN= module kills Apache1 or CLI PHP on startup due to threaded unixodbc 19BROKEN= module kills Apache1 or CLI PHP on startup due to threaded unixodbc
22 20
23.include "../../databases/unixodbc/buildlink3.mk" 21.include "../../databases/unixodbc/buildlink3.mk"
24.include "../../databases/php-pdo/buildlink3.mk" 22.include "../../databases/php-pdo/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/databases/php-pdo_pgsql/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/php-pdo_pgsql/Makefile 2009/03/13 10:57:20 1.10
+++ pkgsrc/databases/php-pdo_pgsql/Makefile 2009/10/07 05:00:58 1.11
@@ -1,23 +1,21 @@ @@ -1,23 +1,21 @@
1# $NetBSD: Makefile,v 1.10 2009/03/13 10:57:20 sborrill Exp $ 1# $NetBSD: Makefile,v 1.11 2009/10/07 05:00:58 taca Exp $
2 2
3MODNAME= pdo_pgsql 3MODNAME= pdo_pgsql
4CATEGORIES+= databases 4CATEGORIES+= databases
5COMMENT= PHP extension for PHP Data Objects (PostgreSQL) 5COMMENT= PHP extension for PHP Data Objects (PostgreSQL)
6 6
7PHP_VERSIONS_ACCEPTED= 5 7PHP_VERSIONS_ACCEPTED= 5
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10USE_PHP_EXT_PATCHES= yes 10USE_PHP_EXT_PATCHES= yes
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14.include "../../lang/php/ext.mk" 14.include "../../lang/php/ext.mk"
15# Remove the following line when PHP >= 5.2.10 is released 
16.include "../../databases/php-pdo/module.mk" 
17 15
18CONFIGURE_ARGS+= --with-${MODNAME} 16CONFIGURE_ARGS+= --with-${MODNAME}
19CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${PGSQL_PREFIX} 17CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${PGSQL_PREFIX}
20 18
21.include "../../mk/pgsql.buildlink3.mk" 19.include "../../mk/pgsql.buildlink3.mk"
22.include "../../databases/php-pdo/buildlink3.mk" 20.include "../../databases/php-pdo/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/databases/php-pdo_sqlite/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/php-pdo_sqlite/Makefile 2009/03/13 10:57:20 1.7
+++ pkgsrc/databases/php-pdo_sqlite/Makefile 2009/10/07 05:00:59 1.8
@@ -1,23 +1,21 @@ @@ -1,23 +1,21 @@
1# $NetBSD: Makefile,v 1.7 2009/03/13 10:57:20 sborrill Exp $ 1# $NetBSD: Makefile,v 1.8 2009/10/07 05:00:59 taca Exp $
2 2
3MODNAME= pdo_sqlite 3MODNAME= pdo_sqlite
4CATEGORIES+= databases 4CATEGORIES+= databases
5COMMENT= PHP extension for PHP Data Objects (SQLite v3) 5COMMENT= PHP extension for PHP Data Objects (SQLite v3)
6 6
7PHP_VERSIONS_ACCEPTED= 5 7PHP_VERSIONS_ACCEPTED= 5
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10USE_PHP_EXT_PATCHES= yes 10USE_PHP_EXT_PATCHES= yes
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14.include "../../lang/php/ext.mk" 14.include "../../lang/php/ext.mk"
15# Remove the following line when PHP >= 5.2.10 is released 
16.include "../../databases/php-pdo/module.mk" 
17 15
18CONFIGURE_ARGS+= --with-${MODNAME} 16CONFIGURE_ARGS+= --with-${MODNAME}
19CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.sqlite3} 17CONFIGURE_ARGS+= --with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.sqlite3}
20 18
21.include "../../databases/sqlite3/buildlink3.mk" 19.include "../../databases/sqlite3/buildlink3.mk"
22.include "../../databases/php-pdo/buildlink3.mk" 20.include "../../databases/php-pdo/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"