NO_SENDMAIL and /usr/sbin/sendmail

[Johan Karlsson]

On Fri, Jan 16, 2004 at 17:13 (+0100) +0000, Melvyn Sopacua wrote:
> Hi,
> 
> on each installworld the mailwrapper is still installed and symlinks are 
> created. I have NO_SENDMAIL=yes in my /etc/make.conf.
> 
> May there be a NO_SENDMAIL=dont_ever_touch_anything setting, so that I keep my 
> symlinks to where I point them to and skip the entire /etc/mail* and 
> mailwrapper stuff? Or are there objections / drawbacks to such an approach?

Please try the attached patch. You will have to have both
NO_SENDMAIL=yes and NO_MAILWRAPPER=yes in /etc/make.conf.

/Johan K

> 
> -- 
> Melvyn
> 
> =======================================================
> FreeBSD sarevok.idg.nl 5.2-CURRENT FreeBSD 5.2-CURRENT #3: Tue Dec 30 14:31:47 
> CET 2003     root at sarevok.idg.nl:/usr/obj/usr/src/sys/SAREVOK_NOAPM_NODEBUG  
> i386
> =======================================================



-- 
Johan Karlsson		mailto:johan at FreeBSD.org
-------------- next part --------------
Index: usr.sbin/mailwrapper/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/mailwrapper/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- usr.sbin/mailwrapper/Makefile	29 Jul 2002 09:40:16 -0000	1.11
+++ usr.sbin/mailwrapper/Makefile	15 Jan 2004 21:47:01 -0000
@@ -8,14 +8,17 @@
 LDADD=	-lutil
 .endif
 
-SYMLINKS= 	${BINDIR}/mailwrapper /usr/sbin/sendmail  \
+__SYMLINKS= 	${BINDIR}/mailwrapper /usr/sbin/sendmail  \
 		${BINDIR}/mailwrapper /usr/sbin/hoststat  \
 		${BINDIR}/mailwrapper /usr/sbin/purgestat \
 		${BINDIR}/mailwrapper /usr/bin/newaliases \
 		${BINDIR}/mailwrapper /usr/bin/mailq
 
-.if defined(NO_MAILWRAPPER) && !defined(NO_SENDMAIL)
-SYMLINKS+=	/usr/libexec/sendmail/sendmail ${BINDIR}/mailwrapper
+.if !defined(NO_MAILWRAPPER)
+SYMLINKS=	${__SYMLINKS}
+.elif !defined(NO_SENDMAIL)
+SYMLINKS=	${__SYMLINKS} \
+		/usr/libexec/sendmail/sendmail ${BINDIR}/mailwrapper
 .endif
 
 afterinstall: