diff options
author | fredb <fredb> | 2002-06-15 15:32:27 +0000 |
---|---|---|
committer | fredb <fredb> | 2002-06-15 15:32:27 +0000 |
commit | 036be8b8174cd0376677f5b1fe8066ac500048fe (patch) | |
tree | 58ff53a20d5295199e46d3ae2886c96acead672d | |
parent | f3b3fa5f9adb2896426d169c504b0add7eb1837e (diff) | |
download | pkgsrc-036be8b8174cd0376677f5b1fe8066ac500048fe.tar.gz |
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.
-rw-r--r-- | mail/mutt/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
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 |