Sat Feb 22 09:50:48 2014 UTC ()
Additionally check underlying builtin openssl for builtin detection.

It will be done in mk/buildlink3/bsd.buildlink3.mk later, but not for
standalone builtin check (with CHECK_BUILTIN.heimdal=yes).


(obache)
diff -r1.14 -r1.15 pkgsrc/security/heimdal/builtin.mk
cvs diff -r1.14 -r1.15 pkgsrc/security/heimdal/builtin.mk (expand / switch to unified diff)

--- pkgsrc/security/heimdal/builtin.mk 2013/11/23 12:10:13 1.14
+++ pkgsrc/security/heimdal/builtin.mk 2014/02/22 09:50:47 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.14 2013/11/23 12:10:13 obache Exp $ 1# $NetBSD: builtin.mk,v 1.15 2014/02/22 09:50:47 obache Exp $
2 2
3BUILTIN_PKG:= heimdal 3BUILTIN_PKG:= heimdal
4 4
5BUILTIN_FIND_HEADERS_VAR:= H_HEIMDAL 5BUILTIN_FIND_HEADERS_VAR:= H_HEIMDAL
6BUILTIN_FIND_HEADERS.H_HEIMDAL= krb5/krb5.h krb5.h 6BUILTIN_FIND_HEADERS.H_HEIMDAL= krb5/krb5.h krb5.h
7BUILTIN_FIND_GREP.H_HEIMDAL= heimdal_version 7BUILTIN_FIND_GREP.H_HEIMDAL= heimdal_version
8BUILTIN_FIND_FILES_VAR:= SH_KRB5_CONFIG 8BUILTIN_FIND_FILES_VAR:= SH_KRB5_CONFIG
9BUILTIN_FIND_FILES.SH_KRB5_CONFIG= /usr/bin/krb5-config 9BUILTIN_FIND_FILES.SH_KRB5_CONFIG= /usr/bin/krb5-config
10BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version) 10BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version)
11 11
12.include "../../mk/buildlink3/bsd.builtin.mk" 12.include "../../mk/buildlink3/bsd.builtin.mk"
13 13
14### 14###
@@ -62,29 +62,37 @@ BUILTIN_VERSION.heimdal?= 0.2t @@ -62,29 +62,37 @@ BUILTIN_VERSION.heimdal?= 0.2t
62BUILTIN_PKG.heimdal= heimdal-${BUILTIN_VERSION.heimdal} 62BUILTIN_PKG.heimdal= heimdal-${BUILTIN_VERSION.heimdal}
63.endif 63.endif
64MAKEVARS+= BUILTIN_PKG.heimdal 64MAKEVARS+= BUILTIN_PKG.heimdal
65 65
66### 66###
67### Determine whether we should use the built-in implementation if it 67### Determine whether we should use the built-in implementation if it
68### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 68### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
69### 69###
70.if !defined(USE_BUILTIN.heimdal) 70.if !defined(USE_BUILTIN.heimdal)
71. if ${PREFER.heimdal} == "pkgsrc" 71. if ${PREFER.heimdal} == "pkgsrc"
72USE_BUILTIN.heimdal= no 72USE_BUILTIN.heimdal= no
73. else 73. else
74USE_BUILTIN.heimdal= ${IS_BUILTIN.heimdal} 74USE_BUILTIN.heimdal= ${IS_BUILTIN.heimdal}
 75. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS])
 76CHECK_BUILTIN.openssl:= yes
 77. include "../../security/openssl/builtin.mk"
 78CHECK_BUILTIN.openssl:= no
 79. if !empty(USE_BUILTIN.openssl:M[Nn][Oo])
 80USE_BUILTIN.heimdal= no
 81. endif
 82. endif
75. if defined(BUILTIN_PKG.heimdal) && \ 83. if defined(BUILTIN_PKG.heimdal) && \
76 !empty(IS_BUILTIN.heimdal:M[yY][eE][sS]) 84 !empty(IS_BUILTIN.heimdal:M[yY][eE][sS])
77USE_BUILTIN.heimdal= yes 85USE_BUILTIN.heimdal?= yes
78. for _dep_ in ${BUILDLINK_API_DEPENDS.heimdal} 86. for _dep_ in ${BUILDLINK_API_DEPENDS.heimdal}
79. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS]) 87. if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS])
80USE_BUILTIN.heimdal!= \ 88USE_BUILTIN.heimdal!= \
81 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.heimdal:Q}; then \ 89 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.heimdal:Q}; then \
82 ${ECHO} yes; \ 90 ${ECHO} yes; \
83 else \ 91 else \
84 ${ECHO} no; \ 92 ${ECHO} no; \
85 fi 93 fi
86. endif 94. endif
87. endfor 95. endfor
88. endif 96. endif
89. endif # PREFER.heimdal 97. endif # PREFER.heimdal
90.endif 98.endif