Il giorno 01/nov/2014 11.15, "Jérémie Courrèges-Anglas" <j...@wxcvbn.org> ha
scritto:
>
> Stuart Henderson <st...@openbsd.org> writes:
>
> > On 2014/10/31 17:10, Jérémie Courrèges-Anglas wrote:
> >> "Kirill Bychkov" <ki...@linklevel.net> writes:
> >>
> >> > Hi this adds conflict marker to sendmail. It conflicts at least with
> >> > man/man1/sendmail.1 from postfix.
> >> > OK?
> >>
> >> Hmm, I just committed to mail/sendmail, so you'd need to refresh your
> >> diff. But on the other hand, I'm not sure this is the way to go.
> >>
> >> Brad, would you mind if I renamed postfix' sendmail.1 to
> >> postfix-sendmail.1?
> >
> > sendmail.1 isn't the problem, conflicts are only in mailq.1,
newaliases.1,
> > and aliases.5.
> >
> > mailq and newaliases are aliases to sendmail.1 and I think could be
> > @commented, though I would also be happy with renaming to postfix-XX.
> >
> > aliases.5, rename?
> >
> > These are all "hidden" behind smtpd's manpages in base anyway,
> > so renaming to postfix-XX would even make it easier for users to
> > find those manpages. Given this, I'd be a lot happier with renaming
> > than conflicting (but if you do conflict, it should be added to
> > all 3 ports, not just sendmail).
>
> So here's a diff to rename all three manpages.
>
> ok?
Yes, ok with me.
> Index: Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/mail/postfix/Makefile.inc,v
> retrieving revision 1.91
> diff -u -p -r1.91 Makefile.inc
> --- Makefile.inc 13 Sep 2014 18:09:21 -0000 1.91
> +++ Makefile.inc 1 Nov 2014 09:29:43 -0000
> @@ -119,4 +119,7 @@ do-install:
> @rm -fr ${WRKINST}/var/spool/postfix
> @chown -h ${BINOWN}:${BINGRP} ${PREFIX}/{sbin,libexec/postfix}/*
> @chown -R ${MANOWN}:${MANGRP} ${PREFIX}/man
> + @mv ${PREFIX}/man/man1/mailq.1 ${PREFIX}/man/man1/postfix-mailq.1
> + @mv ${PREFIX}/man/man1/newaliases.1
${PREFIX}/man/man1/postfix-newaliases.1
> + @mv ${PREFIX}/man/man5/aliases.5
${PREFIX}/man/man5/postfix-aliases.5
> @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share
> Index: snapshot/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/postfix/snapshot/Makefile,v
> retrieving revision 1.277
> diff -u -p -r1.277 Makefile
> --- snapshot/Makefile 25 Oct 2014 22:08:16 -0000 1.277
> +++ snapshot/Makefile 31 Oct 2014 21:59:32 -0000
> @@ -1,6 +1,7 @@
> # $OpenBSD: Makefile,v 1.277 2014/10/25 22:08:16 brad Exp $
>
> VERSION= 2.12-20141020
> +REVISION= 0
>
> MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/}
>
> Index: snapshot/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/mail/postfix/snapshot/pkg/PLIST,v
> retrieving revision 1.66
> diff -u -p -r1.66 PLIST
> --- snapshot/pkg/PLIST 3 Jul 2014 16:02:23 -0000 1.66
> +++ snapshot/pkg/PLIST 1 Nov 2014 09:31:09 -0000
> @@ -42,8 +42,8 @@ libexec/postfix/postmulti-script
> @bin libexec/postfix/trivial-rewrite
> @bin libexec/postfix/verify
> @bin libexec/postfix/virtual
> -@man man/man1/mailq.1
> -@man man/man1/newaliases.1
> +@man man/man1/postfix-mailq.1
> +@man man/man1/postfix-newaliases.1
> @man man/man1/postalias.1
> @man man/man1/postcat.1
> @man man/man1/postconf.1
> @@ -59,7 +59,7 @@ libexec/postfix/postmulti-script
> @man man/man1/qshape.1
> @man man/man1/sendmail.1
> @man man/man5/access.5
> -@man man/man5/aliases.5
> +@man man/man5/postfix-aliases.5
> @man man/man5/body_checks.5
> @man man/man5/bounce.5
> @man man/man5/canonical.5
> Index: stable/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/postfix/stable/Makefile,v
> retrieving revision 1.174
> diff -u -p -r1.174 Makefile
> --- stable/Makefile 25 Oct 2014 21:44:42 -0000 1.174
> +++ stable/Makefile 31 Oct 2014 21:59:46 -0000
> @@ -1,6 +1,7 @@
> # $OpenBSD: Makefile,v 1.174 2014/10/25 21:44:42 brad Exp $
>
> VERSION= 2.11.3
> +REVISION= 0
>
> MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/}
>
> Index: stable/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/mail/postfix/stable/pkg/PLIST,v
> retrieving revision 1.33
> diff -u -p -r1.33 PLIST
> --- stable/pkg/PLIST 21 Jan 2014 23:52:23 -0000 1.33
> +++ stable/pkg/PLIST 1 Nov 2014 09:31:48 -0000
> @@ -45,8 +45,8 @@ libexec/postfix/postmulti-script
> @bin libexec/postfix/trivial-rewrite
> @bin libexec/postfix/verify
> @bin libexec/postfix/virtual
> -@man man/man1/mailq.1
> -@man man/man1/newaliases.1
> +@man man/man1/postfix-mailq.1
> +@man man/man1/postfix-newaliases.1
> @man man/man1/postalias.1
> @man man/man1/postcat.1
> @man man/man1/postconf.1
> @@ -62,7 +62,7 @@ libexec/postfix/postmulti-script
> @man man/man1/qshape.1
> @man man/man1/sendmail.1
> @man man/man5/access.5
> -@man man/man5/aliases.5
> +@man man/man5/postfix-aliases.5
> @man man/man5/body_checks.5
> @man man/man5/bounce.5
> @man man/man5/canonical.5
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524
E7EE
>
