diff options
| author | Michael Scheidell <scheidell@FreeBSD.org> | 2012-05-26 11:11:12 +0000 |
|---|---|---|
| committer | Michael Scheidell <scheidell@FreeBSD.org> | 2012-05-26 11:11:12 +0000 |
| commit | 2c46b870212f8d41d2d1743084a85d021bf608c1 (patch) | |
| tree | 2c197fc19b812dfdc70e25f036264f8afb5880ef /databases | |
| parent | - Upgrade to 0.11. (diff) | |
- Fix for building failed with PHP 5.4
- Bump PORTREVISION
PR: ports/168302
Submitted by: Joe Horn <joehorn@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=297471
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/php-adodb-ext/Makefile | 7 | ||||
| -rw-r--r-- | databases/php-adodb-ext/files/extra-patch-php54-adodb.c | 37 |
2 files changed, 41 insertions, 3 deletions
diff --git a/databases/php-adodb-ext/Makefile b/databases/php-adodb-ext/Makefile index bb54e1f9b27c..24137016745a 100644 --- a/databases/php-adodb-ext/Makefile +++ b/databases/php-adodb-ext/Makefile @@ -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- @@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/adodb-${PORTVERSION:S/.//} USE_PHP= yes USE_PHPIZE= yes DEFAULT_PHP_VER=53 -IGNORE_WITH_PHP=5 USE_ZIP= yes CONFIGURE_ARGS= --with-php-config=${PREFIX}/bin/php-config \ @@ -32,7 +31,9 @@ USE_DOS2UNIX= yes .include <bsd.port.pre.mk> -.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 --git a/databases/php-adodb-ext/files/extra-patch-php54-adodb.c b/databases/php-adodb-ext/files/extra-patch-php54-adodb.c new file mode 100644 index 000000000000..0c2db9a281e2 --- /dev/null +++ b/databases/php-adodb-ext/files/extra-patch-php54-adodb.c @@ -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];
\ No newline at end of file |