From owner-svn-ports-all@FreeBSD.ORG Mon Oct 27 15:45:20 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2062A01; Mon, 27 Oct 2014 15:45:20 +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 839BB95B; Mon, 27 Oct 2014 15:45:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9RFjKO7036265; Mon, 27 Oct 2014 15:45:20 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9RFjKCI036263; Mon, 27 Oct 2014 15:45:20 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201410271545.s9RFjKCI036263@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 27 Oct 2014 15:45:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371588 - 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Oct 2014 15:45:20 -0000 Author: adamw Date: Mon Oct 27 15:45:19 2014 New Revision: 371588 URL: https://svnweb.freebsd.org/changeset/ports/371588 QAT: https://qat.redports.org/buildarchive/r371588/ Log: Remove the checkyesno dovecot_enable section, as it prevents onestart/onestop from working (as well as other things). I suspect this behaviour is present in other rc-files... a general cleanup on this might be in order. PR: 194629 Submitted by: Reinier Schoof Modified: head/mail/dovecot2/Makefile head/mail/dovecot2/files/dovecot.in Modified: head/mail/dovecot2/Makefile ============================================================================== --- head/mail/dovecot2/Makefile Mon Oct 27 15:23:30 2014 (r371587) +++ head/mail/dovecot2/Makefile Mon Oct 27 15:45:19 2014 (r371588) @@ -3,6 +3,7 @@ PORTNAME= dovecot PORTVERSION= 2.2.15 +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 Mon Oct 27 15:23:30 2014 (r371587) +++ head/mail/dovecot2/files/dovecot.in Mon Oct 27 15:45:19 2014 (r371588) @@ -48,12 +48,10 @@ restart_cmd() # To start multiple instances of dovecot set dovecot_config to # a space seperated list of configuration files. -if checkyesno ${name}_enable; then - for config in ${dovecot_config}; do - required_files="${config}" - command_args="-c ${config}" - base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F '= ' '/^base_dir =/ { print $2 }') - pidfile="${base_dir}/master.pid" - run_rc_command "$1" - done -fi +for config in ${dovecot_config}; do + required_files="${config}" + command_args="-c ${config}" + base_dir=$(${command} ${command_args} -a | /usr/bin/awk -F '= ' '/^base_dir =/ { print $2 }') + pidfile="${base_dir}/master.pid" + run_rc_command "$1" +done