Index: stable/4/lib/libmilter/Makefile
===================================================================
--- stable/4/lib/libmilter/Makefile	(revision 130155)
+++ stable/4/lib/libmilter/Makefile	(revision 130156)
@@ -1,28 +1,32 @@
 # $FreeBSD$
 
 MAINTAINER=	gshapiro@FreeBSD.org
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
-CFLAGS+=-DNETINET6 -DNOT_SENDMAIL -Dsm_snprintf=snprintf
+CFLAGS+=-DNOT_SENDMAIL -Dsm_snprintf=snprintf
 CFLAGS+=-D_THREAD_SAFE
+
+.if !defined(NOINET6)
+CFLAGS+=-DNETINET6
+.endif
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
 
 INCSDIR=${INCLUDEDIR}/libmilter
 INCS=	${SENDMAIL_DIR}/include/libmilter/mfapi.h \
 	${SENDMAIL_DIR}/include/libmilter/mfdef.h
 LIB=	milter
 
 SRCS+=	sm_os.h
 SRCS+=	main.c engine.c listener.c handler.c comm.c smfi.c \
 	signal.c sm_gethost.c errstring.c strl.c
 CLEANFILES+=sm_os.h
 
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.lib.mk>
Index: stable/4/lib/libsm/Makefile
===================================================================
--- stable/4/lib/libsm/Makefile	(revision 130155)
+++ stable/4/lib/libsm/Makefile	(revision 130156)
@@ -1,35 +1,39 @@
 # $FreeBSD$
 
 MAINTAINER=	gshapiro@FreeBSD.org
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/libsm
 
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
-CFLAGS+=-DNETINET6 -DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL
+CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL
+
+.if !defined(NOINET6)
+CFLAGS+=-DNETINET6
+.endif
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
 
 LIB=	sm
 
 SRCS+=	sm_os.h
 SRCS+=	assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \
 	strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c \
 	fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c \
 	fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c \
 	fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c \
 	smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c \
 	vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c \
 	vsprintf.c vsscanf.c wbuf.c wsetup.c string.c stringf.c \
 	xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c \
 	signal.c clock.c config.c shm.c mbdb.c strexit.c cf.c ldap.c \
 	niprop.c mpeix.c
 CLEANFILES+=sm_os.h
 
 INTERNALLIB=		true
 
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.lib.mk>
Index: stable/4/usr.sbin/sendmail/Makefile
===================================================================
--- stable/4/usr.sbin/sendmail/Makefile	(revision 130155)
+++ stable/4/usr.sbin/sendmail/Makefile	(revision 130156)
@@ -1,80 +1,84 @@
 #	@(#)Makefile	8.8 (Berkeley) 3/28/97
 # $FreeBSD$
 
 MAINTAINER=	gshapiro@FreeBSD.org
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 SMDIR=	${SENDMAIL_DIR}/src
 .PATH: ${SMDIR}
 
 BINDIR=	/usr/libexec/sendmail
 
 PROG=	sendmail
 MAN=	mailq.1 newaliases.1 aliases.5 sendmail.8 
 SRCS=	alias.c arpadate.c bf.c collect.c conf.c control.c \
 	convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c \
 	macro.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \
 	readcf.c recipient.c savemail.c sasl.c sfsasl.c shmticklib.c \
 	sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c timers.c \
 	tls.c trace.c udb.c usersmtp.c util.c version.c
 BINOWN=	root
 BINGRP=	smmsp
 .ifdef SENDMAIL_SET_USER_ID
 BINMODE=4555
 .else
 BINMODE=2555
 .endif
 
 # Define the database format to use for aliases et al.
 DBMDEF=	-DNEWDB
 # If you don't want NIS alias/map support, comment out this line
 NIS=	-DNIS
 # Map extensions
 MAPS=	-DMAP_REGEX -DDNSMAP
 
 CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include -I.
-CFLAGS+= ${DBMDEF} ${NIS} -DMILTER -DNETINET6 -DTCPWRAPPERS ${MAPS}
+CFLAGS+= ${DBMDEF} ${NIS} -DMILTER -DTCPWRAPPERS ${MAPS}
+
+.if !defined(NOINET6)
+CFLAGS+= -DNETINET6
+.endif
 
 DPADD=	${LIBUTIL} ${LIBWRAP}
 LDADD=	-lutil -lwrap
 
 .if exists(${.OBJDIR}/../../lib/libsm)
 LIBSMDIR:=	${.OBJDIR}/../../lib/libsm
 .else
 LIBSMDIR!=	cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR
 .endif
 LIBSM:=		${LIBSMDIR}/libsm.a
 
 .if exists(${.OBJDIR}/../../lib/libsmutil)
 LIBSMUTILDIR:=	${.OBJDIR}/../../lib/libsmutil
 .else
 LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
 .endif
 LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
 
 DPADD+=	${LIBSMUTIL} ${LIBSM}
 LDADD+=	${LIBSMUTIL} ${LIBSM}
 
 SRCS+=	sm_os.h
 CLEANFILES+=sm_os.h
 
 .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && \
 	!defined(NOSECURE) && !defined(NO_OPENSSL) && \
 	!defined(RELEASE_CRUNCH)
 # STARTTLS support
 DISTRIBUTION=	crypto
 CFLAGS+=	-DSTARTTLS -D_FFR_TLS_1
 LDADD+=		-lssl -lcrypto
 DPADD+=		${LIBSSL} ${LIBCRYPTO}
 .endif
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
 DPADD+=${SENDMAIL_DPADD}
 LDADD+=${SENDMAIL_LDADD}
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 sm_os.h:
 	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>