diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile 2008-08-20 02:56:56.000000000 +0200 +++ ./Makefile 2008-09-27 08:46:52.000000000 +0200 @@ -110,10 +110,14 @@ # If you want to enable debugging capabilities define: # WITH_MUTT_DEBUG # +# If you do not want to install the manpages mbox.5 and mdf.8 (because that +# conflicts with other ports which installed these: +# WITHOUT_MUTT_MAILBOX_MANPAGES +# PORTNAME= mutt-devel PORTVERSION= 1.5.18 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -178,6 +182,7 @@ DW_PATCH_VERSION= 1.5.6 AC_PATCH_VERSION= 1.5.9 VC_PATCH_VERSION= 1.5.16 +DW_MBOX_PATCH_VERSION= 1.5.18 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} .endif @@ -444,7 +449,6 @@ @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-ifdef .endif .if defined(WITH_MUTT_MBOX_HOOK_PATCH) -IGNORE= The WITH_MUTT_MBOX_HOOK_PATCH does not work at the moment. PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) @@ -463,7 +467,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1 -MAN5= muttrc.5 mbox.5 mmdf.5 +MAN5= muttrc.5 +.if !defined(WITHOUT_MUTT_MAILBOX_MANPAGES) +MAN5+= mbox.5 mmdf.5 +.endif post-patch:: @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \ @@ -472,6 +479,9 @@ ${WRKSRC}/contrib/pgp6.rc @${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \ ${WRKSRC}/contrib/Makefile.am +.if defined(WITHOUT_MUTT_MAILBOX_MANPAGES) + @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-no-mbox-manpage +.endif pre-configure:: @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4) diff -ru /usr/ports/mail/mutt-devel/distinfo ./distinfo --- /usr/ports/mail/mutt-devel/distinfo 2008-06-21 06:09:30.000000000 +0200 +++ ./distinfo 2008-09-27 08:06:06.000000000 +0200 @@ -16,6 +16,9 @@ MD5 (mutt/patch-1.5.18.vvv.quote.gz) = 67c3582b272d71612bef6216f028d960 SHA256 (mutt/patch-1.5.18.vvv.quote.gz) = 9f77848a63e6775a88e84901b9fcad743985f481b5f7a9249df5603d871277a0 SIZE (mutt/patch-1.5.18.vvv.quote.gz) = 1736 +MD5 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = ae70a6668e297bdc804b2673221b4727 +SHA256 (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 12b9f41476850a5e2eed2334be9326e4905e8a6d786740689b6966a5d285070c +SIZE (mutt/p0-patch-1.5.18.dw.mbox-hook.1) = 6812 MD5 (mutt/mutt-1.5.16.vc.greeting) = 4bd9beeb74d075e4418e86e8ed887aa0 SHA256 (mutt/mutt-1.5.16.vc.greeting) = cf05aeab5f1813864aa72b68f59a579c46dacf2fbd8e5fd064b920012320b986 SIZE (mutt/mutt-1.5.16.vc.greeting) = 4526 diff -ru /usr/ports/mail/mutt-devel/files/extra-patch-no-mbox-manpage ./files/extra-patch-no-mbox-manpage --- /usr/ports/mail/mutt-devel/files/extra-patch-no-mbox-manpage 1970-01-01 01:00:00.000000000 +0100 +++ ./files/extra-patch-no-mbox-manpage 2008-09-27 07:57:35.000000000 +0200 @@ -0,0 +1,29 @@ ++--- doc/Makefile.am.orig 2008-05-30 08:00:04.000000000 +0100 +++++ doc/Makefile.am 2008-09-19 18:55:55.000000000 +0100 ++@@ -18,8 +18,6 @@ ++ gen-map-doc \ ++ muttrc.man.head \ ++ muttrc.man.tail \ ++- mbox.man \ ++- mmdf.man \ ++ manual.xml.head \ ++ manual.xml.tail \ ++ instdoc.sh.in \ ++@@ -57,8 +55,6 @@ ++ test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \ ++ $(DESTDIR)$(mandir)/man1/mutt_dotlock.1 ++ ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 ++- ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5 ++- ./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5 ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir) ++ for f in $(topsrcdir_DOCFILES) ; do \ ++ $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ ++@@ -83,7 +79,7 @@ ++ for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \ ++ rm -f $(DESTDIR)$(mandir)/man1/$$f ; \ ++ done ++- for f in muttrc.5 mbox.5 mmdf.5 ; do \ +++ for f in muttrc.5 ; do \ ++ rm -f $(DESTDIR)$(mandir)/man5/$$f ; \ ++ done ++ for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES) ; \