FreeBSD Bugzilla – Attachment 90346 Details for
Bug 127509
[PATCH] ports mail/mutt-devel and news/tin install conflicting manual pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 2.57 KB, created by
N.J. Mann
on 2008-09-20 17:40:03 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
N.J. Mann
Created:
2008-09-20 17:40:03 UTC
Size:
2.57 KB
patch
obsolete
>diff -ruN news/tin~/Makefile news/tin/Makefile >--- news/tin~/Makefile 2008-06-06 14:55:03.000000000 +0100 >+++ news/tin/Makefile 2008-09-19 14:35:50.000000000 +0100 >@@ -63,7 +63,10 @@ > LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' > ALL_TARGET= build > MAN1= tin.1 w2r.pl.1 opt-case.pl.1 tinews.pl.1 >-MAN5= tin.5 mbox.5 mmdf.5 >+MAN5= tin.5 >+.if !defined(WITHOUT_TIN_MAILBOX_MANPAGES) >+MAN5+= mbox.5 mmdf.5 >+.endif > MLINKS= tin.1 rtin.1 > > .if defined(WITH_TIN_NNTP_ONLY) >@@ -102,6 +105,9 @@ > .endif > > post-patch: >+.if defined(WITHOUT_TIN_MAILBOX_MANPAGES) >+ @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-no-mbox-manpage >+.endif > ${REINPLACE_CMD} -e 's:/var/spool/news:/var/news:g' \ > -e 's:/etc/nntpserver:${PREFIX}/etc/nntpserver:g' \ > -e 's:/usr/lib/news:${PREFIX}/news/lib:g' \ >diff -ruN news/tin~/files/extra-patch-no-mbox-manpage news/tin/files/extra-patch-no-mbox-manpage >--- news/tin~/files/extra-patch-no-mbox-manpage 1970-01-01 01:00:00.000000000 +0100 >+++ news/tin/files/extra-patch-no-mbox-manpage 2008-09-19 11:09:55.000000000 +0100 >@@ -0,0 +1,13 @@ >+--- src/Makefile.in~ 2006-05-04 09:19:04.000000000 +0100 >++++ src/Makefile.in 2008-09-19 11:01:52.000000000 +0100 >+@@ -336,8 +336,8 @@ >+ @$(INSTALL) -m 444 $(DOCDIR)/tin.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/$(PROJECT).$(INS_MANUAL_EXT) >+ @( $(CD) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) && $(RM) -f r$(PROJECT).$(INS_MANUAL_EXT) && $(LN) $(PROJECT).$(INS_MANUAL_EXT) r$(PROJECT).$(INS_MANUAL_EXT) ) >+ @$(INSTALL) -m 444 $(DOCDIR)/tin.5 $(DESTDIR)$(INS_MANUAL_DIR)5/$(PROJECT).5 >+- @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi >+- @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi >++# @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi >++# @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) " ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi >+ >+ uninstall_manpage : >+ @$(ECHO) "Uninstalling $(PROJECT) manual page in $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) ..." >--- tin.patch.txt ends here ---
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 127509
:
90345
| 90346