- Fix MUTT_LITE and NOPORTDOCS knobs.

PR:             110002
Submitted by:   Udo Schweigert <udo.schweigert@siemens.com> (maintainer)

4 files changed, 16 insertions, 37 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 8ae5b23693c4..49eab4b3733d 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -110,7 +110,7 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.5.14
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
diff --git a/mail/mutt-devel/files/extra-patch-doc-xml b/mail/mutt-devel/files/extra-patch-doc-xml
index 6321bff8f8fe..6f74fb537ce1 100644
--- a/mail/mutt-devel/files/extra-patch-doc-xml
+++ b/mail/mutt-devel/files/extra-patch-doc-xml
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig2	Mon Jul 17 15:50:28 2006
-+++ doc/Makefile.in	Mon Jul 17 15:50:57 2006
-@@ -71,7 +71,7 @@
+--- doc/Makefile.am.orig2	Tue Mar  6 17:40:41 2007
++++ doc/Makefile.am	Tue Mar  6 17:42:51 2007
+@@ -42,7 +42,7 @@
  all: ../makedoc$(EXEEXT)
  	$(MAKE) makedoc-all
  
 -makedoc-all: mutt.1 muttrc.man
 +makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
  
- install: makedoc-all instdoc
+ install-data-local: makedoc-all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
diff --git a/mail/mutt-devel/files/extra-patch-nodoc-contrib b/mail/mutt-devel/files/extra-patch-nodoc-contrib
index e8ff8296c475..47e741b2b7cc 100644
--- a/mail/mutt-devel/files/extra-patch-nodoc-contrib
+++ b/mail/mutt-devel/files/extra-patch-nodoc-contrib
@@ -9,9 +9,9 @@
  
  bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
  
---- doc/Makefile.in.orig	Sun Sep 18 16:56:56 2005
-+++ doc/Makefile.in	Sun Sep 18 17:00:01 2005
-@@ -81,14 +81,6 @@
+--- doc/Makefile.am.orig3	Tue Mar  6 17:51:02 2007
++++ doc/Makefile.am	Tue Mar  6 17:51:45 2007
+@@ -55,14 +55,6 @@
  	./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
@@ -24,5 +24,5 @@
 -	done
 -	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
  
- uninstall:
+ uninstall-local:
  	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index 97d8a13ab244..72f183c35cae 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,36 +1,15 @@
---- doc/Makefile.am.orig	Mon Aug 14 16:06:21 2006
-+++ doc/Makefile.am	Wed Aug 30 14:52:04 2006
-@@ -63,9 +63,6 @@
- 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
--	-for f in $(HTML_DOCFILES) ; do \
--		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
--	done
- 
- uninstall-local:
- 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
-@@ -82,7 +79,7 @@
- 
- check:
- manual.txt: manual.html
--	-lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
-+	-lynx -dump -nolist -with_backspaces manual.html > $@ || w3m -dump $^ > $@
- 
- manual.html: $(srcdir)/html.xsl stamp-doc-xml
- 	-xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
---- doc/Makefile.in.orig1	Wed Jul  5 10:40:07 2006
-+++ doc/Makefile.in	Mon Jul 17 15:49:28 2006
-@@ -71,7 +71,7 @@
+--- doc/Makefile.am.orig	Tue Mar  6 17:39:29 2007
++++ doc/Makefile.am	Tue Mar  6 17:40:41 2007
+@@ -42,7 +42,7 @@
  all: ../makedoc$(EXEEXT)
  	$(MAKE) makedoc-all
  
 -makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
 +makedoc-all: mutt.1 muttrc.man
  
- install: makedoc-all instdoc
+ install-data-local: makedoc-all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -92,9 +92,6 @@
+@@ -63,9 +63,6 @@
  		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
  	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
@@ -38,9 +17,9 @@
 -		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
 -	done
  
- uninstall:
+ uninstall-local:
  	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
-@@ -111,7 +108,7 @@
+@@ -82,7 +79,7 @@
  
  check:
  manual.txt: manual.html