diff options
| author | richard <richard@pkgsrc.org> | 2013-10-26 05:28:43 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2013-10-26 05:28:43 +0000 |
| commit | 96abfcba3e9713a7799cae405d8b72680c96d0ac (patch) | |
| tree | 6dc6547d72030ff137a0c6b2b61f8c3fd20dbf89 /security/mit-krb5 | |
| parent | 301d5d9f1b87fdf73920cbf8b490f677ea36c296 (diff) | |
| download | pkgsrc-96abfcba3e9713a7799cae405d8b72680c96d0ac.tar.gz | |
update mit-krb5 builtin for solaris and better krb5-config support
Diffstat (limited to 'security/mit-krb5')
| -rw-r--r-- | security/mit-krb5/buildlink3.mk | 4 | ||||
| -rw-r--r-- | security/mit-krb5/builtin.mk | 23 |
2 files changed, 23 insertions, 4 deletions
diff --git a/security/mit-krb5/buildlink3.mk b/security/mit-krb5/buildlink3.mk index 7cbe28ffe14..bbcedb48c5c 100644 --- a/security/mit-krb5/buildlink3.mk +++ b/security/mit-krb5/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.13 2013/10/12 04:24:59 richard Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2013/10/26 05:28:43 richard Exp $ BUILDLINK_TREE+= mit-krb5 .if !defined(MIT_KRB5_BUILDLINK3_MK) MIT_KRB5_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.4nb1 +BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.4 BUILDLINK_PKGSRCDIR.mit-krb5?= ../../security/mit-krb5 .endif # MIT_KRB5_BUILDLINK3_MK diff --git a/security/mit-krb5/builtin.mk b/security/mit-krb5/builtin.mk index c31837da494..f51b7390334 100644 --- a/security/mit-krb5/builtin.mk +++ b/security/mit-krb5/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.7 2011/04/08 17:30:35 tez Exp $ +# $NetBSD: builtin.mk,v 1.8 2013/10/26 05:28:43 richard Exp $ BUILTIN_PKG:= mit-krb5 @@ -39,7 +39,7 @@ MAKEVARS+= IS_BUILTIN.mit-krb5 !empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS]) . if empty(SH_KRB5_CONFIG:M__nonexistent__) BUILTIN_VERSION.mit-krb5!= ${SH_KRB5_CONFIG} --version | \ - ${SED} -e 's/.*release //' -e 's/-.*//' + ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//' . endif BUILTIN_VERSION.mit-krb5?= 1.4.0 BUILTIN_PKG.mit-krb5= mit-krb5-${BUILTIN_VERSION.mit-krb5} @@ -72,3 +72,22 @@ USE_BUILTIN.mit-krb5!= \ . endif .endif MAKEVARS+= USE_BUILTIN.mit-krb5 + +### +### The section below only applies if we are not including this file +### solely to determine whether a built-in implementation exists. +### +CHECK_BUILTIN.mit-krb5?= no +.if !empty(CHECK_BUILTIN.mit-krb5:M[nN][oO]) +. if !empty(USE_BUILTIN.mit-krb5:M[yY][eE][sS]) +KRB5_CONFIG?= ${SH_KRB5_CONFIG} +ALL_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q} + +BUILDLINK_CPPFLAGS.mit-krb5!= ${SH_KRB5_CONFIG} --cflags +BUILDLINK_LDFLAGS.mit-krb5!= ${SH_KRB5_CONFIG} --libs +. if ${OPSYS} == "SunOS" +BUILDLINK_LDFLAGS.mit-krb5+= -lgss +. endif +. endif + +.endif # CHECK_BUILTIN.mit-krb5 |