Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -2015,8 +2015,10 @@
 .endfor
 
 .if defined(PORTNAME)
+.if make(check-sanity) || make(show*-errors) || make(show*-warnings)
 .include "${PORTSDIR}/Mk/bsd.sanity.mk"
 .endif
+.endif
 
 .if defined(USE_LOCALE)
 CONFIGURE_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
Index: Mk/bsd.sanity.mk
===================================================================
--- Mk/bsd.sanity.mk
+++ Mk/bsd.sanity.mk
@@ -55,6 +55,7 @@
 
 
 # Warnings only when DEVELOPER=yes
+.if defined(DEVELOPER)
 
 .if exists(${.CURDIR}/../../Mk/bsd.port.mk) || ${OVERLAYS:tA:M${.CURDIR:H:H}} == ${.CURDIR:H:H}
 .if ${.CURDIR:H:T} != ${PKGCATEGORY}
@@ -308,3 +309,5 @@
 DEV_ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
 .endif
 .endfor
+
+.endif	# defined(DEVELOPER)