CVS commit: pkgsrc/security/heimdal

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Jan  6 12:53:56 UTC 2019

Modified Files:
        pkgsrc/security/heimdal: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/security/heimdal/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/heimdal/Makefile
diff -u pkgsrc/security/heimdal/Makefile:1.129 pkgsrc/security/heimdal/Makefile:1.130
--- pkgsrc/security/heimdal/Makefile:1.129      Sun Dec  9 18:52:07 2018
+++ pkgsrc/security/heimdal/Makefile    Sun Jan  6 12:53:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2018/12/09 18:52:07 adam Exp $
+# $NetBSD: Makefile,v 1.130 2019/01/06 12:53:56 bsiegert Exp $
 
 DISTNAME=      heimdal-1.5.3
 PKGREVISION=   19
@@ -73,15 +73,21 @@ PLIST.vis=  yes
 PLIST.glob=    yes
 .endif
 
+PLIST_VARS+=           hcrypto
 # Linux does not have include/vis.h and expected include/glob.h.
 .if ${OPSYS} == "Linux"
 PLIST.vis=     yes
 PLIST.glob=    yes
 # Without this I get undefined references to pthread_getspecific
 PTHREAD_AUTO_VARS=     yes
+.if ${OS_VARIANT} == "Microsoft"
+# On Ubuntu hosted via WSL this is needed to avoid a DESTDIR/PLIST
+# conflict error.
+PLIST.hcrypto= yes
+.endif
 .endif
 
-PLIST_VARS+=           afskauth hcrypto
+PLIST_VARS+=           afskauth
 .if ${OPSYS} == "IRIX"
 PLIST.afskauth=                yes
 .endif