From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 17 13:51:23 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 921AA8F;
 Mon, 17 Dec 2012 13:51:23 +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 5E3658FC0A;
 Mon, 17 Dec 2012 13:51:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHDpNka098492;
 Mon, 17 Dec 2012 13:51:23 GMT (envelope-from ale@svn.freebsd.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHDpNrd098491;
 Mon, 17 Dec 2012 13:51:23 GMT (envelope-from ale@svn.freebsd.org)
Message-Id: <201212171351.qBHDpNrd098491@svn.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Mon, 17 Dec 2012 13:51:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309092 - 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, 17 Dec 2012 13:51:23 -0000

Author: ale
Date: Mon Dec 17 13:51:22 2012
New Revision: 309092
URL: http://svnweb.freebsd.org/changeset/ports/309092

Log:
  - drop support for apache 1.3
  - add support for "event" mpm
  - improve IGNORE message [1]
  
  PR:		ports/173277 [1]
  Submitted by:	adamw

Modified:
  head/Mk/bsd.php.mk

Modified: head/Mk/bsd.php.mk
==============================================================================
--- head/Mk/bsd.php.mk	Mon Dec 17 13:36:43 2012	(r309091)
+++ head/Mk/bsd.php.mk	Mon Dec 17 13:51:22 2012	(r309092)
@@ -59,19 +59,15 @@ PHP_EXT_INC=	pcre spl
 
 HTTPD?=		${LOCALBASE}/sbin/httpd
 .if exists(${HTTPD})
-APACHE_VERSION!=	${HTTPD} -V | ${SED} -ne 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p'
-.	if ${APACHE_VERSION} > 13
 APXS?=		${LOCALBASE}/sbin/apxs
 APACHE_MPM!=	${APXS} -q MPM_NAME
-.		if ${APACHE_MPM} == "worker"
+.	if ${APACHE_MPM} == "worker" || ${APACHE_MPM} == "event"
 PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
-.		endif
 .	endif
-.elif defined(APACHE_PORT)
-APACHE_VERSION!=	${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p'
-.	if ${APACHE_VERSION} > 13 && defined(WITH_MPM) && ${WITH_MPM} == "worker"
+.elif defined(APACHE_PORT) && (${APACHE_PORT:M*worker*} != "" || ${APACHE_PORT:M*event*} != "")
+PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
+.elif defined(WITH_MPM) && (${WITH_MPM} == "worker" || ${WITH_MPM} == "event")
 PHP_EXT_DIR:=	${PHP_EXT_DIR}-zts
-.	endif
 .endif
 
 .if defined(WITH_DEBUG)
@@ -81,10 +77,13 @@ PHP_SAPI?=	""
 .endif	# .if exists(${PHPBASE}/etc/php.conf)
 PHP_EXT_INC?=	""
 
+PHP5_LAST_VER=	54
+
 .if defined(IGNORE_WITH_PHP)
 .	for VER in ${IGNORE_WITH_PHP}
 .		if ${PHP_VER} == "${VER}"
-IGNORE=		cannot install: doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${IGNORE_WITH_PHP})
+IGNORE=		cannot be installed: doesn't work with lang/php${PHP_VER} port\
+		(doesn't support PHP ${IGNORE_WITH_PHP:C/^5$/${PHP5_LAST_VER}/:C/^5/5./})
 .		endif
 .	endfor
 .endif