summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorobache <obache>2013-11-23 12:10:13 +0000
committerobache <obache>2013-11-23 12:10:13 +0000
commita2273dc9e75a2c632dee6560e6b7083eb0564e4b (patch)
tree170323e52ded4da7ed1f335beacbd2caa4d64eda /security
parenta875a1c6b9f7eeb1ac0613f1ac24f8c6034f7159 (diff)
downloadpkgsrc-a2273dc9e75a2c632dee6560e6b7083eb0564e4b.tar.gz
Use find-headers instead of find-files to detect builtin header files.
Diffstat (limited to 'security')
-rw-r--r--security/PAM/builtin.mk8
-rw-r--r--security/heimdal/builtin.mk7
-rw-r--r--security/libdes/builtin.mk6
-rw-r--r--security/mit-krb5/builtin.mk11
-rw-r--r--security/openpam/builtin.mk6
-rw-r--r--security/openssl/builtin.mk12
-rw-r--r--security/skey/builtin.mk6
-rw-r--r--security/tcp_wrappers/builtin.mk6
8 files changed, 30 insertions, 32 deletions
diff --git a/security/PAM/builtin.mk b/security/PAM/builtin.mk
index 3250e05c4ef..6a13e4274cc 100644
--- a/security/PAM/builtin.mk
+++ b/security/PAM/builtin.mk
@@ -1,10 +1,10 @@
-# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:37 reed Exp $
+# $NetBSD: builtin.mk,v 1.15 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= linux-pam
-BUILTIN_FIND_FILES_VAR:= H_LINUX_PAM
-BUILTIN_FIND_FILES.H_LINUX_PAM= /usr/include/security/pam_appl.h \
- /usr/include/pam/pam_appl.h
+BUILTIN_FIND_HEADERS_VAR:= H_LINUX_PAM
+BUILTIN_FIND_HEADERS.H_LINUX_PAM= security/pam_appl.h \
+ pam/pam_appl.h
BUILTIN_FIND_GREP.H_LINUX_PAM= The Linux-PAM Framework layer API
.include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk
index c9083c6acc4..68bb367c4fb 100644
--- a/security/heimdal/builtin.mk
+++ b/security/heimdal/builtin.mk
@@ -1,10 +1,11 @@
-# $NetBSD: builtin.mk,v 1.13 2011/01/23 10:01:37 markd Exp $
+# $NetBSD: builtin.mk,v 1.14 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= heimdal
-BUILTIN_FIND_FILES_VAR:= H_HEIMDAL SH_KRB5_CONFIG
-BUILTIN_FIND_FILES.H_HEIMDAL= /usr/include/krb5/krb5.h /usr/include/krb5.h
+BUILTIN_FIND_HEADERS_VAR:= H_HEIMDAL
+BUILTIN_FIND_HEADERS.H_HEIMDAL= krb5/krb5.h krb5.h
BUILTIN_FIND_GREP.H_HEIMDAL= heimdal_version
+BUILTIN_FIND_FILES_VAR:= SH_KRB5_CONFIG
BUILTIN_FIND_FILES.SH_KRB5_CONFIG= /usr/bin/krb5-config
BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version)
diff --git a/security/libdes/builtin.mk b/security/libdes/builtin.mk
index 0d20f7a6aa0..0326b5fc088 100644
--- a/security/libdes/builtin.mk
+++ b/security/libdes/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:22:42 reed Exp $
+# $NetBSD: builtin.mk,v 1.7 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= libdes
-BUILTIN_FIND_FILES_VAR:= H_LIBDES
-BUILTIN_FIND_FILES.H_LIBDES= /usr/include/libdes.h /usr/include/des.h
+BUILTIN_FIND_HEADERS_VAR:= H_LIBDES
+BUILTIN_FIND_HEADERS.H_LIBDES= libdes.h des.h
.include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/security/mit-krb5/builtin.mk b/security/mit-krb5/builtin.mk
index f51b7390334..49d77b0a8c7 100644
--- a/security/mit-krb5/builtin.mk
+++ b/security/mit-krb5/builtin.mk
@@ -1,19 +1,20 @@
-# $NetBSD: builtin.mk,v 1.8 2013/10/26 05:28:43 richard Exp $
+# $NetBSD: builtin.mk,v 1.9 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= mit-krb5
.include "../../mk/bsd.fast.prefs.mk"
-BUILTIN_FIND_FILES_VAR:= H_MIT_KRB5 SH_KRB5_CONFIG
+BUILTIN_FIND_HEADERS_VAR:= H_MIT_KRB5
.if !(empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \
empty(MACHINE_PLATFORM:MDarwin-10.*-*))
-BUILTIN_FIND_FILES.H_MIT_KRB5= /usr/include/krb5/krb5.h
+BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h
.elif !empty(MACHINE_PLATFORM:MSunOS-*-*)
-BUILTIN_FIND_FILES.H_MIT_KRB5= /usr/include/kerberosv5/krb5.h
+BUILTIN_FIND_HEADERS.H_MIT_KRB5= kerberosv5/krb5.h
.else
-BUILTIN_FIND_FILES.H_MIT_KRB5= /usr/include/krb5.h
+BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5.h
.endif
BUILTIN_FIND_GREP.H_MIT_KRB5= Massachusetts Institute of Technology
+BUILTIN_FIND_FILES_VAR:= SH_KRB5_CONFIG
BUILTIN_FIND_FILES.SH_KRB5_CONFIG= /usr/bin/krb5-config
BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version)
diff --git a/security/openpam/builtin.mk b/security/openpam/builtin.mk
index 61f46eeb1f4..197a0c1f7c7 100644
--- a/security/openpam/builtin.mk
+++ b/security/openpam/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.8 2008/01/29 00:52:58 obache Exp $
+# $NetBSD: builtin.mk,v 1.9 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= openpam
-BUILTIN_FIND_FILES_VAR:= H_OPENPAM
-BUILTIN_FIND_FILES.H_OPENPAM= /usr/include/security/openpam_version.h
+BUILTIN_FIND_HEADERS_VAR:= H_OPENPAM
+BUILTIN_FIND_HEADERS.H_OPENPAM= security/openpam_version.h
.include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index a3139e2b9dd..f79fee94d31 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,15 +1,11 @@
-# $NetBSD: builtin.mk,v 1.35 2013/10/06 12:54:10 obache Exp $
+# $NetBSD: builtin.mk,v 1.36 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= openssl
BUILTIN_FIND_LIBS:= crypto des ssl
-BUILTIN_FIND_FILES_VAR:= H_OPENSSLCONF H_OPENSSLV
-BUILTIN_FIND_FILES.H_OPENSSLCONF= /usr/include/openssl/opensslconf.h \
- /usr/sfw/include/openssl/opensslconf.h \
- /boot/common/include/openssl/opensslconf.h
-BUILTIN_FIND_FILES.H_OPENSSLV= /usr/include/openssl/opensslv.h \
- /usr/sfw/include/openssl/opensslv.h \
- /boot/common/include/openssl/opensslv.h
+BUILTIN_FIND_HEADERS_VAR:= H_OPENSSLCONF H_OPENSSLV
+BUILTIN_FIND_HEADERS.H_OPENSSLCONF= openssl/opensslconf.h
+BUILTIN_FIND_HEADERS.H_OPENSSLV= openssl/opensslv.h
.include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/security/skey/builtin.mk b/security/skey/builtin.mk
index 9c6a0c09455..292297237e0 100644
--- a/security/skey/builtin.mk
+++ b/security/skey/builtin.mk
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:44 reed Exp $
+# $NetBSD: builtin.mk,v 1.5 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= skey
-BUILTIN_FIND_FILES_VAR:= H_SKEY
-BUILTIN_FIND_FILES.H_SKEY= /usr/include/skey.h
+BUILTIN_FIND_HEADERS_VAR:= H_SKEY
+BUILTIN_FIND_HEADERS.H_SKEY= skey.h
.include "../../mk/buildlink3/bsd.builtin.mk"
diff --git a/security/tcp_wrappers/builtin.mk b/security/tcp_wrappers/builtin.mk
index 840f8eab14b..02d655a3c70 100644
--- a/security/tcp_wrappers/builtin.mk
+++ b/security/tcp_wrappers/builtin.mk
@@ -1,10 +1,10 @@
-# $NetBSD: builtin.mk,v 1.8 2006/04/06 06:22:44 reed Exp $
+# $NetBSD: builtin.mk,v 1.9 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= tcp_wrappers
BUILTIN_FIND_LIBS:= wrap
-BUILTIN_FIND_FILES_VAR:= H_TCP_WRAPPERS
-BUILTIN_FIND_FILES.H_TCP_WRAPPERS= /usr/include/tcpd.h
+BUILTIN_FIND_HEADERS_VAR:= H_TCP_WRAPPERS
+BUILTIN_FIND_HEADERS.H_TCP_WRAPPERS= tcpd.h
.include "../../mk/buildlink3/bsd.builtin.mk"