svn commit: r564865 - head/net/bsdrcmds

[Cy Schubert]

Author: cy
Date: Wed Feb 10 15:39:56 2021
New Revision: 564865
URL: https://svnweb.freebsd.org/changeset/ports/564865

Log:
  Fix 13-STABLE and 14-CURRENT for real.
  
  r564711 attempted to provide both the definitions to use the old
  NO_WERROR and the new MK_WERROR. However foot-shooting protection
  prevents such innovative approaches. Therefore additional logic
  is required.
  
  PR:		253000
  Submitted by:	cy
  Reported by:	cy
  Approved by:	jlh (maintainer, by private email)
  MFH:		2021Q1

Modified:
  head/net/bsdrcmds/Makefile   (contents, props changed)

Modified: head/net/bsdrcmds/Makefile
==============================================================================
--- head/net/bsdrcmds/Makefile	Wed Feb 10 15:17:54 2021	(r564864)
+++ head/net/bsdrcmds/Makefile	Wed Feb 10 15:39:56 2021	(r564865)
@@ -16,7 +16,14 @@ LICENSE=	BSD3CLAUSE
 USES=		uidfix
 
 MAKE_ARGS+=		BINOWN=${BINOWN} BINMODE=${BINMODE}
-MAKE_ENV+=		MK_WERROR=no NO_WERROR=1
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300134
+MAKE_ENV+=		MK_WERROR=no
+.else
+MAKE_ENV+=		NO_WERROR=1
+.endif
 
 OPTIONS_DEFINE=		IPV6 LIBBLACKLIST
 OPTIONS_DEFAULT=	LIBBLACKLIST