mutt: unbundle cyrus-sasl

extra/cyrus-sasl/build

@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/usr/bin
+
+make
+make DESTDIR="$1" install

extra/cyrus-sasl/checksums

@@ -0,0 +1 @@
+7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c

extra/cyrus-sasl/depends

@@ -0,0 +1 @@
+openssl

extra/cyrus-sasl/sources

@@ -0,0 +1 @@
+https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-VERSION/cyrus-sasl-VERSION.tar.gz

extra/cyrus-sasl/version

@@ -0,0 +1 @@
+2.1.28 1

extra/mutt/build

@@ -1,28 +1,10 @@
 #!/bin/sh -e
 
-out=$PWD/out
-mkdir -p out
-
-(
-    cd cyrus-sasl
-
-    ./configure \
-        LIBS='-lssl -lcrypto' \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --disable-shared \
-        --sbindir=/usr/bin
-
-    make
-    make DESTDIR="$out" install
-)
-
 # Remove perl dependency.
 sed 's/ doc contrib/ contrib/g' Makefile.in > _
 mv -f _ Makefile.in
 
 ./configure \
-    ac_cv_search_sasl_encode64=-lsasl2 \
     --prefix=/usr \
     --sysconfdir=/etc \
     --disable-doc \
@@ -30,8 +12,8 @@ mv -f _ Makefile.in
     --enable-pop \
     --enable-imap \
     --enable-smtp \
-    --with-ssl \
-    --with-sasl="$out/usr"
+    --with-sasl \
+    --with-ssl
 
 make
 make install-exec

extra/mutt/checksums

@@ -1,2 +1 @@
 eb13858f58bb369f477bf652d90e9b6aaddd0d610acbea3455049e5efad36df1
-7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c

extra/mutt/depends

@@ -1,3 +1,4 @@
+cyrus-sasl
 ncurses
 openssl
 zlib

extra/mutt/sources

@@ -1,2 +1 @@
 https://bitbucket.org/mutt/mutt/downloads/mutt-VERSION.tar.gz
-https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz cyrus-sasl

extra/mutt/version

@@ -1 +1 @@
-2.2.7 1
+2.2.7 2