Attachment #165436 for bug #206092





PORTNAME=	mutt
PORTVERSION=	1.5.24
PORTREVISION?=	1
CATEGORIES+=	mail ipv6
MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \

		ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
		http://www.spinnaker.de/mutt/compressed/:rr \
		http://lunar-linux.org/~tchan/mutt/:tchan
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

PATCH_SITES+=	http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
		http://home.woolridge.ca/mutt/patches/:dw \
		http://www.spinnaker.de/mutt/compressed/:rr \
		http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp

MAINTAINER?=	udo.schweigert@siemens.com
COMMENT?=	The Mongrel of Mail User Agents (development version)

AUTOMAKE_ARGS=	--add-missing --foreign
USE_OPENSSL=	yes

OPTIONS_SUB=	yes

.if defined (MUTT_LITE)
LITE=	yes
.endif

.if defined (LITE)
OPTIONS_UNSET=	NLS DOCS EXAMPLES
.else

		MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \
		QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR_PATCH \
		SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \
		TOKYOCABINET TRASH_PATCH URLVIEW XML

OPTIONS_SINGLE=	SCREEN
OPTIONS_RADIO=	SPELL

SMTP_DESC=	SMTP relay support
TOKYOCABINET_DESC=	Use tokyocabinet instead of Berkley DB
TRASH_PATCH_DESC=	Trash folder support
URLVIEW_DESC=	Use urlview for the URL selector menu
XML_DESC=	Use XML tools for rebuilding documentation

OPTIONS_DEFAULT=	COMPRESSED_FOLDERS HTML ICONV IDN IFDEF_PATCH \

		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH NLS \
		NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
		REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT \
		SASL SMTP TRASH_PATCH URLVIEW XML
.endif

RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support

.if !defined (LITE)
ASPELL_BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
ASPELL_RUN_DEPENDS=		aspell:${PORTSDIR}/textproc/aspell
ISPELL_BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
ISPELL_RUN_DEPENDS=		ispell:${PORTSDIR}/textproc/aspell-ispell
URLVIEW_RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
.if !defined(RR_PATCH_VERSION)
RR_PATCH_VERSION=	${PORTVERSION}
.endif
.if !defined(DW_PATCH_VERSION)
DW_PATCH_VERSION=	${PORTVERSION}
.endif
.if !defined(DW_MBOX_PATCH_VERSION)
DW_MBOX_PATCH_VERSION=	${DW_PATCH_VERSION}
.endif
.if !defined(AC_PATCH_VERSION)
AC_PATCH_VERSION=	${PORTVERSION}
.endif

.if defined (LITE)
PKGNAMESUFFIX=	-lite
PLIST_SUB+=	MAILBOX_MANPAGES=""
.endif

DEBUG_CONFIGURE_ON=	--enable-debug
# this should be done automagically by aclocal but ....
# for now, this will have to do
pre-build::
	@${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
			-e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
			-e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
		${BUILD_WRKSRC}/Makefile

# Handle ncurses/ncurses-port/slang
SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang

NCURSES_USES=	ncurses
.if ${PORT_OPTIONS:MASPELL}
BUILD_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
RUN_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
.elif ${PORT_OPTIONS:MISPELL}
BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell
.endif
.if defined(PACKAGE_BUILDING)
RUN_DEPENDS+=	urlview:${PORTSDIR}/textproc/urlview
.endif
.endif

NLS_USES=	gettext
NLS_CONFIGURE_OFF=	--disable-nls
CONFIGURE_ARGS+=	--with-slang=${LOCALBASE}
LIB_DEPENDS+=	libslang.so:${PORTSDIR}/devel/libslang2
.endif

ICONV_USES=	iconv:translit
ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
ICONV_CONFIGURE_OFF=	--disable-iconv

ASPELL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aspell
##PARENT_CHILD_MATCH_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-parent-child-match
REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
.else
CONFIGURE_ARGS+=	--disable-nls
PLIST_SUB+=	NLS="@comment "
.endif

SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
.endif

#MIXMASTER_BUILD_DEPENDS=	mixmaster:${PORTSDIR}/mail/mixmaster
MIXMASTER_RUN_DEPENDS=	mixmaster:${PORTSDIR}/mail/mixmaster
MIXMASTER_CONFIGURE_ON=	--with-mixmaster=${LOCALBASE}
CONFIGURE_ARGS+=	--with-mixmaster=${LOCALBASE}
.endif

SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smime-outlook
SMART_DATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smartdate
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
.endif

FLOCK_CONFIGURE_ON=	--enable-flock
FLOCK_CONFIGURE_OFF=	--disable-flock
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smartdate
.endif

LOCALES_FIX_CONFIGURE_ON=	--enable-locales-fix
IGNORE=	the WITH_SIGNATURE_MENU does not work at the moment
XML_NEEDED=	yes
post-patch::
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu
.endif

IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
IDN_CONFIGURE_ON=	--with-idn
IDN_CONFIGURE_OFF=	--without-idn
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
.else
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime
.endif
.endif

GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
GPGME_CONFIGURE_ON=	--enable-gpgme
GPGME_CONFIGURE_OFF=	--disable-gpgme
.endif

SMTP_CONFIGURE_ON=	--enable-smtp
SMTP_CONFIGURE_OFF=	--disable-smtp
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply
.endif

MAILDIR_HEADER_CACHE_CONFIGURE_OFF=	--without-qdbm
post-patch::
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
.endif

COMPRESSED_FOLDERS_DISTFILES=	patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
COMPRESSED_FOLDERS_CONFIGURE_ON=	--enable-compressed
COMPRESSED_FOLDERS_VARS=	XML_NEEDED=yes
CONFIGURE_ARGS+=	--disable-flock
.endif

QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
		patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
QUOTE_PATCH_VARS=	XML_NEEDED=yes

NNTP_DISTFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv \
		patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
NNTP_CONFIGURE_ON=	--enable-nntp
NNTP_VARS=	XML_NEEDED=yes
NNTP_CATEGORIES=	news
.endif

SIDEBAR_PATCH_VARS=	XML_NEEDED=yes
LIB_DEPENDS+=	libidn.so:${PORTSDIR}/dns/libidn
CONFIGURE_ARGS+=	--with-idn
.else
CONFIGURE_ARGS+=	--without-idn
.endif

DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref

SIGNATURE_MENU_IGNORE=	SIGNATURE_MENU does not work at the moment
SIGNATURE_MENU_VARS=	XML_NEEDED=yes
SIGNATURE_MENU_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-signature-menu

MBOX_HOOK_PATCH_IGNORE=	MBOX_HOOK_PATCH does not work at the moment
MBOX_HOOK_PATCH_PATCHFILES=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw

.include <bsd.port.options.mk>

DW_PATCH_VERSION=	1.5.6
DW_MBOX_PATCH_VERSION=	1.5.18
.if !defined(VVV_PATCH_VERSION)
VVV_PATCH_VERSION=	${PORTVERSION}
.endif
.if !defined(RR_PATCH_VERSION)
RR_PATCH_VERSION=	${PORTVERSION}
.endif
.if !defined(DW_PATCH_VERSION)
DW_PATCH_VERSION=	${PORTVERSION}
.endif
.if !defined(DW_MBOX_PATCH_VERSION)
DW_MBOX_PATCH_VERSION=	${DW_PATCH_VERSION}
.endif

# XXX
# this should be done automagically by aclocal but ....
# for now, this will have to do
pre-build::
	@${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
			-e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
			-e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
		${BUILD_WRKSRC}/Makefile

.if ${PORT_OPTIONS:MGSSAPI}
.if exists(${LOCALBASE}/bin/krb5-config)

LDFLAGS+=		-L${HEIMDAL_HOME}/lib -Wl,-rpath=${HEIMDAL_HOME}/lib -ltinfow
.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
CONFIGURE_ARGS+=	--with-gss
WITH_KRB5_SYS=yes
.endif
.endif


CFLAGS+=		${CFLAGS_ADD}
LDFLAGS+=		${LDFLAGS_ADD}

.if ${PORT_OPTIONS:MSMTP}
CONFIGURE_ARGS+=	--enable-smtp
.else
CONFIGURE_ARGS+=	--disable-smtp
.endif

.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=	--enable-debug
.endif

PATCH_DIST_STRIP=	-p1

pre-patch-PARENT_CHILD_MATCH_PATCH-on:
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match

pre-patch-COMPRESSED_FOLDERS-on:
pre-patch::
	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed
	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
		 ${WRKDIR}/patch-compressed
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
.endif

pre-patch-NNTP-on:
DISTFILES+=	patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv
DISTFILES+=	patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
CONFIGURE_ARGS+=	--enable-nntp
XML_NEEDED=	yes
CATEGORIES+=	news
PLIST_SUB+=	NNTP=""
pre-patch::
	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp
	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
		${WRKDIR}/patch-nntp
	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
post-install:
	${INSTALL_MAN} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
.else
PLIST_SUB+=	NNTP="@comment "
.endif

.if ${PORT_OPTIONS:MQUOTE_PATCH}
PATCHFILES+=	patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
		patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
XML_NEEDED=	yes
.endif

post-patch-NNTP-on:
.if ${PORT_OPTIONS:MSIDEBAR_PATCH}
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh
.endif
.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
IGNORE=	the MBOX_HOOK_PATCH does not work at the moment
#PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
.endif

post-patch-NNTP-off:
.if ${PORT_OPTIONS:MSIDEBAR_PATCH}
XML_NEEDED=	yes
.if ${PORT_OPTIONS:MNNTP}
post-patch::
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh
.else
post-patch::
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh
.endif
.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
.endif

post-install-NNTP-on:
	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}

post-patch-GREETING_PATCH-on:
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting

post-patch-IFDEF_PATCH-on:
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef

post-patch-TRASH_PATCH-on:
	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge
.endif

WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}


		${WRKSRC}/imap/auth_gss.c
.endif

.if ${PORT_OPTIONS:MCOMPRESSED_FOLDERS}
PLIST_SUB+=	COMPRESS=""
.else
PLIST_SUB+=	COMPRESS="@comment "
.endif

.if ${PORT_OPTIONS:MIMAP_HEADER_CACHE} || ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
.if ${PORT_OPTIONS:MTOKYOCABINET}
CONFIGURE_ARGS+=	--enable-hcache --without-gdbm --without-bdb --with-tokyocabinet

CONFIGURE_ARGS+=	--disable-hcache
.endif

.if ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
CONFIGURE_ARGS+=	--without-qdbm
.endif

.if ${PORT_OPTIONS:MMAILBOX_MANPAGES}
PLIST_SUB+=	MBOXMAN=""
.else
PLIST_SUB+=	MBOXMAN="@comment "
.endif

.if ${PORT_OPTIONS:MHTML}
PLIST_SUB+=	HTML=""
.else
PLIST_SUB+=	HTML="@comment "
.endif
.if ${PORT_OPTIONS:MDOCS}
post-build:
	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
		${WRKSRC}/doc/mutt.man
	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
		${WRKSRC}/doc/muttrc.man
.endif

.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
PLIST_SUB+=	XML=""
BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
		lynx:${PORTSDIR}/www/lynx
.else
PLIST_SUB+=	XML="@comment "
pre-build::
	@${REINPLACE_CMD} -E -e 's|-xsltproc|@-true xsltproc|g' \
		${WRKSRC}/doc/Makefile
.endif

.if ${PORT_OPTIONS:MSLANG}
PKGMESSAGE=	${FILESDIR}/pkg-message.slang
.endif

.include <bsd.port.mk>

Lines 6-12 Link Here

(-)mutt/files/extra-patch-doc-ref (-1 / +1 lines)
6	mail under unix operating systems, including support for color terminals, MIME,	6	mail under unix operating systems, including support for color terminals, MIME,
7	-OpenPGP, and a threaded sorting mode.	7	-OpenPGP, and a threaded sorting mode.
8	+OpenPGP, and a threaded sorting mode. Details of how to use all of this is	8	+OpenPGP, and a threaded sorting mode. Details of how to use all of this is
9	+available in \fI${DOCSDIR}\fP.	9	+available in @docdir@.
10	.PP	10	.PP
11	.I Note:	11	.I Note:
12	.IR	12	.IR




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%%%%COMPRESSED_FOLDERS%%%%PORTDOCS%%%%DOCSDIR%%/compressed-folders.html
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc

Return to bug 206092

Lines 3-9 Link Here

(-)mutt/Makefile (-235 / +119 lines)
3		3
4	PORTNAME= mutt	4	PORTNAME= mutt
5	PORTVERSION= 1.5.24	5	PORTVERSION= 1.5.24
6	PORTREVISION?= 0	6	PORTREVISION?= 1
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 11-32 Link Here
11	ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \	11	ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
12	http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \	12	http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
13	http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \	13	http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
14	http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
15	ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
16	ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
17	http://www.spinnaker.de/mutt/compressed/:rr \
18	http://lunar-linux.org/~tchan/mutt/:tchan
19	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	14	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
20	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}	15	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
21		16
22	PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \	17	PATCH_SITES+= http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
23	http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \	18	http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
24	http://www3.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
25	ftp://ftp.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
26	ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
27	http://home.woolridge.ca/mutt/patches/:dw \	19	http://home.woolridge.ca/mutt/patches/:dw \
28	http://www.spinnaker.de/mutt/compressed/:rr \
29	http://www.emaillab.org/mutt/${AC_PATCH_VERSION}/:jp
30		20
31	MAINTAINER?= udo.schweigert@siemens.com	21	MAINTAINER?= udo.schweigert@siemens.com
32	COMMENT?= The Mongrel of Mail User Agents (development version)	22	COMMENT?= The Mongrel of Mail User Agents (development version)
Lines 54-62 Link Here
54	AUTOMAKE_ARGS= --add-missing --foreign	44	AUTOMAKE_ARGS= --add-missing --foreign
55	USE_OPENSSL= yes	45	USE_OPENSSL= yes
56		46
		47	OPTIONS_SUB= yes
		48
57	.if defined (MUTT_LITE)	49	.if defined (MUTT_LITE)
58	LITE= YES	50	LITE= yes
59	.endif	51	.endif
		52
60	.if defined (LITE)	53	.if defined (LITE)
61	OPTIONS_UNSET= NLS DOCS EXAMPLES	54	OPTIONS_UNSET= NLS DOCS EXAMPLES
62	.else	55	.else
Lines 67-73 Link Here
67	MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \	60	MIXMASTER NLS NNTP PARENT_CHILD_MATCH_PATCH \
68	QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR_PATCH \	61	QUOTE_PATCH REVERSE_REPLY_PATCH SIDEBAR_PATCH \
69	SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \	62	SIGNATURE_MENU SMART_DATE SMIME_OUTLOOK_COMPAT SMTP \
70	TOKYOCABINET TRASH_PATCH XML	63	TOKYOCABINET TRASH_PATCH URLVIEW XML
71		64
72	OPTIONS_SINGLE= SCREEN	65	OPTIONS_SINGLE= SCREEN
73	OPTIONS_RADIO= SPELL	66	OPTIONS_RADIO= SPELL
Lines 103-108 Link Here
103	SMTP_DESC= SMTP relay support	96	SMTP_DESC= SMTP relay support
104	TOKYOCABINET_DESC= Use tokyocabinet instead of Berkley DB	97	TOKYOCABINET_DESC= Use tokyocabinet instead of Berkley DB
105	TRASH_PATCH_DESC= Trash folder support	98	TRASH_PATCH_DESC= Trash folder support
		99	URLVIEW_DESC= Use urlview for the URL selector menu
106	XML_DESC= Use XML tools for rebuilding documentation	100	XML_DESC= Use XML tools for rebuilding documentation
107		101
108	OPTIONS_DEFAULT= COMPRESSED_FOLDERS HTML ICONV IDN IFDEF_PATCH \	102	OPTIONS_DEFAULT= COMPRESSED_FOLDERS HTML ICONV IDN IFDEF_PATCH \
Lines 110-270 Link Here
110	MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH NLS \	104	MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH NLS \
111	NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \	105	NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
112	REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT \	106	REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT \
113	SASL SMTP TRASH_PATCH XML	107	SASL SMTP TRASH_PATCH URLVIEW XML
114	.endif	108	.endif
115		109
116	.include <bsd.port.options.mk>	110	RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
117		111
118	DW_PATCH_VERSION= 1.5.6	112	.if !defined (LITE)
119	AC_PATCH_VERSION= 1.5.9	113	ASPELL_BUILD_DEPENDS= aspell:${PORTSDIR}/textproc/aspell
120	DW_MBOX_PATCH_VERSION= 1.5.18	114	ASPELL_RUN_DEPENDS= aspell:${PORTSDIR}/textproc/aspell
121	.if !defined(VVV_PATCH_VERSION)	115	ISPELL_BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/aspell-ispell
122	VVV_PATCH_VERSION= ${PORTVERSION}	116	ISPELL_RUN_DEPENDS= ispell:${PORTSDIR}/textproc/aspell-ispell
123	.endif	117	URLVIEW_RUN_DEPENDS= urlview:${PORTSDIR}/textproc/urlview
124	.if !defined(RR_PATCH_VERSION)
125	RR_PATCH_VERSION= ${PORTVERSION}
126	.endif
127	.if !defined(DW_PATCH_VERSION)
128	DW_PATCH_VERSION= ${PORTVERSION}
129	.endif
130	.if !defined(DW_MBOX_PATCH_VERSION)
131	DW_MBOX_PATCH_VERSION= ${DW_PATCH_VERSION}
132	.endif
133	.if !defined(AC_PATCH_VERSION)
134	AC_PATCH_VERSION= ${PORTVERSION}
135	.endif	118	.endif
136		119
137	.if defined (LITE)	120	.if defined (LITE)
138	PKGNAMESUFFIX= -lite	121	PKGNAMESUFFIX= -lite
139	PLIST_SUB+= MBOXMAN=""	122	PLIST_SUB+= MAILBOX_MANPAGES=""
140	.endif	123	.endif
141		124
142	# XXX	125	DEBUG_CONFIGURE_ON= --enable-debug
143	# this should be done automagically by aclocal but ....
144	# for now, this will have to do
145	pre-build::
146	@${REINPLACE_CMD} -E -e "s\|^(ACLOCAL = ).+\|\1${ACLOCAL}\|" \
147	-e "s\|^(AUTOCONF = ).+\|\1${AUTOCONF}\|" \
148	-e "s\|^(AUTOMAKE = ).+\|\1${AUTOMAKE}\|" \
149	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \
150	${BUILD_WRKSRC}/Makefile
151		126
152	RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support	127	# Handle ncurses/ncurses-port/slang
		128	SLANG_CONFIGURE_ON= --with-slang=${LOCALBASE}
		129	SLANG_LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2
		130	SLANG_VARS= PKGMESSAGE=${FILESDIR}/pkg-message.slang
153		131
154	.if !defined (LITE)	132	NCURSES_USES= ncurses
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		133
167	# Handle ncurses/ncurses-port/slang	134	NLS_USES= gettext
168	.if ${PORT_OPTIONS:MSLANG}	135	NLS_CONFIGURE_OFF= --disable-nls
169	CONFIGURE_ARGS+= --with-slang=${LOCALBASE}
170	LIB_DEPENDS+= libslang.so:${PORTSDIR}/devel/libslang2
171	.endif
172		136
173	.if ${PORT_OPTIONS:MNCURSES}	137	ICONV_USES= iconv:translit
174	USES+= ncurses	138	ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG}
175	.endif	139	ICONV_CONFIGURE_OFF= --disable-iconv
176		140
177	.if ${PORT_OPTIONS:MNLS}	141	ASPELL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aspell
178	USES+= gettext	142	##PARENT_CHILD_MATCH_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-parent-child-match
179	PLIST_SUB+= NLS=""	143	REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply
180	.else
181	CONFIGURE_ARGS+= --disable-nls
182	PLIST_SUB+= NLS="@comment "
183	.endif
184		144
185	.if ${PORT_OPTIONS:MSASL}	145	SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
186	LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2	146	SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE}
187	CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
188	.endif
189		147
190	.if ${PORT_OPTIONS:MMIXMASTER}	148	#MIXMASTER_BUILD_DEPENDS= mixmaster:${PORTSDIR}/mail/mixmaster
191	# BUILD_DEPENDS+= mixmaster:${PORTSDIR}/mail/mixmaster	149	MIXMASTER_RUN_DEPENDS= mixmaster:${PORTSDIR}/mail/mixmaster
192	RUN_DEPENDS+= mixmaster:${PORTSDIR}/mail/mixmaster	150	MIXMASTER_CONFIGURE_ON= --with-mixmaster=${LOCALBASE}
193	CONFIGURE_ARGS+= --with-mixmaster=${LOCALBASE}
194	.endif
195		151
196	.if ${PORT_OPTIONS:MSMIME_OUTLOOK_COMPAT}	152	SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smime-outlook
197	post-patch::	153	SMART_DATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-smartdate
198	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook
199	.endif
200		154
201	.if ${PORT_OPTIONS:MSMART_DATE}	155	FLOCK_CONFIGURE_ON= --enable-flock
202	post-patch::	156	FLOCK_CONFIGURE_OFF= --disable-flock
203	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smartdate
204	.endif
205		157
206	.if ${PORT_OPTIONS:MSIGNATURE_MENU}	158	LOCALES_FIX_CONFIGURE_ON= --enable-locales-fix
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		159
213	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}	160	IDN_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn
214	post-patch::	161	IDN_CONFIGURE_ON= --with-idn
215	.if ${PORT_OPTIONS:MNNTP}	162	IDN_CONFIGURE_OFF= --without-idn
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		163
222	.if ${PORT_OPTIONS:MASPELL}	164	GPGME_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
223	post-patch::	165	GPGME_CONFIGURE_ON= --enable-gpgme
224	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell	166	GPGME_CONFIGURE_OFF= --disable-gpgme
225	.endif
226		167
227	.if ${PORT_OPTIONS:MREVERSE_REPLY_PATCH}	168	SMTP_CONFIGURE_ON= --enable-smtp
228	post-patch::	169	SMTP_CONFIGURE_OFF= --disable-smtp
229	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply
230	.endif
231		170
232	.if ${PORT_OPTIONS:MPARENT_CHILD_MATCH_PATCH}	171	MAILDIR_HEADER_CACHE_CONFIGURE_OFF= --without-qdbm
233	post-patch::
234	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
235	.endif
236		172
237	.if ${PORT_OPTIONS:MFLOCK}	173	COMPRESSED_FOLDERS_DISTFILES= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
238	CONFIGURE_ARGS+= --enable-flock	174	COMPRESSED_FOLDERS_CONFIGURE_ON= --enable-compressed
239	.else	175	COMPRESSED_FOLDERS_VARS= XML_NEEDED=yes
240	CONFIGURE_ARGS+= --disable-flock
241	.endif
242		176
243	.if ${PORT_OPTIONS:MLOCALES_FIX}	177	QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
244	CONFIGURE_ARGS+= --enable-locales-fix	178	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
245	.endif	179	QUOTE_PATCH_VARS= XML_NEEDED=yes
246		180
247	.if ${PORT_OPTIONS:MICONV}	181	NNTP_DISTFILES= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv \
248	USES+= iconv:translit	182	patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv
249	CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG}	183	NNTP_CONFIGURE_ON= --enable-nntp
250	.else	184	NNTP_VARS= XML_NEEDED=yes
251	CONFIGURE_ARGS+= --disable-iconv	185	NNTP_CATEGORIES= news
252	.endif
253		186
254	.if ${PORT_OPTIONS:MIDN}	187	SIDEBAR_PATCH_VARS= XML_NEEDED=yes
255	LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn
256	CONFIGURE_ARGS+= --with-idn
257	.else
258	CONFIGURE_ARGS+= --without-idn
259	.endif
260		188
261	.if ${PORT_OPTIONS:MGPGME}	189	DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref
262	LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme	190
263	CONFIGURE_ARGS+= --enable-gpgme	191	SIGNATURE_MENU_IGNORE= SIGNATURE_MENU does not work at the moment
264	.else	192	SIGNATURE_MENU_VARS= XML_NEEDED=yes
265	CONFIGURE_ARGS+= --disable-gpgme	193	SIGNATURE_MENU_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-signature-menu
		194
		195	MBOX_HOOK_PATCH_IGNORE= MBOX_HOOK_PATCH does not work at the moment
		196	MBOX_HOOK_PATCH_PATCHFILES= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
		197
		198	.include <bsd.port.options.mk>
		199
		200	DW_PATCH_VERSION= 1.5.6
		201	DW_MBOX_PATCH_VERSION= 1.5.18
		202	.if !defined(VVV_PATCH_VERSION)
		203	VVV_PATCH_VERSION= ${PORTVERSION}
		204	.endif
		205	.if !defined(RR_PATCH_VERSION)
		206	RR_PATCH_VERSION= ${PORTVERSION}
		207	.endif
		208	.if !defined(DW_PATCH_VERSION)
		209	DW_PATCH_VERSION= ${PORTVERSION}
		210	.endif
		211	.if !defined(DW_MBOX_PATCH_VERSION)
		212	DW_MBOX_PATCH_VERSION= ${DW_PATCH_VERSION}
266	.endif	213	.endif
267	LDFLAGS=	214
		215	# XXX
		216	# this should be done automagically by aclocal but ....
		217	# for now, this will have to do
		218	pre-build::
		219	@${REINPLACE_CMD} -E -e "s\|^(ACLOCAL = ).+\|\1${ACLOCAL}\|" \
		220	-e "s\|^(AUTOCONF = ).+\|\1${AUTOCONF}\|" \
		221	-e "s\|^(AUTOMAKE = ).+\|\1${AUTOMAKE}\|" \
		222	-e "s\|^(AUTOHEADER = ).+\|\1${AUTOHEADER}\|" \
		223	${BUILD_WRKSRC}/Makefile
268		224
269	.if ${PORT_OPTIONS:MGSSAPI}	225	.if ${PORT_OPTIONS:MGSSAPI}
270	.if exists(${LOCALBASE}/bin/krb5-config)	226	.if exists(${LOCALBASE}/bin/krb5-config)
Lines 280-286 Link Here
280	LDFLAGS+= -L${HEIMDAL_HOME}/lib -Wl,-rpath=${HEIMDAL_HOME}/lib -ltinfow	236	LDFLAGS+= -L${HEIMDAL_HOME}/lib -Wl,-rpath=${HEIMDAL_HOME}/lib -ltinfow
281	.elif (defined(MAKE_KERBEROS5)) \|\| exists(/usr/lib/libkrb5.a)	237	.elif (defined(MAKE_KERBEROS5)) \|\| exists(/usr/lib/libkrb5.a)
282	CONFIGURE_ARGS+= --with-gss	238	CONFIGURE_ARGS+= --with-gss
283	WITH_KRB5_SYS=YES	239	WITH_KRB5_SYS=yes
284	.endif	240	.endif
285	.endif	241	.endif
286		242
Lines 288-371 Link Here
288	CFLAGS+= ${CFLAGS_ADD}	244	CFLAGS+= ${CFLAGS_ADD}
289	LDFLAGS+= ${LDFLAGS_ADD}	245	LDFLAGS+= ${LDFLAGS_ADD}
290		246
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	247	PATCH_DIST_STRIP= -p1
302		248
303	.if ${PORT_OPTIONS:MCOMPRESSED_FOLDERS}	249	pre-patch-PARENT_CHILD_MATCH_PATCH-on:
304	DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv	250	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match
305	CONFIGURE_ARGS+= --enable-compressed	251
306	XML_NEEDED= yes	252	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	253	@${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' \	254	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
310	${WRKDIR}/patch-compressed	255	${WRKDIR}/patch-compressed
311	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed	256	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
312	.endif
313		257
314	.if ${PORT_OPTIONS:MNNTP}	258	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	259	@${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' \	260	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
324	${WRKDIR}/patch-nntp	261	${WRKDIR}/patch-nntp
325	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp	262	@${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
332	.if ${PORT_OPTIONS:MQUOTE_PATCH}
333	PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \
334	patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv
335	XML_NEEDED= yes
336	.endif
337		263
338	.if ${PORT_OPTIONS:MIFDEF_PATCH}	264	post-patch-NNTP-on:
339	post-patch::	265	.if ${PORT_OPTIONS:MSIDEBAR_PATCH}
340	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef	266	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp
		267	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh
341	.endif	268	.endif
342		269	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
343	.if ${PORT_OPTIONS:MMBOX_HOOK_PATCH}	270	@${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	271	.endif
347		272
		273	post-patch-NNTP-off:
348	.if ${PORT_OPTIONS:MSIDEBAR_PATCH}	274	.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	275	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar
357	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh	276	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-refresh
358	.endif	277	.endif
		278	.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
		279	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
359	.endif	280	.endif
360		281
361	.if ${PORT_OPTIONS:MGREETING_PATCH}	282	post-install-NNTP-on:
362	post-patch::	283	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
		284
		285	post-patch-GREETING_PATCH-on:
363	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting	286	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting
364	.endif	287
365	.if ${PORT_OPTIONS:MTRASH_PATCH}	288	post-patch-IFDEF_PATCH-on:
366	post-patch::	289	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
		290
		291	post-patch-TRASH_PATCH-on:
367	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge	292	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge
368	.endif
369		293
370	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}	294	WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
371		295
Lines 386-397 Link Here
386	${WRKSRC}/imap/auth_gss.c	310	${WRKSRC}/imap/auth_gss.c
387	.endif	311	.endif
388		312
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}	313	.if ${PORT_OPTIONS:MIMAP_HEADER_CACHE} \|\| ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
396	.if ${PORT_OPTIONS:MTOKYOCABINET}	314	.if ${PORT_OPTIONS:MTOKYOCABINET}
397	CONFIGURE_ARGS+= --enable-hcache --without-gdbm --without-bdb --with-tokyocabinet	315	CONFIGURE_ARGS+= --enable-hcache --without-gdbm --without-bdb --with-tokyocabinet
Lines 407-454 Link Here
407	CONFIGURE_ARGS+= --disable-hcache	325	CONFIGURE_ARGS+= --disable-hcache
408	.endif	326	.endif
409		327
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}	328	.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
439	PLIST_SUB+= XML=""
440	BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \	329	BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
441	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \	330	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
442	lynx:${PORTSDIR}/www/lynx	331	lynx:${PORTSDIR}/www/lynx
443	.else	332	.else
444	PLIST_SUB+= XML="@comment "
445	pre-build::	333	pre-build::
446	@${REINPLACE_CMD} -E -e 's\|-xsltproc\|@-true xsltproc\|g' \	334	@${REINPLACE_CMD} -E -e 's\|-xsltproc\|@-true xsltproc\|g' \
447	${WRKSRC}/doc/Makefile	335	${WRKSRC}/doc/Makefile
448	.endif	336	.endif
449		337
450	.if ${PORT_OPTIONS:MSLANG}
451	PKGMESSAGE= ${FILESDIR}/pkg-message.slang
452	.endif
453
454	.include <bsd.port.mk>	338	.include <bsd.port.mk>

Line 0 Link Here

(-)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

(-)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%%%%COMPRESSED_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