diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	Sun Feb  6 11:00:40 2005
+++ ./Makefile	Mon Feb  7 17:09:21 2005
@@ -108,6 +108,9 @@
 		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
+DISTNAME=	mutt-${PORTVERSION}i
+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 \
@@ -123,12 +126,10 @@
 COMMENT?=	The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
 
 CONFLICTS=	mutt-[0-9]*
-
 DIST_SUBDIR=	mutt
 DOCSDIR?=	${PREFIX}/share/doc/mutt
 EXAMPLESDIR?=	${PREFIX}/share/examples/mutt
 DATADIR?=	${PREFIX}/share/mutt
-
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-flock --disable-fcntl --with-ssl=${OPENSSLBASE} \
@@ -150,10 +151,6 @@
 
 .include <bsd.port.pre.mk>
 
-DISTNAME=	mutt-${PORTVERSION}i
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-
 CD_PATCH_VERSION=	1.5.5.1
 CD_IFDEF_PATCH_VERSION=	1.5.4
 DW_PATCH_VERSION=	1.5.6
@@ -383,7 +380,7 @@
 	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
 
 .if defined(MUTT_SLAVE_HTML_PAGES)
-SCRIPTS_ENV+=	MUTT_SLAVE_HTML_PAGES="$(MUTT_SLAVE_HTML_PAGES)"
+SCRIPTS_ENV+=	MUTT_SLAVE_HTML_PAGES="${MUTT_SLAVE_HTML_PAGES}"
 .endif
 .if defined(WITH_MUTT_NNTP)
 SCRIPTS_ENV+=	MUTT_NNTP="yes"
diff -ru  /usr/ports/mail/mutt-devel/files/patch-Makefile.am.doc ./files/patch-Makefile.am.doc
--- /usr/ports/mail/mutt-devel/files/patch-Makefile.am.doc	Thu Jan  1 01:00:00 1970
+++ ./files/patch-Makefile.am.doc	Mon Feb  7 10:55:57 2005
@@ -0,0 +1,11 @@
+--- Makefile.am.orig2	Mon Feb  7 10:20:52 2005
++++ Makefile.am	Mon Feb  7 10:29:41 2005
+@@ -10,7 +10,7 @@
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
+ 
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+