[Midnightbsd-cvs] mports: mail/mutt: remove sasl1 configuration.

[laffer1 at midnightbsd.org]

Log Message:
-----------
remove sasl1 configuration.  add license

Modified Files:
--------------
    mports/mail/mutt:
        Makefile (r1.2 -> r1.3)
    mports/mail/mutt/files:
        patch-configure.in (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/mutt/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L mail/mutt/Makefile -L mail/mutt/Makefile -u -r1.2 -r1.3
--- mail/mutt/Makefile
+++ mail/mutt/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -30,6 +30,7 @@
 
 MAINTAINER?=	ports at MidnightBSD.org
 COMMENT?=	The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
+LICENSE=	gpl2
 
 CONFLICTS=	mutt-devel-*
 
@@ -62,9 +63,6 @@
 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
-.endif
 .if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .endif
@@ -76,6 +74,7 @@
 
 DIST_SUBDIR=	mutt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
+USE_GMAKE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake:19 autoconf:261
@@ -115,9 +114,6 @@
 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
 MAN1=		mutt.1 mutt_dotlock.1
 MAN5=		mbox.5 muttrc.5
 
Index: patch-configure.in
===================================================================
RCS file: /home/cvs/mports/mail/mutt/files/patch-configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L mail/mutt/files/patch-configure.in -L mail/mutt/files/patch-configure.in -u -r1.1 -r1.2
--- mail/mutt/files/patch-configure.in
+++ 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])