- update to PHP 5.3.19, with a re-rolled suhosin patch (the last official

one has a patch conflict due to copyright date changes)

- don't build pointless -ap2 flavoured subpackages (modules, fpm, fastcgi)

ok robert@ (maintainer)

lang/php/5.2/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2012/09/27 16:45:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2012/11/28 10:47:12 sthen Exp $
 
 # doesn't set USE_LIBTOOL but use the bundled one because it needs some
 # specific options we don't have.
@@ -41,4 +41,9 @@ CONFIGURE_ARGS+=        --with-sybase-ct=shared,${LOCALBASE}
 LIB_DEPENDS-sybase_ct=	databases/freetds
 WANTLIB-sybase_ct=	c ct pthread
 
+.include <bsd.port.arch.mk>
+.if ${FLAVOR:L:Map2}
+BUILD_PACKAGES :=	${BUILD_PACKAGES:N-fastcgi}
+.endif
+
 .include <bsd.port.mk>

lang/php/5.3/Makefile

@@ -1,14 +1,11 @@
-# $OpenBSD: Makefile,v 1.42 2012/10/24 07:58:48 pea Exp $
+# $OpenBSD: Makefile,v 1.43 2012/11/28 10:47:12 sthen Exp $
 
 BROKEN-hppa =	no __sync_bool_compare_and_swap support nor asm fallback
 
 PV=		5.3
-V=		${PV}.17
-SUHOSIN_PHPV=	5.3.9
-SUHOSIN_P_V=	0.9.10
-
-REVISION-main=	0
-REVISION-imap=	0
+V=		${PV}.19
+SUHOSIN_PHPV=	5.3.19
+SUHOSIN_P_V=	0.9.10unofficial
 
 INI_TEMPLATES=	development production
 
@@ -32,4 +29,9 @@ CONFIGURE_ARGS+=	--enable-pcntl=shared
 LIB_DEPENDS-pcntl=
 WANTLIB-pcntl=		c pthread
 
+.include <bsd.port.arch.mk>
+.if ${FLAVOR:L:Map2}
+BUILD_PACKAGES :=	${BUILD_PACKAGES:N-fpm:N-fastcgi}
+.endif
+
 .include <bsd.port.mk>

lang/php/5.3/distinfo

@@ -1,6 +1,6 @@
-SHA256 (php-5.3.17.tar.gz) = JiIRaU0DtApN3rgmaZlJvyLX7oL1ziH6tjGZNG6imv4=
+SHA256 (php-5.3.19.tar.gz) = hE6yRwFvWp52m+R9T3Fn7Pb2wPtVIHBMfotl/wGc6oc=
 SHA256 (suhosin-0.9.33.tgz) = hlsccrrppacQ/gsHoGNVVs5sg4ZT7DZNKipub1lFKcU=
-SHA256 (suhosin-patch-5.3.9-0.9.10.patch.gz) = RDjK6rChDGyUrun36qcD9Xmfl9TgV59DqUe7cxTjgxc=
-SIZE (php-5.3.17.tar.gz) = 14819748
+SHA256 (suhosin-patch-5.3.19-0.9.10unofficial.patch.gz) = Bt2K+0TloFGvm+P5I5SuSNpNgohXhPr10OoX4N1tQWY=
+SIZE (php-5.3.19.tar.gz) = 14894346
 SIZE (suhosin-0.9.33.tgz) = 104488
-SIZE (suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967
+SIZE (suhosin-patch-5.3.19-0.9.10unofficial.patch.gz) = 41638

lang/php/5.3/patches/patch-sapi_fpm_fpm_fpm_atomic_h

@@ -1,10 +1,10 @@
-$OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_h,v 1.1 2012/10/24 07:58:48 pea Exp $
+$OpenBSD: patch-sapi_fpm_fpm_fpm_atomic_h,v 1.2 2012/11/28 10:47:12 sthen Exp $
 
 Add support for mips
 Fix types for sparc64
 
---- sapi/fpm/fpm/fpm_atomic.h.orig	Fri Oct 19 11:28:28 2012
-+++ sapi/fpm/fpm/fpm_atomic.h	Fri Oct 19 11:28:31 2012
+--- sapi/fpm/fpm/fpm_atomic.h.orig.port	Wed Nov 21 20:07:23 2012
++++ sapi/fpm/fpm/fpm_atomic.h	Fri Nov 23 15:40:43 2012
 @@ -77,10 +77,10 @@ static inline atomic_uint_t atomic_cmp_set(atomic_t *l
  }
  /* }}} */

lang/php/Makefile.inc

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.33 2012/09/27 16:45:51 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.34 2012/11/28 10:47:12 sthen Exp $
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
@@ -25,7 +25,8 @@ MASTER_SITES=		http://se.php.net/distributions/ \
 			http://us.php.net/distributions/ \
 			http://no.php.net/distributions/ \
 			http://uk.php.net/distributions/
-MASTER_SITES0=		http://download.suhosin.org/ \
+MASTER_SITES0=		http://spacehopper.org/mirrors/ \
+			http://download.suhosin.org/ \
 			http://blade2k.humppa.hu/ \
 			${_MASTER_SITE_FREEBSD}
 
@@ -346,6 +347,9 @@ DESCR-${i}=		${.CURDIR}/../files/DESCR-${i}
 MESSAGE-${i}=		${.CURDIR}/../files/MESSAGE-ext
 UNMESSAGE-${i}=		${.CURDIR}/../files/UNMESSAGE-ext
 PKGNAME-${i}=		php-${i}-${V}
+# don't build separate plugins for -ap2
+FULLPKGNAME-${i}=	php-${i}-${V}${FLAVOR_EXT:S/-ap2//}
+FULLPKGPATH-${i}=	${PKGPATH},-${i}${FLAVOR_EXT:S/-ap2//:S/-/,/g}
 .if ${V:M5.2*}
 PKGSPEC-${i}=		php-${i}->=5.2,<5.3
 .else if ${V:M5.3*}