Sun Jan 6 12:53:56 2019 UTC ()
heimdal: Fix compilation under WSL

This sets the "hcrypto" PLIST variable correct when pkgsrc is used under
WSL (Windows Services for Linux).

From David Weller-Fahy via PR pkg/53806.


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

--- pkgsrc/security/heimdal/Makefile 2018/12/09 18:52:07 1.129
+++ pkgsrc/security/heimdal/Makefile 2019/01/06 12:53:56 1.130
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.129 2018/12/09 18:52:07 adam Exp $ 1# $NetBSD: Makefile,v 1.130 2019/01/06 12:53:56 bsiegert Exp $
2 2
3DISTNAME= heimdal-1.5.3 3DISTNAME= heimdal-1.5.3
4PKGREVISION= 19 4PKGREVISION= 19
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]*
@@ -63,35 +63,41 @@ CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h @@ -63,35 +63,41 @@ CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h
63 63
64.if ${READLINE_TYPE} == "readline" 64.if ${READLINE_TYPE} == "readline"
65CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline} 65CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}
66.elif ${READLINE_TYPE} == "editline" 66.elif ${READLINE_TYPE} == "editline"
67CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editlinereadline} 67CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editlinereadline}
68.endif 68.endif
69 69
70PLIST_VARS+= glob vis 70PLIST_VARS+= glob vis
71.if ${OPSYS} == "SunOS" 71.if ${OPSYS} == "SunOS"
72PLIST.vis= yes 72PLIST.vis= yes
73PLIST.glob= yes 73PLIST.glob= yes
74.endif 74.endif
75 75
 76PLIST_VARS+= hcrypto
76# Linux does not have include/vis.h and expected include/glob.h. 77# Linux does not have include/vis.h and expected include/glob.h.
77.if ${OPSYS} == "Linux" 78.if ${OPSYS} == "Linux"
78PLIST.vis= yes 79PLIST.vis= yes
79PLIST.glob= yes 80PLIST.glob= yes
80# Without this I get undefined references to pthread_getspecific 81# Without this I get undefined references to pthread_getspecific
81PTHREAD_AUTO_VARS= yes 82PTHREAD_AUTO_VARS= yes
 83.if ${OS_VARIANT} == "Microsoft"
 84# On Ubuntu hosted via WSL this is needed to avoid a DESTDIR/PLIST
 85# conflict error.
 86PLIST.hcrypto= yes
 87.endif
82.endif 88.endif
83 89
84PLIST_VARS+= afskauth hcrypto 90PLIST_VARS+= afskauth
85.if ${OPSYS} == "IRIX" 91.if ${OPSYS} == "IRIX"
86PLIST.afskauth= yes 92PLIST.afskauth= yes
87.endif 93.endif
88 94
89OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 95OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
90SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} 96SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS}
91SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} 97SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
92RCD_SCRIPTS= kadmind kcm kdc kpasswdd 98RCD_SCRIPTS= kadmind kcm kdc kpasswdd
93INFO_FILES= yes 99INFO_FILES= yes
94 100
95TEST_TARGET= check 101TEST_TARGET= check
96 102
97# remove manpages conficting with OpenSSL keeping only the important ones 103# remove manpages conficting with OpenSSL keeping only the important ones