diff options
| author | Andraž Levstik | 2007-10-31 09:44:39 +0100 |
|---|---|---|
| committer | Andraž Levstik | 2007-10-31 09:44:39 +0100 |
| commit | 4864ea80b4e67b0db6f35e850906904fa4cc417a (patch) | |
| tree | 4d7b213201f9f88f814a4e91330d6ef02f135b9d | |
| parent | ec6ef16bc8c8d9e002ec858ca88fbb5086092e11 (diff) | |
alpine: minor cleanup of BUILD and moving stuff to DEPENDS
| -rwxr-xr-x | mail/alpine/BUILD | 13 | ||||
| -rwxr-xr-x | mail/alpine/DEPENDS | 21 | ||||
| -rw-r--r-- | mail/alpine/HISTORY | 4 |
3 files changed, 20 insertions, 18 deletions
diff --git a/mail/alpine/BUILD b/mail/alpine/BUILD index 9447ed2231..6ddf11bd87 100755 --- a/mail/alpine/BUILD +++ b/mail/alpine/BUILD @@ -1,13 +1,2 @@ -if echo $OPTS | grep -q with-ssl; then - message "${MESSAGE_COLOR}Building with OpenSSL...${DEFAULT_COLOR}" && - ALPINE_OPTS="${ALPINE_OPTS} \ - --with-ssl-dir=$INSTALL_ROOT/usr \ - --with-ssl-certs-dir=$INSTALL_ROOT/etc/ssl/certs \ - --with-ssl-include-dir=$INSTALL_ROOT/usr/include/openssl \ - --with-ssl-lib-dir=$INSTALL_ROOT/usr/lib" -else - message "${MESSAGE_COLOR}Building without OpenSSL...${DEFAULT_COLOR}" -fi && - -OPTS="${OPTS} --with-system-pinerc=/etc/pinerc --with-c-client-target=slx ${ALPINE_OPTS}" && +OPTS="--with-system-pinerc=/etc/pinerc --with-c-client-target=slx ${ALPINE_OPTS} $OPTS" && default_build diff --git a/mail/alpine/DEPENDS b/mail/alpine/DEPENDS index 7c15b663c8..9840edd561 100755 --- a/mail/alpine/DEPENDS +++ b/mail/alpine/DEPENDS @@ -1,14 +1,23 @@ depends MAIL-TRANSPORT-AGENT && -optional_depends openssl '--with-ssl-dir' '--without-ssl' \ - 'for SSL/TLS support' && +optional_depends openssl \ + "--with-ssl-dir=$INSTALL_ROOT/usr \ + --with-ssl-certs-dir=$INSTALL_ROOT/etc/ssl/certs \ + --with-ssl-include-dir=$INSTALL_ROOT/usr/include/openssl \ + --with-ssl-lib-dir=$INSTALL_ROOT/usr/lib" \ + "--without-ssl" \ + "for SSL/TLS support" && # it doesn't detect TCL as much as i have tried #optional_depends tcl '--with-tcl-lib' '--without-tcl' \ # 'for Web Alpine support' && -optional_depends openldap '--with-ldap-dir' '--without-ldap' \ - 'for LDAP support' && +optional_depends openldap \ + '--with-ldap-dir' \ + '--without-ldap' \ + 'for LDAP support' && -optional_depends krb5 '--with-krb5-dir' '--without-krb5' \ - 'for Kerberos support' +optional_depends krb5 \ + '--with-krb5-dir' \ + '--without-krb5' \ + 'for Kerberos support' diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY index 147ac10495..fcb18204f0 100644 --- a/mail/alpine/HISTORY +++ b/mail/alpine/HISTORY @@ -1,2 +1,6 @@ +2007-10-31 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> + * BUILD: removed the unnecessary ssl stuff + * DEPENDS: added more opts to the ssl stuff + 2007-10-30 Elisamuel Resto <ryuji@mages.ath.cx> * BUILD, CONFIGURE, DEPENDS, DETAILS: spell created from current c-client spell. |