diff options
| -rw-r--r-- | lang/php53/Makefile | 3 | ||||
| -rw-r--r-- | lang/php53/Makefile.common | 4 | ||||
| -rw-r--r-- | lang/php53/distinfo | 13 | ||||
| -rw-r--r-- | lang/php53/patches/patch-ab | 38 |
4 files changed, 27 insertions, 31 deletions
diff --git a/lang/php53/Makefile b/lang/php53/Makefile index e55371955c0..09a6e487d86 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2013/02/28 21:28:20 imil Exp $ +# $NetBSD: Makefile,v 1.39 2013/03/16 01:58:17 taca Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. # PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 1 CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common index 8fd59c6a346..bfa47fdca62 100644 --- a/lang/php53/Makefile.common +++ b/lang/php53/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2013/02/22 03:06:16 taca Exp $ +# $NetBSD: Makefile.common,v 1.23 2013/03/16 01:58:18 taca Exp $ # used by lang/php53/Makefile.php # used by lang/php/ext.mk # used by meta-pkgs/php53-extensions/Makefile @@ -38,7 +38,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.3.22 +PHP_BASE_VERS= 5.3.23 PHP_EXTENSION_DIR= lib/php/20090630 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} diff --git a/lang/php53/distinfo b/lang/php53/distinfo index 4c0da4bcf3d..0223f0c4416 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,13 +1,10 @@ -$NetBSD: distinfo,v 1.59 2013/02/28 21:28:20 imil Exp $ +$NetBSD: distinfo,v 1.60 2013/03/16 01:58:18 taca Exp $ -SHA1 (php-5.3.22.tar.bz2) = 8a0948040d70bd7ebf1f3001c4462649b43d5ab0 -RMD160 (php-5.3.22.tar.bz2) = dc51c94f4201aeb3bef03df8d1def780a1ab60f5 -Size (php-5.3.22.tar.bz2) = 11366482 bytes -SHA1 (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 7df6bb0f39fe4111a96a7d6ce694f954f1796c48 -RMD160 (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 4f2039676592c94fd923cdf7a35255d663ab56df -Size (suhosin-patch-5.3.21-0.9.10.patch.bz2) = 33131 bytes +SHA1 (php-5.3.23.tar.bz2) = fe9d84ada4747629f31051f9c689629261558056 +RMD160 (php-5.3.23.tar.bz2) = a537ed70a94ebbc8c1ee12a897f2f78b98a1dee4 +Size (php-5.3.23.tar.bz2) = 11410987 bytes SHA1 (patch-aa) = b0dc6cd0b2103d5858280202506b33322a98496e -SHA1 (patch-ab) = d08bb50cf074a6065ef0d1d67a713b7573cb2f5b +SHA1 (patch-ab) = 718248326c74ffa8a0f7df47b641fed39b838ba1 SHA1 (patch-ac) = b6eb40116f3770464120b6ea9061624609b9564e SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881 SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56 diff --git a/lang/php53/patches/patch-ab b/lang/php53/patches/patch-ab index 1c608c0167e..27af5cf52ca 100644 --- a/lang/php53/patches/patch-ab +++ b/lang/php53/patches/patch-ab @@ -1,62 +1,62 @@ -$NetBSD: patch-ab,v 1.4 2011/03/19 07:01:19 taca Exp $ +$NetBSD: patch-ab,v 1.5 2013/03/16 01:58:18 taca Exp $ ---- configure.orig 2011-03-17 07:55:56.000000000 +0000 +--- configure.orig 2013-03-14 17:17:01.000000000 +0000 +++ configure -@@ -13699,7 +13699,7 @@ EOF +@@ -17392,7 +17392,7 @@ echo "${ECHO_T}no" >&6 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" - + if test "$PHP_SAPI" != "default"; then - { echo "configure: error: -@@ -22963,7 +22963,7 @@ fi + { { echo "$as_me:$LINENO: error: +@@ -33475,7 +33475,7 @@ echo "$as_me: error: OpenSSL version 0.9 if test "$found_openssl" = "no"; then - + if test "$PHP_OPENSSL_DIR" = "yes"; then - PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" + PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" fi for i in $PHP_OPENSSL_DIR; do -@@ -24930,7 +24930,7 @@ echo "configure:24910: checking bundled +@@ -35650,7 +35650,7 @@ echo "${ECHO_T}yes" >&6 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" - - + + - for header_file in ext/sqlite3/libsqlite/sqlite3.h; do + for header_file; do - - + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -35788,7 +35788,7 @@ fi +@@ -47718,7 +47718,7 @@ echo "$as_me: error: OpenSSL version 0.9 if test "$found_openssl" = "no"; then - + if test "$PHP_OPENSSL_DIR" = "yes"; then - PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" + PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" fi for i in $PHP_OPENSSL_DIR; do -@@ -49814,7 +49814,7 @@ fi +@@ -65336,7 +65336,7 @@ echo "$as_me: error: OpenSSL version 0.9 if test "$found_openssl" = "no"; then - + if test "$PHP_OPENSSL_DIR" = "yes"; then - PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" + PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" fi for i in $PHP_OPENSSL_DIR; do -@@ -83901,7 +83901,7 @@ fi +@@ -106941,7 +106941,7 @@ echo "$as_me: error: OpenSSL version 0.9 if test "$found_openssl" = "no"; then - + if test "$PHP_OPENSSL_DIR" = "yes"; then - PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" + PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /" fi for i in $PHP_OPENSSL_DIR; do -@@ -107041,12 +107041,7 @@ old_CC=$CC +@@ -138087,12 +138087,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" |