ports/162748: maintainer-update of mail/mutt-devel

[Udo Schweigert]

>Number:         162748
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 22 07:20:05 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 8.2-STABLE FreeBSD i386
>Organization:
>Environment:

>Description:

Maintainer update of mail/mutt-devel:

	- Fix the WITHOUT_MUTT_MAILBOX_MANPAGES knob.

>How-To-Repeat:
>Fix:
diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	2011-10-01 18:50:09.000000000 +0200
+++ ./Makefile	2011-11-22 07:42:45.000000000 +0100
@@ -115,7 +115,7 @@
 # If you want to enable debugging capabilities define:
 #  WITH_MUTT_DEBUG
 #
-# If you do not want to install the manpages mbox.5 and mdf.8 (because that
+# If you do not want to install the manpages mbox.5 and mmdf.5 (because that
 # conflicts with other ports which installed these:
 #  WITHOUT_MUTT_MAILBOX_MANPAGES
 #
@@ -190,7 +190,7 @@
 		MUTT_IMAP_HEADER_CACHE		"Enable imap header cache"	off \
 		MUTT_ISPELL			"Enable ispell support"		off \
 		MUTT_LOCALES_FIX		"Enable locales fix"		off \
-		MUTT_MAILBOX_MANPAGES		"Install mbox.5/mdf.8 manpages"	on  \
+		MUTT_MAILBOX_MANPAGES		"Install mbox.5/mmdf.5 manpages"	on  \
 		MUTT_MAILDIR_HEADER_CACHE	"Enable maildir header cache"	off \
 		MUTT_MAILDIR_MTIME_PATCH	"Enable Maildir mtime patch"	off \
 		MUTT_MBOX_HOOK_PATCH		"Enable enhanced mbox-hook"	off \
diff -ru  /usr/ports/mail/mutt-devel/files/extra-patch-no-mbox-manpage ./files/extra-patch-no-mbox-manpage
--- /usr/ports/mail/mutt-devel/files/extra-patch-no-mbox-manpage	2008-09-29 09:35:46.000000000 +0200
+++ ./files/extra-patch-no-mbox-manpage	2011-11-22 07:41:37.000000000 +0100
@@ -1,29 +1,29 @@
-+--- doc/Makefile.am.orig	2008-05-30 08:00:04.000000000 +0100
-++++ doc/Makefile.am	2008-09-19 18:55:55.000000000 +0100
-+@@ -18,8 +18,6 @@
-+ 	gen-map-doc			\
-+ 	muttrc.man.head			\
-+ 	muttrc.man.tail			\
-+-	mbox.man			\
-+-	mmdf.man			\
-+ 	manual.xml.head			\
-+ 	manual.xml.tail			\
-+ 	instdoc.sh.in			\
-+@@ -57,8 +55,6 @@
-+ 	test x at DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
-+ 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
-+ 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
-+-	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
-+-	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
-+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-+ 	for f in $(topsrcdir_DOCFILES) ; do \
-+ 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+@@ -83,7 +79,7 @@
-+ 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
-+ 		rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
-+ 	done
-+-	for f in muttrc.5 mbox.5 mmdf.5 ; do \
-++	for f in muttrc.5 ; do \
-+ 		rm -f $(DESTDIR)$(mandir)/man5/$$f ; \
-+ 	done
-+ 	for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES) ; \
+--- doc/Makefile.am.orig	2008-05-30 08:00:04.000000000 +0100
++++ doc/Makefile.am	2008-09-19 18:55:55.000000000 +0100
+@@ -18,8 +18,6 @@
+ 	gen-map-doc			\
+ 	muttrc.man.head			\
+ 	muttrc.man.tail			\
+-	mbox.man			\
+-	mmdf.man			\
+ 	manual.xml.head			\
+ 	manual.xml.tail			\
+ 	instdoc.sh.in			\
+@@ -57,8 +55,6 @@
+ 	test x at DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
+ 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+ 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
+-	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
+-	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+ 	for f in $(topsrcdir_DOCFILES) ; do \
+ 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+@@ -83,7 +79,7 @@
+ 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
+ 		rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
+ 	done
+-	for f in muttrc.5 mbox.5 mmdf.5 ; do \
++	for f in muttrc.5 ; do \
+ 		rm -f $(DESTDIR)$(mandir)/man5/$$f ; \
+ 	done
+ 	for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES) ; \
>Release-Note:
>Audit-Trail:
>Unformatted: