diff options
| author | tron <tron@pkgsrc.org> | 2001-11-22 21:34:45 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-11-22 21:34:45 +0000 |
| commit | 7c7d68c5c5cec5e45411e8e6b0d216337f8c159d (patch) | |
| tree | 3b7558ab1791530bcc1548024ce02f72b74f405c | |
| parent | 161d9bfe09d860277fa4b1cc7b27a672c2dbe78e (diff) | |
| download | pkgsrc-7c7d68c5c5cec5e45411e8e6b0d216337f8c159d.tar.gz | |
Add a new option "MUTT_USE_SLANG" to use the "slang" library instead of
"curses" because the first deals with resize better, especially under
NetBSD 1.5/1.5.x. This change was suggested by Joe Abley in PR pkg/13630.
| -rw-r--r-- | mail/mutt-devel/Makefile | 21 | ||||
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 9 |
2 files changed, 21 insertions, 9 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index b59057da40b..d834b95e65f 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/11/07 09:19:03 tron Exp $ +# $NetBSD: Makefile,v 1.16 2001/11/22 21:34:45 tron Exp $ DISTNAME= mutt-1.3.23i PKGNAME= ${DISTNAME:C/i$//} @@ -19,15 +19,24 @@ BUILD_USES_MSGFMT= YES USE_GMAKE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/mutt \ - --enable-pop --enable-imap \ - --without-included-gettext -CONFIGURE_ARGS+= --with-curses=${BUILDLINK_DIR} + --without-included-gettext \ + --enable-pop --enable-imap LDFLAGS+= ${STRIPFLAG} WRKSRC= ${WRKDIR}/${DISTNAME:C/i$$//} .include "../../mk/bsd.prefs.mk" +.if defined(MUTT_USE_SLANG) && ${MUTT_USE_SLANG} != NO +CONFIGURE_ARGS+= --with-slang=${BUILDLINK_DIR} + +.include "../../devel/libslang/buildlink.mk" +.else +CONFIGURE_ARGS+= --with-curses=${BUILDLINK_DIR} + +.include "../../devel/ncurses/buildlink.mk" +.endif + # There seems to be a problem using NetBSD's /bin/sh, so use /bin/ksh instead. .if ${OPSYS} == "NetBSD" CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh @@ -36,14 +45,13 @@ CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh MUTT_USE_SSL?= YES .if defined(MUTT_USE_SSL) && ${MUTT_USE_SSL} == "YES" -#USE_SSL= YES .include "../../security/openssl/buildlink.mk" CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} .else CONFIGURE_ARGS+= --without-ssl .endif -BUILD_DEFS+= MUTT_USE_SSL +BUILD_DEFS+= MUTT_USE_SLANG MUTT_USE_SSL DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" @@ -66,5 +74,4 @@ post-install: .include "../../converters/libiconv/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/ncurses/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 17f11312996..76c65a3b865 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.13 2001/11/12 23:04:26 enami Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.14 2001/11/22 21:40:19 tron Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -868,11 +868,16 @@ MAJORDOMO_USER?= majordom # Possible: defined, not defined # Default: not defined -MUTT_USE_SSL?= YES +#MUTT_USE_SSL?= YES # Enable SSL in mutt (for pop and imap connections) # Possible: YES, NO # Default: YES +#MUTT_USE_SLANG?= NO +# Use slang instead of curses in mutt +# Possible: YES, NO +# Default: NO + NMH_EDITOR?= vi # default editor for use in nmh. # Possible: any editor. |