Date: Fri, 28 Aug 2015 12:28:10 -0600 From: Adam Weinberger <adamw@adamw.org> To: Jan Beich <jbeich@FreeBSD.org> Cc: svn-ports-head@freebsd.org, Baptiste Daroussin <bapt@FreeBSD.org>, Adam Weinberger <adamw@FreeBSD.org>, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r395509 - head/mail/dovecot2 Message-ID: <6C572BB2-6060-44AB-A159-FB5447B7FAB8@adamw.org> In-Reply-To: <si73-e0hp-wny@FreeBSD.org> References: <201508281627.t7SGRASm062936@repo.freebsd.org> <20150828164832.GW93486@ivaldir.etoilebsd.net> <A54FE3B5-BBC5-4EEF-95E4-7A2B554C4D55@adamw.org> <1ten-gv2d-wny@FreeBSD.org> <4D2AEA26-E3FB-4FFD-97E1-4A7B1007CA3D@adamw.org> <si73-e0hp-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 28 Aug, 2015, at 12:22, Jan Beich <jbeich@FreeBSD.org> wrote: >=20 > Adam Weinberger <adamw@adamw.org> writes: >=20 >>> On 28 Aug, 2015, at 11:51, Jan Beich <jbeich@FreeBSD.org> wrote: >>> Adam Weinberger <adamw@adamw.org> writes: >>>>> On 28 Aug, 2015, at 10:48, Baptiste Daroussin <bapt@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 >>>>>>=20 >>>>>> Log: >>>>>> Use new _VARS option helpers. Still can't remove >>>>>> bsd.port.options.mk inclusion though. >>>>>=20 >>>>> I see nothing that prevents from removing bsd.port.options.mk what >>>>> issue do you face? >>>>=20 >>>> _REQUIRE=3D LOGIN >>>> MYSQL_VARS=3D _REQUIRE+=3Dmysql >>>> SUB_LIST+=3D REQUIRE=3D"${_REQUIRE}" >>>>=20 >>>> Without including b.p.o.mk, SUB_LIST gets the default ${_REQUIRE}. = It >>>> needs the _VARS helpers to load before ${_REQUIRE} gets fully >>>> expanded. >>>=20 >>> What if you move initial value? >>>=20 >>> $ make WITH=3DMYSQL -V '${SUB_LIST:MREQUIRE*}' >>> REQUIRE=3D"LOGIN mysql" >>=20 >> There's a problem there with multiple options enabled, though I have >> no idea why. With b.p.o.mk included it works properly. >>=20 >> $ make WITH=3D"MYSQL LDAP" -V '${SUB_LIST:MREQUIRE*}' >> REQUIRE=3D"LOGIN slapd" >> $ make WITH=3D"MYSQL PGSQL" -V '${SUB_LIST:MREQUIRE*}' >> REQUIRE=3D"LOGIN mysql" >=20 > OK. Here's an ugly workaround until someone investigates. It leaves > extra space behind that's maybe harmless for rcorder(8). >=20 > $ make WITH=3D"MYSQL LDAP" -V '${SUB_LIST:MREQUIRE*}' > REQUIRE=3D"LOGIN slapd mysql " >=20 > $ make WITH=3D"MYSQL PGSQL" -V '${SUB_LIST:MREQUIRE*}' > REQUIRE=3D"LOGIN mysql postgresql" >=20 > Index: mail/dovecot2/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- mail/dovecot2/Makefile (revision 395518) > +++ mail/dovecot2/Makefile (working copy) > @@ -129,14 +129,13 @@ PORTDOCS=3D * > PORTEXAMPLES=3D * >=20 > # Default requirement for dovecot rc script > -_REQUIRE=3D LOGIN > +_REQUIRE=3D LOGIN ${LDAP_REQUIRE} ${MYSQL_REQUIRE} ${PGSQL_REQUIRE} >=20 > -LDAP_VARS=3D _REQUIRE+=3Dslapd > -MYSQL_VARS=3D _REQUIRE+=3Dmysql > -PGSQL_VARS=3D _REQUIRE+=3Dpostgresql > +# XXX Appending variable in SUB_LIST seems buggy > +LDAP_VARS=3D LDAP_REQUIRE=3Dslapd > +MYSQL_VARS=3D MYSQL_REQUIRE=3Dmysql > +PGSQL_VARS=3D PGSQL_REQUIRE=3Dpostgresql >=20 > -.include <bsd.port.options.mk> > - > SUB_LIST+=3D REQUIRE=3D"${_REQUIRE}" > SUB_FILES+=3D pkg-message Thanks, Jan. It works fine with b.p.o.mk included so I'll leave it as-is = for now :-) # Adam --=20 Adam Weinberger adamw@adamw.org http://www.adamw.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6C572BB2-6060-44AB-A159-FB5447B7FAB8>