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

Collapse All | Expand All

(-)Makefile (-22 / +13 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	mutt
4
PORTNAME=	mutt
5
PORTVERSION=	1.5.24
5
PORTVERSION=	1.5.24
6
PORTREVISION?=	2
6
PORTREVISION?=	3
7
CATEGORIES+=	mail ipv6
7
CATEGORIES+=	mail ipv6
8
MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
8
MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
9
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
9
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
Lines 54-60 Link Here
54
OPTIONS_UNSET=	NLS DOCS EXAMPLES
54
OPTIONS_UNSET=	NLS DOCS EXAMPLES
55
.else
55
.else
56
OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
56
OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
57
		GPGME GREETING_PATCH GSSAPI HTML ICONV IDN IFDEF_PATCH \
57
		GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
58
		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
58
		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
59
		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
59
		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
60
		MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \
60
		MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \
Lines 62-70 Link Here
62
		SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \
62
		SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \
63
		TOKYOCABINET TRASH_PATCH URLVIEW XML
63
		TOKYOCABINET TRASH_PATCH URLVIEW XML
64
64
65
OPTIONS_SINGLE=	SCREEN
65
OPTIONS_SINGLE=	GSSAPI SCREEN
66
OPTIONS_RADIO=	SPELL
66
OPTIONS_RADIO=	SPELL
67
OPTIONS_RADIO_SPELL=	ASPELL ISPELL
67
OPTIONS_RADIO_SPELL=	ASPELL ISPELL
68
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
68
OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
69
OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
69
70
70
COMPRESSED_FOLDERS_DESC=	Compressed folders
71
COMPRESSED_FOLDERS_DESC=	Compressed folders
Lines 73-79 Link Here
73
FLOCK_DESC=	flock() usage
74
FLOCK_DESC=	flock() usage
74
GPGME_DESC=	Gpgme interface
75
GPGME_DESC=	Gpgme interface
75
GREETING_PATCH_DESC=	Greeting support
76
GREETING_PATCH_DESC=	Greeting support
76
GSSAPI_DESC=	Use the gss API
77
HTML_DESC=	HTML documentation
77
HTML_DESC=	HTML documentation
78
IFDEF_PATCH_DESC=	ifdef feature
78
IFDEF_PATCH_DESC=	ifdef feature
79
IMAP_HEADER_CACHE_DESC=	IMAP header cache
79
IMAP_HEADER_CACHE_DESC=	IMAP header cache
Lines 141-146 Link Here
141
NLS_USES=	gettext
141
NLS_USES=	gettext
142
NLS_CONFIGURE_OFF=	--disable-nls
142
NLS_CONFIGURE_OFF=	--disable-nls
143
143
144
# Handle GSSAPI from various places
145
GSSAPI_BASE_USES=	gssapi
146
GSSAPI_BASE_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
147
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
148
GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
149
GSSAPI_MIT_USES=	gssapi:mit
150
GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
151
GSSAPI_NONE_CONFIGURE_ON=	--without-gss
152
144
ICONV_USES=	iconv:translit
153
ICONV_USES=	iconv:translit
145
ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
154
ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
146
ICONV_CONFIGURE_OFF=	--disable-iconv
155
ICONV_CONFIGURE_OFF=	--disable-iconv
Lines 229-252 Link Here
229
			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
238
			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
230
		${BUILD_WRKSRC}/Makefile
239
		${BUILD_WRKSRC}/Makefile
231
240
232
.if ${PORT_OPTIONS:MGSSAPI}
233
.if exists(${LOCALBASE}/bin/krb5-config)
234
LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
235
CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
236
.elif exists(${KRB5_HOME}/bin/krb5-config)
237
LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
238
CONFIGURE_ARGS+=	--with-gss=${KRB5_HOME}
239
LDFLAGS+=		-L${KRB5_HOME}/lib -Wl,-rpath=${KRB5_HOME}/lib -ltinfow
240
.elif exists(${HEIMDAL_HOME}/bin/krb5-config)
241
LIB_DEPENDS+=		libgssapi_krb5.so:${PORTSDIR}/security/krb5
242
CONFIGURE_ARGS+=	--with-gss=${HEIMDAL_HOME}
243
LDFLAGS+=		-L${HEIMDAL_HOME}/lib -Wl,-rpath=${HEIMDAL_HOME}/lib -ltinfow
244
.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
245
CONFIGURE_ARGS+=	--with-gss
246
WITH_KRB5_SYS=yes
247
.endif
248
.endif
249
250
LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
241
LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
251
CFLAGS+=		${CFLAGS_ADD}
242
CFLAGS+=		${CFLAGS_ADD}
252
LDFLAGS+=		${LDFLAGS_ADD}
243
LDFLAGS+=		${LDFLAGS_ADD}
(-)files/patch-m4-gssapi.m4 (+10 lines)
Line 0 Link Here
1
--- m4/gssapi.m4.orig	2015-08-30 19:06:38.000000000 +0200
2
+++ m4/gssapi.m4	2016-01-25 15:04:37.448609000 +0100
3
@@ -27,6 +27,7 @@
4
     GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`"
5
     case "`$KRB5CFGPATH --version`" in
6
       "Kerberos 5 "*)	GSSAPI_IMPL="MIT";;
7
+      "FreeBSD heimdal"*)		GSSAPI_IMPL="Heimdal";;
8
       ?eimdal*)		GSSAPI_IMPL="Heimdal";;
9
       *)		GSSAPI_IMPL="Unknown";;
10
    esac

Return to bug 206220