diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index 87bd3c95faa8..fcc11bb56f62 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -16,14 +16,14 @@ LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
 .endif
 LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
 
-DPADD+=	${LIBSMUTIL}
-LDADD+=	${LIBSMUTIL}
+DPADD=	${LIBSMUTIL}
+LDADD=	${LIBSMUTIL}
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
-LDFLAGS+=${SENDMAIL_LDFLAGS}
-LDADD+=${SENDMAIL_LDADD}
 DPADD+=${SENDMAIL_DPADD}
+LDADD+=${SENDMAIL_LDADD}
+LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 # If you want to have your rmail queuing the mail only, uncomment the
 # following:
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index f042facc9054..3eb1545f7297 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -16,13 +16,13 @@ LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
 .endif
 LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
 
-DPADD+=	${LIBSMUTIL}
-LDADD+=	${LIBSMUTIL}
+DPADD=	${LIBSMUTIL}
+LDADD=	${LIBSMUTIL}
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
-LDFLAGS+=${SENDMAIL_LDFLAGS}
-LDADD+=${SENDMAIL_LDADD}
 DPADD+=${SENDMAIL_DPADD}
+LDADD+=${SENDMAIL_LDADD}
+LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile
index 37c2e4da3b7f..a32f935eabe8 100644
--- a/libexec/smrsh/Makefile
+++ b/libexec/smrsh/Makefile
@@ -16,13 +16,13 @@ LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
 .endif
 LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
 
-DPADD+=	${LIBSMUTIL}
-LDADD+=	${LIBSMUTIL}
+DPADD=	${LIBSMUTIL}
+LDADD=	${LIBSMUTIL}
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
-LDFLAGS+=${SENDMAIL_LDFLAGS}
-LDADD+=${SENDMAIL_LDADD}
 DPADD+=${SENDMAIL_DPADD}
+LDADD+=${SENDMAIL_LDADD}
+LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/secure/usr.sbin/sendmail/Makefile b/secure/usr.sbin/sendmail/Makefile
index b2dfcdc759ff..454a6333c36f 100644
--- a/secure/usr.sbin/sendmail/Makefile
+++ b/secure/usr.sbin/sendmail/Makefile
@@ -41,8 +41,8 @@ LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
 .endif
 LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
 
-DPADD+=	${LIBSMUTIL}
-LDADD+=	${LIBSMUTIL}
+DPADD=	${LIBSMUTIL}
+LDADD=	${LIBSMUTIL}
 
 .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 # STARTTLS support
@@ -53,9 +53,9 @@ DPADD+=	${LIBSSL} ${LIBCRYPTO}
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
-LDFLAGS+=${SENDMAIL_LDFLAGS}
-LDADD+=${SENDMAIL_LDADD}
 DPADD+=${SENDMAIL_DPADD}
+LDADD+=${SENDMAIL_LDADD}
+LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile
index 89806a099a57..7908ca296014 100644
--- a/usr.sbin/mailstats/Makefile
+++ b/usr.sbin/mailstats/Makefile
@@ -16,13 +16,13 @@ LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
 .endif
 LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
 
-DPADD+=	${LIBSMUTIL}
-LDADD+=	${LIBSMUTIL}
+DPADD=	${LIBSMUTIL}
+LDADD=	${LIBSMUTIL}
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
-LDFLAGS+=${SENDMAIL_LDFLAGS}
-LDADD+=${SENDMAIL_LDADD}
 DPADD+=${SENDMAIL_DPADD}
+LDADD+=${SENDMAIL_LDADD}
+LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile
index bd2d8c6f5e86..b7f04a52834f 100644
--- a/usr.sbin/makemap/Makefile
+++ b/usr.sbin/makemap/Makefile
@@ -24,13 +24,13 @@ LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
 .endif
 LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
 
-DPADD+=	${LIBSMDB} ${LIBSMUTIL}
-LDADD+=	${LIBSMDB} ${LIBSMUTIL}
+DPADD=	${LIBSMDB} ${LIBSMUTIL}
+LDADD=	${LIBSMDB} ${LIBSMUTIL}
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
-LDFLAGS+=${SENDMAIL_LDFLAGS}
-LDADD+=${SENDMAIL_LDADD}
 DPADD+=${SENDMAIL_DPADD}
+LDADD+=${SENDMAIL_LDADD}
+LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile
index 6b242a2f34af..a10ce4ca5cde 100644
--- a/usr.sbin/praliases/Makefile
+++ b/usr.sbin/praliases/Makefile
@@ -24,13 +24,13 @@ LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
 .endif
 LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
 
-DPADD+=	${LIBSMDB} ${LIBSMUTIL}
-LDADD+=	${LIBSMDB} ${LIBSMUTIL}
+DPADD=	${LIBSMDB} ${LIBSMUTIL}
+LDADD=	${LIBSMDB} ${LIBSMUTIL}
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
-LDFLAGS+=${SENDMAIL_LDFLAGS}
-LDADD+=${SENDMAIL_LDADD}
 DPADD+=${SENDMAIL_DPADD}
+LDADD+=${SENDMAIL_LDADD}
+LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index b2dfcdc759ff..454a6333c36f 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -41,8 +41,8 @@ LIBSMUTILDIR!=	cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR
 .endif
 LIBSMUTIL:=	${LIBSMUTILDIR}/libsmutil.a
 
-DPADD+=	${LIBSMUTIL}
-LDADD+=	${LIBSMUTIL}
+DPADD=	${LIBSMUTIL}
+LDADD=	${LIBSMUTIL}
 
 .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 # STARTTLS support
@@ -53,9 +53,9 @@ DPADD+=	${LIBSSL} ${LIBCRYPTO}
 
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
-LDFLAGS+=${SENDMAIL_LDFLAGS}
-LDADD+=${SENDMAIL_LDADD}
 DPADD+=${SENDMAIL_DPADD}
+LDADD+=${SENDMAIL_LDADD}
+LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \