[pkgsrc/trunk]: pkgsrc/databases/php-sqlite replace local arg3_force_ref[] wi...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6192fbe1a840
branches:  trunk
changeset: 499292:6192fbe1a840
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Sep 18 15:22:11 2005 +0000

description:
replace local arg3_force_ref[] with standard Zend API's third_arg_force_ref
(definition is identical on PHP4), so that this compiles with PHP5

allow the package to build with PHP5 too, bump package revision

diffstat:

 databases/php-sqlite/Makefile         |   6 ++----
 databases/php-sqlite/distinfo         |   3 ++-
 databases/php-sqlite/patches/patch-aa |  24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r 1e2911807fc9 -r 6192fbe1a840 databases/php-sqlite/Makefile
--- a/databases/php-sqlite/Makefile     Sun Sep 18 13:52:02 2005 +0000
+++ b/databases/php-sqlite/Makefile     Sun Sep 18 15:22:11 2005 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2005/09/12 16:43:18 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/09/18 15:22:11 jdolecek Exp $
 
 MODNAME=               SQLite
 PKGMODNAME=            sqlite
 PKGNAME=               php-${PKGMODNAME}-${PHP_BASE_VERS}.${PECL_VERSION}
-PKGREVISION=           1
+PKGREVISION=           2
 PECL_VERSION=          1.0.3
 CATEGORIES+=           databases
 MAINTAINER=            tech-pkg%NetBSD.org@localhost
 COMMENT=               PHP extension for SQLite 2.x databases
 
-PHP_VERSIONS_ACCEPTED= 4
-
 CONFIGURE_ARGS+=       --with-${PKGMODNAME}=shared,${BUILDLINK_PREFIX.sqlite}
 
 .include "../../lang/php/ext.mk"
diff -r 1e2911807fc9 -r 6192fbe1a840 databases/php-sqlite/distinfo
--- a/databases/php-sqlite/distinfo     Sun Sep 18 13:52:02 2005 +0000
+++ b/databases/php-sqlite/distinfo     Sun Sep 18 15:22:11 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/09/06 19:10:57 tv Exp $
+$NetBSD: distinfo,v 1.2 2005/09/18 15:22:11 jdolecek Exp $
 
 SHA1 (php-SQLite/SQLite-1.0.3.tgz) = 338333183875deb74956b37a8d58e2659d47a501
 RMD160 (php-SQLite/SQLite-1.0.3.tgz) = 681928ec360b5fe3e7cdcecc5ff88491f5547428
 Size (php-SQLite/SQLite-1.0.3.tgz) = 371189 bytes
+SHA1 (patch-aa) = cfc560a992bd8706f79828f31b7210fcef14e25f
diff -r 1e2911807fc9 -r 6192fbe1a840 databases/php-sqlite/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/php-sqlite/patches/patch-aa     Sun Sep 18 15:22:11 2005 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2005/09/18 15:22:11 jdolecek Exp $
+
+--- sqlite.c.orig      2005-09-18 16:59:55.000000000 +0200
++++ sqlite.c   2005-09-18 17:01:08.000000000 +0200
+@@ -53,8 +53,6 @@
+ extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out);
+ extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out);
+ 
+-static unsigned char arg3_force_ref[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
+-
+ static int le_sqlite_db, le_sqlite_result, le_sqlite_pdb;
+ 
+ static inline void php_sqlite_strtoupper(char *s)
+@@ -122,8 +120,8 @@
+ enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM };
+ 
+ function_entry sqlite_functions[] = {
+-      PHP_FE(sqlite_open, arg3_force_ref)
+-      PHP_FE(sqlite_popen, arg3_force_ref)
++      PHP_FE(sqlite_open, third_arg_force_ref)
++      PHP_FE(sqlite_popen, third_arg_force_ref)
+       PHP_FE(sqlite_close, NULL)
+       PHP_FE(sqlite_query, NULL)
+       PHP_FE(sqlite_exec, NULL)