View | Details | Raw Unified | Return to bug 270693 | Differences between
and this patch

Collapse All | Expand All

(-)b/mail/neomutt/Makefile (-14 / +17 lines)
Lines 13-35 RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support \ Link Here
13
		urlview:textproc/urlview
13
		urlview:textproc/urlview
14
LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
14
LIB_DEPENDS=	libpcre2-posix.so:devel/pcre2
15
15
16
USES=		cpe iconv:translit localbase ncurses perl5 pkgconfig shebangfix ssl
16
USES=		cpe iconv:translit localbase ncurses perl5 pkgconfig \
17
		python:env shebangfix ssl
17
18
18
USE_GITHUB=	yes
19
USE_GITHUB=	yes
19
USE_PERL5=	build
20
USE_PERL5=	build
20
MAKE_JOBS_UNSAFE=	yes
21
22
SHEBANG_FILES=	contrib/oauth2/mutt_oauth2.py contrib/smime_keys \
23
		data/account-command/macos-keychain/keychain.py
21
24
22
HAS_CONFIGURE=	yes
25
HAS_CONFIGURE=	yes
26
CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARGS} \
27
		--disable-idn \
28
		--fmemopen \
29
		--locales-fix \
30
		--mandir=${PREFIX}/man \
31
		--pcre2 \
32
		--with-ssl="${OPENSSLBASE}"
33
CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
23
34
24
OPTIONS_SUB=	yes
35
MAKE_JOBS_UNSAFE=	yes
25
SHEBANG_FILES=	contrib/smime_keys
26
36
27
OPTIONS_DEFINE=	NLS DOCS SASL IDN FLOCK GPGME NOTMUCH
37
OPTIONS_DEFINE=	NLS DOCS SASL IDN FLOCK GPGME NOTMUCH
28
OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES GSSAPI_BASE
38
OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB GSSAPI_BASE
29
OPTIONS_MULTI=	HCACHE
39
OPTIONS_MULTI=	HCACHE
30
OPTIONS_MULTI_HCACHE=	BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
40
OPTIONS_MULTI_HCACHE=	BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
31
OPTIONS_SINGLE=	GSSAPI
41
OPTIONS_SINGLE=	GSSAPI
32
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
42
OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
43
OPTIONS_SUB=	yes
33
44
34
FLOCK_DESC=	Use flock() to lock files
45
FLOCK_DESC=	Use flock() to lock files
35
GPGME_DESC=	Use gpgme to handle pgp
46
GPGME_DESC=	Use gpgme to handle pgp
Lines 41-55 QDBM_DESC= Quick DataBase Manager support Link Here
41
TOKYOCABINET_DESC=	Tokyo Cabinet support
52
TOKYOCABINET_DESC=	Tokyo Cabinet support
42
SCREEN_DESC=	Screen options
53
SCREEN_DESC=	Screen options
43
54
44
CONFIGURE_ARGS=	--with-ssl="${OPENSSLBASE}" \
45
		--locales-fix \
46
		--fmemopen \
47
		--pcre2 \
48
		--disable-idn \
49
		--mandir=${PREFIX}/man \
50
		${ICONV_CONFIGURE_ARGS}
51
CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
52
53
# Header cache
55
# Header cache
54
BDB_CONFIGURE_ON=		--bdb
56
BDB_CONFIGURE_ON=		--bdb
55
BDB_USES=			bdb
57
BDB_USES=			bdb
Lines 90-95 GSSAPI_HEIMDAL_USES= gssapi:heimdal Link Here
90
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${LOCALBASE}
92
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${LOCALBASE}
91
GSSAPI_MIT_USES=		gssapi:mit
93
GSSAPI_MIT_USES=		gssapi:mit
92
GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${LOCALBASE}
94
GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${LOCALBASE}
95
GSSAPI_NONE_CONFIGURE_ON=	--disable-gss
93
96
94
DOCS_CONFIGURE_OFF=	--disable-doc
97
DOCS_CONFIGURE_OFF=	--disable-doc
95
DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
98
DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
(-)b/mail/neomutt/files/patch-autosetup_autosetup-find-tclsh (+15 lines)
Added Link Here
1
auto.def started using 'lmap' between`neomutt-20220429`and neomutt-20230322
2
tclsh8.5 does not support that.
3
https://github.com/neomutt/neomutt/issues/3808
4
5
--- autosetup/autosetup-find-tclsh.orig	2023-03-22 15:35:11 UTC
6
+++ autosetup/autosetup-find-tclsh
7
@@ -4,7 +4,7 @@
8
 # Prefer $autosetup_tclsh if is set in the environment (unless ./jimsh0 works)
9
 # If an argument is given, use that as the test instead of autosetup-test-tclsh
10
 d="`dirname "$0"`"
11
-for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6 tclsh8.7; do
12
+for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.6 tclsh8.7; do
13
 	{ $tclsh "$d/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0
14
 done
15
 echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"

Return to bug 270693