Date: Fri, 28 Aug 2015 18:48:32 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Adam Weinberger <adamw@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r395509 - head/mail/dovecot2 Message-ID: <20150828164832.GW93486@ivaldir.etoilebsd.net> In-Reply-To: <201508281627.t7SGRASm062936@repo.freebsd.org> References: <201508281627.t7SGRASm062936@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--yPlaimQd/TpiYx8R Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 in= clusion > 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 I see nothing that prevents from removing bsd.port.options.mk what issue do= you face? Bapt --yPlaimQd/TpiYx8R Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlXgkOAACgkQ8kTtMUmk6Eyg9QCgnATSE9axkWgqdbWs6IY1N6V1 dJMAn338zYEXp6vCKQcg1wv573wZ1M0O =5wol -----END PGP SIGNATURE----- --yPlaimQd/TpiYx8R--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150828164832.GW93486>