Repair build links for pegosos, and also build for amd64

10 files changed, 41 insertions, 33 deletions

diff --git a/sbin/ancontrol/Makefile b/sbin/ancontrol/Makefile
index 5b99166e9c5..8bc47380ffd 100644
--- a/sbin/ancontrol/Makefile
+++ b/sbin/ancontrol/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.6 2004/01/11 22:14:10 grange Exp $
+#	$OpenBSD: Makefile,v 1.7 2004/01/28 17:45:21 deraadt Exp $
 
-.if (${MACHINE} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE} == "alpha")
+.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
+    (${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "alpha")
 PROG=	ancontrol
 CPPFLAGS+=-DANCACHE
 .else
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 1df7600f789..b3e21692abb 100644
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2003/10/31 04:05:29 drahn Exp $
+#	$OpenBSD: Makefile,v 1.31 2004/01/28 17:45:22 deraadt Exp $
 
 PROG=	disklabel
 SRCS=	disklabel.c dkcksum.c editor.c manual.c
@@ -27,7 +27,7 @@ manual.c:	disklabel.cat8
 CFLAGS+= -D${MACHINE}
 .endif
 
-.if (${MACHINE} == "i386")
+.if (${MACHINE} == "i386") || (${MACHINE} == "amd64")
 CFLAGS+= -DNUMBOOT=2 -DDOSLABEL
 CFLAGS+= -DSEEALSO="\"fdisk(8), installboot(8)\""
 .endif
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index 43c54035034..5e67140f7b4 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile,v 1.22 2003/10/31 04:05:29 drahn Exp $
+#	$OpenBSD: Makefile,v 1.23 2004/01/28 17:45:22 deraadt Exp $
 #
 # Copyright (c) 1997 Tobias Weingartner
 # All rights reserved.
@@ -25,8 +25,9 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-.if ${MACHINE} == "i386" || ${MACHINE} == "macppc" || ${MACHINE} == "alpha" \
-|| ${MACHINE} == "pegasos"
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
+    ${MACHINE} == "macppc" || ${MACHINE} == "pegasos" || \
+    ${MACHINE} == "alpha"
 PROG=	fdisk
 SRCS=	fdisk.c user.c misc.c disk.c mbr.c part.c cmd.c manual.c
 DPADD=	${LIBUTIL}
@@ -52,6 +53,6 @@ NOPROG=yes
 .endif
 
 MAN=	fdisk.8
-MANSUBDIR=i386 macppc alpha
+MANSUBDIR=i386 amd64 macppc pegosos alpha
 
 .include <bsd.prog.mk>
diff --git a/sbin/iopctl/Makefile b/sbin/iopctl/Makefile
index 3b97a0b97ac..c695ccbec27 100644
--- a/sbin/iopctl/Makefile
+++ b/sbin/iopctl/Makefile
@@ -1,7 +1,8 @@
-#	$OpenBSD: Makefile,v 1.4 2003/10/31 04:05:29 drahn Exp $
+#	$OpenBSD: Makefile,v 1.5 2004/01/28 17:45:22 deraadt Exp $
 
-.if (${MACHINE} == "i386") || (${MACHINE} == "macppc") || \
-    (${MACHINE} == "alpha") || (${MACHINE} == "pegasos")
+.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
+    (${MACHINE} == "macppc") || (${MACHINE} == "pegasos") || \
+    (${MACHINE} == "alpha")
 PROG=   iopctl
 .else
 NOPROG=
diff --git a/sbin/kbd/Makefile b/sbin/kbd/Makefile
index 688fedd7f6b..4c14f58f989 100644
--- a/sbin/kbd/Makefile
+++ b/sbin/kbd/Makefile
@@ -1,9 +1,11 @@
-#	$OpenBSD: Makefile,v 1.17 2003/10/31 04:05:29 drahn Exp $
+#	$OpenBSD: Makefile,v 1.18 2004/01/28 17:45:22 deraadt Exp $
 
-.if (${MACHINE} == "alpha") || (${MACHINE} == "hppa") || \
-    (${MACHINE} == "i386") || (${MACHINE} == "macppc") || \
+.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
+    (${MACHINE} == "macppc") || (${MACHINE} == "pegasos") || \
+    (${MACHINE} == "alpha") || (${MACHINE} == "hppa") || \
     (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") || \
-    (${MACHINE} == "vax") || (${MACHINE} == "pegasos")
+    (${MACHINE} == "vax")
+    
 PROG=	kbd
 
 SRCS=	main.c kbd_wscons.c
@@ -15,6 +17,6 @@ NOPROG=	Yes
 .endif
 
 MAN=		kbd.8
-MANSUBDIR=	alpha hppa i386 macppc sparc sparc64 vax
+MANSUBDIR=	alpha hppa i386 macppc sparc sparc64 vax pegosos amd64
 
 .include <bsd.prog.mk>
diff --git a/sbin/wicontrol/Makefile b/sbin/wicontrol/Makefile
index 542675bd59a..eb903d0c3c0 100644
--- a/sbin/wicontrol/Makefile
+++ b/sbin/wicontrol/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.7 2003/06/23 09:32:24 miod Exp $
+#	$OpenBSD: Makefile,v 1.8 2004/01/28 17:45:22 deraadt Exp $
 #	From: Makefile,v 1.1 1999/05/05 07:37:06 wpaul Exp $
 
-.if (${MACHINE} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+.if (${MACHINE} == "i386") || (${MACHINE} == "amd64") || \
     (${MACHINE} == "alpha") || (${MACHINE} == "sparc") || \
-    (${MACHINE} == "sparc64")
+    (${MACHINE} == "sparc64") || (${MACHINE_ARCH} == "powerpc")
 PROG=	wicontrol
 SRCS=	wicontrol.c
 .else
diff --git a/sbin/wsconsctl/Makefile b/sbin/wsconsctl/Makefile
index 63310ff3d50..b62a5a4b754 100644
--- a/sbin/wsconsctl/Makefile
+++ b/sbin/wsconsctl/Makefile
@@ -1,8 +1,9 @@
-#	$OpenBSD: Makefile,v 1.13 2004/01/05 02:55:28 espie Exp $
+#	$OpenBSD: Makefile,v 1.14 2004/01/28 17:45:22 deraadt Exp $
 
-.if ${MACHINE} == "i386" || ${MACHINE} == "alpha" || ${MACHINE} == "hppa" || \
-    ${MACHINE} == "macppc" || ${MACHINE} == "sparc" || \
-    ${MACHINE} == "sparc64" || ${MACHINE} == "pegasos"
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
+    ${MACHINE} == "hppa" || ${MACHINE} == "macppc" || \
+    ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || \
+    ${MACHINE} == "pegasos" || ${MACHINE} == "alpha"
 
 PROG=	wsconsctl
 SRCS=	display.c keyboard.c keysym.c map_parse.y map_scan.l \
@@ -23,6 +24,6 @@ NOPROG=yes
 .endif
 
 MAN=	wsconsctl.8
-MANSUBDIR=	alpha hppa i386 macppc sparc sparc64 pegasos
+MANSUBDIR=	alpha hppa i386 macppc sparc sparc64 pegasos amd64
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wsconscfg/Makefile b/usr.sbin/wsconscfg/Makefile
index 1a43462ba2c..bebc95112eb 100644
--- a/usr.sbin/wsconscfg/Makefile
+++ b/usr.sbin/wsconscfg/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.11 2003/10/31 04:12:20 drahn Exp $
+#	$OpenBSD: Makefile,v 1.12 2004/01/28 17:42:59 deraadt Exp $
 
-.if ${MACHINE} == "i386" || ${MACHINE} == "alpha" || ${MACHINE} == "hppa" || \
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
+    ${MACHINE} == "alpha" || ${MACHINE} == "hppa" || \
     ${MACHINE} == "macppc" || ${MACHINE} == "sparc" || \
     ${MACHINE} == "sparc64" || ${MACHINE} == "pegasos"
 
@@ -14,6 +15,6 @@ NOPROG=yes
 .endif
 
 MAN=	wsconscfg.8
-MANSUBDIR=	alpha hppa i386 macppc pegasos sparc sparc64
+MANSUBDIR=	alpha hppa i386 macppc pegasos sparc sparc64 amd64
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wsfontload/Makefile b/usr.sbin/wsfontload/Makefile
index 5f927476f0d..f6ea30f80f7 100644
--- a/usr.sbin/wsfontload/Makefile
+++ b/usr.sbin/wsfontload/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.5 2001/01/30 01:18:38 mickey Exp $
+#	$OpenBSD: Makefile,v 1.6 2004/01/28 17:43:01 deraadt Exp $
 
-.if ${MACHINE} == "i386" || ${MACHINE} == "alpha" || ${MACHINE} == "hppa"
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
+    ${MACHINE} == "alpha" || ${MACHINE} == "hppa"
 
 PROG=	wsfontload
 SRCS=	wsfontload.c
diff --git a/usr.sbin/wsmoused/Makefile b/usr.sbin/wsmoused/Makefile
index 7569fd82ff9..540df7332f6 100644
--- a/usr.sbin/wsmoused/Makefile
+++ b/usr.sbin/wsmoused/Makefile
@@ -1,6 +1,7 @@
-#	$OpenBSD: Makefile,v 1.3 2003/10/31 04:12:20 drahn Exp $	
+#	$OpenBSD: Makefile,v 1.4 2004/01/28 17:43:01 deraadt Exp $	
 
-.if ${MACHINE} == "i386" || ${MACHINE} == "alpha" || ${MACHINE} == "pegasos"
+.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" ||\
+    ${MACHINE} == "alpha" || ${MACHINE} == "pegasos"
 
 PROG=	wsmoused
 SRCS=	wsmoused.c mouse_protocols.c
@@ -12,7 +13,7 @@ NOPROG=yes
 .endif
 
 MAN=	wsmoused.8 
-MANSUBDIR=	i386 alpha
+MANSUBDIR=	i386 amd64 alpha pegosos
 
 .include <bsd.prog.mk>