From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 20 15:40:11 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9A4D106566C for ; Sun, 20 May 2012 15:40:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7ECAA8FC18 for ; Sun, 20 May 2012 15:40:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4KFe2PR022700 for ; Sun, 20 May 2012 15:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4KFe2EH022699; Sun, 20 May 2012 15:40:02 GMT (envelope-from gnats) Resent-Date: Sun, 20 May 2012 15:40:02 GMT Resent-Message-Id: <201205201540.q4KFe2EH022699@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joe Horn Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13656106566B for ; Sun, 20 May 2012 15:38:14 +0000 (UTC) (envelope-from root@Leo.mi.chu.edu.tw) Received: from Leo.mi.chu.edu.tw (Leo.mi.chu.edu.tw [140.126.143.63]) by mx1.freebsd.org (Postfix) with ESMTP id CEDE88FC0C for ; Sun, 20 May 2012 15:38:13 +0000 (UTC) Received: from Leo.mi.chu.edu.tw (localhost [127.0.0.1]) by Leo.mi.chu.edu.tw (Postfix) with ESMTP id 85B094DFC28 for ; Sun, 20 May 2012 23:29:50 +0800 (CST) Received: from Leo.mi.chu.edu.tw ([127.0.0.1]) by Leo.mi.chu.edu.tw (Leo.mi.chu.edu.tw [127.0.0.1]) (amavisd-new, port 10024) with LMTP id qm9qvyykfKih for ; Sun, 20 May 2012 23:29:50 +0800 (CST) Received: by Leo.mi.chu.edu.tw (Postfix, from userid 0) id 505544DFC27; Sun, 20 May 2012 23:29:50 +0800 (CST) Message-Id: <20120520152950.505544DFC27@Leo.mi.chu.edu.tw> Date: Sun, 20 May 2012 23:29:50 +0800 (CST) From: Joe Horn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/168168: [MAINTAINER] databases/php-adodb-ext: Fix for building failed with PHP 5.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 May 2012 15:40:11 -0000 >Number: 168168 >Category: ports >Synopsis: [MAINTAINER] databases/php-adodb-ext: Fix for building failed with PHP 5.4 >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: Sun May 20 15:40:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Joe Horn >Release: FreeBSD 9.0-RELEASE amd64 >Organization: Taiwanese User >Environment: System: FreeBSD joehorn.idv.tw 9.0-RELEASE FreeBSD 9.0-RELEASE #3: Mon Jan 9 22:14:09 CST >Description: - Fix for building failed with PHP 5.4 Added file(s): - files/extra-patch-php54-adodb.c Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- php-adodb-ext-5.04_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/databases/php-adodb-ext/Makefile ./Makefile --- /usr/ports/databases/php-adodb-ext/Makefile 2012-05-20 23:27:12.000000000 +0800 +++ ./Makefile 2012-05-20 23:28:24.000000000 +0800 @@ -7,7 +7,7 @@ PORTNAME= adodb-ext PORTVERSION= 5.04 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://phplens.com/lens/dl/ PKGNAMEPREFIX= php- @@ -31,7 +31,9 @@ .include -.if ${PHP_VER} != "52" +.if ${PHP_VER} == "5" +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-php54-adodb.c +.elif ${PHP_VER} != "52" EXTRA_PATCHES= ${PATCHDIR}/extra-patch-adodb.c .endif diff -ruN --exclude=CVS /usr/ports/databases/php-adodb-ext/files/extra-patch-php54-adodb.c ./files/extra-patch-php54-adodb.c --- /usr/ports/databases/php-adodb-ext/files/extra-patch-php54-adodb.c 1970-01-01 08:00:00.000000000 +0800 +++ ./files/extra-patch-php54-adodb.c 2012-05-20 23:24:38.000000000 +0800 @@ -0,0 +1,37 @@ +--- adodb.c.orig 2012-05-20 14:42:41.000000000 +0000 ++++ adodb.c 2012-05-20 14:41:28.000000000 +0000 +@@ -108,7 +108,7 @@ + }; + #else + /* PHP 5 */ +-function_entry adodb_functions[] = { ++zend_function_entry adodb_functions[] = { + PHP_FE(adodb_movenext,NULL) + PHP_FE(adodb_getall,NULL) + {NULL, NULL, NULL} +@@ -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 = ¶ms[1]; --- php-adodb-ext-5.04_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: