Attachment #165351 for bug #206092

Lines 54-62 Link Here

(-)mail/mutt/Makefile (-220 / +124 lines)
54	AUTOMAKE_ARGS= --add-missing --foreign	54	AUTOMAKE_ARGS= --add-missing --foreign
55	USE_OPENSSL= yes	55	USE_OPENSSL= yes
56		56
		57	OPTIONS_SUB= yes
		58
57	.if defined (MUTT_LITE)	59	.if defined (MUTT_LITE)
58	LITE= YES	60	LITE= yes
59	.endif	61	.endif
		62
60	.if defined (LITE)	63	.if defined (LITE)
61	OPTIONS_UNSET= NLS DOCS EXAMPLES	64	OPTIONS_UNSET= NLS DOCS EXAMPLES
62	.else	65	.else
Lines 67-73 Link Here
67	MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \	70	MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \
68	QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR_PATCH \	71	QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR_PATCH \
69	SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \	72	SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \
70	TOKYOCABINET TRASH_PATCH XML	73	TOKYOCABINET TRASH_PATCH URLVIEW XML
71		74
72	OPTIONS_SINGLE= SCREEN	75	OPTIONS_SINGLE= SCREEN
73	OPTIONS_RADIO= SPELL	76	OPTIONS_RADIO= SPELL
Lines 103-108 Link Here
103	SMTP_DESC= SMTP relay support	106	SMTP_DESC= SMTP relay support
104	TOKYOCABINET_DESC= Use tokyocabinet instead of Berkley DB	107	TOKYOCABINET_DESC= Use tokyocabinet instead of Berkley DB
105	TRASH_PATCH_DESC= Trash folder support	108	TRASH_PATCH_DESC= Trash folder support
		109	URLVIEW_DESC= Use urlview for the URL selector menu
106	XML_DESC= Use XML tools for rebuilding documentation	110	XML_DESC= Use XML tools for rebuilding documentation
107		111
108	OPTIONS_DEFAULT= COMPRESSED_FOLDERS HTML ICONV IDN IFDEF_PATCH \	112	OPTIONS_DEFAULT= COMPRESSED_FOLDERS HTML ICONV IDN IFDEF_PATCH \
Lines 110-118 Link Here
110	MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH NLS \	114	MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH NLS \
111	NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \	115	NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
112	REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT \	116	REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT \
113	SASL SMTP TRASH_PATCH XML	117	SASL SMTP TRASH_PATCH URLVIEW XML
		118	.endif
		119
		120	RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
		121
		122	.if !defined (LITE)
		123	ASPELL_BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell
		124	ASPELL_RUN_DEPENDS= aspell:${PORTSDIR}/textproc/aspell
		125	ISPELL_BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/aspell-ispell
		126	ISPELL_RUN_DEPENDS= ispell:${PORTSDIR}/textproc/aspell-ispell
		127	URLVIEW_RUN_DEPENDS= urlview:${PORTSDIR}/textproc/urlview
		128	.endif
		129
		130	.if defined (LITE)
		131	PKGNAMESUFFIX= -lite
		132	PLIST_SUB+= MAILBOX_MANPAGES=""
114	.endif	133	.endif
115		134
		135	DEBUG_CONFIGURE_ON= --enable-debug
		136
		137	# Handle ncurses/ncurses-port/slang
		138	SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE}
		139	SLANG_LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2
		140	SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang
		141
		142	NCURSES_USES= ncurses
		143
		144	NLS_USES= gettext
		145	NLS_CONFIGURE_OFF= --disable-nls
		146
		147	ICONV_USES= iconv:translit
		148	ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG}
		149	ICONV_CONFIGURE_OFF= --disable-iconv
		150
		151	ASPELL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aspell
		152	##PARENT_CHILD_MATCH_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-parent-child-match
		153	REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply
		154
		155	SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
		156	SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE}
		157
		158	#MIXMASTER_BUILD_DEPENDS= mixmaster:${PORTSDIR}/mail/mixmaster
		159	MIXMASTER_RUN_DEPENDS= mixmaster:${PORTSDIR}/mail/mixmaster
		160	MIXMASTER_CONFIGURE_ON= --with-mixmaster=${LOCALBASE}
		161
		162	SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smime-outlook
		163	SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate
		164
		165	FLOCK_CONFIGURE_ON= --enable-flock
		166	FLOCK_CONFIGURE_OFF= --disable-flock
		167
		168	LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix
		169
		170	IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn
		171	IDN_CONFIGURE_ON= --with-idn
		172	IDN_CONFIGURE_OFF= --without-idn
		173
		174	GPGME_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
		175	GPGME_CONFIGURE_ON= --enable-gpgme
		176	GPGME_CONFIGURE_OFF= --disable-gpgme
		177
		178	SMTP_CONFIGURE_ON= --enable-smtp
		179	SMTP_CONFIGURE_OFF= --disable-smtp
		180
		181	MAILDIR_HEADER_CACHE_CONFIGURE_OFF= --without-qdbm
		182
		183	COMPRESSED_FOLDERS_DISTFILES= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
		184	COMPRESSED_FOLDERS_CONFIGURE_ON= --enable-compressed
		185	COMPRESSED_FOLDERS_VARS= XML_NEEDED=yes
		186
		187	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
		188	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
		189	QUOTE_PATCH_VARS= XML_NEEDED=yes
		190
		191	NNTP_DISTFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv \
		192	patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
		193	NNTP_CONFIGURE_ON= --enable-nntp
		194	NNTP_VARS= XML_NEEDED=yes
		195	NNTP_CATEGORIES= news
		196
		197	SIDEBAR_PATCH_VARS= XML_NEEDED=yes
		198
199	DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref
200
201	SIGNATURE_MENU_IGNORE= SIGNATURE_MENU does not work at the moment
202	SIGNATURE_MENU_VARS= XML_NEEDED=yes
203	SIGNATURE_MENU_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-signature-menu
204
205	MBOX_HOOK_PATCH_IGNORE= MBOX_HOOK_PATCH does not work at the moment
206	MBOX_HOOK_PATCH_PATCHFILES= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
207
116	.include <bsd.port.options.mk>	208	.include <bsd.port.options.mk>
117		209
118	DW_PATCH_VERSION= 1.5.6	210	DW_PATCH_VERSION= 1.5.6
Lines 134-144 Link Here
134	AC_PATCH_VERSION= ${PORTVERSION}	226	AC_PATCH_VERSION= ${PORTVERSION}
135	.endif	227	.endif
136		228
137	.if defined (LITE)
138	PKGNAMESUFFIX= -lite
139	PLIST_SUB+= MBOXMAN=""
140	.endif
141
142	# XXX	229	# XXX
143	# this should be done automagically by aclocal but ....	230	# this should be done automagically by aclocal but ....
144	# for now, this will have to do	231	# for now, this will have to do
Lines 149-271 Link Here
149	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \	236	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \
150	${BUILD_WRKSRC}/Makefile	237	${BUILD_WRKSRC}/Makefile
151		238
152	RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
153
154	.if !defined (LITE)
155	.if ${PORT_OPTIONS:MASPELL}
156	BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
157	RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
158	.elif ${PORT_OPTIONS:MISPELL}
159	BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/aspell-ispell
160	RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/aspell-ispell
161	.endif
162	.if defined(PACKAGE_BUILDING)
163	RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview
164	.endif
165	.endif
166
167	# Handle ncurses/ncurses-port/slang
168	.if ${PORT_OPTIONS:MSLANG}
169	CONFIGURE_ARGS+= --with-slang=${LOCALBASE}
170	LIB_DEPENDS+= libslang.so:${PORTSDIR}/devel/libslang2
171	.endif
172
173	.if ${PORT_OPTIONS:MNCURSES}
174	USES+= ncurses
175	.endif
176
177	.if ${PORT_OPTIONS:MNLS}
178	USES+= gettext
179	PLIST_SUB+= NLS=""
180	.else
181	CONFIGURE_ARGS+= --disable-nls
182	PLIST_SUB+= NLS="@comment "
183	.endif
184
185	.if ${PORT_OPTIONS:MSASL}
186	LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
187	CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
188	.endif
189
190	.if ${PORT_OPTIONS:MMIXMASTER}
191	# BUILD_DEPENDS+= mixmaster:${PORTSDIR}/mail/mixmaster
192	RUN_DEPENDS+= mixmaster:${PORTSDIR}/mail/mixmaster
193	CONFIGURE_ARGS+= --with-mixmaster=${LOCALBASE}
194	.endif
195
196	.if ${PORT_OPTIONS:MSMIME_OUTLOOK_COMPAT}
197	post-patch::
198	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
199	.endif
200
201	.if ${PORT_OPTIONS:MSMART_DATE}
202	post-patch::
203	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smartdate
204	.endif
205
206	.if ${PORT_OPTIONS:MSIGNATURE_MENU}
207	IGNORE= the WITH_SIGNATURE_MENU does not work at the moment
208	XML_NEEDED= yes
209	post-patch::
210	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu
211	.endif
212
213	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
214	post-patch::
215	.if ${PORT_OPTIONS:MNNTP}
216	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
217	.else
218	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime
219	.endif
220	.endif
221
222	.if ${PORT_OPTIONS:MASPELL}
223	post-patch::
224	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell
225	.endif
226
227	.if ${PORT_OPTIONS:MREVERSE_REPLY_PATCH}
228	post-patch::
229	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply
230	.endif
231
232	.if ${PORT_OPTIONS:MPARENT_CHILD_MATCH_PATCH}
233	post-patch::
234	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
235	.endif
236
237	.if ${PORT_OPTIONS:MFLOCK}
238	CONFIGURE_ARGS+= --enable-flock
239	.else
240	CONFIGURE_ARGS+= --disable-flock
241	.endif
242
243	.if ${PORT_OPTIONS:MLOCALES_FIX}
244	CONFIGURE_ARGS+= --enable-locales-fix
245	.endif
246
247	.if ${PORT_OPTIONS:MICONV}
248	USES+= iconv:translit
249	CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG}
250	.else
251	CONFIGURE_ARGS+= --disable-iconv
252	.endif
253
254	.if ${PORT_OPTIONS:MIDN}
255	LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn
256	CONFIGURE_ARGS+= --with-idn
257	.else
258	CONFIGURE_ARGS+= --without-idn
259	.endif
260
261	.if ${PORT_OPTIONS:MGPGME}
262	LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme
263	CONFIGURE_ARGS+= --enable-gpgme
264	.else
265	CONFIGURE_ARGS+= --disable-gpgme
266	.endif
267	LDFLAGS=
268
269	.if ${PORT_OPTIONS:MGSSAPI}	239	.if ${PORT_OPTIONS:MGSSAPI}
270	.if exists(${LOCALBASE}/bin/krb5-config)	240	.if exists(${LOCALBASE}/bin/krb5-config)
271	LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5	241	LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5
Lines 280-286 Link Here
280	LDFLAGS+= -L${HEIMDAL_HOME}/lib -Wl,-rpath=${HEIMDAL_HOME}/lib -ltinfow	250	LDFLAGS+= -L${HEIMDAL_HOME}/lib -Wl,-rpath=${HEIMDAL_HOME}/lib -ltinfow
281	.elif (defined(MAKE_KERBEROS5)) \|\| exists(/usr/lib/libkrb5.a)	251	.elif (defined(MAKE_KERBEROS5)) \|\| exists(/usr/lib/libkrb5.a)
282	CONFIGURE_ARGS+= --with-gss	252	CONFIGURE_ARGS+= --with-gss
283	WITH_KRB5_SYS=YES	253	WITH_KRB5_SYS=yes
284	.endif	254	.endif
285	.endif	255	.endif
286		256
Lines 288-371 Link Here
288	CFLAGS+= ${CFLAGS_ADD}	258	CFLAGS+= ${CFLAGS_ADD}
289	LDFLAGS+= ${LDFLAGS_ADD}	259	LDFLAGS+= ${LDFLAGS_ADD}
290		260
291	.if ${PORT_OPTIONS:MSMTP}
292	CONFIGURE_ARGS+= --enable-smtp
293	.else
294	CONFIGURE_ARGS+= --disable-smtp
295	.endif
296
297	.if ${PORT_OPTIONS:MDEBUG}
298	CONFIGURE_ARGS+= --enable-debug
299	.endif
300
301	PATCH_DIST_STRIP= -p1	261	PATCH_DIST_STRIP= -p1
302		262
303	.if ${PORT_OPTIONS:MCOMPRESSED_FOLDERS}	263	pre-patch-PARENT_CHILD_MATCH_PATCH-on:
304	DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv	264	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
305	CONFIGURE_ARGS+= --enable-compressed	265
306	XML_NEEDED= yes	266	pre-patch-COMPRESSED_FOLDERS-on:
307	pre-patch::
308	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed	267	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed
309	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \	268	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
310	${WRKDIR}/patch-compressed	269	${WRKDIR}/patch-compressed
311	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed	270	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
312	.endif
313		271
314	.if ${PORT_OPTIONS:MNNTP}	272	pre-patch-NNTP-on:
315	DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
316	DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
317	CONFIGURE_ARGS+= --enable-nntp
318	XML_NEEDED= yes
319	CATEGORIES+= news
320	PLIST_SUB+= NNTP=""
321	pre-patch::
322	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp	273	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
323	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \	274	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
324	${WRKDIR}/patch-nntp	275	${WRKDIR}/patch-nntp
325	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp	276	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
326	post-install:
327	${INSTALL_MAN} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
328	.else
329	PLIST_SUB+= NNTP="@comment "
330	.endif
331		277
332	.if ${PORT_OPTIONS:MQUOTE_PATCH}	278	post-patch-NNTP-on:
333	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \	279	.if ${PORT_OPTIONS:MSIDEBAR_PATCH}
334	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv	280	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp
335	XML_NEEDED= yes	281	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh
336	.endif
337
338	.if ${PORT_OPTIONS:MIFDEF_PATCH}
339	post-patch::
340	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
341	.endif	282	.endif
342		283	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
343	.if ${PORT_OPTIONS:MMBOX_HOOK_PATCH}	284	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
344	IGNORE= the MBOX_HOOK_PATCH does not work at the moment
345	#PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
346	.endif	285	.endif
347		286
		287	post-patch-NNTP-off:
348	.if ${PORT_OPTIONS:MSIDEBAR_PATCH}	288	.if ${PORT_OPTIONS:MSIDEBAR_PATCH}
349	XML_NEEDED= yes
350	.if ${PORT_OPTIONS:MNNTP}
351	post-patch::
352	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp
353	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh
354	.else
355	post-patch::
356	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar	289	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar
357	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh	290	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh
358	.endif	291	.endif
		292	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
		293	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
359	.endif	294	.endif
360		295
361	.if ${PORT_OPTIONS:MGREETING_PATCH}	296	post-install-NNTP-on:
362	post-patch::	297	${INSTALL_MAN} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
		298
		299	post-patch-GREETING_PATCH-on:
363	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting	300	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting
364	.endif	301
365	.if ${PORT_OPTIONS:MTRASH_PATCH}	302	post-patch-IFDEF_PATCH-on:
366	post-patch::	303	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
		304
		305	post-patch-TRASH_PATCH-on:
367	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge	306	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge
368	.endif
369		307
370	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}	308	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
371		309
Lines 386-397 Link Here
386	${WRKSRC}/imap/auth_gss.c	324	${WRKSRC}/imap/auth_gss.c
387	.endif	325	.endif
388		326
389	.if ${PORT_OPTIONS:MCOMPRESSED_FOLDERS}
390	PLIST_SUB+= COMPRESS=""
391	.else
392	PLIST_SUB+= COMPRESS="@comment "
393	.endif
394
395	.if ${PORT_OPTIONS:MIMAP_HEADER_CACHE} \|\| ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}	327	.if ${PORT_OPTIONS:MIMAP_HEADER_CACHE} \|\| ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
396	.if ${PORT_OPTIONS:MTOKYOCABINET}	328	.if ${PORT_OPTIONS:MTOKYOCABINET}
397	CONFIGURE_ARGS+= --enable-hcache --without-gdbm --without-bdb --with-tokyocabinet	329	CONFIGURE_ARGS+= --enable-hcache --without-gdbm --without-bdb --with-tokyocabinet
Lines 407-454 Link Here
407	CONFIGURE_ARGS+= --disable-hcache	339	CONFIGURE_ARGS+= --disable-hcache
408	.endif	340	.endif
409		341
410	.if ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
411	CONFIGURE_ARGS+= --without-qdbm
412	.endif
413
414	.if ${PORT_OPTIONS:MMAILBOX_MANPAGES}
415	PLIST_SUB+= MBOXMAN=""
416	.else
417	PLIST_SUB+= MBOXMAN="@comment "
418	.endif
419
420	.if ${PORT_OPTIONS:MHTML}
421	PLIST_SUB+= HTML=""
422	.else
423	PLIST_SUB+= HTML="@comment "
424	.endif
425	.if ${PORT_OPTIONS:MDOCS}
426	post-build:
427	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
428	@${REINPLACE_CMD} -E -e 's\|\$$\{PREFIX\}\|${PREFIX}\|g' \
429	-e 's\|\$$\{DOCSDIR\}\|${DOCSDIR}\|g' \
430	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \
431	${WRKSRC}/doc/mutt.man
432	@${REINPLACE_CMD} -E -e 's\|\$$\{PREFIX\}\|${PREFIX}\|g' \
433	-e 's\|\$$\{DOCSDIR\}\|${DOCSDIR}\|g' \
434	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \
435	${WRKSRC}/doc/muttrc.man
436	.endif
437
438	.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}	342	.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
439	PLIST_SUB+= XML=""
440	BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \	343	BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
441	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \	344	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
442	lynx:${PORTSDIR}/www/lynx	345	lynx:${PORTSDIR}/www/lynx
443	.else	346	.else
444	PLIST_SUB+= XML="@comment "
445	pre-build::	347	pre-build::
446	@${REINPLACE_CMD} -E -e 's\|-xsltproc\|@-true xsltproc\|g' \	348	@${REINPLACE_CMD} -E -e 's\|-xsltproc\|@-true xsltproc\|g' \
447	${WRKSRC}/doc/Makefile	349	${WRKSRC}/doc/Makefile
448	.endif	350	.endif
449		351
450	.if ${PORT_OPTIONS:MSLANG}	352	post-build-DOCS-on:
451	PKGMESSAGE= ${FILESDIR}/pkg-message.slang	353	@${REINPLACE_CMD} -E -e 's\|\$$\{PREFIX\}\|${PREFIX}\|g' \
452	.endif	354	-e 's\|\$$\{DOCSDIR\}\|${DOCSDIR}\|g' \
		355	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \
		356	${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/muttrc.man
453		357
454	.include <bsd.port.mk>	358	.include <bsd.port.mk>




Index: browser.c
@@ -80,6 +80,12 @@
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 
+  /* Always keep '..' in first menu position */
+  if (!strncmp(pa->name, "..", 2))
+	  return(-1);
+  if (!strncmp(pb->name, "..", 2))
+	  return(1);
+
   int r = mutt_strcoll (pa->name, pb->name);
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -90,6 +96,12 @@
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 
+  /* Always keep '..' in first menu position */
+  if (!strncmp(pa->name, "..", 2))
+	  return(-1);
+  if (!strncmp(pb->name, "..", 2))
+	  return(1);
+
   int r = pa->mtime - pb->mtime;
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -100,6 +112,12 @@
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 
+  /* Always keep '..' in first menu position */
+  if (!strncmp(pa->name, "..", 2))
+	  return(-1);
+  if (!strncmp(pb->name, "..", 2))
+	  return(1);
+
   int r = pa->size - pb->size;
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);




bin/flea
bin/mutt
bin/muttbug
@(,mail,2755) bin/mutt_dotlock
@mode 2755
bin/mutt_dotlock
@group wheel
@mode
bin/pgpewrap
bin/pgpring
bin/smime_keys

man/man1/pgpewrap.1.gz
man/man1/pgpring.1.gz
man/man1/smime_keys.1.gz
%%MAILBOX_MANPAGES%%man/man5/mbox.5.gz
%%MAILBOX_MANPAGES%%man/man5/mmdf.5.gz
man/man5/muttrc.5.gz
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog

%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/reference.html
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/security.html
%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tuning.html
%%XML%%%%HTML%%%%MCOMPRESSED_FOLDERS%%%%PORTDOCS%%%%DOCSDIR%%/compressed-folders.html
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc

Return to bug 206092

Line 0 Link Here

(-)mail/mutt/files/patch-browser.c (+40 lines)
	1	Index: browser.c
	2	@@ -80,6 +80,12 @@
	3	struct folder_file pa = (struct folder_file ) a;
	4	struct folder_file pb = (struct folder_file ) b;
	5
	6	+ /* Always keep '..' in first menu position */
	7	+ if (!strncmp(pa->name, "..", 2))
	8	+ return(-1);
	9	+ if (!strncmp(pb->name, "..", 2))
	10	+ return(1);
	11	+
	12	int r = mutt_strcoll (pa->name, pb->name);
	13
	14	return ((BrowserSort & SORT_REVERSE) ? -r : r);
	15	@@ -90,6 +96,12 @@
	16	struct folder_file pa = (struct folder_file ) a;
	17	struct folder_file pb = (struct folder_file ) b;
	18
	19	+ /* Always keep '..' in first menu position */
	20	+ if (!strncmp(pa->name, "..", 2))
	21	+ return(-1);
	22	+ if (!strncmp(pb->name, "..", 2))
	23	+ return(1);
	24	+
	25	int r = pa->mtime - pb->mtime;
	26
	27	return ((BrowserSort & SORT_REVERSE) ? -r : r);
	28	@@ -100,6 +112,12 @@
	29	struct folder_file pa = (struct folder_file ) a;
	30	struct folder_file pb = (struct folder_file ) b;
	31
	32	+ /* Always keep '..' in first menu position */
	33	+ if (!strncmp(pa->name, "..", 2))
	34	+ return(-1);
	35	+ if (!strncmp(pb->name, "..", 2))
	36	+ return(1);
	37	+
	38	int r = pa->size - pb->size;
	39
	40	return ((BrowserSort & SORT_REVERSE) ? -r : r);

Lines 1-11 Link Here

(-)mail/mutt/pkg-plist (-8 / +4 lines)
1	bin/flea	1	bin/flea
2	bin/mutt	2	bin/mutt
3	bin/muttbug	3	bin/muttbug
4	@group mail	4	@(,mail,2755) bin/mutt_dotlock
5	@mode 2755
6	bin/mutt_dotlock
7	@group wheel
8	@mode
9	bin/pgpewrap	5	bin/pgpewrap
10	bin/pgpring	6	bin/pgpring
11	bin/smime_keys	7	bin/smime_keys
Lines 17-24 Link Here
17	man/man1/pgpewrap.1.gz	13	man/man1/pgpewrap.1.gz
18	man/man1/pgpring.1.gz	14	man/man1/pgpring.1.gz
19	man/man1/smime_keys.1.gz	15	man/man1/smime_keys.1.gz
20	%%MBOXMAN%%man/man5/mbox.5.gz	16	%%MAILBOX_MANPAGES%%man/man5/mbox.5.gz
21	%%MBOXMAN%%man/man5/mmdf.5.gz	17	%%MAILBOX_MANPAGES%%man/man5/mmdf.5.gz
22	man/man5/muttrc.5.gz	18	man/man5/muttrc.5.gz
23	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT	19	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
24	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	20	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
Lines 48-54 Link Here
48	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/reference.html	44	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/reference.html
49	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/security.html	45	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/security.html
50	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tuning.html	46	%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tuning.html
51	%%XML%%%%HTML%%%%COMPRESS%%%%PORTDOCS%%%%DOCSDIR%%/compressed-folders.html	47	%%XML%%%%HTML%%%%MCOMPRESSED_FOLDERS%%%%PORTDOCS%%%%DOCSDIR%%/compressed-folders.html
52	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc	48	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc
53	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc	49	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
54	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc	50	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc