summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/php53/Makefile.common4
-rw-r--r--lang/php53/Makefile.php4
-rw-r--r--lang/php53/distinfo10
-rw-r--r--lang/php53/patches/patch-aj6
4 files changed, 13 insertions, 11 deletions
diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common
index 7b7459902b1..bf44d19752d 100644
--- a/lang/php53/Makefile.common
+++ b/lang/php53/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2012/06/16 01:27:24 taca Exp $
+# $NetBSD: Makefile.common,v 1.15 2012/07/20 12:28:17 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.14
+PHP_BASE_VERS= 5.3.15
PHP_EXTENSION_DIR= lib/php/20090630
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php
index 030b093d484..1fd5b7c1a80 100644
--- a/lang/php53/Makefile.php
+++ b/lang/php53/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.18 2012/06/16 01:27:24 taca Exp $
+# $NetBSD: Makefile.php,v 1.19 2012/07/20 12:28:17 taca Exp $
# used by lang/php53/Makefile
# used by www/ap-php/Makefile
@@ -58,7 +58,7 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl
.if !empty(PKG_OPTIONS:Msuhosin)
SUHOSIN_PHPVER= 5.3.9
-. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.14
+. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.15
PKG_FAIL_REASON+= "The suhosin patch is currently not available for"
PKG_FAIL_REASON+= "this version of PHP. You may have to wait until"
PKG_FAIL_REASON+= "an updated patch is released or temporarily"
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 14ffed15a35..c38a751a2f0 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2012/06/16 01:27:24 taca Exp $
+$NetBSD: distinfo,v 1.46 2012/07/20 12:28:17 taca Exp $
-SHA1 (php-5.3.14.tar.bz2) = 71f3840395eb35f730d8dd255513e4ebdae4b1b0
-RMD160 (php-5.3.14.tar.bz2) = 07a798ee7f8ce1818be09e7aee0f6014160145f9
-Size (php-5.3.14.tar.bz2) = 11408016 bytes
+SHA1 (php-5.3.15.tar.bz2) = 05cf819352062ea3fbcccd3f15aa02c8c3f87440
+RMD160 (php-5.3.15.tar.bz2) = b82b9f57c4bdc3b451a0c179f131497ebbbfd94f
+Size (php-5.3.15.tar.bz2) = 11307865 bytes
SHA1 (suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed
RMD160 (suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22
Size (suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes
@@ -15,7 +15,7 @@ SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc
SHA1 (patch-ag) = c49cdff097d1e54ebe93b5afb550e89b0cc2468e
SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83
SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
-SHA1 (patch-aj) = d611d13fcc28c5d2b9e9586832ce4b8ae5707b48
+SHA1 (patch-aj) = 8698b3caa6299843c7483473b0cb18ceffa3dada
SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
SHA1 (patch-ext_standard_basic__functions.c) = 18596d281017760293189d87d19de9c5c772232d
SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad
diff --git a/lang/php53/patches/patch-aj b/lang/php53/patches/patch-aj
index 78e0e9d815f..a1064d09fe6 100644
--- a/lang/php53/patches/patch-aj
+++ b/lang/php53/patches/patch-aj
@@ -1,9 +1,11 @@
-$NetBSD: patch-aj,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+$NetBSD: patch-aj,v 1.2 2012/07/20 12:28:18 taca Exp $
+
+Use proper shbang line.
--- run-tests.php.orig 2010-01-03 09:23:27.000000000 +0000
+++ run-tests.php
@@ -1,4 +1,4 @@
--#!/usr/bin/php
+-#!/usr/bin/env php
+#!@PREFIX@/bin/php
<?php
/*