From owner-svn-ports-head@FreeBSD.ORG  Thu Oct 11 16:42:59 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4E088FEC;
 Thu, 11 Oct 2012 16:42:59 +0000 (UTC) (envelope-from rm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 368C28FC19;
 Thu, 11 Oct 2012 16:42:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9BGgxhl053287;
 Thu, 11 Oct 2012 16:42:59 GMT (envelope-from rm@svn.freebsd.org)
Received: (from rm@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9BGgxcY053284;
 Thu, 11 Oct 2012 16:42:59 GMT (envelope-from rm@svn.freebsd.org)
Message-Id: <201210111642.q9BGgxcY053284@svn.freebsd.org>
From: Ruslan Mahmatkhanov <rm@FreeBSD.org>
Date: Thu, 11 Oct 2012 16:42:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305733 - head/mail/dbmail22
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Oct 2012 16:42:59 -0000

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