From: Peter Avalos Date: Sun, 21 Jun 2009 21:45:01 +0000 (-1000) Subject: Rename libarchive-2/ to libarchive/. No need for it to be versioned. X-Git-Tag: v2.5.1~28^2~3 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/60b4ad0950228d48ce2a5f9f335d583173987f53 Rename libarchive-2/ to libarchive/. No need for it to be versioned. --- diff --git a/contrib/libarchive-2/COPYING b/contrib/libarchive/COPYING similarity index 100% rename from contrib/libarchive-2/COPYING rename to contrib/libarchive/COPYING diff --git a/contrib/libarchive-2/NEWS b/contrib/libarchive/NEWS similarity index 100% rename from contrib/libarchive-2/NEWS rename to contrib/libarchive/NEWS diff --git a/contrib/libarchive-2/README b/contrib/libarchive/README similarity index 100% rename from contrib/libarchive-2/README rename to contrib/libarchive/README diff --git a/contrib/libarchive-2/cpio/bsdcpio.1 b/contrib/libarchive/cpio/bsdcpio.1 similarity index 100% rename from contrib/libarchive-2/cpio/bsdcpio.1 rename to contrib/libarchive/cpio/bsdcpio.1 diff --git a/contrib/libarchive-2/cpio/cmdline.c b/contrib/libarchive/cpio/cmdline.c similarity index 100% rename from contrib/libarchive-2/cpio/cmdline.c rename to contrib/libarchive/cpio/cmdline.c diff --git a/contrib/libarchive-2/cpio/cpio.c b/contrib/libarchive/cpio/cpio.c similarity index 100% rename from contrib/libarchive-2/cpio/cpio.c rename to contrib/libarchive/cpio/cpio.c diff --git a/contrib/libarchive-2/cpio/cpio.h b/contrib/libarchive/cpio/cpio.h similarity index 100% rename from contrib/libarchive-2/cpio/cpio.h rename to contrib/libarchive/cpio/cpio.h diff --git a/contrib/libarchive-2/cpio/cpio_platform.h b/contrib/libarchive/cpio/cpio_platform.h similarity index 100% rename from contrib/libarchive-2/cpio/cpio_platform.h rename to contrib/libarchive/cpio/cpio_platform.h diff --git a/contrib/libarchive-2/cpio/err.c b/contrib/libarchive/cpio/err.c similarity index 100% rename from contrib/libarchive-2/cpio/err.c rename to contrib/libarchive/cpio/err.c diff --git a/contrib/libarchive-2/cpio/matching.c b/contrib/libarchive/cpio/matching.c similarity index 100% rename from contrib/libarchive-2/cpio/matching.c rename to contrib/libarchive/cpio/matching.c diff --git a/contrib/libarchive-2/cpio/matching.h b/contrib/libarchive/cpio/matching.h similarity index 100% rename from contrib/libarchive-2/cpio/matching.h rename to contrib/libarchive/cpio/matching.h diff --git a/contrib/libarchive-2/cpio/pathmatch.c b/contrib/libarchive/cpio/pathmatch.c similarity index 100% rename from contrib/libarchive-2/cpio/pathmatch.c rename to contrib/libarchive/cpio/pathmatch.c diff --git a/contrib/libarchive-2/cpio/pathmatch.h b/contrib/libarchive/cpio/pathmatch.h similarity index 100% rename from contrib/libarchive-2/cpio/pathmatch.h rename to contrib/libarchive/cpio/pathmatch.h diff --git a/contrib/libarchive-2/libarchive/archive.h b/contrib/libarchive/libarchive/archive.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive.h rename to contrib/libarchive/libarchive/archive.h diff --git a/contrib/libarchive-2/libarchive/archive.h.in b/contrib/libarchive/libarchive/archive.h.in similarity index 100% rename from contrib/libarchive-2/libarchive/archive.h.in rename to contrib/libarchive/libarchive/archive.h.in diff --git a/contrib/libarchive-2/libarchive/archive_check_magic.c b/contrib/libarchive/libarchive/archive_check_magic.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_check_magic.c rename to contrib/libarchive/libarchive/archive_check_magic.c diff --git a/contrib/libarchive-2/libarchive/archive_endian.h b/contrib/libarchive/libarchive/archive_endian.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive_endian.h rename to contrib/libarchive/libarchive/archive_endian.h diff --git a/contrib/libarchive-2/libarchive/archive_entry.3 b/contrib/libarchive/libarchive/archive_entry.3 similarity index 100% rename from contrib/libarchive-2/libarchive/archive_entry.3 rename to contrib/libarchive/libarchive/archive_entry.3 diff --git a/contrib/libarchive-2/libarchive/archive_entry.c b/contrib/libarchive/libarchive/archive_entry.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_entry.c rename to contrib/libarchive/libarchive/archive_entry.c diff --git a/contrib/libarchive-2/libarchive/archive_entry.h b/contrib/libarchive/libarchive/archive_entry.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive_entry.h rename to contrib/libarchive/libarchive/archive_entry.h diff --git a/contrib/libarchive-2/libarchive/archive_entry_copy_stat.c b/contrib/libarchive/libarchive/archive_entry_copy_stat.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_entry_copy_stat.c rename to contrib/libarchive/libarchive/archive_entry_copy_stat.c diff --git a/contrib/libarchive-2/libarchive/archive_entry_link_resolver.c b/contrib/libarchive/libarchive/archive_entry_link_resolver.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_entry_link_resolver.c rename to contrib/libarchive/libarchive/archive_entry_link_resolver.c diff --git a/contrib/libarchive-2/libarchive/archive_entry_private.h b/contrib/libarchive/libarchive/archive_entry_private.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive_entry_private.h rename to contrib/libarchive/libarchive/archive_entry_private.h diff --git a/contrib/libarchive-2/libarchive/archive_entry_stat.c b/contrib/libarchive/libarchive/archive_entry_stat.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_entry_stat.c rename to contrib/libarchive/libarchive/archive_entry_stat.c diff --git a/contrib/libarchive-2/libarchive/archive_entry_strmode.c b/contrib/libarchive/libarchive/archive_entry_strmode.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_entry_strmode.c rename to contrib/libarchive/libarchive/archive_entry_strmode.c diff --git a/contrib/libarchive-2/libarchive/archive_platform.h b/contrib/libarchive/libarchive/archive_platform.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive_platform.h rename to contrib/libarchive/libarchive/archive_platform.h diff --git a/contrib/libarchive-2/libarchive/archive_private.h b/contrib/libarchive/libarchive/archive_private.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive_private.h rename to contrib/libarchive/libarchive/archive_private.h diff --git a/contrib/libarchive-2/libarchive/archive_read.3 b/contrib/libarchive/libarchive/archive_read.3 similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read.3 rename to contrib/libarchive/libarchive/archive_read.3 diff --git a/contrib/libarchive-2/libarchive/archive_read.c b/contrib/libarchive/libarchive/archive_read.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read.c rename to contrib/libarchive/libarchive/archive_read.c diff --git a/contrib/libarchive-2/libarchive/archive_read_data_into_fd.c b/contrib/libarchive/libarchive/archive_read_data_into_fd.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_data_into_fd.c rename to contrib/libarchive/libarchive/archive_read_data_into_fd.c diff --git a/contrib/libarchive-2/libarchive/archive_read_extract.c b/contrib/libarchive/libarchive/archive_read_extract.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_extract.c rename to contrib/libarchive/libarchive/archive_read_extract.c diff --git a/contrib/libarchive-2/libarchive/archive_read_open_fd.c b/contrib/libarchive/libarchive/archive_read_open_fd.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_open_fd.c rename to contrib/libarchive/libarchive/archive_read_open_fd.c diff --git a/contrib/libarchive-2/libarchive/archive_read_open_file.c b/contrib/libarchive/libarchive/archive_read_open_file.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_open_file.c rename to contrib/libarchive/libarchive/archive_read_open_file.c diff --git a/contrib/libarchive-2/libarchive/archive_read_open_filename.c b/contrib/libarchive/libarchive/archive_read_open_filename.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_open_filename.c rename to contrib/libarchive/libarchive/archive_read_open_filename.c diff --git a/contrib/libarchive-2/libarchive/archive_read_open_memory.c b/contrib/libarchive/libarchive/archive_read_open_memory.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_open_memory.c rename to contrib/libarchive/libarchive/archive_read_open_memory.c diff --git a/contrib/libarchive-2/libarchive/archive_read_private.h b/contrib/libarchive/libarchive/archive_read_private.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_private.h rename to contrib/libarchive/libarchive/archive_read_private.h diff --git a/contrib/libarchive-2/libarchive/archive_read_support_compression_all.c b/contrib/libarchive/libarchive/archive_read_support_compression_all.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_compression_all.c rename to contrib/libarchive/libarchive/archive_read_support_compression_all.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_compression_bzip2.c b/contrib/libarchive/libarchive/archive_read_support_compression_bzip2.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_compression_bzip2.c rename to contrib/libarchive/libarchive/archive_read_support_compression_bzip2.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_compression_compress.c b/contrib/libarchive/libarchive/archive_read_support_compression_compress.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_compression_compress.c rename to contrib/libarchive/libarchive/archive_read_support_compression_compress.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_compression_gzip.c b/contrib/libarchive/libarchive/archive_read_support_compression_gzip.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_compression_gzip.c rename to contrib/libarchive/libarchive/archive_read_support_compression_gzip.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_compression_none.c b/contrib/libarchive/libarchive/archive_read_support_compression_none.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_compression_none.c rename to contrib/libarchive/libarchive/archive_read_support_compression_none.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_compression_program.c b/contrib/libarchive/libarchive/archive_read_support_compression_program.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_compression_program.c rename to contrib/libarchive/libarchive/archive_read_support_compression_program.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_format_all.c b/contrib/libarchive/libarchive/archive_read_support_format_all.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_format_all.c rename to contrib/libarchive/libarchive/archive_read_support_format_all.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_format_ar.c b/contrib/libarchive/libarchive/archive_read_support_format_ar.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_format_ar.c rename to contrib/libarchive/libarchive/archive_read_support_format_ar.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_format_cpio.c b/contrib/libarchive/libarchive/archive_read_support_format_cpio.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_format_cpio.c rename to contrib/libarchive/libarchive/archive_read_support_format_cpio.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_format_empty.c b/contrib/libarchive/libarchive/archive_read_support_format_empty.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_format_empty.c rename to contrib/libarchive/libarchive/archive_read_support_format_empty.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_format_iso9660.c b/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_format_iso9660.c rename to contrib/libarchive/libarchive/archive_read_support_format_iso9660.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_format_mtree.c b/contrib/libarchive/libarchive/archive_read_support_format_mtree.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_format_mtree.c rename to contrib/libarchive/libarchive/archive_read_support_format_mtree.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_format_tar.c b/contrib/libarchive/libarchive/archive_read_support_format_tar.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_format_tar.c rename to contrib/libarchive/libarchive/archive_read_support_format_tar.c diff --git a/contrib/libarchive-2/libarchive/archive_read_support_format_zip.c b/contrib/libarchive/libarchive/archive_read_support_format_zip.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_read_support_format_zip.c rename to contrib/libarchive/libarchive/archive_read_support_format_zip.c diff --git a/contrib/libarchive-2/libarchive/archive_string.c b/contrib/libarchive/libarchive/archive_string.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_string.c rename to contrib/libarchive/libarchive/archive_string.c diff --git a/contrib/libarchive-2/libarchive/archive_string.h b/contrib/libarchive/libarchive/archive_string.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive_string.h rename to contrib/libarchive/libarchive/archive_string.h diff --git a/contrib/libarchive-2/libarchive/archive_string_sprintf.c b/contrib/libarchive/libarchive/archive_string_sprintf.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_string_sprintf.c rename to contrib/libarchive/libarchive/archive_string_sprintf.c diff --git a/contrib/libarchive-2/libarchive/archive_util.3 b/contrib/libarchive/libarchive/archive_util.3 similarity index 100% rename from contrib/libarchive-2/libarchive/archive_util.3 rename to contrib/libarchive/libarchive/archive_util.3 diff --git a/contrib/libarchive-2/libarchive/archive_util.c b/contrib/libarchive/libarchive/archive_util.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_util.c rename to contrib/libarchive/libarchive/archive_util.c diff --git a/contrib/libarchive-2/libarchive/archive_virtual.c b/contrib/libarchive/libarchive/archive_virtual.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_virtual.c rename to contrib/libarchive/libarchive/archive_virtual.c diff --git a/contrib/libarchive-2/libarchive/archive_write.3 b/contrib/libarchive/libarchive/archive_write.3 similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write.3 rename to contrib/libarchive/libarchive/archive_write.3 diff --git a/contrib/libarchive-2/libarchive/archive_write.c b/contrib/libarchive/libarchive/archive_write.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write.c rename to contrib/libarchive/libarchive/archive_write.c diff --git a/contrib/libarchive-2/libarchive/archive_write_disk.3 b/contrib/libarchive/libarchive/archive_write_disk.3 similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_disk.3 rename to contrib/libarchive/libarchive/archive_write_disk.3 diff --git a/contrib/libarchive-2/libarchive/archive_write_disk.c b/contrib/libarchive/libarchive/archive_write_disk.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_disk.c rename to contrib/libarchive/libarchive/archive_write_disk.c diff --git a/contrib/libarchive-2/libarchive/archive_write_disk_private.h b/contrib/libarchive/libarchive/archive_write_disk_private.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_disk_private.h rename to contrib/libarchive/libarchive/archive_write_disk_private.h diff --git a/contrib/libarchive-2/libarchive/archive_write_disk_set_standard_lookup.c b/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_disk_set_standard_lookup.c rename to contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c diff --git a/contrib/libarchive-2/libarchive/archive_write_open_fd.c b/contrib/libarchive/libarchive/archive_write_open_fd.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_open_fd.c rename to contrib/libarchive/libarchive/archive_write_open_fd.c diff --git a/contrib/libarchive-2/libarchive/archive_write_open_file.c b/contrib/libarchive/libarchive/archive_write_open_file.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_open_file.c rename to contrib/libarchive/libarchive/archive_write_open_file.c diff --git a/contrib/libarchive-2/libarchive/archive_write_open_filename.c b/contrib/libarchive/libarchive/archive_write_open_filename.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_open_filename.c rename to contrib/libarchive/libarchive/archive_write_open_filename.c diff --git a/contrib/libarchive-2/libarchive/archive_write_open_memory.c b/contrib/libarchive/libarchive/archive_write_open_memory.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_open_memory.c rename to contrib/libarchive/libarchive/archive_write_open_memory.c diff --git a/contrib/libarchive-2/libarchive/archive_write_private.h b/contrib/libarchive/libarchive/archive_write_private.h similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_private.h rename to contrib/libarchive/libarchive/archive_write_private.h diff --git a/contrib/libarchive-2/libarchive/archive_write_set_compression_bzip2.c b/contrib/libarchive/libarchive/archive_write_set_compression_bzip2.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_compression_bzip2.c rename to contrib/libarchive/libarchive/archive_write_set_compression_bzip2.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_compression_compress.c b/contrib/libarchive/libarchive/archive_write_set_compression_compress.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_compression_compress.c rename to contrib/libarchive/libarchive/archive_write_set_compression_compress.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_compression_gzip.c b/contrib/libarchive/libarchive/archive_write_set_compression_gzip.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_compression_gzip.c rename to contrib/libarchive/libarchive/archive_write_set_compression_gzip.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_compression_none.c b/contrib/libarchive/libarchive/archive_write_set_compression_none.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_compression_none.c rename to contrib/libarchive/libarchive/archive_write_set_compression_none.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_compression_program.c b/contrib/libarchive/libarchive/archive_write_set_compression_program.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_compression_program.c rename to contrib/libarchive/libarchive/archive_write_set_compression_program.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_format.c b/contrib/libarchive/libarchive/archive_write_set_format.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_format.c rename to contrib/libarchive/libarchive/archive_write_set_format.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_format_ar.c b/contrib/libarchive/libarchive/archive_write_set_format_ar.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_format_ar.c rename to contrib/libarchive/libarchive/archive_write_set_format_ar.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_format_by_name.c b/contrib/libarchive/libarchive/archive_write_set_format_by_name.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_format_by_name.c rename to contrib/libarchive/libarchive/archive_write_set_format_by_name.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_format_cpio.c b/contrib/libarchive/libarchive/archive_write_set_format_cpio.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_format_cpio.c rename to contrib/libarchive/libarchive/archive_write_set_format_cpio.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_format_cpio_newc.c b/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_format_cpio_newc.c rename to contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_format_pax.c b/contrib/libarchive/libarchive/archive_write_set_format_pax.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_format_pax.c rename to contrib/libarchive/libarchive/archive_write_set_format_pax.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_format_shar.c b/contrib/libarchive/libarchive/archive_write_set_format_shar.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_format_shar.c rename to contrib/libarchive/libarchive/archive_write_set_format_shar.c diff --git a/contrib/libarchive-2/libarchive/archive_write_set_format_ustar.c b/contrib/libarchive/libarchive/archive_write_set_format_ustar.c similarity index 100% rename from contrib/libarchive-2/libarchive/archive_write_set_format_ustar.c rename to contrib/libarchive/libarchive/archive_write_set_format_ustar.c diff --git a/contrib/libarchive-2/libarchive/cpio.5 b/contrib/libarchive/libarchive/cpio.5 similarity index 100% rename from contrib/libarchive-2/libarchive/cpio.5 rename to contrib/libarchive/libarchive/cpio.5 diff --git a/contrib/libarchive-2/libarchive/filter_fork.c b/contrib/libarchive/libarchive/filter_fork.c similarity index 100% rename from contrib/libarchive-2/libarchive/filter_fork.c rename to contrib/libarchive/libarchive/filter_fork.c diff --git a/contrib/libarchive-2/libarchive/filter_fork.h b/contrib/libarchive/libarchive/filter_fork.h similarity index 100% rename from contrib/libarchive-2/libarchive/filter_fork.h rename to contrib/libarchive/libarchive/filter_fork.h diff --git a/contrib/libarchive-2/libarchive/libarchive-formats.5 b/contrib/libarchive/libarchive/libarchive-formats.5 similarity index 100% rename from contrib/libarchive-2/libarchive/libarchive-formats.5 rename to contrib/libarchive/libarchive/libarchive-formats.5 diff --git a/contrib/libarchive-2/libarchive/libarchive.3 b/contrib/libarchive/libarchive/libarchive.3 similarity index 100% rename from contrib/libarchive-2/libarchive/libarchive.3 rename to contrib/libarchive/libarchive/libarchive.3 diff --git a/contrib/libarchive-2/libarchive/libarchive_internals.3 b/contrib/libarchive/libarchive/libarchive_internals.3 similarity index 100% rename from contrib/libarchive-2/libarchive/libarchive_internals.3 rename to contrib/libarchive/libarchive/libarchive_internals.3 diff --git a/contrib/libarchive-2/libarchive/mtree.5 b/contrib/libarchive/libarchive/mtree.5 similarity index 100% rename from contrib/libarchive-2/libarchive/mtree.5 rename to contrib/libarchive/libarchive/mtree.5 diff --git a/contrib/libarchive-2/libarchive/tar.5 b/contrib/libarchive/libarchive/tar.5 similarity index 100% rename from contrib/libarchive-2/libarchive/tar.5 rename to contrib/libarchive/libarchive/tar.5 diff --git a/contrib/libarchive-2/tar/bsdtar.1 b/contrib/libarchive/tar/bsdtar.1 similarity index 100% rename from contrib/libarchive-2/tar/bsdtar.1 rename to contrib/libarchive/tar/bsdtar.1 diff --git a/contrib/libarchive-2/tar/bsdtar.c b/contrib/libarchive/tar/bsdtar.c similarity index 100% rename from contrib/libarchive-2/tar/bsdtar.c rename to contrib/libarchive/tar/bsdtar.c diff --git a/contrib/libarchive-2/tar/bsdtar.h b/contrib/libarchive/tar/bsdtar.h similarity index 100% rename from contrib/libarchive-2/tar/bsdtar.h rename to contrib/libarchive/tar/bsdtar.h diff --git a/contrib/libarchive-2/tar/bsdtar_platform.h b/contrib/libarchive/tar/bsdtar_platform.h similarity index 100% rename from contrib/libarchive-2/tar/bsdtar_platform.h rename to contrib/libarchive/tar/bsdtar_platform.h diff --git a/contrib/libarchive-2/tar/getdate.y b/contrib/libarchive/tar/getdate.y similarity index 100% rename from contrib/libarchive-2/tar/getdate.y rename to contrib/libarchive/tar/getdate.y diff --git a/contrib/libarchive-2/tar/matching.c b/contrib/libarchive/tar/matching.c similarity index 100% rename from contrib/libarchive-2/tar/matching.c rename to contrib/libarchive/tar/matching.c diff --git a/contrib/libarchive-2/tar/read.c b/contrib/libarchive/tar/read.c similarity index 100% rename from contrib/libarchive-2/tar/read.c rename to contrib/libarchive/tar/read.c diff --git a/contrib/libarchive-2/tar/siginfo.c b/contrib/libarchive/tar/siginfo.c similarity index 100% rename from contrib/libarchive-2/tar/siginfo.c rename to contrib/libarchive/tar/siginfo.c diff --git a/contrib/libarchive-2/tar/subst.c b/contrib/libarchive/tar/subst.c similarity index 100% rename from contrib/libarchive-2/tar/subst.c rename to contrib/libarchive/tar/subst.c diff --git a/contrib/libarchive-2/tar/tree.c b/contrib/libarchive/tar/tree.c similarity index 100% rename from contrib/libarchive-2/tar/tree.c rename to contrib/libarchive/tar/tree.c diff --git a/contrib/libarchive-2/tar/tree.h b/contrib/libarchive/tar/tree.h similarity index 100% rename from contrib/libarchive-2/tar/tree.h rename to contrib/libarchive/tar/tree.h diff --git a/contrib/libarchive-2/tar/util.c b/contrib/libarchive/tar/util.c similarity index 100% rename from contrib/libarchive-2/tar/util.c rename to contrib/libarchive/tar/util.c diff --git a/contrib/libarchive-2/tar/write.c b/contrib/libarchive/tar/write.c similarity index 100% rename from contrib/libarchive-2/tar/write.c rename to contrib/libarchive/tar/write.c diff --git a/contrib/libarchive-2/version b/contrib/libarchive/version similarity index 100% rename from contrib/libarchive-2/version rename to contrib/libarchive/version