Browse Source

remove makefiles as they cause the in source build test of cmake to fail

Bill Hoffman 16 years ago
parent
commit
b9e88cd4c8

+ 0 - 14
Utilities/cmlibarchive/contrib/shar/Makefile

@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PROG=   shar
-SRCS=   shar.c tree.c
-
-WARNS?= 6
-
-DPADD=  ${LIBARCHIVE}
-LDADD=  -larchive
-
-LINKS=  ${BINDIR}/shar
-MLINKS= shar.1
-
-.include <bsd.prog.mk>

+ 0 - 26
Utilities/cmlibarchive/cpio/Makefile

@@ -1,26 +0,0 @@
-# $FreeBSD: src/usr.bin/cpio/Makefile,v 1.6 2008/12/06 07:30:40 kientzle Exp $
-
-.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../libarchive_fe
-
-PROG=   bsdcpio
-BSDCPIO_VERSION_STRING=2.7.900a
-SRCS=   cpio.c cmdline.c err.c line_reader.c matching.c pathmatch.c
-WARNS?= 6
-DPADD=  ${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
-CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
-CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-CFLAGS+= -I../libarchive_fe -I${.CURDIR}
-LDADD+= -larchive -lz -lbz2 -lmd -lcrypto
-
-.if ${MK_GNU_CPIO} != "yes"
-SYMLINKS=bsdcpio ${BINDIR}/cpio
-MLINKS= bsdcpio.1 cpio.1
-.endif
-
-.PHONY: check test
-
-check test: $(PROG) bsdcpio.1.gz
-    cd ${.CURDIR}/test && make clean test
-
-.include <bsd.prog.mk>

+ 0 - 75
Utilities/cmlibarchive/cpio/test/Makefile

@@ -1,75 +0,0 @@
-# $FreeBSD: src/usr.bin/cpio/test/Makefile,v 1.4 2008/08/24 05:49:36 kientzle Exp $
-
-# Where to find the cpio sources (for the internal unit tests)
-CPIO_SRCDIR=${.CURDIR}/..
-.PATH: ${CPIO_SRCDIR} ${CPIO_SRCDIR}/../libarchive_fe
-
-# Some cpio sources are pulled in for white-box tests
-CPIO_SRCS= cmdline.c err.c pathmatch.c
-
-TESTS=  \
-    test_0.c                \
-    test_basic.c                \
-    test_cmdline.c              \
-    test_format_newc.c          \
-    test_gcpio_compat.c         \
-    test_option_B_upper.c           \
-    test_option_C_upper.c           \
-    test_option_J_upper.c           \
-    test_option_L_upper.c           \
-    test_option_Z_upper.c           \
-    test_option_a.c             \
-    test_option_c.c             \
-    test_option_d.c             \
-    test_option_f.c             \
-    test_option_help.c          \
-    test_option_l.c             \
-    test_option_lzma.c          \
-    test_option_m.c             \
-    test_option_t.c             \
-    test_option_u.c             \
-    test_option_version.c           \
-    test_option_y.c             \
-    test_option_z.c             \
-    test_owner_parse.c          \
-    test_passthrough_dotdot.c       \
-    test_passthrough_reverse.c      \
-    test_pathmatch.c
-
-# Build the test program
-SRCS= list.h                    \
-    ${CPIO_SRCS}                \
-    ${TESTS}                \
-    main.c
-
-CLEANFILES+= list.h bsdcpio_test
-
-NO_MAN=yes
-
-PROG=bsdcpio_test
-DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
-CFLAGS+=    -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-CFLAGS+=    -I.. -I../../libarchive_fe
-LDADD= -larchive -lz -lbz2
-CFLAGS+= -static -g -O2 -Wall
-CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -I${CPIO_SRCDIR}
-
-# Uncomment to link against dmalloc
-#LDADD+= -L/usr/local/lib -ldmalloc
-#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
-WARNS=6
-
-check test: bsdcpio_test
-    ${.OBJDIR}/bsdcpio_test -p ${.OBJDIR}/../bsdcpio -r ${.CURDIR}
-
-${.OBJDIR}/list.h list.h: ${TESTS} Makefile
-    (cd ${.CURDIR}; cat ${TESTS}) | grep DEFINE_TEST > list.h
-
-clean:
-    rm -f ${CLEANFILES}
-    rm -f *~
-    -chmod -R +w /tmp/bsdcpio_test.*
-    rm -rf /tmp/bsdcpio_test.*
-
-.include <bsd.prog.mk>

+ 0 - 34
Utilities/cmlibarchive/examples/minitar/Makefile

@@ -1,34 +0,0 @@
-
-#
-# Adjust the following to control which options minitar gets
-# built with.  See comments in minitar.c for details.
-#
-CFLAGS=             \
-    -DNO_BZIP2_CREATE   \
-    -DNO_BZIP2_EXTRACT  \
-    -DNO_COMPRESS_EXTRACT   \
-    -DNO_CPIO_EXTRACT   \
-    -DNO_CREATE     \
-    -DNO_GZIP_CREATE    \
-    -DNO_GZIP_EXTRACT   \
-    -DNO_LOOKUP
-
-# Omit 'tree.o' if you're not including create support
-#OBJS= minitar.o tree.o
-OBJS= minitar.o
-
-all: minitar
-
-minitar: $(OBJS)
-    cc -o minitar -static $(OBJS) -larchive -lz -lbz2
-    strip minitar
-    ls -l minitar
-
-minitar.o: minitar.c
-
-tree.o: tree.c
-
-clean::
-    rm -f *.o
-    rm -f minitar
-    rm -f *~

+ 0 - 267
Utilities/cmlibarchive/libarchive/Makefile

@@ -1,267 +0,0 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.88 2008/08/31 07:21:46 kientzle Exp $
-.include <bsd.own.mk>
-
-LIB=    archive
-DPADD=  ${LIBBZ2} ${LIBZ}
-LDADD=  -lbz2 -lz
-
-# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
-# It has no real relation to the libarchive version number.
-SHLIB_MAJOR= 5
-
-CFLAGS+=    -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-CFLAGS+=    -I${.OBJDIR}
-#Uncomment to build with full lzma/xz support via liblzma
-#CFLAGS+= -I/usr/local/include -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
-#LDADD+= -L/usr/local/lib -llzma
-
-.if ${MK_OPENSSL} != "no"
-CFLAGS+=    -DWITH_OPENSSL
-.endif
-
-
-WARNS?= 6
-
-# Headers to be installed in /usr/include
-INCS=   archive.h archive_entry.h
-
-# Sources to be compiled.
-SRCS=   archive_check_magic.c               \
-    archive_entry.c                 \
-    archive_entry_copy_stat.c           \
-    archive_entry_stat.c                \
-    archive_entry_strmode.c             \
-    archive_entry_link_resolver.c           \
-    archive_entry_xattr.c               \
-    archive_read.c                  \
-    archive_read_data_into_fd.c         \
-    archive_read_disk.c             \
-    archive_read_disk_entry_from_file.c     \
-    archive_read_disk_set_standard_lookup.c     \
-    archive_read_extract.c              \
-    archive_read_open_fd.c              \
-    archive_read_open_file.c            \
-    archive_read_open_filename.c            \
-    archive_read_open_memory.c          \
-    archive_read_support_compression_all.c      \
-    archive_read_support_compression_bzip2.c    \
-    archive_read_support_compression_compress.c \
-    archive_read_support_compression_gzip.c     \
-    archive_read_support_compression_none.c     \
-    archive_read_support_compression_program.c  \
-    archive_read_support_compression_xz.c       \
-    archive_read_support_format_all.c       \
-    archive_read_support_format_ar.c        \
-    archive_read_support_format_cpio.c      \
-    archive_read_support_format_empty.c     \
-    archive_read_support_format_iso9660.c       \
-    archive_read_support_format_mtree.c     \
-    archive_read_support_format_raw.c       \
-    archive_read_support_format_tar.c       \
-    archive_read_support_format_zip.c       \
-    archive_string.c                \
-    archive_string_sprintf.c            \
-    archive_util.c                  \
-    archive_virtual.c               \
-    archive_write.c                 \
-    archive_write_disk.c                \
-    archive_write_disk_set_standard_lookup.c    \
-    archive_write_open_fd.c             \
-    archive_write_open_file.c           \
-    archive_write_open_filename.c           \
-    archive_write_open_memory.c         \
-    archive_write_set_compression_bzip2.c       \
-    archive_write_set_compression_compress.c    \
-    archive_write_set_compression_gzip.c        \
-    archive_write_set_compression_none.c        \
-    archive_write_set_compression_program.c     \
-    archive_write_set_compression_xz.c      \
-    archive_write_set_format.c          \
-    archive_write_set_format_ar.c           \
-    archive_write_set_format_by_name.c      \
-    archive_write_set_format_cpio.c         \
-    archive_write_set_format_cpio_newc.c        \
-    archive_write_set_format_mtree.c        \
-    archive_write_set_format_pax.c          \
-    archive_write_set_format_shar.c         \
-    archive_write_set_format_ustar.c        \
-    archive_write_set_format_zip.c          \
-    filter_fork.c
-
-# Man pages to be installed.
-MAN=    archive_entry.3                 \
-    archive_read.3                  \
-    archive_read_disk.3             \
-    archive_util.3                  \
-    archive_write.3                 \
-    archive_write_disk.3                \
-    cpio.5                      \
-    libarchive.3                    \
-    libarchive-formats.5                \
-    tar.5
-
-# Symlink the man pages under each function name.
-MLINKS+=    archive_entry.3 archive_entry_acl_add_entry.3
-MLINKS+=    archive_entry.3 archive_entry_acl_add_entry_w.3
-MLINKS+=    archive_entry.3 archive_entry_acl_clear.3
-MLINKS+=    archive_entry.3 archive_entry_acl_count.3
-MLINKS+=    archive_entry.3 archive_entry_acl_next.3
-MLINKS+=    archive_entry.3 archive_entry_acl_next_w.3
-MLINKS+=    archive_entry.3 archive_entry_acl_reset.3
-MLINKS+=    archive_entry.3 archive_entry_acl_text_w.3
-MLINKS+=    archive_entry.3 archive_entry_clear.3
-MLINKS+=    archive_entry.3 archive_entry_clone.3
-MLINKS+=    archive_entry.3 archive_entry_copy_fflags_text.3
-MLINKS+=    archive_entry.3 archive_entry_copy_fflags_text_w.3
-MLINKS+=    archive_entry.3 archive_entry_copy_gname.3
-MLINKS+=    archive_entry.3 archive_entry_copy_gname_w.3
-MLINKS+=    archive_entry.3 archive_entry_copy_hardlink_w.3
-MLINKS+=    archive_entry.3 archive_entry_copy_link.3
-MLINKS+=    archive_entry.3 archive_entry_copy_link_w.3
-MLINKS+=    archive_entry.3 archive_entry_copy_pathname_w.3
-MLINKS+=    archive_entry.3 archive_entry_copy_stat.3
-MLINKS+=    archive_entry.3 archive_entry_copy_symlink_w.3
-MLINKS+=    archive_entry.3 archive_entry_copy_uname.3
-MLINKS+=    archive_entry.3 archive_entry_copy_uname_w.3
-MLINKS+=    archive_entry.3 archive_entry_dev.3
-MLINKS+=    archive_entry.3 archive_entry_devmajor.3
-MLINKS+=    archive_entry.3 archive_entry_devminor.3
-MLINKS+=    archive_entry.3 archive_entry_filetype.3
-MLINKS+=    archive_entry.3 archive_entry_fflags.3
-MLINKS+=    archive_entry.3 archive_entry_fflags_text.3
-MLINKS+=    archive_entry.3 archive_entry_free.3
-MLINKS+=    archive_entry.3 archive_entry_gid.3
-MLINKS+=    archive_entry.3 archive_entry_gname.3
-MLINKS+=    archive_entry.3 archive_entry_gname_w.3
-MLINKS+=    archive_entry.3 archive_entry_hardlink.3
-MLINKS+=    archive_entry.3 archive_entry_ino.3
-MLINKS+=    archive_entry.3 archive_entry_mode.3
-MLINKS+=    archive_entry.3 archive_entry_mtime.3
-MLINKS+=    archive_entry.3 archive_entry_mtime_nsec.3
-MLINKS+=    archive_entry.3 archive_entry_nlink.3
-MLINKS+=    archive_entry.3 archive_entry_new.3
-MLINKS+=    archive_entry.3 archive_entry_pathname.3
-MLINKS+=    archive_entry.3 archive_entry_pathname_w.3
-MLINKS+=    archive_entry.3 archive_entry_rdev.3
-MLINKS+=    archive_entry.3 archive_entry_rdevmajor.3
-MLINKS+=    archive_entry.3 archive_entry_rdevminor.3
-MLINKS+=    archive_entry.3 archive_entry_set_atime.3
-MLINKS+=    archive_entry.3 archive_entry_set_ctime.3
-MLINKS+=    archive_entry.3 archive_entry_set_dev.3
-MLINKS+=    archive_entry.3 archive_entry_set_devmajor.3
-MLINKS+=    archive_entry.3 archive_entry_set_devminor.3
-MLINKS+=    archive_entry.3 archive_entry_set_fflags.3
-MLINKS+=    archive_entry.3 archive_entry_set_gid.3
-MLINKS+=    archive_entry.3 archive_entry_set_gname.3
-MLINKS+=    archive_entry.3 archive_entry_set_hardlink.3
-MLINKS+=    archive_entry.3 archive_entry_set_link.3
-MLINKS+=    archive_entry.3 archive_entry_set_mode.3
-MLINKS+=    archive_entry.3 archive_entry_set_mtime.3
-MLINKS+=    archive_entry.3 archive_entry_set_nlink.3
-MLINKS+=    archive_entry.3 archive_entry_set_pathname.3
-MLINKS+=    archive_entry.3 archive_entry_set_rdev.3
-MLINKS+=    archive_entry.3 archive_entry_set_rdevmajor.3
-MLINKS+=    archive_entry.3 archive_entry_set_rdevminor.3
-MLINKS+=    archive_entry.3 archive_entry_set_size.3
-MLINKS+=    archive_entry.3 archive_entry_set_symlink.3
-MLINKS+=    archive_entry.3 archive_entry_set_uid.3
-MLINKS+=    archive_entry.3 archive_entry_set_uname.3
-MLINKS+=    archive_entry.3 archive_entry_size.3
-MLINKS+=    archive_entry.3 archive_entry_stat.3
-MLINKS+=    archive_entry.3 archive_entry_symlink.3
-MLINKS+=    archive_entry.3 archive_entry_uid.3
-MLINKS+=    archive_entry.3 archive_entry_uname.3
-MLINKS+=    archive_entry.3 archive_entry_uname_w.3
-MLINKS+=    archive_read.3 archive_read_data.3
-MLINKS+=    archive_read.3 archive_read_data_block.3
-MLINKS+=    archive_read.3 archive_read_data_into_buffer.3
-MLINKS+=    archive_read.3 archive_read_data_into_fd.3
-MLINKS+=    archive_read.3 archive_read_data_skip.3
-MLINKS+=    archive_read.3 archive_read_extract.3
-MLINKS+=    archive_read.3 archive_read_extract_set_progress_callback.3
-MLINKS+=    archive_read.3 archive_read_extract_set_skip_file.3
-MLINKS+=    archive_read.3 archive_read_finish.3
-MLINKS+=    archive_read.3 archive_read_new.3
-MLINKS+=    archive_read.3 archive_read_next_header.3
-MLINKS+=    archive_read.3 archive_read_next_header2.3
-MLINKS+=    archive_read.3 archive_read_open.3
-MLINKS+=    archive_read.3 archive_read_open2.3
-MLINKS+=    archive_read.3 archive_read_open_FILE.3
-MLINKS+=    archive_read.3 archive_read_open_fd.3
-MLINKS+=    archive_read.3 archive_read_open_file.3
-MLINKS+=    archive_read.3 archive_read_open_filename.3
-MLINKS+=    archive_read.3 archive_read_open_memory.3
-MLINKS+=    archive_read.3 archive_read_support_compression_all.3
-MLINKS+=    archive_read.3 archive_read_support_compression_bzip2.3
-MLINKS+=    archive_read.3 archive_read_support_compression_compress.3
-MLINKS+=    archive_read.3 archive_read_support_compression_gzip.3
-MLINKS+=    archive_read.3 archive_read_support_compression_lzma.3
-MLINKS+=    archive_read.3 archive_read_support_compression_none.3
-MLINKS+=    archive_read.3 archive_read_support_compression_program.3
-MLINKS+=    archive_read.3 archive_read_support_compression_program_signature.3
-MLINKS+=    archive_read.3 archive_read_support_compression_xz.3
-MLINKS+=    archive_read.3 archive_read_support_format_all.3
-MLINKS+=    archive_read.3 archive_read_support_format_ar.3
-MLINKS+=    archive_read.3 archive_read_support_format_cpio.3
-MLINKS+=    archive_read.3 archive_read_support_format_empty.3
-MLINKS+=    archive_read.3 archive_read_support_format_iso9660.3
-MLINKS+=    archive_read.3 archive_read_support_format_raw.3
-MLINKS+=    archive_read.3 archive_read_support_format_tar.3
-MLINKS+=    archive_read.3 archive_read_support_format_zip.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_entry_from_file.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_gname.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_new.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_set_gname_lookup.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_set_standard_lookup.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_set_symlink_hybrid.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_set_symlink_logical.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_set_symlink_physical.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_set_uname_lookup.3
-MLINKS+=    archive_read_disk.3 archive_read_disk_uname.3
-MLINKS+=    archive_util.3 archive_clear_error.3
-MLINKS+=    archive_util.3 archive_compression.3
-MLINKS+=    archive_util.3 archive_compression_name.3
-MLINKS+=    archive_util.3 archive_errno.3
-MLINKS+=    archive_util.3 archive_error_string.3
-MLINKS+=    archive_util.3 archive_file_count.3
-MLINKS+=    archive_util.3 archive_format.3
-MLINKS+=    archive_util.3 archive_format_name.3
-MLINKS+=    archive_util.3 archive_set_error.3
-MLINKS+=    archive_write.3 archive_write_close.3
-MLINKS+=    archive_write.3 archive_write_data.3
-MLINKS+=    archive_write.3 archive_write_finish.3
-MLINKS+=    archive_write.3 archive_write_finish_entry.3
-MLINKS+=    archive_write.3 archive_write_get_bytes_in_last_block.3
-MLINKS+=    archive_write.3 archive_write_get_bytes_per_block.3
-MLINKS+=    archive_write.3 archive_write_header.3
-MLINKS+=    archive_write.3 archive_write_new.3
-MLINKS+=    archive_write.3 archive_write_open.3
-MLINKS+=    archive_write.3 archive_write_open_FILE.3
-MLINKS+=    archive_write.3 archive_write_open_fd.3
-MLINKS+=    archive_write.3 archive_write_open_file.3
-MLINKS+=    archive_write.3 archive_write_open_filename.3
-MLINKS+=    archive_write.3 archive_write_open_memory.3
-MLINKS+=    archive_write.3 archive_write_set_bytes_in_last_block.3
-MLINKS+=    archive_write.3 archive_write_set_bytes_per_block.3
-MLINKS+=    archive_write.3 archive_write_set_callbacks.3
-MLINKS+=    archive_write.3 archive_write_set_compression_bzip2.3
-MLINKS+=    archive_write.3 archive_write_set_compression_compress.3
-MLINKS+=    archive_write.3 archive_write_set_compression_gzip.3
-MLINKS+=    archive_write.3 archive_write_set_compression_none.3
-MLINKS+=    archive_write.3 archive_write_set_compression_program.3
-MLINKS+=    archive_write.3 archive_write_set_format_pax.3
-MLINKS+=    archive_write.3 archive_write_set_format_shar.3
-MLINKS+=    archive_write.3 archive_write_set_format_ustar.3
-MLINKS+=    archive_write_disk.3 archive_write_disk_new.3
-MLINKS+=    archive_write_disk.3 archive_write_disk_set_group_lookup.3
-MLINKS+=    archive_write_disk.3 archive_write_disk_set_options.3
-MLINKS+=    archive_write_disk.3 archive_write_disk_set_skip_file.3
-MLINKS+=    archive_write_disk.3 archive_write_disk_set_standard_lookup.3
-MLINKS+=    archive_write_disk.3 archive_write_disk_set_user_lookup.3
-MLINKS+=    libarchive.3 archive.3
-
-.PHONY: check test
-check test:
-    cd ${.CURDIR}/test && make test
-
-.include <bsd.lib.mk>

+ 0 - 153
Utilities/cmlibarchive/libarchive/test/Makefile

@@ -1,153 +0,0 @@
-# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.29 2008/12/06 07:08:08 kientzle Exp $
-
-# Where to find the libarchive sources
-LA_SRCDIR=${.CURDIR}/..
-.PATH: ${LA_SRCDIR}
-
-# Get a list of all libarchive source files
-LA_SRCS!=make -f ${LA_SRCDIR}/Makefile -V SRCS
-
-TESTS= \
-    test_acl_basic.c            \
-    test_acl_freebsd.c          \
-    test_acl_pax.c              \
-    test_archive_api_feature.c      \
-    test_bad_fd.c               \
-    test_compat_bzip2.c         \
-    test_compat_gtar.c          \
-    test_compat_gzip.c          \
-    test_compat_solaris_tar_acl.c       \
-    test_compat_tar_hardlink.c      \
-    test_compat_xz.c            \
-    test_compat_zip.c           \
-    test_empty_write.c          \
-    test_entry.c                \
-    test_entry_strmode.c            \
-    test_extattr_freebsd.c          \
-    test_fuzz.c             \
-    test_link_resolver.c            \
-    test_open_fd.c              \
-    test_open_file.c            \
-    test_open_filename.c            \
-    test_pax_filename_encoding.c        \
-    test_read_compress_program.c        \
-    test_read_data_large.c          \
-    test_read_disk.c            \
-    test_read_disk_entry_from_file.c    \
-    test_read_extract.c         \
-    test_read_file_nonexistent.c        \
-    test_read_format_ar.c           \
-    test_read_format_cpio_bin.c     \
-    test_read_format_cpio_bin_Z.c       \
-    test_read_format_cpio_bin_be.c      \
-    test_read_format_cpio_bin_bz2.c     \
-    test_read_format_cpio_bin_gz.c      \
-    test_read_format_cpio_bin_xz.c      \
-    test_read_format_cpio_odc.c     \
-    test_read_format_cpio_svr4_gzip.c   \
-    test_read_format_cpio_svr4c_Z.c     \
-    test_read_format_empty.c        \
-    test_read_format_gtar_gz.c      \
-    test_read_format_gtar_lzma.c        \
-    test_read_format_gtar_sparse.c      \
-    test_read_format_iso_gz.c       \
-    test_read_format_isojoliet_bz2.c    \
-    test_read_format_isojoliet_long.c   \
-    test_read_format_isojoliet_rr.c     \
-    test_read_format_isorr_bz2.c        \
-    test_read_format_isorr_new_bz2.c    \
-    test_read_format_isozisofs_bz2.c    \
-    test_read_format_mtree.c        \
-    test_read_format_pax_bz2.c      \
-    test_read_format_raw.c          \
-    test_read_format_tar.c          \
-    test_read_format_tar_empty_filename.c   \
-    test_read_format_tbz.c          \
-    test_read_format_tgz.c          \
-    test_read_format_txz.c          \
-    test_read_format_tz.c           \
-    test_read_format_zip.c          \
-    test_read_large.c           \
-    test_read_pax_truncated.c       \
-    test_read_position.c            \
-    test_read_truncated.c           \
-    test_tar_filenames.c            \
-    test_tar_large.c            \
-    test_ustar_filenames.c          \
-    test_write_compress.c           \
-    test_write_compress_bzip2.c     \
-    test_write_compress_gzip.c      \
-    test_write_compress_lzma.c      \
-    test_write_compress_program.c       \
-    test_write_compress_xz.c        \
-    test_write_disk.c           \
-    test_write_disk_failures.c      \
-    test_write_disk_hardlink.c      \
-    test_write_disk_perms.c         \
-    test_write_disk_secure.c        \
-    test_write_disk_sparse.c        \
-    test_write_disk_symlink.c       \
-    test_write_disk_times.c         \
-    test_write_format_ar.c          \
-    test_write_format_cpio.c        \
-    test_write_format_cpio_empty.c      \
-    test_write_format_cpio_newc.c       \
-    test_write_format_cpio_odc.c        \
-    test_write_format_mtree.c       \
-    test_write_format_pax.c         \
-    test_write_format_shar_empty.c      \
-    test_write_format_tar.c         \
-    test_write_format_tar_empty.c       \
-    test_write_format_tar_ustar.c       \
-    test_write_format_zip.c         \
-    test_write_format_zip_empty.c       \
-    test_write_format_zip_no_compression.c  \
-    test_write_open_memory.c
-
-
-# Build the test program using all libarchive sources + the test sources.
-SRCS= ${LA_SRCS}                \
-    ${TESTS}                \
-    list.h                  \
-    main.c                  \
-    read_open_memory.c
-
-NO_MAN=yes
-
-PROG=libarchive_test
-INTERNALPROG=yes  # Don't install this; it's just for testing
-DPADD=${LIBBZ2} ${LIBZ}
-CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-LDADD= -lz -lbz2 -lmd -lcrypto
-CFLAGS+= -g
-CFLAGS+= -I${LA_SRCDIR} -I.
-
-# Uncomment to build and test lzma support via liblzmadec
-#CFLAGS+= -I/usr/local/include -DHAVE_LIBLZMADEC=1 -DHAVE_LZMADEC_H=1
-#LDADD+= -L/usr/local/lib -llzmadec
-
-# Uncomment to build and test lzma and xz support via liblzma
-CFLAGS+= -I/usr/local/include -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
-LDADD+= -L/usr/local/lib -llzma
-
-# Uncomment to link against dmalloc
-#LDADD+= -L/usr/local/lib -ldmalloc
-#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
-WARNS=6
-
-# Build libarchive_test and run it.
-check test: libarchive_test
-    ./libarchive_test -r ${.CURDIR}
-
-# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines
-list.h: ${TESTS} Makefile
-    (cd ${.CURDIR}; cat test_*.c) | grep DEFINE_TEST > list.h
-
-CLEANFILES += *.out *.o *.core *~ list.h .dirstamp .depend
-CLEANDIRS += .deps .libs
-
-cleantest:
-    -chmod -R +w /tmp/libarchive_test.*
-    rm -rf /tmp/libarchive_test.*
-
-.include <bsd.prog.mk>

+ 0 - 23
Utilities/cmlibarchive/tar/Makefile

@@ -1,23 +0,0 @@
-# $FreeBSD: src/usr.bin/tar/Makefile,v 1.40 2008/12/06 07:38:14 kientzle Exp $
-
-.PATH: ${.CURDIR}/../libarchive_fe
-
-PROG=   bsdtar
-BSDTAR_VERSION_STRING=2.7.900a
-SRCS=   bsdtar.c cmdline.c getdate.c read.c subst.c tree.c util.c write.c
-SRCS+=  err.c line_reader.c matching.c pathmatch.c
-WARNS?= 5
-DPADD=  ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
-LDADD=  -larchive -lbz2 -lz -lmd -lcrypto
-CFLAGS+=    -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
-CFLAGS+=    -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-CFLAGS+=    -I"${.CURDIR}" -I"${.CURDIR}/../libarchive_fe"
-SYMLINKS=   bsdtar ${BINDIR}/tar
-MLINKS= bsdtar.1 tar.1
-DEBUG_FLAGS=-g
-
-.PHONY: check test
-check test: $(PROG) bsdtar.1.gz
-    cd ${.CURDIR}/test && make test
-
-.include <bsd.prog.mk>

+ 0 - 68
Utilities/cmlibarchive/tar/test/Makefile

@@ -1,68 +0,0 @@
-# $FreeBSD: src/usr.bin/tar/test/Makefile,v 1.5 2008/11/10 05:04:55 kientzle Exp $
-
-# Where to find the tar sources (for the internal unit tests)
-TAR_SRCDIR=${.CURDIR}/..
-.PATH: ${TAR_SRCDIR}
-
-# Some tar sources are pulled in for white-box tests
-TAR_SRCS=                   \
-    getdate.c
-
-TESTS=  \
-    test_0.c                \
-    test_basic.c                \
-    test_copy.c             \
-    test_getdate.c              \
-    test_help.c             \
-    test_option_T_upper.c           \
-    test_option_q.c             \
-    test_option_r.c             \
-    test_option_s.c             \
-    test_patterns.c             \
-    test_stdio.c                \
-    test_strip_components.c         \
-    test_symlink_dir.c          \
-    test_version.c              \
-    test_windows.c
-
-# Build the test program
-SRCS= ${TAR_SRCS}               \
-    ${TESTS}                \
-    list.h                  \
-    main.c
-
-CLEANFILES+= list.h
-
-NO_MAN=yes
-
-PROG=bsdtar_test
-DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
-CFLAGS+=    -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
-CFLAGS+=    -I..
-LDADD= -larchive -lz -lbz2
-CFLAGS+= -static -g -O2 -Wall
-CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -I${TAR_SRCDIR}
-
-# Uncomment to link against dmalloc
-#LDADD+= -L/usr/local/lib -ldmalloc
-#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
-WARNS=6
-
-check test: bsdtar_test
-    ./bsdtar_test -p ${.OBJDIR}/../bsdtar -r ${.CURDIR}
-
-list.h: ${TESTS} Makefile
-    (cd ${.CURDIR}; cat ${TESTS}) | grep DEFINE_TEST > list.h
-
-clean:
-    rm -f *.out
-    rm -f *.o
-    rm -f *.core
-    rm -f *~
-    rm -f list.h
-    rm -f archive.h ../archive.h
-    -chmod -R +w /tmp/bsdtar_test.*
-    rm -rf /tmp/bsdtar_test.*
-
-.include <bsd.prog.mk>