Use find-headers instead of find-files to detect builtin header files.

9 files changed, 33 insertions, 37 deletions

diff --git a/mk/curses.builtin.mk b/mk/curses.builtin.mk
index e6f7ee1e674..b2bc27c09bc 100644
--- a/mk/curses.builtin.mk
+++ b/mk/curses.builtin.mk
@@ -1,11 +1,10 @@
-# $NetBSD: curses.builtin.mk,v 1.6 2013/04/21 07:53:14 obache Exp $
+# $NetBSD: curses.builtin.mk,v 1.7 2013/11/23 09:10:14 obache Exp $
 
 BUILTIN_PKG:=	curses
 
 BUILTIN_FIND_LIBS:=		curses
-BUILTIN_FIND_FILES_VAR:=	H_CURSES
-BUILTIN_FIND_FILES.H_CURSES=	/usr/include/curses.h
-BUILTIN_FIND_FILES.H_CURSES+=	/boot/develop/headers/3rdparty/curses.h
+BUILTIN_FIND_HEADERS_VAR:=	H_CURSES
+BUILTIN_FIND_HEADERS.H_CURSES=	curses.h
 
 .include "buildlink3/bsd.builtin.mk"
 
diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk
index 0f3072b8bef..1aae17f498f 100644
--- a/mk/db1.builtin.mk
+++ b/mk/db1.builtin.mk
@@ -1,10 +1,10 @@
-# $NetBSD: db1.builtin.mk,v 1.22 2012/02/05 12:16:56 obache Exp $
+# $NetBSD: db1.builtin.mk,v 1.23 2013/11/23 09:10:14 obache Exp $
 
 BUILTIN_PKG:=	db1
 
 BUILTIN_FIND_LIBS:=		db1 db
-BUILTIN_FIND_FILES_VAR:=	H_DB
-BUILTIN_FIND_FILES.H_DB=	/usr/include/db1/db.h /usr/include/db.h
+BUILTIN_FIND_HEADERS_VAR:=	H_DB
+BUILTIN_FIND_HEADERS.H_DB=	db1/db.h db.h
 #
 # The builtin Berkeley database library must support hash version 2 or
 # else it doesn't support db-1.85 databases.
diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk
index ab1fb57fb79..660a477447a 100644
--- a/mk/dlopen.builtin.mk
+++ b/mk/dlopen.builtin.mk
@@ -1,12 +1,10 @@
-# $NetBSD: dlopen.builtin.mk,v 1.26 2013/11/01 11:58:48 jperkin Exp $
+# $NetBSD: dlopen.builtin.mk,v 1.27 2013/11/23 09:10:14 obache Exp $
 
 BUILTIN_PKG:=	dl
 
 BUILTIN_FIND_LIBS:=		dl
-BUILTIN_FIND_FILES_VAR:=	H_DL
-BUILTIN_FIND_FILES.H_DL=	/usr/include/dlfcn.h			\
-				/opt/gcc.3.3/include/dlfcn.h		\
-				/boot/develop/headers/posix/dlfcn.h
+BUILTIN_FIND_HEADERS_VAR:=	H_DL
+BUILTIN_FIND_HEADERS.H_DL=	dlfcn.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/mk/oss.builtin.mk b/mk/oss.builtin.mk
index b56f14f4a9b..d037c296d64 100644
--- a/mk/oss.builtin.mk
+++ b/mk/oss.builtin.mk
@@ -1,11 +1,11 @@
-# $NetBSD: oss.builtin.mk,v 1.3 2009/03/17 22:13:36 rillig Exp $
+# $NetBSD: oss.builtin.mk,v 1.4 2013/11/23 09:10:14 obache Exp $
 
 BUILTIN_PKG:=	oss
 
 BUILTIN_FIND_LIBS:=		ossaudio
-BUILTIN_FIND_FILES_VAR:=	H_SOUNDCARD
-BUILTIN_FIND_FILES.H_SOUNDCARD=	/usr/include/soundcard.h		\
-				/usr/include/sys/soundcard.h
+BUILTIN_FIND_HEADERS_VAR:=	H_SOUNDCARD
+BUILTIN_FIND_HEADERS.H_SOUNDCARD=	soundcard.h		\
+					sys/soundcard.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/mk/pthread.builtin.mk b/mk/pthread.builtin.mk
index 3c7f8a305c7..883f91066c7 100644
--- a/mk/pthread.builtin.mk
+++ b/mk/pthread.builtin.mk
@@ -1,11 +1,10 @@
-# $NetBSD: pthread.builtin.mk,v 1.14 2013/10/12 06:24:49 richard Exp $
+# $NetBSD: pthread.builtin.mk,v 1.15 2013/11/23 09:10:14 obache Exp $
 
 BUILTIN_PKG:=	pthread
 
 BUILTIN_FIND_LIBS:=		pthread c_r rt
-BUILTIN_FIND_FILES_VAR=		H_PTHREAD
-BUILTIN_FIND_FILES.H_PTHREAD=	/usr/include/pthread.h	\
-				/boot/develop/headers/posix/pthread.h
+BUILTIN_FIND_HEADERS_VAR=	H_PTHREAD
+BUILTIN_FIND_HEADERS.H_PTHREAD=	pthread.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/mk/readline.builtin.mk b/mk/readline.builtin.mk
index 9f43e5cfe02..50591e3390f 100644
--- a/mk/readline.builtin.mk
+++ b/mk/readline.builtin.mk
@@ -1,14 +1,14 @@
-# $NetBSD: readline.builtin.mk,v 1.3 2013/07/19 14:35:37 ryoon Exp $
+# $NetBSD: readline.builtin.mk,v 1.4 2013/11/23 09:10:14 obache Exp $
 #
 
 BUILTIN_PKG:=	editlinereadline
 
 BUILTIN_FIND_LIBS:=		edit readline history
-BUILTIN_FIND_FILES_VAR:=	H_EDITLINE H_READLINE
-BUILTIN_FIND_FILES.H_READLINE=	/usr/include/readline/readline.h	\
-				/usr/include/readline.h
-BUILTIN_FIND_FILES.H_EDITLINE=	/usr/include/editline/readline.h	\
-				/usr/include/readline/readline.h
+BUILTIN_FIND_HEADERS_VAR:=	H_EDITLINE H_READLINE
+BUILTIN_FIND_HEADERS.H_READLINE=	readline/readline.h	\
+					readline.h
+BUILTIN_FIND_HEADERS.H_EDITLINE=	editline/readline.h	\
+					readline/readline.h
 BUILTIN_FIND_GREP.H_EDITLINE=	NetBSD
 BUILTIN_FIND_GREP.H_READLINE=	\#define[ 	]*RL_VERSION_MAJOR
 
diff --git a/mk/solaris-pam.builtin.mk b/mk/solaris-pam.builtin.mk
index 025a4da5d97..48e47f696c5 100644
--- a/mk/solaris-pam.builtin.mk
+++ b/mk/solaris-pam.builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: solaris-pam.builtin.mk,v 1.4 2006/04/06 06:23:06 reed Exp $
+# $NetBSD: solaris-pam.builtin.mk,v 1.5 2013/11/23 09:10:14 obache Exp $
 
 BUILTIN_PKG:=	solaris-pam
 
-BUILTIN_FIND_FILES_VAR:=		H_SOLARIS_PAM
-BUILTIN_FIND_FILES.H_SOLARIS_PAM=	/usr/include/security/pam_appl.h
+BUILTIN_FIND_HEADERS_VAR:=		H_SOLARIS_PAM
+BUILTIN_FIND_HEADERS.H_SOLARIS_PAM=	security/pam_appl.h
 BUILTIN_FIND_GREP.H_SOLARIS_PAM=	Copyright.*Sun Microsystems
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/mk/termcap.builtin.mk b/mk/termcap.builtin.mk
index 5568dc2b759..12be8f5509b 100644
--- a/mk/termcap.builtin.mk
+++ b/mk/termcap.builtin.mk
@@ -1,14 +1,14 @@
-# $NetBSD: termcap.builtin.mk,v 1.9 2013/06/17 05:44:27 obache Exp $
+# $NetBSD: termcap.builtin.mk,v 1.10 2013/11/23 09:10:14 obache Exp $
 
 BUILTIN_PKG:=	termcap
 
 BUILTIN_FIND_LIBS:=		terminfo curses termcap termlib tinfo
-BUILTIN_FIND_FILES_VAR:=	H_TERM H_TERMCAP H_TERMLIB
-BUILTIN_FIND_FILES.H_TERM:=	/usr/include/term.h
+BUILTIN_FIND_HEADERS_VAR:=	H_TERM H_TERMCAP H_TERMLIB
+BUILTIN_FIND_HEADERS.H_TERM:=	term.h
 BUILTIN_FIND_GREP.H_TERM:=	tgetent
-BUILTIN_FIND_FILES.H_TERMCAP:=	/usr/include/termcap.h
+BUILTIN_FIND_HEADERS.H_TERMCAP:=	termcap.h
 BUILTIN_FIND_GREP.H_TERMCAP:=	tgetent
-BUILTIN_FIND_FILES.H_TERMLIB:=	/usr/include/termlib.h
+BUILTIN_FIND_HEADERS.H_TERMLIB:=	termlib.h
 BUILTIN_FIND_GREP.H_TERMLIB:=	tgetent
 
 .include "buildlink3/bsd.builtin.mk"
diff --git a/mk/terminfo.builtin.mk b/mk/terminfo.builtin.mk
index 29684cdc281..ea45223160d 100644
--- a/mk/terminfo.builtin.mk
+++ b/mk/terminfo.builtin.mk
@@ -1,10 +1,10 @@
-# $NetBSD: terminfo.builtin.mk,v 1.4 2013/11/19 11:40:39 obache Exp $
+# $NetBSD: terminfo.builtin.mk,v 1.5 2013/11/23 09:10:14 obache Exp $
 
 BUILTIN_PKG:=	terminfo
 
 BUILTIN_FIND_LIBS:=		terminfo curses tinfo
-BUILTIN_FIND_FILES_VAR:=	H_TERM
-BUILTIN_FIND_FILES.H_TERM:=	/usr/include/term.h
+BUILTIN_FIND_HEADERS_VAR:=	H_TERM
+BUILTIN_FIND_HEADERS.H_TERM:=	term.h
 BUILTIN_FIND_GREP.H_TERM:=	tigetstr
 
 .include "buildlink3/bsd.builtin.mk"