From f63b6c64906527cf61e10d242b29d1b4e8abcfbc Mon Sep 17 00:00:00 2001
From: fredb <fredb@pkgsrc.org>
Date: Sat, 15 Jun 2002 15:32:27 +0000
Subject: Add a knob to force build with "ncurses", and count on all the
 USE_MUTT_* knobs to have a default set in bsd.pkg.defaults.mk, since they now
 are.

---
 mail/mutt/Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'mail')

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 6fcc8b36b0a..899d054d633 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2002/05/29 12:13:52 tron Exp $
+# $NetBSD: Makefile,v 1.80 2002/06/15 15:32:27 fredb Exp $
 
 DISTNAME=		mutt-1.4i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -28,12 +28,15 @@ WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(MUTT_USE_SLANG) && ${MUTT_USE_SLANG} != NO
-.include "../../devel/libslang/buildlink.mk"
+.if ${MUTT_USE_SLANG} == YES
+. include "../../devel/libslang/buildlink.mk"
 CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_DIR}
 .else
-.include "../../devel/ncurses/buildlink.mk"
+. include "../../devel/ncurses/buildlink.mk"
 CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_DIR}
+. if ${MUTT_USE_NCURSES} == YES
+USE_NCURSES=		YES
+. endif
 .endif
 
 # There seems to be a problem using NetBSD's /bin/sh, so use /bin/ksh instead.
@@ -41,16 +44,14 @@ CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 .endif
 
-MUTT_USE_SSL?=		YES
-
-.if defined(MUTT_USE_SSL) && ${MUTT_USE_SSL} == "YES"
+.if ${MUTT_USE_SSL} == YES
 .include "../../security/openssl/buildlink.mk"
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
 
-BUILD_DEFS+=		MUTT_USE_SLANG MUTT_USE_SSL
+BUILD_DEFS+=		MUTT_USE_NCURSES MUTT_USE_SLANG MUTT_USE_SSL
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 EGDIR=			${PREFIX}/share/doc/mutt/samples
-- 
cgit v1.2.3