diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2010-04-12 13:56:14 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2010-04-12 13:56:14 +0000 |
| commit | 49812c9408c3c37d20c8a5c4476d1cc53165a5b6 (patch) | |
| tree | af9ebccaa64aaf55f0b09365d978016096a5a864 /databases | |
| parent | a30025fa7254dd06a650e4cf7fd70966189f0603 (diff) | |
| download | ports-49812c9408c3c37d20c8a5c4476d1cc53165a5b6.tar.gz ports-49812c9408c3c37d20c8a5c4476d1cc53165a5b6.zip | |
- Fix build with php 5.3
PR: ports/145653
Submitted by: Joe Horn <joehorn@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=252595
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/php-adodb-ext/Makefile | 3 | ||||
| -rw-r--r-- | databases/php-adodb-ext/files/patch-adodb.c | 28 | ||||
| -rw-r--r-- | databases/php-adodb-ext/pkg-plist | 2 |
3 files changed, 32 insertions, 1 deletions
diff --git a/databases/php-adodb-ext/Makefile b/databases/php-adodb-ext/Makefile index e049f28d16d2..f3051497fbdf 100644 --- a/databases/php-adodb-ext/Makefile +++ b/databases/php-adodb-ext/Makefile @@ -7,6 +7,7 @@ PORTNAME= adodb-ext PORTVERSION= 5.04 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://phplens.com/lens/dl/ PKGNAMEPREFIX= php- @@ -20,11 +21,13 @@ WRKSRC= ${WRKDIR}/adodb-${PORTVERSION:S/.//} 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} SUB_FILES= pkg-message PLIST_SUB= PHP_EXT_DIR=${PHP_EXT_DIR} +USE_DOS2UNIX= yes post-install: @${CAT} ${PKGMESSAGE} diff --git a/databases/php-adodb-ext/files/patch-adodb.c b/databases/php-adodb-ext/files/patch-adodb.c new file mode 100644 index 000000000000..1d31a0848451 --- /dev/null +++ b/databases/php-adodb-ext/files/patch-adodb.c @@ -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 = ¶ms[1]; diff --git a/databases/php-adodb-ext/pkg-plist b/databases/php-adodb-ext/pkg-plist index 44fc06f89b46..e2c7d4c30c7a 100644 --- a/databases/php-adodb-ext/pkg-plist +++ b/databases/php-adodb-ext/pkg-plist @@ -1,2 +1,2 @@ lib/php/%%PHP_EXT_DIR%%/adodb.so -@dirrmtry lib/php/%%PHP_EXT_DIR%%
\ No newline at end of file +@dirrmtry lib/php/%%PHP_EXT_DIR%% |