Attachment 181606 Details for Bug 218493 – version two without patch file

[patch] version two without patch file

phalcon.patch (text/plain), 2.67 KB, created by Franco Fichtner on 2017-04-08 17:52:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2017-04-08 17:52:17 UTC

Size: 2.67 KB

patch

obsolete

>diff --git a/www/phalcon/Makefile b/www/phalcon/Makefile
>index 5666862b4a04..d027c82f0ebe 100644
>--- a/www/phalcon/Makefile
>+++ b/www/phalcon/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	phalcon
>-PORTVERSION=	3.1.1
>+PORTVERSION=	3.1.2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> 
>@@ -13,7 +13,6 @@ LICENSE=	BSD3CLAUSE
> 
> USES=		php:ext
> USE_PHP=	hash:build json:build pdo:build
>-IGNORE_WITH_PHP=71
> 
> ONLY_FOR_ARCHS=	amd64 armv6 i386
> 
>@@ -29,8 +28,9 @@ 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
>+post-patch:
>+.if ${PHP_VER} >= 70 && ${PBITS} == 32
>+	@${REINPLACE_CMD} -e 's| ZEPHIR_FASTCALL | |' ${WRKSRC}/phalcon.zep.c
> .endif
> 
> .include <bsd.port.post.mk>
>diff --git a/www/phalcon/distinfo b/www/phalcon/distinfo
>index 423b46448fc0..e5a27feea334 100644
>--- a/www/phalcon/distinfo
>+++ b/www/phalcon/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1490587322
>-SHA256 (phalcon-cphalcon-v3.1.1_GH0.tar.gz) = 430359e0103ac926861976815d5f1d1373c6b1d7317e128359409aafd4285f84
>-SIZE (phalcon-cphalcon-v3.1.1_GH0.tar.gz) = 6467096
>+TIMESTAMP = 1491663656
>+SHA256 (phalcon-cphalcon-v3.1.2_GH0.tar.gz) = da619cab5979b3592b5e880a5e286e8d59841e911000be944fcddb030a7af587
>+SIZE (phalcon-cphalcon-v3.1.2_GH0.tar.gz) = 6436291
>diff --git a/www/phalcon/files/extra-patch-phalcon.zep.c b/www/phalcon/files/extra-patch-phalcon.zep.c
>deleted file mode 100644
>index f7fcb2c74700..000000000000
>--- a/www/phalcon/files/extra-patch-phalcon.zep.c
>+++ /dev/null
>@@ -1,31 +0,0 @@
>---- 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;

Actions: View | Diff

Attachments on bug 218493: 181600 | 181606