From owner-svn-ports-all@FreeBSD.ORG  Tue Apr  8 15:15:32 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3376DD02;
 Tue,  8 Apr 2014 15:15:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1FE7C1C58;
 Tue,  8 Apr 2014 15:15:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s38FFV8U069912;
 Tue, 8 Apr 2014 15:15:31 GMT (envelope-from ale@svn.freebsd.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s38FFVe8069910;
 Tue, 8 Apr 2014 15:15:31 GMT (envelope-from ale@svn.freebsd.org)
Message-Id: <201404081515.s38FFVe8069910@svn.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Tue, 8 Apr 2014 15:15:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350622 - in head/lang: php5 php55
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.17
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: Tue, 08 Apr 2014 15:15:32 -0000

Author: ale
Date: Tue Apr  8 15:15:31 2014
New Revision: 350622
URL: http://svnweb.freebsd.org/changeset/ports/350622
QAT: https://qat.redports.org/buildarchive/r350622/

Log:
  Force users to update their options file if APACHE was selected.

Modified:
  head/lang/php5/Makefile
  head/lang/php55/Makefile

Modified: head/lang/php5/Makefile
==============================================================================
--- head/lang/php5/Makefile	Tue Apr  8 15:03:14 2014	(r350621)
+++ head/lang/php5/Makefile	Tue Apr  8 15:15:31 2014	(r350622)
@@ -87,6 +87,11 @@ CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-group=${WWWGRP}
 .endif
 
+.if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
+IGNORE=		doesn't install the Apache module anymore:\
+		update your OPTIONS and build www/mod_php5 port instead
+.endif
+
 .if defined(PKGNAMEPREFIX)
 USE_PHP=	yes
 PHP_DEFAULT=	5.4

Modified: head/lang/php55/Makefile
==============================================================================
--- head/lang/php55/Makefile	Tue Apr  8 15:03:14 2014	(r350621)
+++ head/lang/php55/Makefile	Tue Apr  8 15:15:31 2014	(r350622)
@@ -87,6 +87,11 @@ CONFIGURE_ARGS+=--enable-fpm \
 		--with-fpm-group=${WWWGRP}
 .endif
 
+.if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
+IGNORE=		doesn't install the Apache module anymore:\
+		update your OPTIONS and build www/mod_php55 port instead 
+.endif
+
 .if defined(PKGNAMEPREFIX)
 USE_PHP=	yes
 PHP_DEFAULT=	5.5