From owner-svn-ports-all@freebsd.org  Tue Apr 12 01:14:51 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31E98AECAAC;
 Tue, 12 Apr 2016 01:14:51 +0000 (UTC)
 (envelope-from ganbold@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 02DD110E0;
 Tue, 12 Apr 2016 01:14:50 +0000 (UTC)
 (envelope-from ganbold@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3C1EoS9075628;
 Tue, 12 Apr 2016 01:14:50 GMT (envelope-from ganbold@FreeBSD.org)
Received: (from ganbold@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3C1EonL075626;
 Tue, 12 Apr 2016 01:14:50 GMT (envelope-from ganbold@FreeBSD.org)
Message-Id: <201604120114.u3C1EonL075626@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ganbold set sender to
 ganbold@FreeBSD.org using -f
From: Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
Date: Tue, 12 Apr 2016 01:14:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413091 - in head/lang/php56: . files
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.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Apr 2016 01:14:51 -0000

Author: ganbold (src,doc committer)
Date: Tue Apr 12 01:14:49 2016
New Revision: 413091
URL: https://svnweb.freebsd.org/changeset/ports/413091

Log:
  Add configtest support for php-fpm rc script.
  
  PR:	208324
  Sponsored by:	A-Team Systems

Modified:
  head/lang/php56/Makefile
  head/lang/php56/files/php-fpm.in

Modified: head/lang/php56/Makefile
==============================================================================
--- head/lang/php56/Makefile	Mon Apr 11 23:36:34 2016	(r413090)
+++ head/lang/php56/Makefile	Tue Apr 12 01:14:49 2016	(r413091)
@@ -3,7 +3,7 @@
 
 PORTNAME=	php56
 PORTVERSION=	5.6.20
-PORTREVISION?=	0
+PORTREVISION=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${PORTVERSION}

Modified: head/lang/php56/files/php-fpm.in
==============================================================================
--- head/lang/php56/files/php-fpm.in	Mon Apr 11 23:36:34 2016	(r413090)
+++ head/lang/php56/files/php-fpm.in	Tue Apr 12 01:14:49 2016	(r413091)
@@ -17,11 +17,16 @@
 name="php_fpm"
 rcvar=php_fpm_enable
 
+start_precmd="php_fpm_checkconfig"
+restart_precmd="php_fpm_checkconfig"
+reload_precmd="php_fpm_checkconfig"
+configtest_cmd="php_fpm_checkconfig"
+
 load_rc_config "$name"
 
 : ${php_fpm_enable="NO"}
 
-extra_commands="reload logrotate"
+extra_commands="reload configtest logrotate"
 
 command="%%PREFIX%%/sbin/php-fpm"
 pidfile="/var/run/php-fpm.pid"
@@ -40,4 +45,10 @@ php_fpm_logrotate() {
         kill -USR1 $rc_pid
 }
 
+php_fpm_checkconfig()
+{
+        echo "Performing sanity check on php-fpm configuration:"
+        eval ${command} -t
+}
+
 run_rc_command "$1"