Date: Fri, 28 Aug 2015 20:22:58 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Adam Weinberger <adamw@adamw.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: <si73-e0hp-wny@FreeBSD.org> In-Reply-To: <4D2AEA26-E3FB-4FFD-97E1-4A7B1007CA3D@adamw.org> (Adam Weinberger's message of "Fri, 28 Aug 2015 11:59:16 -0600") 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>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Adam Weinberger <adamw@adamw.org> writes: >> 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. >>>> >>>> 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" > > 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=3D"MYSQL LDAP" -V '${SUB_LIST:MREQUIRE*}' > REQUIRE=3D"LOGIN slapd" > $ make WITH=3D"MYSQL PGSQL" -V '${SUB_LIST:MREQUIRE*}' > REQUIRE=3D"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=3D"MYSQL LDAP" -V '${SUB_LIST:MREQUIRE*}' REQUIRE=3D"LOGIN slapd mysql " $ make WITH=3D"MYSQL PGSQL" -V '${SUB_LIST:MREQUIRE*}' REQUIRE=3D"LOGIN mysql postgresql" 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 =2D-- 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 =2D_REQUIRE=3D LOGIN +_REQUIRE=3D LOGIN ${LDAP_REQUIRE} ${MYSQL_REQUIRE} ${PGSQL_REQUIRE} =20 =2DLDAP_VARS=3D _REQUIRE+=3Dslapd =2DMYSQL_VARS=3D _REQUIRE+=3Dmysql =2DPGSQL_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 =2D.include <bsd.port.options.mk> =2D SUB_LIST+=3D REQUIRE=3D"${_REQUIRE}" SUB_FILES+=3D pkg-message =20 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJV4KcCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bbGoH/1q8RePG5bzbmaKeT+0EFmWd roR4VfrsHzVBRp2voqR42Th2UUCKQP3CNXpeUeq25/zzcGltLdJtXSjQDuTpkRJ/ UInWEEHivsavzRSJ5b0dX9k7cYwESOrUO+vGQncwnAhVQZ19bnH7CF4U6jWWJmBo RI749BUfznbDWExC44yz4xc/mmz1xZLJHjBTIPSSYxm8/Y2QOZp6YY2aqxi2AmoN vAI7+yDmxm+rIuhFSlsQSdOCypN0BcN570b8C5lAqfM2bst3FheiSqnigH6wcacg jbmgoeD1INS0L/iMUXrQ4lRo1QH89PxBHjVUijDKkhaG/HIRFeVAMtY7io4T44s= =tHci -----END PGP SIGNATURE----- --=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?si73-e0hp-wny>