From owner-svn-ports-all@freebsd.org Fri Aug 28 17:59:23 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB1E69C4CF8; Fri, 28 Aug 2015 17:59:23 +0000 (UTC) (envelope-from adamw@adamw.org) Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "abg.ninja", Issuer "Gandi Standard SSL CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 107531DC3; Fri, 28 Aug 2015 17:59:22 +0000 (UTC) (envelope-from adamw@adamw.org) Received: by apnoea.adamw.org (OpenSMTPD) with ESMTPSA id 72189f0c TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO; Fri, 28 Aug 2015 11:59:18 -0600 (MDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: svn commit: r395509 - head/mail/dovecot2 From: Adam Weinberger In-Reply-To: <1ten-gv2d-wny@FreeBSD.org> Date: Fri, 28 Aug 2015 11:59:16 -0600 Cc: Baptiste Daroussin , svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, Adam Weinberger , ports-committers@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <4D2AEA26-E3FB-4FFD-97E1-4A7B1007CA3D@adamw.org> References: <201508281627.t7SGRASm062936@repo.freebsd.org> <20150828164832.GW93486@ivaldir.etoilebsd.net> <1ten-gv2d-wny@FreeBSD.org> To: Jan Beich X-Mailer: Apple Mail (2.2104) X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2015 17:59:23 -0000 > On 28 Aug, 2015, at 11:51, Jan Beich wrote: >=20 > Adam Weinberger writes: >=20 >>> On 28 Aug, 2015, at 10:48, Baptiste Daroussin = 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 inclusion >>>> 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 >>>> - >>>> -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 >>>>=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? >>=20 >>=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 > 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) > @@ -128,16 +128,11 @@ DOCS=3D AUTHORS COPYING COPYING.LGPL = COPYING.MIT IN > PORTDOCS=3D * > PORTEXAMPLES=3D * >=20 > -# Default requirement for dovecot rc script > -_REQUIRE=3D LOGIN > - > LDAP_VARS=3D _REQUIRE+=3Dslapd > MYSQL_VARS=3D _REQUIRE+=3Dmysql > PGSQL_VARS=3D _REQUIRE+=3Dpostgresql >=20 > -.include > - > -SUB_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} 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" # Adam --=20 Adam Weinberger adamw@adamw.org http://www.adamw.org