Fri Feb 28 12:17:20 2014 UTC ()
Also define KRB5_CONFIG for the case not using builtin mit-krb5.


(obache)
diff -r1.11 -r1.12 pkgsrc/security/mit-krb5/builtin.mk
cvs diff -r1.11 -r1.12 pkgsrc/security/mit-krb5/builtin.mk (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/builtin.mk 2014/02/13 20:31:08 1.11
+++ pkgsrc/security/mit-krb5/builtin.mk 2014/02/28 12:17:20 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.11 2014/02/13 20:31:08 adam Exp $ 1# $NetBSD: builtin.mk,v 1.12 2014/02/28 12:17:20 obache Exp $
2 2
3BUILTIN_PKG:= mit-krb5 3BUILTIN_PKG:= mit-krb5
4 4
5.include "../../mk/bsd.fast.prefs.mk" 5.include "../../mk/bsd.fast.prefs.mk"
6 6
7BUILTIN_FIND_HEADERS_VAR:= H_MIT_KRB5 7BUILTIN_FIND_HEADERS_VAR:= H_MIT_KRB5
8.if !(empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \ 8.if !(empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \
9 empty(MACHINE_PLATFORM:MDarwin-1?.*-*)) 9 empty(MACHINE_PLATFORM:MDarwin-1?.*-*))
10BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h 10BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h
11.elif !empty(MACHINE_PLATFORM:MSunOS-*-*) 11.elif !empty(MACHINE_PLATFORM:MSunOS-*-*)
12BUILTIN_FIND_HEADERS.H_MIT_KRB5= kerberosv5/krb5.h 12BUILTIN_FIND_HEADERS.H_MIT_KRB5= kerberosv5/krb5.h
13.else 13.else
14BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5.h 14BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5.h
@@ -100,16 +100,20 @@ BUILDLINK_TARGETS+= fake-krb5-config @@ -100,16 +100,20 @@ BUILDLINK_TARGETS+= fake-krb5-config
100fake-krb5-config: 100fake-krb5-config:
101 ${RUN} \ 101 ${RUN} \
102 src=../../security/mit-krb5/files/krb5-config-wrapper.sh; \ 102 src=../../security/mit-krb5/files/krb5-config-wrapper.sh; \
103 dst=${BUILDLINK_DIR}/bin/krb5-config; \ 103 dst=${BUILDLINK_DIR}/bin/krb5-config; \
104 if [ ! -f $${dst} ]; then \ 104 if [ ! -f $${dst} ]; then \
105 ${ECHO_BUILDLINK_MSG} "Creating $${dst}"; \ 105 ${ECHO_BUILDLINK_MSG} "Creating $${dst}"; \
106 ${ECHO} "#!${SH}" > $${dst}; \ 106 ${ECHO} "#!${SH}" > $${dst}; \
107 ${SED} -e "s,@KRB5_CONFIG@,${SH_KRB5_CONFIG:Q},g" \ 107 ${SED} -e "s,@KRB5_CONFIG@,${SH_KRB5_CONFIG:Q},g" \
108 $${src} >> $${dst}; \ 108 $${src} >> $${dst}; \
109 ${CHMOD} +x $${dst}; \ 109 ${CHMOD} +x $${dst}; \
110 fi 110 fi
111 111
112. endif 112. endif
 113. else
 114KRB5_CONFIG?= ${BUILDLINK_PREFIX.mit-krb5}/bin/krb5-config
 115CONFIGURE_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q}
 116MAKE_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q}
113. endif 117. endif
114 118
115.endif # CHECK_BUILTIN.mit-krb5 119.endif # CHECK_BUILTIN.mit-krb5