Date: Fri, 28 Aug 2015 19:51:54 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Adam Weinberger <adamw@adamw.org> Cc: Baptiste Daroussin <bapt@FreeBSD.org>, svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, Adam Weinberger <adamw@FreeBSD.org>, ports-committers@freebsd.org Subject: Re: svn commit: r395509 - head/mail/dovecot2 Message-ID: <1ten-gv2d-wny@FreeBSD.org> In-Reply-To: <A54FE3B5-BBC5-4EEF-95E4-7A2B554C4D55@adamw.org> (Adam Weinberger's message of "Fri, 28 Aug 2015 10:51:27 -0600") References: <201508281627.t7SGRASm062936@repo.freebsd.org> <20150828164832.GW93486@ivaldir.etoilebsd.net> <A54FE3B5-BBC5-4EEF-95E4-7A2B554C4D55@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 10:48, Baptiste Daroussin <bapt@FreeBSD.org> wrote: >>=20 >> 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 i= nclusion >>> though. >>>=20 >>> Modified: >>> head/mail/dovecot2/Makefile >>>=20 >>> Modified: head/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=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- head/mail/dovecot2/Makefile Fri Aug 28 16:21:24 2015 (r395508) >>> +++ head/mail/dovecot2/Makefile Fri Aug 28 16:27:09 2015 (r395509) >>> @@ -95,7 +95,6 @@ KQUEUE_CONFIGURE_ON=3D --with-ioloop=3Dkqueu >>>=20 >>> LDAP_USE=3D OPENLDAP=3Dyes >>> LDAP_CONFIGURE_WITH=3D ldap >>> -LDAP_RC_REQUIRE=3D slapd >>>=20 >>> LIBWRAP_CONFIGURE_WITH=3D libwrap >>>=20 >>> @@ -106,11 +105,9 @@ LZ4_LIB_DEPENDS=3D liblz4.so:${PORTSDIR}/a >>>=20 >>> MYSQL_USE=3D MYSQL=3Dyes >>> MYSQL_CONFIGURE_WITH=3D mysql >>> -MYSQL_RC_REQUIRE=3D mysql >>>=20 >>> PGSQL_USES=3D pgsql >>> PGSQL_CONFIGURE_WITH=3D pgsql >>> -PGSQL_RC_REQUIRE=3D postgresql >>>=20 >>> SOLR_CONFIGURE_WITH=3D solr >>> SOLR_BUILD_DEPENDS=3D curl:${PORTSDIR}/ftp/curl >>> @@ -131,21 +128,21 @@ DOCS=3D AUTHORS COPYING COPYING.LGPL COPY >>> PORTDOCS=3D * >>> PORTEXAMPLES=3D * >>>=20 >>> -.include <bsd.port.options.mk> >>> - >>> -CPPFLAGS+=3D -I${LOCALBASE}/include -I${OPENSSLINC} >>> -LDFLAGS+=3D -L${LOCALBASE}/lib -I${OPENSSLLIB} >>> - >>> # Default requirement for dovecot rc script >>> _REQUIRE=3D LOGIN >>>=20 >>> -.for opt in ${PORT_OPTIONS} >>> -_REQUIRE+=3D ${${opt}_RC_REQUIRE} >>> -.endfor >>> +LDAP_VARS=3D _REQUIRE+=3Dslapd >>> +MYSQL_VARS=3D _REQUIRE+=3Dmysql >>> +PGSQL_VARS=3D _REQUIRE+=3Dpostgresql >>> + >>> +.include <bsd.port.options.mk> >>>=20 >>> SUB_LIST+=3D REQUIRE=3D"${_REQUIRE}" >>> SUB_FILES+=3D pkg-message >>>=20 >>> +CPPFLAGS+=3D -I${LOCALBASE}/include -I${OPENSSLINC} >>> +LDFLAGS+=3D -L${LOCALBASE}/lib -I${OPENSSLLIB} >>> + >>> post-patch: >>> @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ >>> s,sysconfdir=3D/etc,sysconfdir=3D${PREFIX}/etc,g' \ >>>=20 >>=20 >> I see nothing that prevents from removing bsd.port.options.mk what issue= do you >> face? > > > _REQUIRE=3D LOGIN > MYSQL_VARS=3D _REQUIRE+=3Dmysql > SUB_LIST+=3D REQUIRE=3D"${_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=3DMYSQL -V '${SUB_LIST:MREQUIRE*}' REQUIRE=3D"LOGIN mysql" 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) @@ -128,16 +128,11 @@ DOCS=3D AUTHORS COPYING COPYING.LGPL COPYING.MIT IN PORTDOCS=3D * PORTEXAMPLES=3D * =20 =2D# Default requirement for dovecot rc script =2D_REQUIRE=3D LOGIN =2D LDAP_VARS=3D _REQUIRE+=3Dslapd MYSQL_VARS=3D _REQUIRE+=3Dmysql PGSQL_VARS=3D _REQUIRE+=3Dpostgresql =20 =2D.include <bsd.port.options.mk> =2D =2DSUB_LIST+=3D REQUIRE=3D"${_REQUIRE}" +SUB_LIST+=3D REQUIRE=3D"LOGIN ${_REQUIRE}" SUB_FILES+=3D pkg-message =20 CPPFLAGS+=3D -I${LOCALBASE}/include -I${OPENSSLINC} --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJV4J+6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bVMwH/2IAXBd+STlJoUI+SZqWEC+j j9yMhB75Ac7g2rId8Eig4Eh+KhyHqt3DFdYcbG00pse2FxRJxLSdlKJpKx25bXXq FIpgW9OzMYUsz9kxkMDcwLv65/DOBpw6J2gtyU1A6HoLeyP6a/4/RgjYQ++TFhF8 h1gLbg99S0iZvCl1XEqoPHvg0s+srURV9aizOWRhQXFmi5Pnqo3pLmOUlwr9uDEz mYQeLMlK/20UxDH9LhMxEeLpvzV2A1LONUyvGfq6xVQCKHgWj/0krBlo1pcs/j9Z XZUshXqv+RySGan7gYzK2LJhB6w421G1rAHBYVrlHbp1WofSTcW8hEFiMZ1u520= =3RT4 -----END PGP SIGNATURE----- --=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1ten-gv2d-wny>