ports/177903: [patch] mail/mutt/files/extra-patch-nodoc-contrib doesn't apply correctly

[Konstantinos Koukopoulos]

>Number:         177903
>Category:       ports
>Synopsis:       [patch] mail/mutt/files/extra-patch-nodoc-contrib doesn't apply correctly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 17 12:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Konstantinos Koukopoulos
>Release:        9.1-RELEASE
>Organization:
>Environment:
FreeBSD quoth.noc.uoa.gr 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243826: Tue Dec  4 06:55:39 UTC 2012     root at obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
The nodoc-contrib patch in the 1.5.21_2 mutt port doesn't apply correctly for me:

   $ make -d l patch
   [...]
   ===>  Applying FreeBSD patches for mutt-1.5.21_2
   /usr/bin/patch -d /var/ports/usr/ports/mail/mutt/work/mutt-1.5.21 --forward --quiet -E -p0 -V simple --suffix .orig < /usr/ports/mail/mutt/files/extra-patch-smime-outlook
   /usr/bin/patch -d /var/ports/usr/ports/mail/mutt/work/mutt-1.5.21 --forward --quiet -E -p0 -V simple --suffix .orig < /usr/ports/mail/mutt/files/extra-patch-aspell
   /usr/bin/patch -d /var/ports/usr/ports/mail/mutt/work/mutt-1.5.21 --forward --quiet -E -p0 -V simple --suffix .orig -p1 < /usr/ports/mail/mutt/files/extra-patch-sidebar
   /usr/bin/patch -d /var/ports/usr/ports/mail/mutt/work/mutt-1.5.21 --forward --quiet -E -p0 -V simple --suffix .orig -p1 < /usr/ports/mail/mutt/files/extra-patch-trash-purge
   /usr/bin/sed -i.bak -e 's,/usr/bin/gpg,/usr/local/bin/gpg,g'  /var/ports/usr/ports/mail/mutt/work/mutt-1.5.21/contrib/gpg.rc
   /usr/bin/sed -i.bak -e 's,pgp6,pgp,g'  /var/ports/usr/ports/mail/mutt/work/mutt-1.5.21/contrib/pgp6.rc
   /usr/bin/sed -i.bak -E -e 's|@samplesdir@|/usr/local/share/examples/mutt|g'  /var/ports/usr/ports/mail/mutt/work/mutt-1.5.21/contrib/Makefile.am
   /usr/bin/patch -d /var/ports/usr/ports/mail/mutt/work/mutt-1.5.21 --forward --quiet -E -p0 -V simple --suffix .orig < /usr/ports/mail/mutt/files/extra-patch-nodoc-contrib
   1 out of 1 hunks failed--saving rejects to doc/Makefile.in.rej
   *** [post-patch] Error code 1
   
   Stop in /usr/ports/mail/mutt.
   *** [patch] Error code 1
   
   Stop in /usr/ports/mail/mutt.

 I have attached a patch that updates it so that it applies cleanly.
>How-To-Repeat:
Configure the port accordingly and try to build:

   $ make config
   $ grep _SET /var/db/ports/mutt/options
   OPTIONS_FILE_SET+=GPGME
   OPTIONS_FILE_SET+=ICONV
   OPTIONS_FILE_SET+=IMAP_HEADER_CACHE
   OPTIONS_FILE_SET+=MAILBOX_MANPAGES
   OPTIONS_FILE_SET+=SASL
   OPTIONS_FILE_SET+=SIDEBAR_PATCH
   OPTIONS_FILE_SET+=SMIME_OUTLOOK_COMPAT
   OPTIONS_FILE_SET+=SMTP
   OPTIONS_FILE_SET+=TRASH_PATCH
   OPTIONS_FILE_SET+=SLANG
   OPTIONS_FILE_SET+=ASPELL
   $ cd /usr/ports/mail/mutt ; make patch
>Fix:
Apply the included patch.

Patch attached with submission follows:

--- /usr/ports/mail/mutt/files/extra-patch-nodoc-contrib.orig	2013-04-17 12:55:04.000000000 +0300
+++ /usr/ports/mail/mutt/files/extra-patch-nodoc-contrib	2013-04-17 13:34:45.000000000 +0300
@@ -23,6 +23,6 @@
 -		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
 -	done
 -	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
- 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
- 	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
- 		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
+	-for f in $(HTML_DOCFILES) ; do \
+		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
+	done


>Release-Note:
>Audit-Trail:
>Unformatted: