svn commit: r407391 - in branches/2016Q1/mail/dovecot2: . files

[Adam Weinberger]

Author: adamw
Date: Thu Jan 28 01:32:35 2016
New Revision: 407391
URL: https://svnweb.freebsd.org/changeset/ports/407391

Log:
  MFH: r405316
  
  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 at cschwarz.com
  
  Approved by:	ports-secteam (feld)

Modified:
  branches/2016Q1/mail/dovecot2/Makefile
  branches/2016Q1/mail/dovecot2/files/dovecot.in
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/mail/dovecot2/Makefile
==============================================================================
--- branches/2016Q1/mail/dovecot2/Makefile	Wed Jan 27 23:07:08 2016	(r407390)
+++ branches/2016Q1/mail/dovecot2/Makefile	Thu Jan 28 01:32:35 2016	(r407391)
@@ -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: branches/2016Q1/mail/dovecot2/files/dovecot.in
==============================================================================
--- branches/2016Q1/mail/dovecot2/files/dovecot.in	Wed Jan 27 23:07:08 2016	(r407390)
+++ branches/2016Q1/mail/dovecot2/files/dovecot.in	Thu Jan 28 01:32:35 2016	(r407391)
@@ -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