diff options
| -rw-r--r-- | databases/php-adodb-ext/Makefile | 20 | ||||
| -rw-r--r-- | databases/php-adodb-ext/files/extra-patch-php54-adodb.c | 26 | ||||
| -rw-r--r-- | databases/php-adodb-ext/files/patch-adodb.c (renamed from databases/php-adodb-ext/files/extra-patch-adodb.c) | 0 | ||||
| -rw-r--r-- | databases/php-adodb-ext/pkg-descr | 2 | ||||
| -rw-r--r-- | databases/php-adodb-ext/pkg-plist | 2 |
5 files changed, 6 insertions, 44 deletions
diff --git a/databases/php-adodb-ext/Makefile b/databases/php-adodb-ext/Makefile index 97909371eadb..8b63ffdbfeaf 100644 --- a/databases/php-adodb-ext/Makefile +++ b/databases/php-adodb-ext/Makefile @@ -3,7 +3,7 @@ PORTNAME= adodb-ext PORTVERSION= 5.04 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= http://phplens.com/lens/dl/ PKGNAMEPREFIX= php- @@ -14,27 +14,17 @@ COMMENT= ADOdb Extension WRKSRC= ${WRKDIR}/adodb-${PORTVERSION:S/.//} -USES= zip +USES= dos2unix zip USE_PHP= yes -USE_PHPIZE= yes -DEFAULT_PHP_VER=53 +USE_PHPEXT= yes +PHP_MODNAME= adodb -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 -NO_STAGE= yes .include <bsd.port.pre.mk> -.if ${PHP_VER} == "5" +.if ${PHP_VER} == "5" || ${PHP_VER} == "54" || ${PHP_VER} == "55" EXTRA_PATCHES= ${PATCHDIR}/extra-patch-php54-adodb.c -.elif ${PHP_VER} != "52" -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-adodb.c .endif -post-install: - @${CAT} ${PKGMESSAGE} - .include <bsd.port.post.mk> diff --git a/databases/php-adodb-ext/files/extra-patch-php54-adodb.c b/databases/php-adodb-ext/files/extra-patch-php54-adodb.c index ef2ffb0d8c88..d78d62be0a2c 100644 --- a/databases/php-adodb-ext/files/extra-patch-php54-adodb.c +++ b/databases/php-adodb-ext/files/extra-patch-php54-adodb.c @@ -9,29 +9,3 @@ 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]; diff --git a/databases/php-adodb-ext/files/extra-patch-adodb.c b/databases/php-adodb-ext/files/patch-adodb.c index 1d31a0848451..1d31a0848451 100644 --- a/databases/php-adodb-ext/files/extra-patch-adodb.c +++ b/databases/php-adodb-ext/files/patch-adodb.c diff --git a/databases/php-adodb-ext/pkg-descr b/databases/php-adodb-ext/pkg-descr index 1819ffebe0fd..1abda72a953e 100644 --- a/databases/php-adodb-ext/pkg-descr +++ b/databases/php-adodb-ext/pkg-descr @@ -3,4 +3,4 @@ with C code. ADOdb will auto-detect if this extension is installed and use it automatically. This extension is compatible with ADOdb 3.32 or later, and PHP 4.3.*, 4.4.*, 5.0.* and 5.1.*. -WWW: http://adodb.sourceforge.net/ +WWW: http://adodb.sourceforge.net/ diff --git a/databases/php-adodb-ext/pkg-plist b/databases/php-adodb-ext/pkg-plist deleted file mode 100644 index e2c7d4c30c7a..000000000000 --- a/databases/php-adodb-ext/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/php/%%PHP_EXT_DIR%%/adodb.so -@dirrmtry lib/php/%%PHP_EXT_DIR%% |