svn commit: r462455 - head/Mk

Bryan Drewery bdrewery at FreeBSD.org
Tue Feb 20 22:10:03 UTC 2018


Author: bdrewery
Date: Tue Feb 20 22:10:02 2018
New Revision: 462455
URL: https://svnweb.freebsd.org/changeset/ports/462455

Log:
  Avoid fstat(/usr/bin/soeliminate) for every port when building INDEX.
  
  Approved by:	portmgr (implicit)

Modified:
  head/Mk/bsd.commands.mk

Modified: head/Mk/bsd.commands.mk
==============================================================================
--- head/Mk/bsd.commands.mk	Tue Feb 20 21:32:18 2018	(r462454)
+++ head/Mk/bsd.commands.mk	Tue Feb 20 22:10:02 2018	(r462455)
@@ -108,11 +108,6 @@ XZ_CMD?=		/usr/bin/xz ${XZ}
 
 MD5?=			/sbin/md5
 SHA256?=		/sbin/sha256
-.if exists(/usr/bin/soeliminate)
-SOELIM?=		/usr/bin/soeliminate
-.else
-SOELIM?=		/usr/bin/soelim
-.endif
 
 # 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
@@ -133,4 +128,12 @@ PKG_CREATE?=		${PKG_BIN} create
 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


More information about the svn-ports-head mailing list