Index: head/databases/php56-odbc/files/patch-config.m4
===================================================================
--- head/databases/php56-odbc/files/patch-config.m4	(revision 384786)
+++ head/databases/php56-odbc/files/patch-config.m4	(revision 384787)
@@ -1,129 +1,129 @@
---- config.m4.orig	2015-03-19 00:19:30.000000000 +0000
-+++ config.m4	2015-04-01 08:21:21.242902661 +0000
+--- config.m4.orig	2015-04-15 18:05:57.000000000 +0000
++++ config.m4	2015-04-26 12:08:54.914235064 +0000
 @@ -100,13 +100,17 @@
  dnl configure options
  dnl
  
 +PHP_ARG_ENABLE(odbc,,
 +[  --enable-odbc             Enable ODBC support with selected driver])
 +
 +
  PHP_ARG_WITH(odbcver,,
  [  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0300.
                               Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(adabas,,
 -[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
 +[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]], no, no)
  
+   AC_MSG_CHECKING([for Adabas support])
    if test "$PHP_ADABAS" != "no"; then
-     AC_MSG_CHECKING([for Adabas support])
-@@ -133,7 +137,7 @@
+@@ -135,7 +139,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(sapdb,,
 -[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]])
 +[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]], no, no)
  
+   AC_MSG_CHECKING([for SAP DB support])
    if test "$PHP_SAPDB" != "no"; then
-     AC_MSG_CHECKING([for SAP DB support])
-@@ -151,7 +155,7 @@
+@@ -155,7 +159,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(solid,,
 -[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]])
 +[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]], no, no)
  
+   AC_MSG_CHECKING(for Solid support)
    if test "$PHP_SOLID" != "no"; then
-     AC_MSG_CHECKING(for Solid support)
-@@ -176,7 +180,7 @@
+@@ -182,7 +186,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(ibm-db2,,
 -[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]])
 +[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]], no, no)
  
+   AC_MSG_CHECKING(for IBM DB2 support)
    if test "$PHP_IBM_DB2" != "no"; then
-     AC_MSG_CHECKING(for IBM DB2 support)
-@@ -213,7 +217,7 @@
+@@ -221,7 +225,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(ODBCRouter,,
 -[  --with-ODBCRouter[=DIR]   Include ODBCRouter.com support [/usr]])
 +[  --with-ODBCRouter[=DIR]   Include ODBCRouter.com support [/usr]], no, no)
  
+   AC_MSG_CHECKING(for ODBCRouter.com support)
    if test "$PHP_ODBCROUTER" != "no"; then
-     AC_MSG_CHECKING(for ODBCRouter.com support)
-@@ -234,7 +238,7 @@
+@@ -244,7 +248,7 @@
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(empress,,
  [  --with-empress[=DIR]      Include Empress support [\$EMPRESSPATH]
 -                          (Empress Version >= 8.60 required)])
 +                          (Empress Version >= 8.60 required)], no, no)
  
+   AC_MSG_CHECKING(for Empress support)
    if test "$PHP_EMPRESS" != "no"; then
-     AC_MSG_CHECKING(for Empress support)
-@@ -258,7 +262,7 @@
+@@ -270,7 +274,7 @@
  PHP_ARG_WITH(empress-bcs,,
  [  --with-empress-bcs[=DIR]
                            Include Empress Local Access support [\$EMPRESSPATH]
 -                          (Empress Version >= 8.60 required)])
 +                          (Empress Version >= 8.60 required)], no, no)
  
+   AC_MSG_CHECKING(for Empress local access support)
    if test "$PHP_EMPRESS_BCS" != "no"; then
-     AC_MSG_CHECKING(for Empress local access support)
-@@ -296,7 +300,7 @@
+@@ -310,7 +314,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(birdstep,,
 -[  --with-birdstep[=DIR]     Include Birdstep support [/usr/local/birdstep]])
 +[  --with-birdstep[=DIR]     Include Birdstep support [/usr/local/birdstep]], no, no)
    
+   AC_MSG_CHECKING(for Birdstep support)
    if test "$PHP_BIRDSTEP" != "no"; then
-     AC_MSG_CHECKING(for Birdstep support)
-@@ -350,7 +354,7 @@
+@@ -366,7 +370,7 @@
                            running this configure script:
                              CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
                              LDFLAGS=-lunix
 -                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
 +                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no)
  
+   AC_MSG_CHECKING(for a custom ODBC support)
    if test "$PHP_CUSTOM_ODBC" != "no"; then
-     AC_MSG_CHECKING(for a custom ODBC support)
-@@ -370,7 +374,7 @@
+@@ -388,7 +392,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(iodbc,,
--[  --with-iodbc[=DIR]        Include iODBC support])
-+[  --with-iodbc[=DIR]        Include iODBC support], no, no)
+-[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
++[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]], no, no)
  
+   AC_MSG_CHECKING(for iODBC support)
    if test "$PHP_IODBC" != "no"; then
-     AC_MSG_CHECKING(for iODBC support)
-@@ -406,7 +410,7 @@
+@@ -426,7 +430,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(esoob,,
 -[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
 +[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no)
  
+   AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
    if test "$PHP_ESOOB" != "no"; then
-     AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
-@@ -426,7 +430,7 @@
+@@ -448,7 +452,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(unixODBC,,
 -[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]])
 +[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]], no, no)
  
+   AC_MSG_CHECKING(for unixODBC support)
    if test "$PHP_UNIXODBC" != "no"; then
-     AC_MSG_CHECKING(for unixODBC support)
-@@ -447,7 +451,7 @@
+@@ -471,7 +475,7 @@
  
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH(dbmaker,,
 -[  --with-dbmaker[=DIR]      Include DBMaker support])
 +[  --with-dbmaker[=DIR]      Include DBMaker support], no, no)
  
+   AC_MSG_CHECKING(for DBMaker support)
    if test "$PHP_DBMAKER" != "no"; then
-     AC_MSG_CHECKING(for DBMaker support)
Index: head/databases/php56-pdo_sqlite/Makefile
===================================================================
--- head/databases/php56-pdo_sqlite/Makefile	(revision 384786)
+++ head/databases/php56-pdo_sqlite/Makefile	(revision 384787)
@@ -1,11 +1,10 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases
 
 MASTERDIR=	${.CURDIR}/../../lang/php56
 
 PKGNAMESUFFIX=	-pdo_sqlite
 
 .include "${MASTERDIR}/Makefile"
Index: head/databases/php56-sqlite3/Makefile
===================================================================
--- head/databases/php56-sqlite3/Makefile	(revision 384786)
+++ head/databases/php56-sqlite3/Makefile	(revision 384787)
@@ -1,11 +1,10 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases
 
 MASTERDIR=	${.CURDIR}/../../lang/php56
 
 PKGNAMESUFFIX=	-sqlite3
 
 .include "${MASTERDIR}/Makefile"
Index: head/lang/php56/Makefile
===================================================================
--- head/lang/php56/Makefile	(revision 384786)
+++ head/lang/php56/Makefile	(revision 384787)
@@ -1,212 +1,212 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	php56
-PORTVERSION=	5.6.7
+PORTVERSION=	5.6.8
 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+=		-lpthread
 .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: head/lang/php56/distinfo
===================================================================
--- head/lang/php56/distinfo	(revision 384786)
+++ head/lang/php56/distinfo	(revision 384787)
@@ -1,4 +1,4 @@
-SHA256 (php-5.6.7.tar.bz2) = 02954fb74c61a7879d48ebdcd4ecb78aa0056f4215ca9b096232de28eb8f17bc
-SIZE (php-5.6.7.tar.bz2) = 13697400
+SHA256 (php-5.6.8.tar.bz2) = 0af0045745d61eeb74a3ea744529a2481b27cb689da720e6c0250675043724e4
+SIZE (php-5.6.8.tar.bz2) = 13724681
 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
 SIZE (php-5.5.x-mail-header.patch) = 3379
Index: head/security/php56-mcrypt/Makefile
===================================================================
--- head/security/php56-mcrypt/Makefile	(revision 384786)
+++ head/security/php56-mcrypt/Makefile	(revision 384787)
@@ -1,11 +1,10 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	security
 
 MASTERDIR=	${.CURDIR}/../../lang/php56
 
 PKGNAMESUFFIX=	-mcrypt
 
 .include "${MASTERDIR}/Makefile"
Index: head/textproc/php56-pspell/Makefile
===================================================================
--- head/textproc/php56-pspell/Makefile	(revision 384786)
+++ head/textproc/php56-pspell/Makefile	(revision 384787)
@@ -1,11 +1,10 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	textproc
 
 MASTERDIR=	${.CURDIR}/../../lang/php56
 
 PKGNAMESUFFIX=	-pspell
 
 .include "${MASTERDIR}/Makefile"