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

22 files changed, 80 insertions, 86 deletions

diff --git a/archivers/bzip2/builtin.mk b/archivers/bzip2/builtin.mk
index 156535c272a..04f75d74784 100644
--- a/archivers/bzip2/builtin.mk
+++ b/archivers/bzip2/builtin.mk
@@ -1,10 +1,9 @@
-# $NetBSD: builtin.mk,v 1.8 2010/07/06 23:35:01 obache Exp $
+# $NetBSD: builtin.mk,v 1.9 2013/11/23 10:51:09 obache Exp $
 
 BUILTIN_PKG:=	bzip2
 
-BUILTIN_FIND_FILES_VAR:=	H_BZIP2
-BUILTIN_FIND_FILES.H_BZIP2=	/usr/include/bzlib.h \
-				/boot/common/include/bzlib.h
+BUILTIN_FIND_HEADERS_VAR:=	H_BZIP2
+BUILTIN_FIND_HEADERS.H_BZIP2=	bzlib.h
 BUILTIN_FIND_GREP.H_BZIP2=	BZ2_
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/archivers/libarchive/builtin.mk b/archivers/libarchive/builtin.mk
index 810799bed02..7dc1547ef6b 100644
--- a/archivers/libarchive/builtin.mk
+++ b/archivers/libarchive/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.4 2011/10/27 04:23:50 joerg Exp $
+# $NetBSD: builtin.mk,v 1.5 2013/11/23 10:51:09 obache Exp $
 
 BUILTIN_PKG:=	libarchive
 
-BUILTIN_FIND_FILES_VAR:=	H_ARCHIVE
-BUILTIN_FIND_FILES.H_ARCHIVE=	/usr/include/archive.h
+BUILTIN_FIND_HEADERS_VAR:=	H_ARCHIVE
+BUILTIN_FIND_HEADERS.H_ARCHIVE=	archive.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/archivers/xz/builtin.mk b/archivers/xz/builtin.mk
index 101a842389c..84c890139d5 100644
--- a/archivers/xz/builtin.mk
+++ b/archivers/xz/builtin.mk
@@ -1,12 +1,10 @@
-# $NetBSD: builtin.mk,v 1.2 2011/02/09 09:12:16 adam Exp $
+# $NetBSD: builtin.mk,v 1.3 2013/11/23 10:51:09 obache Exp $
 
 BUILTIN_PKG:=	xz
 
-BUILTIN_FIND_FILES_VAR:=	H_LZMA H_LZMA_VERSION
-BUILTIN_FIND_FILES.H_LZMA=	/usr/include/lzma.h \
-				/boot/common/include/lzma.h
-BUILTIN_FIND_FILES.H_LZMA_VERSION=/usr/include/lzma/version.h \
-				/boot/common/include/lzma/version.h
+BUILTIN_FIND_HEADERS_VAR:=	H_LZMA H_LZMA_VERSION
+BUILTIN_FIND_HEADERS.H_LZMA=	lzma.h
+BUILTIN_FIND_HEADERS.H_LZMA_VERSION=lzma/version.h
 BUILTIN_FIND_GREP.H_LZMA=	LZMA_
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk
index 054a4565647..d23c2a9565f 100644
--- a/converters/libiconv/builtin.mk
+++ b/converters/libiconv/builtin.mk
@@ -1,16 +1,14 @@
-# $NetBSD: builtin.mk,v 1.22 2011/01/16 11:16:28 wiz Exp $
+# $NetBSD: builtin.mk,v 1.23 2013/11/23 10:58:46 obache Exp $
 
 BUILTIN_PKG:=	iconv
 
 BUILTIN_FIND_LIBS:=			iconv
-BUILTIN_FIND_FILES_VAR:=		H_ICONV H_GLIBC_ICONV H_CITRUS_ICONV
-BUILTIN_FIND_FILES.H_ICONV=		/usr/include/iconv.h \
-					/boot/common/include/iconv.h
+BUILTIN_FIND_HEADERS_VAR:=		H_ICONV H_GLIBC_ICONV H_CITRUS_ICONV
+BUILTIN_FIND_HEADERS.H_ICONV=		iconv.h
 BUILTIN_FIND_GREP.H_ICONV=		GNU LIBICONV Library
-BUILTIN_FIND_FILES.H_GLIBC_ICONV=	/usr/include/iconv.h \
-					/boot/common/include/iconv.h
+BUILTIN_FIND_HEADERS.H_GLIBC_ICONV=	iconv.h
 BUILTIN_FIND_GREP.H_GLIBC_ICONV=	This file is part of the GNU C Library
-BUILTIN_FIND_FILES.H_CITRUS_ICONV=	/usr/include/iconv.h
+BUILTIN_FIND_HEADERS.H_CITRUS_ICONV=	iconv.h
 BUILTIN_FIND_GREP.H_CITRUS_ICONV=	Copyright.*Citrus Project
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/databases/gdbm/builtin.mk b/databases/gdbm/builtin.mk
index 2cfccbf5a5b..4a099e1aec5 100644
--- a/databases/gdbm/builtin.mk
+++ b/databases/gdbm/builtin.mk
@@ -1,8 +1,8 @@
-# $NetBSD: builtin.mk,v 1.1 2011/12/03 08:44:21 sbd Exp $
+# $NetBSD: builtin.mk,v 1.2 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=			gdbm
-BUILTIN_FIND_FILES_VAR=		GDBM_H
-BUILTIN_FIND_FILES.GDBM_H=	/usr/include/gdbm.h
+BUILTIN_FIND_HEADERS_VAR=	GDBM_H
+BUILTIN_FIND_HEADERS.GDBM_H=	gdbm.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/databases/gdbm_compat/builtin.mk b/databases/gdbm_compat/builtin.mk
index 1b1c6c3f15a..716b436435f 100644
--- a/databases/gdbm_compat/builtin.mk
+++ b/databases/gdbm_compat/builtin.mk
@@ -1,8 +1,8 @@
-# $NetBSD: builtin.mk,v 1.3 2013/04/08 11:17:10 rodent Exp $
+# $NetBSD: builtin.mk,v 1.4 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=			gdbm_compat
-BUILTIN_FIND_FILES_VAR=		NDBM_H
-BUILTIN_FIND_FILES.NDBM_H=	/usr/include/ndbm.h
+BUILTIN_FIND_HEADERS_VAR=	NDBM_H
+BUILTIN_FIND_HEADERS.NDBM_H=	ndbm.h
 BUILTIN_FIND_GREP.NDBM_H=	This file is part of GDBM
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/devel/argp/builtin.mk b/devel/argp/builtin.mk
index abe67454a26..b03761eaa02 100644
--- a/devel/argp/builtin.mk
+++ b/devel/argp/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.1 2007/12/22 01:40:21 joerg Exp $
+# $NetBSD: builtin.mk,v 1.2 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	argp
 
-BUILTIN_FIND_FILES_VAR:=	H_ARGP
-BUILTIN_FIND_FILES.H_ARGP=	/usr/include/argp.h
+BUILTIN_FIND_HEADERS_VAR:=	H_ARGP
+BUILTIN_FIND_HEADERS.H_ARGP=	argp.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/devel/cdk/builtin.mk b/devel/cdk/builtin.mk
index 145e3e7bd53..44cde5cbe84 100644
--- a/devel/cdk/builtin.mk
+++ b/devel/cdk/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:21:47 reed Exp $
+# $NetBSD: builtin.mk,v 1.5 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	cdk
 
-BUILTIN_FIND_FILES_VAR:=	H_CDK
-BUILTIN_FIND_FILES.H_CDK=	/usr/include/cdk/cdk.h
+BUILTIN_FIND_HEADERS_VAR:=	H_CDK
+BUILTIN_FIND_HEADERS.H_CDK=	cdk/cdk.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/devel/dlcompat/builtin.mk b/devel/dlcompat/builtin.mk
index 5e8dceff9f3..12d66b98c36 100644
--- a/devel/dlcompat/builtin.mk
+++ b/devel/dlcompat/builtin.mk
@@ -1,10 +1,10 @@
-# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:48 reed Exp $
+# $NetBSD: builtin.mk,v 1.10 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	dlcompat
 
 BUILTIN_FIND_LIBS:=		dl
-BUILTIN_FIND_FILES_VAR:=	H_DLFCN
-BUILTIN_FIND_FILES.H_DLFCN=	/usr/include/dlfcn.h
+BUILTIN_FIND_HEADERS_VAR:=	H_DLFCN
+BUILTIN_FIND_HEADERS.H_DLFCN=	dlfcn.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/devel/editline/builtin.mk b/devel/editline/builtin.mk
index dac95251040..5ee1d0f0713 100644
--- a/devel/editline/builtin.mk
+++ b/devel/editline/builtin.mk
@@ -1,11 +1,11 @@
-# $NetBSD: builtin.mk,v 1.3 2013/08/11 07:41:04 obache Exp $
+# $NetBSD: builtin.mk,v 1.4 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	editline
 
 BUILTIN_FIND_LIBS:=		edit
-BUILTIN_FIND_FILES_VAR:=	H_EDITLINE
-BUILTIN_FIND_FILES.H_EDITLINE=	/usr/include/editline/readline.h \
-				/usr/include/readline/readline.h
+BUILTIN_FIND_HEADERS_VAR:=	H_EDITLINE
+BUILTIN_FIND_HEADERS.H_EDITLINE=editline/readline.h \
+				readline/readline.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index ce4149ae9b6..bbb5369be40 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,17 +1,17 @@
-# $NetBSD: builtin.mk,v 1.43 2013/05/03 01:57:11 obache Exp $
+# $NetBSD: builtin.mk,v 1.44 2013/11/23 11:29:35 obache Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
 BUILTIN_PKG:=	gettext
 
 BUILTIN_FIND_LIBS:=			intl
-BUILTIN_FIND_FILES_VAR:=		H_GETTEXT H_GENTOO_GETTEXT	\
+BUILTIN_FIND_HEADERS_VAR:=		H_GETTEXT H_GENTOO_GETTEXT	\
 					H_NGETTEXT_GETTEXT
-BUILTIN_FIND_FILES.H_GETTEXT=		/usr/include/libintl.h
+BUILTIN_FIND_HEADERS.H_GETTEXT=		libintl.h
 BUILTIN_FIND_GREP.H_GETTEXT=		\#define[ 	]*__USE_GNU_GETTEXT
-BUILTIN_FIND_FILES.H_GENTOO_GETTEXT=	/usr/include/libintl.h
+BUILTIN_FIND_HEADERS.H_GENTOO_GETTEXT=	libintl.h
 BUILTIN_FIND_GREP.H_GENTOO_GETTEXT=	gentoo-multilib/.*/libintl.h
-BUILTIN_FIND_FILES.H_NGETTEXT_GETTEXT=	/usr/include/libintl.h
+BUILTIN_FIND_HEADERS.H_NGETTEXT_GETTEXT=libintl.h
 BUILTIN_FIND_GREP.H_NGETTEXT_GETTEXT=	char.*ngettext
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/devel/libevent/builtin.mk b/devel/libevent/builtin.mk
index e5a85607692..332a609fb7b 100644
--- a/devel/libevent/builtin.mk
+++ b/devel/libevent/builtin.mk
@@ -1,10 +1,10 @@
-# $NetBSD: builtin.mk,v 1.11 2011/10/03 11:48:11 adam Exp $
+# $NetBSD: builtin.mk,v 1.12 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	libevent
 
-BUILTIN_FIND_FILES_VAR:=	H_LIBEVENT H_LIBEVENTCONFIG
-BUILTIN_FIND_FILES.H_LIBEVENT=	/usr/include/event.h
-BUILTIN_FIND_FILES.H_LIBEVENTCONFIG= /usr/include/event-config.h
+BUILTIN_FIND_HEADERS_VAR:=		H_LIBEVENT H_LIBEVENTCONFIG
+BUILTIN_FIND_HEADERS.H_LIBEVENT=	event.h
+BUILTIN_FIND_HEADERS.H_LIBEVENTCONFIG=	event-config.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/devel/libexecinfo/builtin.mk b/devel/libexecinfo/builtin.mk
index 6a1039684ce..fe884cf2c8a 100644
--- a/devel/libexecinfo/builtin.mk
+++ b/devel/libexecinfo/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.1 2013/07/03 14:47:04 ryoon Exp $
+# $NetBSD: builtin.mk,v 1.2 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	libexecinfo
 
-BUILTIN_FIND_FILES_VAR:=	H_EXECINFO
-BUILTIN_FIND_FILES.H_EXECINFO=	/usr/include/execinfo.h
+BUILTIN_FIND_HEADERS_VAR:=		H_EXECINFO
+BUILTIN_FIND_HEADERS.H_EXECINFO=	execinfo.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/devel/libgetopt/builtin.mk b/devel/libgetopt/builtin.mk
index daa285eb9ba..91146005443 100644
--- a/devel/libgetopt/builtin.mk
+++ b/devel/libgetopt/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:21:51 reed Exp $
+# $NetBSD: builtin.mk,v 1.7 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	getopt
 
-BUILTIN_FIND_FILES_VAR:=	H_GETOPT
-BUILTIN_FIND_FILES.H_GETOPT=	/usr/include/getopt.h
+BUILTIN_FIND_HEADERS_VAR:=	H_GETOPT
+BUILTIN_FIND_HEADERS.H_GETOPT=	getopt.h
 BUILTIN_FIND_GREP.H_GETOPT=	int.*getopt_long
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/devel/libuuid/builtin.mk b/devel/libuuid/builtin.mk
index 80f27e087c9..27a85a1ab79 100644
--- a/devel/libuuid/builtin.mk
+++ b/devel/libuuid/builtin.mk
@@ -1,10 +1,11 @@
-# $NetBSD: builtin.mk,v 1.4 2012/01/11 13:28:45 hans Exp $
+# $NetBSD: builtin.mk,v 1.5 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	libuuid
 
-BUILTIN_FIND_FILES_VAR=		UUID_PC H_UUID
+BUILTIN_FIND_FILES_VAR=		UUID_PC
 BUILTIN_FIND_FILES.UUID_PC=	/usr/lib/pkgconfig/uuid.pc
-BUILTIN_FIND_FILES.H_UUID=	/usr/include/uuid/uuid.h
+BUILTIN_FIND_HEADERS_VAR=	H_UUID
+BUILTIN_FIND_HEADERS.H_UUID=	uuid/uuid.h
 BUILTIN_FIND_GREP.H_UUID=	uuid_generate
 BUILTIN_FIND_LIBS:=		uuid
 
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index 741ef047945..642a6d39f12 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.33 2013/08/21 14:27:30 richard Exp $
+# $NetBSD: builtin.mk,v 1.34 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	ncurses
 
@@ -6,14 +6,13 @@ BUILTIN_PKG:=	ncurses
 #
 
 BUILTIN_FIND_LIBS:=		ncurses curses terminfo
-BUILTIN_FIND_FILES_VAR:=	H_NCURSES H_CURSES H_CURSES1
-BUILTIN_FIND_FILES.H_NCURSES=	/usr/include/ncurses.h /usr/include/curses.h
-#BUILTIN_FIND_FILES.H_NCURSES+=	/usr/include/ncurses/curses.h
-BUILTIN_FIND_FILES.H_NCURSES+=	/boot/develop/headers/3rdparty/curses.h
+BUILTIN_FIND_HEADERS_VAR:=	H_NCURSES H_CURSES H_CURSES1
+BUILTIN_FIND_HEADERS.H_NCURSES=	ncurses.h curses.h
+#BUILTIN_FIND_HEADERS.H_NCURSES+=	ncurses/curses.h
 BUILTIN_FIND_GREP.H_NCURSES=	\#define[ 	]*NCURSES_VERSION
-BUILTIN_FIND_FILES.H_CURSES=	/usr/include/ncurses.h /usr/include/curses.h
+BUILTIN_FIND_HEADERS.H_CURSES=	ncurses.h curses.h
 BUILTIN_FIND_GREP.H_CURSES=	mvwchgat
-BUILTIN_FIND_FILES.H_CURSES1=	/usr/include/ncurses.h /usr/include/curses.h
+BUILTIN_FIND_HEADERS.H_CURSES1=	ncurses.h curses.h
 BUILTIN_FIND_GREP.H_CURSES1=	wsyncup
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/devel/ncursesw/builtin.mk b/devel/ncursesw/builtin.mk
index 9c4ed179c20..7084c45a432 100644
--- a/devel/ncursesw/builtin.mk
+++ b/devel/ncursesw/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2011/02/28 11:02:46 adam Exp $
+# $NetBSD: builtin.mk,v 1.11 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	ncursesw
 
@@ -8,11 +8,11 @@ BUILTIN_PKG:=	ncursesw
 # XXX Need to deal with Solaris <curses.h>
 #
 BUILTIN_FIND_LIBS:=			ncursesw curses
-BUILTIN_FIND_FILES_VAR:=		H_NB_CURSESW H_NCURSESW
-BUILTIN_FIND_FILES.H_NB_CURSESW=	/usr/include/curses.h
+BUILTIN_FIND_HEADERS_VAR:=		H_NB_CURSESW H_NCURSESW
+BUILTIN_FIND_HEADERS.H_NB_CURSESW=	curses.h
 BUILTIN_FIND_GREP.H_NB_CURSESW=		\#ifdef[ 	]*HAVE_WCHAR
-BUILTIN_FIND_FILES.H_NCURSESW=		/usr/include/ncursesw/curses.h	\
-					/usr/include/curses.h
+BUILTIN_FIND_HEADERS.H_NCURSESW=	ncursesw/curses.h	\
+					curses.h
 BUILTIN_FIND_GREP.H_NCURSESW=		\Id: curses.wide,v
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk
index e9baced43a7..4abf8ef2853 100644
--- a/devel/readline/builtin.mk
+++ b/devel/readline/builtin.mk
@@ -1,11 +1,11 @@
-# $NetBSD: builtin.mk,v 1.19 2013/07/19 14:35:37 ryoon Exp $
+# $NetBSD: builtin.mk,v 1.20 2013/11/23 11:29:35 obache Exp $
 
 BUILTIN_PKG:=	readline
 
 BUILTIN_FIND_LIBS:=		readline history
-BUILTIN_FIND_FILES_VAR:=	H_READLINE _BLTN_H_READLINE
-BUILTIN_FIND_FILES.H_READLINE=	/usr/include/readline/readline.h	\
-				/usr/include/readline.h
+BUILTIN_FIND_HEADERS_VAR:=	H_READLINE _BLTN_H_READLINE
+BUILTIN_FIND_HEADERS.H_READLINE=readline/readline.h	\
+				readline.h
 BUILTIN_FIND_GREP.H_READLINE=	\#define[ 	]*RL_VERSION_MAJOR
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/devel/sysexits/builtin.mk b/devel/sysexits/builtin.mk
index dc0145156d0..af87905a9ac 100644
--- a/devel/sysexits/builtin.mk
+++ b/devel/sysexits/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
+# $NetBSD: builtin.mk,v 1.4 2013/11/23 11:29:36 obache Exp $
 
 BUILTIN_PKG:=	sysexits
 
-BUILTIN_FIND_FILES_VAR:=	H_SYSEXITS
-BUILTIN_FIND_FILES.H_SYSEXITS=	/usr/include/sysexits.h
+BUILTIN_FIND_HEADERS_VAR:=	H_SYSEXITS
+BUILTIN_FIND_HEADERS.H_SYSEXITS=sysexits.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/devel/zlib/builtin.mk b/devel/zlib/builtin.mk
index c78bee71e5c..9b3ea999f00 100644
--- a/devel/zlib/builtin.mk
+++ b/devel/zlib/builtin.mk
@@ -1,10 +1,9 @@
-# $NetBSD: builtin.mk,v 1.8 2010/12/14 19:51:45 abs Exp $
+# $NetBSD: builtin.mk,v 1.9 2013/11/23 11:29:36 obache Exp $
 
 BUILTIN_PKG:=	zlib
 
-BUILTIN_FIND_FILES_VAR:=	H_ZLIB
-BUILTIN_FIND_FILES.H_ZLIB=	/usr/include/zlib.h \
-				/boot/develop/headers/3rdparty/zlib.h
+BUILTIN_FIND_HEADERS_VAR:=	H_ZLIB
+BUILTIN_FIND_HEADERS.H_ZLIB=	zlib.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/filesystems/perfuse/builtin.mk b/filesystems/perfuse/builtin.mk
index bd7e57e3367..bb6ca5a0726 100644
--- a/filesystems/perfuse/builtin.mk
+++ b/filesystems/perfuse/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.1 2010/12/03 10:15:55 wiz Exp $
+# $NetBSD: builtin.mk,v 1.2 2013/11/23 11:31:47 obache Exp $
 
 BUILTIN_PKG:=	perfuse
 
-BUILTIN_FIND_FILES_VAR:=	H_PERFUSE
-BUILTIN_FIND_FILES.H_PERFUSE=	/usr/include/perfuse.h
+BUILTIN_FIND_HEADERS_VAR:=	H_PERFUSE
+BUILTIN_FIND_HEADERS.H_PERFUSE=	perfuse.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/mail/libmilter/builtin.mk b/mail/libmilter/builtin.mk
index a7553209741..3ffb7173165 100644
--- a/mail/libmilter/builtin.mk
+++ b/mail/libmilter/builtin.mk
@@ -1,10 +1,10 @@
-# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:22:18 reed Exp $
+# $NetBSD: builtin.mk,v 1.6 2013/11/23 11:34:45 obache Exp $
 
 BUILTIN_PKG:=	libmilter
 
 BUILTIN_FIND_LIBS:=		milter
-BUILTIN_FIND_FILES_VAR:=	H_LIBMILTER
-BUILTIN_FIND_FILES.H_LIBMILTER=	/usr/include/libmilter/mfapi.h
+BUILTIN_FIND_HEADERS_VAR:=	H_LIBMILTER
+BUILTIN_FIND_HEADERS.H_LIBMILTER=	libmilter/mfapi.h
 
 .include "../../mk/buildlink3/bsd.builtin.mk"