Fri Jul 8 21:23:57 2016 UTC ()
Opt to prefer OpenSSL from pkgsrc rather than a builtin version for all versions rather than just 10.7 or newer.
There is no good reason to opt for the builtin on the legacy release prior as they're unmaintained.


(sevan)
diff -r1.81 -r1.82 pkgsrc/mk/platform/Darwin.mk
cvs diff -r1.81 -r1.82 pkgsrc/mk/platform/Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Darwin.mk 2016/03/11 22:04:34 1.81
+++ pkgsrc/mk/platform/Darwin.mk 2016/07/08 21:23:57 1.82
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Darwin.mk,v 1.81 2016/03/11 22:04:34 fhajny Exp $ 1# $NetBSD: Darwin.mk,v 1.82 2016/07/08 21:23:57 sevan Exp $
2# 2#
3# Variable definitions for the Darwin operating system. 3# Variable definitions for the Darwin operating system.
4 4
5# OS, Kernel, Xcode Version 5# OS, Kernel, Xcode Version
6# Note that Xcode gets updates on older systems sometimes. 6# Note that Xcode gets updates on older systems sometimes.
7# pkgsrc generally expects that the most up-to-date xcode available for 7# pkgsrc generally expects that the most up-to-date xcode available for
8# an OS version is installed 8# an OS version is installed
9# 9#
10# Codename OS Kernel Xcode 10# Codename OS Kernel Xcode
11# Cheetah 10.0.x 1.3.1 11# Cheetah 10.0.x 1.3.1
12# Puma 10.1 1.4.1 12# Puma 10.1 1.4.1
13# 10.1.x 5.x.y 13# 10.1.x 5.x.y
14# Jaguar 10.2.x 6.x.y 14# Jaguar 10.2.x 6.x.y
@@ -126,29 +126,27 @@ _USE_RPATH= no # don't add rpath to LDF @@ -126,29 +126,27 @@ _USE_RPATH= no # don't add rpath to LDF
126KRB5_DEFAULT?= mit-krb5 126KRB5_DEFAULT?= mit-krb5
127 127
128# 128#
129# Builtin overrides. 129# Builtin overrides.
130# 130#
131.if !empty(OS_VERSION:M[56].*) 131.if !empty(OS_VERSION:M[56].*)
132USE_BUILTIN.dl= no # Darwin-[56].* uses devel/dlcompat 132USE_BUILTIN.dl= no # Darwin-[56].* uses devel/dlcompat
133.endif 133.endif
134 134
135# Builtin defaults which make sense for this platform. 135# Builtin defaults which make sense for this platform.
136_OPSYS_PREFER.libuuid?= native # system headers assume uuid_string_t 136_OPSYS_PREFER.libuuid?= native # system headers assume uuid_string_t
137_OPSYS_PREFER.linux-pam?= native 137_OPSYS_PREFER.linux-pam?= native
138_OPSYS_PREFER.mit-krb5?= native 138_OPSYS_PREFER.mit-krb5?= native
139.if ${OS_VERSION:R} >= 11 
140_OPSYS_PREFER.openssl?= pkgsrc # builtin deprecated from 10.7 onwards 139_OPSYS_PREFER.openssl?= pkgsrc # builtin deprecated from 10.7 onwards
141.endif 
142 140
143# Remove common GNU ld arguments incompatible with the Darwin linker. 141# Remove common GNU ld arguments incompatible with the Darwin linker.
144BUILDLINK_TRANSFORM+= rm:-Wl,-O1 142BUILDLINK_TRANSFORM+= rm:-Wl,-O1
145BUILDLINK_TRANSFORM+= rm:-Wl,-Bdynamic 143BUILDLINK_TRANSFORM+= rm:-Wl,-Bdynamic
146BUILDLINK_TRANSFORM+= rm:-Wl,-Bsymbolic 144BUILDLINK_TRANSFORM+= rm:-Wl,-Bsymbolic
147BUILDLINK_TRANSFORM+= rm:-Wl,-export-dynamic 145BUILDLINK_TRANSFORM+= rm:-Wl,-export-dynamic
148BUILDLINK_TRANSFORM+= rm:-Wl,-warn-common 146BUILDLINK_TRANSFORM+= rm:-Wl,-warn-common
149BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed 147BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed
150BUILDLINK_TRANSFORM+= rm:-Wl,--no-as-needed 148BUILDLINK_TRANSFORM+= rm:-Wl,--no-as-needed
151BUILDLINK_TRANSFORM+= rm:-Wl,--disable-new-dtags 149BUILDLINK_TRANSFORM+= rm:-Wl,--disable-new-dtags
152BUILDLINK_TRANSFORM+= rm:-Wl,--enable-new-dtags 150BUILDLINK_TRANSFORM+= rm:-Wl,--enable-new-dtags
153BUILDLINK_TRANSFORM+= rm:-Wl,--export-dynamic 151BUILDLINK_TRANSFORM+= rm:-Wl,--export-dynamic
154BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections 152BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections