Let manpages be built if !amiga

7 files changed, 39 insertions, 18 deletions

diff --git a/sys/arch/amiga/stand/binpatch/Makefile b/sys/arch/amiga/stand/binpatch/Makefile
index 789374b5903..71c609261ba 100644
--- a/sys/arch/amiga/stand/binpatch/Makefile
+++ b/sys/arch/amiga/stand/binpatch/Makefile
@@ -1,11 +1,15 @@
-#	$OpenBSD: Makefile,v 1.4 1999/07/09 18:48:04 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2000/02/12 15:29:05 espie Exp $
 #	$NetBSD: Makefile,v 1.6 1996/09/27 03:23:12 chopps Exp $
 
+.if ${MACHINE} == "amiga"
 PROG=binpatch
-MAN=binpatch.8
-MANSUBDIR=/amiga
-
 BINDIR=/sbin
 LDFLAGS+=-static
+.else
+NOPROG=Yes
+.endif
+
+MAN=binpatch.8
+MANSUBDIR=/amiga
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/boot/Makefile b/sys/arch/amiga/stand/boot/Makefile
index b8c9b938d54..f101ec86bad 100644
--- a/sys/arch/amiga/stand/boot/Makefile
+++ b/sys/arch/amiga/stand/boot/Makefile
@@ -1,9 +1,11 @@
-#	$OpenBSD: Makefile,v 1.5 1999/07/08 20:11:52 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2000/02/12 15:29:06 espie Exp $
 
 NOPROG=	installboot
 MAN=installboot.8
 MANSUBDIR=/amiga
 
+.if ${MACHINE}== "amiga"
+
 SUBDIR=aout2bb txlt libsa
 
 AOUT2BB!=cd $(.CURDIR)/aout2bb; \
@@ -106,5 +108,7 @@ xxtest: xxboot
 fdtest: fdboot
 	dd if=$? of=/dev/rfd0a bs=8192 count=1
 
+.endif
+
 .include <bsd.prog.mk>
 .include "Makefile.txlt"
diff --git a/sys/arch/amiga/stand/boot/main.c b/sys/arch/amiga/stand/boot/main.c
index 986e121a365..c788275d318 100644
--- a/sys/arch/amiga/stand/boot/main.c
+++ b/sys/arch/amiga/stand/boot/main.c
@@ -1,5 +1,5 @@
 /*
- * $OpenBSD: main.c,v 1.3 1997/05/13 16:15:55 niklas Exp $
+ * $OpenBSD: main.c,v 1.4 2000/02/12 15:29:06 espie Exp $
  * $NetBSD: main.c,v 1.1.1.1 1996/11/29 23:36:29 is Exp $
  *
  *
@@ -349,15 +349,15 @@ pain()
 		goto err;
 	}
 
-	printf("%ld", eh->a_text);
+	printf("%lu", (unsigned long)eh->a_text);
 	if (read(io, kp, eh->a_text) != eh->a_text)
 		goto err;
 
-	printf("+%ld", eh->a_data);
+	printf("+%lu", (unsigned long)eh->a_data);
 	if (read(io, kp + textsz, eh->a_data) != eh->a_data)
 		goto err;
 
-	printf("+%ld", eh->a_bss);
+	printf("+%lu", (unsigned long)eh->a_bss);
 
 	kvers = (u_short *)(kp + eh->a_entry - 2);
 
@@ -375,11 +375,11 @@ pain()
         nkcd = (int *)(kp + textsz + eh->a_data + eh->a_bss);
         if (*kvers != 0x4e73 && *kvers > 1 && S_flag && eh->a_syms) {
                 *nkcd++ = eh->a_syms;
-		printf("+[%ld", eh->a_syms);
+		printf("+[%lu", (unsigned long)eh->a_syms);
                 if (read(io, (char *)nkcd, eh->a_syms) != eh->a_syms)
 			goto err;
                 nkcd = (int *)((char *)nkcd + eh->a_syms);
-		printf("+%ld]", stringsz);
+		printf("+%lu]", (unsigned long)stringsz);
                 if (read(io, (char *)nkcd, stringsz) != stringsz)
 			goto err;
                 nkcd = (int*)((char *)nkcd + ((stringsz + 3) & ~3));
diff --git a/sys/arch/amiga/stand/device-streams/Makefile.bsd-wrapper b/sys/arch/amiga/stand/device-streams/Makefile.bsd-wrapper
index 8c9ab1933d0..d591b642a0b 100644
--- a/sys/arch/amiga/stand/device-streams/Makefile.bsd-wrapper
+++ b/sys/arch/amiga/stand/device-streams/Makefile.bsd-wrapper
@@ -1,5 +1,6 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.1 1999/09/27 08:39:08 espie Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2000/02/12 15:29:06 espie Exp $
 
+.if ${ARCH} == "amiga"
 BINPROG= devtostream rdbinfo streamtodev xdevtostream xstreamtodev
 BINLIB=getopt.lib unixemul.lib
 BINARIES=${BINPROG} ${BINLIB}
@@ -23,5 +24,9 @@ ${I}.gz: ${I}.gz.uu
 .endfor
 
 CLEANFILES=${BINARIES} ${BINARIES:S/$/.gz/} ${ARCHIVE}
+.else
+NOPROG=Yes
+NOMAN=Yes
+.endif
 
 .include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/loadbsd/Makefile.bsd-wrapper b/sys/arch/amiga/stand/loadbsd/Makefile.bsd-wrapper
index d2d2d11acb0..c4ef22e8b01 100644
--- a/sys/arch/amiga/stand/loadbsd/Makefile.bsd-wrapper
+++ b/sys/arch/amiga/stand/loadbsd/Makefile.bsd-wrapper
@@ -1,5 +1,6 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 1999/09/14 14:16:06 espie Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2000/02/12 15:29:06 espie Exp $
 
+.if ${MACHINE}=="amiga"
 all: loadbsd
 
 loadbsd: loadbsd.gz
@@ -9,6 +10,9 @@ loadbsd.gz: loadbsd.gz.uu
 	uudecode ${.ALLSRC}
 
 CLEANFILES=loadbsd loadbsd.gz
+.else
+NOPROG=Yes
+.endif
 
 MAN=loadbsd.8
 MANSUBDIR=/amiga
diff --git a/sys/arch/amiga/stand/loadbsd/loadbsd.8 b/sys/arch/amiga/stand/loadbsd/loadbsd.8
index af869cb1911..373a68d25c1 100644
--- a/sys/arch/amiga/stand/loadbsd/loadbsd.8
+++ b/sys/arch/amiga/stand/loadbsd/loadbsd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: loadbsd.8,v 1.3 1999/09/23 04:12:07 alex Exp $
+.\"	$OpenBSD: loadbsd.8,v 1.4 2000/02/12 15:29:06 espie Exp $
 .\" Copyright (c) 1999 Marc Espie
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -10,7 +10,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .Dd September 9, 1999
-.Dt LOADBSD 1
+.Dt LOADBSD 8 amiga
 .Os
 .Sh NAME
 .Nm loadbsd
diff --git a/sys/arch/amiga/stand/loadkmap/Makefile b/sys/arch/amiga/stand/loadkmap/Makefile
index 85d8dc6e6bd..2df37e3b059 100644
--- a/sys/arch/amiga/stand/loadkmap/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/Makefile
@@ -1,10 +1,14 @@
-# $OpenBSD: Makefile,v 1.6 1999/07/09 18:48:05 deraadt Exp $
+# $OpenBSD: Makefile,v 1.7 2000/02/12 15:29:06 espie Exp $
 # $NetBSD: Makefile,v 1.5 1996/09/27 03:23:13 chopps Exp $
 
+.if ${ARCH}=="amiga"
 PROG=loadkmap
-MAN=loadkmap.8
-MANSUBDIR=/amiga
 BINDIR=/usr/sbin
 SUBDIR=din es fr sw us
+.else
+NOPROG=Yes
+.endif
 
+MAN=loadkmap.8
+MANSUBDIR=/amiga
 .include <bsd.prog.mk>