Revert addition of support for Haiku OS (BEINCLUDES and BELIBRARIES).

Improve a port is not better than break others, and current BUILDLINK3
dose not fit such a environment.
Thanks for tests and reviews after commit.

2 files changed, 8 insertions, 33 deletions

diff --git a/mk/buildlink3/find-files.mk b/mk/buildlink3/find-files.mk
index a711a561a2c..1042f250152 100644
--- a/mk/buildlink3/find-files.mk
+++ b/mk/buildlink3/find-files.mk
@@ -1,4 +1,4 @@
-# $NetBSD: find-files.mk,v 1.7 2010/05/03 05:54:18 wiz Exp $
+# $NetBSD: find-files.mk,v 1.8 2010/05/03 06:58:27 obache Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -83,29 +83,16 @@ USE_TOOLS+=	grep
 .  if !defined(${_var_})
 ${_var_}=	__nonexistent__
 .    for _file_ in ${BUILTIN_FIND_FILES.${_var_}}
-.      if !empty(${_var_}:M__nonexistent__)
-_real_file_=	__nonexistent__
-.        if exists(${_file_})
-_real_file_=	${_file_}
-.        endif
-.        if !empty(_real_file_:M__nonexistent__) && defined(BEINCLUDES) && !empty(BEINCLUDES)
-.          for _try_file_ in ${BEINCLUDES:S/;/ /g:=${_file_:S/\/usr\/include\//\//g}}
-.            if !empty(_real_file_:M__nonexistent__) && exists(${_try_file_})
-_real_file_=	${_try_file_}
-.            endif
-.          endfor
-.        endif
-.        if empty(_real_file_:M__nonexistent__)
-.          if !defined(BUILTIN_FIND_GREP.${_var_})
-${_var_}:=	${_real_file_}
-.          else
+.      if !empty(${_var_}:M__nonexistent__) && exists(${_file_})
+.        if !defined(BUILTIN_FIND_GREP.${_var_})
+${_var_}=	${_file_}
+.        else
 ${_var_}!=								\
-	if ${GREP} -q ${BUILTIN_FIND_GREP.${_var_}:Q} ${_real_file_:Q}; then	\
-		${ECHO} ${_real_file_:Q};				\
+	if ${GREP} -q ${BUILTIN_FIND_GREP.${_var_}:Q} ${_file_:Q}; then	\
+		${ECHO} ${_file_:Q};					\
 	else								\
 		${ECHO} __nonexistent__;				\
 	fi
-.          endif
 .        endif
 .      endif
 .    endfor
diff --git a/mk/buildlink3/find-libs.mk b/mk/buildlink3/find-libs.mk
index f3f4d499116..68592b07584 100644
--- a/mk/buildlink3/find-libs.mk
+++ b/mk/buildlink3/find-libs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: find-libs.mk,v 1.7 2010/05/02 18:32:09 wiz Exp $
+# $NetBSD: find-libs.mk,v 1.8 2010/05/03 06:58:27 obache Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -71,18 +71,6 @@ BUILTIN_LIB_FOUND.${_lib_}!=	\
 	else								\
 		${ECHO} no;						\
 	fi
-.    if BUILTIN_LIB_FOUND.${_lib_}=="no" && defined(BELIBRARIES) && !empty(BELIBRARIES)
-.      for _path_ in ${BELIBRARIES:S/;/ /g}
-.        if BUILTIN_LIB_FOUND.${_lib_} == "no"
-BUILTIN_LIB_FOUND.${_lib_}!=    \
-	if ${TEST} "`${ECHO} ${_path_}/lib${_lib_}.*`" != "${_path_}/lib/lib${_lib_}.*"; then \
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-.        endif
-.      endfor
-.    endif
 .  endif
 MAKEVARS+=	BUILTIN_LIB_FOUND.${_lib_}
 .endfor