svn commit: r436704 - in head/www/phalcon: . files

[Vanilla I. Shu]

Author: vanilla
Date: Wed Mar 22 15:02:19 2017
New Revision: 436704
URL: https://svnweb.freebsd.org/changeset/ports/436704

Log:
  update to 3.0.4 and fix 32 bit build on PHP 7.0
  
  PR:		217443
  Submitted by:	Franco Fichtner <franco at opnsense.org>
  Approved by:	maintainer

Added:
  head/www/phalcon/files/
  head/www/phalcon/files/extra-patch-phalcon.zep.c   (contents, props changed)
Modified:
  head/www/phalcon/Makefile
  head/www/phalcon/distinfo

Modified: head/www/phalcon/Makefile
==============================================================================
--- head/www/phalcon/Makefile	Wed Mar 22 14:52:00 2017	(r436703)
+++ head/www/phalcon/Makefile	Wed Mar 22 15:02:19 2017	(r436704)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	phalcon
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -28,4 +28,8 @@ CONFIGURE_ARGS=	--enable-phalcon
 PBITS=		${ARCH:S/amd64/64/:S/armv6/32/:S/i386/32/:S/x86_64/64/}
 WRKSRC_SUBDIR=	build/php${PHP_VER:C/.$//}/${PBITS}bits
 
+.if ${PHP_VER} == 70 && ${PBITS} == 32
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-phalcon.zep.c
+.endif
+
 .include <bsd.port.post.mk>

Modified: head/www/phalcon/distinfo
==============================================================================
--- head/www/phalcon/distinfo	Wed Mar 22 14:52:00 2017	(r436703)
+++ head/www/phalcon/distinfo	Wed Mar 22 15:02:19 2017	(r436704)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482903422
-SHA256 (phalcon-cphalcon-v3.0.3_GH0.tar.gz) = b3b5a2408b9eed5f440bf8fcb89b18da255ddc6ed1d90e585aa70975c258699c
-SIZE (phalcon-cphalcon-v3.0.3_GH0.tar.gz) = 6371473
+TIMESTAMP = 1487668442
+SHA256 (phalcon-cphalcon-v3.0.4_GH0.tar.gz) = 50834275cd964a5d1fdd7a588183ca4e038a46900045a6cf91f50b56664d15cd
+SIZE (phalcon-cphalcon-v3.0.4_GH0.tar.gz) = 6407812

Added: head/www/phalcon/files/extra-patch-phalcon.zep.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/phalcon/files/extra-patch-phalcon.zep.c	Wed Mar 22 15:02:19 2017	(r436704)
@@ -0,0 +1,31 @@
+--- phalcon.zep.c.orig	2016-11-26 21:03:16 UTC
++++ phalcon.zep.c
+@@ -2114,8 +2114,8 @@ static int ZEPHIR_FASTCALL zephir_memory
+ #define ZEPHIR_MM_RESTORE() zephir_memory_restore_stack(NULL)
+ 
+ #else
+-static void ZEPHIR_FASTCALL zephir_memory_grow_stack();
+-static int ZEPHIR_FASTCALL zephir_memory_restore_stack();
++static void zephir_memory_grow_stack();
++static int zephir_memory_restore_stack();
+ 
+ #define ZEPHIR_MM_GROW() zephir_memory_grow_stack()
+ #define ZEPHIR_MM_RESTORE() zephir_memory_restore_stack()
+@@ -4212,7 +4212,7 @@ static void ZEPHIR_FASTCALL zephir_memor
+ 
+ #else
+ 
+-static void ZEPHIR_FASTCALL zephir_memory_grow_stack()
++static void zephir_memory_grow_stack()
+ {
+ 	zend_zephir_globals_def *g = ZEPHIR_VGLOBAL;
+ 	if (g->start_memory == NULL) {
+@@ -4221,7 +4221,7 @@ static void ZEPHIR_FASTCALL zephir_memor
+ 	zephir_memory_grow_stack_common(g);
+ }
+ 
+-static int ZEPHIR_FASTCALL zephir_memory_restore_stack()
++static int zephir_memory_restore_stack()
+ {
+ 	zephir_memory_restore_stack_common(ZEPHIR_VGLOBAL);
+ 	return SUCCESS;