svn commit: r305720 - head/mail/dbmail22

[Ruslan Mahmatkhanov]

Jason E. Hale wrote on 11.10.2012 17:52:
> On Thursday, October 11, 2012 13:24:41 Ruslan Mahmatkhanov wrote:
>> Author: rm
>> Date: Thu Oct 11 13:24:41 2012
>> New Revision: 305720
>> URL: http://svn.freebsd.org/changeset/ports/305720
>>
>> Log:
>>    - convert to optionsng
>>
>>    PR:		172380
>>    Submitted by:	Alan Hicks <ahicks at p-o.co dot uk> (maintainer)
>>    Feature safe:	yes
>>
>> Modified:
>>    head/mail/dbmail22/Makefile
>>    head/mail/dbmail22/pkg-descr
>>
>> Modified: head/mail/dbmail22/Makefile
>> ============================================================================
>> == --- head/mail/dbmail22/Makefile	Thu Oct 11 13:23:57 2012	(r305719) +++
>> head/mail/dbmail22/Makefile	Thu Oct 11 13:24:41 2012	(r305720) @@ -1,9
>>
>> -OPTIONS=	MYSQL		"Build with MySQL support" on \
>> -		POSTGRESQL	"Build with PostgreSQL support"	off \
>> -		SQLITE		"Build with SQLite support" off \
>> -		SIEVE		"Build w. support for Sieve mail sorting language"
> off \
>> -		LDAP		"Build with support for LDAP authentication" off
>> +OPTIONS_DEFINE=	MYSQL PGSQL SQLITE SIEVE LDAP
>> +OPTIONS_DEFAULT=MYSQL
>> +SIEVE_DESC=	Support for Sieve mail sorting language
>>
>
>>
>> -.if defined(WITHOUT_MYSQL) && !defined(WITH_POSTGRESQL) &&
>> !defined(WITH_SQLITE) +.if empty(${PORT_OPTIONS:MMYSQL}) &&
>> empty(${PORT_OPTIONS:MPGSQL}) && empty(${PORT_OPTIONS:MSQLITE})
>> IGNORE="requires at least one database backend selected. Run 'make config'"
>> .endif
>>
> Wouldn't it be better to use OPTIONS_MULTI instead of the IGNORE message?
> OPTIONS_DEFINE=	SIEVE LDAP
> OPTIONS_MULTI=		DB
> OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
>
> ${} shouldn't be used within emtpy() either. E.g.:
> .if empty(${PORT_OPTIONS:MMYSQL}) -> .if empty(PORT_OPTIONS:MMYSQL)
>
> This port also has:
> .if !defined(NOPORTDOCS)
> Might as well convert to:
> .if ${PORT_OPTIONS:MDOCS}
>
> - Jason

You are right, thank you. This one should work. I'll consult the 
maintainer and if he approves - commit.

-- 
Regards,
Ruslan

Tinderboxing kills... the drives.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dbmail22-options.diff
Type: text/x-patch
Size: 1251 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20121011/5c17049d/attachment.bin>