diff options
Diffstat (limited to 'lang/php53')
| -rw-r--r-- | lang/php53/Makefile.common | 4 | ||||
| -rw-r--r-- | lang/php53/distinfo | 13 | ||||
| -rw-r--r-- | lang/php53/patches/patch-ab | 24 |
3 files changed, 19 insertions, 22 deletions
diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common index 20440975e68..85934e5e9df 100644 --- a/lang/php53/Makefile.common +++ b/lang/php53/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2010/07/24 22:23:37 tron Exp $ +# $NetBSD: Makefile.common,v 1.2.2.1 2010/12/23 10:10:54 sbd Exp $ # used by lang/php53/Makefile.php # used by lang/php/ext.mk # used by meta-pkgs/php53-extensions/Makefile @@ -39,7 +39,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.3.3 +PHP_BASE_VERS= 5.3.4 PHP_EXTENSION_DIR= lib/php/20090630 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} diff --git a/lang/php53/distinfo b/lang/php53/distinfo index 4995e348c53..64311fce55b 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,13 +1,10 @@ -$NetBSD: distinfo,v 1.6 2010/07/24 22:23:37 tron Exp $ +$NetBSD: distinfo,v 1.6.2.1 2010/12/23 10:10:54 sbd Exp $ -SHA1 (php-5.3.3/php-5.3.3.tar.bz2) = 9f66716b341119e4e4f8fe3d81b7d0a5daf3cbc8 -RMD160 (php-5.3.3/php-5.3.3.tar.bz2) = 9edb51663feac9b787f8382012893f1ac98fec6a -Size (php-5.3.3/php-5.3.3.tar.bz2) = 10662227 bytes -SHA1 (php-5.3.3/suhosin-patch-5.3.3-0.9.10.patch.gz) = 76675242cfdeff763767900213346af622002490 -RMD160 (php-5.3.3/suhosin-patch-5.3.3-0.9.10.patch.gz) = 8dcd8b51ea0357b6cc51e70e495e18f341c62f7c -Size (php-5.3.3/suhosin-patch-5.3.3-0.9.10.patch.gz) = 41298 bytes +SHA1 (php-5.3.4/php-5.3.4.tar.bz2) = 0b33926e78e1683e3383b3b5c840ee60ba669b0b +RMD160 (php-5.3.4/php-5.3.4.tar.bz2) = dffbeced87117fd34c948de3ebdde01a25c24dae +Size (php-5.3.4/php-5.3.4.tar.bz2) = 10804376 bytes SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09 -SHA1 (patch-ab) = 8ac388f50afc03f3f4eacbfed42ae295a2e8d700 +SHA1 (patch-ab) = 7aeb5148056e7f0b150388c4cf60a139f6aeec44 SHA1 (patch-ac) = a896371d3343c07a5cf46c79d9ca9e1b2164797a SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881 SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56 diff --git a/lang/php53/patches/patch-ab b/lang/php53/patches/patch-ab index ad8856baaaf..66735d6c9e2 100644 --- a/lang/php53/patches/patch-ab +++ b/lang/php53/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $ +$NetBSD: patch-ab,v 1.2.2.1 2010/12/23 10:10:54 sbd Exp $ ---- configure.orig 2010-07-24 22:35:41.000000000 +0100 -+++ configure 2010-07-24 22:39:23.000000000 +0100 -@@ -13778,7 +13778,7 @@ +--- configure.orig 2010-12-08 21:46:58.000000000 +0000 ++++ configure +@@ -13699,7 +13699,7 @@ EOF PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH" - INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" + INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php" - PHP_SAPI=cgi - -@@ -23206,7 +23206,7 @@ + if test "$PHP_SAPI" != "default"; then + { echo "configure: error: +@@ -22963,7 +22963,7 @@ fi if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $ fi for i in $PHP_OPENSSL_DIR; do -@@ -25179,7 +25179,7 @@ +@@ -24930,7 +24930,7 @@ echo "configure:24910: checking bundled PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" @@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -36124,7 +36124,7 @@ +@@ -35788,7 +35788,7 @@ fi if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then @@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $ fi for i in $PHP_OPENSSL_DIR; do -@@ -50201,7 +50201,7 @@ +@@ -49814,7 +49814,7 @@ fi if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then @@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $ fi for i in $PHP_OPENSSL_DIR; do -@@ -84421,7 +84421,7 @@ +@@ -83900,7 +83900,7 @@ fi if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then @@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.2 2010/07/24 22:23:37 tron Exp $ fi for i in $PHP_OPENSSL_DIR; do -@@ -107682,12 +107682,7 @@ +@@ -107040,12 +107040,7 @@ old_CC=$CC if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" |