From a5ba2728ca70b1bd5a7d33916a4e9a7f1ec595e7 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 12 Sep 2011 20:32:18 +0000 Subject: [PATCH] fix bad .so for muttbug(1) manual; pointed out by patrick keshishian --- mail/mutt/stable/Makefile | 3 ++- mail/mutt/stable/patches/patch-doc_Makefile_in | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mail/mutt/stable/Makefile b/mail/mutt/stable/Makefile index cac7777842f..58cf48cb55b 100644 --- a/mail/mutt/stable/Makefile +++ b/mail/mutt/stable/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.43 2011/05/04 07:47:22 sthen Exp $ +# $OpenBSD: Makefile,v 1.44 2011/09/12 20:32:18 sthen Exp $ COMMENT= tty-based e-mail client VERSION= 1.4.2.3 DISTNAME= mutt-${VERSION} EPOCH= 0 +REVISION= 0 # 1.4.2.3 is not on sourceforge, the latest 1.4.x is 1.4.2.2i MASTER_SITES= ${MASTER_SITES_MUTT} USE_GROFF= Yes diff --git a/mail/mutt/stable/patches/patch-doc_Makefile_in b/mail/mutt/stable/patches/patch-doc_Makefile_in index d20b7aabb55..ddf87c62001 100644 --- a/mail/mutt/stable/patches/patch-doc_Makefile_in +++ b/mail/mutt/stable/patches/patch-doc_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.4 2010/10/22 17:00:20 naddy Exp $ ---- doc/Makefile.in.orig Wed May 23 03:17:52 2007 -+++ doc/Makefile.in Fri Oct 22 18:39:46 2010 +$OpenBSD: patch-doc_Makefile_in,v 1.5 2011/09/12 20:32:18 sthen Exp $ +--- doc/Makefile.in.orig Wed May 23 02:17:52 2007 ++++ doc/Makefile.in Mon Sep 12 21:30:43 2011 @@ -60,7 +60,7 @@ srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt \ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ README NEWS TODO README.SECURITY README.SSL @@ -10,6 +10,15 @@ $OpenBSD: patch-doc_Makefile_in,v 1.4 2010/10/22 17:00:20 naddy Exp $ try-html: ../makedoc test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ +@@ -73,7 +73,7 @@ install: all instdoc + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5 + ./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1 + ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1 +- echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1 ++ ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1 + ./instdoc $(srcdir)/dotlock.man \ + $(DESTDIR)$(mandir)/man1/mutt_dotlock.1 + ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 @@ -155,8 +155,8 @@ update-doc: ../makedoc stamp-doc-sgml stamp-doc-man m muttrc.man stamp-doc-man: ../makedoc $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail