Fri Feb 1 12:36:06 2013 UTC ()
Prefer openssl from pkgsrc on SunOS by default.


(hans)
diff -r1.47 -r1.48 pkgsrc/mk/platform/SunOS.mk
cvs diff -r1.47 -r1.48 pkgsrc/mk/platform/SunOS.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/SunOS.mk 2013/02/01 12:25:16 1.47
+++ pkgsrc/mk/platform/SunOS.mk 2013/02/01 12:36:06 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: SunOS.mk,v 1.47 2013/02/01 12:25:16 hans Exp $ 1# $NetBSD: SunOS.mk,v 1.48 2013/02/01 12:36:06 hans Exp $
2# 2#
3# Variable definitions for the SunOS/Solaris operating system. 3# Variable definitions for the SunOS/Solaris operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake 6IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
7PKGLOCALEDIR?= lib 7PKGLOCALEDIR?= lib
8PS?= /bin/ps 8PS?= /bin/ps
9# XXX: default from defaults/mk.conf. Verify/correct for this platform 9# XXX: default from defaults/mk.conf. Verify/correct for this platform
10# and remove this comment. 10# and remove this comment.
11SU?= /usr/bin/su 11SU?= /usr/bin/su
12TYPE?= /usr/bin/type 12TYPE?= /usr/bin/type
13 13
14CPP_PRECOMP_FLAGS?= # unset 14CPP_PRECOMP_FLAGS?= # unset
@@ -29,26 +29,27 @@ USERADD?= /usr/sbin/useradd @@ -29,26 +29,27 @@ USERADD?= /usr/sbin/useradd
29.if exists(/usr/openwin/include/X11/X.h) 29.if exists(/usr/openwin/include/X11/X.h)
30X11_TYPE?= native 30X11_TYPE?= native
31.else 31.else
32X11_TYPE?= modular 32X11_TYPE?= modular
33.endif 33.endif
34.if ${X11_TYPE} == native 34.if ${X11_TYPE} == native
35MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type 35MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type
36.else 36.else
37MOTIF_TYPE_DEFAULT?= motif 37MOTIF_TYPE_DEFAULT?= motif
38.endif 38.endif
39 39
40# Builtin defaults which make sense for this platform. 40# Builtin defaults which make sense for this platform.
41PREFER.solaris-pam?= native 41PREFER.solaris-pam?= native
 42PREFER.openssl?= pkgsrc
42 43
43_OPSYS_EMULDIR.solaris= # empty 44_OPSYS_EMULDIR.solaris= # empty
44_OPSYS_EMULDIR.solaris32= # empty 45_OPSYS_EMULDIR.solaris32= # empty
45_OPSYS_EMULDIR.sunos= # empty 46_OPSYS_EMULDIR.sunos= # empty
46 47
47.if exists(/usr/include/netinet/ip6.h) 48.if exists(/usr/include/netinet/ip6.h)
48_OPSYS_HAS_INET6= yes # IPv6 is standard 49_OPSYS_HAS_INET6= yes # IPv6 is standard
49.else 50.else
50_OPSYS_HAS_INET6= no # IPv6 is not standard 51_OPSYS_HAS_INET6= no # IPv6 is not standard
51.endif 52.endif
52_OPSYS_HAS_JAVA= no # Java is not standard 53_OPSYS_HAS_JAVA= no # Java is not standard
53_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages 54_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
54_OPSYS_HAS_OSSAUDIO= no # libossaudio is available 55_OPSYS_HAS_OSSAUDIO= no # libossaudio is available