diff options
| author | obache <obache> | 2014-02-20 08:19:43 +0000 |
|---|---|---|
| committer | obache <obache> | 2014-02-20 08:19:43 +0000 |
| commit | 8aba5ef6941f133e50e5ade055e0ca62453b0747 (patch) | |
| tree | cb595561dd6da4b8dcf09b947bdbdd84760ae31a /security/heimdal | |
| parent | 972580f238b688fc3ffd27908828a5e12c4ba2fa (diff) | |
| download | pkgsrc-8aba5ef6941f133e50e5ade055e0ca62453b0747.tar.gz | |
Move check of builtin openssl below to buildlink with openssl and exactly set as
checking builtin before including openssl/builtin.mk, so that wanted openssl
will be picked up (formerly, BUILTINK_API_DEPENDS.openssl is ignored).
Bump PKGREVISION.
Diffstat (limited to 'security/heimdal')
| -rw-r--r-- | security/heimdal/Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 131136b17ad..94d63dae1f9 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.108 2014/02/12 23:18:32 tron Exp $ +# $NetBSD: Makefile,v 1.109 2014/02/20 08:19:43 obache Exp $ DISTNAME= heimdal-1.5.3 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= security MASTER_SITES= http://www.h5l.org/dist/src/ @@ -81,14 +81,6 @@ PLIST_VARS+= afskauth hcrypto PLIST.afskauth= yes .endif -.include "../../security/openssl/builtin.mk" - -.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \ - (${OPSYS} == "SunOS" && !empty(USE_BUILTIN.openssl:Myes) && \ - !empty(BUILTIN_LIB_FOUND.crypto:M[Nn][Oo])) -PLIST.hcrypto= yes -.endif - .if ${OPSYS} == "MirBSD" PLIST.hcrypto= yes PLIST.vis= yes @@ -116,6 +108,15 @@ pre-build: .include "../../databases/sqlite3/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +CHECK_BUILTIN.openssl:= yes +.include "../../security/openssl/builtin.mk" +CHECK_BUILTIN.openssl:=no +.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \ + (${OPSYS} == "SunOS" && !empty(USE_BUILTIN.openssl:Myes) && \ + !empty(BUILTIN_LIB_FOUND.crypto:M[Nn][Oo])) +PLIST.hcrypto= yes +.endif + .include "../../mk/termcap.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/readline.buildlink3.mk" |