On Fri, October 31, 2014 19: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.
No problem to bump my patch.
>
> Brad, would you mind if I renamed postfix' sendmail.1 to
> postfix-sendmail.1?
Well, it looks better, but we need OK from brad@.
I can provide diffs for both variants.
>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/mail/sendmail/Makefile,v
>> retrieving revision 1.4
>> diff -u -r1.4 Makefile
>> --- Makefile 18 Sep 2014 14:41:05 -0000 1.4
>> +++ Makefile 30 Oct 2014 16:40:14 -0000
>> @@ -10,7 +10,7 @@
>> FULLPKGNAME-libmilter = libmilter-${V}
>> FULLPKGPATH-libmilter = mail/sendmail,-libmilter
>>
>> -REVISION-main = 2
>> +REVISION-main = 3
>>
>> SHARED_LIBS = milter 4.0
>>
>> cvs server: Diffing files
>> cvs server: Diffing files/cf
>> cvs server: Diffing patches
>> cvs server: Diffing pkg
>> Index: pkg/PLIST-main
>> ===================================================================
>> RCS file: /cvs/ports/mail/sendmail/pkg/PLIST-main,v
>> retrieving revision 1.1
>> diff -u -r1.1 PLIST-main
>> --- pkg/PLIST-main 17 Sep 2014 09:11:53 -0000 1.1
>> +++ pkg/PLIST-main 30 Oct 2014 16:40:14 -0000
>> @@ -1,4 +1,5 @@
>> @comment $OpenBSD: PLIST-main,v 1.1 2014/09/17 09:11:53 ajacoutot Exp $
>> +@conflict postfix-*
>> @newgroup _smmsp:742
>> @newuser _smmsp:742:_smmsp::Sendmail Message Submission
>> Program:/nonexistent:/sbin/nologin
>> @bin libexec/mail.local
>>
>>
>
