* Add postscript doc if already using sgmlformat.

* Add new knob WITH_MUTT_PS to build postscript doc (this in fact
  is an alias for WITH_MUTT_HTML, so html doc is also installed).

PR:		ports/42193
Submitted by:	maintainer
Approved by:	dwcjr (mentor)

5 files changed, 20 insertions, 38 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 8d3e35332e10..52a7a4bfd9e3 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -24,7 +24,7 @@
 # have to set the variables COLORTERM=yes and COLORFGBG=color,color in your
 # environment to get slang function properly.
 #
-# If you want to install the mutt documentation in html format define:
+# If you want to install the mutt documentation in html and ps format define:
 #  WITH_MUTT_HTML
 #
 # If you do not want that the documentation is rebuilt using sgmlformat
@@ -128,6 +128,9 @@ RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
 		urlview:${PORTSDIR}/textproc/urlview
 .endif
 
+.if defined(WITH_MUTT_PS)
+WITH_MUTT_HTML=		yes
+.endif
 .if defined(WITH_MUTT_NCURSES_PORT)
 WITH_MUTT_NCURSES=	yes
 .endif
@@ -283,7 +286,7 @@ post-install:
 		PGP-Notes.txt ../ABOUT-NLS ../contrib/language* \
 		${PREFIX}/share/doc/mutt
 .if ${SGML_USED} == yes
-	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 \
+	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 manual.ps \
 		${PREFIX}/share/doc/mutt
 .endif
 .if defined(WITH_MUTT_NNTP)
diff --git a/mail/mutt-devel/files/extra-patch-nodoc b/mail/mutt-devel/files/extra-patch-nodoc
deleted file mode 100644
index 7cdb181772a1..000000000000
--- a/mail/mutt-devel/files/extra-patch-nodoc
+++ /dev/null
@@ -1,30 +0,0 @@
---- doc/Makefile.in.orig2	Wed Jun 13 22:57:18 2001
-+++ doc/Makefile.in	Wed Jun 13 23:03:55 2001
-@@ -59,7 +59,7 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL README.UPGRADE
- 
--all: muttrc.man try-html try-txt try-latin1
-+all: 
- 
- try-html: ../makedoc
- 	$(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-@@ -80,18 +80,6 @@
- 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
- 	./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) ; \
--	done
--	for f in $(topsrcdir_DOCFILES) ; do \
--	 	$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
--	done
--	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
--	# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
--	# for file in manual*.html ; do	\
--	# 	$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
--	# done
- 
- uninstall:
- 	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
diff --git a/mail/mutt-devel/files/extra-patch-sgmlformat b/mail/mutt-devel/files/extra-patch-sgmlformat
index fd813af6db6a..4ddbe8901fe5 100644
--- a/mail/mutt-devel/files/extra-patch-sgmlformat
+++ b/mail/mutt-devel/files/extra-patch-sgmlformat
@@ -5,7 +5,7 @@
  	README NEWS TODO README.SECURITY README.SSL 
  
 -all:
-+all: muttrc.man try-html try-txt try-latin1
++all: muttrc.man try-html try-txt try-latin1 try-ps
  
  try-html: ../makedoc
  	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index c58ff2ef7c0b..05f26a83e8e3 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,6 +1,6 @@
 --- doc/Makefile.in.orig	Thu Jan 24 22:53:25 2002
-+++ doc/Makefile.in	Mon Jun 24 21:29:01 2002
-@@ -61,13 +61,19 @@
++++ doc/Makefile.in	Fri Aug 30 11:26:16 2002
+@@ -61,13 +61,23 @@
  topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
  	README NEWS TODO README.SECURITY README.SSL 
  
@@ -20,10 +20,14 @@
 +try-latin1: 
 +	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
 +	touch $@
++
++try-ps: 
++	$(MAKE) manual.ps || cp $(srcdir)/manual.ps ./
++	touch $@
  
  install: all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -87,10 +93,6 @@
+@@ -87,10 +97,6 @@
  		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
  	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
@@ -34,7 +38,7 @@
  
  uninstall:
  	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-@@ -100,14 +102,17 @@
+@@ -100,17 +106,20 @@
  
  check:
  manual.txt: manual.sgml
@@ -55,4 +59,8 @@
 +	sgmlfmt -f latin1 manual  || true
  
  manual.ps: manual.sgml
- 	sgml2latex --output=ps manual || true
+-	sgml2latex --output=ps manual || true
++	sgmlfmt -f ps manual  || true
+ 
+ clean: 
+ 	rm -f *~ *.html *.orig *.rej  stamp-doc-sgml stamp-doc-man *.ps
diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist
index 795c505517b8..521ba4dabfc9 100644
--- a/mail/mutt-devel/scripts/generate-plist
+++ b/mail/mutt-devel/scripts/generate-plist
@@ -117,6 +117,7 @@ echo "share/doc/mutt/ChangeLog.nntp" >> $tmp_first
 fi
 if [ "$MUTT_SGML" = "yes" ]; then
 echo "share/doc/mutt/manual.latin1" >> $tmp_first
+echo "share/doc/mutt/manual.ps" >> $tmp_first
 fi
 
 if [ "$MUTT_HTML" = "yes" ]; then