Date: Sat, 10 Nov 2001 14:31:40 -0800 From: Joe Kelsey <joe@zircon.seattle.wa.us> To: freebsd-stable@freebsd.org Subject: NO_SENDMAIL patch to -stable Message-ID: <15341.43724.360824.942144@zircon.zircon.seattle.wa.us>
next in thread | raw e-mail | index | archive | help
Could someone please commit this patch to the stable tree for me? It
modifies src/lib/Makefile, src/share/doc/smm/Makefile and
src/usr.bin/Makefile to remove the entries libsmdb, libsmutil,
08.sendmailop and vacation from the respective makefiles if NO_SENDMAIL
is defined. I currently operate with NO_SENDMAIL set to true in
/etc/make.conf and also go to the extra step of putting *sendmail* in my
cvsup reject file to make sure that no sendmail-related sources make it
onto my system. In the past, I have been able to operate normally, but
recent changes to -stable have added vacation to usr.bin, which in turn
required the addition of libsmdb and libsmutil. Also, share/doc/smm
includes a chapter on sendmail.
I have tested this patch and it works on my recently cvsup'd sources.
/Joe
--- lib/Makefile.o Tue Jul 31 17:16:06 2001
+++ lib/Makefile Sat Nov 10 14:13:57 2001
@@ -25,8 +25,12 @@
libftpio libgnumalloc ${_libio} libipsec libipx libisc libkvm libmenu \
${_libncp} \
libnetgraph libopie libpam libpanel libpcap \
- libposix1e libresolv librpcsvc libsmdb libsmutil libss \
+ libposix1e libresolv librpcsvc libss \
libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
+
+.ifndef NO_SENDMAIL
+SUBDIR+= libsmdb libsmutil
+.endif
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT})
_csu=csu/${MACHINE_ARCH}-${OBJFORMAT}
--- share/doc/smm/Makefile.o Sun Aug 27 10:31:41 2000
+++ share/doc/smm/Makefile Sat Nov 10 14:14:31 2001
@@ -12,7 +12,11 @@
# 07.lpd
SUBDIR= title contents 01.setup 02.config 03.fsck 04.quotas 05.fastfs \
- 06.nfs 08.sendmailop 10.named 11.timedop \
+ 06.nfs 10.named 11.timedop \
12.timed 18.net
+
+.ifndef NO_SENDMAIL
+SUBDIR+= 08.sendmailop
+.endif
.include <bsd.subdir.mk>
--- usr.bin/Makefile.o Thu Sep 27 10:52:55 2001
+++ usr.bin/Makefile Sat Nov 10 14:14:06 2001
@@ -175,7 +175,6 @@
users \
uudecode \
uuencode \
- vacation \
vgrind \
vi \
vis \
@@ -199,6 +198,10 @@
ypcat \
ypmatch \
ypwhich
+
+.ifndef NO_SENDMAIL
+SUBDIR+= vacation
+.endif
.if defined(RELEASEDIR) || (!exists(${.CURDIR}/../kerberosIV) && \
!exists(${.CURDIR}/../secure)) || defined(NOCRYPT) || \
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?15341.43724.360824.942144>