From owner-svn-ports-head@freebsd.org Wed Mar 10 04:20:17 2021 Return-Path: Delivered-To: svn-ports-head@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 60F1657C797; Wed, 10 Mar 2021 04:20:17 +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 4DwJlP2MM4z4T4n; Wed, 10 Mar 2021 04:20:17 +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 404FCB39; Wed, 10 Mar 2021 04:20:17 +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 12A4KH46036049; Wed, 10 Mar 2021 04:20:17 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12A4KHno036048; Wed, 10 Mar 2021 04:20:17 GMT (envelope-from cy@FreeBSD.org) Message-Id: <202103100420.12A4KHno036048@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 10 Mar 2021 04:20:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567980 - head/net/bsdrcmds X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/net/bsdrcmds X-SVN-Commit-Revision: 567980 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Mar 2021 04:20:17 -0000 Author: cy Date: Wed Mar 10 04:20:16 2021 New Revision: 567980 URL: https://svnweb.freebsd.org/changeset/ports/567980 Log: net/bsdrcmds: Fix options breakage. r564865 broke OPTIONS. PR: 253000 Reported by: bugzilla.freebsd@omnilan.de MFH: 2021Q1 Modified: head/net/bsdrcmds/Makefile (contents, props changed) Modified: head/net/bsdrcmds/Makefile ============================================================================== --- head/net/bsdrcmds/Makefile Wed Mar 10 01:54:34 2021 (r567979) +++ head/net/bsdrcmds/Makefile Wed Mar 10 04:20:16 2021 (r567980) @@ -17,14 +17,6 @@ USES= uidfix MAKE_ARGS+= BINOWN=${BINOWN} BINMODE=${BINMODE} -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300134 -MAKE_ENV+= MK_WERROR=no -.else -MAKE_ENV+= NO_WERROR=1 -.endif - OPTIONS_DEFINE= IPV6 LIBBLACKLIST OPTIONS_DEFAULT= LIBBLACKLIST .if !exists(/usr/include/blacklist.h) @@ -35,5 +27,13 @@ IPV6_MAKE_ARGS= USE_IPV6=yes LIBBLACKLIST_DESC= libblacklist(3) support for rlogind(8) and rshd(8) LIBBLACKLIST_MAKE_ARGS= USE_LIBBLACKLIST=yes + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300134 +MAKE_ENV+= MK_WERROR=no +.else +MAKE_ENV+= NO_WERROR=1 +.endif .include