Convert to use bsd.options.mk.

2 files changed, 68 insertions, 38 deletions

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index ba3ae35c30d..04e0d75c7a8 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/08/01 05:17:19 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2004/08/01 07:04:45 jlam Exp $
 
 DISTNAME=		dovecot-0.99.10.9
 CATEGORIES=		mail
@@ -29,42 +29,7 @@ CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS}
 CONFIGURE_ENV+=		F77=${FALSE}
 
 .include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=		DOVECOT_USE_GNUTLS DOVECOT_USE_MYSQL \
-			DOVECOT_USE_PGSQL USE_INET6 USE_OPENLDAP USE_SASL2
-
-.if !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ssl=gnutls
-.  include "../../security/gnutls/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=        --enable-ssl=openssl
-.  include "../../security/openssl/buildlink3.mk"
-.endif
-
-.if !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][SS])
-CONFIGURE_ARGS+=	--with-mysql
-.  include "../../databases/mysql4-client/buildlink3.mk"
-.endif
-
-.if !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-pgsql
-CPPFLAGS=		-I${BUILDLINK_DIR}/include/pgsql
-.  include "../../mk/pgsql.buildlink3.mk"
-.endif
-
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-.if !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-ldap
-.  include "../../databases/openldap/buildlink3.mk"
-.endif
-
-.if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-cyrus-sasl2
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
-.endif
+.include "options.mk"
 
 RCD_SCRIPTS=	dovecot
 
@@ -76,7 +41,8 @@ PKG_USERS=	${DOVECOT_USER}:${DOVECOT_GROUP}::Dovecot\\ IMAP/POP3\\ user
 EGDIR=		${PREFIX}/share/examples/dovecot
 CONF_FILES=	${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
 
-INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot share/examples/dovecot
+INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot		\
+			share/examples/dovecot
 
 post-configure:
 	@cd ${WRKSRC};							\
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
new file mode 100644
index 00000000000..754082d0ede
--- /dev/null
+++ b/mail/dovecot/options.mk
@@ -0,0 +1,64 @@
+# $NetBSD: options.mk,v 1.1 2004/08/01 07:04:45 jlam Exp $
+
+# Global and legacy options
+.if defined(DOVECOT_USE_GNUTLS) || defined(DOVECOT_USE_MYSQL) || \
+    defined(DOVECOT_USE_PGSQL) || defined(USE_INET6) || \
+    defined(USE_OPENLDAP) || defined(USE_SASL2)
+.  if !defined(PKG_OPTIONS.dovecot)
+.    if defined(DOVECOT_USE_GNUTLS) && !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
+PKG_OPTIONS.dovecot+=	gnutls
+.    endif
+.    if defined(DOVECOT_USE_MYSQL) && !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][Ss])
+PKG_OPTIONS.dovecot+=	mysql
+.    endif
+.    if defined(DOVECOT_USE_PGSQL) && !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
+PKG_OPTIONS.dovecot+=	pgsql
+.    endif
+.    if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+PKG_OPTIONS.dovecot+=	inet6
+.    endif
+.    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
+PKG_OPTIONS.dovecot+=	openldap
+.    endif
+.    if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
+PKG_OPTIONS.dovecot+=	sasl
+.    endif
+.  endif
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
+PKG_SUPPORTED_OPTIONS=	gnutls inet6 ldap mysql pgsql sasl
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+=	--enable-ssl=gnutls
+.  include "../../security/gnutls/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --enable-ssl=openssl
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysql)
+CONFIGURE_ARGS+=	--with-mysql
+.  include "../../databases/mysql4-client/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+CONFIGURE_ARGS+=	--with-pgsql
+CPPFLAGS+=		-I${BUILDLINK_DIR}/include/pgsql
+.  include "../../mk/pgsql.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+=	--with-ldap
+.  include "../../databases/openldap/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msasl)
+CONFIGURE_ARGS+=	--with-cyrus-sasl2
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
+.endif