Index: stable/10/lib/clang/clang.build.mk
===================================================================
--- stable/10/lib/clang/clang.build.mk	(revision 291813)
+++ stable/10/lib/clang/clang.build.mk	(revision 291814)
@@ -1,237 +1,236 @@
 # $FreeBSD$
 
 CLANG_SRCS=	${LLVM_SRCS}/tools/clang
 
 CFLAGS+=	-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \
 		-I${LLVM_SRCS}/${SRCDIR} ${INCDIR:C/^/-I${LLVM_SRCS}\//} -I. \
 		-I${LLVM_SRCS}/../../lib/clang/include \
 		-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \
 		-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DNDEBUG
 
 .if !defined(EARLY_BUILD) && defined(MK_CLANG_FULL) && ${MK_CLANG_FULL} != "no"
 CFLAGS+=	-DCLANG_ENABLE_ARCMT \
 		-DCLANG_ENABLE_REWRITER \
 		-DCLANG_ENABLE_STATIC_ANALYZER
 .endif # !EARLY_BUILD && MK_CLANG_FULL
 
 # LLVM is not strict aliasing safe as of 12/31/2011
 CFLAGS+=	-fno-strict-aliasing
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 BUILD_ARCH?=	${MACHINE_ARCH}
 
 .if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
     ${MK_ARM_EABI} != "no"
 TARGET_ABI=	gnueabi
 .else
 TARGET_ABI=	unknown
 .endif
 
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.2
 BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.2
 CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
 		-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
 		-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
 CXXFLAGS+=	-fno-exceptions -fno-rtti
 
 .PATH:	${LLVM_SRCS}/${SRCDIR}
 
 TBLGEN?=	tblgen
 CLANG_TBLGEN?=	clang-tblgen
 
 Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
 	${TBLGEN} -gen-intrinsic \
 	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
 .for arch in \
 	ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86
 . for hdr in \
 	AsmMatcher/-gen-asm-matcher \
 	AsmWriter1/-gen-asm-writer,-asmwriternum=1 \
 	AsmWriter/-gen-asm-writer \
 	CallingConv/-gen-callingconv \
 	CodeEmitter/-gen-emitter \
 	DAGISel/-gen-dag-isel \
 	DisassemblerTables/-gen-disassembler \
 	FastISel/-gen-fast-isel \
 	InstrInfo/-gen-instr-info \
 	MCCodeEmitter/-gen-emitter,-mc-emitter \
 	MCPseudoLowering/-gen-pseudo-lowering \
 	RegisterInfo/-gen-register-info \
 	SubtargetInfo/-gen-subtarget
 ${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
 	${TBLGEN} ${hdr:T:C/,/ /g} \
 	    -I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target/${arch:H} \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
 . endfor
 .endfor
 
 Attrs.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-classes \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrDump.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-dump \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrIdentifierArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-identifier-arg-list \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-impl \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrLateParsed.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-late-parsed-list \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-list \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrParsedAttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-impl \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrParsedAttrKinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-kinds \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrParsedAttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-list \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrPCHRead.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-pch-read \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrPCHWrite.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-pch-write \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrSpellings.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-spelling-list \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrSpellingListIndex.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-spelling-index \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrTemplateInstantiate.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-template-instantiate \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 AttrTypeArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-type-arg-list \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
 CommentCommandInfo.inc.h: ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
 	${CLANG_TBLGEN} -gen-clang-comment-command-info \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
 
 CommentCommandList.inc.h: ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
 	${CLANG_TBLGEN} -gen-clang-comment-command-list \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
 
 CommentHTMLNamedCharacterReferences.inc.h: \
 	${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td
 	${CLANG_TBLGEN} -gen-clang-comment-html-named-character-references \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td
 
 CommentHTMLTags.inc.h: ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
 	${CLANG_TBLGEN} -gen-clang-comment-html-tags \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
 
 CommentHTMLTagsProperties.inc.h: \
 	${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
 	${CLANG_TBLGEN} -gen-clang-comment-html-tags-properties \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
 
 CommentNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td
 	${CLANG_TBLGEN} -gen-clang-comment-nodes \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td
 
 DeclNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
 	${CLANG_TBLGEN} -gen-clang-decl-nodes \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
 
 StmtNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
 	${CLANG_TBLGEN} -gen-clang-stmt-nodes \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
 
 arm_neon.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
 	${CLANG_TBLGEN} -gen-arm-neon \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
 
 arm_neon.inc.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
 	${CLANG_TBLGEN} -gen-arm-neon-sema \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
 
 DiagnosticGroups.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 	${CLANG_TBLGEN} -gen-clang-diag-groups \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/\.h$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 
 DiagnosticIndexName.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 	${CLANG_TBLGEN} -gen-clang-diags-index-name \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/\.h$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 
 .for hdr in AST Analysis Comment Common Driver Frontend Lex Parse Sema Serialization
 Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 	${CLANG_TBLGEN} -gen-clang-diags-defs -clang-component=${hdr} \
 	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/\.h$/.d/} \
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 .endfor
 
 Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
 	${TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Driver/Options.td
 
 CC1AsOptions.inc.h: ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td
 	${TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td
 
 Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
 	${CLANG_TBLGEN} -gen-clang-sa-checkers \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
 
 .for dep in ${TGHDRS:C/$/.inc.d/}
 . sinclude "${dep}"
 .endfor
 
 SRCS+=		${TGHDRS:C/$/.inc.h/}
-DPSRCS+=	${TGHDRS:C/$/.inc.h/}
 CLEANFILES+=	${TGHDRS:C/$/.inc.h/} ${TGHDRS:C/$/.inc.d/}
Index: stable/10/lib/libarchive/tests/Makefile
===================================================================
--- stable/10/lib/libarchive/tests/Makefile	(revision 291813)
+++ stable/10/lib/libarchive/tests/Makefile	(revision 291814)
@@ -1,459 +1,457 @@
 # $FreeBSD$
 
 SRCTOP=		${.CURDIR:H:H:H}
 TESTSDIR=	${TESTSBASE}/lib/libarchive
 
 LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 
 ATF_TESTS_SH+=	functional_test
 
 BINDIR=	${TESTSDIR}
 
 PROGS+=	libarchive_test
 
 CFLAGS+= -I${.CURDIR:H} -I${.OBJDIR}
 CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils
 CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
 
 # Uncomment to link against dmalloc
 #LDADD+= -L/usr/local/lib -ldmalloc
 #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
 
 .PATH: ${LIBARCHIVEDIR}/libarchive/test
 TESTS_SRCS= \
 	test_acl_freebsd_nfs4.c			\
 	test_acl_freebsd_posix1e.c		\
 	test_acl_nfs4.c				\
 	test_acl_pax.c				\
 	test_acl_posix1e.c			\
 	test_archive_api_feature.c		\
 	test_archive_clear_error.c		\
 	test_archive_cmdline.c			\
 	test_archive_crypto.c			\
 	test_archive_getdate.c			\
 	test_archive_match_time.c		\
 	test_archive_match_owner.c		\
 	test_archive_match_path.c		\
 	test_archive_pathmatch.c		\
 	test_archive_read_close_twice.c		\
 	test_archive_read_close_twice_open_fd.c	\
 	test_archive_read_close_twice_open_filename.c	\
 	test_archive_read_multiple_data_objects.c	\
 	test_archive_read_next_header_empty.c	\
 	test_archive_read_next_header_raw.c	\
 	test_archive_read_open2.c		\
 	test_archive_read_set_filter_option.c	\
 	test_archive_read_set_format_option.c	\
 	test_archive_read_set_option.c		\
 	test_archive_read_set_options.c		\
 	test_archive_read_support.c		\
 	test_archive_set_error.c		\
 	test_archive_string.c			\
 	test_archive_string_conversion.c	\
 	test_archive_write_add_filter_by_name.c	\
 	test_archive_write_set_filter_option.c	\
 	test_archive_write_set_format_by_name.c	\
 	test_archive_write_set_format_option.c	\
 	test_archive_write_set_option.c		\
 	test_archive_write_set_options.c	\
 	test_bad_fd.c				\
 	test_compat_bzip2.c			\
 	test_compat_cpio.c			\
 	test_compat_gtar.c			\
 	test_compat_gzip.c			\
 	test_compat_lzip.c			\
 	test_compat_lzma.c			\
 	test_compat_lzop.c			\
 	test_compat_mac.c			\
 	test_compat_pax_libarchive_2x.c		\
 	test_compat_solaris_tar_acl.c		\
 	test_compat_solaris_pax_sparse.c	\
 	test_compat_tar_hardlink.c		\
 	test_compat_uudecode.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_filter_count.c			\
 	test_fuzz.c				\
 	test_gnutar_filename_encoding.c		\
 	test_link_resolver.c			\
 	test_open_fd.c				\
 	test_open_failure.c			\
 	test_open_file.c			\
 	test_open_filename.c			\
 	test_pax_filename_encoding.c		\
 	test_read_data_large.c			\
 	test_read_disk.c			\
 	test_read_disk_directory_traversals.c	\
 	test_read_disk_entry_from_file.c	\
 	test_read_extract.c			\
 	test_read_file_nonexistent.c		\
 	test_read_filter_grzip.c		\
 	test_read_filter_lrzip.c		\
 	test_read_filter_lzop.c			\
 	test_read_filter_lzop_multiple_parts.c	\
 	test_read_filter_program.c		\
 	test_read_filter_program_signature.c	\
 	test_read_filter_uudecode.c		\
 	test_read_format_7zip.c			\
 	test_read_format_ar.c			\
 	test_read_format_cab.c			\
 	test_read_format_cab_filename.c		\
 	test_read_format_cpio_afio.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_lzip.c	\
 	test_read_format_cpio_bin_lzma.c	\
 	test_read_format_cpio_bin_xz.c		\
 	test_read_format_cpio_filename.c	\
 	test_read_format_cpio_odc.c		\
 	test_read_format_cpio_svr4_gzip.c	\
 	test_read_format_cpio_svr4c_Z.c		\
 	test_read_format_cpio_svr4_bzip2_rpm.c	\
 	test_read_format_cpio_svr4_gzip_rpm.c	\
 	test_read_format_empty.c		\
 	test_read_format_gtar_filename.c	\
 	test_read_format_gtar_gz.c		\
 	test_read_format_gtar_lzma.c		\
 	test_read_format_gtar_sparse.c		\
 	test_read_format_gtar_sparse_skip_entry.c \
 	test_read_format_iso_Z.c		\
 	test_read_format_iso_multi_extent.c	\
 	test_read_format_iso_xorriso.c		\
 	test_read_format_isorr_rr_moved.c	\
 	test_read_format_isojoliet_bz2.c	\
 	test_read_format_isojoliet_long.c	\
 	test_read_format_isojoliet_rr.c		\
 	test_read_format_isojoliet_versioned.c	\
 	test_read_format_isorr_bz2.c		\
 	test_read_format_isorr_ce.c		\
 	test_read_format_isorr_new_bz2.c	\
 	test_read_format_isozisofs_bz2.c	\
 	test_read_format_lha.c			\
 	test_read_format_lha_filename.c		\
 	test_read_format_mtree.c		\
 	test_read_format_pax_bz2.c		\
 	test_read_format_rar.c			\
 	test_read_format_raw.c			\
 	test_read_format_tar.c			\
 	test_read_format_tar_empty_filename.c	\
 	test_read_format_tar_filename.c		\
 	test_read_format_tbz.c			\
 	test_read_format_tgz.c			\
 	test_read_format_tlz.c			\
 	test_read_format_txz.c			\
 	test_read_format_tz.c			\
 	test_read_format_ustar_filename.c	\
 	test_read_format_xar.c			\
 	test_read_format_zip.c			\
 	test_read_format_zip_comment_stored.c	\
 	test_read_format_zip_filename.c		\
 	test_read_format_zip_mac_metadata.c	\
 	test_read_format_zip_sfx.c		\
 	test_read_large.c			\
 	test_read_pax_truncated.c		\
 	test_read_position.c			\
 	test_read_set_format.c			\
 	test_read_truncated.c			\
 	test_read_truncated_filter.c		\
 	test_sparse_basic.c			\
 	test_tar_filenames.c			\
 	test_tar_large.c			\
 	test_ustar_filenames.c			\
 	test_ustar_filename_encoding.c		\
 	test_write_disk.c			\
 	test_write_disk_appledouble.c		\
 	test_write_disk_failures.c		\
 	test_write_disk_hardlink.c		\
 	test_write_disk_hfs_compression.c	\
 	test_write_disk_lookup.c		\
 	test_write_disk_mac_metadata.c		\
 	test_write_disk_no_hfs_compression.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_filter_b64encode.c		\
 	test_write_filter_bzip2.c		\
 	test_write_filter_compress.c		\
 	test_write_filter_gzip.c		\
 	test_write_filter_gzip_timestamp.c	\
 	test_write_filter_lrzip.c		\
 	test_write_filter_lzip.c		\
 	test_write_filter_lzma.c		\
 	test_write_filter_lzop.c		\
 	test_write_filter_program.c		\
 	test_write_filter_uuencode.c		\
 	test_write_filter_xz.c			\
 	test_write_format_7zip.c		\
 	test_write_format_7zip_empty.c		\
 	test_write_format_7zip_large.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_gnutar.c		\
 	test_write_format_iso9660.c		\
 	test_write_format_iso9660_boot.c	\
 	test_write_format_iso9660_empty.c	\
 	test_write_format_iso9660_filename.c	\
 	test_write_format_iso9660_zisofs.c	\
 	test_write_format_mtree.c		\
 	test_write_format_mtree_absolute_path.c	\
 	test_write_format_mtree_classic.c	\
 	test_write_format_mtree_classic_indent.c	\
 	test_write_format_mtree_fflags.c	\
 	test_write_format_mtree_no_separator.c	\
 	test_write_format_mtree_quoted_filename.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_sparse.c		\
 	test_write_format_tar_ustar.c		\
 	test_write_format_tar_v7tar.c		\
 	test_write_format_xar.c			\
 	test_write_format_xar_empty.c		\
 	test_write_format_zip.c			\
 	test_write_format_zip_empty.c		\
 	test_write_format_zip_no_compression.c	\
 	test_write_zip_set_compression_store.c	\
 	test_write_open_memory.c		\
 	test_zip_filename_encoding.c
 
 # Deterministic failures:
 # Crashes with SIGBUS
 BROKEN_TESTS+=			test_archive_rmd160
 # Fails with `libarchive/test/test_archive_crypto.c:121: md != actualmd`
 BROKEN_TESTS+=			test_archive_sha384
 # Fails with `test_compat_pax_libarchive_2x.c:122: ARCHIVE_WARN != archive_read_next_header(a, &ae)`
 BROKEN_TESTS+=			test_compat_pax_libarchive_2x
 # Fails with `test_read_disk_directory_traversals.c:1094: File at has atime 886622, 1443306049 seconds ago`
 BROKEN_TESTS+=			test_read_disk_directory_traversals
 
 # Non-deterministic failures:
 # (Times out?) [and] crashes
 BROKEN_TESTS+=			test_fuzz_rar
 
 # Build the test program.
 SRCS.libarchive_test=		\
 	${TESTS_SRCS}		\
 	main.c			\
-	read_open_memory.c
-
-DPSRCS.libarchive_test= \
+	read_open_memory.c	\
 	list.h
 
 DPADD.libarchive_test=	${LIBARCHIVE}
 LDADD.libarchive_test=	-larchive
 
 .PATH: ${LIBARCHIVEDIR}/test_utils
 SRCS.libarchive_test+=	test_utils.c
 
 # list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines
 list.h: ${TESTS_SRCS} Makefile
 	@(cd ${LIBARCHIVEDIR}/libarchive/test && \
 	grep -h DEFINE_TEST ${.ALLSRC:N*Makefile} | \
 	    egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp
 	@mv ${.TARGET}.tmp ${.TARGET}
 
 CLEANFILES+=	list.h list.h.tmp
 
 FILES+=	README
 FILES+=	test_acl_pax.tar.uu
 FILES+=	test_archive_string_conversion.txt.Z.uu
 FILES+=	test_compat_bzip2_1.tbz.uu
 FILES+=	test_compat_bzip2_2.tbz.uu
 FILES+=	test_compat_cpio_1.cpio.uu
 FILES+=	test_compat_gtar_1.tar.uu
 FILES+=	test_compat_gzip_1.tgz.uu
 FILES+=	test_compat_gzip_2.tgz.uu
 FILES+=	test_compat_lzip_1.tlz.uu
 FILES+=	test_compat_lzip_2.tlz.uu
 FILES+=	test_compat_lzma_1.tlz.uu
 FILES+=	test_compat_lzma_2.tlz.uu
 FILES+=	test_compat_lzma_3.tlz.uu
 FILES+=	test_compat_lzop_1.tar.lzo.uu
 FILES+=	test_compat_lzop_2.tar.lzo.uu
 FILES+=	test_compat_lzop_3.tar.lzo.uu
 FILES+=	test_compat_mac-1.tar.Z.uu
 FILES+=	test_compat_mac-2.tar.Z.uu
 FILES+=	test_compat_pax_libarchive_2x.tar.Z.uu
 FILES+=	test_compat_solaris_pax_sparse_1.pax.Z.uu
 FILES+=	test_compat_solaris_pax_sparse_2.pax.Z.uu
 FILES+=	test_compat_solaris_tar_acl.tar.uu
 FILES+=	test_compat_tar_hardlink_1.tar.uu
 FILES+=	test_compat_xz_1.txz.uu
 FILES+=	test_compat_zip_1.zip.uu
 FILES+=	test_compat_zip_2.zip.uu
 FILES+=	test_compat_zip_3.zip.uu
 FILES+=	test_compat_zip_4.zip.uu
 FILES+=	test_compat_zip_5.zip.uu
 FILES+=	test_compat_zip_6.zip.uu
 FILES+=	test_compat_zip_7.xps.uu
 FILES+=	test_fuzz.cab.uu
 FILES+=	test_fuzz.lzh.uu
 FILES+=	test_fuzz_1.iso.Z.uu
 FILES+=	test_pax_filename_encoding.tar.uu
 FILES+=	test_rar_multivolume_multiple_files.part1.rar.uu
 FILES+=	test_rar_multivolume_multiple_files.part2.rar.uu
 FILES+=	test_rar_multivolume_multiple_files.part3.rar.uu
 FILES+=	test_rar_multivolume_multiple_files.part4.rar.uu
 FILES+=	test_rar_multivolume_multiple_files.part5.rar.uu
 FILES+=	test_rar_multivolume_multiple_files.part6.rar.uu
 FILES+=	test_rar_multivolume_single_file.part1.rar.uu
 FILES+=	test_rar_multivolume_single_file.part2.rar.uu
 FILES+=	test_rar_multivolume_single_file.part3.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part01.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part02.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part03.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part04.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part05.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part06.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part07.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part08.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part09.rar.uu
 FILES+=	test_rar_multivolume_uncompressed_files.part10.rar.uu
 FILES+=	test_read_filter_grzip.tar.grz.uu
 FILES+=	test_read_filter_lrzip.tar.lrz.uu
 FILES+=	test_read_filter_lzop.tar.lzo.uu
 FILES+=	test_read_filter_lzop_multiple_parts.tar.lzo.uu
 FILES+=	test_read_format_7zip_bcj2_bzip2.7z.uu
 FILES+=	test_read_format_7zip_bcj2_copy_1.7z.uu
 FILES+=	test_read_format_7zip_bcj2_copy_2.7z.uu
 FILES+=	test_read_format_7zip_bcj2_copy_lzma.7z.uu
 FILES+=	test_read_format_7zip_bcj2_deflate.7z.uu
 FILES+=	test_read_format_7zip_bcj2_lzma1_1.7z.uu
 FILES+=	test_read_format_7zip_bcj2_lzma1_2.7z.uu
 FILES+=	test_read_format_7zip_bcj2_lzma2_1.7z.uu
 FILES+=	test_read_format_7zip_bcj2_lzma2_2.7z.uu
 FILES+=	test_read_format_7zip_bcj_bzip2.7z.uu
 FILES+=	test_read_format_7zip_bcj_copy.7z.uu
 FILES+=	test_read_format_7zip_bcj_deflate.7z.uu
 FILES+=	test_read_format_7zip_bcj_lzma1.7z.uu
 FILES+=	test_read_format_7zip_bcj_lzma2.7z.uu
 FILES+=	test_read_format_7zip_bzip2.7z.uu
 FILES+=	test_read_format_7zip_copy.7z.uu
 FILES+=	test_read_format_7zip_copy_2.7z.uu
 FILES+=	test_read_format_7zip_deflate.7z.uu
 FILES+=	test_read_format_7zip_delta_lzma1.7z.uu
 FILES+=	test_read_format_7zip_delta_lzma2.7z.uu
 FILES+=	test_read_format_7zip_empty_archive.7z.uu
 FILES+=	test_read_format_7zip_empty_file.7z.uu
 FILES+=	test_read_format_7zip_lzma1.7z.uu
 FILES+=	test_read_format_7zip_lzma1_2.7z.uu
 FILES+=	test_read_format_7zip_lzma1_lzma2.7z.uu
 FILES+=	test_read_format_7zip_lzma2.7z.uu
 FILES+=	test_read_format_7zip_ppmd.7z.uu
 FILES+=	test_read_format_7zip_symbolic_name.7z.uu
 FILES+=	test_read_format_ar.ar.uu
 FILES+=	test_read_format_cab_1.cab.uu
 FILES+=	test_read_format_cab_2.cab.uu
 FILES+=	test_read_format_cab_3.cab.uu
 FILES+=	test_read_format_cab_filename_cp932.cab.uu
 FILES+=	test_read_format_cpio_bin_be.cpio.uu
 FILES+=	test_read_format_cpio_filename_cp866.cpio.uu
 FILES+=	test_read_format_cpio_filename_eucjp.cpio.uu
 FILES+=	test_read_format_cpio_filename_koi8r.cpio.uu
 FILES+=	test_read_format_cpio_filename_utf8_jp.cpio.uu
 FILES+=	test_read_format_cpio_filename_utf8_ru.cpio.uu
 FILES+=	test_read_format_cpio_svr4_bzip2_rpm.rpm.uu
 FILES+=	test_read_format_cpio_svr4_gzip_rpm.rpm.uu
 FILES+=	test_read_format_gtar_filename_cp866.tar.Z.uu
 FILES+=	test_read_format_gtar_filename_eucjp.tar.Z.uu
 FILES+=	test_read_format_gtar_filename_koi8r.tar.Z.uu
 FILES+=	test_read_format_gtar_sparse_1_13.tar.uu
 FILES+=	test_read_format_gtar_sparse_1_17.tar.uu
 FILES+=	test_read_format_gtar_sparse_1_17_posix00.tar.uu
 FILES+=	test_read_format_gtar_sparse_1_17_posix01.tar.uu
 FILES+=	test_read_format_gtar_sparse_1_17_posix10.tar.uu
 FILES+=	test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
 FILES+=	test_read_format_gtar_sparse_skip_entry.tar.Z.uu
 FILES+=	test_read_format_iso.iso.Z.uu
 FILES+=	test_read_format_iso_2.iso.Z.uu
 FILES+=	test_read_format_iso_joliet.iso.Z.uu
 FILES+=	test_read_format_iso_joliet_by_nero.iso.Z.uu
 FILES+=	test_read_format_iso_joliet_long.iso.Z.uu
 FILES+=	test_read_format_iso_joliet_rockridge.iso.Z.uu
 FILES+=	test_read_format_iso_multi_extent.iso.Z.uu
 FILES+=	test_read_format_iso_rockridge.iso.Z.uu
 FILES+=	test_read_format_iso_rockridge_ce.iso.Z.uu
 FILES+=	test_read_format_iso_rockridge_new.iso.Z.uu
 FILES+=	test_read_format_iso_rockridge_rr_moved.iso.Z.uu
 FILES+=	test_read_format_iso_xorriso.iso.Z.uu
 FILES+=	test_read_format_iso_zisofs.iso.Z.uu
 FILES+=	test_read_format_lha_filename_cp932.lzh.uu
 FILES+=	test_read_format_lha_header0.lzh.uu
 FILES+=	test_read_format_lha_header1.lzh.uu
 FILES+=	test_read_format_lha_header2.lzh.uu
 FILES+=	test_read_format_lha_header3.lzh.uu
 FILES+=	test_read_format_lha_lh0.lzh.uu
 FILES+=	test_read_format_lha_lh6.lzh.uu
 FILES+=	test_read_format_lha_lh7.lzh.uu
 FILES+=	test_read_format_lha_withjunk.lzh.uu
 FILES+=	test_read_format_mtree.mtree.uu
 FILES+=	test_read_format_mtree_nomagic.mtree.uu
 FILES+=	test_read_format_mtree_nomagic2.mtree.uu
 FILES+=	test_read_format_mtree_nomagic3.mtree.uu
 FILES+=	test_read_format_rar.rar.uu
 FILES+=	test_read_format_rar_binary_data.rar.uu
 FILES+=	test_read_format_rar_compress_best.rar.uu
 FILES+=	test_read_format_rar_compress_normal.rar.uu
 FILES+=	test_read_format_rar_multi_lzss_blocks.rar.uu
 FILES+=	test_read_format_rar_multivolume.part0001.rar.uu
 FILES+=	test_read_format_rar_multivolume.part0002.rar.uu
 FILES+=	test_read_format_rar_multivolume.part0003.rar.uu
 FILES+=	test_read_format_rar_multivolume.part0004.rar.uu
 FILES+=	test_read_format_rar_noeof.rar.uu
 FILES+=	test_read_format_rar_ppmd_lzss_conversion.rar.uu
 FILES+=	test_read_format_rar_sfx.exe.uu
 FILES+=	test_read_format_rar_subblock.rar.uu
 FILES+=	test_read_format_rar_unicode.rar.uu
 FILES+=	test_read_format_rar_windows.rar.uu
 FILES+=	test_read_format_raw.data.Z.uu
 FILES+=	test_read_format_raw.data.uu
 FILES+=	test_read_format_tar_empty_filename.tar.uu
 FILES+=	test_read_format_tar_filename_koi8r.tar.Z.uu
 FILES+=	test_read_format_ustar_filename_cp866.tar.Z.uu
 FILES+=	test_read_format_ustar_filename_eucjp.tar.Z.uu
 FILES+=	test_read_format_ustar_filename_koi8r.tar.Z.uu
 FILES+=	test_read_format_zip.zip.uu
 FILES+=	test_read_format_zip_comment_stored_1.zip.uu
 FILES+=	test_read_format_zip_comment_stored_2.zip.uu
 FILES+=	test_read_format_zip_filename_cp866.zip.uu
 FILES+=	test_read_format_zip_filename_cp932.zip.uu
 FILES+=	test_read_format_zip_filename_koi8r.zip.uu
 FILES+=	test_read_format_zip_filename_utf8_jp.zip.uu
 FILES+=	test_read_format_zip_filename_utf8_ru.zip.uu
 FILES+=	test_read_format_zip_filename_utf8_ru2.zip.uu
 FILES+=	test_read_format_zip_length_at_end.zip.uu
 FILES+=	test_read_format_zip_mac_metadata.zip.uu
 FILES+=	test_read_format_zip_sfx.uu
 FILES+=	test_read_format_zip_symlink.zip.uu
 FILES+=	test_read_format_zip_ux.zip.uu
 FILES+=	test_read_large_splitted_rar_aa.uu
 FILES+=	test_read_large_splitted_rar_ab.uu
 FILES+=	test_read_large_splitted_rar_ac.uu
 FILES+=	test_read_large_splitted_rar_ad.uu
 FILES+=	test_read_large_splitted_rar_ae.uu
 FILES+=	test_read_splitted_rar_aa.uu
 FILES+=	test_read_splitted_rar_ab.uu
 FILES+=	test_read_splitted_rar_ac.uu
 FILES+=	test_read_splitted_rar_ad.uu
 FILES+=	test_splitted_rar_seek_support_aa.uu
 FILES+=	test_splitted_rar_seek_support_ab.uu
 FILES+=	test_splitted_rar_seek_support_ac.uu
 FILES+=	test_write_disk_appledouble.cpio.gz.uu
 FILES+=	test_write_disk_hfs_compression.tgz.uu
 FILES+=	test_write_disk_mac_metadata.tar.gz.uu
 FILES+=	test_write_disk_no_hfs_compression.tgz.uu
 
 .include <bsd.test.mk>
Index: stable/10/sbin/ipf/ipf/Makefile
===================================================================
--- stable/10/sbin/ipf/ipf/Makefile	(revision 291813)
+++ stable/10/sbin/ipf/ipf/Makefile	(revision 291814)
@@ -1,42 +1,40 @@
 # $FreeBSD$
 
 PROG=		ipf
 SRCS=		${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
 MAN=		ipfilter.4 ipfilter.5 ipf.8 ipf.4 ipf.5 ipl.4
 MLINKS=		ipf.5 ipf.conf.5 ipf.5 ipf6.conf.5
 CFLAGS+=	-I. -DIPFILTER_BPF -DHAS_SYS_MD5_H
 
 GENHDRS=	ipf_l.h ipf_y.h
-DPSRCS+=	${GENHDRS}
-
 CLEANFILES+=	${GENHDRS} ipf_y.c ipf_l.c
 
 ipf_y.c: ipf_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ipf_yy/g' \
 	    -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ipf_yy/g' \
 	    y.tab.h > ${.TARGET:.c=.h}
 
 ipf_y.h: ipf_y.c
 
 ipf_l.c: lexer.c
 	sed -e 's/yy/ipf_yy/g' \
 	    -e 's/y.tab.h/ipf_y.h/' \
 	    -e 's/lexer.h/ipf_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipf_l.h: lexer.h
 	sed -e 's/yy/ipf_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .if defined(RESCUE)
 LIBIPF_SRCS!=	cd ${.CURDIR}/../libipf && ${MAKE} -V SRCS
 SRCS+=	${LIBIPF_SRCS}
 .else
 DPADD+=	${LIBPCAP}
 LDADD+=	-lpcap
 .endif
 
 .include <bsd.prog.mk>
Index: stable/10/sbin/ipf/ipftest/Makefile
===================================================================
--- stable/10/sbin/ipf/ipftest/Makefile	(revision 291813)
+++ stable/10/sbin/ipf/ipftest/Makefile	(revision 291814)
@@ -1,109 +1,108 @@
 #	$FreeBSD$
 
 PROG=		ipftest
 SRCS=		${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
 		ip_nat6.c \
 		ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
 		ip_pool.c ip_scan.c ip_sync.c ip_rules.c \
 		ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \
 		ipf_l.c ipnat_y.c ipnat_l.c md5.c radix_ipf.c ip_dstlist.c
 MAN=		ipftest.1
 
 WARNS?=		0
 CFLAGS+=	-DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \
 		-DIPFILTER_SYNC -DIPFILTER_CKSUM -DHAS_SYS_MD5_H -I.
 
 # XXX	The original tarball does not define IPFILTER_SCAN when building this
 # XXX	and other modules. It is believed the reason is it fails to build.
 # XXX	It has been removed for now.
 # XXX CFLAGS+=		-DIPFILTER_SCAN
 
 
 .PATH:		${.CURDIR}/../../../sys/contrib/ipfilter/netinet
 
 GENHDRS=	ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
-DPSRCS+=	${GENHDRS}
 
 CLEANFILES+=	${GENHDRS} 
 CLEANFILES+=	ipf_y.c ipf_l.c
 CLEANFILES+=	ipf.tab.c ipf.tab.h
 CLEANFILES+=	ipnat_y.c ipnat_l.c
 CLEANFILES+=	ipnat.tab.c ipnat.tab.h
 CLEANFILES+=	ippool_y.c ippool_l.c
 CLEANFILES+=	ippool.tab.c ippool.tab.h
 
 ipnat.tab.c ipnat.tab.h: ipnat_y.y
 	${YACC} -b ipnat -d ${.ALLSRC}
 
 ipnat_y.c: ipnat.tab.c
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.c/ipnat_y.c/' \
 	    -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \
 	    ipnat.tab.c > ${.TARGET}
 
 ipnat_y.h: ipnat.tab.h
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.h/ipnat_y.h/' \
 	    ipnat.tab.h > ${.TARGET}
 
 ipnat_y.h: ipnat_y.c
 
 ipnat_l.c: lexer.c
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.h/ipnat_y.h/' \
 	    -e 's/lexer.h/ipnat_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipnat_l.h: lexer.h
 	sed -e 's/yy/ipnat_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ippool.tab.c ippool.tab.h: ippool_y.y
 	${YACC} -b ippool -d ${.ALLSRC}
 
 ippool_y.c: ippool.tab.c
 	sed -e 's/yy/ippool_yy/g' \
 	    -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
 	    ippool.tab.c > ${.TARGET}
 
 ippool_y.h: ippool.tab.h
 	sed -e 's/yy/ippool_yy/g' \
 	    ippool.tab.h > ${.TARGET}
 
 ippool_y.h: ippool_y.c
 
 ippool_l.c: lexer.c
 	sed -e 's/yy/ippool_yy/g' \
 	    -e 's/y.tab.h/ippool_y.h/' \
 	    -e 's/lexer.h/ippool_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ippool_l.h: lexer.h
 	sed -e 's/yy/ippool_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipf.tab.c ipf.tab.h: ipf_y.y
 	${YACC} -b ipf -d ${.ALLSRC}
 
 ipf_y.c: ipf.tab.c
 	sed -e 's/yy/ipf_yy/g' \
 	    -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \
 		ipf.tab.c > ${.TARGET}
 
 ipf_y.h: ipf.tab.h
 	sed -e 's/yy/ipf_yy/g' \
 		ipf.tab.h > ${.TARGET}
 
 ipf_y.h: ipf_y.c
 
 ipf_l.c: lexer.c
 	sed -e 's/yy/ipf_yy/g' \
 	     -e 's/y.tab.h/ipf_y.h/' \
 	     -e 's/lexer.h/ipf_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipf_l.h: lexer.h
 	sed -e 's/yy/ipf_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
Index: stable/10/sbin/ipf/ipmon/Makefile
===================================================================
--- stable/10/sbin/ipf/ipmon/Makefile	(revision 291813)
+++ stable/10/sbin/ipf/ipmon/Makefile	(revision 291814)
@@ -1,34 +1,32 @@
 #	$FreeBSD$
 
 PROG=		ipmon
 SRCS=		${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c
 MAN=		ipmon.8
 
 CFLAGS+=	-DLOGFAC=LOG_LOCAL0 -I.
 
 GENHDRS+=	ipmon_l.h ipmon_y.h
-DPSRCS+=	${GENHDRS}
-
 CLEANFILES+=	${GENHDRS} ipmon_y.c ipmon_l.c
 
 ipmon_y.c: ipmon_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ipmon_yy/g' \
 	    -e 's/"ipmon_y.y"/"..\/tools\/ipmon_y.y"/' \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ipmon_yy/g' \
 	    y.tab.h > ${.TARGET:.c=.h}
 
 ipmon_y.h: ipmon_y.c
 
 ipmon_l.c: lexer.c
 	sed -e 's/yy/ipmon_yy/g' \
 	    -e 's/y.tab.h/ipmon_y.h/' \
 	    -e 's/lexer.h/ipmon_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipmon_l.h: lexer.h
 	sed -e 's/yy/ipmon_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
Index: stable/10/sbin/ipf/ipnat/Makefile
===================================================================
--- stable/10/sbin/ipf/ipnat/Makefile	(revision 291813)
+++ stable/10/sbin/ipf/ipnat/Makefile	(revision 291814)
@@ -1,36 +1,34 @@
 #	$FreeBSD$
 
 PROG=		ipnat
 SRCS=		${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c
 MAN=		ipnat.8 ipnat.4 ipnat.5
 MLINKS=		ipnat.5 ipnat.conf.5
 CFLAGS+=	-I.
 
 GENHDRS=	ipnat_l.h ipnat_y.h
-DPSRCS+=	${GENHDRS}
-
 CLEANFILES+=	${GENHDRS} ipnat_y.c ipnat_l.c
 
 ipnat_y.c: ipnat_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.c/ipnat_y.c/' \
 	    -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.h/ipnat_y.h/' \
 	    y.tab.h > ${.TARGET:.c=.h}
 
 ipnat_y.h: ipnat_y.c
 
 ipnat_l.c: lexer.c
 	sed -e 's/yy/ipnat_yy/g' \
 	    -e 's/y.tab.h/ipnat_y.h/' \
 	    -e 's/lexer.h/ipnat_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ipnat_l.h: lexer.h
 	sed -e 's/yy/ipnat_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
Index: stable/10/sbin/ipf/ippool/Makefile
===================================================================
--- stable/10/sbin/ipf/ippool/Makefile	(revision 291813)
+++ stable/10/sbin/ipf/ippool/Makefile	(revision 291814)
@@ -1,33 +1,31 @@
 #	$FreeBSD$
 
 PROG=		ippool
 SRCS=		${GENHDRS} ippool_y.c ippool_l.c kmem.c ippool.c
 MAN=		ippool.5 ippool.8
 CFLAGS+=	-I.
 
 GENHDRS=	ippool_l.h ippool_y.h
-DPSRCS+=	${GENHDRS}
-
 CLEANFILES+=	${GENHDRS} ippool_y.c ippool_l.c
 
 ippool_y.c: ippool_y.y
 	${YACC} -d ${.ALLSRC}
 	sed -e 's/yy/ippool_yy/g' \
 	    -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \
 	    y.tab.c > ${.TARGET}
 	sed -e 's/yy/ippool_yy/g' \
 	    y.tab.h > ${.TARGET:.c=.h}
 
 ippool_y.h: ippool_y.c
 
 ippool_l.c: lexer.c
 	sed -e 's/yy/ippool_yy/g' \
 	    -e 's/y.tab.h/ippool_y.h/' \
 	    -e 's/lexer.h/ippool_l.h/' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ippool_l.h: lexer.h
 	sed -e 's/yy/ippool_yy/g' \
 	    ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
Index: stable/10/usr.bin/cpio/tests/Makefile
===================================================================
--- stable/10/usr.bin/cpio/tests/Makefile	(revision 291813)
+++ stable/10/usr.bin/cpio/tests/Makefile	(revision 291814)
@@ -1,120 +1,117 @@
 # $FreeBSD$
 
 SRCTOP=		${.CURDIR:H:H:H}
 TESTSDIR=	${TESTSBASE}/usr.bin/cpio
 
 LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 
 ATF_TESTS_SH+=	functional_test
 
 BINDIR=		${TESTSDIR}
 
 PROGS+=		bsdcpio_test
 
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
 CFLAGS+=	-I${SRCTOP}/lib/libarchive -I${.OBJDIR}
 
 CFLAGS+=	-I${.OBJDIR}
 CFLAGS+=	-I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe
 CFLAGS+=	-I${LIBARCHIVEDIR}/test_utils
 
 # Uncomment to link against dmalloc
 #LDADD+= -L/usr/local/lib -ldmalloc
 #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
 
 .PATH:	${LIBARCHIVEDIR}/cpio
 CPIO_SRCS= cmdline.c
 
 .PATH:	${LIBARCHIVEDIR}/libarchive_fe
 CPIO_SRCS+= err.c
 
 .PATH:	${LIBARCHIVEDIR}/cpio/test
 TESTS_SRCS=	\
 	test_0.c				\
 	test_basic.c				\
 	test_cmdline.c				\
 	test_extract_cpio_Z.c			\
 	test_extract_cpio_bz2.c			\
 	test_extract_cpio_grz.c			\
 	test_extract_cpio_gz.c			\
 	test_extract_cpio_lrz.c			\
 	test_extract_cpio_lz.c			\
 	test_extract_cpio_lzma.c		\
 	test_extract_cpio_lzo.c			\
 	test_extract_cpio_xz.c			\
 	test_format_newc.c			\
 	test_gcpio_compat.c			\
 	test_option_0.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_b64encode.c			\
 	test_option_c.c				\
 	test_option_d.c				\
 	test_option_f.c				\
 	test_option_grzip.c			\
 	test_option_help.c			\
 	test_option_l.c				\
 	test_option_lrzip.c			\
 	test_option_lzma.c			\
 	test_option_lzop.c			\
 	test_option_m.c				\
 	test_option_t.c				\
 	test_option_u.c				\
 	test_option_uuencode.c			\
 	test_option_version.c			\
 	test_option_xz.c			\
 	test_option_y.c				\
 	test_option_z.c				\
 	test_owner_parse.c			\
 	test_passthrough_dotdot.c		\
 	test_passthrough_reverse.c
 
 SRCS.bsdcpio_test= list.h			\
 	${CPIO_SRCS}				\
 	${TESTS_SRCS}				\
 	main.c
 
-DPSRCS.bsdcpio_test= \
-	list.h
-
 .PATH:	${LIBARCHIVEDIR}/test_utils
 SRCS.bsdcpio_test+=	test_utils.c
 
 DPADD.bsdcpio_test=	${LIBARCHIVE}
 LDADD.bsdcpio_test=	-larchive
 
 list.h: ${TESTS_SRCS} Makefile
 	@(cd ${LIBARCHIVEDIR}/tar/test && \
 	grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp
 	@mv ${.TARGET}.tmp ${.TARGET}
 
 CLEANFILES+=	list.h list.h.tmp
 
 FILES+= test_extract.cpio.Z.uu
 FILES+= test_extract.cpio.bz2.uu
 FILES+= test_extract.cpio.grz.uu
 FILES+= test_extract.cpio.gz.uu
 FILES+= test_extract.cpio.lrz.uu
 FILES+= test_extract.cpio.lz.uu
 FILES+= test_extract.cpio.lzma.uu
 FILES+= test_extract.cpio.lzo.uu
 FILES+= test_extract.cpio.xz.uu
 FILES+= test_gcpio_compat_ref.bin.uu
 FILES+= test_gcpio_compat_ref.crc.uu
 FILES+= test_gcpio_compat_ref.newc.uu
 FILES+= test_gcpio_compat_ref.ustar.uu
 FILES+= test_gcpio_compat_ref_nosym.bin.uu
 FILES+= test_gcpio_compat_ref_nosym.crc.uu
 FILES+= test_gcpio_compat_ref_nosym.newc.uu
 FILES+= test_gcpio_compat_ref_nosym.ustar.uu
 FILES+= test_option_f.cpio.uu
 FILES+= test_option_m.cpio.uu
 FILES+= test_option_t.cpio.uu
 FILES+= test_option_t.stdout.uu
 FILES+= test_option_tv.stdout.uu
 
 .include <bsd.test.mk>
Index: stable/10/usr.bin/tar/tests/Makefile
===================================================================
--- stable/10/usr.bin/tar/tests/Makefile	(revision 291813)
+++ stable/10/usr.bin/tar/tests/Makefile	(revision 291814)
@@ -1,112 +1,110 @@
 # $FreeBSD$
 
 SRCTOP=		${.CURDIR:H:H:H}
 TESTSDIR=	${TESTSBASE}/usr.bin/tar
 
 LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 
 ATF_TESTS_SH+=	functional_test
 
 BINDIR=		${TESTSDIR}
 
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
 CFLAGS+=	-static
 CFLAGS+=	-I${SRCTOP}/lib/libarchive -I${.OBJDIR}
 CFLAGS+=	-I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/test_utils
 
 # Uncomment to link against dmalloc
 #LDADD+= -L/usr/local/lib -ldmalloc
 #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
 
 PROGS+=		bsdtar_test
 
 .PATH: ${LIBARCHIVEDIR}/tar/test
 TESTS_SRCS=	\
 	test_0.c				\
 	test_basic.c				\
 	test_copy.c				\
 	test_empty_mtree.c			\
 	test_extract_tar_bz2.c			\
 	test_extract_tar_grz.c			\
 	test_extract_tar_gz.c			\
 	test_extract_tar_lrz.c			\
 	test_extract_tar_lz.c			\
 	test_extract_tar_lzma.c			\
 	test_extract_tar_lzo.c			\
 	test_extract_tar_xz.c			\
 	test_format_newc.c			\
 	test_help.c				\
 	test_option_C_upper.c			\
 	test_option_H_upper.c			\
 	test_option_L_upper.c			\
 	test_option_O_upper.c			\
 	test_option_T_upper.c			\
 	test_option_U_upper.c			\
 	test_option_X_upper.c			\
 	test_option_a.c				\
 	test_option_b.c				\
 	test_option_b64encode.c			\
 	test_option_exclude.c			\
 	test_option_gid_gname.c			\
 	test_option_grzip.c			\
 	test_option_j.c				\
 	test_option_k.c				\
 	test_option_keep_newer_files.c		\
 	test_option_lrzip.c			\
 	test_option_lzma.c			\
 	test_option_lzop.c			\
 	test_option_n.c				\
 	test_option_newer_than.c		\
 	test_option_nodump.c			\
 	test_option_older_than.c		\
 	test_option_q.c				\
 	test_option_r.c				\
 	test_option_s.c				\
 	test_option_uid_uname.c			\
 	test_option_uuencode.c			\
 	test_option_xz.c			\
 	test_option_z.c				\
 	test_patterns.c				\
 	test_print_longpath.c			\
 	test_stdio.c				\
 	test_strip_components.c			\
 	test_symlink_dir.c			\
 	test_version.c
 
 SRCS.bsdtar_test=	\
 	${TESTS_SRCS}	\
 	list.h		\
 	main.c
 
-DPSRCS.bsdtar_test+=	list.h
-
 .PATH: ${LIBARCHIVEDIR}/test_utils
 SRCS.bsdtar_test+=	test_utils.c
 
 DPADD.bsdtar_test=	${LIBARCHIVE}
 LDADD.bsdtar_test=	-larchive
 
 list.h: ${TESTS_SRCS} Makefile
 	@(cd ${LIBARCHIVEDIR}/tar/test && \
 	grep -h DEFINE_TEST ${.ALLSRC:N*Makefile}) > ${.TARGET}.tmp
 	@mv ${.TARGET}.tmp ${.TARGET}
 
 CLEANFILES+=	list.h list.h.tmp
 
 FILES+=	test_extract.tar.Z.uu
 FILES+=	test_extract.tar.bz2.uu
 FILES+=	test_extract.tar.grz.uu
 FILES+=	test_extract.tar.gz.uu
 FILES+=	test_extract.tar.lrz.uu
 FILES+=	test_extract.tar.lz.uu
 FILES+=	test_extract.tar.lzma.uu
 FILES+=	test_extract.tar.lzo.uu
 FILES+=	test_extract.tar.xz.uu
 FILES+=	test_option_keep_newer_files.tar.Z.uu
 FILES+=	test_option_s.tar.Z.uu
 FILES+=	test_patterns_2.tar.uu
 FILES+=	test_patterns_3.tar.uu
 FILES+=	test_patterns_4.tar.uu
 FILES+=	test_print_longpath.tar.Z.uu
 
 .include <bsd.test.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 291813)
+++ stable/10	(revision 291814)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r291329