summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2016-03-11 04:58:51 +0000
committertnn <tnn@pkgsrc.org>2016-03-11 04:58:51 +0000
commit63f96b14b30243beee73131f52b794a09cdcd27f (patch)
treee42104be2ce621c32626f42d4fa13cc8893b1fc6 /mk
parente4eb71aa66598171c8b40b4db892cafde842bf0e (diff)
downloadpkgsrc-63f96b14b30243beee73131f52b794a09cdcd27f.tar.gz
for SunOS, assume that OS_VARIANT is Oracle if no match on other variants
for OmniOS, stop processing /etc/release after the first line
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 1a3f083820a..0affe2b8faa 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.377 2016/03/10 16:58:19 jperkin Exp $
+# $NetBSD: bsd.prefs.mk,v 1.378 2016/03/11 04:58:51 tnn Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -247,7 +247,10 @@ OS_VARIANT= SmartOS
LOWER_VARIANT_VERSION= ${_UNAME_V:C/joyent_//}
. elif !empty(_UNAME_V:Momnios-*)
OS_VARIANT= OmniOS
-LOWER_VARIANT_VERSION!= /usr/bin/awk '{ if (!seen) { print $$3; seen=1 } }' /etc/release
+LOWER_VARIANT_VERSION!= /usr/bin/awk '{ print $$3; exit 0; }' /etc/release
+. else
+OS_VARIANT= Oracle
+LOWER_VARIANT_VERSION= ${_UNAME_V}
. endif
.elif ${OPSYS} == "SCO_SV"