diff options
author | ale <ale@FreeBSD.org> | 2009-09-22 18:36:31 +0800 |
---|---|---|
committer | ale <ale@FreeBSD.org> | 2009-09-22 18:36:31 +0800 |
commit | f168a87789b122b0690c63d73b50dedacc4780ab (patch) | |
tree | 067b11433c2c8955af99482e01e7db19ee1ffb4c /lang | |
parent | 8d901d8e38ed0f1be38ca2e61da9189082ad2a2c (diff) | |
download | freebsd-ports-gnome-f168a87789b122b0690c63d73b50dedacc4780ab.tar.gz freebsd-ports-gnome-f168a87789b122b0690c63d73b50dedacc4780ab.tar.zst freebsd-ports-gnome-f168a87789b122b0690c63d73b50dedacc4780ab.zip |
Update to 5.2.11 release.
(Do not link to thread library when building a thread-safe only lib)
Feature safe: yes
Diffstat (limited to 'lang')
-rw-r--r-- | lang/php5/Makefile | 8 | ||||
-rw-r--r-- | lang/php5/distinfo | 18 | ||||
-rw-r--r-- | lang/php5/files/patch-TSRM_threads.m4 | 22 | ||||
-rw-r--r-- | lang/php5/files/patch-ext_standard_php_dns.h (renamed from lang/php5/files/patch-ext_standard_dns.h) | 4 | ||||
-rw-r--r-- | lang/php5/files/patch-main_SAPI.c | 20 | ||||
-rw-r--r-- | lang/php5/pkg-plist | 3 | ||||
-rw-r--r-- | lang/php53/Makefile | 8 | ||||
-rw-r--r-- | lang/php53/distinfo | 18 | ||||
-rw-r--r-- | lang/php53/files/patch-TSRM_threads.m4 | 22 | ||||
-rw-r--r-- | lang/php53/files/patch-ext_standard_php_dns.h (renamed from lang/php53/files/patch-ext_standard_dns.h) | 4 | ||||
-rw-r--r-- | lang/php53/files/patch-main_SAPI.c | 20 | ||||
-rw-r--r-- | lang/php53/pkg-plist | 3 |
12 files changed, 54 insertions, 96 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index a30beed57d9f..17a4a59e70f8 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -6,7 +6,7 @@ # PORTNAME= php5 -PORTVERSION= 5.2.10 +PORTVERSION= 5.2.11 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.9-mail-header.patch:mail +PATCHFILES+= php-5.2.10-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail .endif @@ -131,8 +131,8 @@ CONFIGURE_ARGS+=--with-zend-vm=SWITCH CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif -CONFIGURE_ENV+= ac_cv_pthreads_lib=${PTHREAD_LIBS} \ - ac_cv_pthreads_cflags=${PTHREAD_CFLAGS} \ +CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ + ac_cv_pthreads_cflags="" \ pthreads_working="yes" \ lt_cv_path_SED="sed" diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 7711f94ef714..a95c17a66fc1 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,9 +1,9 @@ -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 +MD5 (php-5.2.11.tar.bz2) = 286bf34630f5643c25ebcedfec5e0a09 +SHA256 (php-5.2.11.tar.bz2) = 9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23 +SIZE (php-5.2.11.tar.bz2) = 9030787 +MD5 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 8f9de4d97fae6eba163cf3699509a260 +SHA256 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b +SIZE (suhosin-patch-5.2.11-0.9.7.patch.gz) = 23050 +MD5 (php-5.2.10-mail-header.patch) = 7f73682e78d32e22989c3fb3678d668b +SHA256 (php-5.2.10-mail-header.patch) = a61d50540f4aae32390118453845c380fe935b6d1e46cef6819c8561946e942f +SIZE (php-5.2.10-mail-header.patch) = 3383 diff --git a/lang/php5/files/patch-TSRM_threads.m4 b/lang/php5/files/patch-TSRM_threads.m4 index 6208eac7f79c..227f6d26c9d5 100644 --- a/lang/php5/files/patch-TSRM_threads.m4 +++ b/lang/php5/files/patch-TSRM_threads.m4 @@ -1,11 +1,11 @@ ---- TSRM/threads.m4.orig Wed Apr 27 15:22:18 2005 -+++ TSRM/threads.m4 Wed May 3 10:02:34 2006 -@@ -164,7 +164,7 @@ - dnl - AC_DEFUN([PTHREADS_ASSIGN_VARS],[ - if test -n "$ac_cv_pthreads_lib"; then -- LIBS="$LIBS -l$ac_cv_pthreads_lib" -+ LIBS="$LIBS $ac_cv_pthreads_lib" - fi - - if test -n "$ac_cv_pthreads_cflags"; then +--- TSRM/threads.m4.orig 2005-04-27 15:22:18.000000000 +0200 ++++ TSRM/threads.m4 2009-09-22 10:01:37.000000000 +0200 +@@ -79,7 +79,7 @@ + pthread_mutexattr_t mattr; + int data = 1; + pthread_mutexattr_init(&mattr); +- return pthread_create(&thd, NULL, thread_routine, &data); ++ return 0; + } ], [ + pthreads_working=yes + ], [ diff --git a/lang/php5/files/patch-ext_standard_dns.h b/lang/php5/files/patch-ext_standard_php_dns.h index 1ea8751970c8..8ab9e9c01d38 100644 --- a/lang/php5/files/patch-ext_standard_dns.h +++ b/lang/php5/files/patch-ext_standard_php_dns.h @@ -1,5 +1,5 @@ ---- ext/standard/dns.h.orig Sun Jun 19 11:57:31 2005 -+++ ext/standard/dns.h Sun Jun 19 12:03:37 2005 +--- ext/standard/php_dns.h.orig Sun Jun 19 11:57:31 2005 ++++ ext/standard/php_dns.h Sun Jun 19 12:03:37 2005 @@ -25,6 +25,10 @@ #if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME diff --git a/lang/php5/files/patch-main_SAPI.c b/lang/php5/files/patch-main_SAPI.c deleted file mode 100644 index e257bfeb5bee..000000000000 --- a/lang/php5/files/patch-main_SAPI.c +++ /dev/null @@ -1,20 +0,0 @@ ---- main/SAPI.c.orig 2007-05-25 11:20:01.000000000 +0200 -+++ main/SAPI.c 2008-02-01 23:48:51.000000000 +0100 -@@ -604,7 +606,7 @@ - ptr++; - len--; - } --#if HAVE_ZLIB -+#if 1 - if(!strncmp(ptr, "image/", sizeof("image/")-1)) { - zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); - } -@@ -758,7 +760,7 @@ - return SUCCESS; - } - --#if HAVE_ZLIB -+#if 1 - /* Add output compression headers at this late stage in order to make - it possible to switch it off inside the script. */ - diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist index 17c9fdaaf18f..d5d252f247f7 100644 --- a/lang/php5/pkg-plist +++ b/lang/php5/pkg-plist @@ -82,7 +82,6 @@ include/php/ext/standard/css.h include/php/ext/standard/cyr_convert.h include/php/ext/standard/datetime.h include/php/ext/standard/dl.h -include/php/ext/standard/dns.h include/php/ext/standard/exec.h include/php/ext/standard/file.h include/php/ext/standard/flock_compat.h @@ -99,6 +98,7 @@ include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h include/php/ext/standard/php_crypt.h include/php/ext/standard/php_dir.h +include/php/ext/standard/php_dns.h include/php/ext/standard/php_ext_syslog.h include/php/ext/standard/php_filestat.h include/php/ext/standard/php_fopen_wrappers.h @@ -129,7 +129,6 @@ include/php/ext/standard/sha1.h include/php/ext/standard/streamsfuncs.h include/php/ext/standard/uniqid.h include/php/ext/standard/url.h -include/php/ext/standard/url_scanner.h include/php/ext/standard/url_scanner_ex.h @exec touch %D/include/php/ext/php_config.h @unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h diff --git a/lang/php53/Makefile b/lang/php53/Makefile index a30beed57d9f..17a4a59e70f8 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -6,7 +6,7 @@ # PORTNAME= php5 -PORTVERSION= 5.2.10 +PORTVERSION= 5.2.11 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.9-mail-header.patch:mail +PATCHFILES+= php-5.2.10-mail-header.patch:mail PATCH_SITES+= http://choon.net/opensource/php/:mail .endif @@ -131,8 +131,8 @@ CONFIGURE_ARGS+=--with-zend-vm=SWITCH CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif -CONFIGURE_ENV+= ac_cv_pthreads_lib=${PTHREAD_LIBS} \ - ac_cv_pthreads_cflags=${PTHREAD_CFLAGS} \ +CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ + ac_cv_pthreads_cflags="" \ pthreads_working="yes" \ lt_cv_path_SED="sed" diff --git a/lang/php53/distinfo b/lang/php53/distinfo index 7711f94ef714..a95c17a66fc1 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,9 +1,9 @@ -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 +MD5 (php-5.2.11.tar.bz2) = 286bf34630f5643c25ebcedfec5e0a09 +SHA256 (php-5.2.11.tar.bz2) = 9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23 +SIZE (php-5.2.11.tar.bz2) = 9030787 +MD5 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 8f9de4d97fae6eba163cf3699509a260 +SHA256 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b +SIZE (suhosin-patch-5.2.11-0.9.7.patch.gz) = 23050 +MD5 (php-5.2.10-mail-header.patch) = 7f73682e78d32e22989c3fb3678d668b +SHA256 (php-5.2.10-mail-header.patch) = a61d50540f4aae32390118453845c380fe935b6d1e46cef6819c8561946e942f +SIZE (php-5.2.10-mail-header.patch) = 3383 diff --git a/lang/php53/files/patch-TSRM_threads.m4 b/lang/php53/files/patch-TSRM_threads.m4 index 6208eac7f79c..227f6d26c9d5 100644 --- a/lang/php53/files/patch-TSRM_threads.m4 +++ b/lang/php53/files/patch-TSRM_threads.m4 @@ -1,11 +1,11 @@ ---- TSRM/threads.m4.orig Wed Apr 27 15:22:18 2005 -+++ TSRM/threads.m4 Wed May 3 10:02:34 2006 -@@ -164,7 +164,7 @@ - dnl - AC_DEFUN([PTHREADS_ASSIGN_VARS],[ - if test -n "$ac_cv_pthreads_lib"; then -- LIBS="$LIBS -l$ac_cv_pthreads_lib" -+ LIBS="$LIBS $ac_cv_pthreads_lib" - fi - - if test -n "$ac_cv_pthreads_cflags"; then +--- TSRM/threads.m4.orig 2005-04-27 15:22:18.000000000 +0200 ++++ TSRM/threads.m4 2009-09-22 10:01:37.000000000 +0200 +@@ -79,7 +79,7 @@ + pthread_mutexattr_t mattr; + int data = 1; + pthread_mutexattr_init(&mattr); +- return pthread_create(&thd, NULL, thread_routine, &data); ++ return 0; + } ], [ + pthreads_working=yes + ], [ diff --git a/lang/php53/files/patch-ext_standard_dns.h b/lang/php53/files/patch-ext_standard_php_dns.h index 1ea8751970c8..8ab9e9c01d38 100644 --- a/lang/php53/files/patch-ext_standard_dns.h +++ b/lang/php53/files/patch-ext_standard_php_dns.h @@ -1,5 +1,5 @@ ---- ext/standard/dns.h.orig Sun Jun 19 11:57:31 2005 -+++ ext/standard/dns.h Sun Jun 19 12:03:37 2005 +--- ext/standard/php_dns.h.orig Sun Jun 19 11:57:31 2005 ++++ ext/standard/php_dns.h Sun Jun 19 12:03:37 2005 @@ -25,6 +25,10 @@ #if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME diff --git a/lang/php53/files/patch-main_SAPI.c b/lang/php53/files/patch-main_SAPI.c deleted file mode 100644 index e257bfeb5bee..000000000000 --- a/lang/php53/files/patch-main_SAPI.c +++ /dev/null @@ -1,20 +0,0 @@ ---- main/SAPI.c.orig 2007-05-25 11:20:01.000000000 +0200 -+++ main/SAPI.c 2008-02-01 23:48:51.000000000 +0100 -@@ -604,7 +606,7 @@ - ptr++; - len--; - } --#if HAVE_ZLIB -+#if 1 - if(!strncmp(ptr, "image/", sizeof("image/")-1)) { - zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); - } -@@ -758,7 +760,7 @@ - return SUCCESS; - } - --#if HAVE_ZLIB -+#if 1 - /* Add output compression headers at this late stage in order to make - it possible to switch it off inside the script. */ - diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist index 17c9fdaaf18f..d5d252f247f7 100644 --- a/lang/php53/pkg-plist +++ b/lang/php53/pkg-plist @@ -82,7 +82,6 @@ include/php/ext/standard/css.h include/php/ext/standard/cyr_convert.h include/php/ext/standard/datetime.h include/php/ext/standard/dl.h -include/php/ext/standard/dns.h include/php/ext/standard/exec.h include/php/ext/standard/file.h include/php/ext/standard/flock_compat.h @@ -99,6 +98,7 @@ include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h include/php/ext/standard/php_crypt.h include/php/ext/standard/php_dir.h +include/php/ext/standard/php_dns.h include/php/ext/standard/php_ext_syslog.h include/php/ext/standard/php_filestat.h include/php/ext/standard/php_fopen_wrappers.h @@ -129,7 +129,6 @@ include/php/ext/standard/sha1.h include/php/ext/standard/streamsfuncs.h include/php/ext/standard/uniqid.h include/php/ext/standard/url.h -include/php/ext/standard/url_scanner.h include/php/ext/standard/url_scanner_ex.h @exec touch %D/include/php/ext/php_config.h @unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h |