4 files changed, 72 insertions, 54 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 4bf6246c4204..9ecbb06ca9b3 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -83,8 +83,8 @@ CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .if defined(WITH_MUTT_CYRUS_SASL)
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		muttrc.5
+MAN1=		flea.1 mutt.1 mutt_dotlock.1 muttbug.1
+MAN5=		mbox.5 muttrc.5
 
 # XXX
 # this should be done automagically by aclocal but ....
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index c0b5cf03d3f7..f95d3e5cdd1c 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+bin/flea
 bin/mutt
 bin/mutt_dotlock
 bin/muttbug
@@ -6,25 +7,6 @@ bin/pgpewrap
 bin/pgpring
 etc/Muttrc
 etc/mime.types
-share/locale/cs/LC_MESSAGES/mutt.mo
-share/locale/da/LC_MESSAGES/mutt.mo
-share/locale/de/LC_MESSAGES/mutt.mo
-share/locale/el/LC_MESSAGES/mutt.mo
-share/locale/eo/LC_MESSAGES/mutt.mo
-share/locale/es/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/gl/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/nl/LC_MESSAGES/mutt.mo
-share/locale/pl/LC_MESSAGES/mutt.mo
-share/locale/pt_BR/LC_MESSAGES/mutt.mo
-share/locale/ru/LC_MESSAGES/mutt.mo
-share/locale/sk/LC_MESSAGES/mutt.mo
-share/locale/sv/LC_MESSAGES/mutt.mo
-share/locale/uk/LC_MESSAGES/mutt.mo
-share/doc/mutt/manual.txt
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
 share/doc/mutt/GPL
@@ -37,17 +19,12 @@ share/doc/mutt/README.SSL
 share/doc/mutt/TODO
 share/doc/mutt/applying-patches.txt
 share/doc/mutt/devel-notes.txt
+share/doc/mutt/manual.txt
 share/doc/mutt/patch-notes.txt
 share/doc/mutt/samples/Mush.rc
 share/doc/mutt/samples/Pine.rc
 share/doc/mutt/samples/Tin.rc
 share/doc/mutt/samples/gpg.rc
-share/doc/mutt/samples/pgp2.rc
-share/doc/mutt/samples/pgp5.rc
-share/doc/mutt/samples/pgp6.rc
-share/doc/mutt/samples/sample.mailcap
-share/doc/mutt/samples/sample.muttrc
-share/doc/mutt/samples/sample.muttrc-tlr
 share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
 share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
 share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
@@ -66,6 +43,38 @@ share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
 share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
 share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
 share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
+share/doc/mutt/samples/pgp2.rc
+share/doc/mutt/samples/pgp5.rc
+share/doc/mutt/samples/pgp6.rc
+share/doc/mutt/samples/sample.mailcap
+share/doc/mutt/samples/sample.muttrc
+share/doc/mutt/samples/sample.muttrc-tlr
+share/locale/ca/LC_MESSAGES/mutt.mo
+share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/da/LC_MESSAGES/mutt.mo
+share/locale/de/LC_MESSAGES/mutt.mo
+share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/eo/LC_MESSAGES/mutt.mo
+share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/et/LC_MESSAGES/mutt.mo
+share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/gl/LC_MESSAGES/mutt.mo
+share/locale/hu/LC_MESSAGES/mutt.mo
+share/locale/id/LC_MESSAGES/mutt.mo
+share/locale/it/LC_MESSAGES/mutt.mo
+share/locale/ja/LC_MESSAGES/mutt.mo
+share/locale/ko/LC_MESSAGES/mutt.mo
+share/locale/lt/LC_MESSAGES/mutt.mo
+share/locale/nl/LC_MESSAGES/mutt.mo
+share/locale/pl/LC_MESSAGES/mutt.mo
+share/locale/pt_BR/LC_MESSAGES/mutt.mo
+share/locale/ru/LC_MESSAGES/mutt.mo
+share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/sv/LC_MESSAGES/mutt.mo
+share/locale/tr/LC_MESSAGES/mutt.mo
+share/locale/uk/LC_MESSAGES/mutt.mo
+share/locale/zh_CN/LC_MESSAGES/mutt.mo
+share/locale/zh_TW/LC_MESSAGES/mutt.mo
 @dirrm share/doc/mutt/samples/iconv
 @dirrm share/doc/mutt/samples
 @dirrm share/doc/mutt
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 4bf6246c4204..9ecbb06ca9b3 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -83,8 +83,8 @@ CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .if defined(WITH_MUTT_CYRUS_SASL)
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		muttrc.5
+MAN1=		flea.1 mutt.1 mutt_dotlock.1 muttbug.1
+MAN5=		mbox.5 muttrc.5
 
 # XXX
 # this should be done automagically by aclocal but ....
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index c0b5cf03d3f7..f95d3e5cdd1c 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+bin/flea
 bin/mutt
 bin/mutt_dotlock
 bin/muttbug
@@ -6,25 +7,6 @@ bin/pgpewrap
 bin/pgpring
 etc/Muttrc
 etc/mime.types
-share/locale/cs/LC_MESSAGES/mutt.mo
-share/locale/da/LC_MESSAGES/mutt.mo
-share/locale/de/LC_MESSAGES/mutt.mo
-share/locale/el/LC_MESSAGES/mutt.mo
-share/locale/eo/LC_MESSAGES/mutt.mo
-share/locale/es/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/gl/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/nl/LC_MESSAGES/mutt.mo
-share/locale/pl/LC_MESSAGES/mutt.mo
-share/locale/pt_BR/LC_MESSAGES/mutt.mo
-share/locale/ru/LC_MESSAGES/mutt.mo
-share/locale/sk/LC_MESSAGES/mutt.mo
-share/locale/sv/LC_MESSAGES/mutt.mo
-share/locale/uk/LC_MESSAGES/mutt.mo
-share/doc/mutt/manual.txt
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
 share/doc/mutt/GPL
@@ -37,17 +19,12 @@ share/doc/mutt/README.SSL
 share/doc/mutt/TODO
 share/doc/mutt/applying-patches.txt
 share/doc/mutt/devel-notes.txt
+share/doc/mutt/manual.txt
 share/doc/mutt/patch-notes.txt
 share/doc/mutt/samples/Mush.rc
 share/doc/mutt/samples/Pine.rc
 share/doc/mutt/samples/Tin.rc
 share/doc/mutt/samples/gpg.rc
-share/doc/mutt/samples/pgp2.rc
-share/doc/mutt/samples/pgp5.rc
-share/doc/mutt/samples/pgp6.rc
-share/doc/mutt/samples/sample.mailcap
-share/doc/mutt/samples/sample.muttrc
-share/doc/mutt/samples/sample.muttrc-tlr
 share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
 share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
 share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
@@ -66,6 +43,38 @@ share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
 share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
 share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
 share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
+share/doc/mutt/samples/pgp2.rc
+share/doc/mutt/samples/pgp5.rc
+share/doc/mutt/samples/pgp6.rc
+share/doc/mutt/samples/sample.mailcap
+share/doc/mutt/samples/sample.muttrc
+share/doc/mutt/samples/sample.muttrc-tlr
+share/locale/ca/LC_MESSAGES/mutt.mo
+share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/da/LC_MESSAGES/mutt.mo
+share/locale/de/LC_MESSAGES/mutt.mo
+share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/eo/LC_MESSAGES/mutt.mo
+share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/et/LC_MESSAGES/mutt.mo
+share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/gl/LC_MESSAGES/mutt.mo
+share/locale/hu/LC_MESSAGES/mutt.mo
+share/locale/id/LC_MESSAGES/mutt.mo
+share/locale/it/LC_MESSAGES/mutt.mo
+share/locale/ja/LC_MESSAGES/mutt.mo
+share/locale/ko/LC_MESSAGES/mutt.mo
+share/locale/lt/LC_MESSAGES/mutt.mo
+share/locale/nl/LC_MESSAGES/mutt.mo
+share/locale/pl/LC_MESSAGES/mutt.mo
+share/locale/pt_BR/LC_MESSAGES/mutt.mo
+share/locale/ru/LC_MESSAGES/mutt.mo
+share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/sv/LC_MESSAGES/mutt.mo
+share/locale/tr/LC_MESSAGES/mutt.mo
+share/locale/uk/LC_MESSAGES/mutt.mo
+share/locale/zh_CN/LC_MESSAGES/mutt.mo
+share/locale/zh_TW/LC_MESSAGES/mutt.mo
 @dirrm share/doc/mutt/samples/iconv
 @dirrm share/doc/mutt/samples
 @dirrm share/doc/mutt