Index: branches/2015Q1/databases/php-adodb-ext/Makefile
===================================================================
--- branches/2015Q1/databases/php-adodb-ext/Makefile	(revision 380262)
+++ branches/2015Q1/databases/php-adodb-ext/Makefile	(revision 380263)
@@ -1,30 +1,32 @@
 # Created by: JoeHorn <joehorn@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	adodb-ext
 PORTVERSION=	5.04
 PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://phplens.com/lens/dl/
 PKGNAMEPREFIX=	php-
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//}
 
 MAINTAINER=	joehorn@gmail.com
 COMMENT=	ADOdb Extension
 
 WRKSRC=		${WRKDIR}/adodb-${PORTVERSION:S/.//}
 
 USES=		dos2unix zip
 USE_PHP=	yes
 USE_PHPEXT=	yes
 PHP_MODNAME=	adodb
+PHP_DEFAULT=	55
+IGNORE_WITH_PHP=56
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
 .if ${PHP_VER} == "5" || ${PHP_VER} == "54" || ${PHP_VER} == "55"
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-php54-adodb.c
 .endif
 
 .include <bsd.port.post.mk>
Index: branches/2015Q1/lang/php5/Makefile
===================================================================
--- branches/2015Q1/lang/php5/Makefile	(revision 380262)
+++ branches/2015Q1/lang/php5/Makefile	(revision 380263)
@@ -1,209 +1,209 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	php5
-PORTVERSION=	5.4.37
+PORTVERSION=	5.4.38
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	PHP Scripting Language
 
 LICENSE=	PHP301
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USES=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--enable-mysqlnd \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-pcre-regex=${LOCALBASE} \
 		--with-zlib-dir=/usr \
 		--program-prefix=""
 
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
 OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 DTRACE_DESC=	Enable DTrace support
 IPV6_DESC=	Enable ipv6 support
 MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CONFLICTS=	php53-5* php55-5* php56-5*
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
 PATCH_DIST_STRIP=	-p1
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.4.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 .else
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 .if ${PORT_OPTIONS:MCGI}
 PHP_SAPI+=	cgi
 .else
 CONFIGURE_ARGS+=--disable-cgi
 .endif
 
 .if ${PORT_OPTIONS:MFPM}
 PHP_SAPI+=	fpm
 USE_RC_SUBR+=	php-fpm
 CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
 		--with-fpm-group=${WWWGRP}
 .endif
 
 .if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
 IGNORE=		doesn't install the Apache module anymore:\
 		update your OPTIONS and build www/mod_php5 port instead
 .endif
 
 .if defined(PKGNAMEPREFIX)
 USE_PHP=	yes
 PHP_DEFAULT=	5.4
 IGNORE_WITH_PHP=53 55
 USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
 .else
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PLIST=		${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	libphp5
 SHORTMODNAME=	php5
 WARNING=	"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MEMBED}
 PHP_SAPI+=	embed
 CONFIGURE_ARGS+=--enable-embed
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .endif
 
 .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL"
 CONFIGURE_ARGS+=--with-zend-vm=CALL
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
 CONFIGURE_ARGS+=--with-zend-vm=SWITCH
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
 CONFIGURE_ARGS+=--with-zend-vm=GOTO
 .endif
 
 CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		ac_cv_pthreads_cflags="" \
 		ac_cv_decimal_fp_supported="no" \
 		pthreads_working="yes" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
 LIBS+=		${PTHREAD_LIBS}
 .endif
 
 .if ${PORT_OPTIONS:MZTS}
 CONFIGURE_ARGS+=--enable-maintainer-zts
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 .if ${OSVERSION} < 900000
 IGNORE=		cannot be built with DTrace support on FreeBSD < 9.x
 .endif
 CONFIGURE_ARGS+=--enable-dtrace
 PLIST_SUB+=	DTRACE=""
 .else
 PLIST_SUB+=	DTRACE="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 .if ${PORT_OPTIONS:MFPM}
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 .endif
 
 # Work around issues with newer (>=2.64) autoconf
 pre-configure:
 	@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
 		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
 	@${RM} ${WRKSRC}/configure
 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .include <bsd.port.post.mk>
Index: branches/2015Q1/lang/php5/Makefile.ext
===================================================================
--- branches/2015Q1/lang/php5/Makefile.ext	(revision 380262)
+++ branches/2015Q1/lang/php5/Makefile.ext	(revision 380263)
@@ -1,592 +1,599 @@
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_DEFAULT=	5.4
 IGNORE_WITH_PHP=52 53 55
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=--enable-bcmath
 
 PHP_HEADER_DIRS=libbcmath libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=--enable-dba
 
 OPTIONS_DEFINE=	CDB DB4 GDBM QDBM TOKYO INIFILE FLATFILE
 OPTIONS_DEFAULT=CDB INIFILE FLATFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 GDBM_DESC=	GDBM database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 INIFILE_DESC=	INI file support
 FLATFILE_DESC=	flatfile support
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=--enable-dom \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=--enable-fileinfo \
 		--with-pcre-dir=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=--enable-filter \
 		--with-pcre-dir=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=--enable-ftp \
 		--with-openssl-dir=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 CONFIGURE_ARGS+=--with-gd \
 		--with-freetype-dir=${LOCALBASE} \
 		--with-jpeg-dir=${LOCALBASE} \
 		--with-png-dir=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
 OPTIONS_DEFINE=	T1LIB TRUETYPE JIS X11 VPX
 OPTIONS_DEFAULT=T1LIB TRUETYPE X11
 
 T1LIB_DESC=	Include T1lib support
 TRUETYPE_DESC=	Enable TrueType string function
 JIS_DESC=	Enable JIS-mapped Japanese font support
 X11_DESC=	Enable XPM support
 VPX_DESC=	Enable VP8 codec support
 
 PHP_HEADER_DIRS=libgd
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "hash"
 CONFIGURE_ARGS+=--enable-hash \
 		--with-mhash
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
 
 USES+=	iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "imap"
-LIB_DEPENDS+=	libc-client4.so:${PORTSDIR}/mail/cclient
+OPTIONS_DEFINE=	PANDA
+PANDA_DESC=	Uses the forked panda-cclient instead of the original cclient
 
 CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
-		--with-pcre-dir=${LOCALBASE}
-.if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE}
+		--with-pcre-dir=${LOCALBASE} \
+		--with-imap-ssl=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
-.endif
 
 .if ${PHP_MODNAME} == "interbase"
 CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
 
 USE_FIREBIRD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "json"
 CONFIGURE_ARGS+=--enable-json
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 
 USE_OPENLDAP=	yes
 
 . ifdef(WANT_OPENLDAP_SASL)
 CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
 . endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=--enable-mbstring \
 		--with-pcre-dir=${LOCALBASE}
 
 OPTIONS_DEFINE=	REGEX
 OPTIONS_DEFAULT=REGEX
 
 REGEX_DESC=	Enable multibyte regex support
 
 PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mcrypt"
 LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl \
 		libmcrypt.so:${PORTSDIR}/security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "mssql"
 LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
 
 CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "mysql"
 OPTIONS_DEFINE=	MYSQLND
 OPTIONS_DEFAULT=MYSQLND
 
 MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 OPTIONS_DEFINE=	MYSQLND
 OPTIONS_DEFAULT=MYSQLND
 
 MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--enable-odbc \
 		--with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "openssl"
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=	Enable Microsoft SQL Server support
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 
 USE_FIREBIRD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=	MYSQLND
 OPTIONS_DEFAULT=MYSQLND
 
 MYSQLND_DESC=	Use MySQL Native Driver
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "pear"
 CONFIGURE_ARGS+=--with-pear
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=--enable-phar \
 		--with-pcre-dir=${LOCALBASE}
 
 USE_PHP=	hash
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
 LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
 
 CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
 
 # Ugly hack to load session before psell to avoid crashes
 USE_PHP=	session
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "readline"
 CONFIGURE_ARGS+=--with-readline=/usr
 USES+=		readline
 .endif
 
 .if ${PHP_MODNAME} == "recode"
 LIB_DEPENDS+=	librecode.so:${PORTSDIR}/converters/recode
 
 CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=--enable-session
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=--enable-simplexml \
 		--with-pcre-dir=${LOCALBASE} \
 		--with-libxml-dir=${LOCALBASE}
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
 		--with-openssl-dir=${OPENSSLBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=--enable-soap \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 
 USE_PHP=	session
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sybase_ct"
 LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
 
 CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy.so:${PORTSDIR}/www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "wddx"
 CONFIGURE_ARGS+=--enable-wddx \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 
 USE_PHP=	xml session
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=--enable-xml \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=--enable-xmlreader \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=--with-xmlrpc \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-iconv-dir=${LOCALBASE}
 
 USES+=		iconv:translit
 USE_GNOME=	libxml2
 
 PHP_HEADER_DIRS=libxmlrpc
 
 USE_PHP=	xml
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=--enable-xmlwriter \
                 --with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=      libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom xml
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 CONFIGURE_ARGS+=--enable-zip \
 		--with-zlib-dir=/usr \
 		--with-pcre-dir=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=--with-zlib=/usr
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PHP_MODNAME} == "dba"
 .	if empty(PORT_OPTIONS:MCDB)
 CONFIGURE_ARGS+=--without-cdb
 .	endif
 .	if ${PORT_OPTIONS:MDB4}
 CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
 
 USE_BDB=		40+
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}
 LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
 
 CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MQDBM}
 LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
 
 CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTOKYO}
 LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
 
 CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
 .	endif
 .	if empty(PORT_OPTIONS:MINIFILE)
 CONFIGURE_ARGS+=--disable-inifile
 .	endif
 .	if empty(PORT_OPTIONS:MFLATFILE)
 CONFIGURE_ARGS+=--disable-flatfile
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 .	if ${PORT_OPTIONS:MT1LIB}
 LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
 
 CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTRUETYPE}
 CONFIGURE_ARGS+=--enable-gd-native-ttf
 .	endif
 .	if ${PORT_OPTIONS:MJIS}
 CONFIGURE_ARGS+=--enable-gd-jis-conv
 .	endif
 .	if ${PORT_OPTIONS:MX11}
 USE_XORG=	xpm
 
 CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MVPX}
 LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 
 CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
+.	endif
+.endif
+
+.if ${PHP_MODNAME} == "imap"
+.	if ${PORT_OPTIONS:MPANDA}
+LIB_DEPENDS+=	libc-client4.so.10:${PORTSDIR}/mail/panda-cclient
+.	else
+LIB_DEPENDS+=	libc-client4.so.9:${PORTSDIR}/mail/cclient
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 .	if ${PORT_OPTIONS:MREGEX}
 LIB_DEPENDS+=	libonig.so:${PORTSDIR}/devel/oniguruma4
 CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
 .	else
 CONFIGURE_ARGS+=--disable-mbregex
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mysql"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-mysql=mysqlnd
 .	else
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
 USE_MYSQL=	yes
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-mysqli=mysqlnd
 .	else
 CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config
 
 USE_MYSQL=	yes
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 .	if ${PORT_OPTIONS:MMSSQL}
 LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
 .	else
 LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
 
 USE_PHP+=	mysql
 .	else
 CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
 USE_MYSQL=	yes
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
Index: branches/2015Q1/lang/php5/distinfo
===================================================================
--- branches/2015Q1/lang/php5/distinfo	(revision 380262)
+++ branches/2015Q1/lang/php5/distinfo	(revision 380263)
@@ -1,4 +1,4 @@
-SHA256 (php-5.4.37.tar.bz2) = 857bf6675eeb0ae9c3cd6f9ccdb2a9b7bf89dcfda7f0a80857638fe023f3a8ad
-SIZE (php-5.4.37.tar.bz2) = 12275113
+SHA256 (php-5.4.38.tar.bz2) = abf37db0cfadc9bb814f9df35f6aa966ad63f4f4c4475e432ec625568a5d3e88
+SIZE (php-5.4.38.tar.bz2) = 12273298
 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
 SIZE (php-5.4.x-mail-header.patch) = 3379
Index: branches/2015Q1/lang/php55/Makefile
===================================================================
--- branches/2015Q1/lang/php55/Makefile	(revision 380262)
+++ branches/2015Q1/lang/php55/Makefile	(revision 380263)
@@ -1,209 +1,209 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	php55
-PORTVERSION=	5.5.20
+PORTVERSION=	5.5.22
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	PHP Scripting Language
 
 LICENSE=	PHP301
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USES=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--enable-mysqlnd \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-pcre-regex=${LOCALBASE} \
 		--with-zlib-dir=/usr \
 		--program-prefix=""
 
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
 OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 DTRACE_DESC=	Enable DTrace support
 IPV6_DESC=	Enable ipv6 support
 MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CONFLICTS=	php53-5* php54-5* php56-5* php5-5*
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
 PATCH_DIST_STRIP=	-p1
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.5.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 .else
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 .if ${PORT_OPTIONS:MCGI}
 PHP_SAPI+=	cgi
 .else
 CONFIGURE_ARGS+=--disable-cgi
 .endif
 
 .if ${PORT_OPTIONS:MFPM}
 PHP_SAPI+=	fpm
 USE_RC_SUBR+=	php-fpm
 CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
 		--with-fpm-group=${WWWGRP}
 .endif
 
 .if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
 IGNORE=		doesn't install the Apache module anymore:\
 		update your OPTIONS and build www/mod_php55 port instead 
 .endif
 
 .if defined(PKGNAMEPREFIX)
 USE_PHP=	yes
 PHP_DEFAULT=	5.5
 IGNORE_WITH_PHP=53 54 5
 USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
 .else
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PLIST=		${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	libphp5
 SHORTMODNAME=	php5
 WARNING=	"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MEMBED}
 PHP_SAPI+=	embed
 CONFIGURE_ARGS+=--enable-embed
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .endif
 
 .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL"
 CONFIGURE_ARGS+=--with-zend-vm=CALL
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
 CONFIGURE_ARGS+=--with-zend-vm=SWITCH
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
 CONFIGURE_ARGS+=--with-zend-vm=GOTO
 .endif
 
 CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		ac_cv_pthreads_cflags="" \
 		ac_cv_decimal_fp_supported="no" \
 		pthreads_working="yes" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
 LIBS+=		${PTHREAD_LIBS}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MZTS}
 CONFIGURE_ARGS+=--enable-maintainer-zts
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 .if ${OSVERSION} < 900000
 IGNORE=		cannot be built with DTrace support on FreeBSD < 9.x
 .endif
 CONFIGURE_ARGS+=--enable-dtrace
 PLIST_SUB+=	DTRACE=""
 .else
 PLIST_SUB+=	DTRACE="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 .if ${PORT_OPTIONS:MFPM}
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 .endif
 
 # Work around issues with newer (>=2.64) autoconf
 pre-configure:
 	@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
 		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
 	@${RM} ${WRKSRC}/configure
 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=55" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .include <bsd.port.post.mk>
Index: branches/2015Q1/lang/php55/Makefile.ext
===================================================================
--- branches/2015Q1/lang/php55/Makefile.ext	(revision 380262)
+++ branches/2015Q1/lang/php55/Makefile.ext	(revision 380263)
@@ -1,592 +1,599 @@
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_DEFAULT=	5.5
 IGNORE_WITH_PHP=52 53 54 5
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=--enable-bcmath
 
 PHP_HEADER_DIRS=libbcmath libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=--enable-dba
 
 OPTIONS_DEFINE=	CDB DB4 GDBM QDBM TOKYO INIFILE FLATFILE
 OPTIONS_DEFAULT=CDB INIFILE FLATFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 GDBM_DESC=	GDBM database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 INIFILE_DESC=	INI file support
 FLATFILE_DESC=	flatfile support
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=--enable-dom \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=--enable-fileinfo \
 		--with-pcre-dir=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=--enable-filter \
 		--with-pcre-dir=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=--enable-ftp \
 		--with-openssl-dir=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 CONFIGURE_ARGS+=--with-gd \
 		--with-freetype-dir=${LOCALBASE} \
 		--with-jpeg-dir=${LOCALBASE} \
 		--with-png-dir=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
 OPTIONS_DEFINE=	T1LIB TRUETYPE JIS X11 VPX
 OPTIONS_DEFAULT=T1LIB TRUETYPE X11
 
 T1LIB_DESC=	Include T1lib support
 TRUETYPE_DESC=	Enable TrueType string function
 JIS_DESC=	Enable JIS-mapped Japanese font support
 X11_DESC=	Enable XPM support
 VPX_DESC=	Enable VP8 codec support
 
 PHP_HEADER_DIRS=libgd
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "hash"
 CONFIGURE_ARGS+=--enable-hash \
 		--with-mhash
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
 
 USES+=	iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "imap"
-LIB_DEPENDS+=	libc-client4.so:${PORTSDIR}/mail/cclient
+OPTIONS_DEFINE=	PANDA
+PANDA_DESC=	Uses the forked panda-cclient instead of the original cclient
 
 CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
-		--with-pcre-dir=${LOCALBASE}
-.if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE}
+		--with-pcre-dir=${LOCALBASE} \
+		--with-imap-ssl=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
-.endif
 
 .if ${PHP_MODNAME} == "interbase"
 CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
 
 USE_FIREBIRD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "json"
 CONFIGURE_ARGS+=--enable-json
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 
 USE_OPENLDAP=	yes
 
 . ifdef(WANT_OPENLDAP_SASL)
 CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
 . endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=--enable-mbstring \
 		--with-pcre-dir=${LOCALBASE}
 
 OPTIONS_DEFINE=	REGEX
 OPTIONS_DEFAULT=REGEX
 
 REGEX_DESC=	Enable multibyte regex support
 
 PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mcrypt"
 LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl \
 		libmcrypt.so:${PORTSDIR}/security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "mssql"
 LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
 
 CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "mysql"
 OPTIONS_DEFINE=	MYSQLND
 OPTIONS_DEFAULT=MYSQLND
 
 MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 OPTIONS_DEFINE=	MYSQLND
 OPTIONS_DEFAULT=MYSQLND
 
 MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--enable-odbc \
 		--with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "openssl"
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
 CONFIGURE_ARGS+=--enable-opcache
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=	Enable Microsoft SQL Server support
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 
 USE_FIREBIRD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=	MYSQLND
 OPTIONS_DEFAULT=MYSQLND
 
 MYSQLND_DESC=	Use MySQL Native Driver
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=--enable-phar \
 		--with-pcre-dir=${LOCALBASE}
 
 USE_PHP=	hash
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
 LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
 
 CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
 
 # Ugly hack to load session before psell to avoid crashes
 USE_PHP=	session
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "readline"
 CONFIGURE_ARGS+=--with-readline=/usr
 USES+=		readline
 .endif
 
 .if ${PHP_MODNAME} == "recode"
 LIB_DEPENDS+=	librecode.so:${PORTSDIR}/converters/recode
 
 CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=--enable-session
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=--enable-simplexml \
 		--with-pcre-dir=${LOCALBASE} \
 		--with-libxml-dir=${LOCALBASE}
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
 		--with-openssl-dir=${OPENSSLBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=--enable-soap \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 
 USE_PHP=	session
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sybase_ct"
 LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
 
 CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy.so:${PORTSDIR}/www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "wddx"
 CONFIGURE_ARGS+=--enable-wddx \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 
 USE_PHP=	xml session
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=--enable-xml \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=--enable-xmlreader \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=--with-xmlrpc \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-iconv-dir=${LOCALBASE}
 
 USES+=		iconv:translit
 USE_GNOME=	libxml2
 
 PHP_HEADER_DIRS=libxmlrpc
 
 USE_PHP=	xml
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=--enable-xmlwriter \
                 --with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=      libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom xml
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 CONFIGURE_ARGS+=--enable-zip \
 		--with-zlib-dir=/usr \
 		--with-pcre-dir=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=--with-zlib=/usr
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PHP_MODNAME} == "dba"
 .	if empty(PORT_OPTIONS:MCDB)
 CONFIGURE_ARGS+=--without-cdb
 .	endif
 .	if ${PORT_OPTIONS:MDB4}
 CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
 
 USE_BDB=		40+
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}
 LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
 
 CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MQDBM}
 LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
 
 CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTOKYO}
 LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
 
 CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
 .	endif
 .	if empty(PORT_OPTIONS:MINIFILE)
 CONFIGURE_ARGS+=--disable-inifile
 .	endif
 .	if empty(PORT_OPTIONS:MFLATFILE)
 CONFIGURE_ARGS+=--disable-flatfile
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 .	if ${PORT_OPTIONS:MT1LIB}
 LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
 
 CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTRUETYPE}
 CONFIGURE_ARGS+=--enable-gd-native-ttf
 .	endif
 .	if ${PORT_OPTIONS:MJIS}
 CONFIGURE_ARGS+=--enable-gd-jis-conv
 .	endif
 .	if ${PORT_OPTIONS:MX11}
 USE_XORG=	xpm
 
 CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MVPX}
 LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 
 CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
+.	endif
+.endif
+
+.if ${PHP_MODNAME} == "imap"
+.	if ${PORT_OPTIONS:MPANDA}
+LIB_DEPENDS+=	libc-client4.so.10:${PORTSDIR}/mail/panda-cclient
+.	else
+LIB_DEPENDS+=	libc-client4.so.9:${PORTSDIR}/mail/cclient
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 .	if ${PORT_OPTIONS:MREGEX}
 LIB_DEPENDS+=	libonig.so:${PORTSDIR}/devel/oniguruma4
 CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
 .	else
 CONFIGURE_ARGS+=--disable-mbregex
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mysql"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-mysql=mysqlnd
 .	else
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
 USE_MYSQL=	yes
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-mysqli=mysqlnd
 .	else
 CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config
 
 USE_MYSQL=	yes
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 .	if ${PORT_OPTIONS:MMSSQL}
 LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
 .	else
 LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
 
 USE_PHP+=	mysql
 .	else
 CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
 USE_MYSQL=	yes
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
Index: branches/2015Q1/lang/php55/distinfo
===================================================================
--- branches/2015Q1/lang/php55/distinfo	(revision 380262)
+++ branches/2015Q1/lang/php55/distinfo	(revision 380263)
@@ -1,4 +1,4 @@
-SHA256 (php-5.5.20.tar.bz2) = f28a150d1cd8991bd1a41dce4fdff4e343d1dbe01a48b9b44bea74532ce0391a
-SIZE (php-5.5.20.tar.bz2) = 13240796
+SHA256 (php-5.5.22.tar.bz2) = c218c184bef2905bc79fcdda6040f3d1738261395fb706396935d1c6f6e162bb
+SIZE (php-5.5.22.tar.bz2) = 13305486
 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
 SIZE (php-5.5.x-mail-header.patch) = 3379
Index: branches/2015Q1/lang/php55/files/patch-sapi_fpm_php-fpm.conf.in
===================================================================
--- branches/2015Q1/lang/php55/files/patch-sapi_fpm_php-fpm.conf.in	(revision 380262)
+++ branches/2015Q1/lang/php55/files/patch-sapi_fpm_php-fpm.conf.in	(nonexistent)
@@ -1,11 +0,0 @@
---- sapi/fpm/php-fpm.conf.in.orig	2013-12-10 23:31:06.000000000 +0000
-+++ sapi/fpm/php-fpm.conf.in	2013-12-13 21:50:25.757258451 +0000
-@@ -341,7 +341,7 @@ pm.max_spare_servers = 3
- ;   last request memory:  0
- ;
- ; Note: There is a real-time FPM status monitoring sample web page available
--;       It's available in: @EXPANDED_DATADIR@/fpm/status.html
-+;       It's available in: @EXPANDED_DATADIR@/php/fpm/status.html
- ;
- ; Note: The value must start with a leading slash (/). The value can be
- ;       anything, but it may not be a good idea to use the .php extension or it

Property changes on: branches/2015Q1/lang/php55/files/patch-sapi_fpm_php-fpm.conf.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2015Q1/lang/php55/files/patch-sapi_fpm_Makefile.frag
===================================================================
--- branches/2015Q1/lang/php55/files/patch-sapi_fpm_Makefile.frag	(revision 380262)
+++ branches/2015Q1/lang/php55/files/patch-sapi_fpm_Makefile.frag	(nonexistent)
@@ -1,12 +0,0 @@
---- sapi/fpm/Makefile.frag.orig	2013-12-10 23:31:06.000000000 +0000
-+++ sapi/fpm/Makefile.frag	2013-12-13 21:50:25.575258563 +0000
-@@ -18,6 +18,6 @@ install-fpm: $(SAPI_FPM_PATH)
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
- 	@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8
- 
--	@echo "Installing PHP FPM status page:      $(INSTALL_ROOT)$(datadir)/fpm/"
--	@$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm
--	@$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html
-+	@echo "Installing PHP FPM status page:      $(INSTALL_ROOT)$(datadir)/php/fpm/"
-+	@$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/php/fpm
-+	@$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/php/fpm/status.html

Property changes on: branches/2015Q1/lang/php55/files/patch-sapi_fpm_Makefile.frag
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2015Q1/lang/php55/pkg-plist
===================================================================
--- branches/2015Q1/lang/php55/pkg-plist	(revision 380262)
+++ branches/2015Q1/lang/php55/pkg-plist	(revision 380263)
@@ -1,244 +1,245 @@
 %%CLI%%bin/php
 %%CGI%%bin/php-cgi
 bin/php-config
 bin/phpize
 %%FPM%%sbin/php-fpm
 etc/php.conf
 etc/php.ini-development
 etc/php.ini-production
 %%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi
 %%FPM%%etc/php-fpm.conf.default
 %%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
 include/php/TSRM/TSRM.h
 include/php/TSRM/readdir.h
 include/php/TSRM/tsrm_config.h
 include/php/TSRM/tsrm_config.w32.h
 include/php/TSRM/tsrm_config_common.h
 include/php/TSRM/tsrm_nw.h
 include/php/TSRM/tsrm_strtok_r.h
 include/php/TSRM/tsrm_virtual_cwd.h
 include/php/TSRM/tsrm_win32.h
 include/php/Zend/zend.h
 include/php/Zend/zend_API.h
 include/php/Zend/zend_alloc.h
 include/php/Zend/zend_build.h
 include/php/Zend/zend_builtin_functions.h
 include/php/Zend/zend_closures.h
 include/php/Zend/zend_compile.h
 include/php/Zend/zend_config.h
 include/php/Zend/zend_config.nw.h
 include/php/Zend/zend_config.w32.h
 include/php/Zend/zend_constants.h
 include/php/Zend/zend_dtrace.h
 %%DTRACE%%include/php/Zend/zend_dtrace_gen.h
 include/php/Zend/zend_dynamic_array.h
 include/php/Zend/zend_errors.h
 include/php/Zend/zend_exceptions.h
 include/php/Zend/zend_execute.h
 include/php/Zend/zend_extensions.h
 include/php/Zend/zend_float.h
 include/php/Zend/zend_gc.h
 include/php/Zend/zend_generators.h
 include/php/Zend/zend_globals.h
 include/php/Zend/zend_globals_macros.h
 include/php/Zend/zend_hash.h
 include/php/Zend/zend_highlight.h
 include/php/Zend/zend_indent.h
 include/php/Zend/zend_ini.h
 include/php/Zend/zend_ini_parser.h
 include/php/Zend/zend_ini_scanner.h
 include/php/Zend/zend_ini_scanner_defs.h
 include/php/Zend/zend_interfaces.h
 include/php/Zend/zend_istdiostream.h
 include/php/Zend/zend_iterators.h
 include/php/Zend/zend_language_parser.h
 include/php/Zend/zend_language_scanner.h
 include/php/Zend/zend_language_scanner_defs.h
 include/php/Zend/zend_list.h
 include/php/Zend/zend_llist.h
 include/php/Zend/zend_modules.h
 include/php/Zend/zend_multibyte.h
 include/php/Zend/zend_multiply.h
 include/php/Zend/zend_object_handlers.h
 include/php/Zend/zend_objects.h
 include/php/Zend/zend_objects_API.h
 include/php/Zend/zend_operators.h
 include/php/Zend/zend_ptr_stack.h
 include/php/Zend/zend_qsort.h
 include/php/Zend/zend_signal.h
 include/php/Zend/zend_stack.h
 include/php/Zend/zend_static_allocator.h
 include/php/Zend/zend_stream.h
 include/php/Zend/zend_string.h
 include/php/Zend/zend_strtod.h
 include/php/Zend/zend_ts_hash.h
 include/php/Zend/zend_types.h
 include/php/Zend/zend_variables.h
 include/php/Zend/zend_vm.h
 include/php/Zend/zend_vm_def.h
 include/php/Zend/zend_vm_execute.h
 include/php/Zend/zend_vm_opcodes.h
 include/php/ext/date/lib/timelib.h
 include/php/ext/date/lib/timelib_config.h
 include/php/ext/date/lib/timelib_structs.h
 include/php/ext/date/php_date.h
 include/php/ext/ereg/php_ereg.h
 include/php/ext/ereg/php_regex.h
 include/php/ext/ereg/regex/cclass.h
 include/php/ext/ereg/regex/cname.h
 include/php/ext/ereg/regex/regex.h
 include/php/ext/ereg/regex/regex2.h
 include/php/ext/ereg/regex/utils.h
 include/php/ext/libxml/php_libxml.h
 include/php/ext/mysqlnd/config-win.h
+include/php/ext/mysqlnd/mysql_float_to_double.h
 include/php/ext/mysqlnd/mysqlnd.h
 include/php/ext/mysqlnd/mysqlnd_alloc.h
 include/php/ext/mysqlnd/mysqlnd_block_alloc.h
 include/php/ext/mysqlnd/mysqlnd_charset.h
 include/php/ext/mysqlnd/mysqlnd_debug.h
 include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
 include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
 include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
 include/php/ext/mysqlnd/mysqlnd_net.h
 include/php/ext/mysqlnd/mysqlnd_portability.h
 include/php/ext/mysqlnd/mysqlnd_priv.h
 include/php/ext/mysqlnd/mysqlnd_result.h
 include/php/ext/mysqlnd/mysqlnd_result_meta.h
 include/php/ext/mysqlnd/mysqlnd_reverse_api.h
 include/php/ext/mysqlnd/mysqlnd_statistics.h
 include/php/ext/mysqlnd/mysqlnd_structs.h
 include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
 include/php/ext/mysqlnd/php_mysqlnd.h
 include/php/ext/mysqlnd/php_mysqlnd_config.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/spl/php_spl.h
 include/php/ext/spl/spl_array.h
 include/php/ext/spl/spl_directory.h
 include/php/ext/spl/spl_dllist.h
 include/php/ext/spl/spl_engine.h
 include/php/ext/spl/spl_exceptions.h
 include/php/ext/spl/spl_fixedarray.h
 include/php/ext/spl/spl_functions.h
 include/php/ext/spl/spl_heap.h
 include/php/ext/spl/spl_iterators.h
 include/php/ext/spl/spl_observer.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/crc32.h
 include/php/ext/standard/credits.h
 include/php/ext/standard/credits_ext.h
 include/php/ext/standard/credits_sapi.h
 include/php/ext/standard/crypt_blowfish.h
 include/php/ext/standard/crypt_freesec.h
 include/php/ext/standard/css.h
 include/php/ext/standard/cyr_convert.h
 include/php/ext/standard/datetime.h
 include/php/ext/standard/dl.h
 include/php/ext/standard/exec.h
 include/php/ext/standard/file.h
 include/php/ext/standard/flock_compat.h
 include/php/ext/standard/fsock.h
 include/php/ext/standard/head.h
 include/php/ext/standard/html.h
 include/php/ext/standard/html_tables.h
 include/php/ext/standard/info.h
 include/php/ext/standard/md5.h
 include/php/ext/standard/microtime.h
 include/php/ext/standard/pack.h
 include/php/ext/standard/pageinfo.h
 include/php/ext/standard/php_array.h
 include/php/ext/standard/php_assert.h
 include/php/ext/standard/php_browscap.h
 include/php/ext/standard/php_crypt.h
 include/php/ext/standard/php_crypt_r.h
 include/php/ext/standard/php_dir.h
 include/php/ext/standard/php_dns.h
 include/php/ext/standard/php_ext_syslog.h
 include/php/ext/standard/php_filestat.h
 include/php/ext/standard/php_fopen_wrappers.h
 include/php/ext/standard/php_ftok.h
 include/php/ext/standard/php_http.h
 include/php/ext/standard/php_image.h
 include/php/ext/standard/php_incomplete_class.h
 include/php/ext/standard/php_iptc.h
 include/php/ext/standard/php_lcg.h
 include/php/ext/standard/php_link.h
 include/php/ext/standard/php_mail.h
 include/php/ext/standard/php_math.h
 include/php/ext/standard/php_metaphone.h
 include/php/ext/standard/php_password.h
 include/php/ext/standard/php_rand.h
 include/php/ext/standard/php_smart_str.h
 include/php/ext/standard/php_smart_str_public.h
 include/php/ext/standard/php_standard.h
 include/php/ext/standard/php_string.h
 include/php/ext/standard/php_type.h
 include/php/ext/standard/php_uuencode.h
 include/php/ext/standard/php_var.h
 include/php/ext/standard/php_versioning.h
 include/php/ext/standard/proc_open.h
 include/php/ext/standard/quot_print.h
 include/php/ext/standard/scanf.h
 include/php/ext/standard/sha1.h
 include/php/ext/standard/streamsfuncs.h
 include/php/ext/standard/uniqid.h
 include/php/ext/standard/url.h
 include/php/ext/standard/url_scanner_ex.h
 include/php/ext/standard/winver.h
 @exec touch %D/include/php/ext/php_config.h
 @unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
 include/php/main/fopen_wrappers.h
 include/php/main/php.h
 include/php/main/php_compat.h
 include/php/main/php_config.h
 include/php/main/php_content_types.h
 include/php/main/php_getopt.h
 include/php/main/php_globals.h
 include/php/main/php_ini.h
 include/php/main/php_main.h
 include/php/main/php_memory_streams.h
 include/php/main/php_network.h
 include/php/main/php_open_temporary_file.h
 include/php/main/php_output.h
 include/php/main/php_reentrancy.h
 include/php/main/php_scandir.h
 include/php/main/php_streams.h
 include/php/main/php_syslog.h
 include/php/main/php_ticks.h
 include/php/main/php_variables.h
 include/php/main/php_version.h
 include/php/main/rfc1867.h
 include/php/main/snprintf.h
 include/php/main/spprintf.h
 include/php/main/streams/php_stream_context.h
 include/php/main/streams/php_stream_filter_api.h
 include/php/main/streams/php_stream_glob_wrapper.h
 include/php/main/streams/php_stream_mmap.h
 include/php/main/streams/php_streams_int.h
 include/php/main/streams/php_stream_transport.h
 include/php/main/streams/php_stream_userspace.h
 include/php/main/streams/php_stream_plain_wrapper.h
 %%CLI%%include/php/sapi/cli/cli.h
 %%EMBED%%include/php/sapi/embed/php_embed.h
 include/php/main/win32_internal_function_disabled.h
 include/php/main/win95nt.h
 %%EMBED%%lib/libphp5.so
 lib/php/build/Makefile.global
 lib/php/build/acinclude.m4
 lib/php/build/config.guess
 lib/php/build/config.sub
 lib/php/build/libtool.m4
 lib/php/build/ltmain.sh
 lib/php/build/mkdep.awk
 lib/php/build/phpize.m4
 lib/php/build/run-tests.php
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
 %%CGI%%man/man1/php-cgi.1.gz
 man/man1/php-config.1.gz
 %%CLI%%man/man1/php.1.gz
 man/man1/phpize.1.gz
 %%FPM%%man/man8/php-fpm.8.gz
 %%FPM%%share/php/fpm/status.html
Index: branches/2015Q1/lang/php56/Makefile
===================================================================
--- branches/2015Q1/lang/php56/Makefile	(revision 380262)
+++ branches/2015Q1/lang/php56/Makefile	(revision 380263)
@@ -1,212 +1,212 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	php56
-PORTVERSION=	5.6.4
+PORTVERSION=	5.6.6
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
 DISTNAME=	php-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	PHP Scripting Language
 
 LICENSE=	PHP301
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 USES=		tar:bzip2 cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--enable-mysqlnd \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-pcre-regex=${LOCALBASE} \
 		--with-zlib-dir=/usr \
 		--program-prefix=""
 
 USE_GNOME=	libxml2
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
 OPTIONS_SUB=	yes
 
 CLI_DESC=	Build CLI version
 CGI_DESC=	Build CGI version
 FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 DTRACE_DESC=	Enable DTrace support
 IPV6_DESC=	Enable ipv6 support
 MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CONFLICTS=	php53-5* php54-5* php55-5* php5-5*
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
 PATCH_DIST_STRIP=	-p1
 
 PATCH_SITES+=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
 PATCHFILES+=	php-5.5.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 .else
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
 .if ${PORT_OPTIONS:MCGI}
 PHP_SAPI+=	cgi
 .else
 CONFIGURE_ARGS+=--disable-cgi
 .endif
 
 .if ${PORT_OPTIONS:MFPM}
 PHP_SAPI+=	fpm
 USE_RC_SUBR+=	php-fpm
 CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
 		--with-fpm-group=${WWWGRP}
 .endif
 
 .if defined(PKGNAMEPREFIX)
 USE_PHP=	yes
 PHP_DEFAULT=	5.6
 IGNORE_WITH_PHP=53 54 5
 USE_APACHE=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
 .else
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PLIST=		${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	libphp5
 SHORTMODNAME=	php5
 WARNING=	"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MEMBED}
 PHP_SAPI+=	embed
 CONFIGURE_ARGS+=--enable-embed
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG}
 PHP_SAPI+=	phpdbg
 CONFIGURE_ARGS+=--enable-phpdbg
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-phpdbg-debug
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
 CONFIGURE_ARGS+=--with-regex=php
 .elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system"
 CONFIGURE_ARGS+=--with-regex=system
 .endif
 
 .if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL"
 CONFIGURE_ARGS+=--with-zend-vm=CALL
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH"
 CONFIGURE_ARGS+=--with-zend-vm=SWITCH
 .elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "GOTO"
 CONFIGURE_ARGS+=--with-zend-vm=GOTO
 .endif
 
 CONFIGURE_ENV+=	ac_cv_pthreads_lib="" \
 		ac_cv_pthreads_cflags="" \
 		ac_cv_decimal_fp_supported="no" \
 		pthreads_working="yes" \
 		lt_cv_path_SED="sed"
 
 .if ${PORT_OPTIONS:MLINKTHR}
 LIBS+=		${PTHREAD_LIBS}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MZTS}
 CONFIGURE_ARGS+=--enable-maintainer-zts
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 .if ${OSVERSION} < 900000
 IGNORE=		cannot be built with DTrace support on FreeBSD < 9.x
 .endif
 CONFIGURE_ARGS+=--enable-dtrace
 PLIST_SUB+=	DTRACE=""
 .else
 PLIST_SUB+=	DTRACE="@comment "
 .endif
 
 .if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 .if ${PORT_OPTIONS:MFPM}
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 .endif
 
 # Work around issues with newer (>=2.64) autoconf
 pre-configure:
 	@${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
 		${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'`
 	@${RM} ${WRKSRC}/configure
 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=56" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .include <bsd.port.post.mk>
Index: branches/2015Q1/lang/php56/Makefile.ext
===================================================================
--- branches/2015Q1/lang/php56/Makefile.ext	(revision 380262)
+++ branches/2015Q1/lang/php56/Makefile.ext	(revision 380263)
@@ -1,595 +1,602 @@
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_DEFAULT=	5.6
 IGNORE_WITH_PHP=52 53 54 55 5
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=--enable-bcmath
 
 PHP_HEADER_DIRS=libbcmath libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=--enable-dba
 
 OPTIONS_DEFINE=	CDB DB4 GDBM QDBM TOKYO INIFILE FLATFILE
 OPTIONS_DEFAULT=CDB INIFILE FLATFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 GDBM_DESC=	GDBM database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 INIFILE_DESC=	INI file support
 FLATFILE_DESC=	flatfile support
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=--enable-dom \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=--enable-fileinfo \
 		--with-pcre-dir=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=--enable-filter \
 		--with-pcre-dir=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=--enable-ftp \
 		--with-openssl-dir=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 CONFIGURE_ARGS+=--with-gd \
 		--with-freetype-dir=${LOCALBASE} \
 		--with-jpeg-dir=${LOCALBASE} \
 		--with-png-dir=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
 OPTIONS_DEFINE=	T1LIB TRUETYPE JIS X11 VPX
 OPTIONS_DEFAULT=T1LIB TRUETYPE X11
 
 T1LIB_DESC=	Include T1lib support
 TRUETYPE_DESC=	Enable TrueType string function
 JIS_DESC=	Enable JIS-mapped Japanese font support
 X11_DESC=	Enable XPM support
 VPX_DESC=	Enable VP8 codec support
 
 PHP_HEADER_DIRS=libgd
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "hash"
 CONFIGURE_ARGS+=--enable-hash \
 		--with-mhash
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
 
 USES+=	iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "imap"
-LIB_DEPENDS+=	libc-client4.so:${PORTSDIR}/mail/cclient
+OPTIONS_DEFINE=	PANDA
+PANDA_DESC=	Uses the forked panda-cclient instead of the original cclient
 
 CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
-		--with-pcre-dir=${LOCALBASE}
-.if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE}
+		--with-pcre-dir=${LOCALBASE} \
+		--with-imap-ssl=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
-.endif
 
 .if ${PHP_MODNAME} == "interbase"
 CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
 
 USE_FIREBIRD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "json"
 CONFIGURE_ARGS+=--enable-json
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 
 USE_OPENLDAP=	yes
 
 . ifdef(WANT_OPENLDAP_SASL)
 CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
 . endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=--enable-mbstring \
 		--with-pcre-dir=${LOCALBASE}
 
 OPTIONS_DEFINE=	REGEX
 OPTIONS_DEFAULT=REGEX
 
 REGEX_DESC=	Enable multibyte regex support
 
 PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mcrypt"
 LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl \
 		libmcrypt.so:${PORTSDIR}/security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "mssql"
 LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
 
 CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "mysql"
 OPTIONS_DEFINE=	MYSQLND
 OPTIONS_DEFAULT=MYSQLND
 
 MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 OPTIONS_DEFINE=	MYSQLND
 OPTIONS_DEFAULT=MYSQLND
 
 MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 
 CONFIGURE_ARGS+=--enable-odbc \
 		--with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "openssl"
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
 CONFIGURE_ARGS+=--enable-opcache
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=	Enable Microsoft SQL Server support
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 
 USE_FIREBIRD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=	MYSQLND
 OPTIONS_DEFAULT=MYSQLND
 
 MYSQLND_DESC=	Use MySQL Native Driver
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=--enable-phar \
 		--with-pcre-dir=${LOCALBASE}
 
 USE_PHP=	hash
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
 LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
 
 CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
 
 # Ugly hack to load session before psell to avoid crashes
 USE_PHP=	session
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "readline"
 CONFIGURE_ARGS+=--with-readline=/usr
 USES+=		readline
 .endif
 
 .if ${PHP_MODNAME} == "recode"
 LIB_DEPENDS+=	librecode.so:${PORTSDIR}/converters/recode
 
 CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=--enable-session
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=--enable-simplexml \
 		--with-pcre-dir=${LOCALBASE} \
 		--with-libxml-dir=${LOCALBASE}
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
 		--with-openssl-dir=${OPENSSLBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=--enable-soap \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 
 USE_PHP=	session
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sybase_ct"
 LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
 
 CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy.so:${PORTSDIR}/www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "wddx"
 CONFIGURE_ARGS+=--enable-wddx \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 
 USE_PHP=	xml session
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=--enable-xml \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=--enable-xmlreader \
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=--with-xmlrpc \
 		--with-libxml-dir=${LOCALBASE} \
 		--with-iconv-dir=${LOCALBASE}
 
 USES+=		iconv:translit
 USE_GNOME=	libxml2
 
 PHP_HEADER_DIRS=libxmlrpc
 
 USE_PHP=	xml
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=--enable-xmlwriter \
                 --with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=      libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom xml
 USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 LIB_DEPENDS+=	libzip.so:${PORTSDIR}/archivers/libzip
 
 CONFIGURE_ARGS+=--enable-zip \
 		--with-zlib-dir=/usr \
 		--with-pcre-dir=${LOCALBASE} \
 		--with-libzip=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=--with-zlib=/usr
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PHP_MODNAME} == "dba"
 .	if empty(PORT_OPTIONS:MCDB)
 CONFIGURE_ARGS+=--without-cdb
 .	endif
 .	if ${PORT_OPTIONS:MDB4}
 CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
 
 USE_BDB=		40+
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}
 LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
 
 CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MQDBM}
 LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
 
 CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTOKYO}
 LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
 
 CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
 .	endif
 .	if empty(PORT_OPTIONS:MINIFILE)
 CONFIGURE_ARGS+=--disable-inifile
 .	endif
 .	if empty(PORT_OPTIONS:MFLATFILE)
 CONFIGURE_ARGS+=--disable-flatfile
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 .	if ${PORT_OPTIONS:MT1LIB}
 LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
 
 CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTRUETYPE}
 CONFIGURE_ARGS+=--enable-gd-native-ttf
 .	endif
 .	if ${PORT_OPTIONS:MJIS}
 CONFIGURE_ARGS+=--enable-gd-jis-conv
 .	endif
 .	if ${PORT_OPTIONS:MX11}
 USE_XORG=	xpm
 
 CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MVPX}
 LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 
 CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
+.	endif
+.endif
+
+.if ${PHP_MODNAME} == "imap"
+.	if ${PORT_OPTIONS:MPANDA}
+LIB_DEPENDS+=	libc-client4.so.10:${PORTSDIR}/mail/panda-cclient
+.	else
+LIB_DEPENDS+=	libc-client4.so.9:${PORTSDIR}/mail/cclient
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 .	if ${PORT_OPTIONS:MREGEX}
 LIB_DEPENDS+=	libonig.so:${PORTSDIR}/devel/oniguruma4
 CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
 .	else
 CONFIGURE_ARGS+=--disable-mbregex
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mysql"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-mysql=mysqlnd
 .	else
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
 USE_MYSQL=	yes
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-mysqli=mysqlnd
 .	else
 CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config
 
 USE_MYSQL=	yes
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 .	if ${PORT_OPTIONS:MMSSQL}
 LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
 .	else
 LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
 
 USE_PHP+=	mysql
 .	else
 CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
 		--with-zlib-dir=/usr
 
 USE_MYSQL=	yes
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
Index: branches/2015Q1/lang/php56/distinfo
===================================================================
--- branches/2015Q1/lang/php56/distinfo	(revision 380262)
+++ branches/2015Q1/lang/php56/distinfo	(revision 380263)
@@ -1,4 +1,4 @@
-SHA256 (php-5.6.4.tar.bz2) = 576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1
-SIZE (php-5.6.4.tar.bz2) = 13498882
+SHA256 (php-5.6.6.tar.bz2) = 09625c9b65e0c8198dc76995a35f0feec0e13ea4489526e64a00954b12adbb4c
+SIZE (php-5.6.6.tar.bz2) = 13687928
 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
 SIZE (php-5.5.x-mail-header.patch) = 3379
Index: branches/2015Q1/lang/php56/files/patch-sapi_fpm_php-fpm.conf.in
===================================================================
--- branches/2015Q1/lang/php56/files/patch-sapi_fpm_php-fpm.conf.in	(revision 380262)
+++ branches/2015Q1/lang/php56/files/patch-sapi_fpm_php-fpm.conf.in	(nonexistent)
@@ -1,11 +0,0 @@
---- sapi/fpm/php-fpm.conf.in.orig	2013-12-10 23:31:06.000000000 +0000
-+++ sapi/fpm/php-fpm.conf.in	2013-12-13 21:50:25.757258451 +0000
-@@ -341,7 +341,7 @@ pm.max_spare_servers = 3
- ;   last request memory:  0
- ;
- ; Note: There is a real-time FPM status monitoring sample web page available
--;       It's available in: @EXPANDED_DATADIR@/fpm/status.html
-+;       It's available in: @EXPANDED_DATADIR@/php/fpm/status.html
- ;
- ; Note: The value must start with a leading slash (/). The value can be
- ;       anything, but it may not be a good idea to use the .php extension or it

Property changes on: branches/2015Q1/lang/php56/files/patch-sapi_fpm_php-fpm.conf.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2015Q1/lang/php56/files/patch-sapi_fpm_Makefile.frag
===================================================================
--- branches/2015Q1/lang/php56/files/patch-sapi_fpm_Makefile.frag	(revision 380262)
+++ branches/2015Q1/lang/php56/files/patch-sapi_fpm_Makefile.frag	(nonexistent)
@@ -1,12 +0,0 @@
---- sapi/fpm/Makefile.frag.orig	2013-12-10 23:31:06.000000000 +0000
-+++ sapi/fpm/Makefile.frag	2013-12-13 21:50:25.575258563 +0000
-@@ -18,6 +18,6 @@ install-fpm: $(SAPI_FPM_PATH)
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
- 	@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8
- 
--	@echo "Installing PHP FPM status page:      $(INSTALL_ROOT)$(datadir)/fpm/"
--	@$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm
--	@$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html
-+	@echo "Installing PHP FPM status page:      $(INSTALL_ROOT)$(datadir)/php/fpm/"
-+	@$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/php/fpm
-+	@$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/php/fpm/status.html

Property changes on: branches/2015Q1/lang/php56/files/patch-sapi_fpm_Makefile.frag
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2015Q1/lang/php56/pkg-plist
===================================================================
--- branches/2015Q1/lang/php56/pkg-plist	(revision 380262)
+++ branches/2015Q1/lang/php56/pkg-plist	(revision 380263)
@@ -1,247 +1,248 @@
 %%CLI%%bin/php
 %%CGI%%bin/php-cgi
 bin/php-config
 %%PHPDBG%%bin/phpdbg
 bin/phpize
 %%FPM%%sbin/php-fpm
 etc/php.conf
 etc/php.ini-development
 etc/php.ini-production
 %%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi
 %%FPM%%etc/php-fpm.conf.default
 %%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
 include/php/TSRM/TSRM.h
 include/php/TSRM/readdir.h
 include/php/TSRM/tsrm_config.h
 include/php/TSRM/tsrm_config.w32.h
 include/php/TSRM/tsrm_config_common.h
 include/php/TSRM/tsrm_nw.h
 include/php/TSRM/tsrm_strtok_r.h
 include/php/TSRM/tsrm_win32.h
 include/php/Zend/zend.h
 include/php/Zend/zend_API.h
 include/php/Zend/zend_alloc.h
 include/php/Zend/zend_ast.h
 include/php/Zend/zend_build.h
 include/php/Zend/zend_builtin_functions.h
 include/php/Zend/zend_closures.h
 include/php/Zend/zend_compile.h
 include/php/Zend/zend_config.h
 include/php/Zend/zend_config.nw.h
 include/php/Zend/zend_config.w32.h
 include/php/Zend/zend_constants.h
 include/php/Zend/zend_dtrace.h
 %%DTRACE%%include/php/Zend/zend_dtrace_gen.h
 include/php/Zend/zend_dynamic_array.h
 include/php/Zend/zend_errors.h
 include/php/Zend/zend_exceptions.h
 include/php/Zend/zend_execute.h
 include/php/Zend/zend_extensions.h
 include/php/Zend/zend_float.h
 include/php/Zend/zend_gc.h
 include/php/Zend/zend_generators.h
 include/php/Zend/zend_globals.h
 include/php/Zend/zend_globals_macros.h
 include/php/Zend/zend_hash.h
 include/php/Zend/zend_highlight.h
 include/php/Zend/zend_indent.h
 include/php/Zend/zend_ini.h
 include/php/Zend/zend_ini_parser.h
 include/php/Zend/zend_ini_scanner.h
 include/php/Zend/zend_ini_scanner_defs.h
 include/php/Zend/zend_interfaces.h
 include/php/Zend/zend_istdiostream.h
 include/php/Zend/zend_iterators.h
 include/php/Zend/zend_language_parser.h
 include/php/Zend/zend_language_scanner.h
 include/php/Zend/zend_language_scanner_defs.h
 include/php/Zend/zend_list.h
 include/php/Zend/zend_llist.h
 include/php/Zend/zend_modules.h
 include/php/Zend/zend_multibyte.h
 include/php/Zend/zend_multiply.h
 include/php/Zend/zend_object_handlers.h
 include/php/Zend/zend_objects.h
 include/php/Zend/zend_objects_API.h
 include/php/Zend/zend_operators.h
 include/php/Zend/zend_ptr_stack.h
 include/php/Zend/zend_qsort.h
 include/php/Zend/zend_signal.h
 include/php/Zend/zend_stack.h
 include/php/Zend/zend_static_allocator.h
 include/php/Zend/zend_stream.h
 include/php/Zend/zend_string.h
 include/php/Zend/zend_strtod.h
 include/php/Zend/zend_ts_hash.h
 include/php/Zend/zend_types.h
 include/php/Zend/zend_variables.h
 include/php/Zend/zend_virtual_cwd.h
 include/php/Zend/zend_vm.h
 include/php/Zend/zend_vm_def.h
 include/php/Zend/zend_vm_execute.h
 include/php/Zend/zend_vm_opcodes.h
 include/php/ext/date/lib/timelib.h
 include/php/ext/date/lib/timelib_config.h
 include/php/ext/date/lib/timelib_structs.h
 include/php/ext/date/php_date.h
 include/php/ext/ereg/php_ereg.h
 include/php/ext/ereg/php_regex.h
 include/php/ext/ereg/regex/cclass.h
 include/php/ext/ereg/regex/cname.h
 include/php/ext/ereg/regex/regex.h
 include/php/ext/ereg/regex/regex2.h
 include/php/ext/ereg/regex/utils.h
 include/php/ext/libxml/php_libxml.h
 include/php/ext/mysqlnd/config-win.h
+include/php/ext/mysqlnd/mysql_float_to_double.h
 include/php/ext/mysqlnd/mysqlnd.h
 include/php/ext/mysqlnd/mysqlnd_alloc.h
 include/php/ext/mysqlnd/mysqlnd_block_alloc.h
 include/php/ext/mysqlnd/mysqlnd_charset.h
 include/php/ext/mysqlnd/mysqlnd_debug.h
 include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
 include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
 include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
 include/php/ext/mysqlnd/mysqlnd_net.h
 include/php/ext/mysqlnd/mysqlnd_portability.h
 include/php/ext/mysqlnd/mysqlnd_priv.h
 include/php/ext/mysqlnd/mysqlnd_result.h
 include/php/ext/mysqlnd/mysqlnd_result_meta.h
 include/php/ext/mysqlnd/mysqlnd_reverse_api.h
 include/php/ext/mysqlnd/mysqlnd_statistics.h
 include/php/ext/mysqlnd/mysqlnd_structs.h
 include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
 include/php/ext/mysqlnd/php_mysqlnd.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/spl/php_spl.h
 include/php/ext/spl/spl_array.h
 include/php/ext/spl/spl_directory.h
 include/php/ext/spl/spl_dllist.h
 include/php/ext/spl/spl_engine.h
 include/php/ext/spl/spl_exceptions.h
 include/php/ext/spl/spl_fixedarray.h
 include/php/ext/spl/spl_functions.h
 include/php/ext/spl/spl_heap.h
 include/php/ext/spl/spl_iterators.h
 include/php/ext/spl/spl_observer.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/crc32.h
 include/php/ext/standard/credits.h
 include/php/ext/standard/credits_ext.h
 include/php/ext/standard/credits_sapi.h
 include/php/ext/standard/crypt_blowfish.h
 include/php/ext/standard/crypt_freesec.h
 include/php/ext/standard/css.h
 include/php/ext/standard/cyr_convert.h
 include/php/ext/standard/datetime.h
 include/php/ext/standard/dl.h
 include/php/ext/standard/exec.h
 include/php/ext/standard/file.h
 include/php/ext/standard/flock_compat.h
 include/php/ext/standard/fsock.h
 include/php/ext/standard/head.h
 include/php/ext/standard/html.h
 include/php/ext/standard/html_tables.h
 include/php/ext/standard/info.h
 include/php/ext/standard/md5.h
 include/php/ext/standard/microtime.h
 include/php/ext/standard/pack.h
 include/php/ext/standard/pageinfo.h
 include/php/ext/standard/php_array.h
 include/php/ext/standard/php_assert.h
 include/php/ext/standard/php_browscap.h
 include/php/ext/standard/php_crypt.h
 include/php/ext/standard/php_crypt_r.h
 include/php/ext/standard/php_dir.h
 include/php/ext/standard/php_dns.h
 include/php/ext/standard/php_ext_syslog.h
 include/php/ext/standard/php_filestat.h
 include/php/ext/standard/php_fopen_wrappers.h
 include/php/ext/standard/php_ftok.h
 include/php/ext/standard/php_http.h
 include/php/ext/standard/php_image.h
 include/php/ext/standard/php_incomplete_class.h
 include/php/ext/standard/php_iptc.h
 include/php/ext/standard/php_lcg.h
 include/php/ext/standard/php_link.h
 include/php/ext/standard/php_mail.h
 include/php/ext/standard/php_math.h
 include/php/ext/standard/php_metaphone.h
 include/php/ext/standard/php_password.h
 include/php/ext/standard/php_rand.h
 include/php/ext/standard/php_smart_str.h
 include/php/ext/standard/php_smart_str_public.h
 include/php/ext/standard/php_standard.h
 include/php/ext/standard/php_string.h
 include/php/ext/standard/php_type.h
 include/php/ext/standard/php_uuencode.h
 include/php/ext/standard/php_var.h
 include/php/ext/standard/php_versioning.h
 include/php/ext/standard/proc_open.h
 include/php/ext/standard/quot_print.h
 include/php/ext/standard/scanf.h
 include/php/ext/standard/sha1.h
 include/php/ext/standard/streamsfuncs.h
 include/php/ext/standard/uniqid.h
 include/php/ext/standard/url.h
 include/php/ext/standard/url_scanner_ex.h
 include/php/ext/standard/winver.h
 @exec touch %D/include/php/ext/php_config.h
 @unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
 include/php/main/fopen_wrappers.h
 include/php/main/php.h
 include/php/main/php_compat.h
 include/php/main/php_config.h
 include/php/main/php_content_types.h
 include/php/main/php_getopt.h
 include/php/main/php_globals.h
 include/php/main/php_ini.h
 include/php/main/php_main.h
 include/php/main/php_memory_streams.h
 include/php/main/php_network.h
 include/php/main/php_open_temporary_file.h
 include/php/main/php_output.h
 include/php/main/php_reentrancy.h
 include/php/main/php_scandir.h
 include/php/main/php_stdint.h
 include/php/main/php_streams.h
 include/php/main/php_syslog.h
 include/php/main/php_ticks.h
 include/php/main/php_variables.h
 include/php/main/php_version.h
 include/php/main/rfc1867.h
 include/php/main/snprintf.h
 include/php/main/spprintf.h
 include/php/main/streams/php_stream_context.h
 include/php/main/streams/php_stream_filter_api.h
 include/php/main/streams/php_stream_glob_wrapper.h
 include/php/main/streams/php_stream_mmap.h
 include/php/main/streams/php_streams_int.h
 include/php/main/streams/php_stream_transport.h
 include/php/main/streams/php_stream_userspace.h
 include/php/main/streams/php_stream_plain_wrapper.h
 %%CLI%%include/php/sapi/cli/cli.h
 %%EMBED%%include/php/sapi/embed/php_embed.h
 include/php/main/win32_internal_function_disabled.h
 include/php/main/win95nt.h
 %%EMBED%%lib/libphp5.so
 lib/php/build/Makefile.global
 lib/php/build/acinclude.m4
 lib/php/build/config.guess
 lib/php/build/config.sub
 lib/php/build/libtool.m4
 lib/php/build/ltmain.sh
 lib/php/build/mkdep.awk
 lib/php/build/phpize.m4
 lib/php/build/run-tests.php
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
 %%CGI%%man/man1/php-cgi.1.gz
 man/man1/php-config.1.gz
 %%CLI%%man/man1/php.1.gz
 %%PHPDBG%%man/man1/phpdbg.1.gz
 man/man1/phpize.1.gz
 %%FPM%%man/man8/php-fpm.8.gz
 %%FPM%%share/php/fpm/status.html