Fri Mar 11 05:42:35 2016 UTC ()
let's do just "Solaris" instead of "Oracle"

The only current use of this is pbulk's subject line, and Solaris 11.3
makes more sense than Oracle 11.3.


(tnn)
diff -r1.378 -r1.379 pkgsrc/mk/bsd.prefs.mk
cvs diff -r1.378 -r1.379 pkgsrc/mk/bsd.prefs.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.prefs.mk 2016/03/11 04:58:51 1.378
+++ pkgsrc/mk/bsd.prefs.mk 2016/03/11 05:42:35 1.379
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.378 2016/03/11 04:58:51 tnn Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.379 2016/03/11 05:42:35 tnn Exp $
2# 2#
3# This file includes the mk.conf file, which contains the user settings. 3# This file includes the mk.conf file, which contains the user settings.
4# 4#
5# Packages should include this file before any of the .if directives, as 5# Packages should include this file before any of the .if directives, as
6# well as before modifying variables like CFLAGS, LDFLAGS, and so on. 6# well as before modifying variables like CFLAGS, LDFLAGS, and so on.
7# Otherwise the behavior may be unexpected. 7# Otherwise the behavior may be unexpected.
8# 8#
9# When mk.conf is included by this file, the following variables are 9# When mk.conf is included by this file, the following variables are
10# defined: 10# defined:
11# 11#
12# ACCEPTABLE_LICENSES 12# ACCEPTABLE_LICENSES
13# This variable is set to the list of Open Source licenses. See 13# This variable is set to the list of Open Source licenses. See
14# mk/license.mk for details. 14# mk/license.mk for details.
@@ -239,27 +239,27 @@ LOWER_VENDOR?= hp @@ -239,27 +239,27 @@ LOWER_VENDOR?= hp
239 239
240.elif ${OPSYS} == "SunOS" 240.elif ${OPSYS} == "SunOS"
241LOWER_VENDOR?= sun 241LOWER_VENDOR?= sun
242LOWER_OPSYS?= solaris 242LOWER_OPSYS?= solaris
243LOWER_OPSYS_VERSUFFIX= 2.${OS_VERSION:C/5.//} 243LOWER_OPSYS_VERSUFFIX= 2.${OS_VERSION:C/5.//}
244_UNAME_V!= ${UNAME} -v 244_UNAME_V!= ${UNAME} -v
245. if !empty(_UNAME_V:Mjoyent_*) 245. if !empty(_UNAME_V:Mjoyent_*)
246OS_VARIANT= SmartOS 246OS_VARIANT= SmartOS
247LOWER_VARIANT_VERSION= ${_UNAME_V:C/joyent_//} 247LOWER_VARIANT_VERSION= ${_UNAME_V:C/joyent_//}
248. elif !empty(_UNAME_V:Momnios-*) 248. elif !empty(_UNAME_V:Momnios-*)
249OS_VARIANT= OmniOS 249OS_VARIANT= OmniOS
250LOWER_VARIANT_VERSION!= /usr/bin/awk '{ print $$3; exit 0; }' /etc/release 250LOWER_VARIANT_VERSION!= /usr/bin/awk '{ print $$3; exit 0; }' /etc/release
251. else 251. else
252OS_VARIANT= Oracle 252OS_VARIANT= Solaris
253LOWER_VARIANT_VERSION= ${_UNAME_V} 253LOWER_VARIANT_VERSION= ${_UNAME_V}
254. endif 254. endif
255 255
256.elif ${OPSYS} == "SCO_SV" 256.elif ${OPSYS} == "SCO_SV"
257SCO_RELEASE!= ${UNAME} -r 257SCO_RELEASE!= ${UNAME} -r
258SCO_VERSION!= ${UNAME} -v 258SCO_VERSION!= ${UNAME} -v
259LOWER_VENDOR?= pc 259LOWER_VENDOR?= pc
260LOWER_OPSYS?= sco 260LOWER_OPSYS?= sco
261LOWER_OPSYS_VERSUFFIX= ${SCO_RELEASE}v${SCO_VERSION} 261LOWER_OPSYS_VERSUFFIX= ${SCO_RELEASE}v${SCO_VERSION}
262_UNAME_V!= ${UNAME} -v 262_UNAME_V!= ${UNAME} -v
263. if !empty(_UNAME_V:M5.0*) 263. if !empty(_UNAME_V:M5.0*)
264OS_VARIANT= SCOOSR5 264OS_VARIANT= SCOOSR5
265. elif !empty(_UNAME_V:M6.0*) 265. elif !empty(_UNAME_V:M6.0*)