Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Retire legacy grfinfo and hilinfo derived from HPBSD
details: https://anonhg.NetBSD.org/src/rev/d4ea8e9e8ad9
branches: trunk
changeset: 761785:d4ea8e9e8ad9
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Mon Feb 07 18:11:28 2011 +0000
description:
Retire legacy grfinfo and hilinfo derived from HPBSD
since finally hp300 got wscons.
diffstat:
distrib/sets/lists/base/md.hp300 | 6 +-
distrib/sets/lists/comp/md.hp300 | 6 +-
distrib/sets/lists/man/mi | 8 +-
usr.sbin/Makefile | 4 +-
usr.sbin/grfinfo/Makefile | 13 ---
usr.sbin/grfinfo/grfinfo.1 | 66 ---------------
usr.sbin/grfinfo/grfinfo.c | 154 ------------------------------------
usr.sbin/hilinfo/Makefile | 12 --
usr.sbin/hilinfo/hilinfo.c | 163 ---------------------------------------
9 files changed, 12 insertions(+), 420 deletions(-)
diffs (truncated from 516 to 300 lines):
diff -r 739d4866277d -r d4ea8e9e8ad9 distrib/sets/lists/base/md.hp300
--- a/distrib/sets/lists/base/md.hp300 Mon Feb 07 17:36:42 2011 +0000
+++ b/distrib/sets/lists/base/md.hp300 Mon Feb 07 18:11:28 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.hp300,v 1.40 2008/11/29 17:57:33 tsutsui Exp $
+# $NetBSD: md.hp300,v 1.41 2011/02/07 18:11:28 tsutsui Exp $
./usr/mdec/bootct base-sysutil-bin
./usr/mdec/bootrd base-sysutil-bin
./usr/mdec/bootsd base-sysutil-bin
@@ -12,5 +12,5 @@
./usr/mdec/rdboot base-sysutil-bin
./usr/mdec/sdboot base-sysutil-bin
./usr/mdec/uboot.lif base-sysutil-bin
-./usr/sbin/grfinfo base-sysutil-bin
-./usr/sbin/hilinfo base-sysutil-bin
+./usr/sbin/grfinfo base-obsolete obsolete
+./usr/sbin/hilinfo base-obsolete obsolete
diff -r 739d4866277d -r d4ea8e9e8ad9 distrib/sets/lists/comp/md.hp300
--- a/distrib/sets/lists/comp/md.hp300 Mon Feb 07 17:36:42 2011 +0000
+++ b/distrib/sets/lists/comp/md.hp300 Mon Feb 07 18:11:28 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.hp300,v 1.59 2010/03/16 01:49:34 mrg Exp $
+# $NetBSD: md.hp300,v 1.60 2011/02/07 18:11:28 tsutsui Exp $
./usr/include/hp300 comp-c-include
./usr/include/hp300/_G_config.h comp-obsolete obsolete
./usr/include/hp300/ansi.h comp-c-include
@@ -54,5 +54,5 @@
./usr/include/hp300/wchar_limits.h comp-c-include
./usr/include/ieeefp.h comp-c-include
./usr/libdata/debug/usr/mdec/mkboot.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/grfinfo.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/hilinfo.debug comp-sysutil-debug debug
+./usr/libdata/debug/usr/sbin/grfinfo.debug comp-obsolete obsolete
+./usr/libdata/debug/usr/sbin/hilinfo.debug comp-obsolete obsolete
diff -r 739d4866277d -r d4ea8e9e8ad9 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Mon Feb 07 17:36:42 2011 +0000
+++ b/distrib/sets/lists/man/mi Mon Feb 07 18:11:28 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1283 2011/01/26 18:48:11 bouyer Exp $
+# $NetBSD: mi,v 1.1284 2011/02/07 18:11:28 tsutsui Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -183,7 +183,7 @@
./usr/share/man/cat1/history.0 man-util-catman .cat
./usr/share/man/cat1/host.0 man-netutil-catman .cat
./usr/share/man/cat1/hostname.0 man-util-catman .cat
-./usr/share/man/cat1/hp300/grfinfo.0 man-sysutil-catman .cat
+./usr/share/man/cat1/hp300/grfinfo.0 man-obsolete obsolete
./usr/share/man/cat1/i386 man-obsolete obsolete
./usr/share/man/cat1/i386/cursor.0 man-obsolete obsolete
./usr/share/man/cat1/i386/fed.0 man-obsolete obsolete
@@ -3015,7 +3015,7 @@
./usr/share/man/html1/history.html man-util-htmlman html
./usr/share/man/html1/host.html man-netutil-htmlman html
./usr/share/man/html1/hostname.html man-util-htmlman html
-./usr/share/man/html1/hp300/grfinfo.html man-sysutil-htmlman html
+./usr/share/man/html1/hp300/grfinfo.html man-obsolete obsolete
./usr/share/man/html1/iconv.html man-util-htmlman html
./usr/share/man/html1/id.html man-util-htmlman html
./usr/share/man/html1/ident.html man-util-htmlman html
@@ -5468,7 +5468,7 @@
./usr/share/man/man1/history.1 man-util-man .man
./usr/share/man/man1/host.1 man-netutil-man .man
./usr/share/man/man1/hostname.1 man-util-man .man
-./usr/share/man/man1/hp300/grfinfo.1 man-sysutil-man .man
+./usr/share/man/man1/hp300/grfinfo.1 man-obsolete obsolete
./usr/share/man/man1/i386 man-obsolete obsolete
./usr/share/man/man1/i386/cursor.1 man-obsolete obsolete
./usr/share/man/man1/i386/fed.1 man-obsolete obsolete
diff -r 739d4866277d -r d4ea8e9e8ad9 usr.sbin/Makefile
--- a/usr.sbin/Makefile Mon Feb 07 17:36:42 2011 +0000
+++ b/usr.sbin/Makefile Mon Feb 07 18:11:28 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.250 2011/01/13 22:28:35 haad Exp $
+# $NetBSD: Makefile,v 1.251 2011/02/07 18:11:29 tsutsui Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
chroot chrtbl cnwctl cpuctl crash dev_mkdb \
dhcp diskpart dumpfs dumplfs edquota eeprom \
envstat eshconfig etcupdate extattrctl fssconfig fusermount fwctl \
- gpioctl grfconfig grfinfo gspa hdaudioctl hilinfo ifwatchd inetd \
+ gpioctl grfconfig gspa hdaudioctl ifwatchd inetd \
installboot \
iopctl iostat ipwctl irdaattach isdn iteconfig iwictl\
kgmon lastlogin ldpd link lmcconfig lockstat lpr mailwrapper makefs \
diff -r 739d4866277d -r d4ea8e9e8ad9 usr.sbin/grfinfo/Makefile
--- a/usr.sbin/grfinfo/Makefile Mon Feb 07 17:36:42 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2005/08/20 17:21:29 rpaulo Exp $
-
-.include <bsd.own.mk>
-
-.if ${MACHINE} == "hp300"
-PROG= grfinfo
-CPPFLAGS+= -I${NETBSDSRCDIR}/sys/arch/hp300
-.endif
-
-MAN= grfinfo.1
-MANSUBDIR= /hp300
-
-.include <bsd.prog.mk>
diff -r 739d4866277d -r d4ea8e9e8ad9 usr.sbin/grfinfo/grfinfo.1
--- a/usr.sbin/grfinfo/grfinfo.1 Mon Feb 07 17:36:42 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-.\" $NetBSD: grfinfo.1,v 1.10 2009/05/12 14:56:22 wiz Exp $
-.\"
-.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Dave Carrel
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
-.\"
-.\" @(#)cat.1 8.3 (Berkeley) 5/2/95
-.\"
-.Dd August 20, 2005
-.Dt GRFINFO 1 hp300
-.Os
-.Sh NAME
-.Nm grfinfo
-.Nd display information about grf graphics devices
-.Sh SYNOPSIS
-.Nm
-.Op Fl at
-.Ar file
-.Sh DESCRIPTION
-The
-.Nm
-utility displays information about grf graphics frame buffer devices.
-By default, only the frame buffer type is displayed.
-.Ar file
-is the device file for the graphics frame buffer.
-.Pp
-The options are as follows:
-.Bl -tag -width flag
-.It Fl a
-Display all possible information.
-.It Fl t
-Display only the type, even if an error occurs.
-.El
-.Sh EXIT STATUS
-The
-.Nm
-utility exits 0 on success, and \*[Gt]0 if an error occurs.
-If the
-.Fl t
-option is used and an error occurs, no error message is displayed, and the
-type is displayed as "none".
-.Sh SEE ALSO
-.Xr grf 4
diff -r 739d4866277d -r d4ea8e9e8ad9 usr.sbin/grfinfo/grfinfo.c
--- a/usr.sbin/grfinfo/grfinfo.c Mon Feb 07 17:36:42 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 1987-1993, The University of Utah and
- * the Center for Software Science at the University of Utah (CSS).
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation, and (3) all advertising
- * materials mentioning features or use of this software display the following
- * acknowledgement: ``This product includes software developed by the Center
- * for Software Science at the University of Utah.''
- *
- * THE UNIVERSITY OF UTAH AND CSS ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
- * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSS DISCLAIM ANY LIABILITY OF
- * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * CSS requests users of this software to return to css-dist%cs.utah.edu@localhost any
- * improvements that they make and grant CSS redistribution rights.
- *
- * from: Utah $Hdr: grfinfo.c 1.3 94/04/04$
- * $NetBSD: grfinfo.c,v 1.9 2009/05/12 14:15:31 tsutsui Exp $
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: grfinfo.c,v 1.9 2009/05/12 14:15:31 tsutsui Exp $");
-#endif
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <dev/grfioctl.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-int aflg = 0;
-int tflg = 0;
-char *dname;
-struct grfinfo gi;
-
-struct grf_info {
- int grf_id;
- const char *grf_name;
-} info[] = {
- { GRFGATOR, "gatorbox" },
- { GRFBOBCAT, "topcat" },
- { GRFRBOX, "renaissance" },
- { GRFFIREEYE, "fireeye" },
- { GRFHYPERION, "hyperion" },
- { GRFDAVINCI, "davinci" },
- { -1, "unknown" }
-};
-
-void getinfo __P((void));
-int main __P((int, char **));
-void printall __P((void));
-const char *tname __P((void));
-void usage __P((void));
-
-int
-main(argc, argv)
- int argc;
- char **argv;
-{
- int c;
-
- while ((c = getopt(argc, argv, "at")) != -1)
- switch (c) {
- /* everything */
- case 'a':
- aflg++;
- break;
- /* type */
- case 't':
- tflg++;
- break;
- /* bogon */
- case '?':
- usage();
- }
- if (optind == argc)
- usage();
- dname = argv[optind];
- getinfo();
- if (aflg)
- printall();
- else
- printf("%s\n", tname());
- exit(0);
-}
-
-void
-getinfo()
-{
- int f;
-
- f = open(dname, 0);
- if (f < 0 || ioctl(f, GRFIOCGINFO, &gi) < 0) {
- if (tflg)
- printf("none\n");
- else
- perror(dname);
- exit(1);
- }
- close(f);
-}
-
-void
-printall()
-{
- printf("%s: %d x %d ", dname, gi.gd_dwidth, gi.gd_dheight);
- if (gi.gd_colors < 3)
- printf("monochrome");
- else {
- printf("%d color", gi.gd_colors);
- if (gi.gd_planes)
- printf(", %d plane", gi.gd_planes);
- }
- printf(" %s\n", tname());
Home |
Main Index |
Thread Index |
Old Index