[src/trunk]: src get pdisk compiling on macppc and mac68k

[dbj <dbj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2bbd7268aff8
branches:  trunk
changeset: 533761:2bbd7268aff8
user:      dbj <dbj%NetBSD.org@localhost>
date:      Tue Jul 09 05:57:32 2002 +0000

description:
get pdisk compiling on macppc and mac68k

diffstat:

 distrib/sets/lists/base/md.mac68k |   3 ++-
 distrib/sets/lists/base/md.macppc |   3 ++-
 distrib/sets/lists/man/mi         |   4 +++-
 sbin/Makefile                     |   4 ++--
 sbin/pdisk/Makefile               |  29 +++++++++++++++++++++++++++++
 sbin/pdisk/errors_workaround.c    |   3 +++
 6 files changed, 41 insertions(+), 5 deletions(-)

diffs (102 lines):

diff -r ba31af1586aa -r 2bbd7268aff8 distrib/sets/lists/base/md.mac68k
--- a/distrib/sets/lists/base/md.mac68k Tue Jul 09 05:49:02 2002 +0000
+++ b/distrib/sets/lists/base/md.mac68k Tue Jul 09 05:57:32 2002 +0000
@@ -1,2 +1,3 @@
-# $NetBSD: md.mac68k,v 1.34 2001/01/25 08:29:19 jwise Exp $
+# $NetBSD: md.mac68k,v 1.35 2002/07/09 05:57:34 dbj Exp $
+./sbin/pdisk           base-sysutil-root
 ./usr/lkm/iwmfd.o      base-sys-lkm
diff -r ba31af1586aa -r 2bbd7268aff8 distrib/sets/lists/base/md.macppc
--- a/distrib/sets/lists/base/md.macppc Tue Jul 09 05:49:02 2002 +0000
+++ b/distrib/sets/lists/base/md.macppc Tue Jul 09 05:57:32 2002 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: md.macppc,v 1.17 2002/07/09 05:30:49 mycroft Exp $
+# $NetBSD: md.macppc,v 1.18 2002/07/09 05:57:34 dbj Exp $
 ./sbin/fdisk                   base-sysutil-root
+./sbin/pdisk                   base-sysutil-root
 ./usr/mdec/bootxx              base-sysutil-bin
 ./usr/mdec/ofwboot             base-sysutil-bin
 ./usr/mdec/ofwboot.elf         base-sysutil-bin
diff -r ba31af1586aa -r 2bbd7268aff8 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Tue Jul 09 05:49:02 2002 +0000
+++ b/distrib/sets/lists/man/mi Tue Jul 09 05:57:32 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.498 2002/06/28 08:45:55 grant Exp $
+# $NetBSD: mi,v 1.499 2002/07/09 05:57:35 dbj 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
@@ -1553,6 +1553,7 @@
 ./usr/share/man/cat8/pc532/bim.0               man-sysutil-catman
 ./usr/share/man/cat8/pc532/makedev.0           man-sysutil-catman
 ./usr/share/man/cat8/pcictl.0                  man-sysutil-catman
+./usr/share/man/can8/pdisk.0                   man-sysutil-catman
 ./usr/share/man/cat8/pcnfsd.0                  man-nfsserver-catman
 ./usr/share/man/cat8/peace.0                   man-sys-catman
 ./usr/share/man/cat8/pickup.0                  man-postfix-catman
@@ -3287,6 +3288,7 @@
 ./usr/share/man/man8/pc532/bim.8               man-sysutil-man
 ./usr/share/man/man8/pc532/makedev.8           man-sysutil-man
 ./usr/share/man/man8/pcictl.8                  man-sysutil-man
+./usr/share/man/man8/pdisk.8                   man-sysutil-man
 ./usr/share/man/man8/pcnfsd.8                  man-nfsserver-man
 ./usr/share/man/man8/peace.8                   man-sys-man
 ./usr/share/man/man8/pickup.8                  man-postfix-man
diff -r ba31af1586aa -r 2bbd7268aff8 sbin/Makefile
--- a/sbin/Makefile     Tue Jul 09 05:49:02 2002 +0000
+++ b/sbin/Makefile     Tue Jul 09 05:57:32 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.76 2002/01/09 22:31:57 thorpej Exp $
+#      $NetBSD: Makefile,v 1.77 2002/07/09 05:57:32 dbj Exp $
 #      @(#)Makefile    8.5 (Berkeley) 3/31/94
 
 # Not ported: XNSrouted enpload scsiformat startslip
@@ -6,7 +6,7 @@
 
 SUBDIR=        atactl badsect bim brconfig ccdconfig disklabel dkctl dmesg edlabel \
        fastboot fdisk fsck fsirand ifconfig init ldconfig lmcctl \
-       mbrlabel mknod modload modunload mount newbtconf nologin ping \
+       mbrlabel mknod modload modunload mount newbtconf nologin pdisk ping \
        pppoectl raidctl reboot rcorder rndctl route routed savecore scsictl \
        shutdown slattach swapctl sysctl ttyflags umount wdogctl wsconsctl
 
diff -r ba31af1586aa -r 2bbd7268aff8 sbin/pdisk/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sbin/pdisk/Makefile       Tue Jul 09 05:57:32 2002 +0000
@@ -0,0 +1,29 @@
+#      $NetBSD: Makefile,v 1.1 2002/07/09 05:57:37 dbj Exp $   
+
+.include <bsd.own.mk>
+
+SRCDIR=        ${.CURDIR}/../../dist/pdisk
+.PATH: ${SRCDIR}
+
+.if (${MACHINE} == "macppc" || \
+     ${MACHINE} == "mac68k")
+
+PROG=  pdisk
+
+SRCS=  bitfield.c convert.c deblock_media.c dump.c \
+       file_media.c hfs_misc.c io.c layout_dump.c \
+       media.c partition_map.c pathname.c pdisk.c util.c \
+       validate.c
+
+SRCS+= errors_workaround.c 
+.endif
+
+MAN=   pdisk.8 
+
+CPPFLAGS+=     -I${SRCDIR}
+
+CPPFLAGS+=     -D__unix__
+
+WARNS=0
+
+.include <bsd.prog.mk>
diff -r ba31af1586aa -r 2bbd7268aff8 sbin/pdisk/errors_workaround.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sbin/pdisk/errors_workaround.c    Tue Jul 09 05:57:32 2002 +0000
@@ -0,0 +1,3 @@
+
+#include <errno.h>
+#include "errors.c"