From 95064792af5227a490dc2836bfe617eac337197b Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Thu, 18 Apr 2013 08:38:54 +0000
Subject: [PATCH] update to PHP 5.3.24 and switch 5.3 to tar.bz2 distfiles ok
 (and original diff for 5.3.23) william@, maintainer timeout

---
 lang/php/5.2/Makefile | 7 +++++--
 lang/php/5.2/distinfo | 9 ---------
 lang/php/5.3/Makefile | 6 +++---
 lang/php/5.3/distinfo | 8 ++++----
 lang/php/Makefile.inc | 4 ++--
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/lang/php/5.2/Makefile b/lang/php/5.2/Makefile
index 0f53b9187e4..86b9405906f 100644
--- a/lang/php/5.2/Makefile
+++ b/lang/php/5.2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2013/04/14 23:22:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2013/04/18 08:38:54 sthen Exp $
 
 # XXX use the bundled libtool because it needs some specific options we
 # don't have.
@@ -8,8 +8,11 @@ PV=		5.2
 V=		5.2.17
 SUHOSIN_PHPV=	5.2.16
 SUHOSIN_P_V=	0.9.7
+REVISION=	14
 
-REVISION=		14
+# remove if updating; defaulting to tar.bz2 but there's no point
+# fetching new files for 5.2 unless it's updated.
+DISTFILES=	php-${V}.tar.gz
 
 INI_TEMPLATES=	dist recommended
 
diff --git a/lang/php/5.2/distinfo b/lang/php/5.2/distinfo
index c115e5ea8c7..a14784eacb1 100644
--- a/lang/php/5.2/distinfo
+++ b/lang/php/5.2/distinfo
@@ -1,12 +1,3 @@
-MD5 (php-5.2.17.tar.gz) = BNMh1a6506BRIz29JCIO8Q==
-MD5 (suhosin-0.9.33.tgz) = DOSYoCqCgeQnTqjjkMK0hw==
-MD5 (suhosin-patch-5.2.16-0.9.7.patch.gz) = 2BX8maDCXCH13yhVH8uwAQ==
-RMD160 (php-5.2.17.tar.gz) = bEdlNlRfCa/MtAHcNd4vjcxYxRE=
-RMD160 (suhosin-0.9.33.tgz) = nGC2lbIm3cvlVisVdiKHgBI+s3I=
-RMD160 (suhosin-patch-5.2.16-0.9.7.patch.gz) = sotw+vE2s+BMW0g9oPTCJ5N49Do=
-SHA1 (php-5.2.17.tar.gz) = W6fty16hh2hwAcTM27lKxI93+pI=
-SHA1 (suhosin-0.9.33.tgz) = q7MMIuf+NBlVtC7HHtWXxDQ54rg=
-SHA1 (suhosin-patch-5.2.16-0.9.7.patch.gz) = /sELK4FYLQa7DQqW6lXFJa/Iqyk=
 SHA256 (php-5.2.17.tar.gz) = Gr4Hwf3WQYRwijuheavPzKVmKk4NIDfrJ0i3WrxC52c=
 SHA256 (suhosin-0.9.33.tgz) = hlsccrrppacQ/gsHoGNVVs5sg4ZT7DZNKipub1lFKcU=
 SHA256 (suhosin-patch-5.2.16-0.9.7.patch.gz) = quEVoxjYCz8yzt+HbnqOS5Mv67Gwx0PAs5gAPr4SL5E=
diff --git a/lang/php/5.3/Makefile b/lang/php/5.3/Makefile
index 32d1f4a0c65..5dc7d706607 100644
--- a/lang/php/5.3/Makefile
+++ b/lang/php/5.3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2013/03/21 08:33:52 landry Exp $
+# $OpenBSD: Makefile,v 1.50 2013/04/18 08:38:54 sthen Exp $
 
 BROKEN-hppa =	no __sync_bool_compare_and_swap support nor asm fallback
 
@@ -7,8 +7,8 @@ BROKEN-hppa =	no __sync_bool_compare_and_swap support nor asm fallback
 USE_LIBTOOL=	No
 
 PV=		5.3
-V=		${PV}.22
-SUHOSIN_PHPV=	5.3.21
+V=		${PV}.24
+SUHOSIN_PHPV=	5.3.24
 SUHOSIN_P_V=	0.9.10unofficial
 
 INI_TEMPLATES=	development production
diff --git a/lang/php/5.3/distinfo b/lang/php/5.3/distinfo
index ea21287cb0c..5540b3dae06 100644
--- a/lang/php/5.3/distinfo
+++ b/lang/php/5.3/distinfo
@@ -1,6 +1,6 @@
-SHA256 (php-5.3.22.tar.gz) = JVMZQPn+8DYfQonlbRztPKCPRMJRurfiDkGkxElO2c4=
+SHA256 (php-5.3.24.tar.bz2) = /DvK3xnDWCexMKy5LJB3cHfhCmxqsQU1Fksu48OHVwM=
 SHA256 (suhosin-0.9.33.tgz) = hlsccrrppacQ/gsHoGNVVs5sg4ZT7DZNKipub1lFKcU=
-SHA256 (suhosin-patch-5.3.21-0.9.10unofficial.patch.gz) = h+18Q+u02Pn/gkuljjp2c8dTLmxEMJZaU00yp20VLPE=
-SIZE (php-5.3.22.tar.gz) = 14902187
+SHA256 (suhosin-patch-5.3.24-0.9.10unofficial.patch.gz) = U5BzS4ifZwScY5NxpuUmojTzjNxNKj89msv0ov5PGmQ=
+SIZE (php-5.3.24.tar.bz2) = 11428201
 SIZE (suhosin-0.9.33.tgz) = 104488
-SIZE (suhosin-patch-5.3.21-0.9.10unofficial.patch.gz) = 41638
+SIZE (suhosin-patch-5.3.24-0.9.10unofficial.patch.gz) = 41586
diff --git a/lang/php/Makefile.inc b/lang/php/Makefile.inc
index 4bdf024c021..fe689e30abf 100644
--- a/lang/php/Makefile.inc
+++ b/lang/php/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.38 2013/03/11 12:27:54 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.39 2013/04/18 08:38:54 sthen Exp $
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
@@ -10,7 +10,7 @@ COMMENT-fastcgi=	stand-alone FastCGI version of PHP
 PKGNAME-main?=		php-${V}
 PKGNAME-fastcgi?=	php-fastcgi-${V}
 
-DISTFILES=		php-${V}.tar.gz
+DISTFILES?=		php-${V}.tar.bz2
 
 DISTNAME?=		php-${V}
 CATEGORIES=		lang www