[pkgsrc/trunk]: pkgsrc/sysutils/file Look for a file binary in /bin or /usr/b...

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9bf38d9a082e
branches:  trunk
changeset: 555805:9bf38d9a082e
user:      cube <cube%pkgsrc.org@localhost>
date:      Mon Mar 09 17:47:36 2009 +0000

description:
Look for a file binary in /bin or /usr/bin, instead of relying on PATH.
After the barrier, the builtin.mk file is parsed with a PATH that includes
LOCALBASE in front, which gives wrong results if file is installed in
LOCALBASE.

diffstat:

 sysutils/file/builtin.mk |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 22f04fb5cf61 -r 9bf38d9a082e sysutils/file/builtin.mk
--- a/sysutils/file/builtin.mk  Mon Mar 09 16:59:44 2009 +0000
+++ b/sysutils/file/builtin.mk  Mon Mar 09 17:47:36 2009 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: builtin.mk,v 1.5 2008/10/29 20:50:16 christos Exp $
+# $NetBSD: builtin.mk,v 1.6 2009/03/09 17:47:36 cube Exp $
 
 BUILTIN_PKG:=  file
 
-BUILTIN_FIND_FILES_VAR:=       H_FILE
+BUILTIN_FIND_FILES_VAR:=       H_FILE BIN_FILE
 BUILTIN_FIND_FILES.H_FILE=     /usr/include/magic.h
 BUILTIN_FIND_GREP.H_FILE=      magic_file
+BUILTIN_FIND_FILES.BIN_FILE=   /bin/file /usr/bin/file
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
@@ -17,13 +18,19 @@
 .  if empty(H_FILE:M__nonexistent__) && empty(H_FILE:M${LOCALBASE}/*)
 IS_BUILTIN.file=       yes
 .  endif
+.  if empty(BIN_FILE:M__nonexistent__) && empty(BIN_FILE:M{LOCALBASE}/*)
+BUILTIN_CMD.file=      ${BIN_FILE}
+.  else
+BUILTIN_CMD.file=      file
+.  endif
 .endif
 MAKEVARS+=     IS_BUILTIN.file
 
 .if !defined(BUILTIN_PKG.file) && !empty(IS_BUILTIN.file:M[yY][eE][sS])
-BUILTIN_VERSION.file!= file --version 2>&1 | ${GREP} 'file-' | ${SED} 's/file-//'
+BUILTIN_VERSION.file!= ${BUILTIN_CMD.file} --version 2>&1 | ${GREP} 'file-' | ${SED} 's/file-//'
 BUILTIN_PKG.file=      file-${BUILTIN_VERSION.file}
 .endif
+MAKEVARS+=     BUILTIN_PKG.file
 
 ###
 ### Determine whether we should use the built-in implementation if it