git: 47bcbde91dea - main - bintrans: move files to a new directory
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 18 Apr 2022 08:54:10 UTC
The branch main has been updated by pstef:
URL: https://cgit.FreeBSD.org/src/commit/?id=47bcbde91dea630d4996b1a7b2c33925fe8d5b5b
commit 47bcbde91dea630d4996b1a7b2c33925fe8d5b5b
Author: Piotr Pawel Stefaniak <pstef@FreeBSD.org>
AuthorDate: 2022-04-17 09:04:08 +0000
Commit: Piotr Pawel Stefaniak <pstef@FreeBSD.org>
CommitDate: 2022-04-18 08:53:11 +0000
bintrans: move files to a new directory
And reflect the change in various places.
---
Makefile.inc1 | 2 +-
ObsoleteFiles.inc | 25 +++++++++++++++++++++
etc/mtree/BSD.tests.dist | 4 ++--
targets/pseudo/tests/Makefile.depend | 2 +-
targets/pseudo/userland/Makefile.depend | 2 +-
usr.bin/Makefile | 2 +-
usr.bin/{uuencode => bintrans}/Makefile | 0
usr.bin/{uuencode => bintrans}/Makefile.depend | 0
usr.bin/{uuencode => bintrans}/bintrans.1 | 0
usr.bin/{uuencode => bintrans}/bintrans.c | 0
usr.bin/{uuencode => bintrans}/tests/Makefile | 0
.../{uuencode => bintrans}/tests/Makefile.depend | 0
.../{uuencode => bintrans}/tests/legacy_test.sh | 0
.../{uuencode => bintrans}/tests/regress.153276.in | 0
.../tests/regress.153276.out | 0
.../{uuencode => bintrans}/tests/regress.base64.in | 0
.../tests/regress.base64.out | 0
usr.bin/{uuencode => bintrans}/tests/regress.in | Bin
usr.bin/{uuencode => bintrans}/tests/regress.out | Bin
usr.bin/{uuencode => bintrans}/tests/regress.sh | 0
.../tests/regress.traditional.in | 0
.../tests/regress.traditional.out | 0
usr.bin/{uuencode => bintrans}/uudecode.c | 0
usr.bin/{uuencode => bintrans}/uuencode.c | 0
usr.bin/{uuencode => bintrans}/uuencode.format.5 | 0
25 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 303dd62a3bed..2b913e4e51f8 100644
--- a/Makefile.inc1
+++ b/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:
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 9afd4ec7e23d..c75e6f14c90d 100644
--- a/ObsoleteFiles.inc
+++ b/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
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 55fcd2796d43..72d044be1005 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -884,6 +884,8 @@
..
basename
..
+ bintrans
+ ..
bmake
archives
fmt_44bsd
@@ -1088,8 +1090,6 @@
..
units
..
- uuencode
- ..
unifdef
..
uniq
diff --git a/targets/pseudo/tests/Makefile.depend b/targets/pseudo/tests/Makefile.depend
index 1f146cab5851..b70ac1839efc 100644
--- a/targets/pseudo/tests/Makefile.depend
+++ b/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 \
diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend
index 3ac9c23ec67e..2d6b51d58c80 100644
--- a/targets/pseudo/userland/Makefile.depend
+++ b/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 \
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 63a660ce0c18..64bc857416ef 100644
--- a/usr.bin/Makefile
+++ b/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 \
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/bintrans/Makefile
similarity index 100%
rename from usr.bin/uuencode/Makefile
rename to usr.bin/bintrans/Makefile
diff --git a/usr.bin/uuencode/Makefile.depend b/usr.bin/bintrans/Makefile.depend
similarity index 100%
rename from usr.bin/uuencode/Makefile.depend
rename to usr.bin/bintrans/Makefile.depend
diff --git a/usr.bin/uuencode/bintrans.1 b/usr.bin/bintrans/bintrans.1
similarity index 100%
rename from usr.bin/uuencode/bintrans.1
rename to usr.bin/bintrans/bintrans.1
diff --git a/usr.bin/uuencode/bintrans.c b/usr.bin/bintrans/bintrans.c
similarity index 100%
rename from usr.bin/uuencode/bintrans.c
rename to usr.bin/bintrans/bintrans.c
diff --git a/usr.bin/uuencode/tests/Makefile b/usr.bin/bintrans/tests/Makefile
similarity index 100%
rename from usr.bin/uuencode/tests/Makefile
rename to usr.bin/bintrans/tests/Makefile
diff --git a/usr.bin/uuencode/tests/Makefile.depend b/usr.bin/bintrans/tests/Makefile.depend
similarity index 100%
rename from usr.bin/uuencode/tests/Makefile.depend
rename to usr.bin/bintrans/tests/Makefile.depend
diff --git a/usr.bin/uuencode/tests/legacy_test.sh b/usr.bin/bintrans/tests/legacy_test.sh
similarity index 100%
rename from usr.bin/uuencode/tests/legacy_test.sh
rename to usr.bin/bintrans/tests/legacy_test.sh
diff --git a/usr.bin/uuencode/tests/regress.153276.in b/usr.bin/bintrans/tests/regress.153276.in
similarity index 100%
rename from usr.bin/uuencode/tests/regress.153276.in
rename to usr.bin/bintrans/tests/regress.153276.in
diff --git a/usr.bin/uuencode/tests/regress.153276.out b/usr.bin/bintrans/tests/regress.153276.out
similarity index 100%
rename from usr.bin/uuencode/tests/regress.153276.out
rename to usr.bin/bintrans/tests/regress.153276.out
diff --git a/usr.bin/uuencode/tests/regress.base64.in b/usr.bin/bintrans/tests/regress.base64.in
similarity index 100%
rename from usr.bin/uuencode/tests/regress.base64.in
rename to usr.bin/bintrans/tests/regress.base64.in
diff --git a/usr.bin/uuencode/tests/regress.base64.out b/usr.bin/bintrans/tests/regress.base64.out
similarity index 100%
rename from usr.bin/uuencode/tests/regress.base64.out
rename to usr.bin/bintrans/tests/regress.base64.out
diff --git a/usr.bin/uuencode/tests/regress.in b/usr.bin/bintrans/tests/regress.in
similarity index 100%
rename from usr.bin/uuencode/tests/regress.in
rename to usr.bin/bintrans/tests/regress.in
diff --git a/usr.bin/uuencode/tests/regress.out b/usr.bin/bintrans/tests/regress.out
similarity index 100%
rename from usr.bin/uuencode/tests/regress.out
rename to usr.bin/bintrans/tests/regress.out
diff --git a/usr.bin/uuencode/tests/regress.sh b/usr.bin/bintrans/tests/regress.sh
similarity index 100%
rename from usr.bin/uuencode/tests/regress.sh
rename to usr.bin/bintrans/tests/regress.sh
diff --git a/usr.bin/uuencode/tests/regress.traditional.in b/usr.bin/bintrans/tests/regress.traditional.in
similarity index 100%
rename from usr.bin/uuencode/tests/regress.traditional.in
rename to usr.bin/bintrans/tests/regress.traditional.in
diff --git a/usr.bin/uuencode/tests/regress.traditional.out b/usr.bin/bintrans/tests/regress.traditional.out
similarity index 100%
rename from usr.bin/uuencode/tests/regress.traditional.out
rename to usr.bin/bintrans/tests/regress.traditional.out
diff --git a/usr.bin/uuencode/uudecode.c b/usr.bin/bintrans/uudecode.c
similarity index 100%
rename from usr.bin/uuencode/uudecode.c
rename to usr.bin/bintrans/uudecode.c
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/bintrans/uuencode.c
similarity index 100%
rename from usr.bin/uuencode/uuencode.c
rename to usr.bin/bintrans/uuencode.c
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/bintrans/uuencode.format.5
similarity index 100%
rename from usr.bin/uuencode/uuencode.format.5
rename to usr.bin/bintrans/uuencode.format.5