[Midnightbsd-cvs] mports [22457] trunk/mail/mutt: update mutt

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun May 14 15:57:26 EDT 2017 

Revision: 22457
          http://svnweb.midnightbsd.org/mports/?rev=22457
Author:   laffer1
Date:     2017-05-14 15:57:26 -0400 (Sun, 14 May 2017)
Log Message:
-----------
update mutt

Modified Paths:
--------------
    trunk/mail/mutt/Makefile
    trunk/mail/mutt/distinfo
    trunk/mail/mutt/files/extra-patch-doc-ref
    trunk/mail/mutt/files/patch-examples
    trunk/mail/mutt/files/patch-threadcomplete
    trunk/mail/mutt/pkg-descr
    trunk/mail/mutt/pkg-plist

Removed Paths:
-------------
    trunk/mail/mutt/files/patch-02
    trunk/mail/mutt/files/patch-03
    trunk/mail/mutt/files/patch-05
    trunk/mail/mutt/files/patch-08
    trunk/mail/mutt/files/patch-aclocal.m4
    trunk/mail/mutt/files/patch-configure.in
    trunk/mail/mutt/files/patch-contrib-Makefile.in
    trunk/mail/mutt/files/patch-doc-mutt.man
    trunk/mail/mutt/files/patch-init.c
    trunk/mail/mutt/files/patch-m4-gssapi.m4
    trunk/mail/mutt/files/patch-mktemp
    trunk/mail/mutt/files/patch-z
    trunk/mail/mutt/pkg-plist.htmlfiles

Modified: trunk/mail/mutt/Makefile
===================================================================
--- trunk/mail/mutt/Makefile	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/Makefile	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,205 +1,325 @@
+# Created by: Udo Schweigert
+# $FreeBSD: head/mail/mutt/Makefile 435416 2017-03-04 16:03:08Z adamw $
 # $MidnightBSD$
 
 PORTNAME=	mutt
-PORTVERSION=	1.4.2.3
-PORTREVISION=	4
+PORTVERSION=	1.8.0
+PORTREVISION?=	0
 CATEGORIES+=	mail ipv6
-MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
+MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
+		https://bitbucket.org/mutt/mutt/downloads/ \
 		ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
-		ftp://ftp.parodius.com/pub/mutt/
+		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
+		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	mutt
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-PATCHVERSION?=	${PORTVERSION}
-PATCHVERSION=	1.4.2.2
-PATCH_SITES=	http://www.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
-		http://www2.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
-		http://www3.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
-		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PATCHVERSION}/:vvv \
-		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${PATCHVERSION}/:vvv
-PATCHFILES=	patch-${PATCHVERSION}.rr.compressed.gz:vvv \
-		patch-${PATCHVERSION}.vvv.initials.gz:vvv
+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://home.uchicago.edu/~dgc/sw/mutt/:dgc \
+		https://www.schrab.com/aaron/mutt/:ats \
+		http://vc.org.ua/mutt/:vc
 PATCH_DIST_STRIP=	-p1
+PATCHFILES=	patch-1.5.1.dgc.deepif.1:dgc \
+			patch-1.7.0.ats.date_conditional.1:ats
 
 MAINTAINER?=	ports at MidnightBSD.org
-COMMENT?=	The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
+COMMENT?=	Small but powerful text based program for read/writing e-mail
+
 LICENSE=	gpl2
 
-CONFLICTS=	mutt-devel-*
-.include <bsd.port.pre.mk>
+DOCSDIR?=	${PREFIX}/share/doc/mutt
+EXAMPLESDIR?=	${PREFIX}/share/examples/mutt
+DATADIR?=	${PREFIX}/share/mutt
+CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include"
+CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
+		--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
+		--enable-external-dotlock --enable-pop --enable-imap \
+		--disable-warnings
 
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
-.if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
-WITH_SLANG=	yes
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/aspell-ispell \
-		urlview:${PORTSDIR}/textproc/urlview
-USE_GMAKE=	yes
+USE_OPENSSL=	yes
+USES+=		cpe shebangfix 
+SHEBANG_FILES=	doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
+
+.if defined(MUTT_CONFIGURE_ARGS)
+CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
+
+USES+=		autoreconf
+GNU_CONFIGURE=	yes
+AUTOMAKE_ARGS=	--add-missing --foreign
+
+OPTIONS_SUB=	yes
+
 .if defined (MUTT_LITE)
-PKGNAMESUFFIX=	-lite
-WITH_SGML_DOCS:=no
-.endif
+OPTIONS_EXCLUDE=	NLS DOCS EXAMPLES
+.else
+OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
+		FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
+		LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH MIXMASTER \
+		NLS NNTP PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
+		REVERSE_REPLY_PATCH SIDEBAR SMART_DATE SMIME_OUTLOOK_COMPAT \
+		SMTP URLVIEW XML
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-USE_ICONV=	yes
-.if defined(WITHOUT_MUTT_ICONV)
-.error the WITHOUT_MUTT_ICONV knob of the mutt port only works if \
-	WITHOUT_NLS is also given
+OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
+OPTIONS_RADIO=	SPELL
+OPTIONS_RADIO_SPELL=	ASPELL ISPELL
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
+OPTIONS_SINGLE_HCACHE=	HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE_NONE
+OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
+
+COMPRESSED_FOLDERS_DESC=	Compressed folders
+SASL_DESC=	SASL authentication
+DEBUG_DESC=	Debugging capabilities
+FLOCK_DESC=	flock() usage
+FORCEBASE64_DESC=	Option to force base64 encoding for compose
+GPGME_DESC=	Gpgme interface
+GREETING_PATCH_DESC=	Greeting support
+HTML_DESC=	HTML documentation
+IDN_DESC+=	International Domain Names (implies ICONV)
+IFDEF_PATCH_DESC=	ifdef feature
+LOCALES_FIX_DESC=	Locales fix
+MAILBOX_MANPAGES_DESC=	Install mbox.5/mmdf.5 manpages
+MAILDIR_MTIME_PATCH_DESC=	Maildir mtime patch
+MIXMASTER_DESC=	Mixmaster support
+NCURSES_DESC=	Ncurses support
+NLS_DESC=	Native language support (implies ICONV)
+PARENT_CHILD_MATCH_PATCH_DESC=	Parent/child match
+QUOTE_PATCH_DESC=	Extended quoting
+REVERSE_REPLY_PATCH_DESC=	Reverse_reply
+SIDEBAR_DESC=	Sidebar support
+SLANG_DESC=	SLANG support
+SMART_DATE_DESC=	Dynamic date formatting with "%@"
+SMIME_OUTLOOK_COMPAT_DESC=	SMIME outlook compatibility
+SMTP_DESC=	SMTP relay support
+HCACHE_DESC=	Header Cache support
+HCACHE_BDB_DESC=	Use Berkeley DB (BDB)
+HCACHE_TOKYOCABINET_DESC=	Use Tokyo Cabinet
+HCACHE_KYOTOCABINET_DESC=	Use Kyoto Cabinet
+HCACHE_NONE_DESC=	Disable Header Cache
+URLVIEW_DESC=	Use urlview for the URL selector menu
+XML_DESC=	Use XML tools for rebuilding documentation
+
+OPTIONS_DEFAULT=	COMPRESSED_FOLDERS GPGME HTML HCACHE_BDB ICONV IDN \
+		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH \
+		NLS NCURSES PARENT_CHILD_MATCH_PATCH QUOTE_PATCH \
+		REVERSE_REPLY_PATCH SMART_DATE SMIME_OUTLOOK_COMPAT SASL SMTP \
+		URLVIEW XML GSSAPI_NONE
 .endif
-.elif !defined(WITHOUT_MUTT_ICONV)
-USE_ICONV=	yes
-.endif
 
-.if defined(WITH_SLANG)
-LIB_DEPENDS+=	slang.2:${PORTSDIR}/devel/libslang2
-.elif defined(WITH_NCURSES_PORT)
-LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
-.endif
+RUN_DEPENDS+=	${LOCALBASE}/etc/mime.types:misc/mime-support
+
 .if !defined (MUTT_LITE)
-.if defined(WITH_MUTT_CYRUS_SASL)
-IGNORE=	The SASL support for mutt has been withdrawn. Please use the mutt-devel port instead
+ASPELL_BUILD_DEPENDS=	aspell:textproc/aspell
+ASPELL_RUN_DEPENDS=	aspell:textproc/aspell
+ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
+ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
+URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
 .endif
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
+
+.if defined (MUTT_LITE)
+PKGNAMESUFFIX=	-lite
+USES+=	ncurses
+PLIST_SUB+=	MAILBOX_MANPAGES=""
+PLIST_SUB+=	COMPRESSED_FOLDERS="@comment "
+PLIST_SUB+=	HTML="@comment "
+PLIST_SUB+=	XML="@comment "
+PLIST_SUB+=	NNTP="@comment "
+# XXX bug in bpm ?
+PLIST_SUB+=	NLS="@comment "
+CONFIGURE_ARGS+=	--disable-nls --disable-iconv --without-idn
 .endif
-.if defined(WITH_MUTT_XFACE)
-PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/news/slrnface:extract
-RUN_DEPENDS+=	slrnface:${PORTSDIR}/news/slrnface
+
+.ifmake makesum # for optional distfiles patchfiles
+PORT_DBDIR=		/dev/null
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 .endif
-.endif
 
-DIST_SUBDIR=	mutt
-WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
-USE_OPENSSL=	yes
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake autoconf
-CONFIGURE_TARGET=${ARCH}-portbld-freebsd6.0
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--enable-pop --enable-imap --disable-fcntl \
-		--with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
-		--with-sharedir=${PREFIX}/share/mutt \
-		--with-docdir=${DOCSDIR} --with-charmaps \
-		--enable-compressed
-.if defined(MUTT_CONFIGURE_ARGS)
-CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
+DEBUG_CONFIGURE_ON=	--enable-debug
+
+# Handle ncurses/ncurses-port/slang
+SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
+SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
+SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang
+
+NCURSES_USES=	ncurses
+
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+#NLS_CONFIGURE_OFF=	--disable-nls
+NLS_IMPLIES=	ICONV
+
+# Handle GSSAPI from various places
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_BASE_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_MIT_USES=	gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON=	--with-gss=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
+GSSAPI_NONE_CONFIGURE_ON=	--without-gss
+
+HCACHE_NONE_CONFIGURE_ON=	--disable-hcache
+HCACHE_NONE_CONFIGURE_OFF=	--enable-hcache --without-qdbm --without-gdbm
+
+HCACHE_BDB_CONFIGURE_WITH=	bdb
+HCACHE_BDB_USES=	bdb:42+
+
+HCACHE_TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet
+HCACHE_TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
+
+HCACHE_KYOTOCABINET_CONFIGURE_WITH=	kyotocabinet
+HCACHE_KYOTOCABINET_LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
+
+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
+
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
+
+#MIXMASTER_BUILD_DEPENDS=	mixmaster:mail/mixmaster
+MIXMASTER_RUN_DEPENDS=	mixmaster:mail/mixmaster
+MIXMASTER_CONFIGURE_ON=	--with-mixmaster=${LOCALBASE}
+
+SMIME_OUTLOOK_COMPAT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smime-outlook
+SMART_DATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smartdate
+
+FLOCK_CONFIGURE_ENABLE=	flock
+
+LOCALES_FIX_CONFIGURE_ON=	--enable-locales-fix
+
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
+IDN_CONFIGURE_WITH=	idn
+IDN_IMPLIES=	ICONV
+
+GPGME_LIB_DEPENDS+=	libgpgme.so:security/gpgme
+GPGME_LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error
+GPGME_LIB_DEPENDS+=	libassuan.so:security/libassuan
+GPGME_CONFIGURE_ENABLE=	gpgme
+
+SMTP_CONFIGURE_ENABLE=	smtp
+
+GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
+
+COMPRESSED_FOLDERS_ENABLE=	compressed
+COMPRESSED_FOLDERS_VARS=	XML_NEEDED=yes \
+COMPRESSED_FOLDERS_PLIST_FILES=%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress
+
+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
+
+SIDEBAR_CONFIGURE_ENABLE=	sidebar
+SIDEBAR_VARS=	XML_NEEDED=yes
+
+DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
+
+.include <bsd.mport.options.mk>
+
+# un/comment as each VERSION is created for PORTVERSION
+VVV_PATCH_VERSION=	1.8.0
+RR_PATCH_VERSION=	1.7.2
+GREETING_PATCH_VERSION=	1.7.2
+
+.if !defined(VVV_PATCH_VERSION)
+VVV_PATCH_VERSION=	${PORTVERSION}
 .endif
-.if defined(WITHOUT_MUTT_FLOCK)
-CONFIGURE_ARGS+=	--disable-flock
-.else
-CONFIGURE_ARGS+=	--enable-flock
+.if !defined(RR_PATCH_VERSION)
+RR_PATCH_VERSION=	${PORTVERSION}
 .endif
-.if defined(WITH_LOCALES_FIX)
-CONFIGURE_ARGS+=	--enable-locales-fix
+.if !defined(GREETING_PATCH_VERSION)
+GREETING_PATCH_VERSION=	${PORTVERSION}
 .endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS=""
+
+# 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
+
+LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib:/usr/lib -ltinfow
+CFLAGS+=		${CFLAGS_ADD}
+LDFLAGS+=		${LDFLAGS_ADD}
+
+pre-patch-NNTP-on:
+	@${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} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp
+
+post-patch-NNTP-on:
+.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
+	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
 .endif
-.if defined(WITHOUT_MUTT_ICONV) && defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-iconv
-.else
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}
+.if ${PORT_OPTIONS:MFORCEBASE64}
+	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
 .endif
-.if defined(WITH_SLANG)
-CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(WITH_NCURSES_PORT)
-CONFIGURE_ARGS+=	--with-curses=${PREFIX}
-CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
+
+post-patch-NNTP-off:
+.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
+	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
 .endif
-.if !defined(WITHOUT_GSSAPI)
-.if exists(${LOCALBASE}/bin/gss-client)
-LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
-CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
-.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=	--with-gss
-USE_KRB5_SYS=YES
+.if ${PORT_OPTIONS:MFORCEBASE64}
+	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
 .endif
-.endif
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		mbox.5 muttrc.5
 
-post-patch::
+post-install:
+	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
+
+post-install-NNTP-on:
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
+
+post-patch-IFDEF_PATCH-on:
+	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
+
+post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
 	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
 		${WRKSRC}/contrib/pgp6.rc
 	@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
-		${WRKSRC}/contrib/Makefile.in
+		${WRKSRC}/contrib/Makefile.am
 
-.if defined(WITH_MUTT_XFACE)
-post-patch::
-	@${ECHO} "===>  Applying XFACE patch"
-	slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \
-			-name slrnface-\*`; \
-	cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
-.endif
-
 pre-configure::
-	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
-.if defined(USE_KRB5_SYS)
+	@${RM} ${WRKSRC}/missing
+.if defined(WITH_KRB5_SYS)
 	@${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
 	@${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
 		${WRKSRC}/imap/auth_gss.c
 .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 !defined(NOPORTDOCS)
-post-build:
-	@${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
-	@${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
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-PLIST:=		${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist.htmlfiles > ${PLIST}
-	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
+.if ${PORT_OPTIONS:MHCACHE_BDB}
+CONFIGURE_SED=	-e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /'
+pre-configure::
+	@${REINPLACE_CMD} -E ${CONFIGURE_SED} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}.ac
 .endif
-.endif
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist
-.if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing Mutt documentation"
-	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
-	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
-		${DOCSDIR}
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m 0755 \
-	    -d ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${DOCSDIR}
+.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
+BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
+		lynx:www/lynx
+.else
+pre-build::
+	@${REINPLACE_CMD} -E -e 's|-xsltproc|@-true xsltproc|g' \
+		${WRKSRC}/doc/Makefile
 .endif
-.endif
 
-.if defined(WITH_MUTT_XFACE)
-	@${ECHO} ""
-	@${ECHO} "************************************************************"
-	@${ECHO} "  To enable the XFACE support in mutt you also have to add"
-	@${ECHO} "        set xface=yes"
-	@${ECHO} "  to your ~/.muttrc"
-	@${ECHO} "  Additional information is provided by news/slrnface"
-	@${ECHO} "************************************************************"
-	@${ECHO} ""
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/mail/mutt/distinfo
===================================================================
--- trunk/mail/mutt/distinfo	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/distinfo	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,9 +1,17 @@
-SHA256 (mutt/mutt-1.4.2.3.tar.gz) = 1a4920e5efccd6a83932af4223cb568956158f62e9f595798acc4004aca6ace5
-RMD160 (mutt/mutt-1.4.2.3.tar.gz) = 59e66c308cd4967e587ad1dc73dd76c7f0d06ef1
-SIZE (mutt/mutt-1.4.2.3.tar.gz) = 2646433
-SHA256 (mutt/patch-1.4.2.2.rr.compressed.gz) = 3f70a8b666e1dd5342acb418aac8cb4a1ab68559b389346052bb1078a3b8dfee
-RMD160 (mutt/patch-1.4.2.2.rr.compressed.gz) = 7671cc5446554b01dc697acb00d944f34a94abc2
-SIZE (mutt/patch-1.4.2.2.rr.compressed.gz) = 10191
-SHA256 (mutt/patch-1.4.2.2.vvv.initials.gz) = 2ab42c9bd369bacf7cad603e242e110c9adfdf18f477ce065fef8dbfbd1a8474
-RMD160 (mutt/patch-1.4.2.2.vvv.initials.gz) = 5604ade00e382db3e4b43944845831fdb5fc4b3e
-SIZE (mutt/patch-1.4.2.2.vvv.initials.gz) = 690
+TIMESTAMP = 1488157778
+SHA256 (mutt/mutt-1.8.0.tar.gz) = 45841eda12804b460260adff8f3f39cc977744e832486a3c49e182eda967adab
+SIZE (mutt/mutt-1.8.0.tar.gz) = 4116223
+SHA256 (mutt/patch-1.8.0.vvv.nntp.gz) = 1bd4b83708bb664749a34a188f01bc541cc7ab51628a163d87da119152ed00b9
+SIZE (mutt/patch-1.8.0.vvv.nntp.gz) = 60675
+SHA256 (mutt/patch-1.8.0.vvv.nntp_ru.gz) = ec9be57cdd516748f9ee7ee27b137d6ef7d3346258198940cb3d1eabb12d13ea
+SIZE (mutt/patch-1.8.0.vvv.nntp_ru.gz) = 3465
+SHA256 (mutt/patch-1.5.1.dgc.deepif.1) = d655a2f0003bdb2efb7ee5a8c77c113da661110e9c63289f03eb622773fc7a34
+SIZE (mutt/patch-1.5.1.dgc.deepif.1) = 767
+SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e
+SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415
+SHA256 (mutt/mutt-1.7.2.vc.greeting) = 05dce466675c8692ab4a2c34d309de06e98e965241249e3cfccbb8d10873b9a3
+SIZE (mutt/mutt-1.7.2.vc.greeting) = 4175
+SHA256 (mutt/patch-1.8.0.vvv.initials.gz) = 98c667c86028691ee0e9a8022977a7ba16972854c1f2fd87f83899c30598fedd
+SIZE (mutt/patch-1.8.0.vvv.initials.gz) = 686
+SHA256 (mutt/patch-1.8.0.vvv.quote.gz) = 18d50110ab38a4338284691e081aa06b1b52301eca49633d2c7639b46acf7e2c
+SIZE (mutt/patch-1.8.0.vvv.quote.gz) = 1282

Modified: trunk/mail/mutt/files/extra-patch-doc-ref
===================================================================
--- trunk/mail/mutt/files/extra-patch-doc-ref	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/extra-patch-doc-ref	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,12 +1,12 @@
---- doc/mutt.man.orig	Mon Jul 13 12:50:38 1998
-+++ doc/mutt.man	Thu Oct  1 22:15:40 1998
-@@ -20,7 +20,8 @@
- .SH DESCRIPTION
- Mutt is a small but very powerful text based program for reading electronic
- mail under unix operating systems, including support color terminals, MIME,
--and a threaded sorting mode.
-+and a threaded sorting mode.  Details of how to use all of this is
-+available in \fI${DOCSDIR}\fP.
- .SH OPTIONS
- .IP "-a \fIfile\fP"
- Attach a file to your message using MIME.
+--- doc/mutt.man.orig	2009-02-06 13:52:38.000000000 +0100
++++ doc/mutt.man	2009-02-06 13:55:05.000000000 +0100
+@@ -69,7 +69,8 @@
+ .PP
+ Mutt is a small but very powerful text based program for reading and sending electronic
+ mail under unix operating systems, including support for color terminals, MIME,
+-OpenPGP, and a threaded sorting mode.
++OpenPGP, and a threaded sorting mode. Details of how to use all of this is
++available in @docdir at .
+ .PP
+ .I Note:
+ .IR

Deleted: trunk/mail/mutt/files/patch-02
===================================================================
--- trunk/mail/mutt/files/patch-02	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-02	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,63 +0,0 @@
---- doc/Makefile.in.orig	Tue Nov  6 11:12:31 2001
-+++ doc/Makefile.in	Fri Jun 21 12:00:28 2002
-@@ -60,13 +60,19 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL 
- 
--all: muttrc.man try-html try-txt
-+all: muttrc.man try-html try-txt try-latin1
- 
- try-html: ../makedoc
--	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	touch $@
- 
- try-txt: ../makedoc
--	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	touch $@
-+
-+try-latin1: 
-+	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
-+	touch $@
- 
- install: all instdoc
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -86,10 +92,10 @@
- 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
--	for file in manual*.html ; do	\
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
--	done
-+	# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-+	# for file in manual*.html ; do	\
-+	# 	$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
-+	# done
- 
- uninstall:
- 	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-@@ -99,14 +105,18 @@
- 
- check:
- manual.txt: manual.sgml
--	if sgml2txt -c latin manual ; then \
--		uniq < manual.txt | expand > _manual.txt ; \
--		rm manual.txt ; \
-+	if sgmlfmt -f ascii manual; then \
-+		uniq < manual.ascii | expand > _manual.txt ; \
-+		rm -f manual.txt manual.ascii; \
- 		mv _manual.txt manual.txt ;\
- 	fi
- 
- manual.html: manual.sgml
--	sgml2html manual  || true
-+	@# sgml2html manual  || true
-+	sgmlfmt -f html manual  || true
-+
-+manual.latin1: manual.sgml
-+	sgmlfmt -f latin1 manual  || true
- 
- manual.ps: manual.sgml
- 	sgml2latex --output=ps manual || true

Deleted: trunk/mail/mutt/files/patch-03
===================================================================
--- trunk/mail/mutt/files/patch-03	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-03	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,13 +0,0 @@
---- doc/manual.sgml.orig	Tue May  9 17:15:26 2000
-+++ doc/manual.sgml	Fri May 12 11:05:40 2000
-@@ -1,5 +1,8 @@
--<!doctype linuxdoc system>
--
-+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
-+<!ENTITY dquot """>
-+]>
-+<linuxdoc>
-+  
- <article>
- 
- <title>The Mutt E-Mail Client

Deleted: trunk/mail/mutt/files/patch-05
===================================================================
--- trunk/mail/mutt/files/patch-05	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-05	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,87 +0,0 @@
---- curs_lib.c.old	Wed Sep  1 19:39:20 1999
-+++ curs_lib.c	Sun Sep 26 23:47:03 1999
-@@ -156,6 +156,16 @@
-       def = 0;
-       break;
-     }
-+    else if (tolower(ch.ch) == 'y')
-+    {
-+      def = 1;
-+      break;
-+    }
-+    else if (tolower(ch.ch) == 'n')
-+    {
-+      def = 0;
-+      break;
-+    }
-     else
-     {
-       BEEP();
-@@ -413,8 +423,9 @@
- {
-   event_t ch;
-   int choice;
--  char *p;
-+  char *p, *nletters;
- 
-+  nletters = _(letters);
-   mvaddstr (LINES - 1, 0, prompt);
-   clrtoeol ();
-   FOREVER
-@@ -428,6 +439,12 @@
-     }
-     else
-     {
-+      p = strchr (nletters, ch.ch);
-+      if (p)
-+      {
-+	choice = p - nletters + 1;
-+	break;
-+      }
-       p = strchr (letters, ch.ch);
-       if (p)
-       {
---- browser.c.orig	Fri Sep 24 01:08:08 1999
-+++ browser.c	Sun Sep 26 23:46:25 1999
-@@ -750,7 +750,7 @@
- 	  switch (mutt_multi_choice ((reverse) ?
- 	      _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ") :
- 	      _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "),
--	      _("dazn")))
-+	      N_("dazn")))
- 	  {
- 	    case -1: /* abort */
- 	      resort = 0;
---- commands.c.orig	Wed Jul  7 02:56:24 1999
-+++ commands.c	Sun Sep 26 23:46:25 1999
-@@ -337,7 +337,7 @@
-   switch (mutt_multi_choice (reverse ?
- 			     _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") :
- 			     _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "),
--			     _("dfrsotuzc")))
-+			     N_("dfrsotuzc")))
-   {
-   case -1: /* abort - don't resort */
-     return -1;
---- compose.c.orig	Mon Feb 12 18:02:38 2001
-+++ compose.c	Fri Mar 30 17:04:09 2001
-@@ -130,7 +130,7 @@
-   char input_signas[SHORT_STRING];
- 
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
--			     _("esabf")))
-+			     N_("esabf")))
-   {
-   case 1: /* (e)ncrypt */
-     bits |= PGPENCRYPT;
---- muttlib.c.orig	Sun Apr  9 14:39:02 2000
-+++ muttlib.c	Fri May 12 11:26:58 2000
-@@ -671,7 +671,7 @@
-   if (*append == 0 && access (fname, F_OK) == 0)
-   {
-     switch (mutt_multi_choice
--	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), _("oac")))
-+	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), N_("oac")))
-     {
-       case -1: /* abort */
-       case 3:  /* cancel */

Deleted: trunk/mail/mutt/files/patch-08
===================================================================
--- trunk/mail/mutt/files/patch-08	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-08	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,10 +0,0 @@
---- Muttrc.orig	Sat May 13 08:30:44 2000
-+++ Muttrc	Sat May 13 08:32:05 2000
-@@ -629,6 +629,7 @@
- # Type: boolean
- # Default: yes
- # 
-+set followup_to=no
- # 
- # Controls whether or not the Mail-Followup-To header field is
- # generated when sending mail.  When set, Mutt will generate this

Deleted: trunk/mail/mutt/files/patch-aclocal.m4
===================================================================
--- trunk/mail/mutt/files/patch-aclocal.m4	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-aclocal.m4	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Fri Jul 28 11:50:25 2000
-+++ aclocal.m4	Wed Dec  5 12:10:16 2001
-@@ -62,4 +62,4 @@
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, aclocal14, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf213, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake14, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader213, $missing_dir)

Deleted: trunk/mail/mutt/files/patch-configure.in
===================================================================
--- trunk/mail/mutt/files/patch-configure.in	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-configure.in	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,11 +0,0 @@
---- configure.in.orig	Mon Nov 11 14:11:26 2002
-+++ configure.in	Mon Nov 11 14:12:09 2002
-@@ -625,7 +625,7 @@
- fi])
- 
- if test x$GCC = xyes -a $mutt_cv_warnings = yes; then
--        CFLAGS="-Wall -pedantic $CFLAGS"
-+        CFLAGS="-Wall $CFLAGS"
- fi
- 
- AC_ARG_ENABLE(nfs-fix, [  --enable-nfs-fix           Work around an NFS with broken attributes caching ],

Deleted: trunk/mail/mutt/files/patch-contrib-Makefile.in
===================================================================
--- trunk/mail/mutt/files/patch-contrib-Makefile.in	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-contrib-Makefile.in	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
-+++ contrib/Makefile.in	Mon Mar 21 08:12:59 2005
-@@ -20,7 +20,7 @@
- 
- subdir = contrib
- 
--SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
- 	sample.muttrc  sample.mailcap sample.muttrc-tlr
- 
- DISTFILES = Makefile.in language.txt language50.txt  \

Deleted: trunk/mail/mutt/files/patch-doc-mutt.man
===================================================================
--- trunk/mail/mutt/files/patch-doc-mutt.man	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-doc-mutt.man	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,34 +0,0 @@
---- doc/mutt.man.orig	Wed Jul 24 10:41:31 2002
-+++ doc/mutt.man	Sun Oct 26 11:06:36 2003
-@@ -136,9 +136,9 @@
- User's personal mapping between MIME types and file extensions.
- .IP "/etc/mime.types"
- System mapping between MIME types and file extensions.
--.IP "/usr/local/bin/mutt_dotlock"
-+.IP "${PREFIX}/bin/mutt_dotlock"
- The privileged dotlocking program.
--.IP "/usr/local/doc/mutt/manual.txt"
-+.IP "${DOCSDIR}/manual.txt"
- The Mutt manual.
- .SH BUGS
- .PP
---- doc/muttrc.man	Sun Oct 26 11:09:09 2003
-+++ doc/muttrc.man	Sun Oct 26 11:08:48 2003
-@@ -990,7 +972,7 @@
- .B dotlock_program
- .nf
- Type: path
--Default: \(lq/usr/local/bin/mutt_dotlock\(rq
-+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq
- .fi
- .IP
- Contains the path of the mutt_dotlock (8) binary to be used by
-@@ -3970,7 +3952,7 @@
- instead of a raw socket. You may be able to use this to set up
- preauthenticated connections to your IMAP/POP3 server. Example:
- .IP
--tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq
-+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq
- .IP
- NOTE: For this example to work you must be able to log in to the remote
- machine without having to enter a password.

Modified: trunk/mail/mutt/files/patch-examples
===================================================================
--- trunk/mail/mutt/files/patch-examples	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-examples	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,50 +1,94 @@
---- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
-+++ contrib/Makefile.in	Wed Mar 26 11:45:15 2003
-@@ -12,6 +12,7 @@
- mandir = @mandir@
- srcdir = @srcdir@
- docdir = @docdir@
+--- INSTALL.orig	2016-10-08 19:30:21 UTC
++++ INSTALL
+@@ -228,13 +228,13 @@ If you decide to use your system's iconv
+ need to tell mutt about implementation-defined names for some
+ character sets.  Sample configuration files for various systems can
+ be found in the directory contrib/iconv/ in this source
+-distribution, and will be installed in the samples/iconv directory
++distribution, and will be installed in the share/examples/mutt/iconv directory
+ as part of mutt's documentation.
+ 
+ In order to use these sample configuration files, just put a line
+ like
+ 
+-     source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
++     source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
+ 
+ into your system's global Muttrc, which normally resides in /etc or
+ /usr/local/etc.
+--- contrib/Makefile.am.orig	2016-10-08 19:30:21 UTC
++++ contrib/Makefile.am
+@@ -1,6 +1,7 @@
+ # $Id$
+ 
+ subdir = contrib
 +samplesdir = @samplesdir@
- top_srcdir = @top_srcdir@
- top_builddir = ..
- INSTALL = @INSTALL@
-@@ -37,12 +38,12 @@
- check:
  
- install:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
+ SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
+ 	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
+@@ -14,12 +15,12 @@ EXTRA_DIST = language.txt language50.txt
+ 	iconv/make.sh
+ 
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
++	$(MKDIR_P) $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
  	for f in $(SAMPLES) ; do \
 -		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
-+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir);	\
++		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir) ;	\
  	done
  	for f in $(srcdir)/iconv/*.rc ; do					\
 -		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
-+		$(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv	  ;	\
++		$(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv  ;		\
  	done
  
- # Nothing needs to be done - uninstall in doc removes samples as well.
---- init.h.orig	Wed Mar 26 11:50:36 2003
-+++ init.h	Wed Mar 26 12:54:37 2003
-@@ -1347,8 +1347,8 @@
+ uninstall-local:
+--- doc/manual.txt.orig	2016-10-08 19:55:06 UTC
++++ doc/manual.txt
+@@ -8073,8 +8073,8 @@ set imap_authenticators="gssapi:cram-md5
+ 
+    For examples on how to configure these formats for the various versions
+    of PGP which are floating around, see the pgp and gpg sample
+-   configuration files in the samples/ subdirectory which has been
+-   installed on your system alongside the documentation. (PGP only)
++   configuration files in the share/examples/mutt/ subdirectory which has
++   been installed on your system alongside the documentation. (PGP only)
+ 
+ 3.166. pgp_decrypt_command
+ 
+@@ -9332,8 +9332,8 @@ set sidebar_delim_chars='.'
+    or "-CAfile [1766]$$ssmmiimmee__ccaa__llooccaattiioonn".
+ 
+    For examples on how to configure these formats, see the smime.rc in the
+-   samples/ subdirectory which has been installed on your system alongside
+-   the documentation. (S/MIME only)
++   share/examples/mutt/ subdirectory which has been installed on your system
++   alongside the documentation. (S/MIME only)
+ 
+ 3.271. smime_decrypt_use_default_key
+ 
+--- init.h.orig	2016-10-08 19:35:50 UTC
++++ init.h
+@@ -1814,9 +1814,8 @@ struct option_t MuttVars[] = {
    ** .pp
    ** For examples on how to configure these formats for the various versions
-   ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in
--  ** the samples/ subdirectory which has been installed on your system
+   ** of PGP which are floating around, see the pgp and gpg sample configuration files in
+-  ** the \fCsamples/\fP subdirectory which has been installed on your system
 -  ** alongside the documentation.
-+  ** the share/examples/mutt subdirectory which has been installed on your
-+  ** system.
+-  ** (PGP only)
++  ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
++  **  your system. (PGP only)
    */
-   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
+   { "pgp_decrypt_command", 	DT_STR, R_NONE, UL &PgpDecryptCommand, 0},
    /*
---- Makefile.am.orig	Wed Mar 26 13:13:10 2003
-+++ Makefile.am	Wed Mar 26 13:25:40 2003
-@@ -13,7 +13,7 @@
- 
- bin_SCRIPTS = muttbug flea
- 
--BUILT_SOURCES = keymap_defs.h patchlist.c
-+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
- 
- bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
- mutt_SOURCES = $(BUILT_SOURCES) \
+@@ -2942,9 +2941,8 @@ struct option_t MuttVars[] = {
+   ** .de
+   ** .pp
+   ** For examples on how to configure these formats, see the \fCsmime.rc\fP in
+-  ** the \fCsamples/\fP subdirectory which has been installed on your system
+-  ** alongside the documentation.
+-  ** (S/MIME only)
++  ** the \fCshare/examples/mutt/\fP subdirectory which has been installed on
++  ** your system. (S/MIME only)
+   */
+   { "smime_decrypt_use_default_key",	DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
+   /*

Deleted: trunk/mail/mutt/files/patch-init.c
===================================================================
--- trunk/mail/mutt/files/patch-init.c	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-init.c	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,39 +0,0 @@
---- init.c.orig	Wed Jul 24 10:41:29 2002
-+++ init.c	Sat May  3 08:46:29 2003
-@@ -1707,7 +1707,11 @@
- void mutt_init (int skip_sys_rc, LIST *commands)
- {
-   struct passwd *pw;
-+#if __FreeBSD_version < 500000
-+  char nodename[STRING];
-+#else
-   struct utsname utsname;
-+#endif
-   char *p, buffer[STRING], error[STRING];
-   int i, default_rc = 0, need_pause = 0;
-   BUFFER err;
-@@ -1765,16 +1769,21 @@
- #endif
- 
-   /* And about the host... */
-+#if __FreeBSD_version < 500000
-+  gethostname(nodename, sizeof (nodename));
-+#else
-   uname (&utsname);
-+  strfcpy (nodename, utsname.nodename, sizeof (nodename));
-+#endif
-   /* some systems report the FQDN instead of just the hostname */
--  if ((p = strchr (utsname.nodename, '.')))
-+  if ((p = strchr (nodename, '.')))
-   {
--    Hostname = mutt_substrdup (utsname.nodename, p);
-+    Hostname = mutt_substrdup (nodename, p);
-     p++;
-     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
-   }
-   else
--    Hostname = safe_strdup (utsname.nodename);
-+    Hostname = safe_strdup (nodename);
- 
- #ifndef DOMAIN
- #define DOMAIN buffer

Deleted: trunk/mail/mutt/files/patch-m4-gssapi.m4
===================================================================
--- trunk/mail/mutt/files/patch-m4-gssapi.m4	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-m4-gssapi.m4	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,33 +0,0 @@
---- m4/gssapi.m4.orig	Wed Apr 17 19:05:04 2002
-+++ m4/gssapi.m4	Mon Oct 16 10:59:34 2006
-@@ -6,10 +6,13 @@
- dnl if it is set and not "yes".
- dnl Defines GSSAPI_CFLAGS and GSSAPI_LIBS if found.
- dnl Defines GSSAPI_IMPL to "Heimdal", "MIT", or "OldMIT", or "none" if not found
--AC_DEFUN(MUTT_AM_PATH_GSSAPI,
-+AC_DEFUN([MUTT_AM_PATH_GSSAPI],
- [
-   GSSAPI_PREFIX=[$]$1
-   GSSAPI_IMPL="none"
-+  saved_CPPFLAGS="$CPPFLAGS"
-+  saved_LDFLAGS="$LDFLAGS"
-+  saved_LIBS="$LIBS"
-   dnl First try krb5-config
-   if test "$GSSAPI_PREFIX" != "yes"
-   then
-@@ -24,14 +27,11 @@
-     GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`"
-     case "`$KRB5CFGPATH --version`" in
-       "Kerberos 5 "*)	GSSAPI_IMPL="MIT";;
--      [hH]eimdal*)		GSSAPI_IMPL="Heimdal";;
-+      ?eimdal*)		GSSAPI_IMPL="Heimdal";;
-       *)		GSSAPI_IMPL="Unknown";;
-    esac
-   else
-     dnl No krb5-config, run the old code
--    saved_CPPFLAGS="$CPPFLAGS"
--    saved_LDFLAGS="$LDFLAGS"
--    saved_LIBS="$LIBS"
-     if test "$GSSAPI_PREFIX" != "yes"
-     then
-       GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include"

Deleted: trunk/mail/mutt/files/patch-mktemp
===================================================================
--- trunk/mail/mutt/files/patch-mktemp	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-mktemp	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,15 +0,0 @@
---- muttlib.c.orig	Fri May  7 17:30:35 2004
-+++ muttlib.c	Fri May  7 17:32:13 2004
-@@ -656,7 +656,11 @@
- 
- void mutt_mktemp (char *s)
- {
--  snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getpid (), Counter++);
-+  char t[7];
-+  snprintf (t, 7, "-%05d", Counter++);
-+  snprintf (s, _POSIX_PATH_MAX-6, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
-+  mktemp (s);
-+  strncat(s, t, 6);
-   unlink (s);
- }
- 

Modified: trunk/mail/mutt/files/patch-threadcomplete
===================================================================
--- trunk/mail/mutt/files/patch-threadcomplete	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-threadcomplete	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,73 +1,37 @@
-written by Nicolas Rachinsky <nr at rachinsky.de>
-http://www.rachinsky.de
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published
-by the Free Software Foundation;  version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
---- mutt-1.3.28.ori/mutt.h	Thu Mar 14 19:22:25 2002
-+++ mutt.h	Fri Mar 15 00:22:41 2002
-@@ -198,6 +198,7 @@
-   M_LIMIT,
-   M_EXPIRED,
-   M_SUPERSEDED,
-+  M_THREADCOMPLETE,
+--- mutt.h.orig	2017-02-27 01:20:29 UTC
++++ mutt.h
+@@ -201,6 +201,7 @@ enum
+   MUTT_EXPIRED,
+   MUTT_SUPERSEDED,
+   MUTT_TRASH,
++  MUTT_THREADCOMPLETE,
  
    /* actions for mutt_pattern_comp/mutt_pattern_exec */
-   M_AND,
---- mutt-1.3.28.ori/pattern.c	Thu Mar 14 19:22:26 2002
-+++ pattern.c	Fri Mar 15 00:23:52 2002
-@@ -50,6 +50,7 @@
+   MUTT_AND,
+--- pattern.c.orig	2017-02-27 01:20:06 UTC
++++ pattern.c
+@@ -56,6 +56,7 @@ static const struct pattern_flags
  }
  Flags[] =
  {
-+  { 'a', M_THREADCOMPLETE,	0,		NULL },
-   { 'A', M_ALL,			0,		NULL },
-   { 'b', M_BODY,		M_FULL_MSG,	eat_regexp },
-   { 'B', M_WHOLE_MSG,		M_FULL_MSG,	eat_regexp },
-@@ -957,6 +958,27 @@
-   return alladdr;
- }
- 
-+static int match_threadcomplete(int flag,THREAD *t,int left,int up,int right,int down)
-+{
-+	int a=0;
-+	HEADER *h=NULL;
-+
-+	if(! t)return 0;
-+	h=t->message;
-+	if(! flag && h && h->tagged)return 1;
-+	if(flag && h && ! h->tagged) return 1;
-+
-+	if(up)a=match_threadcomplete(flag,t->parent,1,1,1,0);
-+	if(a)return a;
-+	if(right && t->parent)a=match_threadcomplete(flag,t->next,0,0,1,1);
-+	if(a)return a;
-+	if(left && t->parent)a=match_threadcomplete(flag,t->prev,1,0,0,1);
-+	if(a)return a;
-+	if(down)a=match_threadcomplete(flag,t->child,1,0,1,1);
-+	if(a)return a;
-+	return 0;
-+}
-+
- /* flags
-    	M_MATCH_FULL_ADDRESS	match both personal and machine address */
- int
-@@ -1053,6 +1075,8 @@
-       return (pat->not ^ (h->env->x_label && regexec (pat->rx, h->env->x_label, 0, NULL, 0) == 0));
-     case M_DUPLICATED:
-       return (pat->not ^ (h->thread && h->thread->duplicate_thread));
-+    case M_THREADCOMPLETE:
-+      return ((h->thread && match_threadcomplete(pat->not,h->thread,1,1,1,1)));
-   }
-   mutt_error (_("error: unknown op %d (report this error)."), pat->op);
-   return (-1);
---- PATCHES~    Tue Nov  6 19:59:33 2001
-+++ PATCHES     Tue Nov  6 19:59:42 2001
-@@ -1,0 +1 @@
-+1.3.28.nr.threadcomplete
++  { 'a', MUTT_THREADCOMPLETE,	0,		NULL },
+   { 'A', MUTT_ALL,			0,		NULL },
+   { 'b', MUTT_BODY,		MUTT_FULL_MSG,	eat_regexp },
+   { 'B', MUTT_WHOLE_MSG,		MUTT_FULL_MSG,	eat_regexp },
+@@ -1236,6 +1237,16 @@ mutt_pattern_exec (struct pattern_t *pat
+       else
+         result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
+       return (pat->not ^ result);
++    case MUTT_THREADCOMPLETE:
++      { static pattern_t tmp;
++        static short pattern_set = 0;
++        if(! pattern_set) {
++          memset (&tmp, 0, sizeof (tmp));
++          tmp.op = MUTT_TAG;
++          pattern_set = 1;
++        }
++        return (pat->not ^ (h->env && match_threadcomplete(&tmp, flags, ctx, h->thread, 1, 1, 1, 1)));
++      } 
+     case MUTT_SUBSCRIBED_LIST:
+       if (cache)
+       {

Deleted: trunk/mail/mutt/files/patch-z
===================================================================
--- trunk/mail/mutt/files/patch-z	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/files/patch-z	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,22 +0,0 @@
---- Makefile.am.orig2	Thu Jan  6 15:45:58 2005
-+++ Makefile.am	Thu Jan  6 15:47:48 2005
-@@ -11,7 +11,7 @@
- 
- SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
- 
--bin_SCRIPTS = muttbug flea
-+bin_SCRIPTS =
- 
- BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
- 
---- doc/Makefile.in.orig2	Thu Jan  6 15:45:57 2005
-+++ doc/Makefile.in	Thu Jan  6 15:53:52 2005
-@@ -78,8 +78,6 @@
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
- 	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
--	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
--	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
- 	./instdoc $(srcdir)/dotlock.man \
- 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5

Modified: trunk/mail/mutt/pkg-descr
===================================================================
--- trunk/mail/mutt/pkg-descr	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/pkg-descr	2017-05-14 19:57:26 UTC (rev 22457)
@@ -6,4 +6,6 @@
 RFC1522 support for encoded headers), customizable key bindings, POP3,
 Delivery Status Notification (DSN) support, and PGP/MIME.
 
+Mutt FAQ:	http://dev.mutt.org/trac/wiki/MuttFaq
+
 WWW: http://www.mutt.org/

Modified: trunk/mail/mutt/pkg-plist
===================================================================
--- trunk/mail/mutt/pkg-plist	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/pkg-plist	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,51 +1,85 @@
+bin/flea
 bin/mutt
-bin/mutt_dotlock
+bin/muttbug
+@(,mail,2755) bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
- at unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi
-etc/Muttrc.dist
- at exec if [ ! -f %D/etc/Muttrc ]; then cp %D/etc/Muttrc.dist %D/etc/Muttrc; fi
-%%DOCSDIR%%/COPYRIGHT
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/GPL
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/PGP-Notes.txt
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.SECURITY
-%%DOCSDIR%%/README.SSL
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/applying-patches.txt
-%%DOCSDIR%%/devel-notes.txt
-%%DOCSDIR%%/manual.txt
-%%DOCSDIR%%/patch-notes.txt
-%%EXAMPLESDIR%%/Mush.rc
-%%EXAMPLESDIR%%/Pine.rc
-%%EXAMPLESDIR%%/Tin.rc
-%%EXAMPLESDIR%%/gpg.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
-%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
-%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
-%%EXAMPLESDIR%%/pgp2.rc
-%%EXAMPLESDIR%%/pgp6.rc
-%%EXAMPLESDIR%%/sample.mailcap
-%%EXAMPLESDIR%%/sample.muttrc
-%%EXAMPLESDIR%%/sample.muttrc-tlr
+bin/smime_keys
+ at sample etc/Muttrc.sample
+man/man1/flea.1.gz
+man/man1/mutt.1.gz
+man/man1/mutt_dotlock.1.gz
+man/man1/muttbug.1.gz
+man/man1/pgpewrap.1.gz
+man/man1/pgpring.1.gz
+man/man1/smime_keys.1.gz
+man/man5/mailcap.5.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
+%%PORTDOCS%%%%DOCSDIR%%/GPL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/README.SSL
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
+%%NNTP%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.nntp
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/miscellany.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/reference.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/security.html
+%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tuning.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime_keys_test.pl
 %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
@@ -55,7 +89,9 @@
 %%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
@@ -73,6 +109,3 @@
 %%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
- at dirrm %%EXAMPLESDIR%%/iconv
- at dirrm %%EXAMPLESDIR%%
- at dirrm %%DOCSDIR%%

Deleted: trunk/mail/mutt/pkg-plist.htmlfiles
===================================================================
--- trunk/mail/mutt/pkg-plist.htmlfiles	2017-05-14 18:03:52 UTC (rev 22456)
+++ trunk/mail/mutt/pkg-plist.htmlfiles	2017-05-14 19:57:26 UTC (rev 22457)
@@ -1,346 +0,0 @@
-%%DOCSDIR%%/html/manual.html
-%%DOCSDIR%%/html/manual1.html
-%%DOCSDIR%%/html/manual10.html
-%%DOCSDIR%%/html/manual100.html
-%%DOCSDIR%%/html/manual101.html
-%%DOCSDIR%%/html/manual102.html
-%%DOCSDIR%%/html/manual103.html
-%%DOCSDIR%%/html/manual104.html
-%%DOCSDIR%%/html/manual105.html
-%%DOCSDIR%%/html/manual106.html
-%%DOCSDIR%%/html/manual107.html
-%%DOCSDIR%%/html/manual108.html
-%%DOCSDIR%%/html/manual109.html
-%%DOCSDIR%%/html/manual11.html
-%%DOCSDIR%%/html/manual110.html
-%%DOCSDIR%%/html/manual111.html
-%%DOCSDIR%%/html/manual112.html
-%%DOCSDIR%%/html/manual113.html
-%%DOCSDIR%%/html/manual114.html
-%%DOCSDIR%%/html/manual115.html
-%%DOCSDIR%%/html/manual116.html
-%%DOCSDIR%%/html/manual117.html
-%%DOCSDIR%%/html/manual118.html
-%%DOCSDIR%%/html/manual119.html
-%%DOCSDIR%%/html/manual12.html
-%%DOCSDIR%%/html/manual120.html
-%%DOCSDIR%%/html/manual121.html
-%%DOCSDIR%%/html/manual122.html
-%%DOCSDIR%%/html/manual123.html
-%%DOCSDIR%%/html/manual124.html
-%%DOCSDIR%%/html/manual125.html
-%%DOCSDIR%%/html/manual126.html
-%%DOCSDIR%%/html/manual127.html
-%%DOCSDIR%%/html/manual128.html
-%%DOCSDIR%%/html/manual129.html
-%%DOCSDIR%%/html/manual13.html
-%%DOCSDIR%%/html/manual130.html
-%%DOCSDIR%%/html/manual131.html
-%%DOCSDIR%%/html/manual132.html
-%%DOCSDIR%%/html/manual133.html
-%%DOCSDIR%%/html/manual134.html
-%%DOCSDIR%%/html/manual135.html
-%%DOCSDIR%%/html/manual136.html
-%%DOCSDIR%%/html/manual137.html
-%%DOCSDIR%%/html/manual138.html
-%%DOCSDIR%%/html/manual139.html
-%%DOCSDIR%%/html/manual14.html
-%%DOCSDIR%%/html/manual140.html
-%%DOCSDIR%%/html/manual141.html
-%%DOCSDIR%%/html/manual142.html
-%%DOCSDIR%%/html/manual143.html
-%%DOCSDIR%%/html/manual144.html
-%%DOCSDIR%%/html/manual145.html
-%%DOCSDIR%%/html/manual146.html
-%%DOCSDIR%%/html/manual147.html
-%%DOCSDIR%%/html/manual148.html
-%%DOCSDIR%%/html/manual149.html
-%%DOCSDIR%%/html/manual15.html
-%%DOCSDIR%%/html/manual150.html
-%%DOCSDIR%%/html/manual151.html
-%%DOCSDIR%%/html/manual152.html
-%%DOCSDIR%%/html/manual153.html
-%%DOCSDIR%%/html/manual154.html
-%%DOCSDIR%%/html/manual155.html
-%%DOCSDIR%%/html/manual156.html
-%%DOCSDIR%%/html/manual157.html
-%%DOCSDIR%%/html/manual158.html
-%%DOCSDIR%%/html/manual159.html
-%%DOCSDIR%%/html/manual16.html
-%%DOCSDIR%%/html/manual160.html
-%%DOCSDIR%%/html/manual161.html
-%%DOCSDIR%%/html/manual162.html
-%%DOCSDIR%%/html/manual163.html
-%%DOCSDIR%%/html/manual164.html
-%%DOCSDIR%%/html/manual165.html
-%%DOCSDIR%%/html/manual166.html
-%%DOCSDIR%%/html/manual167.html
-%%DOCSDIR%%/html/manual168.html
-%%DOCSDIR%%/html/manual169.html
-%%DOCSDIR%%/html/manual17.html
-%%DOCSDIR%%/html/manual170.html
-%%DOCSDIR%%/html/manual171.html
-%%DOCSDIR%%/html/manual172.html
-%%DOCSDIR%%/html/manual173.html
-%%DOCSDIR%%/html/manual174.html
-%%DOCSDIR%%/html/manual175.html
-%%DOCSDIR%%/html/manual176.html
-%%DOCSDIR%%/html/manual177.html
-%%DOCSDIR%%/html/manual178.html
-%%DOCSDIR%%/html/manual179.html
-%%DOCSDIR%%/html/manual18.html
-%%DOCSDIR%%/html/manual180.html
-%%DOCSDIR%%/html/manual181.html
-%%DOCSDIR%%/html/manual182.html
-%%DOCSDIR%%/html/manual183.html
-%%DOCSDIR%%/html/manual184.html
-%%DOCSDIR%%/html/manual185.html
-%%DOCSDIR%%/html/manual186.html
-%%DOCSDIR%%/html/manual187.html
-%%DOCSDIR%%/html/manual188.html
-%%DOCSDIR%%/html/manual189.html
-%%DOCSDIR%%/html/manual19.html
-%%DOCSDIR%%/html/manual190.html
-%%DOCSDIR%%/html/manual191.html
-%%DOCSDIR%%/html/manual192.html
-%%DOCSDIR%%/html/manual193.html
-%%DOCSDIR%%/html/manual194.html
-%%DOCSDIR%%/html/manual195.html
-%%DOCSDIR%%/html/manual196.html
-%%DOCSDIR%%/html/manual197.html
-%%DOCSDIR%%/html/manual198.html
-%%DOCSDIR%%/html/manual199.html
-%%DOCSDIR%%/html/manual2.html
-%%DOCSDIR%%/html/manual20.html
-%%DOCSDIR%%/html/manual200.html
-%%DOCSDIR%%/html/manual201.html
-%%DOCSDIR%%/html/manual202.html
-%%DOCSDIR%%/html/manual203.html
-%%DOCSDIR%%/html/manual204.html
-%%DOCSDIR%%/html/manual205.html
-%%DOCSDIR%%/html/manual206.html
-%%DOCSDIR%%/html/manual207.html
-%%DOCSDIR%%/html/manual208.html
-%%DOCSDIR%%/html/manual209.html
-%%DOCSDIR%%/html/manual21.html
-%%DOCSDIR%%/html/manual210.html
-%%DOCSDIR%%/html/manual211.html
-%%DOCSDIR%%/html/manual212.html
-%%DOCSDIR%%/html/manual213.html
-%%DOCSDIR%%/html/manual214.html
-%%DOCSDIR%%/html/manual215.html
-%%DOCSDIR%%/html/manual216.html
-%%DOCSDIR%%/html/manual217.html
-%%DOCSDIR%%/html/manual218.html
-%%DOCSDIR%%/html/manual219.html
-%%DOCSDIR%%/html/manual22.html
-%%DOCSDIR%%/html/manual220.html
-%%DOCSDIR%%/html/manual221.html
-%%DOCSDIR%%/html/manual222.html
-%%DOCSDIR%%/html/manual223.html
-%%DOCSDIR%%/html/manual224.html
-%%DOCSDIR%%/html/manual225.html
-%%DOCSDIR%%/html/manual226.html
-%%DOCSDIR%%/html/manual227.html
-%%DOCSDIR%%/html/manual228.html
-%%DOCSDIR%%/html/manual229.html
-%%DOCSDIR%%/html/manual23.html
-%%DOCSDIR%%/html/manual230.html
-%%DOCSDIR%%/html/manual231.html
-%%DOCSDIR%%/html/manual232.html
-%%DOCSDIR%%/html/manual233.html
-%%DOCSDIR%%/html/manual234.html
-%%DOCSDIR%%/html/manual235.html
-%%DOCSDIR%%/html/manual236.html
-%%DOCSDIR%%/html/manual237.html
-%%DOCSDIR%%/html/manual238.html
-%%DOCSDIR%%/html/manual239.html
-%%DOCSDIR%%/html/manual24.html
-%%DOCSDIR%%/html/manual240.html
-%%DOCSDIR%%/html/manual241.html
-%%DOCSDIR%%/html/manual242.html
-%%DOCSDIR%%/html/manual243.html
-%%DOCSDIR%%/html/manual244.html
-%%DOCSDIR%%/html/manual245.html
-%%DOCSDIR%%/html/manual246.html
-%%DOCSDIR%%/html/manual247.html
-%%DOCSDIR%%/html/manual248.html
-%%DOCSDIR%%/html/manual249.html
-%%DOCSDIR%%/html/manual25.html
-%%DOCSDIR%%/html/manual250.html
-%%DOCSDIR%%/html/manual251.html
-%%DOCSDIR%%/html/manual252.html
-%%DOCSDIR%%/html/manual253.html
-%%DOCSDIR%%/html/manual254.html
-%%DOCSDIR%%/html/manual255.html
-%%DOCSDIR%%/html/manual256.html
-%%DOCSDIR%%/html/manual257.html
-%%DOCSDIR%%/html/manual258.html
-%%DOCSDIR%%/html/manual259.html
-%%DOCSDIR%%/html/manual26.html
-%%DOCSDIR%%/html/manual260.html
-%%DOCSDIR%%/html/manual261.html
-%%DOCSDIR%%/html/manual262.html
-%%DOCSDIR%%/html/manual263.html
-%%DOCSDIR%%/html/manual264.html
-%%DOCSDIR%%/html/manual265.html
-%%DOCSDIR%%/html/manual266.html
-%%DOCSDIR%%/html/manual267.html
-%%DOCSDIR%%/html/manual268.html
-%%DOCSDIR%%/html/manual269.html
-%%DOCSDIR%%/html/manual27.html
-%%DOCSDIR%%/html/manual270.html
-%%DOCSDIR%%/html/manual271.html
-%%DOCSDIR%%/html/manual272.html
-%%DOCSDIR%%/html/manual273.html
-%%DOCSDIR%%/html/manual274.html
-%%DOCSDIR%%/html/manual275.html
-%%DOCSDIR%%/html/manual276.html
-%%DOCSDIR%%/html/manual277.html
-%%DOCSDIR%%/html/manual278.html
-%%DOCSDIR%%/html/manual279.html
-%%DOCSDIR%%/html/manual28.html
-%%DOCSDIR%%/html/manual280.html
-%%DOCSDIR%%/html/manual281.html
-%%DOCSDIR%%/html/manual282.html
-%%DOCSDIR%%/html/manual283.html
-%%DOCSDIR%%/html/manual284.html
-%%DOCSDIR%%/html/manual285.html
-%%DOCSDIR%%/html/manual286.html
-%%DOCSDIR%%/html/manual287.html
-%%DOCSDIR%%/html/manual288.html
-%%DOCSDIR%%/html/manual289.html
-%%DOCSDIR%%/html/manual29.html
-%%DOCSDIR%%/html/manual290.html
-%%DOCSDIR%%/html/manual291.html
-%%DOCSDIR%%/html/manual292.html
-%%DOCSDIR%%/html/manual293.html
-%%DOCSDIR%%/html/manual294.html
-%%DOCSDIR%%/html/manual295.html
-%%DOCSDIR%%/html/manual296.html
-%%DOCSDIR%%/html/manual297.html
-%%DOCSDIR%%/html/manual298.html
-%%DOCSDIR%%/html/manual299.html
-%%DOCSDIR%%/html/manual3.html
-%%DOCSDIR%%/html/manual30.html
-%%DOCSDIR%%/html/manual300.html
-%%DOCSDIR%%/html/manual301.html
-%%DOCSDIR%%/html/manual302.html
-%%DOCSDIR%%/html/manual303.html
-%%DOCSDIR%%/html/manual304.html
-%%DOCSDIR%%/html/manual305.html
-%%DOCSDIR%%/html/manual306.html
-%%DOCSDIR%%/html/manual307.html
-%%DOCSDIR%%/html/manual308.html
-%%DOCSDIR%%/html/manual309.html
-%%DOCSDIR%%/html/manual31.html
-%%DOCSDIR%%/html/manual310.html
-%%DOCSDIR%%/html/manual311.html
-%%DOCSDIR%%/html/manual312.html
-%%DOCSDIR%%/html/manual313.html
-%%DOCSDIR%%/html/manual314.html
-%%DOCSDIR%%/html/manual315.html
-%%DOCSDIR%%/html/manual316.html
-%%DOCSDIR%%/html/manual317.html
-%%DOCSDIR%%/html/manual318.html
-%%DOCSDIR%%/html/manual319.html
-%%DOCSDIR%%/html/manual32.html
-%%DOCSDIR%%/html/manual320.html
-%%DOCSDIR%%/html/manual321.html
-%%DOCSDIR%%/html/manual322.html
-%%DOCSDIR%%/html/manual323.html
-%%DOCSDIR%%/html/manual324.html
-%%DOCSDIR%%/html/manual325.html
-%%DOCSDIR%%/html/manual326.html
-%%DOCSDIR%%/html/manual327.html
-%%DOCSDIR%%/html/manual328.html
-%%DOCSDIR%%/html/manual329.html
-%%DOCSDIR%%/html/manual33.html
-%%DOCSDIR%%/html/manual330.html
-%%DOCSDIR%%/html/manual331.html
-%%DOCSDIR%%/html/manual332.html
-%%DOCSDIR%%/html/manual333.html
-%%DOCSDIR%%/html/manual334.html
-%%DOCSDIR%%/html/manual335.html
-%%DOCSDIR%%/html/manual336.html
-%%DOCSDIR%%/html/manual337.html
-%%DOCSDIR%%/html/manual338.html
-%%DOCSDIR%%/html/manual339.html
-%%DOCSDIR%%/html/manual34.html
-%%DOCSDIR%%/html/manual340.html
-%%DOCSDIR%%/html/manual341.html
-%%DOCSDIR%%/html/manual342.html
-%%DOCSDIR%%/html/manual35.html
-%%DOCSDIR%%/html/manual36.html
-%%DOCSDIR%%/html/manual37.html
-%%DOCSDIR%%/html/manual38.html
-%%DOCSDIR%%/html/manual39.html
-%%DOCSDIR%%/html/manual4.html
-%%DOCSDIR%%/html/manual40.html
-%%DOCSDIR%%/html/manual41.html
-%%DOCSDIR%%/html/manual42.html
-%%DOCSDIR%%/html/manual43.html
-%%DOCSDIR%%/html/manual44.html
-%%DOCSDIR%%/html/manual45.html
-%%DOCSDIR%%/html/manual46.html
-%%DOCSDIR%%/html/manual47.html
-%%DOCSDIR%%/html/manual48.html
-%%DOCSDIR%%/html/manual49.html
-%%DOCSDIR%%/html/manual5.html
-%%DOCSDIR%%/html/manual50.html
-%%DOCSDIR%%/html/manual51.html
-%%DOCSDIR%%/html/manual52.html
-%%DOCSDIR%%/html/manual53.html
-%%DOCSDIR%%/html/manual54.html
-%%DOCSDIR%%/html/manual55.html
-%%DOCSDIR%%/html/manual56.html
-%%DOCSDIR%%/html/manual57.html
-%%DOCSDIR%%/html/manual58.html
-%%DOCSDIR%%/html/manual59.html
-%%DOCSDIR%%/html/manual6.html
-%%DOCSDIR%%/html/manual60.html
-%%DOCSDIR%%/html/manual61.html
-%%DOCSDIR%%/html/manual62.html
-%%DOCSDIR%%/html/manual63.html
-%%DOCSDIR%%/html/manual64.html
-%%DOCSDIR%%/html/manual65.html
-%%DOCSDIR%%/html/manual66.html
-%%DOCSDIR%%/html/manual67.html
-%%DOCSDIR%%/html/manual68.html
-%%DOCSDIR%%/html/manual69.html
-%%DOCSDIR%%/html/manual7.html
-%%DOCSDIR%%/html/manual70.html
-%%DOCSDIR%%/html/manual71.html
-%%DOCSDIR%%/html/manual72.html
-%%DOCSDIR%%/html/manual73.html
-%%DOCSDIR%%/html/manual74.html
-%%DOCSDIR%%/html/manual75.html
-%%DOCSDIR%%/html/manual76.html
-%%DOCSDIR%%/html/manual77.html
-%%DOCSDIR%%/html/manual78.html
-%%DOCSDIR%%/html/manual79.html
-%%DOCSDIR%%/html/manual8.html
-%%DOCSDIR%%/html/manual80.html
-%%DOCSDIR%%/html/manual81.html
-%%DOCSDIR%%/html/manual82.html
-%%DOCSDIR%%/html/manual83.html
-%%DOCSDIR%%/html/manual84.html
-%%DOCSDIR%%/html/manual85.html
-%%DOCSDIR%%/html/manual86.html
-%%DOCSDIR%%/html/manual87.html
-%%DOCSDIR%%/html/manual88.html
-%%DOCSDIR%%/html/manual89.html
-%%DOCSDIR%%/html/manual9.html
-%%DOCSDIR%%/html/manual90.html
-%%DOCSDIR%%/html/manual91.html
-%%DOCSDIR%%/html/manual92.html
-%%DOCSDIR%%/html/manual93.html
-%%DOCSDIR%%/html/manual94.html
-%%DOCSDIR%%/html/manual95.html
-%%DOCSDIR%%/html/manual96.html
-%%DOCSDIR%%/html/manual97.html
-%%DOCSDIR%%/html/manual98.html
-%%DOCSDIR%%/html/manual99.html
-%%DOCSDIR%%/html/manual_toc.html
-%%DOCSDIR%%/manual.latin1
- at dirrm %%DOCSDIR%%/html

More information about the Midnightbsd-cvs mailing list