summaryrefslogtreecommitdiff
path: root/mail/mutt
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-04-24 22:12:16 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-04-24 22:12:16 +0000
commit80b3ea3af159367ac3a669c3c278951f37c633c5 (patch)
treee29846db257aec7b5b6a2a9f4512c4314382f77f /mail/mutt
parent- Update to r29c (diff)
- Remove SASL1 support
PR: 112076 Submitted by: Udo Schweigert <udo.schweigert@siemens.com> (maintainer)
Notes
Notes: svn path=/head/; revision=190828
Diffstat (limited to 'mail/mutt')
-rw-r--r--mail/mutt/Makefile5
-rw-r--r--mail/mutt/files/patch-configure.in18
2 files changed, 1 insertions, 22 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 55b253df5adf..c5e217be8d11 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -65,7 +65,7 @@ LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
.endif
.if !defined (MUTT_LITE)
.if defined(WITH_MUTT_CYRUS_SASL)
-LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl
+IGNORE= The SASL support for mutt has been withdrawn. Please use the mutt-devel port instead
.endif
.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat
@@ -117,9 +117,6 @@ CONFIGURE_ARGS+= --with-slang=${PREFIX}
CONFIGURE_ARGS+= --with-curses=${PREFIX}
CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include
.endif
-.if defined(WITH_MUTT_CYRUS_SASL)
-CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
-.endif
.if !defined(WITHOUT_GSSAPI)
.if exists(${LOCALBASE}/bin/krb5-config)
LIB_DEPENDS+= gssapi_krb5:${PORTSDIR}/security/krb5
diff --git a/mail/mutt/files/patch-configure.in b/mail/mutt/files/patch-configure.in
index 0b37933c1c62..4e27667bfdd9 100644
--- a/mail/mutt/files/patch-configure.in
+++ b/mail/mutt/files/patch-configure.in
@@ -1,23 +1,5 @@
--- configure.in.orig Mon Nov 11 14:11:26 2002
+++ configure.in Mon Nov 11 14:12:09 2002
-@@ -515,7 +515,7 @@
- AC_MSG_ERROR([SSL support is only useful with POP or IMAP support])
- fi
-
-- if test "$with_ssl" != "yes"
-+ if test "$with_ssl" != "yes" && x$withval != x/usr
- then
- LDFLAGS="$LDFLAGS -L$withval/lib"
- CPPFLAGS="$CPPFLAGS -I$withval/include"
-@@ -572,7 +572,7 @@
- then
- if test "$with_sasl" != "yes"
- then
-- CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-+ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
- LDFLAGS="$LDFLAGS -L$with_sasl/lib"
- fi
-
@@ -625,7 +625,7 @@
fi])