summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2009-06-25 06:25:45 +0000
committerAlex Dupre <ale@FreeBSD.org>2009-06-25 06:25:45 +0000
commit0290ecb2800014dd45b87569b3953957d36416f4 (patch)
tree0c431052a8e100aa5eafe635e223c2a1f0169d1b /lang
parent- Update to 2.0.1 (diff)
Update to 5.2.10 release.
Notes
Notes: svn path=/head/; revision=236607
Diffstat (limited to 'lang')
-rw-r--r--lang/php5/Makefile4
-rw-r--r--lang/php5/distinfo18
-rw-r--r--lang/php5/files/patch-acinclude.m427
-rw-r--r--lang/php53/Makefile4
-rw-r--r--lang/php53/distinfo18
-rw-r--r--lang/php53/files/patch-acinclude.m427
6 files changed, 52 insertions, 46 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 5fd42b39dd0a..a30beed57d9f 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= php5
-PORTVERSION= 5.2.9
+PORTVERSION= 5.2.10
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
@@ -65,7 +65,7 @@ PLIST_SUB+= SUHOSIN="@comment "
.if defined(WITH_MAILHEAD)
#PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
-PATCHFILES+= php-5.2.8-mail-header.patch:mail
+PATCHFILES+= php-5.2.9-mail-header.patch:mail
PATCH_SITES+= http://choon.net/opensource/php/:mail
.endif
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index ad3bf3f65ac9..7711f94ef714 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,9 +1,9 @@
-MD5 (php-5.2.9.tar.bz2) = 280d6cda7f72a4fc6de42fda21ac2db7
-SHA256 (php-5.2.9.tar.bz2) = 30166dda7c3d8bdcb2753ab79260be25454cdf3673d681b7651f8d32006ee2a6
-SIZE (php-5.2.9.tar.bz2) = 10203122
-MD5 (suhosin-patch-5.2.9-0.9.7.patch.gz) = f80dbcd2773a98da1dab0c73c3654895
-SHA256 (suhosin-patch-5.2.9-0.9.7.patch.gz) = 6f7a86cff1cdd1007ba248292f6adfe3b7c01adfed56c2e937c87c60210bbc38
-SIZE (suhosin-patch-5.2.9-0.9.7.patch.gz) = 23026
-MD5 (php-5.2.8-mail-header.patch) = 74bf3a2a123c284f908c4f5483ebe886
-SHA256 (php-5.2.8-mail-header.patch) = 9bd306145153a371f619d89996cb329bdc36791b22a50daf4afe7cc69c46dccb
-SIZE (php-5.2.8-mail-header.patch) = 3381
+MD5 (php-5.2.10.tar.bz2) = 15c7b5a87f57332d6fc683528e28247b
+SHA256 (php-5.2.10.tar.bz2) = d45fd9ed292ec429151a195541aa55b5d26c66531bdcdbc33e9c34f625f182ca
+SIZE (php-5.2.10.tar.bz2) = 8808759
+MD5 (suhosin-patch-5.2.10-0.9.7.patch.gz) = 41b475a469eef0eb0e7aa10a820f12b2
+SHA256 (suhosin-patch-5.2.10-0.9.7.patch.gz) = 51d8496172b838c4bbb40f783b535162169b5e218cd6093ecc25cfcfa0c469f8
+SIZE (suhosin-patch-5.2.10-0.9.7.patch.gz) = 23072
+MD5 (php-5.2.9-mail-header.patch) = df72dbeeb3a476e65b7ea0f764541790
+SHA256 (php-5.2.9-mail-header.patch) = 38f643e7064adf31dac37444bc5356cb9bb849413d8ee835fbcf63a2a028e48e
+SIZE (php-5.2.9-mail-header.patch) = 3381
diff --git a/lang/php5/files/patch-acinclude.m4 b/lang/php5/files/patch-acinclude.m4
index 9c4094b8fd82..4f9a9462f947 100644
--- a/lang/php5/files/patch-acinclude.m4
+++ b/lang/php5/files/patch-acinclude.m4
@@ -1,5 +1,5 @@
---- acinclude.m4.orig Mon Apr 10 14:17:36 2006
-+++ acinclude.m4 Thu May 4 08:10:56 2006
+--- acinclude.m4.orig 2009-05-09 22:28:02.000000000 +0200
++++ acinclude.m4 2009-06-25 08:08:05.000000000 +0200
@@ -194,7 +194,7 @@
dnl
dnl which array to append to?
@@ -9,21 +9,24 @@
])
dnl
-@@ -966,12 +966,8 @@
+@@ -968,15 +968,8 @@
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
-- if test "$PHP_SAPI" = "cgi"; then
-- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
-- EXT_STATIC="$EXT_STATIC $1"
-- else
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
-- fi
-+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
+- case "$PHP_SAPI" in
+- cgi|embed[)]
+- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+- EXT_STATIC="$EXT_STATIC $1"
+- ;;
+- *[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+- ;;
+- esac
++ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1021,12 +1017,6 @@
+@@ -1026,12 +1019,6 @@
build to be successful.
])
fi
@@ -36,7 +39,7 @@
dnl Some systems require that we link $2 to $1 when building
])
-@@ -2158,9 +2148,9 @@
+@@ -2303,9 +2290,9 @@
test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
dnl Fallbacks for different configure options
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 5fd42b39dd0a..a30beed57d9f 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= php5
-PORTVERSION= 5.2.9
+PORTVERSION= 5.2.10
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP}
@@ -65,7 +65,7 @@ PLIST_SUB+= SUHOSIN="@comment "
.if defined(WITH_MAILHEAD)
#PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
-PATCHFILES+= php-5.2.8-mail-header.patch:mail
+PATCHFILES+= php-5.2.9-mail-header.patch:mail
PATCH_SITES+= http://choon.net/opensource/php/:mail
.endif
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index ad3bf3f65ac9..7711f94ef714 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,9 +1,9 @@
-MD5 (php-5.2.9.tar.bz2) = 280d6cda7f72a4fc6de42fda21ac2db7
-SHA256 (php-5.2.9.tar.bz2) = 30166dda7c3d8bdcb2753ab79260be25454cdf3673d681b7651f8d32006ee2a6
-SIZE (php-5.2.9.tar.bz2) = 10203122
-MD5 (suhosin-patch-5.2.9-0.9.7.patch.gz) = f80dbcd2773a98da1dab0c73c3654895
-SHA256 (suhosin-patch-5.2.9-0.9.7.patch.gz) = 6f7a86cff1cdd1007ba248292f6adfe3b7c01adfed56c2e937c87c60210bbc38
-SIZE (suhosin-patch-5.2.9-0.9.7.patch.gz) = 23026
-MD5 (php-5.2.8-mail-header.patch) = 74bf3a2a123c284f908c4f5483ebe886
-SHA256 (php-5.2.8-mail-header.patch) = 9bd306145153a371f619d89996cb329bdc36791b22a50daf4afe7cc69c46dccb
-SIZE (php-5.2.8-mail-header.patch) = 3381
+MD5 (php-5.2.10.tar.bz2) = 15c7b5a87f57332d6fc683528e28247b
+SHA256 (php-5.2.10.tar.bz2) = d45fd9ed292ec429151a195541aa55b5d26c66531bdcdbc33e9c34f625f182ca
+SIZE (php-5.2.10.tar.bz2) = 8808759
+MD5 (suhosin-patch-5.2.10-0.9.7.patch.gz) = 41b475a469eef0eb0e7aa10a820f12b2
+SHA256 (suhosin-patch-5.2.10-0.9.7.patch.gz) = 51d8496172b838c4bbb40f783b535162169b5e218cd6093ecc25cfcfa0c469f8
+SIZE (suhosin-patch-5.2.10-0.9.7.patch.gz) = 23072
+MD5 (php-5.2.9-mail-header.patch) = df72dbeeb3a476e65b7ea0f764541790
+SHA256 (php-5.2.9-mail-header.patch) = 38f643e7064adf31dac37444bc5356cb9bb849413d8ee835fbcf63a2a028e48e
+SIZE (php-5.2.9-mail-header.patch) = 3381
diff --git a/lang/php53/files/patch-acinclude.m4 b/lang/php53/files/patch-acinclude.m4
index 9c4094b8fd82..4f9a9462f947 100644
--- a/lang/php53/files/patch-acinclude.m4
+++ b/lang/php53/files/patch-acinclude.m4
@@ -1,5 +1,5 @@
---- acinclude.m4.orig Mon Apr 10 14:17:36 2006
-+++ acinclude.m4 Thu May 4 08:10:56 2006
+--- acinclude.m4.orig 2009-05-09 22:28:02.000000000 +0200
++++ acinclude.m4 2009-06-25 08:08:05.000000000 +0200
@@ -194,7 +194,7 @@
dnl
dnl which array to append to?
@@ -9,21 +9,24 @@
])
dnl
-@@ -966,12 +966,8 @@
+@@ -968,15 +968,8 @@
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
-- if test "$PHP_SAPI" = "cgi"; then
-- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
-- EXT_STATIC="$EXT_STATIC $1"
-- else
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
-- fi
-+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
+- case "$PHP_SAPI" in
+- cgi|embed[)]
+- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+- EXT_STATIC="$EXT_STATIC $1"
+- ;;
+- *[)]
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+- ;;
+- esac
++ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1021,12 +1017,6 @@
+@@ -1026,12 +1019,6 @@
build to be successful.
])
fi
@@ -36,7 +39,7 @@
dnl Some systems require that we link $2 to $1 when building
])
-@@ -2158,9 +2148,9 @@
+@@ -2303,9 +2290,9 @@
test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
dnl Fallbacks for different configure options