As noticed by Stuart:
- without daemon_flags, rcctl start sendmail fails badly
  Do we want to keep the rcctl example in the README?
- remove conflicts with mail/postfix manpages
  http://marc.info/?l=openbsd-ports&m=141483693403030&w=2
- in the README, tweak the chunk about smmsp

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/sendmail/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile    20 Feb 2015 14:39:18 -0000      1.8
+++ Makefile    25 Feb 2015 12:17:36 -0000
@@ -6,7 +6,7 @@ COMMENT-libmilter =     mail filter support 
 V=                     8.15.1
 DISTNAME =             sendmail.${V}
 PKGNAME-main =         sendmail-${V}
-REVISION-main =                0
+REVISION-main =                1
 PKGNAME-libmilter =    libmilter-${V}
 FULLPKGNAME-libmilter =        libmilter-${V}
 FULLPKGPATH-libmilter =        mail/sendmail,-libmilter
@@ -87,6 +87,10 @@ pre-fake:
 
 docdir =               ${PREFIX}/share/doc/sendmail
 post-install:
+.for manpage section in aliases 5 mailq 1 newaliases 1
+       mv ${PREFIX}/man/man${section}/${manpage}.${section} \
+           ${PREFIX}/man/man${section}/sendmail-${manpage}.${section}
+.endfor
        find ${PREFIX}/bin/ -type l -print -execdir rm -f {} ';' | \
            sed 's/^/rm -f /'
        mv ${PREFIX}/sbin/makemap ${PREFIX}/libexec/sendmail
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/sendmail/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main      20 Feb 2015 14:39:18 -0000      1.4
+++ pkg/PLIST-main      25 Feb 2015 12:14:49 -0000
@@ -12,9 +12,9 @@ libexec/sendmail/
 @owner
 @group
 @bin libexec/smrsh
-@man man/man1/mailq.1
-@man man/man1/newaliases.1
-@man man/man5/aliases.5
+@man man/man1/sendmail-mailq.1
+@man man/man1/sendmail-newaliases.1
+@man man/man5/sendmail-aliases.5
 @man man/man8/editmap.8
 @man man/man8/mail.local.8
 @man man/man8/mailstats.8
Index: pkg/README-main
===================================================================
RCS file: /cvs/ports/mail/sendmail/pkg/README-main,v
retrieving revision 1.3
diff -u -p -r1.3 README-main
--- pkg/README-main     8 Jan 2015 14:08:15 -0000       1.3
+++ pkg/README-main     25 Feb 2015 12:17:58 -0000
@@ -22,7 +22,7 @@ Client mail queue ownership
 ---------------------------
 This package ensures that /var/spool/clientmqueue is owned by
 _smmsp:_smmsp, mode 0770.  You should verify that your submit.cf
-configuration is not using the default settings (smmsp:smmsp).
+configuration is not using the previous default settings (smmsp:smmsp).
 
 Activate the queue runner
 -------------------------
Index: pkg/sendmail.rc
===================================================================
RCS file: /cvs/ports/mail/sendmail/pkg/sendmail.rc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 sendmail.rc
--- pkg/sendmail.rc     16 Sep 2014 17:09:32 -0000      1.1.1.1
+++ pkg/sendmail.rc     25 Feb 2015 12:11:01 -0000
@@ -3,6 +3,7 @@
 # $OpenBSD: sendmail.rc,v 1.1.1.1 2014/09/16 17:09:32 jca Exp $
 
 daemon="${TRUEPREFIX}/libexec/sendmail/sendmail"
+daemon_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m"
 
 . /etc/rc.d/rc.subr
 


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to