svn commit: r395509 - head/mail/dovecot2

[Adam Weinberger]

> On 28 Aug, 2015, at 12:22, Jan Beich <jbeich at FreeBSD.org> wrote:
> 
> Adam Weinberger <adamw at adamw.org> writes:
> 
>>> On 28 Aug, 2015, at 11:51, Jan Beich <jbeich at FreeBSD.org> wrote:
>>> Adam Weinberger <adamw at adamw.org> writes:
>>>>> On 28 Aug, 2015, at 10:48, Baptiste Daroussin <bapt at FreeBSD.org> wrote:
>>>>> On Fri, Aug 28, 2015 at 04:27:10PM +0000, Adam Weinberger wrote:
>>>>>> Author: adamw
>>>>>> Date: Fri Aug 28 16:27:09 2015
>>>>>> New Revision: 395509
>>>>>> URL: https://svnweb.freebsd.org/changeset/ports/395509
>>>>>> 
>>>>>> Log:
>>>>>>  Use new _VARS option helpers. Still can't remove
>>>>>>  bsd.port.options.mk inclusion though.
>>>>> 
>>>>> I see nothing that prevents from removing bsd.port.options.mk what
>>>>> issue do you face?
>>>> 
>>>> _REQUIRE=	LOGIN
>>>> MYSQL_VARS=	_REQUIRE+=mysql
>>>> SUB_LIST+=	REQUIRE="${_REQUIRE}"
>>>> 
>>>> Without including b.p.o.mk, SUB_LIST gets the default ${_REQUIRE}. It
>>>> needs the _VARS helpers to load before ${_REQUIRE} gets fully
>>>> expanded.
>>> 
>>> What if you move initial value?
>>> 
>>> $ make WITH=MYSQL -V '${SUB_LIST:MREQUIRE*}'
>>> REQUIRE="LOGIN mysql"
>> 
>> There's a problem there with multiple options enabled, though I have
>> no idea why. With b.p.o.mk included it works properly.
>> 
>> $ make WITH="MYSQL LDAP" -V '${SUB_LIST:MREQUIRE*}'
>> REQUIRE="LOGIN slapd"
>> $ make WITH="MYSQL PGSQL" -V '${SUB_LIST:MREQUIRE*}'
>> REQUIRE="LOGIN mysql"
> 
> OK. Here's an ugly workaround until someone investigates. It leaves
> extra space behind that's maybe harmless for rcorder(8).
> 
>  $ make WITH="MYSQL LDAP" -V '${SUB_LIST:MREQUIRE*}'
>  REQUIRE="LOGIN slapd mysql "
> 
>  $ make WITH="MYSQL PGSQL" -V '${SUB_LIST:MREQUIRE*}'
>  REQUIRE="LOGIN  mysql postgresql"
> 
> Index: mail/dovecot2/Makefile
> ===================================================================
> --- mail/dovecot2/Makefile	(revision 395518)
> +++ mail/dovecot2/Makefile	(working copy)
> @@ -129,14 +129,13 @@ PORTDOCS=	*
> PORTEXAMPLES=	*
> 
> # Default requirement for dovecot rc script
> -_REQUIRE=	LOGIN
> +_REQUIRE=	LOGIN ${LDAP_REQUIRE} ${MYSQL_REQUIRE} ${PGSQL_REQUIRE}
> 
> -LDAP_VARS=	_REQUIRE+=slapd
> -MYSQL_VARS=	_REQUIRE+=mysql
> -PGSQL_VARS=	_REQUIRE+=postgresql
> +# XXX Appending variable in SUB_LIST seems buggy
> +LDAP_VARS=	LDAP_REQUIRE=slapd
> +MYSQL_VARS=	MYSQL_REQUIRE=mysql
> +PGSQL_VARS=	PGSQL_REQUIRE=postgresql
> 
> -.include <bsd.port.options.mk>
> -
> SUB_LIST+=	REQUIRE="${_REQUIRE}"
> SUB_FILES+=	pkg-message

Thanks, Jan. It works fine with b.p.o.mk included so I'll leave it as-is for now :-)

# Adam


-- 
Adam Weinberger
adamw at adamw.org
http://www.adamw.org