summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-01 21:34:02 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-01 21:34:02 +0000
commit2fca5abcb4c76c4d70f7fc0949dc8d616fdd22a1 (patch)
tree822525b5f7db249c37e996ab355d764694fc0d76 /sbin
parentf8760832144a6c92be7507b374379026e9f64f04 (diff)
cats went away
Diffstat (limited to 'sbin')
-rw-r--r--sbin/disklabel/Makefile4
-rw-r--r--sbin/fdisk/Makefile10
-rw-r--r--sbin/fdisk/fdisk.85
-rw-r--r--sbin/iopctl/Makefile4
-rw-r--r--sbin/kbd/Makefile4
5 files changed, 13 insertions, 14 deletions
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 9013930001b..bd61265f5dd 100644
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2007/06/18 07:37:24 deraadt Exp $
+# $OpenBSD: Makefile,v 1.47 2007/08/01 21:34:01 deraadt Exp $
PROG= disklabel
SRCS= disklabel.c dkcksum.c editor.c manual.c
@@ -32,7 +32,7 @@ CFLAGS+= -DDOSLABEL
CFLAGS+= -DSEEALSO="\"fdisk(8), installboot(8)\""
.endif
-.if (${MACHINE} == "armish") || (${MACHINE} == "cats")
+.if (${MACHINE} == "armish")
CFLAGS+= -DDOSLABEL
CFLAGS+= -DSEEALSO="\"fdisk(8)\""
.endif
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 82126b64eda..b1c58e6c3b4 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,5 +1,5 @@
#
-# $OpenBSD: Makefile,v 1.34 2006/10/15 02:41:15 drahn Exp $
+# $OpenBSD: Makefile,v 1.35 2007/08/01 21:34:01 deraadt Exp $
#
# Copyright (c) 1997 Tobias Weingartner
# All rights reserved.
@@ -26,9 +26,9 @@
#
.if (${MACHINE} == "alpha") || (${MACHINE} == "amd64") || \
- (${MACHINE} == "armish") || (${MACHINE} == "cats") || \
- (${MACHINE} == "i386") || (${MACHINE} == "landisk") || \
- (${MACHINE} == "macppc") || (${MACHINE} == "zaurus")
+ (${MACHINE} == "armish") || (${MACHINE} == "i386") || \
+ (${MACHINE} == "landisk") || (${MACHINE} == "macppc") || \
+ (${MACHINE} == "zaurus")
PROG= fdisk
SRCS= fdisk.c user.c misc.c disk.c mbr.c part.c cmd.c manual.c
DPADD= ${LIBUTIL}
@@ -54,6 +54,6 @@ NOPROG=yes
.endif
MAN= fdisk.8
-MANSUBDIR=alpha amd64 armish cats i386 landisk macppc zaurus
+MANSUBDIR=alpha amd64 armish i386 landisk macppc zaurus
.include <bsd.prog.mk>
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 69dc5485550..21e64313b92 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fdisk.8,v 1.59 2007/05/31 19:19:44 jmc Exp $
+.\" $OpenBSD: fdisk.8,v 1.60 2007/08/01 21:34:01 deraadt Exp $
.\"
.\" Copyright (c) 1997 Tobias Weingartner
.\" All rights reserved.
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 1 2007 $
.Dt FDISK 8
.Os
.Sh NAME
@@ -342,7 +342,6 @@ default MBR template
.Xr fstab 5 ,
.Xr boot_alpha 8 ,
.Xr boot_amd64 8 ,
-.Xr boot_cats 8 ,
.Xr boot_i386 8 ,
.Xr boot_macppc 8 ,
.Xr boot_zaurus 8 ,
diff --git a/sbin/iopctl/Makefile b/sbin/iopctl/Makefile
index 006b6a3b55b..3ac9e2a2a7b 100644
--- a/sbin/iopctl/Makefile
+++ b/sbin/iopctl/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2004/08/06 23:06:23 deraadt Exp $
+# $OpenBSD: Makefile,v 1.9 2007/08/01 21:34:01 deraadt Exp $
.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
(${MACHINE} == "macppc") || (${MACHINE} == "alpha") || \
- (${MACHINE} == "cats") || (${MACHINE} == "sgi")
+ (${MACHINE} == "sgi")
PROG= iopctl
.else
NOPROG=
diff --git a/sbin/kbd/Makefile b/sbin/kbd/Makefile
index d562445112c..af115ab7662 100644
--- a/sbin/kbd/Makefile
+++ b/sbin/kbd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2006/11/10 21:22:44 deraadt Exp $
+# $OpenBSD: Makefile,v 1.31 2007/08/01 21:34:01 deraadt Exp $
#
# Be sure to change src/distrib/special/kbd/Makefile as well if you add or
@@ -18,7 +18,7 @@ NOPROG= Yes
.endif
MAN= kbd.8
-MANSUBDIR= alpha amd64 cats hp300 hppa i386 luna88k mac68k macppc \
+MANSUBDIR= alpha amd64 hp300 hppa i386 luna88k mac68k macppc \
sgi sparc sparc64 vax zaurus
.include <bsd.prog.mk>