diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-08-16 12:11:17 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-08-16 12:11:17 +0000 |
| commit | 6dd58dde59b2abbb460bcbc553d5e4ef59c28e5c (patch) | |
| tree | 1402b06e8848b71c9367222debedf4c61768ea40 /mk | |
| parent | c37d02da75fe63595b3fc8305408bb729267405e (diff) | |
| download | pkgsrc-6dd58dde59b2abbb460bcbc553d5e4ef59c28e5c.tar.gz | |
Move platform-specific settings to the platform file.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/krb5.buildlink3.mk | 6 | ||||
| -rw-r--r-- | mk/platform/Darwin.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/krb5.buildlink3.mk b/mk/krb5.buildlink3.mk index d4b3629467b..0087c1ab1d9 100644 --- a/mk/krb5.buildlink3.mk +++ b/mk/krb5.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: krb5.buildlink3.mk,v 1.11 2007/03/07 10:42:30 rillig Exp $ +# $NetBSD: krb5.buildlink3.mk,v 1.12 2013/08/16 12:11:17 jperkin Exp $ # # This Makefile fragment is meant to be included by packages that # require a Kerberos 5 implementation. krb5.buildlink3.mk will: @@ -28,11 +28,7 @@ KRB5_BUILDLINK3_MK:= ${KRB5_BUILDLINK3_MK}+ .include "../../mk/bsd.prefs.mk" .if !empty(KRB5_BUILDLINK3_MK:M+) -.if ${OPSYS} != Darwin KRB5_DEFAULT?= heimdal -.else -KRB5_DEFAULT?= mit-krb5 -.endif KRB5_ACCEPTED?= ${_KRB5_PKGS} # This is an exhaustive list of all of the Kerberos 5 implementations diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index 5e7082f340c..405fb383d2a 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.53 2013/07/12 10:41:58 jperkin Exp $ +# $NetBSD: Darwin.mk,v 1.54 2013/08/16 12:11:17 jperkin Exp $ # # Variable definitions for the Darwin operating system. @@ -92,8 +92,12 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix _USE_RPATH= no # don't add rpath to LDFLAGS +# Comes with a native mit-krb5 implementation +KRB5_DEFAULT?= mit-krb5 + # Builtin defaults which make sense for this platform. PREFER.linux-pam?= native +PREFER.mit-krb5?= native # flags passed to the linker to extract all symbols from static archives. # this is GNU ld. |