diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 16e9be51d920..4f290dd462ff 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -33,7 +33,7 @@ LIBADD= pthread PRIVATELIB= yes -ZSTDDIR= ${SRCTOP}/contrib/zstd +ZSTDDIR= ${SRCTOP}/sys/contrib/zstd .PATH: ${ZSTDDIR}/lib/common ${ZSTDDIR}/lib/compress \ ${ZSTDDIR}/lib/decompress ${ZSTDDIR}/lib/deprecated \ ${ZSTDDIR}/lib/dictBuilder ${ZSTDDIR}/lib diff --git a/contrib/zstd/.buckconfig b/sys/contrib/zstd/.buckconfig similarity index 100% rename from contrib/zstd/.buckconfig rename to sys/contrib/zstd/.buckconfig diff --git a/contrib/zstd/.buckversion b/sys/contrib/zstd/.buckversion similarity index 100% rename from contrib/zstd/.buckversion rename to sys/contrib/zstd/.buckversion diff --git a/contrib/zstd/.gitattributes b/sys/contrib/zstd/.gitattributes similarity index 100% rename from contrib/zstd/.gitattributes rename to sys/contrib/zstd/.gitattributes diff --git a/contrib/zstd/CONTRIBUTING.md b/sys/contrib/zstd/CONTRIBUTING.md similarity index 100% rename from contrib/zstd/CONTRIBUTING.md rename to sys/contrib/zstd/CONTRIBUTING.md diff --git a/contrib/zstd/COPYING b/sys/contrib/zstd/COPYING similarity index 100% rename from contrib/zstd/COPYING rename to sys/contrib/zstd/COPYING diff --git a/contrib/zstd/LICENSE b/sys/contrib/zstd/LICENSE similarity index 100% rename from contrib/zstd/LICENSE rename to sys/contrib/zstd/LICENSE diff --git a/contrib/zstd/Makefile b/sys/contrib/zstd/Makefile similarity index 100% rename from contrib/zstd/Makefile rename to sys/contrib/zstd/Makefile diff --git a/contrib/zstd/NEWS b/sys/contrib/zstd/NEWS similarity index 100% rename from contrib/zstd/NEWS rename to sys/contrib/zstd/NEWS diff --git a/contrib/zstd/README.md b/sys/contrib/zstd/README.md similarity index 100% rename from contrib/zstd/README.md rename to sys/contrib/zstd/README.md diff --git a/contrib/zstd/TESTING.md b/sys/contrib/zstd/TESTING.md similarity index 100% rename from contrib/zstd/TESTING.md rename to sys/contrib/zstd/TESTING.md diff --git a/contrib/zstd/appveyor.yml b/sys/contrib/zstd/appveyor.yml similarity index 100% rename from contrib/zstd/appveyor.yml rename to sys/contrib/zstd/appveyor.yml diff --git a/contrib/zstd/circle.yml b/sys/contrib/zstd/circle.yml similarity index 100% rename from contrib/zstd/circle.yml rename to sys/contrib/zstd/circle.yml diff --git a/contrib/zstd/contrib/cleanTabs b/sys/contrib/zstd/contrib/cleanTabs similarity index 100% rename from contrib/zstd/contrib/cleanTabs rename to sys/contrib/zstd/contrib/cleanTabs diff --git a/contrib/zstd/contrib/gen_html/.gitignore b/sys/contrib/zstd/contrib/gen_html/.gitignore similarity index 100% rename from contrib/zstd/contrib/gen_html/.gitignore rename to sys/contrib/zstd/contrib/gen_html/.gitignore diff --git a/contrib/zstd/contrib/gen_html/Makefile b/sys/contrib/zstd/contrib/gen_html/Makefile similarity index 100% rename from contrib/zstd/contrib/gen_html/Makefile rename to sys/contrib/zstd/contrib/gen_html/Makefile diff --git a/contrib/zstd/contrib/gen_html/README.md b/sys/contrib/zstd/contrib/gen_html/README.md similarity index 100% rename from contrib/zstd/contrib/gen_html/README.md rename to sys/contrib/zstd/contrib/gen_html/README.md diff --git a/contrib/zstd/contrib/gen_html/gen-zstd-manual.sh b/sys/contrib/zstd/contrib/gen_html/gen-zstd-manual.sh similarity index 100% rename from contrib/zstd/contrib/gen_html/gen-zstd-manual.sh rename to sys/contrib/zstd/contrib/gen_html/gen-zstd-manual.sh diff --git a/contrib/zstd/contrib/gen_html/gen_html.cpp b/sys/contrib/zstd/contrib/gen_html/gen_html.cpp similarity index 100% rename from contrib/zstd/contrib/gen_html/gen_html.cpp rename to sys/contrib/zstd/contrib/gen_html/gen_html.cpp diff --git a/contrib/zstd/contrib/meson/README b/sys/contrib/zstd/contrib/meson/README similarity index 100% rename from contrib/zstd/contrib/meson/README rename to sys/contrib/zstd/contrib/meson/README diff --git a/contrib/zstd/contrib/meson/meson.build b/sys/contrib/zstd/contrib/meson/meson.build similarity index 100% rename from contrib/zstd/contrib/meson/meson.build rename to sys/contrib/zstd/contrib/meson/meson.build diff --git a/contrib/zstd/contrib/meson/meson_options.txt b/sys/contrib/zstd/contrib/meson/meson_options.txt similarity index 100% rename from contrib/zstd/contrib/meson/meson_options.txt rename to sys/contrib/zstd/contrib/meson/meson_options.txt diff --git a/contrib/zstd/contrib/pzstd/.gitignore b/sys/contrib/zstd/contrib/pzstd/.gitignore similarity index 100% rename from contrib/zstd/contrib/pzstd/.gitignore rename to sys/contrib/zstd/contrib/pzstd/.gitignore diff --git a/contrib/zstd/contrib/pzstd/BUCK b/sys/contrib/zstd/contrib/pzstd/BUCK similarity index 100% rename from contrib/zstd/contrib/pzstd/BUCK rename to sys/contrib/zstd/contrib/pzstd/BUCK diff --git a/contrib/zstd/contrib/pzstd/ErrorHolder.h b/sys/contrib/zstd/contrib/pzstd/ErrorHolder.h similarity index 100% rename from contrib/zstd/contrib/pzstd/ErrorHolder.h rename to sys/contrib/zstd/contrib/pzstd/ErrorHolder.h diff --git a/contrib/zstd/contrib/pzstd/Logging.h b/sys/contrib/zstd/contrib/pzstd/Logging.h similarity index 100% rename from contrib/zstd/contrib/pzstd/Logging.h rename to sys/contrib/zstd/contrib/pzstd/Logging.h diff --git a/contrib/zstd/contrib/pzstd/Makefile b/sys/contrib/zstd/contrib/pzstd/Makefile similarity index 100% rename from contrib/zstd/contrib/pzstd/Makefile rename to sys/contrib/zstd/contrib/pzstd/Makefile diff --git a/contrib/zstd/contrib/pzstd/Options.cpp b/sys/contrib/zstd/contrib/pzstd/Options.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/Options.cpp rename to sys/contrib/zstd/contrib/pzstd/Options.cpp diff --git a/contrib/zstd/contrib/pzstd/Options.h b/sys/contrib/zstd/contrib/pzstd/Options.h similarity index 100% rename from contrib/zstd/contrib/pzstd/Options.h rename to sys/contrib/zstd/contrib/pzstd/Options.h diff --git a/contrib/zstd/contrib/pzstd/Pzstd.cpp b/sys/contrib/zstd/contrib/pzstd/Pzstd.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/Pzstd.cpp rename to sys/contrib/zstd/contrib/pzstd/Pzstd.cpp diff --git a/contrib/zstd/contrib/pzstd/Pzstd.h b/sys/contrib/zstd/contrib/pzstd/Pzstd.h similarity index 100% rename from contrib/zstd/contrib/pzstd/Pzstd.h rename to sys/contrib/zstd/contrib/pzstd/Pzstd.h diff --git a/contrib/zstd/contrib/pzstd/README.md b/sys/contrib/zstd/contrib/pzstd/README.md similarity index 100% rename from contrib/zstd/contrib/pzstd/README.md rename to sys/contrib/zstd/contrib/pzstd/README.md diff --git a/contrib/zstd/contrib/pzstd/SkippableFrame.cpp b/sys/contrib/zstd/contrib/pzstd/SkippableFrame.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/SkippableFrame.cpp rename to sys/contrib/zstd/contrib/pzstd/SkippableFrame.cpp diff --git a/contrib/zstd/contrib/pzstd/SkippableFrame.h b/sys/contrib/zstd/contrib/pzstd/SkippableFrame.h similarity index 100% rename from contrib/zstd/contrib/pzstd/SkippableFrame.h rename to sys/contrib/zstd/contrib/pzstd/SkippableFrame.h diff --git a/contrib/zstd/contrib/pzstd/images/Cspeed.png b/sys/contrib/zstd/contrib/pzstd/images/Cspeed.png similarity index 100% rename from contrib/zstd/contrib/pzstd/images/Cspeed.png rename to sys/contrib/zstd/contrib/pzstd/images/Cspeed.png diff --git a/contrib/zstd/contrib/pzstd/images/Dspeed.png b/sys/contrib/zstd/contrib/pzstd/images/Dspeed.png similarity index 100% rename from contrib/zstd/contrib/pzstd/images/Dspeed.png rename to sys/contrib/zstd/contrib/pzstd/images/Dspeed.png diff --git a/contrib/zstd/contrib/pzstd/main.cpp b/sys/contrib/zstd/contrib/pzstd/main.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/main.cpp rename to sys/contrib/zstd/contrib/pzstd/main.cpp diff --git a/contrib/zstd/contrib/pzstd/test/BUCK b/sys/contrib/zstd/contrib/pzstd/test/BUCK similarity index 100% rename from contrib/zstd/contrib/pzstd/test/BUCK rename to sys/contrib/zstd/contrib/pzstd/test/BUCK diff --git a/contrib/zstd/contrib/pzstd/test/OptionsTest.cpp b/sys/contrib/zstd/contrib/pzstd/test/OptionsTest.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/test/OptionsTest.cpp rename to sys/contrib/zstd/contrib/pzstd/test/OptionsTest.cpp diff --git a/contrib/zstd/contrib/pzstd/test/PzstdTest.cpp b/sys/contrib/zstd/contrib/pzstd/test/PzstdTest.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/test/PzstdTest.cpp rename to sys/contrib/zstd/contrib/pzstd/test/PzstdTest.cpp diff --git a/contrib/zstd/contrib/pzstd/test/RoundTrip.h b/sys/contrib/zstd/contrib/pzstd/test/RoundTrip.h similarity index 100% rename from contrib/zstd/contrib/pzstd/test/RoundTrip.h rename to sys/contrib/zstd/contrib/pzstd/test/RoundTrip.h diff --git a/contrib/zstd/contrib/pzstd/test/RoundTripTest.cpp b/sys/contrib/zstd/contrib/pzstd/test/RoundTripTest.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/test/RoundTripTest.cpp rename to sys/contrib/zstd/contrib/pzstd/test/RoundTripTest.cpp diff --git a/contrib/zstd/contrib/pzstd/utils/BUCK b/sys/contrib/zstd/contrib/pzstd/utils/BUCK similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/BUCK rename to sys/contrib/zstd/contrib/pzstd/utils/BUCK diff --git a/contrib/zstd/contrib/pzstd/utils/Buffer.h b/sys/contrib/zstd/contrib/pzstd/utils/Buffer.h similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/Buffer.h rename to sys/contrib/zstd/contrib/pzstd/utils/Buffer.h diff --git a/contrib/zstd/contrib/pzstd/utils/FileSystem.h b/sys/contrib/zstd/contrib/pzstd/utils/FileSystem.h similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/FileSystem.h rename to sys/contrib/zstd/contrib/pzstd/utils/FileSystem.h diff --git a/contrib/zstd/contrib/pzstd/utils/Likely.h b/sys/contrib/zstd/contrib/pzstd/utils/Likely.h similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/Likely.h rename to sys/contrib/zstd/contrib/pzstd/utils/Likely.h diff --git a/contrib/zstd/contrib/pzstd/utils/Range.h b/sys/contrib/zstd/contrib/pzstd/utils/Range.h similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/Range.h rename to sys/contrib/zstd/contrib/pzstd/utils/Range.h diff --git a/contrib/zstd/contrib/pzstd/utils/ResourcePool.h b/sys/contrib/zstd/contrib/pzstd/utils/ResourcePool.h similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/ResourcePool.h rename to sys/contrib/zstd/contrib/pzstd/utils/ResourcePool.h diff --git a/contrib/zstd/contrib/pzstd/utils/ScopeGuard.h b/sys/contrib/zstd/contrib/pzstd/utils/ScopeGuard.h similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/ScopeGuard.h rename to sys/contrib/zstd/contrib/pzstd/utils/ScopeGuard.h diff --git a/contrib/zstd/contrib/pzstd/utils/ThreadPool.h b/sys/contrib/zstd/contrib/pzstd/utils/ThreadPool.h similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/ThreadPool.h rename to sys/contrib/zstd/contrib/pzstd/utils/ThreadPool.h diff --git a/contrib/zstd/contrib/pzstd/utils/WorkQueue.h b/sys/contrib/zstd/contrib/pzstd/utils/WorkQueue.h similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/WorkQueue.h rename to sys/contrib/zstd/contrib/pzstd/utils/WorkQueue.h diff --git a/contrib/zstd/contrib/pzstd/utils/test/BUCK b/sys/contrib/zstd/contrib/pzstd/utils/test/BUCK similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/test/BUCK rename to sys/contrib/zstd/contrib/pzstd/utils/test/BUCK diff --git a/contrib/zstd/contrib/pzstd/utils/test/BufferTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/BufferTest.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/test/BufferTest.cpp rename to sys/contrib/zstd/contrib/pzstd/utils/test/BufferTest.cpp diff --git a/contrib/zstd/contrib/pzstd/utils/test/RangeTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/RangeTest.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/test/RangeTest.cpp rename to sys/contrib/zstd/contrib/pzstd/utils/test/RangeTest.cpp diff --git a/contrib/zstd/contrib/pzstd/utils/test/ResourcePoolTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/ResourcePoolTest.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/test/ResourcePoolTest.cpp rename to sys/contrib/zstd/contrib/pzstd/utils/test/ResourcePoolTest.cpp diff --git a/contrib/zstd/contrib/pzstd/utils/test/ScopeGuardTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/ScopeGuardTest.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/test/ScopeGuardTest.cpp rename to sys/contrib/zstd/contrib/pzstd/utils/test/ScopeGuardTest.cpp diff --git a/contrib/zstd/contrib/pzstd/utils/test/ThreadPoolTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/ThreadPoolTest.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/test/ThreadPoolTest.cpp rename to sys/contrib/zstd/contrib/pzstd/utils/test/ThreadPoolTest.cpp diff --git a/contrib/zstd/contrib/pzstd/utils/test/WorkQueueTest.cpp b/sys/contrib/zstd/contrib/pzstd/utils/test/WorkQueueTest.cpp similarity index 100% rename from contrib/zstd/contrib/pzstd/utils/test/WorkQueueTest.cpp rename to sys/contrib/zstd/contrib/pzstd/utils/test/WorkQueueTest.cpp diff --git a/contrib/zstd/contrib/seekable_format/examples/.gitignore b/sys/contrib/zstd/contrib/seekable_format/examples/.gitignore similarity index 100% rename from contrib/zstd/contrib/seekable_format/examples/.gitignore rename to sys/contrib/zstd/contrib/seekable_format/examples/.gitignore diff --git a/contrib/zstd/contrib/seekable_format/examples/Makefile b/sys/contrib/zstd/contrib/seekable_format/examples/Makefile similarity index 100% rename from contrib/zstd/contrib/seekable_format/examples/Makefile rename to sys/contrib/zstd/contrib/seekable_format/examples/Makefile diff --git a/contrib/zstd/contrib/seekable_format/examples/parallel_compression.c b/sys/contrib/zstd/contrib/seekable_format/examples/parallel_compression.c similarity index 100% rename from contrib/zstd/contrib/seekable_format/examples/parallel_compression.c rename to sys/contrib/zstd/contrib/seekable_format/examples/parallel_compression.c diff --git a/contrib/zstd/contrib/seekable_format/examples/parallel_processing.c b/sys/contrib/zstd/contrib/seekable_format/examples/parallel_processing.c similarity index 100% rename from contrib/zstd/contrib/seekable_format/examples/parallel_processing.c rename to sys/contrib/zstd/contrib/seekable_format/examples/parallel_processing.c diff --git a/contrib/zstd/contrib/seekable_format/examples/seekable_compression.c b/sys/contrib/zstd/contrib/seekable_format/examples/seekable_compression.c similarity index 100% rename from contrib/zstd/contrib/seekable_format/examples/seekable_compression.c rename to sys/contrib/zstd/contrib/seekable_format/examples/seekable_compression.c diff --git a/contrib/zstd/contrib/seekable_format/examples/seekable_decompression.c b/sys/contrib/zstd/contrib/seekable_format/examples/seekable_decompression.c similarity index 100% rename from contrib/zstd/contrib/seekable_format/examples/seekable_decompression.c rename to sys/contrib/zstd/contrib/seekable_format/examples/seekable_decompression.c diff --git a/contrib/zstd/contrib/seekable_format/zstd_seekable.h b/sys/contrib/zstd/contrib/seekable_format/zstd_seekable.h similarity index 100% rename from contrib/zstd/contrib/seekable_format/zstd_seekable.h rename to sys/contrib/zstd/contrib/seekable_format/zstd_seekable.h diff --git a/contrib/zstd/contrib/seekable_format/zstd_seekable_compression_format.md b/sys/contrib/zstd/contrib/seekable_format/zstd_seekable_compression_format.md similarity index 100% rename from contrib/zstd/contrib/seekable_format/zstd_seekable_compression_format.md rename to sys/contrib/zstd/contrib/seekable_format/zstd_seekable_compression_format.md diff --git a/contrib/zstd/contrib/seekable_format/zstdseek_compress.c b/sys/contrib/zstd/contrib/seekable_format/zstdseek_compress.c similarity index 100% rename from contrib/zstd/contrib/seekable_format/zstdseek_compress.c rename to sys/contrib/zstd/contrib/seekable_format/zstdseek_compress.c diff --git a/contrib/zstd/contrib/seekable_format/zstdseek_decompress.c b/sys/contrib/zstd/contrib/seekable_format/zstdseek_decompress.c similarity index 100% rename from contrib/zstd/contrib/seekable_format/zstdseek_decompress.c rename to sys/contrib/zstd/contrib/seekable_format/zstdseek_decompress.c diff --git a/contrib/zstd/doc/README.md b/sys/contrib/zstd/doc/README.md similarity index 100% rename from contrib/zstd/doc/README.md rename to sys/contrib/zstd/doc/README.md diff --git a/contrib/zstd/doc/educational_decoder/Makefile b/sys/contrib/zstd/doc/educational_decoder/Makefile similarity index 100% rename from contrib/zstd/doc/educational_decoder/Makefile rename to sys/contrib/zstd/doc/educational_decoder/Makefile diff --git a/contrib/zstd/doc/educational_decoder/README.md b/sys/contrib/zstd/doc/educational_decoder/README.md similarity index 100% rename from contrib/zstd/doc/educational_decoder/README.md rename to sys/contrib/zstd/doc/educational_decoder/README.md diff --git a/contrib/zstd/doc/educational_decoder/harness.c b/sys/contrib/zstd/doc/educational_decoder/harness.c similarity index 100% rename from contrib/zstd/doc/educational_decoder/harness.c rename to sys/contrib/zstd/doc/educational_decoder/harness.c diff --git a/contrib/zstd/doc/educational_decoder/zstd_decompress.c b/sys/contrib/zstd/doc/educational_decoder/zstd_decompress.c similarity index 100% rename from contrib/zstd/doc/educational_decoder/zstd_decompress.c rename to sys/contrib/zstd/doc/educational_decoder/zstd_decompress.c diff --git a/contrib/zstd/doc/educational_decoder/zstd_decompress.h b/sys/contrib/zstd/doc/educational_decoder/zstd_decompress.h similarity index 100% rename from contrib/zstd/doc/educational_decoder/zstd_decompress.h rename to sys/contrib/zstd/doc/educational_decoder/zstd_decompress.h diff --git a/contrib/zstd/doc/images/Cspeed4.png b/sys/contrib/zstd/doc/images/Cspeed4.png similarity index 100% rename from contrib/zstd/doc/images/Cspeed4.png rename to sys/contrib/zstd/doc/images/Cspeed4.png diff --git a/contrib/zstd/doc/images/DCspeed5.png b/sys/contrib/zstd/doc/images/DCspeed5.png similarity index 100% rename from contrib/zstd/doc/images/DCspeed5.png rename to sys/contrib/zstd/doc/images/DCspeed5.png diff --git a/contrib/zstd/doc/images/Dspeed4.png b/sys/contrib/zstd/doc/images/Dspeed4.png similarity index 100% rename from contrib/zstd/doc/images/Dspeed4.png rename to sys/contrib/zstd/doc/images/Dspeed4.png diff --git a/contrib/zstd/doc/images/dict-cr.png b/sys/contrib/zstd/doc/images/dict-cr.png similarity index 100% rename from contrib/zstd/doc/images/dict-cr.png rename to sys/contrib/zstd/doc/images/dict-cr.png diff --git a/contrib/zstd/doc/images/dict-cs.png b/sys/contrib/zstd/doc/images/dict-cs.png similarity index 100% rename from contrib/zstd/doc/images/dict-cs.png rename to sys/contrib/zstd/doc/images/dict-cs.png diff --git a/contrib/zstd/doc/images/dict-ds.png b/sys/contrib/zstd/doc/images/dict-ds.png similarity index 100% rename from contrib/zstd/doc/images/dict-ds.png rename to sys/contrib/zstd/doc/images/dict-ds.png diff --git a/contrib/zstd/doc/zstd_compression_format.md b/sys/contrib/zstd/doc/zstd_compression_format.md similarity index 100% rename from contrib/zstd/doc/zstd_compression_format.md rename to sys/contrib/zstd/doc/zstd_compression_format.md diff --git a/contrib/zstd/doc/zstd_manual.html b/sys/contrib/zstd/doc/zstd_manual.html similarity index 100% rename from contrib/zstd/doc/zstd_manual.html rename to sys/contrib/zstd/doc/zstd_manual.html diff --git a/contrib/zstd/lib/.gitignore b/sys/contrib/zstd/lib/.gitignore similarity index 100% rename from contrib/zstd/lib/.gitignore rename to sys/contrib/zstd/lib/.gitignore diff --git a/contrib/zstd/lib/BUCK b/sys/contrib/zstd/lib/BUCK similarity index 100% rename from contrib/zstd/lib/BUCK rename to sys/contrib/zstd/lib/BUCK diff --git a/contrib/zstd/lib/Makefile b/sys/contrib/zstd/lib/Makefile similarity index 100% rename from contrib/zstd/lib/Makefile rename to sys/contrib/zstd/lib/Makefile diff --git a/contrib/zstd/lib/README.md b/sys/contrib/zstd/lib/README.md similarity index 100% rename from contrib/zstd/lib/README.md rename to sys/contrib/zstd/lib/README.md diff --git a/contrib/zstd/lib/common/bitstream.h b/sys/contrib/zstd/lib/common/bitstream.h similarity index 100% rename from contrib/zstd/lib/common/bitstream.h rename to sys/contrib/zstd/lib/common/bitstream.h diff --git a/contrib/zstd/lib/common/compiler.h b/sys/contrib/zstd/lib/common/compiler.h similarity index 100% rename from contrib/zstd/lib/common/compiler.h rename to sys/contrib/zstd/lib/common/compiler.h diff --git a/contrib/zstd/lib/common/entropy_common.c b/sys/contrib/zstd/lib/common/entropy_common.c similarity index 100% rename from contrib/zstd/lib/common/entropy_common.c rename to sys/contrib/zstd/lib/common/entropy_common.c diff --git a/contrib/zstd/lib/common/error_private.c b/sys/contrib/zstd/lib/common/error_private.c similarity index 100% rename from contrib/zstd/lib/common/error_private.c rename to sys/contrib/zstd/lib/common/error_private.c diff --git a/contrib/zstd/lib/common/error_private.h b/sys/contrib/zstd/lib/common/error_private.h similarity index 100% rename from contrib/zstd/lib/common/error_private.h rename to sys/contrib/zstd/lib/common/error_private.h diff --git a/contrib/zstd/lib/common/fse.h b/sys/contrib/zstd/lib/common/fse.h similarity index 100% rename from contrib/zstd/lib/common/fse.h rename to sys/contrib/zstd/lib/common/fse.h diff --git a/contrib/zstd/lib/common/fse_decompress.c b/sys/contrib/zstd/lib/common/fse_decompress.c similarity index 100% rename from contrib/zstd/lib/common/fse_decompress.c rename to sys/contrib/zstd/lib/common/fse_decompress.c diff --git a/contrib/zstd/lib/common/huf.h b/sys/contrib/zstd/lib/common/huf.h similarity index 100% rename from contrib/zstd/lib/common/huf.h rename to sys/contrib/zstd/lib/common/huf.h diff --git a/contrib/zstd/lib/common/mem.h b/sys/contrib/zstd/lib/common/mem.h similarity index 100% rename from contrib/zstd/lib/common/mem.h rename to sys/contrib/zstd/lib/common/mem.h diff --git a/contrib/zstd/lib/common/pool.c b/sys/contrib/zstd/lib/common/pool.c similarity index 100% rename from contrib/zstd/lib/common/pool.c rename to sys/contrib/zstd/lib/common/pool.c diff --git a/contrib/zstd/lib/common/pool.h b/sys/contrib/zstd/lib/common/pool.h similarity index 100% rename from contrib/zstd/lib/common/pool.h rename to sys/contrib/zstd/lib/common/pool.h diff --git a/contrib/zstd/lib/common/threading.c b/sys/contrib/zstd/lib/common/threading.c similarity index 100% rename from contrib/zstd/lib/common/threading.c rename to sys/contrib/zstd/lib/common/threading.c diff --git a/contrib/zstd/lib/common/threading.h b/sys/contrib/zstd/lib/common/threading.h similarity index 100% rename from contrib/zstd/lib/common/threading.h rename to sys/contrib/zstd/lib/common/threading.h diff --git a/contrib/zstd/lib/common/xxhash.c b/sys/contrib/zstd/lib/common/xxhash.c similarity index 100% rename from contrib/zstd/lib/common/xxhash.c rename to sys/contrib/zstd/lib/common/xxhash.c diff --git a/contrib/zstd/lib/common/xxhash.h b/sys/contrib/zstd/lib/common/xxhash.h similarity index 100% rename from contrib/zstd/lib/common/xxhash.h rename to sys/contrib/zstd/lib/common/xxhash.h diff --git a/contrib/zstd/lib/common/zstd_common.c b/sys/contrib/zstd/lib/common/zstd_common.c similarity index 100% rename from contrib/zstd/lib/common/zstd_common.c rename to sys/contrib/zstd/lib/common/zstd_common.c diff --git a/contrib/zstd/lib/common/zstd_errors.h b/sys/contrib/zstd/lib/common/zstd_errors.h similarity index 100% rename from contrib/zstd/lib/common/zstd_errors.h rename to sys/contrib/zstd/lib/common/zstd_errors.h diff --git a/contrib/zstd/lib/common/zstd_internal.h b/sys/contrib/zstd/lib/common/zstd_internal.h similarity index 100% rename from contrib/zstd/lib/common/zstd_internal.h rename to sys/contrib/zstd/lib/common/zstd_internal.h diff --git a/contrib/zstd/lib/compress/fse_compress.c b/sys/contrib/zstd/lib/compress/fse_compress.c similarity index 100% rename from contrib/zstd/lib/compress/fse_compress.c rename to sys/contrib/zstd/lib/compress/fse_compress.c diff --git a/contrib/zstd/lib/compress/huf_compress.c b/sys/contrib/zstd/lib/compress/huf_compress.c similarity index 100% rename from contrib/zstd/lib/compress/huf_compress.c rename to sys/contrib/zstd/lib/compress/huf_compress.c diff --git a/contrib/zstd/lib/compress/zstd_compress.c b/sys/contrib/zstd/lib/compress/zstd_compress.c similarity index 100% rename from contrib/zstd/lib/compress/zstd_compress.c rename to sys/contrib/zstd/lib/compress/zstd_compress.c diff --git a/contrib/zstd/lib/compress/zstd_compress.h b/sys/contrib/zstd/lib/compress/zstd_compress.h similarity index 100% rename from contrib/zstd/lib/compress/zstd_compress.h rename to sys/contrib/zstd/lib/compress/zstd_compress.h diff --git a/contrib/zstd/lib/compress/zstd_double_fast.c b/sys/contrib/zstd/lib/compress/zstd_double_fast.c similarity index 100% rename from contrib/zstd/lib/compress/zstd_double_fast.c rename to sys/contrib/zstd/lib/compress/zstd_double_fast.c diff --git a/contrib/zstd/lib/compress/zstd_double_fast.h b/sys/contrib/zstd/lib/compress/zstd_double_fast.h similarity index 100% rename from contrib/zstd/lib/compress/zstd_double_fast.h rename to sys/contrib/zstd/lib/compress/zstd_double_fast.h diff --git a/contrib/zstd/lib/compress/zstd_fast.c b/sys/contrib/zstd/lib/compress/zstd_fast.c similarity index 100% rename from contrib/zstd/lib/compress/zstd_fast.c rename to sys/contrib/zstd/lib/compress/zstd_fast.c diff --git a/contrib/zstd/lib/compress/zstd_fast.h b/sys/contrib/zstd/lib/compress/zstd_fast.h similarity index 100% rename from contrib/zstd/lib/compress/zstd_fast.h rename to sys/contrib/zstd/lib/compress/zstd_fast.h diff --git a/contrib/zstd/lib/compress/zstd_lazy.c b/sys/contrib/zstd/lib/compress/zstd_lazy.c similarity index 100% rename from contrib/zstd/lib/compress/zstd_lazy.c rename to sys/contrib/zstd/lib/compress/zstd_lazy.c diff --git a/contrib/zstd/lib/compress/zstd_lazy.h b/sys/contrib/zstd/lib/compress/zstd_lazy.h similarity index 100% rename from contrib/zstd/lib/compress/zstd_lazy.h rename to sys/contrib/zstd/lib/compress/zstd_lazy.h diff --git a/contrib/zstd/lib/compress/zstd_ldm.c b/sys/contrib/zstd/lib/compress/zstd_ldm.c similarity index 100% rename from contrib/zstd/lib/compress/zstd_ldm.c rename to sys/contrib/zstd/lib/compress/zstd_ldm.c diff --git a/contrib/zstd/lib/compress/zstd_ldm.h b/sys/contrib/zstd/lib/compress/zstd_ldm.h similarity index 100% rename from contrib/zstd/lib/compress/zstd_ldm.h rename to sys/contrib/zstd/lib/compress/zstd_ldm.h diff --git a/contrib/zstd/lib/compress/zstd_opt.c b/sys/contrib/zstd/lib/compress/zstd_opt.c similarity index 100% rename from contrib/zstd/lib/compress/zstd_opt.c rename to sys/contrib/zstd/lib/compress/zstd_opt.c diff --git a/contrib/zstd/lib/compress/zstd_opt.h b/sys/contrib/zstd/lib/compress/zstd_opt.h similarity index 100% rename from contrib/zstd/lib/compress/zstd_opt.h rename to sys/contrib/zstd/lib/compress/zstd_opt.h diff --git a/contrib/zstd/lib/compress/zstdmt_compress.c b/sys/contrib/zstd/lib/compress/zstdmt_compress.c similarity index 100% rename from contrib/zstd/lib/compress/zstdmt_compress.c rename to sys/contrib/zstd/lib/compress/zstdmt_compress.c diff --git a/contrib/zstd/lib/compress/zstdmt_compress.h b/sys/contrib/zstd/lib/compress/zstdmt_compress.h similarity index 100% rename from contrib/zstd/lib/compress/zstdmt_compress.h rename to sys/contrib/zstd/lib/compress/zstdmt_compress.h diff --git a/contrib/zstd/lib/decompress/huf_decompress.c b/sys/contrib/zstd/lib/decompress/huf_decompress.c similarity index 100% rename from contrib/zstd/lib/decompress/huf_decompress.c rename to sys/contrib/zstd/lib/decompress/huf_decompress.c diff --git a/contrib/zstd/lib/decompress/zstd_decompress.c b/sys/contrib/zstd/lib/decompress/zstd_decompress.c similarity index 100% rename from contrib/zstd/lib/decompress/zstd_decompress.c rename to sys/contrib/zstd/lib/decompress/zstd_decompress.c diff --git a/contrib/zstd/lib/deprecated/zbuff.h b/sys/contrib/zstd/lib/deprecated/zbuff.h similarity index 100% rename from contrib/zstd/lib/deprecated/zbuff.h rename to sys/contrib/zstd/lib/deprecated/zbuff.h diff --git a/contrib/zstd/lib/deprecated/zbuff_common.c b/sys/contrib/zstd/lib/deprecated/zbuff_common.c similarity index 100% rename from contrib/zstd/lib/deprecated/zbuff_common.c rename to sys/contrib/zstd/lib/deprecated/zbuff_common.c diff --git a/contrib/zstd/lib/deprecated/zbuff_compress.c b/sys/contrib/zstd/lib/deprecated/zbuff_compress.c similarity index 100% rename from contrib/zstd/lib/deprecated/zbuff_compress.c rename to sys/contrib/zstd/lib/deprecated/zbuff_compress.c diff --git a/contrib/zstd/lib/deprecated/zbuff_decompress.c b/sys/contrib/zstd/lib/deprecated/zbuff_decompress.c similarity index 100% rename from contrib/zstd/lib/deprecated/zbuff_decompress.c rename to sys/contrib/zstd/lib/deprecated/zbuff_decompress.c diff --git a/contrib/zstd/lib/dictBuilder/cover.c b/sys/contrib/zstd/lib/dictBuilder/cover.c similarity index 100% rename from contrib/zstd/lib/dictBuilder/cover.c rename to sys/contrib/zstd/lib/dictBuilder/cover.c diff --git a/contrib/zstd/lib/dictBuilder/divsufsort.c b/sys/contrib/zstd/lib/dictBuilder/divsufsort.c similarity index 100% rename from contrib/zstd/lib/dictBuilder/divsufsort.c rename to sys/contrib/zstd/lib/dictBuilder/divsufsort.c diff --git a/contrib/zstd/lib/dictBuilder/divsufsort.h b/sys/contrib/zstd/lib/dictBuilder/divsufsort.h similarity index 100% rename from contrib/zstd/lib/dictBuilder/divsufsort.h rename to sys/contrib/zstd/lib/dictBuilder/divsufsort.h diff --git a/contrib/zstd/lib/dictBuilder/zdict.c b/sys/contrib/zstd/lib/dictBuilder/zdict.c similarity index 100% rename from contrib/zstd/lib/dictBuilder/zdict.c rename to sys/contrib/zstd/lib/dictBuilder/zdict.c diff --git a/contrib/zstd/lib/dictBuilder/zdict.h b/sys/contrib/zstd/lib/dictBuilder/zdict.h similarity index 100% rename from contrib/zstd/lib/dictBuilder/zdict.h rename to sys/contrib/zstd/lib/dictBuilder/zdict.h diff --git a/contrib/zstd/lib/legacy/zstd_legacy.h b/sys/contrib/zstd/lib/legacy/zstd_legacy.h similarity index 100% rename from contrib/zstd/lib/legacy/zstd_legacy.h rename to sys/contrib/zstd/lib/legacy/zstd_legacy.h diff --git a/contrib/zstd/lib/legacy/zstd_v01.c b/sys/contrib/zstd/lib/legacy/zstd_v01.c similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v01.c rename to sys/contrib/zstd/lib/legacy/zstd_v01.c diff --git a/contrib/zstd/lib/legacy/zstd_v01.h b/sys/contrib/zstd/lib/legacy/zstd_v01.h similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v01.h rename to sys/contrib/zstd/lib/legacy/zstd_v01.h diff --git a/contrib/zstd/lib/legacy/zstd_v02.c b/sys/contrib/zstd/lib/legacy/zstd_v02.c similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v02.c rename to sys/contrib/zstd/lib/legacy/zstd_v02.c diff --git a/contrib/zstd/lib/legacy/zstd_v02.h b/sys/contrib/zstd/lib/legacy/zstd_v02.h similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v02.h rename to sys/contrib/zstd/lib/legacy/zstd_v02.h diff --git a/contrib/zstd/lib/legacy/zstd_v03.c b/sys/contrib/zstd/lib/legacy/zstd_v03.c similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v03.c rename to sys/contrib/zstd/lib/legacy/zstd_v03.c diff --git a/contrib/zstd/lib/legacy/zstd_v03.h b/sys/contrib/zstd/lib/legacy/zstd_v03.h similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v03.h rename to sys/contrib/zstd/lib/legacy/zstd_v03.h diff --git a/contrib/zstd/lib/legacy/zstd_v04.c b/sys/contrib/zstd/lib/legacy/zstd_v04.c similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v04.c rename to sys/contrib/zstd/lib/legacy/zstd_v04.c diff --git a/contrib/zstd/lib/legacy/zstd_v04.h b/sys/contrib/zstd/lib/legacy/zstd_v04.h similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v04.h rename to sys/contrib/zstd/lib/legacy/zstd_v04.h diff --git a/contrib/zstd/lib/legacy/zstd_v05.c b/sys/contrib/zstd/lib/legacy/zstd_v05.c similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v05.c rename to sys/contrib/zstd/lib/legacy/zstd_v05.c diff --git a/contrib/zstd/lib/legacy/zstd_v05.h b/sys/contrib/zstd/lib/legacy/zstd_v05.h similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v05.h rename to sys/contrib/zstd/lib/legacy/zstd_v05.h diff --git a/contrib/zstd/lib/legacy/zstd_v06.c b/sys/contrib/zstd/lib/legacy/zstd_v06.c similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v06.c rename to sys/contrib/zstd/lib/legacy/zstd_v06.c diff --git a/contrib/zstd/lib/legacy/zstd_v06.h b/sys/contrib/zstd/lib/legacy/zstd_v06.h similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v06.h rename to sys/contrib/zstd/lib/legacy/zstd_v06.h diff --git a/contrib/zstd/lib/legacy/zstd_v07.c b/sys/contrib/zstd/lib/legacy/zstd_v07.c similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v07.c rename to sys/contrib/zstd/lib/legacy/zstd_v07.c diff --git a/contrib/zstd/lib/legacy/zstd_v07.h b/sys/contrib/zstd/lib/legacy/zstd_v07.h similarity index 100% rename from contrib/zstd/lib/legacy/zstd_v07.h rename to sys/contrib/zstd/lib/legacy/zstd_v07.h diff --git a/contrib/zstd/lib/libzstd.pc.in b/sys/contrib/zstd/lib/libzstd.pc.in similarity index 100% rename from contrib/zstd/lib/libzstd.pc.in rename to sys/contrib/zstd/lib/libzstd.pc.in diff --git a/contrib/zstd/lib/zstd.h b/sys/contrib/zstd/lib/zstd.h similarity index 100% rename from contrib/zstd/lib/zstd.h rename to sys/contrib/zstd/lib/zstd.h diff --git a/contrib/zstd/programs/.gitignore b/sys/contrib/zstd/programs/.gitignore similarity index 100% rename from contrib/zstd/programs/.gitignore rename to sys/contrib/zstd/programs/.gitignore diff --git a/contrib/zstd/programs/BUCK b/sys/contrib/zstd/programs/BUCK similarity index 100% rename from contrib/zstd/programs/BUCK rename to sys/contrib/zstd/programs/BUCK diff --git a/contrib/zstd/programs/Makefile b/sys/contrib/zstd/programs/Makefile similarity index 100% rename from contrib/zstd/programs/Makefile rename to sys/contrib/zstd/programs/Makefile diff --git a/contrib/zstd/programs/README.md b/sys/contrib/zstd/programs/README.md similarity index 100% rename from contrib/zstd/programs/README.md rename to sys/contrib/zstd/programs/README.md diff --git a/contrib/zstd/programs/bench.c b/sys/contrib/zstd/programs/bench.c similarity index 100% rename from contrib/zstd/programs/bench.c rename to sys/contrib/zstd/programs/bench.c diff --git a/contrib/zstd/programs/bench.h b/sys/contrib/zstd/programs/bench.h similarity index 100% rename from contrib/zstd/programs/bench.h rename to sys/contrib/zstd/programs/bench.h diff --git a/contrib/zstd/programs/datagen.c b/sys/contrib/zstd/programs/datagen.c similarity index 100% rename from contrib/zstd/programs/datagen.c rename to sys/contrib/zstd/programs/datagen.c diff --git a/contrib/zstd/programs/datagen.h b/sys/contrib/zstd/programs/datagen.h similarity index 100% rename from contrib/zstd/programs/datagen.h rename to sys/contrib/zstd/programs/datagen.h diff --git a/contrib/zstd/programs/dibio.c b/sys/contrib/zstd/programs/dibio.c similarity index 100% rename from contrib/zstd/programs/dibio.c rename to sys/contrib/zstd/programs/dibio.c diff --git a/contrib/zstd/programs/dibio.h b/sys/contrib/zstd/programs/dibio.h similarity index 100% rename from contrib/zstd/programs/dibio.h rename to sys/contrib/zstd/programs/dibio.h diff --git a/contrib/zstd/programs/fileio.c b/sys/contrib/zstd/programs/fileio.c similarity index 100% rename from contrib/zstd/programs/fileio.c rename to sys/contrib/zstd/programs/fileio.c diff --git a/contrib/zstd/programs/fileio.h b/sys/contrib/zstd/programs/fileio.h similarity index 100% rename from contrib/zstd/programs/fileio.h rename to sys/contrib/zstd/programs/fileio.h diff --git a/contrib/zstd/programs/platform.h b/sys/contrib/zstd/programs/platform.h similarity index 100% rename from contrib/zstd/programs/platform.h rename to sys/contrib/zstd/programs/platform.h diff --git a/contrib/zstd/programs/util.h b/sys/contrib/zstd/programs/util.h similarity index 100% rename from contrib/zstd/programs/util.h rename to sys/contrib/zstd/programs/util.h diff --git a/contrib/zstd/programs/zstd.1 b/sys/contrib/zstd/programs/zstd.1 similarity index 100% rename from contrib/zstd/programs/zstd.1 rename to sys/contrib/zstd/programs/zstd.1 diff --git a/contrib/zstd/programs/zstd.1.md b/sys/contrib/zstd/programs/zstd.1.md similarity index 100% rename from contrib/zstd/programs/zstd.1.md rename to sys/contrib/zstd/programs/zstd.1.md diff --git a/contrib/zstd/programs/zstdcli.c b/sys/contrib/zstd/programs/zstdcli.c similarity index 100% rename from contrib/zstd/programs/zstdcli.c rename to sys/contrib/zstd/programs/zstdcli.c diff --git a/contrib/zstd/programs/zstdgrep b/sys/contrib/zstd/programs/zstdgrep similarity index 100% rename from contrib/zstd/programs/zstdgrep rename to sys/contrib/zstd/programs/zstdgrep diff --git a/contrib/zstd/programs/zstdless b/sys/contrib/zstd/programs/zstdless similarity index 100% rename from contrib/zstd/programs/zstdless rename to sys/contrib/zstd/programs/zstdless diff --git a/contrib/zstd/tests/.gitignore b/sys/contrib/zstd/tests/.gitignore similarity index 100% rename from contrib/zstd/tests/.gitignore rename to sys/contrib/zstd/tests/.gitignore diff --git a/contrib/zstd/tests/Makefile b/sys/contrib/zstd/tests/Makefile similarity index 100% rename from contrib/zstd/tests/Makefile rename to sys/contrib/zstd/tests/Makefile diff --git a/contrib/zstd/tests/README.md b/sys/contrib/zstd/tests/README.md similarity index 100% rename from contrib/zstd/tests/README.md rename to sys/contrib/zstd/tests/README.md diff --git a/contrib/zstd/tests/datagencli.c b/sys/contrib/zstd/tests/datagencli.c similarity index 100% rename from contrib/zstd/tests/datagencli.c rename to sys/contrib/zstd/tests/datagencli.c diff --git a/contrib/zstd/tests/decodecorpus.c b/sys/contrib/zstd/tests/decodecorpus.c similarity index 100% rename from contrib/zstd/tests/decodecorpus.c rename to sys/contrib/zstd/tests/decodecorpus.c diff --git a/contrib/zstd/tests/files/huffman-compressed-larger b/sys/contrib/zstd/tests/files/huffman-compressed-larger similarity index 100% rename from contrib/zstd/tests/files/huffman-compressed-larger rename to sys/contrib/zstd/tests/files/huffman-compressed-larger diff --git a/contrib/zstd/tests/fullbench.c b/sys/contrib/zstd/tests/fullbench.c similarity index 100% rename from contrib/zstd/tests/fullbench.c rename to sys/contrib/zstd/tests/fullbench.c diff --git a/contrib/zstd/tests/fuzz/Makefile b/sys/contrib/zstd/tests/fuzz/Makefile similarity index 100% rename from contrib/zstd/tests/fuzz/Makefile rename to sys/contrib/zstd/tests/fuzz/Makefile diff --git a/contrib/zstd/tests/fuzz/README.md b/sys/contrib/zstd/tests/fuzz/README.md similarity index 100% rename from contrib/zstd/tests/fuzz/README.md rename to sys/contrib/zstd/tests/fuzz/README.md diff --git a/contrib/zstd/tests/fuzz/block_decompress.c b/sys/contrib/zstd/tests/fuzz/block_decompress.c similarity index 100% rename from contrib/zstd/tests/fuzz/block_decompress.c rename to sys/contrib/zstd/tests/fuzz/block_decompress.c diff --git a/contrib/zstd/tests/fuzz/block_round_trip.c b/sys/contrib/zstd/tests/fuzz/block_round_trip.c similarity index 100% rename from contrib/zstd/tests/fuzz/block_round_trip.c rename to sys/contrib/zstd/tests/fuzz/block_round_trip.c diff --git a/contrib/zstd/tests/fuzz/default.options b/sys/contrib/zstd/tests/fuzz/default.options similarity index 100% rename from contrib/zstd/tests/fuzz/default.options rename to sys/contrib/zstd/tests/fuzz/default.options diff --git a/contrib/zstd/tests/fuzz/fuzz.h b/sys/contrib/zstd/tests/fuzz/fuzz.h similarity index 100% rename from contrib/zstd/tests/fuzz/fuzz.h rename to sys/contrib/zstd/tests/fuzz/fuzz.h diff --git a/contrib/zstd/tests/fuzz/fuzz.py b/sys/contrib/zstd/tests/fuzz/fuzz.py similarity index 100% rename from contrib/zstd/tests/fuzz/fuzz.py rename to sys/contrib/zstd/tests/fuzz/fuzz.py diff --git a/contrib/zstd/tests/fuzz/fuzz_helpers.h b/sys/contrib/zstd/tests/fuzz/fuzz_helpers.h similarity index 100% rename from contrib/zstd/tests/fuzz/fuzz_helpers.h rename to sys/contrib/zstd/tests/fuzz/fuzz_helpers.h diff --git a/contrib/zstd/tests/fuzz/regression_driver.c b/sys/contrib/zstd/tests/fuzz/regression_driver.c similarity index 100% rename from contrib/zstd/tests/fuzz/regression_driver.c rename to sys/contrib/zstd/tests/fuzz/regression_driver.c diff --git a/contrib/zstd/tests/fuzz/simple_decompress.c b/sys/contrib/zstd/tests/fuzz/simple_decompress.c similarity index 100% rename from contrib/zstd/tests/fuzz/simple_decompress.c rename to sys/contrib/zstd/tests/fuzz/simple_decompress.c diff --git a/contrib/zstd/tests/fuzz/simple_round_trip.c b/sys/contrib/zstd/tests/fuzz/simple_round_trip.c similarity index 100% rename from contrib/zstd/tests/fuzz/simple_round_trip.c rename to sys/contrib/zstd/tests/fuzz/simple_round_trip.c diff --git a/contrib/zstd/tests/fuzz/stream_decompress.c b/sys/contrib/zstd/tests/fuzz/stream_decompress.c similarity index 100% rename from contrib/zstd/tests/fuzz/stream_decompress.c rename to sys/contrib/zstd/tests/fuzz/stream_decompress.c diff --git a/contrib/zstd/tests/fuzz/stream_round_trip.c b/sys/contrib/zstd/tests/fuzz/stream_round_trip.c similarity index 100% rename from contrib/zstd/tests/fuzz/stream_round_trip.c rename to sys/contrib/zstd/tests/fuzz/stream_round_trip.c diff --git a/contrib/zstd/tests/fuzz/zstd_helpers.c b/sys/contrib/zstd/tests/fuzz/zstd_helpers.c similarity index 100% rename from contrib/zstd/tests/fuzz/zstd_helpers.c rename to sys/contrib/zstd/tests/fuzz/zstd_helpers.c diff --git a/contrib/zstd/tests/fuzz/zstd_helpers.h b/sys/contrib/zstd/tests/fuzz/zstd_helpers.h similarity index 100% rename from contrib/zstd/tests/fuzz/zstd_helpers.h rename to sys/contrib/zstd/tests/fuzz/zstd_helpers.h diff --git a/contrib/zstd/tests/fuzzer.c b/sys/contrib/zstd/tests/fuzzer.c similarity index 100% rename from contrib/zstd/tests/fuzzer.c rename to sys/contrib/zstd/tests/fuzzer.c diff --git a/contrib/zstd/tests/gzip/Makefile b/sys/contrib/zstd/tests/gzip/Makefile similarity index 100% rename from contrib/zstd/tests/gzip/Makefile rename to sys/contrib/zstd/tests/gzip/Makefile diff --git a/contrib/zstd/tests/gzip/gzip-env.sh b/sys/contrib/zstd/tests/gzip/gzip-env.sh similarity index 100% rename from contrib/zstd/tests/gzip/gzip-env.sh rename to sys/contrib/zstd/tests/gzip/gzip-env.sh diff --git a/contrib/zstd/tests/gzip/helin-segv.sh b/sys/contrib/zstd/tests/gzip/helin-segv.sh similarity index 100% rename from contrib/zstd/tests/gzip/helin-segv.sh rename to sys/contrib/zstd/tests/gzip/helin-segv.sh diff --git a/contrib/zstd/tests/gzip/help-version.sh b/sys/contrib/zstd/tests/gzip/help-version.sh similarity index 100% rename from contrib/zstd/tests/gzip/help-version.sh rename to sys/contrib/zstd/tests/gzip/help-version.sh diff --git a/contrib/zstd/tests/gzip/hufts-segv.gz b/sys/contrib/zstd/tests/gzip/hufts-segv.gz similarity index 100% rename from contrib/zstd/tests/gzip/hufts-segv.gz rename to sys/contrib/zstd/tests/gzip/hufts-segv.gz diff --git a/contrib/zstd/tests/gzip/hufts.sh b/sys/contrib/zstd/tests/gzip/hufts.sh similarity index 100% rename from contrib/zstd/tests/gzip/hufts.sh rename to sys/contrib/zstd/tests/gzip/hufts.sh diff --git a/contrib/zstd/tests/gzip/init.cfg b/sys/contrib/zstd/tests/gzip/init.cfg similarity index 100% rename from contrib/zstd/tests/gzip/init.cfg rename to sys/contrib/zstd/tests/gzip/init.cfg diff --git a/contrib/zstd/tests/gzip/init.sh b/sys/contrib/zstd/tests/gzip/init.sh similarity index 100% rename from contrib/zstd/tests/gzip/init.sh rename to sys/contrib/zstd/tests/gzip/init.sh diff --git a/contrib/zstd/tests/gzip/keep.sh b/sys/contrib/zstd/tests/gzip/keep.sh similarity index 100% rename from contrib/zstd/tests/gzip/keep.sh rename to sys/contrib/zstd/tests/gzip/keep.sh diff --git a/contrib/zstd/tests/gzip/list.sh b/sys/contrib/zstd/tests/gzip/list.sh similarity index 100% rename from contrib/zstd/tests/gzip/list.sh rename to sys/contrib/zstd/tests/gzip/list.sh diff --git a/contrib/zstd/tests/gzip/memcpy-abuse.sh b/sys/contrib/zstd/tests/gzip/memcpy-abuse.sh similarity index 100% rename from contrib/zstd/tests/gzip/memcpy-abuse.sh rename to sys/contrib/zstd/tests/gzip/memcpy-abuse.sh diff --git a/contrib/zstd/tests/gzip/mixed.sh b/sys/contrib/zstd/tests/gzip/mixed.sh similarity index 100% rename from contrib/zstd/tests/gzip/mixed.sh rename to sys/contrib/zstd/tests/gzip/mixed.sh diff --git a/contrib/zstd/tests/gzip/null-suffix-clobber.sh b/sys/contrib/zstd/tests/gzip/null-suffix-clobber.sh similarity index 100% rename from contrib/zstd/tests/gzip/null-suffix-clobber.sh rename to sys/contrib/zstd/tests/gzip/null-suffix-clobber.sh diff --git a/contrib/zstd/tests/gzip/stdin.sh b/sys/contrib/zstd/tests/gzip/stdin.sh similarity index 100% rename from contrib/zstd/tests/gzip/stdin.sh rename to sys/contrib/zstd/tests/gzip/stdin.sh diff --git a/contrib/zstd/tests/gzip/test-driver.sh b/sys/contrib/zstd/tests/gzip/test-driver.sh similarity index 100% rename from contrib/zstd/tests/gzip/test-driver.sh rename to sys/contrib/zstd/tests/gzip/test-driver.sh diff --git a/contrib/zstd/tests/gzip/trailing-nul.sh b/sys/contrib/zstd/tests/gzip/trailing-nul.sh similarity index 100% rename from contrib/zstd/tests/gzip/trailing-nul.sh rename to sys/contrib/zstd/tests/gzip/trailing-nul.sh diff --git a/contrib/zstd/tests/gzip/unpack-invalid.sh b/sys/contrib/zstd/tests/gzip/unpack-invalid.sh similarity index 100% rename from contrib/zstd/tests/gzip/unpack-invalid.sh rename to sys/contrib/zstd/tests/gzip/unpack-invalid.sh diff --git a/contrib/zstd/tests/gzip/z-suffix.sh b/sys/contrib/zstd/tests/gzip/z-suffix.sh similarity index 100% rename from contrib/zstd/tests/gzip/z-suffix.sh rename to sys/contrib/zstd/tests/gzip/z-suffix.sh diff --git a/contrib/zstd/tests/gzip/zdiff.sh b/sys/contrib/zstd/tests/gzip/zdiff.sh similarity index 100% rename from contrib/zstd/tests/gzip/zdiff.sh rename to sys/contrib/zstd/tests/gzip/zdiff.sh diff --git a/contrib/zstd/tests/gzip/zgrep-context.sh b/sys/contrib/zstd/tests/gzip/zgrep-context.sh similarity index 100% rename from contrib/zstd/tests/gzip/zgrep-context.sh rename to sys/contrib/zstd/tests/gzip/zgrep-context.sh diff --git a/contrib/zstd/tests/gzip/zgrep-f.sh b/sys/contrib/zstd/tests/gzip/zgrep-f.sh similarity index 100% rename from contrib/zstd/tests/gzip/zgrep-f.sh rename to sys/contrib/zstd/tests/gzip/zgrep-f.sh diff --git a/contrib/zstd/tests/gzip/zgrep-signal.sh b/sys/contrib/zstd/tests/gzip/zgrep-signal.sh similarity index 100% rename from contrib/zstd/tests/gzip/zgrep-signal.sh rename to sys/contrib/zstd/tests/gzip/zgrep-signal.sh diff --git a/contrib/zstd/tests/gzip/znew-k.sh b/sys/contrib/zstd/tests/gzip/znew-k.sh similarity index 100% rename from contrib/zstd/tests/gzip/znew-k.sh rename to sys/contrib/zstd/tests/gzip/znew-k.sh diff --git a/contrib/zstd/tests/invalidDictionaries.c b/sys/contrib/zstd/tests/invalidDictionaries.c similarity index 100% rename from contrib/zstd/tests/invalidDictionaries.c rename to sys/contrib/zstd/tests/invalidDictionaries.c diff --git a/contrib/zstd/tests/legacy.c b/sys/contrib/zstd/tests/legacy.c similarity index 100% rename from contrib/zstd/tests/legacy.c rename to sys/contrib/zstd/tests/legacy.c diff --git a/contrib/zstd/tests/longmatch.c b/sys/contrib/zstd/tests/longmatch.c similarity index 100% rename from contrib/zstd/tests/longmatch.c rename to sys/contrib/zstd/tests/longmatch.c diff --git a/contrib/zstd/tests/namespaceTest.c b/sys/contrib/zstd/tests/namespaceTest.c similarity index 100% rename from contrib/zstd/tests/namespaceTest.c rename to sys/contrib/zstd/tests/namespaceTest.c diff --git a/contrib/zstd/tests/paramgrill.c b/sys/contrib/zstd/tests/paramgrill.c similarity index 100% rename from contrib/zstd/tests/paramgrill.c rename to sys/contrib/zstd/tests/paramgrill.c diff --git a/contrib/zstd/tests/playTests.sh b/sys/contrib/zstd/tests/playTests.sh similarity index 100% rename from contrib/zstd/tests/playTests.sh rename to sys/contrib/zstd/tests/playTests.sh diff --git a/contrib/zstd/tests/poolTests.c b/sys/contrib/zstd/tests/poolTests.c similarity index 100% rename from contrib/zstd/tests/poolTests.c rename to sys/contrib/zstd/tests/poolTests.c diff --git a/contrib/zstd/tests/roundTripCrash.c b/sys/contrib/zstd/tests/roundTripCrash.c similarity index 100% rename from contrib/zstd/tests/roundTripCrash.c rename to sys/contrib/zstd/tests/roundTripCrash.c diff --git a/contrib/zstd/tests/symbols.c b/sys/contrib/zstd/tests/symbols.c similarity index 100% rename from contrib/zstd/tests/symbols.c rename to sys/contrib/zstd/tests/symbols.c diff --git a/contrib/zstd/tests/test-zstd-speed.py b/sys/contrib/zstd/tests/test-zstd-speed.py similarity index 100% rename from contrib/zstd/tests/test-zstd-speed.py rename to sys/contrib/zstd/tests/test-zstd-speed.py diff --git a/contrib/zstd/tests/test-zstd-versions.py b/sys/contrib/zstd/tests/test-zstd-versions.py similarity index 100% rename from contrib/zstd/tests/test-zstd-versions.py rename to sys/contrib/zstd/tests/test-zstd-versions.py diff --git a/contrib/zstd/tests/zbufftest.c b/sys/contrib/zstd/tests/zbufftest.c similarity index 100% rename from contrib/zstd/tests/zbufftest.c rename to sys/contrib/zstd/tests/zbufftest.c diff --git a/contrib/zstd/tests/zstreamtest.c b/sys/contrib/zstd/tests/zstreamtest.c similarity index 100% rename from contrib/zstd/tests/zstreamtest.c rename to sys/contrib/zstd/tests/zstreamtest.c diff --git a/contrib/zstd/zlibWrapper/.gitignore b/sys/contrib/zstd/zlibWrapper/.gitignore similarity index 100% rename from contrib/zstd/zlibWrapper/.gitignore rename to sys/contrib/zstd/zlibWrapper/.gitignore diff --git a/contrib/zstd/zlibWrapper/BUCK b/sys/contrib/zstd/zlibWrapper/BUCK similarity index 100% rename from contrib/zstd/zlibWrapper/BUCK rename to sys/contrib/zstd/zlibWrapper/BUCK diff --git a/contrib/zstd/zlibWrapper/Makefile b/sys/contrib/zstd/zlibWrapper/Makefile similarity index 100% rename from contrib/zstd/zlibWrapper/Makefile rename to sys/contrib/zstd/zlibWrapper/Makefile diff --git a/contrib/zstd/zlibWrapper/README.md b/sys/contrib/zstd/zlibWrapper/README.md similarity index 100% rename from contrib/zstd/zlibWrapper/README.md rename to sys/contrib/zstd/zlibWrapper/README.md diff --git a/contrib/zstd/zlibWrapper/examples/example.c b/sys/contrib/zstd/zlibWrapper/examples/example.c similarity index 100% rename from contrib/zstd/zlibWrapper/examples/example.c rename to sys/contrib/zstd/zlibWrapper/examples/example.c diff --git a/contrib/zstd/zlibWrapper/examples/example_original.c b/sys/contrib/zstd/zlibWrapper/examples/example_original.c similarity index 100% rename from contrib/zstd/zlibWrapper/examples/example_original.c rename to sys/contrib/zstd/zlibWrapper/examples/example_original.c diff --git a/contrib/zstd/zlibWrapper/examples/fitblk.c b/sys/contrib/zstd/zlibWrapper/examples/fitblk.c similarity index 100% rename from contrib/zstd/zlibWrapper/examples/fitblk.c rename to sys/contrib/zstd/zlibWrapper/examples/fitblk.c diff --git a/contrib/zstd/zlibWrapper/examples/fitblk_original.c b/sys/contrib/zstd/zlibWrapper/examples/fitblk_original.c similarity index 100% rename from contrib/zstd/zlibWrapper/examples/fitblk_original.c rename to sys/contrib/zstd/zlibWrapper/examples/fitblk_original.c diff --git a/contrib/zstd/zlibWrapper/examples/minigzip.c b/sys/contrib/zstd/zlibWrapper/examples/minigzip.c similarity index 100% rename from contrib/zstd/zlibWrapper/examples/minigzip.c rename to sys/contrib/zstd/zlibWrapper/examples/minigzip.c diff --git a/contrib/zstd/zlibWrapper/examples/zwrapbench.c b/sys/contrib/zstd/zlibWrapper/examples/zwrapbench.c similarity index 100% rename from contrib/zstd/zlibWrapper/examples/zwrapbench.c rename to sys/contrib/zstd/zlibWrapper/examples/zwrapbench.c diff --git a/contrib/zstd/zlibWrapper/gzclose.c b/sys/contrib/zstd/zlibWrapper/gzclose.c similarity index 100% rename from contrib/zstd/zlibWrapper/gzclose.c rename to sys/contrib/zstd/zlibWrapper/gzclose.c diff --git a/contrib/zstd/zlibWrapper/gzcompatibility.h b/sys/contrib/zstd/zlibWrapper/gzcompatibility.h similarity index 100% rename from contrib/zstd/zlibWrapper/gzcompatibility.h rename to sys/contrib/zstd/zlibWrapper/gzcompatibility.h diff --git a/contrib/zstd/zlibWrapper/gzguts.h b/sys/contrib/zstd/zlibWrapper/gzguts.h similarity index 100% rename from contrib/zstd/zlibWrapper/gzguts.h rename to sys/contrib/zstd/zlibWrapper/gzguts.h diff --git a/contrib/zstd/zlibWrapper/gzlib.c b/sys/contrib/zstd/zlibWrapper/gzlib.c similarity index 100% rename from contrib/zstd/zlibWrapper/gzlib.c rename to sys/contrib/zstd/zlibWrapper/gzlib.c diff --git a/contrib/zstd/zlibWrapper/gzread.c b/sys/contrib/zstd/zlibWrapper/gzread.c similarity index 100% rename from contrib/zstd/zlibWrapper/gzread.c rename to sys/contrib/zstd/zlibWrapper/gzread.c diff --git a/contrib/zstd/zlibWrapper/gzwrite.c b/sys/contrib/zstd/zlibWrapper/gzwrite.c similarity index 100% rename from contrib/zstd/zlibWrapper/gzwrite.c rename to sys/contrib/zstd/zlibWrapper/gzwrite.c diff --git a/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c b/sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c similarity index 100% rename from contrib/zstd/zlibWrapper/zstd_zlibwrapper.c rename to sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c diff --git a/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h b/sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h similarity index 100% rename from contrib/zstd/zlibWrapper/zstd_zlibwrapper.h rename to sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h diff --git a/usr.bin/zstd/Makefile b/usr.bin/zstd/Makefile index 8499b65a0dde..73bcbbcc371c 100644 --- a/usr.bin/zstd/Makefile +++ b/usr.bin/zstd/Makefile @@ -7,11 +7,11 @@ SRCS= bench.c \ fileio.c \ zstdcli.c -CFLAGS+= -I${SRCTOP}/contrib/zstd/programs \ - -I${SRCTOP}/contrib/zstd/lib/common \ - -I${SRCTOP}/contrib/zstd/lib/compress \ - -I${SRCTOP}/contrib/zstd/lib/dictBuilder \ - -I${SRCTOP}/contrib/zstd/lib \ +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/programs \ + -I${SRCTOP}/sys/contrib/zstd/lib/common \ + -I${SRCTOP}/sys/contrib/zstd/lib/compress \ + -I${SRCTOP}/sys/contrib/zstd/lib/dictBuilder \ + -I${SRCTOP}/sys/contrib/zstd/lib \ -DXXH_NAMESPACE=ZSTD_ \ -DHAVE_THREAD=1 \ -DZSTD_MULTITHREAD=1 @@ -25,6 +25,6 @@ MLINKS= zstd.1 unzstd.1 \ WARNS= 2 LIBADD= zstd -.PATH: ${SRCTOP}/contrib/zstd/programs +.PATH: ${SRCTOP}/sys/contrib/zstd/programs .include