[pkgsrc/trunk]: pkgsrc Add support of SSD/Linux.

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cab5bfe4a97d
branches:  trunk
changeset: 569385:cab5bfe4a97d
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Jan 16 02:16:35 2010 +0000

description:
Add support of SSD/Linux.
 * ROOT_GROUP=wheel, fixes PR#42073.
 * LOWER_VENDOR=ssd
 * adjust paths for some tools

diffstat:

 bootstrap/bootstrap     |   9 +++++----
 mk/bsd.prefs.mk         |   4 +++-
 mk/platform/Linux.mk    |   6 +++++-
 mk/tools/tools.Linux.mk |  15 ++++++++++++++-
 4 files changed, 27 insertions(+), 7 deletions(-)

diffs (114 lines):

diff -r d5a57410af73 -r cab5bfe4a97d bootstrap/bootstrap
--- a/bootstrap/bootstrap       Sat Jan 16 02:05:26 2010 +0000
+++ b/bootstrap/bootstrap       Sat Jan 16 02:16:35 2010 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.151 2009/12/13 08:35:22 obache Exp $
+# $NetBSD: bootstrap,v 1.152 2010/01/16 02:16:35 obache Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -533,10 +533,11 @@
        fi
        ;;
 Linux)
-       if [ -f /etc/debian_version ]; then
-               DEBIAN=yes
+       if [ -f /etc/ssdlinux_version ]; then
+               root_group=wheel
+       else
+               root_group=root
        fi
-       root_group=root
        need_bsd_install=no
        need_awk=no
        need_sed=no
diff -r d5a57410af73 -r cab5bfe4a97d mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sat Jan 16 02:05:26 2010 +0000
+++ b/mk/bsd.prefs.mk   Sat Jan 16 02:16:35 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.302 2010/01/06 18:21:44 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.303 2010/01/16 02:16:35 obache Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -219,6 +219,8 @@
 LOWER_VENDOR?=         redhat
 .  elif exists(/etc/slackware-version)
 LOWER_VENDOR?=         slackware
+.  elif exists(/etc/ssdlinux_version)
+LOWER_VENDOR?=         ssd
 .  elif ${LOWER_ARCH} == "i386"
 LOWER_VENDOR?=          pc
 .  endif
diff -r d5a57410af73 -r cab5bfe4a97d mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Sat Jan 16 02:05:26 2010 +0000
+++ b/mk/platform/Linux.mk      Sat Jan 16 02:16:35 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.34 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: Linux.mk,v 1.35 2010/01/16 02:16:35 obache Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -23,7 +23,11 @@
 NOLOGIN?=              /bin/false
 PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 ROOT_CMD?=             ${SU} - root -c
+.if exists(/etc/ssdlinux_version)
+ROOT_GROUP?=           wheel
+.else
 ROOT_GROUP?=           root
+.endif
 ROOT_USER?=            root
 SERIAL_DEVICES?=       /dev/null
 ULIMIT_CMD_datasize?=  ulimit -d `ulimit -H -d`
diff -r d5a57410af73 -r cab5bfe4a97d mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk   Sat Jan 16 02:05:26 2010 +0000
+++ b/mk/tools/tools.Linux.mk   Sat Jan 16 02:16:35 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.45 2009/10/11 07:36:11 tnn Exp $
+# $NetBSD: tools.Linux.mk,v 1.46 2010/01/16 02:16:35 obache Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -63,7 +63,11 @@
 TOOLS_PLATFORM.egrep?=         /usr/bin/egrep
 .endif
 TOOLS_PLATFORM.env?=           /usr/bin/env
+.if exists(/usr/bin/expr)
 TOOLS_PLATFORM.expr?=          /usr/bin/expr
+.elif exists(/bin/expr)
+TOOLS_PLATFORM.expr?=          /bin/expr
+.endif
 TOOLS_PLATFORM.false?=         false                   # shell builtin
 .if exists(/bin/fgrep)
 TOOLS_PLATFORM.fgrep?=         /bin/fgrep
@@ -99,7 +103,11 @@
 .if exists(/usr/bin/soelim)
 TOOLS_PLATFORM.gsoelim?=       /usr/bin/soelim
 .endif
+.if exists(/bin/tar)
 TOOLS_PLATFORM.gtar?=          /bin/tar
+.elif exists(/usr/bin/tar)
+TOOLS_PLATFORM.gtar?=          /usr/bin/tar
+.endif
 .if exists(/bin/gunzip)
 TOOLS_PLATFORM.gunzip?=                /bin/gunzip -f
 .elif exists(/usr/bin/gunzip)
@@ -107,6 +115,8 @@
 .endif
 .if exists(/bin/zcat)
 TOOLS_PLATFORM.gzcat?=         /bin/zcat
+.elif exists(/usr/bin/zcat)
+TOOLS_PLATFORM.gzcat?=         /usr/bin/zcat
 .endif
 .if exists(/bin/gzip)
 TOOLS_PLATFORM.gzip?=          /bin/gzip -nf ${GZIP}
@@ -222,3 +232,6 @@
 .if exists(/usr/bin/xgettext)
 TOOLS_PLATFORM.xgettext?=      /usr/bin/xgettext
 .endif
+.if exists(/usr/bin/yacc)
+TOOLS_PLATFORM.yacc?=          /usr/bin/yacc
+.endif