From b50dbb4d240ad47ad2c5c32a320b1be3f4ced1fc Mon Sep 17 00:00:00 2001 From: Thomas Cort Date: Sat, 28 Sep 2013 12:37:57 -0400 Subject: [PATCH] Importing usr.bin/machine Change-Id: I7dd97073e94cbb75fdac7f15c73437c8ce44a606 --- distrib/sets/lists/minix/mi | 2 ++ releasetools/nbsd_ports | 1 + usr.bin/Makefile | 2 +- usr.bin/machine/Makefile | 7 +++++ usr.bin/machine/machine.1 | 54 +++++++++++++++++++++++++++++++++++++ usr.bin/machine/machine.sh | 2 ++ 6 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 usr.bin/machine/Makefile create mode 100644 usr.bin/machine/machine.1 create mode 100644 usr.bin/machine/machine.sh diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 38326ff09..a8a1af0a6 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -383,6 +383,7 @@ ./usr/bin/lzma minix-sys ./usr/bin/lzmainfo minix-sys ./usr/bin/m4 minix-sys +./usr/bin/machine minix-sys ./usr/bin/mail minix-sys ./usr/bin/make minix-sys ./usr/bin/MAKEDEV minix-sys @@ -1948,6 +1949,7 @@ ./usr/man/man1/lzma.1 minix-sys ./usr/man/man1/lzmainfo.1 minix-sys ./usr/man/man1/m4.1 minix-sys +./usr/man/man1/machine.1 minix-sys ./usr/man/man1/mail.1 minix-sys ./usr/man/man1/make.1 minix-sys ./usr/man/man1/makeinfo.1 minix-sys diff --git a/releasetools/nbsd_ports b/releasetools/nbsd_ports index 5d713ac80..a8e4158d7 100644 --- a/releasetools/nbsd_ports +++ b/releasetools/nbsd_ports @@ -170,6 +170,7 @@ 2013/05/30 12:00:00,usr.bin/logname 2012/10/17 12:00:00,usr.bin/lorder 2012/10/17 12:00:00,usr.bin/m4 +2013/09/27 12:00:00,usr.bin/machine 2012/10/17 12:00:00,usr.bin/make 2012/10/17 12:00:00,usr.bin/Makefile 2012/10/17 12:00:00,usr.bin/Makefile.inc diff --git a/usr.bin/Makefile b/usr.bin/Makefile index bcbaf3e35..07d512f68 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -15,7 +15,7 @@ SUBDIR= \ head indent infocmp join \ ldd \ login logname lorder m4 \ - make man \ + machine make man \ mkdep mktemp \ \ nbperf newgrp nvi \ diff --git a/usr.bin/machine/Makefile b/usr.bin/machine/Makefile new file mode 100644 index 000000000..d5a7e0b3f --- /dev/null +++ b/usr.bin/machine/Makefile @@ -0,0 +1,7 @@ +# $NetBSD: Makefile,v 1.4 1999/07/30 02:07:15 hubertf Exp $ +# from: @(#)Makefile 5.3 (Berkeley) 5/11/90 + +MAN= machine.1 +SCRIPTS= machine.sh + +.include diff --git a/usr.bin/machine/machine.1 b/usr.bin/machine/machine.1 new file mode 100644 index 000000000..2ea78e9d8 --- /dev/null +++ b/usr.bin/machine/machine.1 @@ -0,0 +1,54 @@ +.\" $NetBSD: machine.1,v 1.7 2003/08/07 11:14:34 agc Exp $ +.\" +.\" Copyright (c) 1980, 1990 The Regents of the University of California. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" from: @(#)machine.1 5.5 (Berkeley) 7/26/91 +.\" $NetBSD: machine.1,v 1.7 2003/08/07 11:14:34 agc Exp $ +.\" +.Dd May 24, 2003 +.Dt MACHINE 1 +.Os +.Sh NAME +.Nm machine +.Nd print machine type +.Sh SYNOPSIS +.Nm +.Sh DESCRIPTION +The +.Nm +command displays the machine type. +It is equivalent to +.Ql uname -m . +.Sh SEE ALSO +.Xr make 1 , +.Xr uname 1 +.Sh HISTORY +A +.Nm +command appeared in +.Bx 4.3 reno . diff --git a/usr.bin/machine/machine.sh b/usr.bin/machine/machine.sh new file mode 100644 index 000000000..594af2123 --- /dev/null +++ b/usr.bin/machine/machine.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/uname -m -- 2.44.0