2008-07-09 mail/mutt-ng: Abandonware by upstream maintainers. Use mail/mutt-devel

Approved by:    araujo (mentor)

12 files changed, 1 insertions, 514 deletions

diff --git a/MOVED b/MOVED
index 9b3b23da7ff9..52a05cf4d716 100644
--- a/MOVED
+++ b/MOVED
@@ -3548,3 +3548,4 @@ hungarian/php_doc||2008-08-04|Manual in this language was removed
 korean/php_doc||2008-08-04|Manual in this language was removed
 mbone/rtpmon||2008-08-16|Abandoned upstream and needs gcc32 which is going to be removed
 games/ssc||2008-08-16|Abandoned upstream and needs gcc32 which is going to be removed
+mail/mutt-ng||2008-08-18|Has expired: Abandonware by upstream maintainers. Use mail/mutt-devel
diff --git a/mail/Makefile b/mail/Makefile
index e3e109a097d8..7055478e8e26 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -287,7 +287,6 @@
     SUBDIR += mutt-devel
     SUBDIR += mutt-devel-lite
     SUBDIR += mutt-lite
-    SUBDIR += mutt-ng
     SUBDIR += mutt_vc_query
     SUBDIR += muttzilla
     SUBDIR += nbsmtp
diff --git a/mail/mutt-ng/Makefile b/mail/mutt-ng/Makefile
deleted file mode 100644
index 6303d8c17262..000000000000
--- a/mail/mutt-ng/Makefile
+++ /dev/null
@@ -1,179 +0,0 @@
-# New ports collection makefile for:	mutt-ng
-# Date created:		14 Jun 2005
-# Whom:			Vsevolod Stakhov <vsevolod@highsecure.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mutt-ng
-PORTVERSION=	20061125
-PORTREVISION=	4
-CATEGORIES=	mail
-MASTER_SITES=	http://nion.modprobe.de/mutt-ng/snapshots/		\
-		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
-DISTNAME=	muttng-${PORTVERSION}
-
-MAINTAINER=	josh@tcbug.org
-COMMENT=	A fork of the mutt with the goal to incorporate all the patches
-
-DEPRECATED=	Abandonware by upstream maintainers. Use mail/mutt-devel
-EXPIRATION_DATE=2008-07-09
-
-GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
-USE_GMAKE=	yes
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-fcntl --sysconfdir=${PREFIX}/etc \
-		--with-sharedir=${PREFIX}/share/mutt \
-		--with-docdir=${DOCSDIR} --with-charmaps
-MAKE_ENV=	"EXAMPLESDIR=${EXAMPLESDIR}"
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-USE_ICONV=	yes
-PLIST_SUB+=	NLS=""
-.if defined(WITHOUT_MUTT_ICONV)
-BROKEN=		The WITHOUT_MUTT_ICONV knob of the mutt port only works if WITHOUT_NLS is also given
-.endif
-.elif !defined(WITHOUT_MUTT_ICONV)
-USE_ICONV=	yes
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-PLIST_SUB+=	NLS="@comment "
-CONFIGURE_ARGS+=	--disable-nls
-CONFIGURE_ARGS+=	--disable-iconv
-.endif
-
-OPTIONS=	POP		"Enable pop3 support"				on  \
-		IMAP		"Enable imap support"				on  \
-		NNTP		"Enable nntp support"				off \
-		COMPRESSED	"Enable compressed folder support"		on  \
-		FLOCK		"Enable flock to lock files"			on  \
-		HCACHE_DB4	"Enable headers caching via DB4"		on  \
-		HCACHE_GDBM	"Enable headers caching via gdbm"		off \
-		HCACHE_QDBM	"Enable headers caching via qdbm"		off \
-		ESMTP		"Enable libesmtp support for sending mail"	off \
-		SLANG		"Compile with SLANG frontend"			off \
-		NCURSES_PORT	"Compile with ncurses frontend via port"	off \
-		SASL2		"Compile with sasl2 support for authentication"	off \
-		GNUTLS		"Compile with SSL support via GNUTLS"		off \
-		LIBIDN		"Enable international domain names"		off \
-		DEBUG		"Compile a debug version"			on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
-WITH_MUTT_IMAP_HEADER_CACHE=	yes
-.endif
-
-.if defined (WITH_POP)
-CONFIGURE_ARGS+=	--enable-pop
-.endif
-
-.if defined (WITH_IMAP) || defined(WITH_MUTT_IMAP_HEADER_CACHE)
-CONFIGURE_ARGS+=	--enable-imap
-.endif
-
-.if defined(WITH_POP) || defined(WITH_IMAP) || defined(WITH_NNTP) || defined(WITH_SSL)
-.if !defined(WITH_GNUTLS)
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=	--with-gnutls=${LOCALBASE}
-LIB_DEPENDS+=		gnutls.26:${PORTSDIR}/security/gnutls
-.endif
-.endif
-
-.if defined (WITH_NNTP) || defined(WITH_MUTT_NNTP)
-CONFIGURE_ARGS+=	--enable-nntp
-.endif
-
-.if defined (WITH_COMPRESSED) || defined(WITH_MUTT_COMPRESSED_FOLDERS)
-CONFIGURE_ARGS+=	--enable-compressed
-.endif
-
-.if defined (WITH_HCACHE_DB4) || defined(WITH_MUTT_IMAP_HEADER_CACHE)
-CONFIGURE_ARGS+=	--enable-hcache --without-qdbm --without-gdbm --with-bdb=${LOCALBASE}
-LIB_DEPENDS+=		db41.1:${PORTSDIR}/databases/db41
-.elif defined (WITH_HCACHE_GDBM)
-CONFIGURE_ARGS+=	--enable-hcache --without-qdbm
-LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm
-.elif defined (WITH_HCACHE_QDBM)
-CONFIGURE_ARGS+=	--enable-hcache
-LIB_DEPENDS+=		qdbm.12:${PORTSDIR}/databases/qdbm
-.endif
-
-.if defined (WITH_FLOCK)
-CONFIGURE_ARGS+=	--enable-flock
-CONFIGURE_ARGS+=	--disable-fcntl
-.elif defined(WITHOUT_MUTT_FLOCK)
-CONFIGURE_ARGS+=	--disable-flock
-CONFIGURE_ARGS+=	--enable-fcntl
-.endif
-
-.if defined(WITH_SLANG) && !defined(WITH_NCURSES_PORT)
-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
-CONFIGURE_ARGS+=	--with-slang=${LOCALBASE}
-.elif defined(WITH_NCURSES_PORT) && !defined(WITH_SLANG)
-LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
-CONFIGURE_ARGS+=	--with-curses=${LOCALBASE}
-.elif defined(WITH_SLANG) && defined(WITH_NCURSES_PORT)
-BROKEN=	You may not specify both WITH_SLANG and WITH_NCURSES options
-.endif
-
-.if defined(WITH_SASL2) || defined(WITH_MUTT_CYRUS_SASL2)
-.if !defined(WITH_POP) && !defined(WITH_IMAP)
-BROKEN=	SASL2 only is useful for imap or pop
-.endif
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--with-sasl2=${LOCALBASE}
-.endif
-
-.if defined(WITH_ESMTP)
-LIB_DEPENDS+=	esmtp.6:${PORTSDIR}/mail/libesmtp
-CONFIGURE_ARGS+=	--with-libesmtp=${LOCALBASE}
-.endif
-
-.if defined(WITH_LIBIDN)
-LIB_DEPENDS+=	idn.16:${PORTSDIR}/dns/libidn
-CONFIGURE_ARGS+=	--with-idn=${LOCALBASE}
-.endif
-
-.if defined (WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.if !defined (NOPORTDOCS)
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nodoc
-.endif
-
-MAN1=	muttng.1 muttngbug.1 muttng_dotlock.1 fleang.1 muttng-flea.1
-MAN5=	muttng-mbox.5 muttngrc.5
-
-.if !defined(NOPORTDOCS)
-post-build:
-	@${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
-	@${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
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/Muttngrc ${PREFIX}/etc/Muttngrc.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}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/mutt-ng/distinfo b/mail/mutt-ng/distinfo
deleted file mode 100644
index 318d19000cf6..000000000000
--- a/mail/mutt-ng/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (muttng-20061125.tar.gz) = 4baa9f38f8da6bebef2fdd9996bc0823
-SHA256 (muttng-20061125.tar.gz) = 325d86c0cda57daba001cd8ae9be5619f2cf34dda287eeaeff9563e4fd047919
-SIZE (muttng-20061125.tar.gz) = 2734101
diff --git a/mail/mutt-ng/files/extra-patch-doc b/mail/mutt-ng/files/extra-patch-doc
deleted file mode 100644
index bb6e36544693..000000000000
--- a/mail/mutt-ng/files/extra-patch-doc
+++ /dev/null
@@ -1,39 +0,0 @@
---- doc/Makefile.in.orig	Tue Mar 14 10:36:31 2006
-+++ doc/Makefile.in	Thu Jul 13 16:51:53 2006
-@@ -89,11 +89,6 @@
- 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
--	-cd html; for file in *.html ; do \
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
--	done
--	-$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html || true
- 
- uninstall:
- 	for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \
-@@ -113,12 +108,6 @@
- 	@HTMLCLEAN_CMD@ $@ || true
- 
- manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
--	test -d html || mkdir html
--	-xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^
--	touch stamp-doc-chunked
--	cd html; for file in *.html ; do \
--	  @HTMLCLEAN_CMD@ $$file || true ; \
--	done
- 	
- manual.pdf: stamp-doc-tex
- 	-if test -f manual.tex; then pdfjadetex manual.tex; fi
-@@ -181,11 +170,6 @@
- 	for file in $(BUILT_DISTFILES) ; do \
- 	  ln $$file $(distdir) 2> /dev/null \
- 	  || cp -p $$file $(distdir) ; \
--	done
--	mkdir $(distdir)/html
--	cd html; for file in *.html ; do \
--	  ln $$file ../$(distdir)/html 2> /dev/null \
--	  || cp -p $$file ../$(distdir)/html ; \
- 	done
- 
- ../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
diff --git a/mail/mutt-ng/files/extra-patch-nodoc b/mail/mutt-ng/files/extra-patch-nodoc
deleted file mode 100644
index ab3ce148496a..000000000000
--- a/mail/mutt-ng/files/extra-patch-nodoc
+++ /dev/null
@@ -1,47 +0,0 @@
---- doc/Makefile.in.orig	Tue Mar 14 10:36:31 2006
-+++ doc/Makefile.in	Thu Jul 13 16:54:23 2006
-@@ -81,19 +81,6 @@
- 		$(DESTDIR)$(mandir)/man1/muttng_dotlock.1
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttngrc.5
- 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/muttng-mbox.5
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
--	for f in $(topsrcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
--	done
--	for f in $(srcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
--	done
--	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
--	-cd html; for file in *.html ; do \
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
--	done
--	-$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html || true
- 
- uninstall:
- 	for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \
-@@ -113,12 +100,6 @@
- 	@HTMLCLEAN_CMD@ $@ || true
- 
- manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
--	test -d html || mkdir html
--	-xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^
--	touch stamp-doc-chunked
--	cd html; for file in *.html ; do \
--	  @HTMLCLEAN_CMD@ $$file || true ; \
--	done
- 	
- manual.pdf: stamp-doc-tex
- 	-if test -f manual.tex; then pdfjadetex manual.tex; fi
-@@ -181,11 +162,6 @@
- 	for file in $(BUILT_DISTFILES) ; do \
- 	  ln $$file $(distdir) 2> /dev/null \
- 	  || cp -p $$file $(distdir) ; \
--	done
--	mkdir $(distdir)/html
--	cd html; for file in *.html ; do \
--	  ln $$file ../$(distdir)/html 2> /dev/null \
--	  || cp -p $$file ../$(distdir)/html ; \
- 	done
- 
- ../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c
diff --git a/mail/mutt-ng/files/patch-Makefile.in b/mail/mutt-ng/files/patch-Makefile.in
deleted file mode 100644
index 20a5fba1da40..000000000000
--- a/mail/mutt-ng/files/patch-Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
---- Makefile.in.orig	Tue Jul 26 07:01:12 2005
-+++ Makefile.in	Wed Jul 27 15:45:51 2005
-@@ -41,7 +41,8 @@
- EXTRA_PROGRAMS = muttng_dotlock$(EXEEXT) pgpringng$(EXEEXT) \
- 	pgpewrapng$(EXEEXT) makedoc$(EXEEXT)
- bin_PROGRAMS = muttng$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ \
--	@SMIMEAUX_TARGET@ $(am__empty)
-+	$(am__empty)
-+bin_SCRIPTS = @SMIMEAUX_TARGET@
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/Muttngrc.head.in \
- 	$(srcdir)/config.h.in $(srcdir)/muttbug.sh.in \
-@@ -71,6 +72,7 @@
- am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
-+SCRIPTS = $(bin_SCRIPTS)
- am_makedoc_OBJECTS = makedoc.$(OBJEXT)
- makedoc_OBJECTS = $(am_makedoc_OBJECTS)
- am__objects_1 = patchlist.$(OBJEXT)
-@@ -267,7 +269,7 @@
- INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
- ISPELL = @ISPELL@
- KRB5CFGPATH = @KRB5CFGPATH@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = -Llib @LDFLAGS@
- LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
- LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
-@@ -467,7 +469,6 @@
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
- $(srcdir)/config.h.in:  $(am__configure_deps) $(top_srcdir)/acconfig.h
--	cd $(top_srcdir) && $(AUTOHEADER)
- 	rm -f stamp-h1
- 	touch $@
- 
-@@ -485,7 +486,7 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- doc/instdoc.sh: $(top_builddir)/config.status $(top_srcdir)/doc/instdoc.sh.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
--install-binPROGRAMS: $(bin_PROGRAMS)
-+install-binPROGRAMS: $(bin_PROGRAMS) $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-@@ -497,6 +498,16 @@
- 	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
-+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_SCRIPT) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_SCRIPT) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	  else :; fi; \
-+	done
-+
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
diff --git a/mail/mutt-ng/files/patch-configure b/mail/mutt-ng/files/patch-configure
deleted file mode 100644
index e0d16a783efe..000000000000
--- a/mail/mutt-ng/files/patch-configure
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.orig	Tue Jun 14 02:01:04 2005
-+++ configure	Mon Jun 20 20:13:56 2005
-@@ -1774,7 +1774,7 @@
- fi
- 
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c"
- 
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
-@@ -14028,7 +14028,7 @@
-                 bdbpfx="$bdbpfx $d/$v"
-             done
-         done
--        BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-+        BDB_VERSIONS="db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
-         echo "$as_me:$LINENO: checking for BerkeleyDB > 4.0" >&5
- echo $ECHO_N "checking for BerkeleyDB > 4.0... $ECHO_C" >&6
-         for d in $bdbpfx; do
-@@ -14037,8 +14037,8 @@
-             for v in / $BDB_VERSIONS; do
-                 if test -r "$d/include/$v/db.h"; then
-                     BDB_INCLUDE_DIR="$d/include/$v"
--                    if test -d "$d/lib/$v"; then
--                        BDB_LIB_DIR="$d/lib/$v"
-+                    if test -d "$d/lib"; then
-+                        BDB_LIB_DIR="$d/lib"
-                         for l in `echo $BDB_VERSIONS`; do
-                             CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS"
-                             LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l"
diff --git a/mail/mutt-ng/files/patch-examples b/mail/mutt-ng/files/patch-examples
deleted file mode 100644
index 86a7fcaaf02d..000000000000
--- a/mail/mutt-ng/files/patch-examples
+++ /dev/null
@@ -1,28 +0,0 @@
---- contrib/Makefile.in.orig	Sat Jun 25 17:55:03 2005
-+++ contrib/Makefile.in	Wed Jul 27 15:53:34 2005
-@@ -12,6 +12,7 @@
- mandir = @mandir@
- srcdir = @srcdir@
- docdir = @docdir@
-+samplesdir = $(EXAMPLESDIR)
- top_srcdir = @top_srcdir@
- top_builddir = ..
- INSTALL = @INSTALL@
-@@ -39,13 +40,13 @@
- check:
- 
- install:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+	$(top_srcdir)/mkinstalldirs $(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) ;	\
- 	done
--	chmod 755 $(DESTDIR)$(docdir)/samples/update-config.pl
-+	chmod 755 $(DESTDIR)$(samplesdir)/update-config.pl
- 	for f in $(srcdir)/iconv/*.rc ; do					\
--		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
-+		$(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv	  ;	\
- 	done
- 
- # Nothing needs to be done - uninstall in doc removes samples as well.
diff --git a/mail/mutt-ng/files/patch-imap_browse.c b/mail/mutt-ng/files/patch-imap_browse.c
deleted file mode 100644
index dd3eeb9f3e56..000000000000
--- a/mail/mutt-ng/files/patch-imap_browse.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- imap/browse.c.orig	Thu Aug 11 13:13:13 2005
-+++ imap/browse.c	Sat Jul  1 16:30:28 2006
-@@ -481,7 +481,7 @@
- 
-             if (*s == '\"') {
-               s++;
--              while (*s && *s != '\"') {
-+              while (*s && *s != '\"' && n < sizeof (ns) - 1) {
-                 if (*s == '\\')
-                   s++;
-                 ns[n++] = *s;
-@@ -491,11 +491,13 @@
-                 s++;
-             }
-             else
--              while (*s && !ISSPACE (*s)) {
-+              while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1) {
-                 ns[n++] = *s;
-                 s++;
-               }
-             ns[n] = '\0';
-+	    if (n == sizeof (ns) - 1)
-+	      debug_print (1, ("browse_get_namespace: too long: [%s]\n", ns));
-             /* delim? */
-             s = imap_next_word (s);
-             /* delimiter is meaningless if namespace is "". Why does
diff --git a/mail/mutt-ng/pkg-descr b/mail/mutt-ng/pkg-descr
deleted file mode 100644
index af50b9d6972d..000000000000
--- a/mail/mutt-ng/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Mutt next generation (mutt-ng) is a fork of the well-known email client mutt
-with the goal to both incorporate all the patches that are floating around in
-the web, and to fix all the other little annoyances of mutt.
-
-WWW:	http://mutt-ng.berlios.de/
diff --git a/mail/mutt-ng/pkg-plist b/mail/mutt-ng/pkg-plist
deleted file mode 100644
index bb8a5569af73..000000000000
--- a/mail/mutt-ng/pkg-plist
+++ /dev/null
@@ -1,92 +0,0 @@
-@comment $FreeBSD$
-bin/muttng
-bin/muttng_dotlock
-bin/pgpewrapng
-bin/pgpringng
-bin/fleang
-bin/muttngbug
-@unexec if cmp -s %D/etc/Muttngrc.dist %D/etc/Muttngrc; then rm -f %D/etc/Muttngrc; fi
-etc/Muttngrc.dist
-etc/muttng-mime.types
-@exec if [ ! -f %D/etc/Muttngrc ]; then cp %D/etc/Muttngrc.dist %D/etc/Muttngrc; fi
-%%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.SSL
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TODO.mutt-ng
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
-%%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual.txt
-%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/smime-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%%/ca-bundle.crt
-%%EXAMPLESDIR%%/colors.default
-%%EXAMPLESDIR%%/colors.linux
-%%EXAMPLESDIR%%/grml-muttng
-%%EXAMPLESDIR%%/pgp2.rc
-%%EXAMPLESDIR%%/pgp5.rc
-%%EXAMPLESDIR%%/pgp6.rc
-%%EXAMPLESDIR%%/sample.mailcap
-%%EXAMPLESDIR%%/sample.muttrc
-%%EXAMPLESDIR%%/sample.muttrc-tlr
-%%EXAMPLESDIR%%/smime.rc
-%%EXAMPLESDIR%%/smime_keys_test.pl
-%%EXAMPLESDIR%%/update-config.pl
-%%NLS%%share/locale/bg/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/da/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/de/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/el/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/es/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/et/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/id/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/it/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/muttng.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/muttng.mo
-@dirrm %%EXAMPLESDIR%%/iconv
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%