[pkgsrc/trunk]: pkgsrc/security/heimdal heimdal: fix Linux PLIST.hcrypto issu...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eafe3ea03baf
branches:  trunk
changeset: 319149:eafe3ea03baf
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Feb 06 11:36:38 2019 +0000

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

Tested under Debian unstable. PR pkg/53806

diffstat:

 security/heimdal/Makefile |  32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diffs (58 lines):

diff -r fd79450122d2 -r eafe3ea03baf security/heimdal/Makefile
--- a/security/heimdal/Makefile Wed Feb 06 11:31:46 2019 +0000
+++ b/security/heimdal/Makefile Wed Feb 06 11:36:38 2019 +0000
@@ -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-libedit=${BUILDLINK_PREFIX.editlinereadline}
 .endif
 
-PLIST_VARS+=           glob vis
+PLIST_VARS+=           glob vis hcrypto afskauth
+
 .if ${OPSYS} == "SunOS"
 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
 .if ${OPSYS} == "IRIX"
 PLIST.afskauth=                yes
 .endif
@@ -121,6 +107,18 @@
 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