Index: stable/4/usr.sbin/Makefile
===================================================================
--- stable/4/usr.sbin/Makefile	(revision 113554)
+++ stable/4/usr.sbin/Makefile	(revision 113555)
@@ -1,186 +1,183 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
 # $FreeBSD$
 
 # XXX MISSING:		mkproto
 SUBDIR=	IPXrouted \
 	ac \
 	accton \
 	adduser \
 	amd \
 	ancontrol \
 	arp \
 	atm \
 	bootparamd \
 	burncd \
 	cdcontrol \
 	chkgrp \
 	chown \
 	chroot \
 	ckdist \
 	config \
 	cron \
 	crunch \
 	ctm \
 	daemon \
 	dev_mkdb \
 	diskpart \
 	edquota \
 	faithd \
 	fdcontrol \
 	fdformat \
 	fdwrite \
 	fwcontrol \
 	gifconfig \
 	ifmcstat \
 	inetd \
 	iostat \
 	jail \
 	kbdcontrol \
 	kbdmap \
 	kernbb \
 	keyserv \
 	lastlogin \
+	mailwrapper \
 	manctl \
 	memcontrol \
 	mergemaster \
 	mixer \
 	mld6query \
 	mlxcontrol \
 	moused \
 	mrouted \
 	mtest \
 	mtree \
 	ndp \
 	newsyslog \
 	ngctl \
 	ntp \
 	nghook \
 	pccard \
 	pciconf \
 	periodic \
 	pkg_install \
 	pnpinfo \
 	portmap \
 	ppp \
 	pppctl \
 	pppd \
 	pppstats \
 	prefix \
 	procctl \
 	pstat \
 	pw \
 	pwd_mkdb \
 	quot \
 	quotaon \
 	rarpd \
 	raycontrol \
 	repquota \
 	rip6query \
 	rmt \
 	route6d \
 	rpc.lockd \
 	rpc.statd \
 	rpc.umntall \
 	rpc.yppasswdd \
 	rpc.ypupdated \
 	rpc.ypxfrd \
 	rrenumd \
 	rtadvd \
 	rtprio \
 	rtsold \
 	rwhod \
 	sa \
 	setkey \
 	sliplogin \
 	slstat \
 	spray \
 	syslogd \
 	tcpdchk \
 	tcpdmatch \
 	tcpdump \
 	timed \
 	traceroute \
 	traceroute6 \
 	trpt \
 	tzsetup \
 	usbd \
 	usbdevs \
 	vidcontrol \
 	vipw \
 	vnconfig \
 	watch \
 	xten \
 	yp_mkdb \
 	ypbind \
 	yppoll \
 	yppush \
 	ypserv \
 	ypset \
 	zic
 
 .if !defined(NO_IPFILTER)
 SUBDIR+=ipftest \
 	ipresend \
 	ipsend \
 	iptest
 .endif
 
 .if !defined(NO_BIND)
 SUBDIR+=named \
 	named.reload \
 	named.restart \
 	ndc \
 	nslookup \
 	nsupdate
 .endif
 
 .if !defined(NO_LPR)
 SUBDIR+=lpr
-.endif
-
-.if !defined(NO_MAILWRAPPER)
-SUBDIR+=mailwrapper
 .endif
 
 .if !defined(NO_SENDMAIL)
 SUBDIR+=editmap \
 	mailstats \
 	makemap \
 	praliases \
 	sendmail
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"
 SUBDIR+=elf2exe
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
 SUBDIR+=apm \
 	apmd \
 	btxld \
 	kgmon \
 	kgzip \
 	lptcontrol \
 	mptable \
 	pcvt \
 	rndcontrol \
 	sgsc \
 	sicontrol \
 	spkrtest \
 	stallion \
 	wicontrol \
 	wlconfig
 .if !defined(NO_I4B)
 SUBDIR+=i4b
 .endif
 .endif
 
 .if ${MACHINE} == "i386"
 SUBDIR+=boot0cfg
 .endif
 
 .if ${MACHINE} == "pc98"
 SUBDIR+=boot98cfg
 .endif
 
 .include <bsd.subdir.mk>
Index: stable/4/usr.sbin/mailwrapper/Makefile
===================================================================
--- stable/4/usr.sbin/mailwrapper/Makefile	(revision 113554)
+++ stable/4/usr.sbin/mailwrapper/Makefile	(revision 113555)
@@ -1,21 +1,29 @@
 # $FreeBSD$
 
+.if !defined(NO_MAILWRAPPER)
 PROG=	mailwrapper
 MAN=	mailwrapper.8
 
-DPADD+=	${LIBUTIL}
-LDADD+=	-lutil
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
+.endif
 
 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
+.endif
+
 afterinstall:
+.if !defined(NO_MAILWRAPPER)
 .if !exists(${DESTDIR}/etc/mail/mailer.conf)
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${.CURDIR}/../../etc/mail/mailer.conf ${DESTDIR}/etc/mail
+.endif
 .endif
 
 .include <bsd.prog.mk>