Date: Thu, 11 Oct 2012 18:01:02 +0400 From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: "Jason E. Hale" <jhale@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r305720 - head/mail/dbmail22 Message-ID: <5076D11E.9050907@yandex.ru> In-Reply-To: <2655234.MtjR6MoGGX@mocha.verizon.net> References: <201210111324.q9BDOfdH029113@svn.freebsd.org> <2655234.MtjR6MoGGX@mocha.verizon.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------000104060003000809050300 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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. --------------000104060003000809050300 Content-Type: text/x-patch; name="dbmail22-options.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="dbmail22-options.diff" Index: Makefile =================================================================== --- Makefile (revision 305720) +++ Makefile (working copy) @@ -15,8 +15,10 @@ CONFLICTS= dbmail-3.* -OPTIONS_DEFINE= MYSQL PGSQL SQLITE SIEVE LDAP +OPTIONS_DEFINE= SIEVE LDAP OPTIONS_DEFAULT=MYSQL +OPTIONS_MULTI= DB +OPTIONS_MULTI_DB=MYSQL PGSQL SQLITE SIEVE_DESC= Support for Sieve mail sorting language LATEST_LINK= dbmail22 @@ -46,7 +48,7 @@ SUB_FILES= pkg-message PLIST_SUB+= PORTNAME=${PORTNAME} -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) PLIST_SUB+= PORTDOCS="@comment " .else PLIST_SUB+= PORTDOCS="" @@ -97,10 +99,6 @@ PLIST_SUB+= LDAP="@comment " .endif -.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 - post-patch: @${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr @${FIND} ${WRKSRC} -name *.orig -type f -delete @@ -128,7 +126,7 @@ ${MKDIR} ${DATADIR}/$$f ; \ ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${DATADIR}/$$f; \ done -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif --------------000104060003000809050300--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5076D11E.9050907>