o Rebuild port docs even if WITH_MUTT_HTML is not given so the ASCII

  manuals reflect all the given WITH_MUTT_knobs.
o (Port now always depends on sgmlformat, which isn't a problem
  anymore since sgmlformat has been fixed for alpha-architecture)

PR:		34185
Submitted by:	maintainer
Requested by:	Nicolas Rachinsky <list@rachinsky.de>

4 files changed, 56 insertions, 77 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 94629ed0d1c8..0c60cb62be4d 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -42,6 +42,7 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.3.27
+PORTREVISION=	1
 PATCH_VERSION=	1.3.26
 CATEGORIES+=	mail
 .if defined(WITH_MUTT_NNTP)
@@ -123,6 +124,7 @@ WITH_MUTT_IMAP=	yes
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
 		giconv.2:${PORTSDIR}/converters/libiconv
 
+BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .if defined(USE_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
 .elif defined(USE_NCURSES) && ${OSVERSION} < 400000
@@ -132,9 +134,6 @@ CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .if defined(WITH_MUTT_SSL)
 USE_OPENSSL=	yes
 .endif
-.if defined(WITH_MUTT_HTML)
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-.endif
 .if defined(WITH_MUTT_NNTP)
 BUILD_DEPENDS+=	${LOCALBASE}/news/bin/inews:${PORTSDIR}/news/inn-stable
 pre-configure::
@@ -847,10 +846,6 @@ post-patch::
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
 .endif
-.if defined(WITH_MUTT_HTML)
-post-patch::
-	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-html
-.endif
 
 post-install:
 	@strip ${PREFIX}/bin/mutt
@@ -858,8 +853,8 @@ post-install:
 	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && \
 		${CHMOD} a+rx ${PREFIX}/share/doc/mutt
-	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
-		../ABOUT-NLS ../contrib/language* \
+	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt manual.latin1 \
+		PGP-Notes.txt ../ABOUT-NLS ../contrib/language* \
 		${PREFIX}/share/doc/mutt
 .if defined(WITH_MUTT_NNTP)
 	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp \
diff --git a/mail/mutt-devel/files/extra-patch-html b/mail/mutt-devel/files/extra-patch-html
deleted file mode 100644
index 0d032a8e1561..000000000000
--- a/mail/mutt-devel/files/extra-patch-html
+++ /dev/null
@@ -1,61 +0,0 @@
---- doc/Makefile.in.orig2	Fri Jan 18 22:14:16 2002
-+++ doc/Makefile.in	Fri Jan 18 22:16:32 2002
-@@ -60,13 +60,19 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL 
- 
--all: 
-+all: muttrc.man try-html try-txt try-latin1
- 
- try-html: ../makedoc
--	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	touch $@
- 
- try-txt: ../makedoc
--	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	touch $@
-+
-+try-latin1: 
-+	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
-+	touch $@
- 
- install: all instdoc
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -80,10 +86,10 @@
- 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- 	for f in $(srcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+	 	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	for f in $(topsrcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+	 	$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
- 	# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-@@ -99,14 +105,18 @@
- 
- check:
- manual.txt: manual.sgml
--	if sgml2txt -c latin manual ; then \
--		uniq < manual.txt | expand > _manual.txt ; \
--		rm manual.txt ; \
-+	if sgmlfmt -f ascii manual; then \
-+		uniq < manual.ascii | expand > _manual.txt ; \
-+		rm -f manual.txt manual.ascii; \
- 		mv _manual.txt manual.txt ;\
- 	fi
- 
- manual.html: manual.sgml
--	sgml2html manual  || true
-+	@# sgml2html manual  || true
-+	sgmlfmt -f html manual  || true
-+
-+manual.latin1: manual.sgml
-+	sgmlfmt -f latin1 manual  || true
- 
- manual.ps: manual.sgml
- 	sgml2latex --output=ps manual || true
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index 6c9282a76a88..204b29f56703 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,16 +1,38 @@
 --- doc/Makefile.in.orig	Tue Nov  6 20:12:31 2001
-+++ doc/Makefile.in	Tue Jan 15 17:22:04 2002
-@@ -60,7 +60,7 @@
++++ doc/Makefile.in	Tue Jan 22 20:47:07 2002
+@@ -60,13 +60,19 @@
  topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
  	README NEWS TODO README.SECURITY README.SSL 
  
 -all: muttrc.man try-html try-txt
-+all: 
++all: muttrc.man try-html try-txt try-latin1
  
  try-html: ../makedoc
- 	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-@@ -86,10 +86,10 @@
- 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+-	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
++	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
++	touch $@
+ 
+ try-txt: ../makedoc
+-	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
++	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
++	touch $@
++
++try-latin1: 
++	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
++	touch $@
+ 
+ install: all instdoc
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
+@@ -80,16 +86,16 @@
+ 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+ 	for f in $(srcdir_DOCFILES) ; do \
+-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
++	 	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+ 	done
+ 	for f in $(topsrcdir_DOCFILES) ; do \
+-		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
++	 	$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
  	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
 -	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
@@ -24,3 +46,26 @@
  
  uninstall:
  	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
+@@ -99,14 +105,18 @@
+ 
+ check:
+ manual.txt: manual.sgml
+-	if sgml2txt -c latin manual ; then \
+-		uniq < manual.txt | expand > _manual.txt ; \
+-		rm manual.txt ; \
++	if sgmlfmt -f ascii manual; then \
++		uniq < manual.ascii | expand > _manual.txt ; \
++		rm -f manual.txt manual.ascii; \
+ 		mv _manual.txt manual.txt ;\
+ 	fi
+ 
+ manual.html: manual.sgml
+-	sgml2html manual  || true
++	@# sgml2html manual  || true
++	sgmlfmt -f html manual  || true
++
++manual.latin1: manual.sgml
++	sgmlfmt -f latin1 manual  || true
+ 
+ manual.ps: manual.sgml
+ 	sgml2latex --output=ps manual || true
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index ae8e42067ffb..fffac9f01acb 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -50,6 +50,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%PORTDOCS%%share/doc/mutt/language.txt
 %%PORTDOCS%%share/doc/mutt/language50.txt
 %%PORTDOCS%%share/doc/mutt/manual.txt
+%%PORTDOCS%%share/doc/mutt/manual.latin1
 %%PORTDOCS%%share/doc/mutt/patch-notes.txt
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
 %%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
@@ -81,7 +82,6 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%PORTDOCS%%share/doc/mutt/samples/sample.muttrc-tlr
 %%PORTDOCS%%@dirrm share/doc/mutt/samples/iconv
 %%PORTDOCS%%@dirrm share/doc/mutt/samples
-%%SUB_HTML%%share/doc/mutt/manual.latin1
 %%SUB_HTML%%share/doc/mutt/html/manual.html
 %%SUB_HTML%%share/doc/mutt/html/manual_toc.html
 %%SUB_HTML%%share/doc/mutt/html/manual1.html