ports/145653: [MAINTAINER] databases/php-adodb-ext: Patches added for compiling errors in PHP 5.3

[Joe Horn]

>Number:         145653
>Category:       ports
>Synopsis:       [MAINTAINER] databases/php-adodb-ext: Patches added for compiling errors in PHP 5.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 12 12:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Joe Horn
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
Taiwanese User
>Environment:
System: FreeBSD joehorn.idv.tw 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #1: Fri Jan  8 23:08:25 CST
>Description:
- Patches added for compiling errors in PHP 5.3.x
- Bump PORTREVISION

Added file(s):
- files/patch-adodb.c

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- php-adodb-ext-5.04_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/php-adodb-ext/Makefile /home/admin/joehorn/php-adodb-ext/Makefile
--- /usr/ports/databases/php-adodb-ext/Makefile	2008-08-08 14:44:28.000000000 +0800
+++ /home/admin/joehorn/php-adodb-ext/Makefile	2010-04-12 20:25:15.000000000 +0800
@@ -7,6 +7,7 @@
 
 PORTNAME=	adodb-ext
 PORTVERSION=	5.04
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://phplens.com/lens/dl/
 PKGNAMEPREFIX=	php-
@@ -20,6 +21,7 @@
 USE_PHP=	yes
 USE_PHPIZE=	yes
 USE_ZIP=	yes
+
 DEFAULT_PHP_VER=	5
 CONFIGURE_ARGS=		--with-php-config=${PREFIX}/bin/php-config \
 			--prefix=${PREFIX}/lib/php/${PHP_EXT_DIR}
diff -ruN --exclude=CVS /usr/ports/databases/php-adodb-ext/files/patch-adodb.c /home/admin/joehorn/php-adodb-ext/files/patch-adodb.c
--- /usr/ports/databases/php-adodb-ext/files/patch-adodb.c	1970-01-01 08:00:00.000000000 +0800
+++ /home/admin/joehorn/php-adodb-ext/files/patch-adodb.c	2010-04-12 20:05:48.000000000 +0800
@@ -0,0 +1,28 @@
+--- adodb.c.orig	2010-04-12 20:00:43.000000000 +0800
++++ adodb.c	2010-04-12 20:05:20.000000000 +0800
+@@ -159,11 +159,11 @@
+ 
+ static void adodb_init_zval(zval *v, char *s)
+ {
+-	v->type = IS_STRING;
+-	v->value.str.val = s;
+-	v->value.str.len = strlen(s);
+-	v->is_ref = 0;
+-	v->refcount = 1;
++	Z_TYPE_P(v) = IS_STRING;
++	Z_STRVAL_P(v) = s;
++	Z_STRLEN_P(v) = strlen(s);
++	Z_UNSET_ISREF_P(v);
++	Z_SET_REFCOUNT_P(v, 1);
+ }
+ 
+ /* {{{ PHP_MINIT_FUNCTION
+@@ -277,7 +277,7 @@
+ 	fci.function_table = EG(function_table);
+ 	fci.function_name = &adodb_zvals[zval_ocifetch];
+ 	fci.symbol_table = NULL;
+-	fci.object_pp = NULL;
++	fci.object_ptr = NULL;
+ 	fci.retval_ptr_ptr = &retval;
+ 	fci.param_count = 2;
+ 	fci.params = &params[1];
diff -ruN --exclude=CVS /usr/ports/databases/php-adodb-ext/pkg-plist /home/admin/joehorn/php-adodb-ext/pkg-plist
--- /usr/ports/databases/php-adodb-ext/pkg-plist	2008-08-08 14:44:28.000000000 +0800
+++ /home/admin/joehorn/php-adodb-ext/pkg-plist	2010-04-12 20:35:47.000000000 +0800
@@ -1,2 +1,2 @@
 lib/php/%%PHP_EXT_DIR%%/adodb.so
- at dirrmtry lib/php/%%PHP_EXT_DIR%%
\ No newline at end of file
+ at dirrmtry lib/php/%%PHP_EXT_DIR%%
--- php-adodb-ext-5.04_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: