summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/php5-pgsql/files/patch-pgsql.c19
-rw-r--r--lang/php5/Makefile2
-rw-r--r--lang/php5/distinfo4
3 files changed, 3 insertions, 22 deletions
diff --git a/databases/php5-pgsql/files/patch-pgsql.c b/databases/php5-pgsql/files/patch-pgsql.c
index a4abfc39dff3..667bb89ded7c 100644
--- a/databases/php5-pgsql/files/patch-pgsql.c
+++ b/databases/php5-pgsql/files/patch-pgsql.c
@@ -1,24 +1,5 @@
--- pgsql.c.orig 2010-01-03 10:23:27.000000000 +0100
+++ pgsql.c 2010-03-08 11:00:26.000000000 +0100
-@@ -63,6 +63,7 @@
- #define PGSQL_MAX_LENGTH_OF_LONG 30
- #define PGSQL_MAX_LENGTH_OF_DOUBLE 60
-
-+#if UINT_MAX > LONG_MAX
- #define PGSQL_RETURN_OID(oid) do { \
- if (oid > LONG_MAX) { \
- smart_str s = {0}; \
-@@ -72,7 +73,9 @@
- } \
- RETURN_LONG((long)oid); \
- } while(0)
--
-+#else
-+#define PGSQL_RETURN_OID(oid) RETURN_LONG((long)oid)
-+#endif
-
- #if HAVE_PQSETNONBLOCKING
- #define PQ_SETNONBLOCKING(pg_link, flag) PQsetnonblocking(pg_link, flag)
@@ -728,7 +731,7 @@
static int le_link, le_plink, le_result, le_lofp, le_string;
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index e0a0ab58ca2a..6ced2a4b10f5 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= php5
-PORTVERSION= 5.4.19
+PORTVERSION= 5.4.20
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index fa64be9013b9..17852ceb1954 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,4 +1,4 @@
-SHA256 (php-5.4.19.tar.bz2) = 7a565360e64c5be5102ef948e7c732778a40850e709270e64be7a3a3207c029b
-SIZE (php-5.4.19.tar.bz2) = 11692563
+SHA256 (php-5.4.20.tar.bz2) = cd0e42cf8b01b2fe23d5acbb30e04d64e8df21b0b4093e28aef36743646759e1
+SIZE (php-5.4.20.tar.bz2) = 11700446
SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
SIZE (php-5.4.x-mail-header.patch) = 3379