From f834b9678795753a8f3dd5bcf7c4e7018323f2d0 Mon Sep 17 00:00:00 2001
From: lebel <lebel@openbsd.org>
Date: Wed, 23 Jan 2002 19:01:28 +0000
Subject: [PATCH] naddy@, fgsch@ and I all agreed to remove the pop and imap
 FLAVORs and intergrate them in the default install in both stable and
 snapshot ports of mail/mutt

---
 mail/mutt/Makefile          |  4 +---
 mail/mutt/snapshot/Makefile | 19 ++++---------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index f56dc4ae249..4d33d2fcd7f 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,8 +1,6 @@
-# $OpenBSD: Makefile,v 1.48 2001/10/06 02:47:46 lebel Exp $ 
+# $OpenBSD: Makefile,v 1.49 2002/01/23 19:01:28 lebel Exp $ 
 
      SUBDIR += stable
-     SUBDIR += stable,imap,pop
      SUBDIR += snapshot
-     SUBDIR += snapshot,imap,pop
 
 .include <bsd.port.subdir.mk>
diff --git a/mail/mutt/snapshot/Makefile b/mail/mutt/snapshot/Makefile
index c3bfd8f1cc9..89b26e6ac5c 100644
--- a/mail/mutt/snapshot/Makefile
+++ b/mail/mutt/snapshot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2002/01/11 04:26:11 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2002/01/23 19:01:28 lebel Exp $
 
 COMMENT=	"tty-based e-mail client, development version"
 
@@ -24,14 +24,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FLAVORS=	slang imap pop mixmaster compressed
+FLAVORS=	slang mixmaster compressed
 FLAVOR?=
 
 SYSCONFDIR=	/etc/mutt
 CONFIGURE_ARGS=	--with-sharedir="${PREFIX}/share/mutt" \
 		--with-docdir="${PREFIX}/share/doc/mutt" \
 		--enable-flock --disable-fcntl \
-		--enable-external_dotlock
+		--enable-external_dotlock \
+		--enable-imap --enable-pop --with-ssl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		ISPELL="${LOCALBASE}/bin/ispell"
@@ -55,18 +56,6 @@ SUPDISTFILES+=  patch-${VERSION}.rr.compressed.2.gz:0
 CONFIGURE_STYLE= gnu
 .endif
 
-# If you need IMAP or POP, you may want to enable those.
-.if ${FLAVOR:L:Mimap}
-CONFIGURE_ARGS+= --enable-imap --with-ssl
-.endif
-
-# Note: The POP3 support is there only for convenience, and it's rather
-# limited.  If you need more functionality you should consider using a
-# specialized program, such as fetchmail.
-.if ${FLAVOR:L:Mpop}
-CONFIGURE_ARGS+= --enable-pop --with-ssl
-.endif
-
 .if ${FLAVOR:L:Mmixmaster}
 CONFIGURE_ARGS+= --with-mixmaster="${LOCALBASE}/sbin/mixmaster"
 RUN_DEPENDS+=	::mail/mixmaster