diskdev_cmds: Patch it all

21 files changed, 121 insertions, 8 deletions

diff --git a/diskdev_cmds/Makefile b/diskdev_cmds/Makefile
new file mode 100644
index 0000000..0ea0640
--- /dev/null
+++ b/diskdev_cmds/Makefile
@@ -0,0 +1,18 @@
+SUBDIR=	dev_mkdb.tproj \
+	edquota.tproj \
+	fdisk.tproj \
+	fsck.tproj \
+	fstyp.tproj \
+	fuser.tproj \
+	mount_devfs.tproj \
+	mount_fdesc.tproj \
+	mount.tproj \
+	quota.tproj \
+	quotacheck.tproj \
+	quotaon.tproj \
+	repquota.tproj \
+	setclass.tproj \
+	vndevice.tproj \
+	vsdbutil.tproj
+
+.include <bsd.subdir.mk>
diff --git a/diskdev_cmds/dev_mkdb.tproj/Makefile b/diskdev_cmds/dev_mkdb.tproj/Makefile
new file mode 100644
index 0000000..2871183
--- /dev/null
+++ b/diskdev_cmds/dev_mkdb.tproj/Makefile
@@ -0,0 +1,4 @@
+PROG=	dev_mkdb
+MAN=	dev_mkdb.8
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/disklib/preen.c b/diskdev_cmds/disklib/preen.c
index f7128e0..34a10a4 100644
--- a/diskdev_cmds/disklib/preen.c
+++ b/diskdev_cmds/disklib/preen.c
@@ -66,7 +66,6 @@
 #include <string.h>
 #include <TargetConditionals.h>
 
-#if TARGET_OS_OSX
 struct part {
 	struct	part *next;		/* forward link of partitions on disk */
 	char	*name;			/* device name */
@@ -387,6 +386,3 @@ rawname(name)
 	(void)strlcat(rawbuf, &dp[1], sizeof(rawbuf));
 	return (rawbuf);
 }
-
-#endif /* TARGET_OS_OSX */
-
diff --git a/diskdev_cmds/edquota.tproj/Makefile b/diskdev_cmds/edquota.tproj/Makefile
new file mode 100644
index 0000000..c45697f
--- /dev/null
+++ b/diskdev_cmds/edquota.tproj/Makefile
@@ -0,0 +1,4 @@
+PROG=	edquota
+MAN=	edquota.8
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/edt_fstab/edt_fstab.h b/diskdev_cmds/edt_fstab/edt_fstab.h
index 1fd4926..ef69480 100644
--- a/diskdev_cmds/edt_fstab/edt_fstab.h
+++ b/diskdev_cmds/edt_fstab/edt_fstab.h
@@ -29,8 +29,6 @@
 #ifndef edt_fstab_h
 #define edt_fstab_h
 
-#include <TargetConditionals.h>
-
 #if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
 #define RAMDISK_FS_SPEC         "ramdisk"
 
diff --git a/diskdev_cmds/fdisk.tproj/Makefile b/diskdev_cmds/fdisk.tproj/Makefile
new file mode 100644
index 0000000..c4b5f79
--- /dev/null
+++ b/diskdev_cmds/fdisk.tproj/Makefile
@@ -0,0 +1,14 @@
+PROG=	fdisk
+MAN=	fdisk.8
+SRCS=	auto.c \
+	cmd.c \
+	disk.c \
+	fdisk.c \
+	getrawpartition.c \
+	mbr.c \
+	misc.c \
+	opendev.c \
+	part.c \
+	user.c
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/fsck.tproj/Makefile b/diskdev_cmds/fsck.tproj/Makefile
new file mode 100644
index 0000000..8ac15de
--- /dev/null
+++ b/diskdev_cmds/fsck.tproj/Makefile
@@ -0,0 +1,6 @@
+PROG=	fsck
+MAN=	fsck.8
+
+CFLAGS+=-DTARGET_OS_SIMULATOR -DTARGET_OS_IPHONE=0
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/fsck.tproj/fsck.c b/diskdev_cmds/fsck.tproj/fsck.c
index dc44e77..9d2114b 100644
--- a/diskdev_cmds/fsck.tproj/fsck.c
+++ b/diskdev_cmds/fsck.tproj/fsck.c
@@ -72,8 +72,6 @@
 #include <sys/time.h>
 #include <signal.h>
 
-#include <TargetConditionals.h>
-
 #include "fsck.h"
 #include "../edt_fstab/edt_fstab.h"
 
diff --git a/diskdev_cmds/fstyp.tproj/Makefile b/diskdev_cmds/fstyp.tproj/Makefile
new file mode 100644
index 0000000..66f4830
--- /dev/null
+++ b/diskdev_cmds/fstyp.tproj/Makefile
@@ -0,0 +1,19 @@
+all:
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_msdos MAN=fstyp_msdos.8 all)
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_ntfs MAN=fstyp_ntfs.8 all)
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_udf MAN=fstyp_udf.8 all)
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp MAN=fstyp.8 all)
+
+clean:
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_msdos MAN=fstyp_msdos.8 clean)
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_ntfs MAN=fstyp_ntfs.8 clean)
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_udf MAN=fstyp_udf.8 clean)
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp MAN=fstyp.8 clean)
+
+install:
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_msdos MAN=fstyp_msdos.8 install)
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_ntfs MAN=fstyp_ntfs.8 install)
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_udf MAN=fstyp_udf.8 install)
+	(${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp MAN=fstyp.8 install)
+
+.PHONY: all clean install
diff --git a/diskdev_cmds/fstyp.tproj/progs.mk b/diskdev_cmds/fstyp.tproj/progs.mk
new file mode 100644
index 0000000..1fe9f5f
--- /dev/null
+++ b/diskdev_cmds/fstyp.tproj/progs.mk
@@ -0,0 +1 @@
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/fuser.tproj/Makefile b/diskdev_cmds/fuser.tproj/Makefile
new file mode 100644
index 0000000..a7ea1b6
--- /dev/null
+++ b/diskdev_cmds/fuser.tproj/Makefile
@@ -0,0 +1,3 @@
+SCRIPTS=	fuser.pl
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/mount.tproj/Makefile b/diskdev_cmds/mount.tproj/Makefile
new file mode 100644
index 0000000..cc671bf
--- /dev/null
+++ b/diskdev_cmds/mount.tproj/Makefile
@@ -0,0 +1,3 @@
+MAN=	fstab.5
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/mount_devfs.tproj/Makefile b/diskdev_cmds/mount_devfs.tproj/Makefile
new file mode 100644
index 0000000..d1d34aa
--- /dev/null
+++ b/diskdev_cmds/mount_devfs.tproj/Makefile
@@ -0,0 +1,6 @@
+PROG=	mount_devfs
+MAN=
+
+LDADD=-lutil
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/mount_fdesc.tproj/Makefile b/diskdev_cmds/mount_fdesc.tproj/Makefile
new file mode 100644
index 0000000..ac71999
--- /dev/null
+++ b/diskdev_cmds/mount_fdesc.tproj/Makefile
@@ -0,0 +1,6 @@
+PROG=	mount_fdesc
+MAN=	mount_fdesc.8
+
+LDADD=-lutil
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/quota.tproj/Makefile b/diskdev_cmds/quota.tproj/Makefile
new file mode 100644
index 0000000..6cf0042
--- /dev/null
+++ b/diskdev_cmds/quota.tproj/Makefile
@@ -0,0 +1,4 @@
+PROG=	quota
+MAN=	quota.1
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/quotacheck.tproj/Makefile b/diskdev_cmds/quotacheck.tproj/Makefile
new file mode 100644
index 0000000..bb4bc11
--- /dev/null
+++ b/diskdev_cmds/quotacheck.tproj/Makefile
@@ -0,0 +1,9 @@
+PROG=	quotacheck
+MAN=	quotacheck.8
+SRCS=	quotacheck.c \
+	hfs_quotacheck.c \
+	preen.c
+
+.PATH: ../disklib
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/quotaon.tproj/Makefile b/diskdev_cmds/quotaon.tproj/Makefile
new file mode 100644
index 0000000..7ab7ff7
--- /dev/null
+++ b/diskdev_cmds/quotaon.tproj/Makefile
@@ -0,0 +1,4 @@
+PROG=	quotaon
+MAN=	quotaon.8
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/repquota.tproj/Makefile b/diskdev_cmds/repquota.tproj/Makefile
new file mode 100644
index 0000000..f86e6f8
--- /dev/null
+++ b/diskdev_cmds/repquota.tproj/Makefile
@@ -0,0 +1,4 @@
+PROG=	repquota
+MAN=	repquota.8
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/setclass.tproj/Makefile b/diskdev_cmds/setclass.tproj/Makefile
new file mode 100644
index 0000000..d8d1d79
--- /dev/null
+++ b/diskdev_cmds/setclass.tproj/Makefile
@@ -0,0 +1,4 @@
+PROG=	setclass
+MAN=	setclass.8
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/vndevice.tproj/Makefile b/diskdev_cmds/vndevice.tproj/Makefile
new file mode 100644
index 0000000..9f1583d
--- /dev/null
+++ b/diskdev_cmds/vndevice.tproj/Makefile
@@ -0,0 +1,4 @@
+PROG=	vndevice
+MAN=
+
+.include <bsd.prog.mk>
diff --git a/diskdev_cmds/vsdbutil.tproj/Makefile b/diskdev_cmds/vsdbutil.tproj/Makefile
new file mode 100644
index 0000000..6e16426
--- /dev/null
+++ b/diskdev_cmds/vsdbutil.tproj/Makefile
@@ -0,0 +1,8 @@
+PROG=	vsdbutil
+MAN=	vsdbutil.8
+SRCS=	vsdbutil_main.c \
+	mount_flags.c
+
+.PATH: ../mount_flags_dir
+
+.include <bsd.prog.mk>