svn commit: r359890 - in head/mail/dovecot: . files

[Bryan Drewery]

On 6/30/14, 12:33 PM, Bryan Drewery wrote:
> Author: bdrewery
> Date: Mon Jun 30 17:33:21 2014
> New Revision: 359890
> URL: http://svnweb.freebsd.org/changeset/ports/359890
> QAT: https://qat.redports.org/buildarchive/r359890/
>
> Log:
>    - Take maintainership
>    - Attempt to limit portscout to version 1.2
>    - Fix rc script for one* commands [1]
>
>    Not bumping PORTREVISION as the installed version doesn't change, should
>    not affect dependent ports.

Meant not bumping dependent ports...

>
>    PR:		177497 [1]
>    Submitted by:	nick at 3wh.net [1]
>
> Modified:
>    head/mail/dovecot/Makefile
>    head/mail/dovecot/files/dovecot.in
>
> Modified: head/mail/dovecot/Makefile
> ==============================================================================
> --- head/mail/dovecot/Makefile	Mon Jun 30 17:27:37 2014	(r359889)
> +++ head/mail/dovecot/Makefile	Mon Jun 30 17:33:21 2014	(r359890)
> @@ -3,12 +3,12 @@
>
>   PORTNAME=	dovecot
>   PORTVERSION=	1.2.17
> -PORTREVISION=	1
> +PORTREVISION=	2
>   CATEGORIES=	mail ipv6
>   MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/ \
>   		http://www.rename-it.nl/dovecot/${PORTVERSION:R}/
>
> -MAINTAINER=	ports at FreeBSD.org
> +MAINTAINER=	bdrewery at FreeBSD.org
>   COMMENT=	Secure and compact IMAP and POP3 servers
>
>   LICENSE=	LGPL21 MIT
> @@ -31,6 +31,8 @@ CONFLICTS=	dovecot2-2.[0-9].*
>   USES=		iconv libtool:keepla
>   USE_RC_SUBR=	dovecot
>
> +PORTSCOUT=	limit:^1\.2
> +
>   GNU_CONFIGURE=	yes
>   CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>   CONFIGURE_ARGS=	--localstatedir=/var \
>
> Modified: head/mail/dovecot/files/dovecot.in
> ==============================================================================
> --- head/mail/dovecot/files/dovecot.in	Mon Jun 30 17:27:37 2014	(r359889)
> +++ head/mail/dovecot/files/dovecot.in	Mon Jun 30 17:33:21 2014	(r359890)
> @@ -50,13 +50,11 @@ 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 }')
> -		login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_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 }')
> +	login_dir=$(${command} ${command_args} -a | /usr/bin/awk -F ': ' '/^login_dir:/ { print $2 }')
> +	pidfile="${base_dir}/master.pid"
> +	run_rc_command "$1"
> +done
>


-- 
Regards,
Bryan Drewery