CVS commit: pkgsrc/security/heimdal

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Feb  6 11:36:38 UTC 2019

Modified Files:
        pkgsrc/security/heimdal: Makefile

Log Message:
heimdal: fix Linux PLIST.hcrypto issue in a more generic way

Tested under Debian unstable. PR pkg/53806


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 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.130 pkgsrc/security/heimdal/Makefile:1.131
--- pkgsrc/security/heimdal/Makefile:1.130      Sun Jan  6 12:53:56 2019
+++ pkgsrc/security/heimdal/Makefile    Wed Feb  6 11:36:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2019/01/06 12:53:56 bsiegert Exp $
+# $NetBSD: Makefile,v 1.131 2019/02/06 11:36:38 tnn Exp $
 
 DISTNAME=      heimdal-1.5.3
 PKGREVISION=   19
@@ -67,27 +67,13 @@ CONFIGURE_ARGS+=    --with-readline=${BUILD
 CONFIGURE_ARGS+=       --with-libedit=${BUILDLINK_PREFIX.editlinereadline}
 .endif
 
-PLIST_VARS+=           glob vis
-.if ${OPSYS} == "SunOS"
-PLIST.vis=     yes
-PLIST.glob=    yes
-.endif
+PLIST_VARS+=           glob vis hcrypto afskauth
 
-PLIST_VARS+=           hcrypto
-# Linux does not have include/vis.h and expected include/glob.h.
-.if ${OPSYS} == "Linux"
+.if ${OPSYS} == "SunOS"
 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
 .if ${OPSYS} == "IRIX"
 PLIST.afskauth=                yes
 .endif
@@ -121,6 +107,18 @@ CHECK_BUILTIN.openssl:=no
 PLIST.hcrypto=         yes
 .endif
 
+# 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 !empty(USE_BUILTIN.openssl:Myes) && \
+       empty(BUILTIN_VERSION.openssl:M1.0*)
+PLIST.hcrypto=         yes
+.endif
+.endif
+
 .if ${OPSYS} == "MirBSD"
 .if !empty(USE_BUILTIN.openssl:Myes)
 PLIST.hcrypto=         yes