From bfe46b8de20a030206f3976b509b9e4ee9911a61 Mon Sep 17 00:00:00 2001
From: Jacob Adams <tookmund@gmail.com>
Date: Sat, 6 Jun 2015 19:14:11 -0400
Subject: [PATCH] Almost done

Basically works just need to fix one last odd error
---
 releasetools/netbsd2minix/applywhitelist.sh |  3 +--
 releasetools/netbsd2minix/minix.txt         |  8 --------
 releasetools/netbsd2minix/run.sh            | 12 ++++++++----
 releasetools/netbsd2minix/special.sh        | 15 +++++++++++++++
 releasetools/netbsd2minix/whitelist/share   |  1 -
 releasetools/netbsd2minix/whitelist/tools   |  6 ------
 releasetools/netbsd2minix/whitelists.sh     |  4 ++--
 7 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100755 releasetools/netbsd2minix/special.sh

diff --git a/releasetools/netbsd2minix/applywhitelist.sh b/releasetools/netbsd2minix/applywhitelist.sh
index e119da241..b9c618417 100755
--- a/releasetools/netbsd2minix/applywhitelist.sh
+++ b/releasetools/netbsd2minix/applywhitelist.sh
@@ -1,10 +1,9 @@
 #!/bin/sh
 # Assume $1 is whitelist working directory
 cd $1
-mkdir -p $SRC/$1
 while read dir
 do
-	cp -rf $dir $SRC/$1
+	cp -rf $dir $SRC/$2
 done
 
 cd $MINIX
diff --git a/releasetools/netbsd2minix/minix.txt b/releasetools/netbsd2minix/minix.txt
index afa594b93..8d90150b1 100644
--- a/releasetools/netbsd2minix/minix.txt
+++ b/releasetools/netbsd2minix/minix.txt
@@ -6,11 +6,3 @@ releasetools
 regress
 .gitignore
 .gitreview
-external/Makefile
-bin/Makefile
-games/Makefile
-gnu/Makefile
-libexec/Makefile
-sbin/Makefile
-usr.bin/Makefile
-usr.sbin/Makefile
diff --git a/releasetools/netbsd2minix/run.sh b/releasetools/netbsd2minix/run.sh
index ea379a6b6..b6ceb064b 100755
--- a/releasetools/netbsd2minix/run.sh
+++ b/releasetools/netbsd2minix/run.sh
@@ -11,11 +11,15 @@ SRC=$N2M/src
 
 export MINIX N2M NETBSD SRC
 
-
+echo "Setup NetBSD"
 $N2M/setupnetbsd.sh
+
+echo "Clear new src tree"
 mkdir -p $SRC
 rm -rf $SRC/*
-$N2M/whitelists.sh
-cd $SRC
 
-./build.sh -m i386 build
+echo "Apply whitelists"
+$N2M/whitelists.sh
+
+echo "Apply special-cases"
+$N2M/special.sh
diff --git a/releasetools/netbsd2minix/special.sh b/releasetools/netbsd2minix/special.sh
new file mode 100755
index 000000000..ea61cfc28
--- /dev/null
+++ b/releasetools/netbsd2minix/special.sh
@@ -0,0 +1,15 @@
+# Manually-copied files
+
+for dir in "external bin games gnu libexec sbin usr.bin usr.sbin"
+do
+	cp -f $MINIX/$dir/Makefile $SRC/$dir
+done
+
+cp -r $MINIX/include/cdbr.h $SRC/include
+cp -r $MINIX/share/zoneinfo $SRC/share
+cp -r $MINIX/tools/llvm-librt $SRC/tools
+cp -r $MINIX/tools/mkfs.mfs $SRC/tools
+cp -r $MINIX/tools/mkproto $SRC/tools
+cp -r $MINIX/tools/partition $SRC/tools
+cp -r $MINIX/tools/toproto $SRC/tools
+cp -r $MINIX/tools/writeisofs $SRC/tools
diff --git a/releasetools/netbsd2minix/whitelist/share b/releasetools/netbsd2minix/whitelist/share
index 2c8fc744f..0456cab68 100644
--- a/releasetools/netbsd2minix/whitelist/share
+++ b/releasetools/netbsd2minix/whitelist/share
@@ -4,4 +4,3 @@ Makefile.inc
 misc
 mk
 terminfo
-zoneinfo
diff --git a/releasetools/netbsd2minix/whitelist/tools b/releasetools/netbsd2minix/whitelist/tools
index 86cea17e2..9e3735c99 100644
--- a/releasetools/netbsd2minix/whitelist/tools
+++ b/releasetools/netbsd2minix/whitelist/tools
@@ -19,7 +19,6 @@ llvm-clang
 llvm-clang-tblgen
 llvm-include
 llvm-lib
-llvm-librt
 llvm-lld
 llvm-mcld
 llvm-tblgen
@@ -35,16 +34,13 @@ Makefile.nbincludes
 makewhatis
 mandoc
 mkdep
-mkfs.mfs
 mkheaderlist.sh
 mknod
-mkproto
 mktemp
 mpc
 mpfr
 mtree
 nbperf
-partition
 pax
 pwd_mkdb
 sed
@@ -52,8 +48,6 @@ stat
 strfile
 texinfo
 tic
-toproto
 tsort
-writeisofs
 yacc
 zic
diff --git a/releasetools/netbsd2minix/whitelists.sh b/releasetools/netbsd2minix/whitelists.sh
index 3b7f761ad..a626aa248 100755
--- a/releasetools/netbsd2minix/whitelists.sh
+++ b/releasetools/netbsd2minix/whitelists.sh
@@ -1,10 +1,10 @@
 cd $N2M/whitelist
 for item in `ls`
 do
-	$N2M/applywhitelist.sh $NETBSD/$item < $item
+	$N2M/applywhitelist.sh $NETBSD/$item $item < $item
 	echo "$item moved"
 done
 
-$N2M/applywhitelist.sh $MINIX < $N2M/minix.txt
+$N2M/applywhitelist.sh $MINIX . < $N2M/minix.txt
 
 cd $MINIX