[Lunar-commits] <moonbase> cyrus-sasl: db and gdbm are optional depends.

[Florin Braescu]

commit 27c4387e0c5ba662a894dd99991b1c390eaaf27e
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Wed Sep 23 20:55:47 2009 +0300

    cyrus-sasl: db and gdbm are optional depends.
---
 crypto/cyrus-sasl/BUILD   |    8 +++++---
 crypto/cyrus-sasl/DEPENDS |    7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/crypto/cyrus-sasl/BUILD b/crypto/cyrus-sasl/BUILD
index 1a2064d..acdbb62 100644
--- a/crypto/cyrus-sasl/BUILD
+++ b/crypto/cyrus-sasl/BUILD
@@ -7,7 +7,7 @@
     sedit "s/@LIBS@/@LIBS@ -lpam -lcrypt/" */Makefile.in
   else
     sedit "s/@LIBS@/@LIBS@ -lcrypt/" */Makefile.in
-  fi
+  fi  &&
 
   # default enabled modules in configure : checkapop, cram, digest, otp, gssapi, plain, anon
   OPTS=$OPTS" --enable-login                       \
@@ -19,14 +19,16 @@
               --with-plugindir=/usr/lib/sasl2      \
               --enable-sample                      \
               --with-gnu-ld                        \
-              --with-saslauthd=/var/lib/sasl "
+              --with-saslauthd=/var/lib/sasl "    &&
 
   default_config           &&
   mkdir -p /var/lib/sasl/  &&
   default_make             &&
+  
   if [ ! -d /etc/sasl2 ]; then
           mkdir -p /etc/sasl2
-  fi &&
+  fi  &&
+  
   if [ ! -e /etc/sasl2/smtpd.conf ] ; then
     install $SOURCE_CACHE/$SOURCE2 /etc/sasl2/smtpd.conf.gz  &&
     gunzip /etc/sasl2/smtpd.conf.gz
diff --git a/crypto/cyrus-sasl/DEPENDS b/crypto/cyrus-sasl/DEPENDS
index 399daa8..a94eb90 100644
--- a/crypto/cyrus-sasl/DEPENDS
+++ b/crypto/cyrus-sasl/DEPENDS
@@ -1,7 +1,8 @@
 depends openssl
-depends db
 
+optional_depends db         ""           ""              "for Brekley DB support"
 optional_depends Linux-PAM  "--with-pam" "--without-pam" "for PAM authentication"
-optional_depends mysql      "--enable-sql --with-mysql" "--without-mysql" "for mysql support"
-optional_depends postgresql "--enable-sql --with-pgsql" "--without-pgsql" "for postgreSQL support"
+optional_depends mysql      "--enable-sql --with-mysql"  "--without-mysql" "for mysql support"
+optional_depends postgresql "--enable-sql --with-pgsql"  "--without-pgsql" "for postgreSQL support"
+optional_depends gdbm       ""           ""              "for gdbm support"
 optional_depends heimdal    "--enable-gssapi=/usr/include --disable-krb4" "--disable-gssapi" "for GSSAPI support"