Wed Mar 19 13:25:04 2014 UTC ()
Only build hcrypto on MirBSD if using the builtin OpenSSL. Fixes build
now that we have OpenSSL from pkgsrc.


(bsiegert)
diff -r1.109 -r1.110 pkgsrc/security/heimdal/Makefile
cvs diff -r1.109 -r1.110 pkgsrc/security/heimdal/Makefile (expand / switch to unified diff)

--- pkgsrc/security/heimdal/Makefile 2014/02/20 08:19:43 1.109
+++ pkgsrc/security/heimdal/Makefile 2014/03/19 13:25:04 1.110
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.109 2014/02/20 08:19:43 obache Exp $ 1# $NetBSD: Makefile,v 1.110 2014/03/19 13:25:04 bsiegert Exp $
2 2
3DISTNAME= heimdal-1.5.3 3DISTNAME= heimdal-1.5.3
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= http://www.h5l.org/dist/src/ 6MASTER_SITES= http://www.h5l.org/dist/src/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.h5l.org/ 9HOMEPAGE= http://www.h5l.org/
10COMMENT= Kerberos 5 implementation 10COMMENT= Kerberos 5 implementation
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13CONFLICTS+= arla-[0-9]* 13CONFLICTS+= arla-[0-9]*
14CONFLICTS+= mit-krb5-[0-9]* 14CONFLICTS+= mit-krb5-[0-9]*
@@ -72,27 +72,29 @@ PLIST.glob= yes @@ -72,27 +72,29 @@ PLIST.glob= yes
72 72
73# Linux does not have include/vis.h and expected include/glob.h. 73# Linux does not have include/vis.h and expected include/glob.h.
74.if ${OPSYS} == "Linux" 74.if ${OPSYS} == "Linux"
75PLIST.vis= yes 75PLIST.vis= yes
76PLIST.glob= yes 76PLIST.glob= yes
77.endif 77.endif
78 78
79PLIST_VARS+= afskauth hcrypto 79PLIST_VARS+= afskauth hcrypto
80.if ${OPSYS} == "IRIX" 80.if ${OPSYS} == "IRIX"
81PLIST.afskauth= yes 81PLIST.afskauth= yes
82.endif 82.endif
83 83
84.if ${OPSYS} == "MirBSD" 84.if ${OPSYS} == "MirBSD"
 85.if ${USE_BUILTIN.openssl} == "yes"
85PLIST.hcrypto= yes 86PLIST.hcrypto= yes
 87.endif
86PLIST.vis= yes 88PLIST.vis= yes
87# all of the tools need to link against pthread, force it. 89# all of the tools need to link against pthread, force it.
88PTHREAD_AUTO_VARS= yes 90PTHREAD_AUTO_VARS= yes
89.endif 91.endif
90 92
91OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 93OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
92SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} 94SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS}
93SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} 95SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
94RCD_SCRIPTS= kadmind kcm kdc kpasswdd 96RCD_SCRIPTS= kadmind kcm kdc kpasswdd
95INFO_FILES= yes 97INFO_FILES= yes
96 98
97TEST_TARGET= check 99TEST_TARGET= check
98 100