Remove detection of a threaded Apache MPM at configure time.

Fixes the problem where thread safety was not consistent in
the php, ap-php and php-* extension packages, and makes ap-php
adhere to the maintainer-zts option. Bump PKGREVISION.

5 files changed, 145 insertions, 32 deletions

diff --git a/lang/php54/distinfo b/lang/php54/distinfo
index 74139533789..e340aa184a8 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2014/06/13 14:09:34 fhajny Exp $
+$NetBSD: distinfo,v 1.42 2014/06/13 14:31:19 fhajny Exp $
 
 SHA1 (php-5.4.29.tar.bz2) = 199cfe6ba44732d737e03e5321ea9399823759d7
 RMD160 (php-5.4.29.tar.bz2) = 38e3d70fe04cf458f4615355857ded9a90df67e4
@@ -6,7 +6,7 @@ Size (php-5.4.29.tar.bz2) = 12293765 bytes
 SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
 SHA1 (patch-aclocal.m4) = eae2ed8ea2985933c4fe88ba52577c14ac88eb92
 SHA1 (patch-build_libtool.m4) = 6dfef7c07a42dc54611c104265ef43c50a4e88ca
-SHA1 (patch-configure) = 7d14d78b6bb1b70d8467afb7baf54e51f313542c
+SHA1 (patch-configure) = a7b2e15625d6005ed3ce16280b0e26a378e0b5f2
 SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
 SHA1 (patch-ext_gd_libgd_gdxpm.c) = 9a175417fad9ac23037a24122f8d1258b9eebbcb
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
diff --git a/lang/php54/patches/patch-configure b/lang/php54/patches/patch-configure
index 771f520f11b..38e0efec4db 100644
--- a/lang/php54/patches/patch-configure
+++ b/lang/php54/patches/patch-configure
@@ -1,8 +1,64 @@
-$NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
+$NetBSD: patch-configure,v 1.8 2014/06/13 14:31:19 fhajny Exp $
 
---- configure.orig	2014-04-30 03:00:42.000000000 +0000
+--- configure.orig	2014-05-27 21:41:03.000000000 +0000
 +++ configure
-@@ -23554,7 +23554,7 @@ fi
+@@ -8319,27 +8319,6 @@ EOF
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+@@ -9143,27 +9122,6 @@ EOF
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+@@ -23554,7 +23512,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -11,7 +67,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25704,7 +25704,7 @@ $as_echo "yes" >&6; }
+@@ -25704,7 +25662,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -20,7 +76,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36944,7 +36944,7 @@ fi
+@@ -36944,7 +36902,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -29,7 +85,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -51409,7 +51409,7 @@ fi
+@@ -51409,7 +51367,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +94,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -105614,12 +105614,7 @@ old_CC=$CC
+@@ -105614,12 +105572,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"
@@ -52,7 +108,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
-@@ -108733,7 +108728,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -108733,7 +108686,7 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        ;;
  
@@ -61,7 +117,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
        ld_shlibs=no
        ;;
  
-@@ -109382,7 +109377,7 @@ dgux*)
+@@ -109382,7 +109335,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -70,7 +126,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
    dynamic_linker=no
    ;;
  
-@@ -109393,7 +109388,7 @@ freebsd* | dragonfly*)
+@@ -109393,7 +109346,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -79,7 +135,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -111473,7 +111468,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -111473,7 +111426,7 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -88,7 +144,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -113019,7 +113014,7 @@ dgux*)
+@@ -113019,7 +112972,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -97,7 +153,7 @@ $NetBSD: patch-configure,v 1.7 2014/05/02 13:04:12 taca Exp $
    dynamic_linker=no
    ;;
  
-@@ -113030,7 +113025,7 @@ freebsd* | dragonfly*)
+@@ -113030,7 +112983,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index 0387c09d44b..749fe846676 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2014/06/13 14:09:34 fhajny Exp $
+$NetBSD: distinfo,v 1.24 2014/06/13 14:31:19 fhajny Exp $
 
 SHA1 (php-5.5.13.tar.bz2) = b16ff3218d2cc79a5acac577f7560dbb80f205d1
 RMD160 (php-5.5.13.tar.bz2) = 806623a7d78ad1c7efcdd953bfea58075e559aae
@@ -6,7 +6,7 @@ Size (php-5.5.13.tar.bz2) = 13274145 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
 SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932
 SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7
-SHA1 (patch-configure) = 7b4bef368e6709c26c0db31a4c7ebc04e4d55e9c
+SHA1 (patch-configure) = efbdae6f90fbf5ccfde3735997e66e79a119439b
 SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
 SHA1 (patch-ext_gd_libgd_gdxpm.c) = 9a175417fad9ac23037a24122f8d1258b9eebbcb
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure
index fcd23eef3e7..217b53a7770 100644
--- a/lang/php55/patches/patch-configure
+++ b/lang/php55/patches/patch-configure
@@ -1,8 +1,64 @@
-$NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
+$NetBSD: patch-configure,v 1.7 2014/06/13 14:31:19 fhajny Exp $
 
---- configure.orig	2014-04-30 08:40:22.000000000 +0000
+--- configure.orig	2014-05-28 09:23:59.000000000 +0000
 +++ configure
-@@ -23604,7 +23604,7 @@ fi
+@@ -8321,27 +8321,6 @@ EOF
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+@@ -9145,27 +9124,6 @@ EOF
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+@@ -23604,7 +23562,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -11,7 +67,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25754,7 +25754,7 @@ $as_echo "yes" >&6; }
+@@ -25754,7 +25712,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -20,7 +76,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36811,7 +36811,7 @@ fi
+@@ -36811,7 +36769,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -29,7 +85,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -48213,7 +48213,7 @@ fi
+@@ -48213,7 +48171,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +94,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -65189,7 +65189,7 @@ rm -f core *.core core.conftest.* gmon.o
+@@ -65189,7 +65147,7 @@ rm -f core *.core core.conftest.* gmon.o
  fi
  
  
@@ -47,7 +103,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
  	as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
  fi
  
-@@ -104582,12 +104582,7 @@ old_CC=$CC
+@@ -104582,12 +104540,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"
@@ -61,7 +117,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
-@@ -107701,7 +107696,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -107701,7 +107654,7 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        ;;
  
@@ -70,7 +126,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
        ld_shlibs=no
        ;;
  
-@@ -108350,7 +108345,7 @@ dgux*)
+@@ -108350,7 +108303,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -79,7 +135,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
    dynamic_linker=no
    ;;
  
-@@ -108361,7 +108356,7 @@ freebsd* | dragonfly*)
+@@ -108361,7 +108314,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -88,7 +144,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -110441,7 +110436,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -110441,7 +110394,7 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -97,7 +153,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
-@@ -111987,7 +111982,7 @@ dgux*)
+@@ -111987,7 +111940,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -106,7 +162,7 @@ $NetBSD: patch-configure,v 1.6 2014/05/01 15:52:33 taca Exp $
    dynamic_linker=no
    ;;
  
-@@ -111998,7 +111993,7 @@ freebsd* | dragonfly*)
+@@ -111998,7 +111951,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile
index 3cf9a06ff72..da96b1d900a 100644
--- a/www/ap-php/Makefile
+++ b/www/ap-php/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2014/01/08 10:13:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2014/06/13 14:31:19 fhajny Exp $
 
 PKGNAME=		${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_BASE_VERS}
+PKGREVISION=		1
 COMMENT=		Apache (${PKG_APACHE}) module for ${PKG_PHP}
 
 CONFLICTS=		ap-php-[0-9]*