From owner-freebsd-ports Fri Aug 30 3:20:21 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 85F9D37B400 for ; Fri, 30 Aug 2002 03:20:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 857FA43E4A for ; Fri, 30 Aug 2002 03:20:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7UAK2JU002540 for ; Fri, 30 Aug 2002 03:20:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7UAK2wA002539; Fri, 30 Aug 2002 03:20:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2DC437B400 for ; Fri, 30 Aug 2002 03:15:52 -0700 (PDT) Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A0BC43E4A for ; Fri, 30 Aug 2002 03:15:51 -0700 (PDT) (envelope-from ust@cert.siemens.de) Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.11.6/8.11.6) with ESMTP id g7UAFmK07362 for ; Fri, 30 Aug 2002 12:15:49 +0200 (MEST) Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17]) by mail2.siemens.de (8.11.6/8.11.6) with ESMTP id g7UAFmS22017 for ; Fri, 30 Aug 2002 12:15:48 +0200 (MEST) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134]) by mars.cert.siemens.de (8.12.6/8.12.6/Siemens CERT [ $Revision: 1.25 ]) with ESMTP id g7UAFmiu009350 for ; Fri, 30 Aug 2002 12:15:48 +0200 (CEST) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1]) by alaska.cert.siemens.de (8.12.6/8.12.6/alaska [ $Revision: 1.14 ]) with ESMTP id g7UAFlOL051003 for ; Fri, 30 Aug 2002 12:15:47 +0200 (CEST) (envelope-from ust@alaska.cert.siemens.de) Received: (from ust@localhost) by alaska.cert.siemens.de (8.12.6/8.12.6/alaska [ $Revision: 1.3 ]) id g7UAFlNi051002; Fri, 30 Aug 2002 12:15:47 +0200 (CEST) (envelope-from ust) Message-Id: <200208301015.g7UAFlNi051002@alaska.cert.siemens.de> Date: Fri, 30 Aug 2002 12:15:47 +0200 (CEST) From: Udo Schweigert Reply-To: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/42193: maintainer update of mail/mutt-devel Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 42193 >Category: ports >Synopsis: maintainer update of mail/mutt-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Aug 30 03:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD alaska.cert.siemens.de 4.6-STABLE FreeBSD 4.6-STABLE #13: Wed Aug 28 13:12:55 CEST 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386 >Description: Maintainer-update of mail/mutt-devel: - 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). - Remove a superfluous file from the port. Inspired by a PR for mail/mutt complaining the missing PS docu. Commiter: removed file (cvs rm): files/extra-patch-nodoc >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Wed Aug 28 21:29:04 2002 +++ ./Makefile Fri Aug 30 11:38:03 2002 @@ -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 @@ 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 @@ 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 -ru /usr/ports/mail/mutt-devel/files/extra-patch-nodoc ./files/extra-patch-nodoc --- /usr/ports/mail/mutt-devel/files/extra-patch-nodoc Fri Jun 15 01:32:39 2001 +++ ./files/extra-patch-nodoc Thu Jan 1 01:00:00 1970 @@ -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 -ru /usr/ports/mail/mutt-devel/files/extra-patch-sgmlformat ./files/extra-patch-sgmlformat --- /usr/ports/mail/mutt-devel/files/extra-patch-sgmlformat Wed Feb 27 00:19:05 2002 +++ ./files/extra-patch-sgmlformat Fri Aug 30 11:28:31 2002 @@ -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 -ru /usr/ports/mail/mutt-devel/files/patch-02 ./files/patch-02 --- /usr/ports/mail/mutt-devel/files/patch-02 Thu Jun 27 21:24:29 2002 +++ ./files/patch-02 Fri Aug 30 11:27:02 2002 @@ -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 -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist --- /usr/ports/mail/mutt-devel/scripts/generate-plist Wed Aug 28 21:29:05 2002 +++ ./scripts/generate-plist Fri Aug 30 11:37:00 2002 @@ -117,6 +117,7 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message