From b13a5d6b59208f155e3a9866d08ab64f30793d6b Mon Sep 17 00:00:00 2001
From: mguegan <mguegan@virtua.ch>
Date: Tue, 12 Dec 2017 15:54:36 +0100
Subject: [PATCH 1/3] Add first tests for php-phalcon compilation

---
 www/php-phalcon/DESCR    |  5 +++++
 www/php-phalcon/Makefile | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 www/php-phalcon/DESCR
 create mode 100644 www/php-phalcon/Makefile

diff --git a/www/php-phalcon/DESCR b/www/php-phalcon/DESCR
new file mode 100644
index 0000000000000..0e243421fdeb1
--- /dev/null
+++ b/www/php-phalcon/DESCR
@@ -0,0 +1,5 @@
+Phalcon is an open source full stack framework for PHP, written as a
+C-extension. Phalcon is optimized for high performance. Its unique architecture
+allows the framework to always be memory resident, offering its functionality
+whenever its needed, without expensive file stats and file reads that
+traditional PHP frameworks employ.
diff --git a/www/php-phalcon/Makefile b/www/php-phalcon/Makefile
new file mode 100644
index 0000000000000..b7a1318d26973
--- /dev/null
+++ b/www/php-phalcon/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD$
+#
+
+DISTNAME=	phalcon-${PHALCON_VERSION}
+PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
+CATEGORIES=	www
+
+HOMEPAGE=		http://phalconphp.com/
+COMMENT=		Phalcon is a web framework implemented as a C extension offering high performance and lower resource consumption
+LICENSE=		php
+
+DOCDIR=			${PREFIX}/share/doc
+INSTALLATION_DIRS=	${DOCDIR}
+
+USE_TOOLS+=	gmake
+
+.include "../../lang/php/phpversion.mk"
+
+BUILD_DEPENDS+=	re2c>=0.15.3:../../devel/re2c
+
+PHALCON_VERSION=	3.2.4
+GIT_REPOSITORIES=	phalcon
+GIT_REPO.phalcon=	git://github.com/phalcon/cphalcon.git
+.if ${_PHP_VERSION} == "53" || ${_PHP_VERSION} == "54"
+GIT_TAG.phalcon=	phalcon-v${PHALCON_VERSION}
+.else
+GIT_TAG.phalcon=	v${PHALCON_VERSION}
+.endif
+
+WRKSRC=			${WRKDIR}/phalcon/ext
+
+USE_LANGUAGES+=		c c++
+
+.include "../../mk/bsd.pkg.mk"

From 4bdb0b2fada47436a362b554dd7856d9cec432dd Mon Sep 17 00:00:00 2001
From: mguegan <mguegan@virtua.ch>
Date: Wed, 13 Dec 2017 12:49:16 +0100
Subject: [PATCH 2/3] www/php-phalcon: various fixes for compiling php-phalcon

Note that it will need a patched version of php-json (see
https://github.com/joyent/pkgsrc/pull/53)
---
 www/php-phalcon/Makefile | 54 +++++++++++++++++++++++++++++-----------
 www/php-phalcon/distinfo |  6 +++++
 2 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 www/php-phalcon/distinfo

diff --git a/www/php-phalcon/Makefile b/www/php-phalcon/Makefile
index b7a1318d26973..dc1ce7049323c 100644
--- a/www/php-phalcon/Makefile
+++ b/www/php-phalcon/Makefile
@@ -1,34 +1,58 @@
 # $NetBSD$
 #
 
-DISTNAME=	phalcon-${PHALCON_VERSION}
-PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
-CATEGORIES=	www
+MODNAME=		phalcon
+PECL_VERSION=		3.2.4
+DISTNAME=		phalcon-${PECL_VERSION}
+PKGNAME=		${PHP_PKG_PREFIX}-${DISTNAME}
+CATEGORIES=		www
+MASTER_SITES=		${MASTER_SITE_GITHUB:=phalcon/}
 
 HOMEPAGE=		http://phalconphp.com/
-COMMENT=		Phalcon is a web framework implemented as a C extension offering high performance and lower resource consumption
+COMMENT=		Web framework implemented as a C extension offering high performance
 LICENSE=		php
 
 DOCDIR=			${PREFIX}/share/doc
 INSTALLATION_DIRS=	${DOCDIR}
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=		gmake pkg-config
 
 .include "../../lang/php/phpversion.mk"
 
-BUILD_DEPENDS+=	re2c>=0.15.3:../../devel/re2c
+BUILD_DEPENDS+=		re2c>=0.15.3:../../devel/re2c
 
-PHALCON_VERSION=	3.2.4
-GIT_REPOSITORIES=	phalcon
-GIT_REPO.phalcon=	git://github.com/phalcon/cphalcon.git
-.if ${_PHP_VERSION} == "53" || ${_PHP_VERSION} == "54"
-GIT_TAG.phalcon=	phalcon-v${PHALCON_VERSION}
-.else
-GIT_TAG.phalcon=	v${PHALCON_VERSION}
-.endif
+DEPENDS+=		${PHP_PKG_PREFIX}-curl>=5.6.0:../../www/php-curl
+DEPENDS+=		${PHP_PKG_PREFIX}-gd>=5.6.0:../../graphics/php-gd
+DEPENDS+=		${PHP_PKG_PREFIX}-json>=5.6.0:../../textproc/php-json
+DEPENDS+=		${PHP_PKG_PREFIX}-mbstring>=5.6.0:../../converters/php-mbstring
+DEPENDS+=		${PHP_PKG_PREFIX}-pdo>=5.6.0:../../databases/php-pdo
+DEPENDS+=		${PHP_PKG_PREFIX}-pdo_mysql>=5.6.0:../../databases/php-pdo_mysql
 
-WRKSRC=			${WRKDIR}/phalcon/ext
+GITHUB_PROJECT=		cphalcon
+GITHUB_TAG=		v${PKGVERSION_NOREV}
+EXTRACT_SUFX=		.tar.gz
 
 USE_LANGUAGES+=		c c++
 
+PHP_VERSIONS_ACCEPTED=	56 70 71
+
+.if ${MACHINE_ARCH} == "x86_64"
+  .if ${PKG_PHP_VERSION} >= 70
+WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${PECL_VERSION}/build/php7/64bits
+  .else
+WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${PECL_VERSION}/build/php5/64bits
+  .endif
+.endif
+
+.if ${MACHINE_ARCH} == "i386"
+  .if ${PKG_PHP_VERSION} >= 70
+WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${PECL_VERSION}/build/php7/32bits
+  .else
+WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${PECL_VERSION}/build/php5/32bits
+  .endif
+.endif
+
+.include "../../databases/php-pdo/buildlink3.mk"
+.include "../../textproc/php-json/buildlink3.mk"
+.include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php-phalcon/distinfo b/www/php-phalcon/distinfo
new file mode 100644
index 0000000000000..37a6b36e4c7d9
--- /dev/null
+++ b/www/php-phalcon/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (php-phalcon/phalcon-3.2.4.tar.gz) = e531019c2b8bfa96175f715a6239791cdbc65bc6
+RMD160 (php-phalcon/phalcon-3.2.4.tar.gz) = e542a7e6ae9f70beb95af528974c9935b9842056
+SHA512 (php-phalcon/phalcon-3.2.4.tar.gz) = 434694824b0c77bbd96b7c68c6b81651a0ebf8f14d3166f3b0e1757568b77aa6908ee0f8d0cc6211293be9ac29336d3593db32142602280f547497c7e6df4a4d
+Size (php-phalcon/phalcon-3.2.4.tar.gz) = 6583823 bytes

From 5b1317cad6e3623c64cc63823636ce9055fd7d0f Mon Sep 17 00:00:00 2001
From: mguegan <mguegan@virtua.ch>
Date: Wed, 13 Dec 2017 12:57:56 +0100
Subject: [PATCH 3/3] www/php-phalcon: fix syntax of conditionnal loops

---
 www/php-phalcon/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/php-phalcon/Makefile b/www/php-phalcon/Makefile
index dc1ce7049323c..9bbc4f8b9066b 100644
--- a/www/php-phalcon/Makefile
+++ b/www/php-phalcon/Makefile
@@ -37,19 +37,19 @@ USE_LANGUAGES+=		c c++
 PHP_VERSIONS_ACCEPTED=	56 70 71
 
 .if ${MACHINE_ARCH} == "x86_64"
-  .if ${PKG_PHP_VERSION} >= 70
+.  if ${PKG_PHP_VERSION} >= 70
 WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${PECL_VERSION}/build/php7/64bits
-  .else
+.  else
 WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${PECL_VERSION}/build/php5/64bits
-  .endif
+.  endif
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
-  .if ${PKG_PHP_VERSION} >= 70
+.  if ${PKG_PHP_VERSION} >= 70
 WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${PECL_VERSION}/build/php7/32bits
-  .else
+.  else
 WRKSRC=			${WRKDIR}/${GITHUB_PROJECT}-${PECL_VERSION}/build/php5/32bits
-  .endif
+.  endif
 .endif
 
 .include "../../databases/php-pdo/buildlink3.mk"