Attachment #181606 for bug #218493




# $FreeBSD$

PORTNAME=	phalcon
PORTVERSION=	3.1.2
DISTVERSIONPREFIX=	v
CATEGORIES=	www



USES=		php:ext
USE_PHP=	hash:build json:build pdo:build
IGNORE_WITH_PHP=71

ONLY_FOR_ARCHS=	amd64 armv6 i386


PBITS=		${ARCH:S/amd64/64/:S/armv6/32/:S/i386/32/:S/x86_64/64/}
WRKSRC_SUBDIR=	build/php${PHP_VER:C/.$//}/${PBITS}bits

post-patch:
.if ${PHP_VER} >= 70 && ${PBITS} == 32
	@${REINPLACE_CMD} -e 's| ZEPHIR_FASTCALL | |' ${WRKSRC}/phalcon.zep.c
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)b/www/phalcon/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1490587322	1	TIMESTAMP = 1491663656
2	SHA256 (phalcon-cphalcon-v3.1.1_GH0.tar.gz) = 430359e0103ac926861976815d5f1d1373c6b1d7317e128359409aafd4285f84	2	SHA256 (phalcon-cphalcon-v3.1.2_GH0.tar.gz) = da619cab5979b3592b5e880a5e286e8d59841e911000be944fcddb030a7af587
3	SIZE (phalcon-cphalcon-v3.1.1_GH0.tar.gz) = 6467096	3	SIZE (phalcon-cphalcon-v3.1.2_GH0.tar.gz) = 6436291




--- 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;

Return to bug 218493

Lines 2-8 Link Here

(-)b/www/phalcon/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= phalcon	4	PORTNAME= phalcon
5	PORTVERSION= 3.1.1	5	PORTVERSION= 3.1.2
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= www	7	CATEGORIES= www
8		8
Lines 13-19 LICENSE= BSD3CLAUSE Link Here
13		13
14	USES= php:ext	14	USES= php:ext
15	USE_PHP= hash:build json:build pdo:build	15	USE_PHP= hash:build json:build pdo:build
16	IGNORE_WITH_PHP=71
17		16
18	ONLY_FOR_ARCHS= amd64 armv6 i386	17	ONLY_FOR_ARCHS= amd64 armv6 i386
19		18
Lines 29-36 CONFIGURE_ARGS= --enable-phalcon Link Here
29	PBITS= ${ARCH:S/amd64/64/:S/armv6/32/:S/i386/32/:S/x86_64/64/}	28	PBITS= ${ARCH:S/amd64/64/:S/armv6/32/:S/i386/32/:S/x86_64/64/}
30	WRKSRC_SUBDIR= build/php${PHP_VER:C/.$//}/${PBITS}bits	29	WRKSRC_SUBDIR= build/php${PHP_VER:C/.$//}/${PBITS}bits
31		30
32	.if ${PHP_VER} == 70 && ${PBITS} == 32	31	post-patch:
33	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-phalcon.zep.c	32	.if ${PHP_VER} >= 70 && ${PBITS} == 32
		33	@${REINPLACE_CMD} -e 's\| ZEPHIR_FASTCALL \| \|' ${WRKSRC}/phalcon.zep.c
34	.endif	34	.endif
35		35
36	.include <bsd.port.post.mk>	36	.include <bsd.port.post.mk>

Removed Link Here

(-)a/www/phalcon/files/extra-patch-phalcon.zep.c (-31 lines)
1	--- phalcon.zep.c.orig 2016-11-26 21:03:16 UTC
2	+++ phalcon.zep.c
3	@@ -2114,8 +2114,8 @@ static int ZEPHIR_FASTCALL zephir_memory
4	#define ZEPHIR_MM_RESTORE() zephir_memory_restore_stack(NULL)
5
6	#else
7	-static void ZEPHIR_FASTCALL zephir_memory_grow_stack();
8	-static int ZEPHIR_FASTCALL zephir_memory_restore_stack();
9	+static void zephir_memory_grow_stack();
10	+static int zephir_memory_restore_stack();
11
12	#define ZEPHIR_MM_GROW() zephir_memory_grow_stack()
13	#define ZEPHIR_MM_RESTORE() zephir_memory_restore_stack()
14	@@ -4212,7 +4212,7 @@ static void ZEPHIR_FASTCALL zephir_memor
15
16	#else
17
18	-static void ZEPHIR_FASTCALL zephir_memory_grow_stack()
19	+static void zephir_memory_grow_stack()
20	{
21	zend_zephir_globals_def *g = ZEPHIR_VGLOBAL;
22	if (g->start_memory == NULL) {
23	@@ -4221,7 +4221,7 @@ static void ZEPHIR_FASTCALL zephir_memor
24	zephir_memory_grow_stack_common(g);
25	}
26
27	-static int ZEPHIR_FASTCALL zephir_memory_restore_stack()
28	+static int zephir_memory_restore_stack()
29	{
30	zephir_memory_restore_stack_common(ZEPHIR_VGLOBAL);
31	return SUCCESS;