From owner-svn-ports-all@freebsd.org  Tue Feb 20 22:25:28 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D41A6F09F01;
 Tue, 20 Feb 2018 22:25:28 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 863A0740D7;
 Tue, 20 Feb 2018 22:25:28 +0000 (UTC)
 (envelope-from bdrewery@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 7CFF37CDF;
 Tue, 20 Feb 2018 22:25:28 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1KMPSe0014688;
 Tue, 20 Feb 2018 22:25:28 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KMPSGu014687;
 Tue, 20 Feb 2018 22:25:28 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201802202225.w1KMPSGu014687@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 20 Feb 2018 22:25:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r462458 - head/Mk
X-SVN-Group: ports-head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/Mk
X-SVN-Commit-Revision: 462458
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.25
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: Tue, 20 Feb 2018 22:25:29 -0000

Author: bdrewery
Date: Tue Feb 20 22:25:28 2018
New Revision: 462458
URL: https://svnweb.freebsd.org/changeset/ports/462458

Log:
  Rework r462455: soeliminate never made it to a release, was only in 11-CURRENT.
  
  Reported by:	antoine
  Approved by:	portmgr (implicit)

Modified:
  head/Mk/bsd.commands.mk

Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk	Tue Feb 20 22:14:17 2018	(r462457)
+++ head/Mk/bsd.commands.mk	Tue Feb 20 22:25:28 2018	(r462458)
@@ -108,6 +108,7 @@ XZ_CMD?=		/usr/bin/xz ${XZ}
 
 MD5?=			/sbin/md5
 SHA256?=		/sbin/sha256
+SOELIM?=		/usr/bin/soelim
 
 # ECHO is defined in /usr/share/mk/sys.mk, which can either be "echo",
 # or "true" if the make flag -s is given.  Use ECHO_CMD where you mean
@@ -129,11 +130,4 @@ PKG_ADD?=		${PKG_BIN} add
 PKG_QUERY?=		${PKG_BIN} query
 
 .endif
-
-.if defined(OSVERSION)
-.if ${OSVERSION} < 1100000
-SOELIM?=		/usr/bin/soeliminate
-.else
-SOELIM?=		/usr/bin/soelim
-.endif
-.endif
+.info here