svn commit: r395509 - head/mail/dovecot2

[Baptiste Daroussin]

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
> 
> Log:
>   Use new _VARS option helpers. Still can't remove bsd.port.options.mk inclusion
>   though.
> 
> Modified:
>   head/mail/dovecot2/Makefile
> 
> Modified: head/mail/dovecot2/Makefile
> ==============================================================================
> --- 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=	--with-ioloop=kqueu
>  
>  LDAP_USE=		OPENLDAP=yes
>  LDAP_CONFIGURE_WITH=	ldap
> -LDAP_RC_REQUIRE=	slapd
>  
>  LIBWRAP_CONFIGURE_WITH=	libwrap
>  
> @@ -106,11 +105,9 @@ LZ4_LIB_DEPENDS=	liblz4.so:${PORTSDIR}/a
>  
>  MYSQL_USE=		MYSQL=yes
>  MYSQL_CONFIGURE_WITH=	mysql
> -MYSQL_RC_REQUIRE=	mysql
>  
>  PGSQL_USES=		pgsql
>  PGSQL_CONFIGURE_WITH=	pgsql
> -PGSQL_RC_REQUIRE=	postgresql
>  
>  SOLR_CONFIGURE_WITH=	solr
>  SOLR_BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
> @@ -131,21 +128,21 @@ DOCS=		AUTHORS COPYING COPYING.LGPL COPY
>  PORTDOCS=	*
>  PORTEXAMPLES=	*
>  
> -.include <bsd.port.options.mk>
> -
> -CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
> -LDFLAGS+=	-L${LOCALBASE}/lib -I${OPENSSLLIB}
> -
>  # Default requirement for dovecot rc script
>  _REQUIRE=	LOGIN
>  
> -.for opt in ${PORT_OPTIONS}
> -_REQUIRE+=	${${opt}_RC_REQUIRE}
> -.endfor
> +LDAP_VARS=	_REQUIRE+=slapd
> +MYSQL_VARS=	_REQUIRE+=mysql
> +PGSQL_VARS=	_REQUIRE+=postgresql
> +
> +.include <bsd.port.options.mk>
>  
>  SUB_LIST+=	REQUIRE="${_REQUIRE}"
>  SUB_FILES+=	pkg-message
>  
> +CPPFLAGS+=	-I${LOCALBASE}/include -I${OPENSSLINC}
> +LDFLAGS+=	-L${LOCALBASE}/lib -I${OPENSSLLIB}
> +
>  post-patch:
>  	@${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \
>  		s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \
> 

I see nothing that prevents from removing bsd.port.options.mk what issue do you
face?

Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20150828/7387893c/attachment.bin>