svn commit: r323097 - in head: databases/php5-pdo_dblib/files lang/php5

[Alex Dupre]

Author: ale
Date: Tue Jul 16 06:47:02 2013
New Revision: 323097
URL: http://svnweb.freebsd.org/changeset/ports/323097

Log:
  Update to 5.4.17 release.
  
  PR:		ports/180527
  Submitted by:	Rustem Alimov <rustem.alimov at gmail.com>

Added:
  head/databases/php5-pdo_dblib/files/
  head/databases/php5-pdo_dblib/files/patch-dblib_driver.c   (contents, props changed)
Modified:
  head/lang/php5/Makefile
  head/lang/php5/Makefile.ext
  head/lang/php5/distinfo

Added: head/databases/php5-pdo_dblib/files/patch-dblib_driver.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/php5-pdo_dblib/files/patch-dblib_driver.c	Tue Jul 16 06:47:02 2013	(r323097)
@@ -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/lang/php5/Makefile
==============================================================================
--- head/lang/php5/Makefile	Tue Jul 16 06:30:29 2013	(r323096)
+++ head/lang/php5/Makefile	Tue Jul 16 06:47:02 2013	(r323097)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	php5
-PORTVERSION=	5.4.16
+PORTVERSION=	5.4.17
 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* php55-5*
 
 MAN1=		php-config.1 phpize.1
 

Modified: head/lang/php5/Makefile.ext
==============================================================================
--- head/lang/php5/Makefile.ext	Tue Jul 16 06:30:29 2013	(r323096)
+++ head/lang/php5/Makefile.ext	Tue Jul 16 06:47:02 2013	(r323097)
@@ -4,7 +4,7 @@ USE_PHP=	yes
 USE_PHPEXT=	yes
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=4 52
+IGNORE_WITH_PHP=52 53 55
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}

Modified: head/lang/php5/distinfo
==============================================================================
--- head/lang/php5/distinfo	Tue Jul 16 06:30:29 2013	(r323096)
+++ head/lang/php5/distinfo	Tue Jul 16 06:47:02 2013	(r323097)
@@ -1,4 +1,4 @@
-SHA256 (php-5.4.16.tar.bz2) = 3ec25fb5c260b3b512a5079ad1674fa6aea9c3bd79623bf307ee643f6fcdc236
-SIZE (php-5.4.16.tar.bz2) = 11690340
+SHA256 (php-5.4.17.tar.bz2) = dc49935387a5d1f6ac798a3bb4902ca5020f3aa74117ea848b58d1bb61327eb4
+SIZE (php-5.4.17.tar.bz2) = 11697434
 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
 SIZE (php-5.4.x-mail-header.patch) = 3379