From owner-svn-ports-all@freebsd.org  Wed Feb 10 15:39:57 2021
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2756754A0D6;
 Wed, 10 Feb 2021 15:39:57 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DbP8Y0hWgz4cxl;
 Wed, 10 Feb 2021 15:39:57 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A8AF20540;
 Wed, 10 Feb 2021 15:39:57 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11AFducJ087637;
 Wed, 10 Feb 2021 15:39:56 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11AFdu5H087636;
 Wed, 10 Feb 2021 15:39:56 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <202102101539.11AFdu5H087636@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 10 Feb 2021 15:39:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r564865 - head/net/bsdrcmds
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head/net/bsdrcmds
X-SVN-Commit-Revision: 564865
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Feb 2021 15:39:57 -0000

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