From 6667fa44a91fa6cef657258dd13d9dcfa90d0680 Mon Sep 17 00:00:00 2001
From: Jacob Adams <tookmund@gmail.com>
Date: Sun, 7 Jun 2015 16:46:39 -0400
Subject: [PATCH] Move netbsd2minix out of own folder

---
 .../{netbsd2minix => }/applywhitelist.sh       |  0
 releasetools/{netbsd2minix => }/minix.txt      |  2 ++
 .../{netbsd2minix/run.sh => netbsd2minix.sh}   | 18 +++++++++---------
 releasetools/{netbsd2minix => }/whitelist/bin  |  0
 .../{netbsd2minix => }/whitelist/common        |  0
 .../{netbsd2minix => }/whitelist/external      |  0
 .../{netbsd2minix => }/whitelist/games         |  0
 releasetools/{netbsd2minix => }/whitelist/gnu  |  0
 .../{netbsd2minix => }/whitelist/include       |  0
 releasetools/{netbsd2minix => }/whitelist/lib  |  0
 .../{netbsd2minix => }/whitelist/libexec       |  0
 releasetools/{netbsd2minix => }/whitelist/sbin |  0
 .../{netbsd2minix => }/whitelist/share         |  0
 releasetools/{netbsd2minix => }/whitelist/sys  |  0
 .../{netbsd2minix => }/whitelist/tests         |  0
 .../{netbsd2minix => }/whitelist/tools         |  0
 .../{netbsd2minix => }/whitelist/usr.bin       |  0
 .../{netbsd2minix => }/whitelist/usr.sbin      |  0
 18 files changed, 11 insertions(+), 9 deletions(-)
 rename releasetools/{netbsd2minix => }/applywhitelist.sh (100%)
 rename releasetools/{netbsd2minix => }/minix.txt (89%)
 rename releasetools/{netbsd2minix/run.sh => netbsd2minix.sh} (76%)
 rename releasetools/{netbsd2minix => }/whitelist/bin (100%)
 rename releasetools/{netbsd2minix => }/whitelist/common (100%)
 rename releasetools/{netbsd2minix => }/whitelist/external (100%)
 rename releasetools/{netbsd2minix => }/whitelist/games (100%)
 rename releasetools/{netbsd2minix => }/whitelist/gnu (100%)
 rename releasetools/{netbsd2minix => }/whitelist/include (100%)
 rename releasetools/{netbsd2minix => }/whitelist/lib (100%)
 rename releasetools/{netbsd2minix => }/whitelist/libexec (100%)
 rename releasetools/{netbsd2minix => }/whitelist/sbin (100%)
 rename releasetools/{netbsd2minix => }/whitelist/share (100%)
 rename releasetools/{netbsd2minix => }/whitelist/sys (100%)
 rename releasetools/{netbsd2minix => }/whitelist/tests (100%)
 rename releasetools/{netbsd2minix => }/whitelist/tools (100%)
 rename releasetools/{netbsd2minix => }/whitelist/usr.bin (100%)
 rename releasetools/{netbsd2minix => }/whitelist/usr.sbin (100%)

diff --git a/releasetools/netbsd2minix/applywhitelist.sh b/releasetools/applywhitelist.sh
similarity index 100%
rename from releasetools/netbsd2minix/applywhitelist.sh
rename to releasetools/applywhitelist.sh
diff --git a/releasetools/netbsd2minix/minix.txt b/releasetools/minix.txt
similarity index 89%
rename from releasetools/netbsd2minix/minix.txt
rename to releasetools/minix.txt
index 8d90150b1..6ce40b25f 100644
--- a/releasetools/netbsd2minix/minix.txt
+++ b/releasetools/minix.txt
@@ -1,6 +1,8 @@
 minix
 build.sh
 distrib
+docs
+etc
 Makefile
 releasetools
 regress
diff --git a/releasetools/netbsd2minix/run.sh b/releasetools/netbsd2minix.sh
similarity index 76%
rename from releasetools/netbsd2minix/run.sh
rename to releasetools/netbsd2minix.sh
index 191970633..d4125111c 100755
--- a/releasetools/netbsd2minix/run.sh
+++ b/releasetools/netbsd2minix.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 
 # Current source tree
-MINIX=`pwd`
-# NetBSD2Minix folder
-N2M=$MINIX/releasetools/netbsd2minix
+: ${MINIX=`pwd`}
+# releasetools folder
+: ${RT=$MINIX/releasetools}
 # NetBSD source tree
-NETBSD=$MINIX/../netbsd
+: ${NETBSD=$MINIX/../netbsd}
 # New source tree
-SRC=$MINIX/../newsrc
+: {SRC=$MINIX/../newsrc}
 
-export MINIX N2M NETBSD SRC
+export MINIX NETBSD SRC
 
 echo "Setup NetBSD"
 cd $NETBSD || (git clone --depth 1 git://github.com/jsonn/src $NETBSD && cd $NETBSD)
@@ -21,14 +21,14 @@ rm -rf $SRC/*
 
 echo "Apply whitelists"
 
-cd $N2M/whitelist
+cd $RT/whitelist
 for item in `ls`
 do
-	$N2M/applywhitelist.sh $NETBSD/$item $item < $item
+	$RT/applywhitelist.sh $NETBSD/$item $item < $item
 	echo "$item moved"
 done
 
-$N2M/applywhitelist.sh $MINIX . < $N2M/minix.txt
+$N2M/applywhitelist.sh $MINIX . < $RT/minix.txt
 
 echo "Apply special-cases"
 
diff --git a/releasetools/netbsd2minix/whitelist/bin b/releasetools/whitelist/bin
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/bin
rename to releasetools/whitelist/bin
diff --git a/releasetools/netbsd2minix/whitelist/common b/releasetools/whitelist/common
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/common
rename to releasetools/whitelist/common
diff --git a/releasetools/netbsd2minix/whitelist/external b/releasetools/whitelist/external
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/external
rename to releasetools/whitelist/external
diff --git a/releasetools/netbsd2minix/whitelist/games b/releasetools/whitelist/games
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/games
rename to releasetools/whitelist/games
diff --git a/releasetools/netbsd2minix/whitelist/gnu b/releasetools/whitelist/gnu
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/gnu
rename to releasetools/whitelist/gnu
diff --git a/releasetools/netbsd2minix/whitelist/include b/releasetools/whitelist/include
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/include
rename to releasetools/whitelist/include
diff --git a/releasetools/netbsd2minix/whitelist/lib b/releasetools/whitelist/lib
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/lib
rename to releasetools/whitelist/lib
diff --git a/releasetools/netbsd2minix/whitelist/libexec b/releasetools/whitelist/libexec
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/libexec
rename to releasetools/whitelist/libexec
diff --git a/releasetools/netbsd2minix/whitelist/sbin b/releasetools/whitelist/sbin
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/sbin
rename to releasetools/whitelist/sbin
diff --git a/releasetools/netbsd2minix/whitelist/share b/releasetools/whitelist/share
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/share
rename to releasetools/whitelist/share
diff --git a/releasetools/netbsd2minix/whitelist/sys b/releasetools/whitelist/sys
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/sys
rename to releasetools/whitelist/sys
diff --git a/releasetools/netbsd2minix/whitelist/tests b/releasetools/whitelist/tests
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/tests
rename to releasetools/whitelist/tests
diff --git a/releasetools/netbsd2minix/whitelist/tools b/releasetools/whitelist/tools
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/tools
rename to releasetools/whitelist/tools
diff --git a/releasetools/netbsd2minix/whitelist/usr.bin b/releasetools/whitelist/usr.bin
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/usr.bin
rename to releasetools/whitelist/usr.bin
diff --git a/releasetools/netbsd2minix/whitelist/usr.sbin b/releasetools/whitelist/usr.sbin
similarity index 100%
rename from releasetools/netbsd2minix/whitelist/usr.sbin
rename to releasetools/whitelist/usr.sbin