Sat Nov 23 10:51:09 2013 UTC ()
Use find-headers instead of find-files to detect builtin header files.


(obache)
diff -r1.8 -r1.9 pkgsrc/archivers/bzip2/builtin.mk
diff -r1.4 -r1.5 pkgsrc/archivers/libarchive/builtin.mk
diff -r1.2 -r1.3 pkgsrc/archivers/xz/builtin.mk
cvs diff -r1.8 -r1.9 pkgsrc/archivers/bzip2/builtin.mk (expand / switch to unified diff)

--- pkgsrc/archivers/bzip2/builtin.mk 2010/07/06 23:35:01 1.8
+++ pkgsrc/archivers/bzip2/builtin.mk 2013/11/23 10:51:09 1.9
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: builtin.mk,v 1.8 2010/07/06 23:35:01 obache Exp $ 1# $NetBSD: builtin.mk,v 1.9 2013/11/23 10:51:09 obache Exp $
2 2
3BUILTIN_PKG:= bzip2 3BUILTIN_PKG:= bzip2
4 4
5BUILTIN_FIND_FILES_VAR:= H_BZIP2 5BUILTIN_FIND_HEADERS_VAR:= H_BZIP2
6BUILTIN_FIND_FILES.H_BZIP2= /usr/include/bzlib.h \ 6BUILTIN_FIND_HEADERS.H_BZIP2= bzlib.h
7 /boot/common/include/bzlib.h 
8BUILTIN_FIND_GREP.H_BZIP2= BZ2_ 7BUILTIN_FIND_GREP.H_BZIP2= BZ2_
9 8
10.include "../../mk/buildlink3/bsd.builtin.mk" 9.include "../../mk/buildlink3/bsd.builtin.mk"
11 10
12### 11###
13### Determine if there is a built-in implementation of the package and 12### Determine if there is a built-in implementation of the package and
14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 13### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
15### 14###
16.if !defined(IS_BUILTIN.bzip2) 15.if !defined(IS_BUILTIN.bzip2)
17IS_BUILTIN.bzip2= no 16IS_BUILTIN.bzip2= no
18. if empty(H_BZIP2:M__nonexistent__) && empty(H_BZIP2:M${LOCALBASE}/*) 17. if empty(H_BZIP2:M__nonexistent__) && empty(H_BZIP2:M${LOCALBASE}/*)
19IS_BUILTIN.bzip2= yes 18IS_BUILTIN.bzip2= yes
20. endif 19. endif
cvs diff -r1.4 -r1.5 pkgsrc/archivers/libarchive/builtin.mk (expand / switch to unified diff)

--- pkgsrc/archivers/libarchive/builtin.mk 2011/10/27 04:23:50 1.4
+++ pkgsrc/archivers/libarchive/builtin.mk 2013/11/23 10:51:09 1.5
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: builtin.mk,v 1.4 2011/10/27 04:23:50 joerg Exp $ 1# $NetBSD: builtin.mk,v 1.5 2013/11/23 10:51:09 obache Exp $
2 2
3BUILTIN_PKG:= libarchive 3BUILTIN_PKG:= libarchive
4 4
5BUILTIN_FIND_FILES_VAR:= H_ARCHIVE 5BUILTIN_FIND_HEADERS_VAR:= H_ARCHIVE
6BUILTIN_FIND_FILES.H_ARCHIVE= /usr/include/archive.h 6BUILTIN_FIND_HEADERS.H_ARCHIVE= archive.h
7 7
8.include "../../mk/buildlink3/bsd.builtin.mk" 8.include "../../mk/buildlink3/bsd.builtin.mk"
9 9
10### 10###
11### Determine if there is a built-in implementation of the package and 11### Determine if there is a built-in implementation of the package and
12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
13### 13###
14.if !defined(IS_BUILTIN.libarchive) 14.if !defined(IS_BUILTIN.libarchive)
15IS_BUILTIN.libarchive= no 15IS_BUILTIN.libarchive= no
16. if empty(H_ARCHIVE:M__nonexistent__) && empty(H_ARCHIVE:M${LOCALBASE}/*) 16. if empty(H_ARCHIVE:M__nonexistent__) && empty(H_ARCHIVE:M${LOCALBASE}/*)
17IS_BUILTIN.libarchive= yes 17IS_BUILTIN.libarchive= yes
18. endif 18. endif
19.endif 19.endif
cvs diff -r1.2 -r1.3 pkgsrc/archivers/xz/builtin.mk (expand / switch to unified diff)

--- pkgsrc/archivers/xz/builtin.mk 2011/02/09 09:12:16 1.2
+++ pkgsrc/archivers/xz/builtin.mk 2013/11/23 10:51:09 1.3
@@ -1,22 +1,20 @@ @@ -1,22 +1,20 @@
1# $NetBSD: builtin.mk,v 1.2 2011/02/09 09:12:16 adam Exp $ 1# $NetBSD: builtin.mk,v 1.3 2013/11/23 10:51:09 obache Exp $
2 2
3BUILTIN_PKG:= xz 3BUILTIN_PKG:= xz
4 4
5BUILTIN_FIND_FILES_VAR:= H_LZMA H_LZMA_VERSION 5BUILTIN_FIND_HEADERS_VAR:= H_LZMA H_LZMA_VERSION
6BUILTIN_FIND_FILES.H_LZMA= /usr/include/lzma.h \ 6BUILTIN_FIND_HEADERS.H_LZMA= lzma.h
7 /boot/common/include/lzma.h 7BUILTIN_FIND_HEADERS.H_LZMA_VERSION=lzma/version.h
8BUILTIN_FIND_FILES.H_LZMA_VERSION=/usr/include/lzma/version.h \ 
9 /boot/common/include/lzma/version.h 
10BUILTIN_FIND_GREP.H_LZMA= LZMA_ 8BUILTIN_FIND_GREP.H_LZMA= LZMA_
11 9
12.include "../../mk/buildlink3/bsd.builtin.mk" 10.include "../../mk/buildlink3/bsd.builtin.mk"
13 11
14### 12###
15### Determine if there is a built-in implementation of the package and 13### Determine if there is a built-in implementation of the package and
16### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
17### 15###
18.if !defined(IS_BUILTIN.xz) 16.if !defined(IS_BUILTIN.xz)
19IS_BUILTIN.xz= no 17IS_BUILTIN.xz= no
20. if empty(H_LZMA:M__nonexistent__) && empty(H_LZMA:M${LOCALBASE}/*) 18. if empty(H_LZMA:M__nonexistent__) && empty(H_LZMA:M${LOCALBASE}/*)
21IS_BUILTIN.xz= yes 19IS_BUILTIN.xz= yes
22. endif 20. endif