Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Jun 2013 14:32:12 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r321684 - in head: Mk archivers archivers/php55-bz2 archivers/php55-phar archivers/php55-zip archivers/php55-zlib converters converters/php55-iconv converters/php55-mbstring converters/...
Message-ID:  <201306241432.r5OEWCOj016074@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Mon Jun 24 14:32:11 2013
New Revision: 321684
URL: http://svnweb.freebsd.org/changeset/ports/321684

Log:
  Welcome PHP 5.5!
  
  Future steps:
  - rename current php5 ports to php54
  - make php55 the default one after an exp-run

Added:
  head/archivers/php55-bz2/
     - copied from r321671, head/archivers/php5-bz2/
  head/archivers/php55-phar/
     - copied from r321671, head/archivers/php5-phar/
  head/archivers/php55-zip/
     - copied from r321671, head/archivers/php5-zip/
  head/archivers/php55-zlib/
     - copied from r321671, head/archivers/php5-zlib/
  head/converters/php55-iconv/
     - copied from r321671, head/converters/php5-iconv/
  head/converters/php55-mbstring/
     - copied from r321671, head/converters/php5-mbstring/
  head/converters/php55-recode/
     - copied from r321671, head/converters/php5-recode/
  head/databases/php55-dba/
     - copied from r321671, head/databases/php5-dba/
  head/databases/php55-interbase/
     - copied from r321671, head/databases/php5-interbase/
  head/databases/php55-mssql/
     - copied from r321671, head/databases/php5-mssql/
  head/databases/php55-mysql/
     - copied from r321671, head/databases/php5-mysql/
  head/databases/php55-mysqli/
     - copied from r321671, head/databases/php5-mysqli/
  head/databases/php55-odbc/
     - copied from r321671, head/databases/php5-odbc/
  head/databases/php55-pdo/
     - copied from r321671, head/databases/php5-pdo/
  head/databases/php55-pdo_dblib/
     - copied from r321671, head/databases/php5-pdo_dblib/
  head/databases/php55-pdo_dblib/files/
  head/databases/php55-pdo_dblib/files/patch-dblib_driver.c   (contents, props changed)
  head/databases/php55-pdo_firebird/
     - copied from r321671, head/databases/php5-pdo_firebird/
  head/databases/php55-pdo_mysql/
     - copied from r321671, head/databases/php5-pdo_mysql/
  head/databases/php55-pdo_odbc/
     - copied from r321671, head/databases/php5-pdo_odbc/
  head/databases/php55-pdo_pgsql/
     - copied from r321671, head/databases/php5-pdo_pgsql/
  head/databases/php55-pdo_sqlite/
     - copied from r321671, head/databases/php5-pdo_sqlite/
  head/databases/php55-pgsql/
     - copied from r321671, head/databases/php5-pgsql/
  head/databases/php55-sqlite3/
     - copied from r321671, head/databases/php5-sqlite3/
  head/databases/php55-sybase_ct/
     - copied from r321671, head/databases/php5-sybase_ct/
  head/devel/php55-gettext/
     - copied from r321671, head/devel/php5-gettext/
  head/devel/php55-json/
     - copied from r321671, head/devel/php5-json/
  head/devel/php55-pcntl/
     - copied from r321671, head/devel/php5-pcntl/
  head/devel/php55-readline/
     - copied from r321671, head/devel/php5-readline/
  head/devel/php55-shmop/
     - copied from r321671, head/devel/php5-shmop/
  head/devel/php55-sysvmsg/
     - copied from r321671, head/devel/php5-sysvmsg/
  head/devel/php55-sysvsem/
     - copied from r321671, head/devel/php5-sysvsem/
  head/devel/php55-sysvshm/
     - copied from r321671, head/devel/php5-sysvshm/
  head/devel/php55-tokenizer/
     - copied from r321671, head/devel/php5-tokenizer/
  head/ftp/php55-curl/
     - copied from r321671, head/ftp/php5-curl/
  head/ftp/php55-ftp/
     - copied from r321671, head/ftp/php5-ftp/
  head/graphics/php55-exif/
     - copied from r321671, head/graphics/php5-exif/
  head/graphics/php55-gd/
     - copied from r321671, head/graphics/php5-gd/
  head/lang/php55/
     - copied from r321671, head/lang/php5/
  head/lang/php55-extensions/
     - copied from r321671, head/lang/php5-extensions/
  head/mail/php55-imap/
     - copied from r321671, head/mail/php5-imap/
  head/math/php55-bcmath/
     - copied from r321671, head/math/php5-bcmath/
  head/math/php55-gmp/
     - copied from r321671, head/math/php5-gmp/
  head/misc/php55-calendar/
     - copied from r321671, head/misc/php5-calendar/
  head/net-mgmt/php55-snmp/
     - copied from r321671, head/net-mgmt/php5-snmp/
  head/net/php55-ldap/
     - copied from r321671, head/net/php5-ldap/
  head/net/php55-soap/
     - copied from r321671, head/net/php5-soap/
  head/net/php55-sockets/
     - copied from r321671, head/net/php5-sockets/
  head/net/php55-xmlrpc/
     - copied from r321671, head/net/php5-xmlrpc/
  head/security/php55-filter/
     - copied from r321671, head/security/php5-filter/
  head/security/php55-hash/
     - copied from r321671, head/security/php5-hash/
  head/security/php55-mcrypt/
     - copied from r321671, head/security/php5-mcrypt/
  head/security/php55-openssl/
     - copied from r321671, head/security/php5-openssl/
  head/sysutils/php55-fileinfo/
     - copied from r321671, head/sysutils/php5-fileinfo/
  head/sysutils/php55-posix/
     - copied from r321671, head/sysutils/php5-posix/
  head/textproc/php55-ctype/
     - copied from r321671, head/textproc/php5-ctype/
  head/textproc/php55-dom/
     - copied from r321671, head/textproc/php5-dom/
  head/textproc/php55-pspell/
     - copied from r321671, head/textproc/php5-pspell/
  head/textproc/php55-simplexml/
     - copied from r321671, head/textproc/php5-simplexml/
  head/textproc/php55-wddx/
     - copied from r321671, head/textproc/php5-wddx/
  head/textproc/php55-xml/
     - copied from r321671, head/textproc/php5-xml/
  head/textproc/php55-xmlreader/
     - copied from r321671, head/textproc/php5-xmlreader/
  head/textproc/php55-xmlwriter/
     - copied from r321671, head/textproc/php5-xmlwriter/
  head/textproc/php55-xsl/
     - copied from r321671, head/textproc/php5-xsl/
  head/www/php55-session/
     - copied from r321671, head/www/php5-session/
  head/www/php55-tidy/
     - copied from r321671, head/www/php5-tidy/
Modified:
  head/Mk/bsd.php.mk
  head/archivers/Makefile
  head/archivers/php55-bz2/Makefile
  head/archivers/php55-phar/Makefile
  head/archivers/php55-zip/Makefile
  head/archivers/php55-zlib/Makefile
  head/converters/Makefile
  head/converters/php55-iconv/Makefile
  head/converters/php55-mbstring/Makefile
  head/converters/php55-recode/Makefile
  head/databases/Makefile
  head/databases/php55-dba/Makefile
  head/databases/php55-interbase/Makefile
  head/databases/php55-mssql/Makefile
  head/databases/php55-mysql/Makefile
  head/databases/php55-mysqli/Makefile
  head/databases/php55-odbc/Makefile
  head/databases/php55-pdo/Makefile
  head/databases/php55-pdo_dblib/Makefile
  head/databases/php55-pdo_firebird/Makefile
  head/databases/php55-pdo_mysql/Makefile
  head/databases/php55-pdo_odbc/Makefile
  head/databases/php55-pdo_pgsql/Makefile
  head/databases/php55-pdo_sqlite/Makefile
  head/databases/php55-pgsql/Makefile
  head/databases/php55-sqlite3/Makefile
  head/databases/php55-sybase_ct/Makefile
  head/devel/Makefile
  head/devel/php55-gettext/Makefile
  head/devel/php55-json/Makefile
  head/devel/php55-pcntl/Makefile
  head/devel/php55-readline/Makefile
  head/devel/php55-shmop/Makefile
  head/devel/php55-sysvmsg/Makefile
  head/devel/php55-sysvsem/Makefile
  head/devel/php55-sysvshm/Makefile
  head/devel/php55-tokenizer/Makefile
  head/ftp/Makefile
  head/ftp/php55-curl/Makefile
  head/ftp/php55-ftp/Makefile
  head/graphics/Makefile
  head/graphics/php55-exif/Makefile
  head/graphics/php55-gd/Makefile
  head/lang/Makefile
  head/lang/php55-extensions/Makefile
  head/lang/php55-extensions/pkg-descr
  head/lang/php55/Makefile
  head/lang/php55/Makefile.ext
  head/lang/php55/distinfo
  head/lang/php55/pkg-plist
  head/mail/Makefile
  head/mail/php55-imap/Makefile
  head/math/Makefile
  head/math/php55-bcmath/Makefile
  head/math/php55-gmp/Makefile
  head/misc/Makefile
  head/misc/php55-calendar/Makefile
  head/net-mgmt/Makefile
  head/net-mgmt/php55-snmp/Makefile
  head/net/Makefile
  head/net/php55-ldap/Makefile
  head/net/php55-soap/Makefile
  head/net/php55-sockets/Makefile
  head/net/php55-xmlrpc/Makefile
  head/security/Makefile
  head/security/php55-filter/Makefile
  head/security/php55-hash/Makefile
  head/security/php55-mcrypt/Makefile
  head/security/php55-openssl/Makefile
  head/sysutils/Makefile
  head/sysutils/php55-fileinfo/Makefile
  head/sysutils/php55-posix/Makefile
  head/textproc/Makefile
  head/textproc/php55-ctype/Makefile
  head/textproc/php55-dom/Makefile
  head/textproc/php55-pspell/Makefile
  head/textproc/php55-simplexml/Makefile
  head/textproc/php55-wddx/Makefile
  head/textproc/php55-xml/Makefile
  head/textproc/php55-xmlreader/Makefile
  head/textproc/php55-xmlwriter/Makefile
  head/textproc/php55-xsl/Makefile
  head/www/Makefile
  head/www/php55-session/Makefile
  head/www/php55-tidy/Makefile

Modified: head/Mk/bsd.php.mk
==============================================================================
--- head/Mk/bsd.php.mk	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/Mk/bsd.php.mk	Mon Jun 24 14:32:11 2013	(r321684)
@@ -53,6 +53,9 @@ PHP_EXT_DIR=	20060613
 .elif ${PHP_VER}  == 53
 PHP_EXT_DIR=	20090626
 PHP_EXT_INC=	pcre spl
+.elif ${PHP_VER}  == 55
+PHP_EXT_DIR=	20121212
+PHP_EXT_INC=	pcre spl
 .else
 PHP_EXT_DIR=	20100525
 PHP_EXT_INC=	pcre spl
@@ -268,6 +271,7 @@ _USE_PHP_ALL=	apc bcmath bitset bz2 cale
 _USE_PHP_VER5=	${_USE_PHP_ALL} phar sqlite3
 _USE_PHP_VER52=	${_USE_PHP_ALL} dbase mhash ming ncurses oci8 sqlite
 _USE_PHP_VER53=	${_USE_PHP_ALL} phar sqlite sqlite3
+_USE_PHP_VER55=	${_USE_PHP_ALL} phar sqlite3
 
 apc_DEPENDS=	www/pecl-APC
 bcmath_DEPENDS=	math/php${PHP_VER}-bcmath

Modified: head/archivers/Makefile
==============================================================================
--- head/archivers/Makefile	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/archivers/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -144,6 +144,10 @@
     SUBDIR += php53-phar
     SUBDIR += php53-zip
     SUBDIR += php53-zlib
+    SUBDIR += php55-bz2
+    SUBDIR += php55-phar
+    SUBDIR += php55-zip
+    SUBDIR += php55-zlib
     SUBDIR += pigz
     SUBDIR += pixz
     SUBDIR += plzip

Modified: head/archivers/php55-bz2/Makefile
==============================================================================
--- head/archivers/php5-bz2/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/archivers/php55-bz2/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-bz2
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	archivers
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-bz2
 

Modified: head/archivers/php55-phar/Makefile
==============================================================================
--- head/archivers/php5-phar/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/archivers/php55-phar/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-phar
-# Date created:			25 Nov 2011
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	archivers
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-phar
 

Modified: head/archivers/php55-zip/Makefile
==============================================================================
--- head/archivers/php5-zip/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/archivers/php55-zip/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-zip
-# Date created:			10 Dec 2008
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	archivers
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-zip
 

Modified: head/archivers/php55-zlib/Makefile
==============================================================================
--- head/archivers/php5-zlib/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/archivers/php55-zlib/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-zlib
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	archivers
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-zlib
 

Modified: head/converters/Makefile
==============================================================================
--- head/converters/Makefile	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/converters/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -134,6 +134,9 @@
     SUBDIR += php53-iconv
     SUBDIR += php53-mbstring
     SUBDIR += php53-recode
+    SUBDIR += php55-iconv
+    SUBDIR += php55-mbstring
+    SUBDIR += php55-recode 
     SUBDIR += psiconv
     SUBDIR += py-bsdconv
     SUBDIR += py-iconv

Modified: head/converters/php55-iconv/Makefile
==============================================================================
--- head/converters/php5-iconv/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/converters/php55-iconv/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-iconv
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	converters
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-iconv
 

Modified: head/converters/php55-mbstring/Makefile
==============================================================================
--- head/converters/php5-mbstring/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/converters/php55-mbstring/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-mbstring
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	converters
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-mbstring
 

Modified: head/converters/php55-recode/Makefile
==============================================================================
--- head/converters/php5-recode/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/converters/php55-recode/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-recode
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	converters
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-recode
 

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/databases/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -633,6 +633,22 @@
     SUBDIR += php53-sqlite
     SUBDIR += php53-sqlite3
     SUBDIR += php53-sybase_ct
+    SUBDIR += php55-dba
+    SUBDIR += php55-interbase
+    SUBDIR += php55-mssql
+    SUBDIR += php55-mysql
+    SUBDIR += php55-mysqli
+    SUBDIR += php55-odbc   
+    SUBDIR += php55-pdo
+    SUBDIR += php55-pdo_dblib
+    SUBDIR += php55-pdo_firebird
+    SUBDIR += php55-pdo_mysql
+    SUBDIR += php55-pdo_odbc
+    SUBDIR += php55-pdo_pgsql
+    SUBDIR += php55-pdo_sqlite
+    SUBDIR += php55-pgsql
+    SUBDIR += php55-sqlite3
+    SUBDIR += php55-sybase_ct
     SUBDIR += phpminiadmin
     SUBDIR += phpmyadmin
     SUBDIR += phpmyadmin35

Modified: head/databases/php55-dba/Makefile
==============================================================================
--- head/databases/php5-dba/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-dba/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-dba
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-dba
 

Modified: head/databases/php55-interbase/Makefile
==============================================================================
--- head/databases/php5-interbase/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-interbase/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-interbase
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-interbase
 

Modified: head/databases/php55-mssql/Makefile
==============================================================================
--- head/databases/php5-mssql/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-mssql/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-mssql
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-mssql
 

Modified: head/databases/php55-mysql/Makefile
==============================================================================
--- head/databases/php5-mysql/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-mysql/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-mysql
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-mysql
 

Modified: head/databases/php55-mysqli/Makefile
==============================================================================
--- head/databases/php5-mysqli/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-mysqli/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-mysqli
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-mysqli
 

Modified: head/databases/php55-odbc/Makefile
==============================================================================
--- head/databases/php5-odbc/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-odbc/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-odbc
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-odbc
 

Modified: head/databases/php55-pdo/Makefile
==============================================================================
--- head/databases/php5-pdo/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-pdo/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-pdo
-# Date created:			7 Feb 2007
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-pdo
 

Modified: head/databases/php55-pdo_dblib/Makefile
==============================================================================
--- head/databases/php5-pdo_dblib/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-pdo_dblib/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-pdo_dblib
-# Date created:			7 Feb 2007
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-pdo_dblib
 

Added: head/databases/php55-pdo_dblib/files/patch-dblib_driver.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/php55-pdo_dblib/files/patch-dblib_driver.c	Mon Jun 24 14:32:11 2013	(r321684)
@@ -0,0 +1,15 @@
+--- dblib_driver.c.orig	2013-06-24 15:17:35.000000000 +0200
++++ dblib_driver.c	2013-06-24 15:20:43.000000000 +0200
+@@ -274,9 +274,9 @@
+ 		,{"5.0",DBVERSION_70} /* FIXME: This does not work with Sybase, but environ will */
+ 		,{"6.0",DBVERSION_70}
+ 		,{"7.0",DBVERSION_70}
+-		,{"7.1",DBVERSION_71}
+-		,{"7.2",DBVERSION_72}
+-		,{"8.0",DBVERSION_72}
++		,{"7.1",DBVERSION_80}
++		,{"7.2",DBVERSION_80}
++		,{"8.0",DBVERSION_80}
+ 		,{"10.0",DBVERSION_100}
+ 		,{"auto",0} /* Only works with FreeTDS. Other drivers will bork */
+ 		

Modified: head/databases/php55-pdo_firebird/Makefile
==============================================================================
--- head/databases/php5-pdo_firebird/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-pdo_firebird/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -3,7 +3,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-pdo_firebird
 

Modified: head/databases/php55-pdo_mysql/Makefile
==============================================================================
--- head/databases/php5-pdo_mysql/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-pdo_mysql/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-pdo_mysql
-# Date created:			7 Feb 2007
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-pdo_mysql
 

Modified: head/databases/php55-pdo_odbc/Makefile
==============================================================================
--- head/databases/php5-pdo_odbc/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-pdo_odbc/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-pdo_odbc
-# Date created:			7 Feb 2007
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-pdo_odbc
 

Modified: head/databases/php55-pdo_pgsql/Makefile
==============================================================================
--- head/databases/php5-pdo_pgsql/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-pdo_pgsql/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-pdo_pgsql
-# Date created:			7 Feb 2007
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-pdo_pgsql
 

Modified: head/databases/php55-pdo_sqlite/Makefile
==============================================================================
--- head/databases/php5-pdo_sqlite/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-pdo_sqlite/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-pdo_sqlite
-# Date created:			7 Feb 2007
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-pdo_sqlite
 

Modified: head/databases/php55-pgsql/Makefile
==============================================================================
--- head/databases/php5-pgsql/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-pgsql/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-pgsql
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-pgsql
 

Modified: head/databases/php55-sqlite3/Makefile
==============================================================================
--- head/databases/php5-sqlite3/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-sqlite3/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-sqlite3
-# Date created:			15 Apr 2011
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-sqlite3
 

Modified: head/databases/php55-sybase_ct/Makefile
==============================================================================
--- head/databases/php5-sybase_ct/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/databases/php55-sybase_ct/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-sybase_ct
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-sybase_ct
 

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/devel/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -3293,6 +3293,15 @@
     SUBDIR += php53-sysvsem
     SUBDIR += php53-sysvshm
     SUBDIR += php53-tokenizer
+    SUBDIR += php55-gettext
+    SUBDIR += php55-json
+    SUBDIR += php55-pcntl
+    SUBDIR += php55-readline
+    SUBDIR += php55-shmop
+    SUBDIR += php55-sysvmsg
+    SUBDIR += php55-sysvsem
+    SUBDIR += php55-sysvshm
+    SUBDIR += php55-tokenizer
     SUBDIR += phpbt
     SUBDIR += phpsh
     SUBDIR += phptags

Modified: head/devel/php55-gettext/Makefile
==============================================================================
--- head/devel/php5-gettext/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/devel/php55-gettext/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-gettext
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-gettext
 

Modified: head/devel/php55-json/Makefile
==============================================================================
--- head/devel/php5-json/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/devel/php55-json/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-json
-# Date created:			10 Dec 2008
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-json
 

Modified: head/devel/php55-pcntl/Makefile
==============================================================================
--- head/devel/php5-pcntl/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/devel/php55-pcntl/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-pcntl
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-pcntl
 

Modified: head/devel/php55-readline/Makefile
==============================================================================
--- head/devel/php5-readline/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/devel/php55-readline/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-readline
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-readline
 

Modified: head/devel/php55-shmop/Makefile
==============================================================================
--- head/devel/php5-shmop/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/devel/php55-shmop/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-shmop
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-shmop
 

Modified: head/devel/php55-sysvmsg/Makefile
==============================================================================
--- head/devel/php5-sysvmsg/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/devel/php55-sysvmsg/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-sysvmsg
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-sysvmsg
 

Modified: head/devel/php55-sysvsem/Makefile
==============================================================================
--- head/devel/php5-sysvsem/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/devel/php55-sysvsem/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-sysvsem
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-sysvsem
 

Modified: head/devel/php55-sysvshm/Makefile
==============================================================================
--- head/devel/php5-sysvshm/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/devel/php55-sysvshm/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-sysvshm
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-sysvshm
 

Modified: head/devel/php55-tokenizer/Makefile
==============================================================================
--- head/devel/php5-tokenizer/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/devel/php55-tokenizer/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-tokenizer
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-tokenizer
 

Modified: head/ftp/Makefile
==============================================================================
--- head/ftp/Makefile	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/ftp/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -76,6 +76,8 @@
     SUBDIR += php52-ftp
     SUBDIR += php53-curl
     SUBDIR += php53-ftp
+    SUBDIR += php55-curl
+    SUBDIR += php55-ftp
     SUBDIR += phpwebftp
     SUBDIR += plasma-applet-ftpmonitor
     SUBDIR += proftpd

Modified: head/ftp/php55-curl/Makefile
==============================================================================
--- head/ftp/php5-curl/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/ftp/php55-curl/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-curl
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	ftp
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-curl
 

Modified: head/ftp/php55-ftp/Makefile
==============================================================================
--- head/ftp/php5-ftp/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/ftp/php55-ftp/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-ftp
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	ftp
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-ftp
 

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/graphics/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -794,6 +794,8 @@
     SUBDIR += php52-ming
     SUBDIR += php53-exif
     SUBDIR += php53-gd
+    SUBDIR += php55-exif
+    SUBDIR += php55-gd
     SUBDIR += phplot
     SUBDIR += phpsview
     SUBDIR += picpuz

Modified: head/graphics/php55-exif/Makefile
==============================================================================
--- head/graphics/php5-exif/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/graphics/php55-exif/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-exif
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	graphics
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-exif
 

Modified: head/graphics/php55-gd/Makefile
==============================================================================
--- head/graphics/php5-gd/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/graphics/php55-gd/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-gd
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	graphics
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-gd
 

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/lang/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -253,6 +253,8 @@
     SUBDIR += php52-extensions
     SUBDIR += php53
     SUBDIR += php53-extensions
+    SUBDIR += php55
+    SUBDIR += php55-extensions
     SUBDIR += php_doc
     SUBDIR += picoc
     SUBDIR += pike76

Modified: head/lang/php55-extensions/Makefile
==============================================================================
--- head/lang/php5-extensions/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/lang/php55-extensions/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,11 +1,7 @@
-# New ports collection makefile for:	php5-extensions
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
-PORTNAME=	php5
+PORTNAME=	php55
 PORTVERSION=	1.7
 CATEGORIES=	lang
 MASTER_SITES=	# none
@@ -17,8 +13,8 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A "meta-port" to install PHP extensions
 
 USE_PHP=	yes
-DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=52 53
+DEFAULT_PHP_VER=55
+IGNORE_WITH_PHP=52 53 54 5
 USE_PHP_BUILD=	yes
 
 NO_BUILD=	yes

Modified: head/lang/php55-extensions/pkg-descr
==============================================================================
--- head/lang/php5-extensions/pkg-descr	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/lang/php55-extensions/pkg-descr	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,6 +1,7 @@
-This is a "meta-port" to install the extensions for PHP 5.
+This is a "meta-port" to install the extensions for PHP 5.5.
 
 Defaults to:
-ctype, dom, iconv, pcre, posix, session, simplexml, sqlite, tokenizer and xml.
+ctype, dom, filter, hash, iconv, json, pdo, pdo_sqlite, phar, posix,
+session, simplexml, sqlite3, tokenizer, xml, xmlreader and xmlwriter.
 
 WWW: http://www.php.net/

Modified: head/lang/php55/Makefile
==============================================================================
--- head/lang/php5/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/lang/php55/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,8 +1,8 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	php5
-PORTVERSION=	5.4.16
+PORTNAME=	php55
+PORTVERSION=	5.5.0
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
@@ -53,7 +53,7 @@ IPV6_DESC=	Enable ipv6 support
 MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 
-CONFLICTS=	php52-5* php53-5*
+CONFLICTS=	php52-5* php53-5* php54-5* php5-5*
 
 MAN1=		php-config.1 phpize.1
 
@@ -65,7 +65,7 @@ PATCH_SITES+=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	ale
 
 .if ${PORT_OPTIONS:MMAILHEAD}
-PATCHFILES+=	php-5.4.x-mail-header.patch:mail
+PATCHFILES+=	php-5.5.x-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
@@ -112,8 +112,8 @@ CONFIGURE_ARGS+=--with-apxs2filter=${APX
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
-MODULENAME=	lib${PORTNAME}
-SHORTMODNAME=	${PORTNAME}
+MODULENAME=	libphp5
+SHORTMODNAME=	php5
 PLIST_SUB+=	APACHE=""
 .else
 PLIST_SUB+=	APACHE="@comment "
@@ -181,7 +181,7 @@ pre-configure:
 	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
 
 post-build:
-	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
+	@${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

Modified: head/lang/php55/Makefile.ext
==============================================================================
--- head/lang/php5/Makefile.ext	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/lang/php55/Makefile.ext	Mon Jun 24 14:32:11 2013	(r321684)
@@ -3,8 +3,8 @@ COMMENT=	The ${PHP_MODNAME} shared exten
 USE_PHP=	yes
 USE_PHPEXT=	yes
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
-DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=4 52
+DEFAULT_PHP_VER=55
+IGNORE_WITH_PHP=52 53 54 5
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}

Modified: head/lang/php55/distinfo
==============================================================================
--- head/lang/php5/distinfo	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/lang/php55/distinfo	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,4 +1,4 @@
-SHA256 (php-5.4.16.tar.bz2) = 3ec25fb5c260b3b512a5079ad1674fa6aea9c3bd79623bf307ee643f6fcdc236
-SIZE (php-5.4.16.tar.bz2) = 11690340
-SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
-SIZE (php-5.4.x-mail-header.patch) = 3379
+SHA256 (php-5.5.0.tar.bz2) = 29bb5ea45256f3983fab95af1f18d76dcc045565b2f175f11817069cefcf6cd1
+SIZE (php-5.5.0.tar.bz2) = 12256814
+SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4
+SIZE (php-5.5.x-mail-header.patch) = 3379

Modified: head/lang/php55/pkg-plist
==============================================================================
--- head/lang/php5/pkg-plist	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/lang/php55/pkg-plist	Mon Jun 24 14:32:11 2013	(r321684)
@@ -37,6 +37,7 @@ 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
@@ -164,6 +165,7 @@ 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
@@ -187,7 +189,6 @@ include/php/ext/standard/winver.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
 include/php/main/fopen_wrappers.h
-include/php/main/logos.h
 include/php/main/php.h
 include/php/main/php_compat.h
 include/php/main/php_config.h
@@ -195,7 +196,6 @@ 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_logos.h
 include/php/main/php_main.h
 include/php/main/php_memory_streams.h
 include/php/main/php_network.h

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/mail/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -484,6 +484,7 @@
     SUBDIR += php5-imap
     SUBDIR += php52-imap
     SUBDIR += php53-imap
+    SUBDIR += php55-imap
     SUBDIR += phplist
     SUBDIR += phpmailer
     SUBDIR += phpmailer2

Modified: head/mail/php55-imap/Makefile
==============================================================================
--- head/mail/php5-imap/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/mail/php55-imap/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-imap
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	mail
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-imap
 

Modified: head/math/Makefile
==============================================================================
--- head/math/Makefile	Mon Jun 24 13:56:07 2013	(r321683)
+++ head/math/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -522,9 +522,11 @@
     SUBDIR += php5-bcmath
     SUBDIR += php5-gmp
     SUBDIR += php52-bcmath
-    SUBDIR += php53-gmp
-    SUBDIR += php53-bcmath
     SUBDIR += php52-gmp
+    SUBDIR += php53-bcmath
+    SUBDIR += php53-gmp
+    SUBDIR += php55-bcmath
+    SUBDIR += php55-gmp
     SUBDIR += physcalc
     SUBDIR += plman
     SUBDIR += ploticus

Modified: head/math/php55-bcmath/Makefile
==============================================================================
--- head/math/php5-bcmath/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/math/php55-bcmath/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-bcmath
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	math
 
-MASTERDIR=	${.CURDIR}/../../lang/php5
+MASTERDIR=	${.CURDIR}/../../lang/php55
 
 PKGNAMESUFFIX=	-bcmath
 

Modified: head/math/php55-gmp/Makefile
==============================================================================
--- head/math/php5-gmp/Makefile	Mon Jun 24 07:36:22 2013	(r321671)
+++ head/math/php55-gmp/Makefile	Mon Jun 24 14:32:11 2013	(r321684)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	php5-gmp
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306241432.r5OEWCOj016074>