@@ -, +, @@ 
- Remove --disable-warnings, seems obsolete
- Remove unsused plist variables: COMPRESSED_FOLDERS, XML
- Remove XML_NEEDED from COMPRESSED_FOLDERS, QUOTE_PATCH, SIDEBAR options.
  Only option that needs XML is NNTP
- Remove unused RR_PATCH_VERSION variable
- Update GREETING_PATCH to 1.8.0
- Make COMPRESSED_FOLDERS enabled by default. It's increases mutt binary size
  by a negligible amount, not conflicts with anything and adds only one small
  example file.
--- Makefile	(revision 436444)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	mutt
 PORTVERSION=	1.8.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -38,7 +38,7 @@ 
 CONFIGURE_ARGS=	--disable-fcntl --with-ssl=${OPENSSLBASE} \
 		--with-docdir=${DOCSDIR} --sysconfdir=${PREFIX}/etc \
 		--enable-external-dotlock --enable-pop --enable-imap \
-		--disable-warnings
+		--enable-compressed
 
 USES+=		cpe shebangfix ssl
 SHEBANG_FILES=	doc/gen-map-doc smime_keys.pl contrib/smime_keys_test.pl
@@ -56,7 +56,7 @@ 
 .if defined (MUTT_LITE)
 OPTIONS_EXCLUDE=	NLS DOCS EXAMPLES
 .else
-OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
+OPTIONS_DEFINE=	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 \
@@ -70,7 +70,6 @@ 
 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
@@ -102,7 +101,7 @@ 
 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 \
+OPTIONS_DEFAULT=	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 \
@@ -123,9 +122,7 @@ 
 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 "
@@ -207,13 +204,8 @@ 
 
 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
@@ -222,7 +214,6 @@ 
 NNTP_CATEGORIES=	news
 
 SIDEBAR_CONFIGURE_ENABLE=	sidebar
-SIDEBAR_VARS=	XML_NEEDED=yes
 
 DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
 
@@ -230,15 +221,11 @@ 
 
 # 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
+GREETING_PATCH_VERSION=	1.8.0
 
 .if !defined(VVV_PATCH_VERSION)
 VVV_PATCH_VERSION=	${PORTVERSION}
 .endif
-.if !defined(RR_PATCH_VERSION)
-RR_PATCH_VERSION=	${PORTVERSION}
-.endif
 .if !defined(GREETING_PATCH_VERSION)
 GREETING_PATCH_VERSION=	${PORTVERSION}
 .endif
--- distinfo	(revision 436444)
+++ distinfo	(working copy)
@@ -1,4 +1,4 @@ 
-TIMESTAMP = 1488157778
+TIMESTAMP = 1489875322
 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
@@ -9,8 +9,8 @@ 
 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/mutt-1.8.0.vc.greeting) = 95458c249a81bd61f087c0f82999ba2ad435f762cc5ee2b899fbfb102df117d5
+SIZE (mutt/mutt-1.8.0.vc.greeting) = 4499
 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
--- pkg-plist	(revision 436444)
+++ pkg-plist	(working copy)
@@ -75,6 +75,7 @@ 
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-compress
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-sidebar
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.vimrc-sidebar