Date: Wed, 17 Nov 2010 17:12:41 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r215429 - in stable/8: share/man/man5 tools/build/mk usr.sbin/mailwrapper Message-ID: <201011171712.oAHHCgin098377@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Wed Nov 17 17:12:41 2010 New Revision: 215429 URL: http://svn.freebsd.org/changeset/base/215429 Log: MFC: Add /bin/rmail symlink to mailwrapper if sendmail is not being built and mailwrapper is being built. Ensure that it is not removed by "make delete-old". Add Exim example to man page. Modified: stable/8/share/man/man5/mailer.conf.5 stable/8/tools/build/mk/OptionalObsoleteFiles.inc stable/8/usr.sbin/mailwrapper/Makefile Modified: stable/8/share/man/man5/mailer.conf.5 ============================================================================== --- stable/8/share/man/man5/mailer.conf.5 Wed Nov 17 16:17:35 2010 (r215428) +++ stable/8/share/man/man5/mailer.conf.5 Wed Nov 17 17:12:41 2010 (r215429) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 31, 2006 +.Dd November 17, 2010 .Dt MAILER.CONF 5 .Os .Sh NAME @@ -110,6 +110,22 @@ mailq /usr/local/sbin/sendmail newaliases /usr/local/sbin/sendmail .Ed .Pp +This example shows +how to invoke +a sendmail-workalike with +.Nm Exim +(from ports) +in place of +.Xr sendmail 8 : +.Bd -literal -offset indent +# Emulate sendmail using exim +sendmail /usr/local/sbin/exim +send-mail /usr/local/sbin/exim +mailq /usr/local/sbin/exim -bp +newaliases /usr/bin/true +rmail /usr/local/sbin/exim -i -oee +.Ed +.Pp This example shows the use of the .Nm mini_sendmail package from ports in place of Modified: stable/8/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/8/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 17 16:17:35 2010 (r215428) +++ stable/8/tools/build/mk/OptionalObsoleteFiles.inc Wed Nov 17 17:12:41 2010 (r215429) @@ -1130,7 +1130,9 @@ OLD_FILES+=usr/share/man/man8/rshd.8.gz #.endif .if ${MK_SENDMAIL} == no +.if ${MK_MAILWRAPPER} == no OLD_FILES+=bin/rmail +.endif OLD_FILES+=usr/bin/vacation OLD_FILES+=usr/include/libmilter/mfapi.h OLD_FILES+=usr/include/libmilter/mfdef.h Modified: stable/8/usr.sbin/mailwrapper/Makefile ============================================================================== --- stable/8/usr.sbin/mailwrapper/Makefile Wed Nov 17 16:17:35 2010 (r215428) +++ stable/8/usr.sbin/mailwrapper/Makefile Wed Nov 17 17:12:41 2010 (r215429) @@ -23,6 +23,10 @@ SYMLINKS+= /usr/libexec/sendmail/sendmai .endif .endif +.if ${MK_MAILWRAPPER} != "no" && ${MK_SENDMAIL} == "no" +SYMLINKS+= ${BINDIR}/mailwrapper /bin/rmail +.endif + .if ${MK_MAILWRAPPER} != "no" .if !exists(${DESTDIR}/etc/mail/mailer.conf) FILES= ${.CURDIR}/../../etc/mail/mailer.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011171712.oAHHCgin098377>