summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortakemura <takemura@NetBSD.org>2002-10-14 06:31:37 +0000
committertakemura <takemura@NetBSD.org>2002-10-14 06:31:37 +0000
commit976f1e210f0525531e727ce266ab18081d4cf52c (patch)
treecbaf3610de02e2ea7215edfd0e301923acb2181d
parentcb76676a560d36207135ec886d4d4b274f5c1f4d (diff)
Enabled apm command device node for hpcmips and put apm.8 and zzz.8 man pages
into mi directory.
-rw-r--r--distrib/sets/lists/base/md.hpcmips5
-rw-r--r--distrib/sets/lists/man/mi10
-rw-r--r--distrib/sets/lists/man/obsolete.mi6
-rw-r--r--etc/etc.hpcmips/MAKEDEV11
-rw-r--r--usr.sbin/apm/Makefile5
-rw-r--r--usr.sbin/apmd/Makefile4
6 files changed, 28 insertions, 13 deletions
diff --git a/distrib/sets/lists/base/md.hpcmips b/distrib/sets/lists/base/md.hpcmips
index 6dc4788a534..38362783dd1 100644
--- a/distrib/sets/lists/base/md.hpcmips
+++ b/distrib/sets/lists/base/md.hpcmips
@@ -1,3 +1,6 @@
-# $NetBSD: md.hpcmips,v 1.5 2002/10/09 01:22:39 thorpej Exp $
+# $NetBSD: md.hpcmips,v 1.6 2002/10/14 06:31:39 takemura Exp $
./sbin/fdisk base-sysutil-root
+./usr/sbin/apm base-sysutil-bin
+./usr/sbin/apmd base-sysutil-bin
./usr/sbin/tpctl base-sysutil-bin
+./usr/sbin/zzz base-sysutil-bin
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 613e2fb3998..345559f1c02 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.522 2002/10/10 08:22:23 itojun Exp $
+# $NetBSD: mi,v 1.523 2002/10/14 06:31:39 takemura Exp $
./usr/share/info/am-utils.info man-amd-info
./usr/share/info/as.info man-computil-info
./usr/share/info/awk.info man-util-info
@@ -1274,6 +1274,7 @@
./usr/share/man/cat8/amiga/installboot.0 man-sysutil-catman
./usr/share/man/cat8/amiga/makedev.0 man-sysutil-catman
./usr/share/man/cat8/amq.0 man-amd-catman
+./usr/share/man/cat8/apm.0 man-sysutil-catman
./usr/share/man/cat8/apmd.0 man-sysutil-catman
./usr/share/man/cat8/arc/MAKEDEV.0 man-sysutil-catman
./usr/share/man/cat8/arc/makedev.0 man-sysutil-catman
@@ -1407,14 +1408,12 @@
./usr/share/man/cat8/hprop.0 man-krb5-catman
./usr/share/man/cat8/hpropd.0 man-krb5-catman
./usr/share/man/cat8/i386/MAKEDEV.0 man-sysutil-catman
-./usr/share/man/cat8/i386/apm.0 man-sysutil-catman
./usr/share/man/cat8/i386/boot.0 man-sys-catman
./usr/share/man/cat8/i386/boot_console.0 man-sys-catman
./usr/share/man/cat8/i386/dosboot.0 man-sys-catman
./usr/share/man/cat8/i386/installboot.0 man-sysutil-catman
./usr/share/man/cat8/i386/makedev.0 man-sysutil-catman
./usr/share/man/cat8/i386/w95boot.0 man-sys-catman
-./usr/share/man/cat8/i386/zzz.0 man-sysutil-catman
./usr/share/man/cat8/identd.0 man-netutil-catman
./usr/share/man/cat8/ifconfig.0 man-netutil-catman
./usr/share/man/cat8/ifmcstat.0 man-netutil-catman
@@ -1783,6 +1782,7 @@
./usr/share/man/cat8/ypxfr.0 man-nis-catman
./usr/share/man/cat8/zdump.0 man-sysutil-catman
./usr/share/man/cat8/zic.0 man-sysutil-catman
+./usr/share/man/cat8/zzz.0 man-sysutil-catman
./usr/share/man/man1/Mail.1 man-mail-man
./usr/share/man/man1/[.1 man-util-man
./usr/share/man/man1/alias.1 man-util-man
@@ -3028,6 +3028,7 @@
./usr/share/man/man8/amiga/installboot.8 man-sysutil-man
./usr/share/man/man8/amiga/makedev.8 man-sysutil-man
./usr/share/man/man8/amq.8 man-amd-man
+./usr/share/man/man8/apm.8 man-sysutil-man
./usr/share/man/man8/apmd.8 man-sysutil-man
./usr/share/man/man8/arc/MAKEDEV.8 man-sysutil-man
./usr/share/man/man8/arc/makedev.8 man-sysutil-man
@@ -3161,14 +3162,12 @@
./usr/share/man/man8/hprop.8 man-krb5-man
./usr/share/man/man8/hpropd.8 man-krb5-man
./usr/share/man/man8/i386/MAKEDEV.8 man-sysutil-man
-./usr/share/man/man8/i386/apm.8 man-sysutil-man
./usr/share/man/man8/i386/boot.8 man-sys-man
./usr/share/man/man8/i386/boot_console.8 man-sys-man
./usr/share/man/man8/i386/dosboot.8 man-sys-man
./usr/share/man/man8/i386/installboot.8 man-sysutil-man
./usr/share/man/man8/i386/makedev.8 man-sysutil-man
./usr/share/man/man8/i386/w95boot.8 man-sys-man
-./usr/share/man/man8/i386/zzz.8 man-sysutil-man
./usr/share/man/man8/identd.8 man-netutil-man
./usr/share/man/man8/ifconfig.8 man-netutil-man
./usr/share/man/man8/ifmcstat.8 man-netutil-man
@@ -3537,3 +3536,4 @@
./usr/share/man/man8/ypxfr.8 man-nis-man
./usr/share/man/man8/zdump.8 man-sysutil-man
./usr/share/man/man8/zic.8 man-sysutil-man
+./usr/share/man/man8/zzz.8 man-sysutil-man
diff --git a/distrib/sets/lists/man/obsolete.mi b/distrib/sets/lists/man/obsolete.mi
index 55ea874afea..da0fe9002c8 100644
--- a/distrib/sets/lists/man/obsolete.mi
+++ b/distrib/sets/lists/man/obsolete.mi
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mi,v 1.53 2002/09/21 07:16:40 lukem Exp $
+# $NetBSD: obsolete.mi,v 1.54 2002/10/14 06:31:41 takemura Exp $
/usr/share/info/g++FAQ.info
/usr/share/man/cat1/amq.0
/usr/share/man/cat1/g711conv.0
@@ -80,6 +80,7 @@
/usr/share/man/cat8/greconfig.0
/usr/share/man/cat8/grfconfig.0
/usr/share/man/cat8/htable.0
+/usr/share/man/cat8/i386/apm.0
/usr/share/man/cat8/i386/apmd.0
/usr/share/man/cat8/i386/bad144.0
/usr/share/man/cat8/i386/ispcvt.0
@@ -87,6 +88,7 @@
/usr/share/man/cat8/i386/reboot.0
/usr/share/man/cat8/i386/reboot_i386.0
/usr/share/man/cat8/i386/vgaio.0
+/usr/share/man/cat8/i386/zzz.0
/usr/share/man/cat8/ispppcontrol.0
/usr/share/man/cat8/kfd.0
/usr/share/man/cat8/mtrace6.0
@@ -191,6 +193,7 @@
/usr/share/man/man8/greconfig.8
/usr/share/man/man8/grfconfig.8
/usr/share/man/man8/htable.8
+/usr/share/man/man8/i386/apm.8
/usr/share/man/man8/i386/apmd.8
/usr/share/man/man8/i386/bad144.8
/usr/share/man/man8/i386/ispcvt.8
@@ -198,6 +201,7 @@
/usr/share/man/man8/i386/reboot.8
/usr/share/man/man8/i386/reboot_i386.8
/usr/share/man/man8/i386/vgaio.8
+/usr/share/man/man8/i386/zzz.8
/usr/share/man/man8/ispppcontrol.8
/usr/share/man/man8/kfd.8
/usr/share/man/man8/mtrace6.8
diff --git a/etc/etc.hpcmips/MAKEDEV b/etc/etc.hpcmips/MAKEDEV
index 17c00f35bd1..7d6ade80950 100644
--- a/etc/etc.hpcmips/MAKEDEV
+++ b/etc/etc.hpcmips/MAKEDEV
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: MAKEDEV,v 1.41 2002/10/04 18:53:31 elric Exp $
+# $NetBSD: MAKEDEV,v 1.42 2002/10/14 06:31:37 takemura Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -104,6 +104,7 @@
# ucbsnd UCB1200 (TX39) audio device. 22.154kHz mono 16bit
# audio* audio devices
# systrace syscall tracer
+# apm power management device
#
dialin=0
@@ -147,6 +148,7 @@ all)
makedev clockctl
makedev audio
makedev systrace
+ makedev apm
# makedev local
;;
@@ -655,6 +657,13 @@ systrace)
chmod 644 systrace
;;
+apm*)
+ rm -f apm apmctl
+ mknod apm c 51 0
+ mknod apmctl c 51 8
+ chmod 644 apm apmctl
+ ;;
+
local)
if [ -f "$0.local" ]; then
umask 0
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index 5cbd995a9c3..079e294845b 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/09/19 12:08:37 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/14 06:31:38 takemura Exp $
.include <bsd.own.mk>
-.if (${MACHINE} == "i386" || ${MACHINE} == "macppc" || ${MACHINE} == "hpcarm")
+.if (${MACHINE} == "i386" || ${MACHINE} == "macppc" || ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips")
PROG= apm
SRCS= apm.c apmsubr.c
.PATH: ${NETBSDSRCDIR}/usr.sbin/apmd
@@ -11,7 +11,6 @@ LINKS= ${BINDIR}/apm ${BINDIR}/zzz
.endif
MAN= apm.8
-MANSUBDIR=/i386
MLINKS= apm.8 zzz.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index 2c12b19a9c2..f09996eba44 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2002/06/18 05:24:44 itojun Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/14 06:31:38 takemura Exp $
-.if ${MACHINE} == "i386" || ${MACHINE} == "sparc" || ${MACHINE} == "macppc"
+.if ${MACHINE} == "i386" || ${MACHINE} == "sparc" || ${MACHINE} == "macppc" || ${MACHINE} == "hpcmips"
PROG= apmd
SRCS= apmd.c apmsubr.c
.endif