Date: Mon, 12 Jun 2000 17:13:38 +0200 From: Udo Schweigert <ust@cert.siemens.de> To: "David J. Kanter" <djkanter@nwu.edu> Cc: FreeBSD questions <freebsd-questions@FreeBSD.ORG>, obrien@FreeBSD.ORG Subject: Re: Is Mutt broken? Message-ID: <20000612171338.A99819@alaska.cert.siemens.de> In-Reply-To: <20000612064752.A905@localhost.localdomain>; from djkanter@nwu.edu on Mon, Jun 12, 2000 at 06:47:52AM -0500 References: <20000612064752.A905@localhost.localdomain>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jun 12, 2000 at 06:47:52 -0500, David J. Kanter wrote:
> I just upgraded from Mutt 1.0.x to 1.2 and have run into problems not
> related to anything mentioned in the README.UPGRADE.
>
> 1. Many on the docs weren't installed. I couldn't find any of the READMEs
> (that one mentioned above was only found in the /work directory after the
> build). The html manual wasn't installed.
>
This is a bug (but I wouldn't cal it broken ;-).
Attached there is a patch to fix this.
Regards
--
Udo Schweigert, Siemens AG | Voice : +49 89 636 42170
ZT IK 3, Siemens CERT | Fax : +49 89 636 41166
D-81730 Muenchen / Germany | email : ust@cert.siemens.de
PGP-2/5 fingerprint | D8 A5 DF 34 EC 87 E8 C6 E2 26 C4 D0 EE 80 36 B2
diff -ru mutt.org/Makefile mutt/Makefile
--- mutt.org/Makefile Sun May 28 09:14:57 2000
+++ mutt/Makefile Mon Jun 12 16:57:35 2000
@@ -107,8 +107,6 @@
${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
.endif
- @cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
- ${PREFIX}/share/doc/mutt
.endif
.include <bsd.port.mk>
diff -ru mutt.org/patches/patch-02 mutt/patches/patch-02
--- mutt.org/patches/patch-02 Sat May 13 19:31:09 2000
+++ mutt/patches/patch-02 Mon Jun 12 16:52:09 2000
@@ -1,5 +1,5 @@
--- doc/Makefile.in.orig Wed Mar 29 11:42:49 2000
-+++ doc/Makefile.in Fri May 12 13:12:32 2000
++++ doc/Makefile.in Mon Jun 12 16:50:51 2000
@@ -58,13 +58,16 @@
topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
README NEWS TODO README.SECURITY README.SSL README.UPGRADE
@@ -20,30 +20,22 @@
install: all
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -73,18 +76,18 @@
- $(INSTALL) -m 644 $(srcdir)/dotlock.man \
- $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+@@ -75,16 +78,16 @@
$(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
-- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-- for f in $(srcdir_DOCFILES) ; do \
+ $(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 $(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
++ $(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
-+ # $(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 ;\
diff -ru mutt.org/pkg/PLIST mutt/pkg/PLIST
--- mutt.org/pkg/PLIST Sun May 14 16:23:34 2000
+++ mutt/pkg/PLIST Mon Jun 12 16:58:00 2000
@@ -187,9 +187,18 @@
share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
share/doc/mutt/manual.txt
share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/sample.muttrc
-share/doc/mutt/Mush.rc
-share/doc/mutt/Pine.rc
+share/doc/mutt/COPYRIGHT
+share/doc/mutt/ChangeLog
+share/doc/mutt/GPL
+share/doc/mutt/INSTALL
+share/doc/mutt/NEWS
+share/doc/mutt/README
+share/doc/mutt/README.SECURITY
+share/doc/mutt/README.SSL
+share/doc/mutt/README.UPGRADE
+share/doc/mutt/TODO
+share/doc/mutt/applying-patches.txt
+share/doc/mutt/devel-notes.txt
share/doc/mutt/samples/Mush.rc
share/doc/mutt/samples/Pine.rc
share/doc/mutt/samples/Tin.rc
diff -ru mutt.org/pkg/PLIST.htmlfiles mutt/pkg/PLIST.htmlfiles
--- mutt.org/pkg/PLIST.htmlfiles Sat May 13 19:31:09 2000
+++ mutt/pkg/PLIST.htmlfiles Mon Jun 12 17:03:39 2000
@@ -7,7 +7,6 @@
share/doc/mutt/html/manual-6.html
share/doc/mutt/html/manual-7.html
share/doc/mutt/html/manual.html
-share/doc/mutt/html/manual.html
share/doc/mutt/html/manual1.html
share/doc/mutt/html/manual10.html
share/doc/mutt/html/manual100.html
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000612171338.A99819>