- Solve compilation problem with PHP 5.5 - Remove DEFAULT_PHP_VER setting Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
Responsible Changed From-To: freebsd-ports-bugs->sunpoet sunpoet@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Author: sunpoet Date: Sun Apr 6 05:49:11 2014 New Revision: 350324 URL: http://svnweb.freebsd.org/changeset/ports/350324 QAT: https://qat.redports.org/buildarchive/r350324/ Log: - Allow build with php55 - Remove DEFAULT_PHP_VER - Bump PORTREVISION for dependency change - While I'm here: - Use USE_PHPEXT and PHP_MODNAME - Remove unnecessary CONFIGURE_ARGS - Simplify Makefile: move common part of two extra patches to patch-adodb.c - Use USES=dos2unix - Support STAGEDIR - Use single space after WWW: PR: ports/188236 Submitted by: Joe Horn <joehorn@gmail.com> (maintainer) Added: head/databases/php-adodb-ext/files/patch-adodb.c - copied unchanged from r347423, head/databases/php-adodb-ext/files/extra-patch-adodb.c Deleted: head/databases/php-adodb-ext/files/extra-patch-adodb.c head/databases/php-adodb-ext/pkg-plist Modified: head/databases/php-adodb-ext/Makefile head/databases/php-adodb-ext/files/extra-patch-php54-adodb.c head/databases/php-adodb-ext/pkg-descr Modified: head/databases/php-adodb-ext/Makefile ============================================================================== --- head/databases/php-adodb-ext/Makefile Sun Apr 6 05:49:06 2014 (r350323) +++ head/databases/php-adodb-ext/Makefile Sun Apr 6 05:49:11 2014 (r350324) @@ -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> Modified: head/databases/php-adodb-ext/files/extra-patch-php54-adodb.c ============================================================================== --- head/databases/php-adodb-ext/files/extra-patch-php54-adodb.c Sun Apr 6 05:49:06 2014 (r350323) +++ head/databases/php-adodb-ext/files/extra-patch-php54-adodb.c Sun Apr 6 05:49:11 2014 (r350324) @@ -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]; Copied: head/databases/php-adodb-ext/files/patch-adodb.c (from r347423, head/databases/php-adodb-ext/files/extra-patch-adodb.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/php-adodb-ext/files/patch-adodb.c Sun Apr 6 05:49:11 2014 (r350324, copy of r347423, head/databases/php-adodb-ext/files/extra-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]; Modified: head/databases/php-adodb-ext/pkg-descr ============================================================================== --- head/databases/php-adodb-ext/pkg-descr Sun Apr 6 05:49:06 2014 (r350323) +++ head/databases/php-adodb-ext/pkg-descr Sun Apr 6 05:49:11 2014 (r350324) @@ -3,4 +3,4 @@ with C code. ADOdb will auto-detect if t 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/ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!