Date: Thu, 11 Oct 2012 16:42:59 +0000 (UTC) From: Ruslan Mahmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305733 - head/mail/dbmail22 Message-ID: <201210111642.q9BGgxcY053284@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Thu Oct 11 16:42:58 2012 New Revision: 305733 URL: http://svn.freebsd.org/changeset/ports/305733 Log: - use multiple choice feature of options framework for database backend selection (mysql is still default) - convert NOPORTDOCS case to optionsng too Suggested by: jhale Approved by: Alan Hicks <ahicks at p-o.co dot uk> (maintainer, by mail) Feature safe: yes Modified: head/mail/dbmail22/Makefile Modified: head/mail/dbmail22/Makefile ============================================================================== --- head/mail/dbmail22/Makefile Thu Oct 11 16:38:57 2012 (r305732) +++ head/mail/dbmail22/Makefile Thu Oct 11 16:42:58 2012 (r305733) @@ -15,8 +15,10 @@ LIB_DEPENDS= gmime-2.0:${PORTSDIR}/mail/ 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 @@ MAN8= dbmail-export.8 dbmail-imapd.8 db 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="" 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 @@ post-install: ${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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210111642.q9BGgxcY053284>