View | Details | Raw Unified | Return to bug 262849
Collapse All | Expand All

(-)b/mail/mutt/Makefile (-70 / +68 lines)
Lines 1-7 Link Here
1
# Created by: Udo Schweigert
1
# Created by: Udo Schweigert
2
2
3
PORTNAME=	mutt
3
PORTNAME=	mutt
4
DISTVERSION=	2.2.1
4
DISTVERSION=	2.2.2
5
CATEGORIES+=	mail
5
CATEGORIES+=	mail
6
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
6
MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
7
		https://bitbucket.org/mutt/mutt/downloads/ \
7
		https://bitbucket.org/mutt/mutt/downloads/ \
Lines 10-18 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ Link Here
10
DIST_SUBDIR=	mutt
10
DIST_SUBDIR=	mutt
11
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
11
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
12
12
13
PATCH_SITES+=		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
13
PATCH_SITES+=	http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
14
			http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
14
		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
15
			http://vc.org.ua/mutt/:vc
15
		http://vc.org.ua/mutt/:vc
16
PATCH_DIST_STRIP=	-p1
16
PATCH_DIST_STRIP=	-p1
17
17
18
MAINTAINER=	dereks@lifeofadishwasher.com
18
MAINTAINER=	dereks@lifeofadishwasher.com
Lines 42-64 CONFIGURE_ARGS= --disable-fcntl \ Link Here
42
CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
42
CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
43
.endif
43
.endif
44
44
45
CONFLICTS=	ja-mutt ja-mutt-devel mutt-1.4* \
45
CONFLICTS=	ja-mutt ja-mutt-devel mutt-1.4* mutt-devel-lite mutt-lite \
46
		mutt-devel-lite mutt-lite zh-mutt-devel
46
		zh-mutt-devel
47
47
48
INFO=		${PORTNAME}
48
INFO=		${PORTNAME}
49
49
50
OPTIONS_SUB=	yes
50
OPTIONS_DEFINE=		AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK GPGME \
51
51
			GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
52
OPTIONS_DEFINE=	AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK GPGME GREETING_PATCH \
52
			MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \
53
		HTML ICONV IDN IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES \
53
			REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW
54
		MAILDIR_MTIME_PATCH NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL \
54
OPTIONS_DEFAULT=	AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML \
55
		SMART_DATE SMIME SMTP URLVIEW
55
			ICONV IDN IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES \
56
			MAILDIR_MTIME_PATCH NCURSES NLS QUOTE_PATCH \
57
			REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW
56
58
57
OPTIONS_SINGLE=		GSSAPI HCACHE SCREEN
59
OPTIONS_SINGLE=		GSSAPI HCACHE SCREEN
58
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
60
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
59
OPTIONS_SINGLE_HCACHE=	HCACHE_BDB HCACHE_KYOTOCABINET HCACHE_NONE \
61
OPTIONS_SINGLE_HCACHE=	HCACHE_BDB HCACHE_KYOTOCABINET HCACHE_NONE \
60
			HCACHE_TOKYOCABINET
62
			HCACHE_TOKYOCABINET
61
OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
63
OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
64
OPTIONS_SUB=		yes
62
65
63
AUTOCRYPT_DESC=			Convenient End-to-End Encryption
66
AUTOCRYPT_DESC=			Convenient End-to-End Encryption
64
DEBUG_LOGS_DESC=		Debugging capabilities
67
DEBUG_LOGS_DESC=		Debugging capabilities
Lines 81-128 NLS_DESC= Native language support (implies ICONV) Link Here
81
QUOTE_PATCH_DESC=		Extended quoting
84
QUOTE_PATCH_DESC=		Extended quoting
82
REVERSE_REPLY_PATCH_DESC=	Reverse_reply
85
REVERSE_REPLY_PATCH_DESC=	Reverse_reply
83
SASL_DESC=			SASL authentication
86
SASL_DESC=			SASL authentication
84
SMIME_DESC=			SMIME email check option patch
85
SLANG_DESC=			SLANG support
87
SLANG_DESC=			SLANG support
86
SMART_DATE_DESC=		Dynamic date formatting with "%@"
88
SMART_DATE_DESC=		Dynamic date formatting with "%@"
89
SMIME_DESC=			SMIME email check option patch
87
SMTP_DESC=			SMTP relay support
90
SMTP_DESC=			SMTP relay support
88
URLVIEW_DESC=			Use urlview for the URL selector menu
91
URLVIEW_DESC=			Use urlview for the URL selector menu
89
92
90
OPTIONS_DEFAULT=	AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML \
91
			ICONV IDN IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES \
92
			MAILDIR_MTIME_PATCH NCURSES NLS QUOTE_PATCH \
93
			REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW
94
95
.ifmake makesum # for optional distfiles patchfiles
96
OPTIONS_OVERRIDE=	${OPTIONS_DEFAULT} ${OPTIONS_DEFINE}
97
.MAKEOVERRIDES+=	OPTIONS_OVERRIDE
98
.endif
99
100
AUTOCRYPT_CONFIGURE_ENABLE=	autocrypt
101
AUTOCRYPT_IMPLIES=		GPGME IDN
93
AUTOCRYPT_IMPLIES=		GPGME IDN
94
AUTOCRYPT_BUILD_DEPENDS=	${AUTOCRYPT_DEPENDS}
95
AUTOCRYPT_RUN_DEPENDS=		${AUTOCRYPT_DEPENDS}
102
AUTOCRYPT_USES=			sqlite:3
96
AUTOCRYPT_USES=			sqlite:3
97
AUTOCRYPT_CONFIGURE_ENABLE=	autocrypt
103
AUTOCRYPT_CONFIGURE_WITH=	sqlite3=${LOCALBASE}
98
AUTOCRYPT_CONFIGURE_WITH=	sqlite3=${LOCALBASE}
104
AUTOCRYPT_DEPENDS=		gnupg>=2.1:security/gnupg \
99
AUTOCRYPT_DEPENDS=		gnupg>=2.1:security/gnupg \
105
				gpgme>=1.8:security/gpgme
100
				gpgme>=1.8:security/gpgme
106
AUTOCRYPT_BUILD_DEPENDS=	${AUTOCRYPT_DEPENDS}
107
AUTOCRYPT_RUN_DEPENDS=		${AUTOCRYPT_DEPENDS}
108
109
URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
110
101
111
DEBUG_LOGS_CONFIGURE_ON=	--enable-debug
102
DEBUG_LOGS_CONFIGURE_ON=	--enable-debug
112
103
113
DOCS_CONFIGURE_OFF=	--disable-doc
114
DOCS_BUILD_DEPENDS=	lynx:www/lynx
104
DOCS_BUILD_DEPENDS=	lynx:www/lynx
105
DOCS_CONFIGURE_OFF=	--disable-doc
115
106
116
# Handle ncurses/ncurses-port/slang
107
FLOCK_CONFIGURE_ENABLE=	flock
117
SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
118
SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
119
SLANG_VARS=		PKGMESSAGE=${FILESDIR}/pkg-message.slang
120
108
121
NCURSES_USES=	ncurses
109
GPGME_LIB_DEPENDS+=	libassuan.so:security/libassuan \
110
			libgpg-error.so:security/libgpg-error \
111
			libgpgme.so:security/gpgme
122
112
123
NLS_USES=		gettext
113
GPGME_CONFIGURE_ENABLE=	gpgme
124
NLS_CONFIGURE_ENABLE=	nls
114
125
NLS_IMPLIES=		ICONV
115
GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
126
116
127
# Handle GSSAPI from various places
117
# Handle GSSAPI from various places
128
GSSAPI_BASE_USES=		gssapi
118
GSSAPI_BASE_USES=		gssapi
Lines 136-193 GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \ Link Here
136
				--with-gss=${GSSAPIBASEDIR}
126
				--with-gss=${GSSAPIBASEDIR}
137
GSSAPI_NONE_CONFIGURE_ON=	--without-gss
127
GSSAPI_NONE_CONFIGURE_ON=	--without-gss
138
128
139
HCACHE_NONE_CONFIGURE_ON=	--disable-hcache
129
HCACHE_BDB_USES=			bdb:42+
140
HCACHE_NONE_CONFIGURE_OFF=	--enable-hcache
130
HCACHE_BDB_CONFIGURE_WITH=		bdb=${LOCALBASE}
141
131
HCACHE_BDB_VARS=			CFLAGS+=-I${BDB_INCLUDE_DIR} \
142
HCACHE_BDB_CONFIGURE_WITH=	bdb=${LOCALBASE}
132
					LDFLAGS+=-L${BDB_LIB_DIR}
143
HCACHE_BDB_USES=		bdb:42+
144
HCACHE_BDB_VARS=		CFLAGS+=-I${BDB_INCLUDE_DIR} \
145
				LDFLAGS+=-L${BDB_LIB_DIR}
146
147
HCACHE_TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet=${LOCALBASE}
148
HCACHE_TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
149
150
HCACHE_KYOTOCABINET_CONFIGURE_WITH=	kyotocabinet=${LOCALBASE}
151
HCACHE_KYOTOCABINET_LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
133
HCACHE_KYOTOCABINET_LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
134
HCACHE_KYOTOCABINET_CONFIGURE_WITH=	kyotocabinet=${LOCALBASE}
135
HCACHE_NONE_CONFIGURE_ON=		--disable-hcache
136
HCACHE_NONE_CONFIGURE_OFF=		--enable-hcache
137
HCACHE_TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
138
HCACHE_TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet=${LOCALBASE}
152
139
153
ICONV_USES=		iconv:translit
140
ICONV_USES=		iconv:translit
154
ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
141
ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
155
ICONV_CONFIGURE_OFF=	--disable-iconv
142
ICONV_CONFIGURE_OFF=	--disable-iconv
156
143
157
REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
144
IDN_IMPLIES=		ICONV
158
159
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
160
SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
161
162
SMIME_EXTRA_PATCHES=	${PATCHDIR}/extra-smime-sender
163
164
SMART_DATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smartdate
165
166
FLOCK_CONFIGURE_ENABLE=	flock
167
168
LOCALES_FIX_CONFIGURE_ON=	--enable-locales-fix
169
170
IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
145
IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
171
			libunistring.so:devel/libunistring
146
			libunistring.so:devel/libunistring
172
IDN_CONFIGURE_WITH=	idn2=${LOCALBASE}
147
IDN_CONFIGURE_WITH=	idn2=${LOCALBASE}
173
IDN_IMPLIES=		ICONV
174
148
175
IFDEF_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ifdef
149
IFDEF_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ifdef
176
150
177
GPGME_LIB_DEPENDS+=	libassuan.so:security/libassuan \
151
LOCALES_FIX_CONFIGURE_ON=	--enable-locales-fix
178
			libgpg-error.so:security/libgpg-error \
179
			libgpgme.so:security/gpgme
180
GPGME_CONFIGURE_ENABLE=	gpgme
181
182
SMTP_CONFIGURE_ENABLE=	smtp
183
152
184
MAILDIR_MTIME_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-maildir-mtime
153
MAILDIR_MTIME_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-maildir-mtime
185
154
186
GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
155
NCURSES_USES=	ncurses
156
157
NLS_IMPLIES=		ICONV
158
NLS_USES=		gettext
159
NLS_CONFIGURE_ENABLE=	nls
187
160
188
QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
161
QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
189
			mutt-${GREETING_PATCH_VERSION}.vvv.quote:vc
162
			mutt-${GREETING_PATCH_VERSION}.vvv.quote:vc
190
163
164
REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
165
166
SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
167
SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
168
169
# Handle ncurses/ncurses-port/slang
170
SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
171
SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
172
SLANG_VARS=		PKGMESSAGE=${FILESDIR}/pkg-message.slang
173
174
SMART_DATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smartdate
175
176
SMIME_EXTRA_PATCHES=	${PATCHDIR}/extra-smime-sender
177
178
SMTP_CONFIGURE_ENABLE=	smtp
179
180
URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
181
182
.ifnmake portclippy
183
.ifmake makesum # for optional distfiles patchfiles
184
OPTIONS_OVERRIDE=	${OPTIONS_DEFAULT} ${OPTIONS_DEFINE}
185
.MAKEOVERRIDES+=	OPTIONS_OVERRIDE
186
.endif
187
.endif
188
191
.include <bsd.port.options.mk>
189
.include <bsd.port.options.mk>
192
190
193
VVV_PATCH_VERSION=	1.13.0
191
VVV_PATCH_VERSION=	1.13.0
(-)b/mail/mutt/distinfo (-4 / +3 lines)
Lines 1-6 Link Here
1
TIMESTAMP = 1645313041
1
TIMESTAMP = 1648312918
2
SHA256 (mutt/mutt-2.2.1.tar.gz) = b76d30d42b6c90aa9abf9f330e41800934eedf7b858a32c120ee3ae63587abb5
2
SHA256 (mutt/mutt-2.2.2.tar.gz) = 10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc
3
SIZE (mutt/mutt-2.2.1.tar.gz) = 5503979
3
SIZE (mutt/mutt-2.2.2.tar.gz) = 5507066
4
SHA256 (mutt/mutt-2.2.0.vc.greeting) = 7abb467cfaa0ccbfa1fa7cdf8585eefef94e039459ff95fb59efe23043d941d2
4
SHA256 (mutt/mutt-2.2.0.vc.greeting) = 7abb467cfaa0ccbfa1fa7cdf8585eefef94e039459ff95fb59efe23043d941d2
5
SIZE (mutt/mutt-2.2.0.vc.greeting) = 1979
5
SIZE (mutt/mutt-2.2.0.vc.greeting) = 1979
6
SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
6
SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
7
- 

Return to bug 262849