aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2013-07-16 14:47:02 +0800
committerale <ale@FreeBSD.org>2013-07-16 14:47:02 +0800
commit9be3936613bf3d5b222c6f2c88ac37f8d0d5670b (patch)
tree37ffc9f21372c7a2d802c2da8933e4caa0ecac6d
parent0e5ca134db5acaa54d247fc6bea75dd901f74d90 (diff)
downloadfreebsd-ports-gnome-9be3936613bf3d5b222c6f2c88ac37f8d0d5670b.tar.gz
freebsd-ports-gnome-9be3936613bf3d5b222c6f2c88ac37f8d0d5670b.tar.zst
freebsd-ports-gnome-9be3936613bf3d5b222c6f2c88ac37f8d0d5670b.zip
Update to 5.4.17 release.
PR: ports/180527 Submitted by: Rustem Alimov <rustem.alimov@gmail.com>
-rw-r--r--databases/php5-pdo_dblib/files/patch-dblib_driver.c15
-rw-r--r--lang/php5/Makefile4
-rw-r--r--lang/php5/Makefile.ext2
-rw-r--r--lang/php5/distinfo4
4 files changed, 20 insertions, 5 deletions
diff --git a/databases/php5-pdo_dblib/files/patch-dblib_driver.c b/databases/php5-pdo_dblib/files/patch-dblib_driver.c
new file mode 100644
index 000000000000..a167784e9067
--- /dev/null
+++ b/databases/php5-pdo_dblib/files/patch-dblib_driver.c
@@ -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 */
+
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 513100abd4c2..599157c20d96 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -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
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 2a32a40b9cef..f044b0794128 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -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}
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 05dc555d57fa..679a8d5ba4fc 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -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