bintrans: move files to a new directory

And reflect the change in various places.

Makefile.inc1

@@ -2393,7 +2393,7 @@ _basic_bootstrap_tools_multilink+=usr.bin/awk awk,nawk
 # file2c is required for building usr.sbin/config:
 _basic_bootstrap_tools+=usr.bin/file2c
 # uuencode/uudecode required for share/tabset
-_basic_bootstrap_tools_multilink+=usr.bin/uuencode uuencode,uudecode
+_basic_bootstrap_tools_multilink+=usr.bin/bintrans uuencode,uudecode
 # xargs is required by mkioctls
 _basic_bootstrap_tools+=usr.bin/xargs
 # cap_mkdb is required for share/termcap:

ObsoleteFiles.inc

@@ -52,6 +52,31 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20220418: uudecode merged into uuencode and renamed to bintrans
+OLD_FILES+=usr/lib/debug/usr/bin/uuencode.debug
+OLD_FILES+=usr/lib/debug/usr/bin/uudecode.debug
+OLD_FILES+=usr/tests/usr.bin/uuencode/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/uuencode/legacy_test
+OLD_FILES+=usr/tests/usr.bin/uuencode/regress.base64.in
+OLD_FILES+=usr/tests/usr.bin/uuencode/regress.traditional.out
+OLD_FILES+=usr/tests/usr.bin/uuencode/regress.traditional.in
+OLD_FILES+=usr/tests/usr.bin/uuencode/regress.out
+OLD_FILES+=usr/tests/usr.bin/uuencode/regress.sh
+OLD_FILES+=usr/tests/usr.bin/uuencode/regress.in
+OLD_FILES+=usr/tests/usr.bin/uuencode/regress.153276.in
+OLD_FILES+=usr/tests/usr.bin/uuencode/regress.base64.out
+OLD_FILES+=usr/tests/usr.bin/uuencode/regress.153276.out
+OLD_FILES+=usr/tests/usr.bin/uudecode/regress.base64.in
+OLD_FILES+=usr/tests/usr.bin/uudecode/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/uudecode/regress.out
+OLD_FILES+=usr/tests/usr.bin/uudecode/regress.sh
+OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.out
+OLD_FILES+=usr/tests/usr.bin/uudecode/regress.traditional.in
+OLD_FILES+=usr/tests/usr.bin/uudecode/legacy_test
+OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.in
+OLD_DIRS+=usr/tests/usr.bin/uuencode
+OLD_DIRS+=usr/tests/usr.bin/uudecode
+
 # 20220318: snd_ds1 and snd_maestro drivers removed
 OLD_FILES+=usr/share/man/man4/snd_ds1.4.gz
 OLD_FILES+=usr/share/man/man4/snd_maestro.4.gz

etc/mtree/BSD.tests.dist

@@ -884,6 +884,8 @@
         ..
         basename
         ..
+        bintrans
+        ..
         bmake
             archives
                 fmt_44bsd
@@ -1088,8 +1090,6 @@
         ..
         units
         ..
-        uuencode
-        ..
         unifdef
         ..
         uniq

targets/pseudo/tests/Makefile.depend

@@ -266,6 +266,7 @@ DIRDEPS= \
       tests/sys/vm \
       usr.bin/apply/tests \
       usr.bin/basename/tests \
+      usr.bin/bintrans/tests \
       usr.bin/bmake/tests \
       usr.bin/bmake/tests/archives \
       usr.bin/bmake/tests/archives/fmt_44bsd \
@@ -358,7 +359,6 @@ DIRDEPS= \
       usr.bin/truncate/tests \
       usr.bin/uniq/tests \
       usr.bin/units/tests \
-      usr.bin/uuencode/tests \
       usr.bin/xargs/tests \
       usr.bin/xinstall/tests \
       usr.bin/xo/tests \

targets/pseudo/userland/Makefile.depend

@@ -147,6 +147,7 @@ DIRDEPS+= \
 	usr.bin/basename \
 	usr.bin/bc \
 	usr.bin/biff \
+	usr.bin/bintrans \
 	usr.bin/bluetooth/bthost \
 	usr.bin/bluetooth/btsockstat \
 	usr.bin/bluetooth/rfcomm_sppd \
@@ -365,7 +366,6 @@ DIRDEPS+= \
 	usr.bin/usbhidaction \
 	usr.bin/usbhidctl \
 	usr.bin/users \
-	usr.bin/uuencode \
 	usr.bin/vacation \
 	usr.bin/vgrind \
 	usr.bin/vi \

usr.bin/Makefile

@@ -11,6 +11,7 @@ SUBDIR=	alias \
 	banner \
 	basename \
 	beep \
+	bintrans \
 	brandelf \
 	bsdcat \
 	bsddialog \
@@ -169,7 +170,6 @@ SUBDIR=	alias \
 	unzip \
 	units \
 	unvis \
-	uuencode \
 	vis \
 	vmstat \
 	w \