From owner-svn-ports-head@freebsd.org  Tue Jan  5 20:59:03 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 DCEEEA6231D;
 Tue,  5 Jan 2016 20:59:03 +0000 (UTC)
 (envelope-from adamw@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 AD73D157A;
 Tue,  5 Jan 2016 20:59:03 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u05Kx2bt068748;
 Tue, 5 Jan 2016 20:59:02 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u05Kx2VE068745;
 Tue, 5 Jan 2016 20:59:02 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201601052059.u05Kx2VE068745@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Tue, 5 Jan 2016 20:59:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405316 - in head/mail/dovecot2: . 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2016 20:59:04 -0000

Author: adamw
Date: Tue Jan  5 20:59:02 2016
New Revision: 405316
URL: https://svnweb.freebsd.org/changeset/ports/405316

Log:
  Execute run_rc_command even if the config file doesn't exist. Previously,
  until you followed the instructions in pkg-message, the config file didn't
  exist and rc.d/dovecot would just silently exit.
  
  While here, also spit out a message reminding you to create the config
  files if necessary.
  
  PR:		205761
  Submitted by:	me@cschwarz.com

Modified:
  head/mail/dovecot2/Makefile
  head/mail/dovecot2/files/dovecot.in

Modified: head/mail/dovecot2/Makefile
==============================================================================
--- head/mail/dovecot2/Makefile	Tue Jan  5 20:43:49 2016	(r405315)
+++ head/mail/dovecot2/Makefile	Tue Jan  5 20:59:02 2016	(r405316)
@@ -14,6 +14,7 @@
 
 PORTNAME=	dovecot
 PORTVERSION=	2.2.21
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 PKGNAMESUFFIX=	2

Modified: head/mail/dovecot2/files/dovecot.in
==============================================================================
--- head/mail/dovecot2/files/dovecot.in	Tue Jan  5 20:43:49 2016	(r405315)
+++ head/mail/dovecot2/files/dovecot.in	Tue Jan  5 20:59:02 2016	(r405316)
@@ -55,6 +55,11 @@ for config in ${dovecot_config}; do
 	if [ -f ${config} ]; then
 		base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F '= ' '/^base_dir =/ { print $2 }')
 		pidfile="${base_dir}/master.pid"
-		run_rc_command "$1"
+	else
+		echo "==Error=="
+		echo "Config file ${config} does not exist. If this is"
+		echo "a new installation, please create the config files as outlined in"
+		echo "	# pkg info -D dovecot2"
 	fi
+	run_rc_command "$1"
 done