CVS commit: pkgsrc/security/mit-krb5

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Thu May 13 09:06:16 UTC 2021

Modified Files:
        pkgsrc/security/mit-krb5: builtin.mk

Log Message:
security/mit-krb5: detect post-1.5 versions on GNU/Linux in builtin.mk

This might need proper reworking to safely detect the krb5 version
and/or header location without guessing. Asking krb5-config might
be a solution also to tell between heimdal and mit-krb5 from
--version output.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/mit-krb5/builtin.mk

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

Modified files:

Index: pkgsrc/security/mit-krb5/builtin.mk
diff -u pkgsrc/security/mit-krb5/builtin.mk:1.16 pkgsrc/security/mit-krb5/builtin.mk:1.17
--- pkgsrc/security/mit-krb5/builtin.mk:1.16    Mon Nov  4 21:12:55 2019
+++ pkgsrc/security/mit-krb5/builtin.mk Thu May 13 09:06:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2019/11/04 21:12:55 rillig Exp $
+# $NetBSD: builtin.mk,v 1.17 2021/05/13 09:06:15 thor Exp $
 
 BUILTIN_PKG:=  mit-krb5
 
@@ -10,10 +10,13 @@ BUILTIN_FIND_HEADERS_VAR:=          H_MIT_KRB5
 BUILTIN_FIND_HEADERS.H_MIT_KRB5=       krb5/krb5.h
 .elif !empty(MACHINE_PLATFORM:MSunOS-*-*)
 BUILTIN_FIND_HEADERS.H_MIT_KRB5=       kerberosv5/krb5.h
+.elif !empty(MACHINE_PLATFORM:MLinux-*)
+# Assuming mit-krb5 >= 1.5 on GNU/Linux.
+BUILTIN_FIND_HEADERS.H_MIT_KRB5=        krb5/krb5.h
 .else
 BUILTIN_FIND_HEADERS.H_MIT_KRB5=       krb5.h
 .endif
-BUILTIN_FIND_GREP.H_MIT_KRB5=          Massachusetts Institute of Technology
+BUILTIN_FIND_GREP.H_MIT_KRB5=          Massachusetts
 BUILTIN_FIND_FILES_VAR:=               SH_KRB5_CONFIG
 BUILTIN_FIND_FILES.SH_KRB5_CONFIG=     /usr/bin/krb5-config
 BUILTIN_FIND_FILES.SH_KRB5_CONFIG+=    /usr/lib/mit/bin/krb5-config