Tue Mar 13 09:04:49 2012 UTC ()
On SunOS, heimdal never builds hcrypto when pkgsrc OpenSSL used.


(fhajny)
diff -r1.88 -r1.89 pkgsrc/security/heimdal/Makefile
cvs diff -r1.88 -r1.89 pkgsrc/security/heimdal/Makefile (expand / switch to unified diff)

--- pkgsrc/security/heimdal/Makefile 2012/03/11 11:30:06 1.88
+++ pkgsrc/security/heimdal/Makefile 2012/03/13 09:04:49 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.88 2012/03/11 11:30:06 shattered Exp $ 1# $NetBSD: Makefile,v 1.89 2012/03/13 09:04:49 fhajny Exp $
2 2
3DISTNAME= heimdal-1.5.2 3DISTNAME= heimdal-1.5.2
4PKGREVISION= 1 4PKGREVISION= 1
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]*
@@ -49,28 +49,31 @@ CFLAGS.Darwin+= -DBIND_8_COMPAT @@ -49,28 +49,31 @@ CFLAGS.Darwin+= -DBIND_8_COMPAT
49# to the BSD <vis.h> header. 49# to the BSD <vis.h> header.
50OPSYSVARS+= CONFIGURE_ENV 50OPSYSVARS+= CONFIGURE_ENV
51CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no 51CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no
52 52
53# Heimdal's configure script expects to find the readline.h header as 53# Heimdal's configure script expects to find the readline.h header as
54# <readline.h>. 54# <readline.h>.
55CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 55CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
56CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline 56CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline
57 57
58PLIST_VARS+= afskauth hcrypto 58PLIST_VARS+= afskauth hcrypto
59.if ${OPSYS} == "IRIX" 59.if ${OPSYS} == "IRIX"
60PLIST.afskauth= yes 60PLIST.afskauth= yes
61.endif 61.endif
 62
 63.include "../../security/openssl/builtin.mk"
 64
62.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \ 65.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \
63 ${OPSYS} == "SunOS" 66 (${OPSYS} == "SunOS" && !empty(USE_BUILTIN.openssl:Myes))
64PLIST.hcrypto= yes 67PLIST.hcrypto= yes
65.endif 68.endif
66 69
67OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 70OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
68SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} 71SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS}
69SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} 72SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
70RCD_SCRIPTS= kadmind kcm kdc kpasswdd 73RCD_SCRIPTS= kadmind kcm kdc kpasswdd
71INFO_FILES= yes 74INFO_FILES= yes
72 75
73# Dynamically determine the "replacement" headers for bits needed by 76# Dynamically determine the "replacement" headers for bits needed by
74# Heimdal but are missing in the base system and add them to the PLIST. 77# Heimdal but are missing in the base system and add them to the PLIST.
75GENERATE_PLIST+= \ 78GENERATE_PLIST+= \
76 ( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders | \ 79 ( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders | \