disable gss support and add an old patch sitting in my tree for >1 year to

fix F1 help text display in stable.
This commit is contained in:
sthen 2014-04-21 18:57:49 +00:00
parent 426ec86372
commit bd7d813a70
4 changed files with 22 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.44 2013/06/20 08:26:13 ajacoutot Exp $
# $OpenBSD: Makefile.inc,v 1.45 2014/04/21 18:57:49 sthen Exp $
CATEGORIES= mail
@ -21,8 +21,7 @@ MODULES= devel/gettext
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB+= c crypto gssapi krb5 ssl asn1 com_err heimbase
WANTLIB+= roken wind
WANTLIB+= c crypto ssl
FLAVORS+= slang mixmaster compressed
FLAVOR?=
@ -37,7 +36,6 @@ CONFIGURE_ARGS+=--enable-external_dotlock \
--mandir=${PREFIX}/man \
--sysconfdir=${CONFDIR} \
--with-docdir="${PREFIX}/share/doc/mutt" \
--with-gss \
--with-ssl
FAKE_FLAGS= sysconfdir="${PREFIX}/share/examples/mutt"
PATCH_DIST_STRIP= -p1

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.82 2014/03/12 22:33:01 sthen Exp $
# $OpenBSD: Makefile,v 1.83 2014/04/21 18:57:49 sthen Exp $
COMMENT= tty-based e-mail client, development version
DISTNAME= mutt-1.5.23
EPOCH= 0
REVISION= 0
# http://prefix.gentooexperimental.org:8000/mutt-patches is useful
MASTER_SITES= ${MASTER_SITES_MUTT} \
${MASTER_SITE_SOURCEFORGE:=mutt/} \

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.47 2013/06/20 08:26:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.48 2014/04/21 18:57:49 sthen Exp $
COMMENT= tty-based e-mail client
VERSION= 1.4.2.3
DISTNAME= mutt-${VERSION}
EPOCH= 0
REVISION= 3
REVISION= 4
# 1.4.2.3 is not on sourceforge, the latest 1.4.x is 1.4.2.2i
MASTER_SITES= ${MASTER_SITES_MUTT}
USE_GROFF= Yes

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Muttrc,v 1.1 2014/04/21 18:57:49 sthen Exp $
--- Muttrc.orig Sat Mar 16 01:44:46 2013
+++ Muttrc Sun Mar 17 00:28:11 2013
@@ -15,9 +15,9 @@ macro index \cb |urlview\n 'call urlview to extract UR
macro pager \cb |urlview\n 'call urlview to extract URLs out of a message'
# Show documentation when pressing F1
-macro generic <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
-macro index <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
-macro pager <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
+macro generic <f1> "!less -R /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
+macro index <f1> "!less -R /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
+macro pager <f1> "!less -R /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
# If Mutt is unable to determine your site's domain name correctly, you can
# set the default here.