pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/44597 (add native Kerberos support on Solaris)



The patch did not work, security/mit-krb5 was built and used, instead of the native libraries.

The use of negative checks ("if empty") makes it hard to add more architectures. This should be easier to maintain:

--- builtin.mk  2011/04/05 07:28:09     1.1
+++ builtin.mk  2011/04/08 11:55:05
@@ -5,11 +5,13 @@
 .include "../../mk/bsd.fast.prefs.mk"

 BUILTIN_FIND_FILES_VAR:=               H_MIT_KRB5 SH_KRB5_CONFIG
-.if empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \
-    empty(MACHINE_PLATFORM:MDarwin-10.*-*)
-BUILTIN_FIND_FILES.H_MIT_KRB5=         /usr/include/krb5.h
+.if !(empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \
+    empty(MACHINE_PLATFORM:MDarwin-10.*-*))
+BUILTIN_FIND_FILES.H_MIT_KRB5=          /usr/include/krb5/krb5.h
+.elif !empty(MACHINE_PLATFORM:MSunOS-*-*)
+BUILTIN_FIND_FILES.H_MIT_KRB5=          /usr/include/kerberosv5/krb5.h
 .else
-BUILTIN_FIND_FILES.H_MIT_KRB5=         /usr/include/krb5/krb5.h
+BUILTIN_FIND_FILES.H_MIT_KRB5=          /usr/include/krb5.h
 .endif
BUILTIN_FIND_GREP.H_MIT_KRB5= Massachusetts Institute of Technology
 BUILTIN_FIND_FILES.SH_KRB5_CONFIG=     /usr/bin/krb5-config


--
 Jörn Clausen                             
joern.clausen%uni-bielefeld.de@localhost
 Hochschulrechenzentrum                 http://www.uni-bielefeld.de/hrz/
 Universität Bielefeld


Home | Main Index | Thread Index | Old Index