From owner-svn-ports-all@FreeBSD.ORG  Mon May 27 12:32:13 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id F06A9165;
 Mon, 27 May 2013 12:32:13 +0000 (UTC) (envelope-from ale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E2A92F15;
 Mon, 27 May 2013 12:32:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RCWDdJ085965;
 Mon, 27 May 2013 12:32:13 GMT (envelope-from ale@svn.freebsd.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RCWDb5085964;
 Mon, 27 May 2013 12:32:13 GMT (envelope-from ale@svn.freebsd.org)
Message-Id: <201305271232.r4RCWDb5085964@svn.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Mon, 27 May 2013 12:32:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319224 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 May 2013 12:32:14 -0000

Author: ale
Date: Mon May 27 12:32:13 2013
New Revision: 319224
URL: http://svnweb.freebsd.org/changeset/ports/319224

Log:
  Rework check for threaded apache, in order to support apache 2.4.

Modified:
  head/Mk/bsd.php.mk

Modified: head/Mk/bsd.php.mk
==============================================================================
--- head/Mk/bsd.php.mk	Mon May 27 12:31:03 2013	(r319223)
+++ head/Mk/bsd.php.mk	Mon May 27 12:32:13 2013	(r319224)
@@ -60,9 +60,8 @@ PHP_EXT_INC=	pcre spl
 
 HTTPD?=		${LOCALBASE}/sbin/httpd
 .if exists(${HTTPD})
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_MPM!=	${APXS} -q MPM_NAME
-.	if ${APACHE_MPM} == "worker" || ${APACHE_MPM} == "event"
+APACHE_THR!=	${HTTPD} -V | ${GREP} threaded
+.	if ${APACHE_THR:Myes}
 PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
 .	endif
 .elif defined(APACHE_PORT) && (${APACHE_PORT:M*worker*} != "" || ${APACHE_PORT:M*event*} != "")