Index: head/lib/atf/libatf-c++/Makefile =================================================================== --- head/lib/atf/libatf-c++/Makefile (revision 275023) +++ head/lib/atf/libatf-c++/Makefile (revision 275024) @@ -1,81 +1,80 @@ #- # Copyright (c) 2011 Google, Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ .include .include LIB= atf-c++ PRIVATELIB= true SHLIB_MAJOR= 2 # libatf-c++ depends on the C version of the ATF library to build. -DPADD= ${LIBATF_C} -LDADD= -latf-c +LIBADD+= atf_c LDFLAGS+= -L${.OBJDIR}/../libatf-c ATF= ${.CURDIR:H:H:H}/contrib/atf .PATH: ${ATF} .PATH: ${ATF}/atf-c++ .PATH: ${ATF}/atf-c++/detail CFLAGS+= -I${ATF} CFLAGS+= -I${.CURDIR}/../libatf-c CFLAGS+= -I. CFLAGS+= -DHAVE_CONFIG_H SRCS= application.cpp \ build.cpp \ check.cpp \ env.cpp \ exceptions.cpp \ fs.cpp \ process.cpp \ tests.cpp \ text.cpp \ utils.cpp INCS= build.hpp \ check.hpp \ macros.hpp \ tests.hpp \ utils.hpp INCSDIR= ${INCLUDEDIR}/atf-c++ INCS+= atf-c++.hpp INCSDIR_atf-c++.hpp= ${INCLUDEDIR} MAN= atf-c++.3 MLINKS+= atf-c++.3 atf-c-api++.3 # Backwards compatibility. .if ${MK_TESTS} != "no" SUBDIR= tests .endif .include "../common.mk" .include Index: head/lib/libarchive/Makefile =================================================================== --- head/lib/libarchive/Makefile (revision 275023) +++ head/lib/libarchive/Makefile (revision 275024) @@ -1,426 +1,414 @@ # $FreeBSD$ .include LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIB= archive -DPADD= ${LIBZ} -LDADD= -lz -DPADD+= ${LIBBZ2} -LDADD+= -lbz2 -CFLAGS+= -DHAVE_BZLIB_H=1 +LIBADD= z bz2 lzma bsdxml +CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 -DPADD+= ${LIBLZMA} -LDADD+= -llzma -CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 - -DPADD+= ${LIBBSDXML} -LDADD+= -lbsdxml - # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. SHLIB_MAJOR= 6 CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" CFLAGS+= -I${.OBJDIR} .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto .else -DPADD+= ${LIBMD} -LDADD+= -lmd +LIBADD+= md .endif .if ${MK_ICONV} != "no" # TODO: This can be changed back to CFLAGS once iconv works correctly # with statically linked binaries. SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const .endif .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \ ${MACHINE_ARCH:Msparc64*} != "" NO_WCAST_ALIGN= yes .if ${MACHINE_ARCH:M*64*} == "" CFLAGS+= -DPPMD_32BIT .endif .endif NO_WCAST_ALIGN.clang= .ifndef COMPAT_32BIT beforeinstall: ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${.CURDIR}/libarchive.pc ${DESTDIR}${LIBDATADIR}/pkgconfig .endif .PATH: ${LIBARCHIVEDIR}/libarchive # Headers to be installed in /usr/include INCS= archive.h archive_entry.h # Sources to be compiled. SRCS= archive_acl.c \ archive_check_magic.c \ archive_cmdline.c \ archive_crypto.c \ archive_entry.c \ archive_entry_copy_stat.c \ archive_entry_link_resolver.c \ archive_entry_sparse.c \ archive_entry_stat.c \ archive_entry_strmode.c \ archive_entry_xattr.c \ archive_getdate.c \ archive_match.c \ archive_options.c \ archive_pathmatch.c \ archive_ppmd7.c \ archive_rb.c \ archive_read.c \ archive_read_append_filter.c \ archive_read_data_into_fd.c \ archive_read_disk_entry_from_file.c \ archive_read_disk_posix.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_set_format.c \ archive_read_set_options.c \ archive_read_support_filter_all.c \ archive_read_support_filter_bzip2.c \ archive_read_support_filter_compress.c \ archive_read_support_filter_gzip.c \ archive_read_support_filter_grzip.c \ archive_read_support_filter_lrzip.c \ archive_read_support_filter_lzop.c \ archive_read_support_filter_none.c \ archive_read_support_filter_program.c \ archive_read_support_filter_rpm.c \ archive_read_support_filter_uu.c \ archive_read_support_filter_xz.c \ archive_read_support_format_7zip.c \ archive_read_support_format_all.c \ archive_read_support_format_ar.c \ archive_read_support_format_by_code.c \ archive_read_support_format_cab.c \ archive_read_support_format_cpio.c \ archive_read_support_format_empty.c \ archive_read_support_format_iso9660.c \ archive_read_support_format_lha.c \ archive_read_support_format_mtree.c \ archive_read_support_format_rar.c \ archive_read_support_format_raw.c \ archive_read_support_format_tar.c \ archive_read_support_format_xar.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_add_filter.c \ archive_write_disk_acl.c \ archive_write_disk_set_standard_lookup.c \ archive_write_disk_posix.c \ archive_write_open_fd.c \ archive_write_open_file.c \ archive_write_open_filename.c \ archive_write_open_memory.c \ archive_write_add_filter_b64encode.c \ archive_write_add_filter_by_name.c \ archive_write_add_filter_bzip2.c \ archive_write_add_filter_compress.c \ archive_write_add_filter_grzip.c \ archive_write_add_filter_gzip.c \ archive_write_add_filter_lrzip.c \ archive_write_add_filter_lzop.c \ archive_write_add_filter_none.c \ archive_write_add_filter_program.c \ archive_write_add_filter_uuencode.c \ archive_write_add_filter_xz.c \ archive_write_set_format.c \ archive_write_set_format_7zip.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_gnutar.c \ archive_write_set_format_iso9660.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_v7tar.c \ archive_write_set_format_xar.c \ archive_write_set_format_zip.c \ archive_write_set_options.c \ filter_fork_posix.c # Man pages to be installed. MAN= archive_entry.3 \ archive_entry_acl.3 \ archive_entry_linkify.3 \ archive_entry_paths.3 \ archive_entry_perms.3 \ archive_entry_stat.3 \ archive_entry_time.3 \ archive_read.3 \ archive_read_data.3 \ archive_read_disk.3 \ archive_read_extract.3 \ archive_read_filter.3 \ archive_read_format.3 \ archive_read_free.3 \ archive_read_header.3 \ archive_read_new.3 \ archive_read_open.3 \ archive_read_set_options.3 \ archive_util.3 \ archive_write.3 \ archive_write_blocksize.3 \ archive_write_data.3 \ archive_write_disk.3 \ archive_write_filter.3 \ archive_write_finish_entry.3 \ archive_write_format.3 \ archive_write_free.3 \ archive_write_header.3 \ archive_write_new.3 \ archive_write_open.3 \ archive_write_set_options.3 \ cpio.5 \ libarchive.3 \ libarchive_changes.3 \ libarchive_internals.3 \ libarchive-formats.5 \ tar.5 # Symlink the man pages under each function name. MLINKS+= archive_entry.3 archive_entry_clear.3 MLINKS+= archive_entry.3 archive_entry_clone.3 MLINKS+= archive_entry.3 archive_entry_free.3 MLINKS+= archive_entry.3 archive_entry_new.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_add_entry.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_add_entry_w.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_clear.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_count.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_next.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_next_w.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_reset.3 MLINKS+= archive_entry_acl.3 archive_entry_acl_text_w.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_new.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_set_strategy.3 MLINKS+= archive_entry_linkify.3 archive_entry_linkresolver_free.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_hardlink.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_hardlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_link.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_link_w.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_pathname.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_sourcepath.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_symlink.3 MLINKS+= archive_entry_paths.3 archive_entry_copy_symlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_hardlink.3 MLINKS+= archive_entry_paths.3 archive_entry_hardlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_pathname.3 MLINKS+= archive_entry_paths.3 archive_entry_pathname_w.3 MLINKS+= archive_entry_paths.3 archive_entry_set_hardlink.3 MLINKS+= archive_entry_paths.3 archive_entry_set_link.3 MLINKS+= archive_entry_paths.3 archive_entry_set_pathname.3 MLINKS+= archive_entry_paths.3 archive_entry_set_symlink.3 MLINKS+= archive_entry_paths.3 archive_entry_symlink.3 MLINKS+= archive_entry_paths.3 archive_entry_symlink_w.3 MLINKS+= archive_entry_paths.3 archive_entry_update_symlink_utf8.3 MLINKS+= archive_entry_paths.3 archive_entry_update_hardlink_utf8.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_fflags_text.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_fflags_text_w.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_gname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_uname.3 MLINKS+= archive_entry_perms.3 archive_entry_copy_uname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_fflags.3 MLINKS+= archive_entry_perms.3 archive_entry_fflags_text.3 MLINKS+= archive_entry_perms.3 archive_entry_gid.3 MLINKS+= archive_entry_perms.3 archive_entry_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_gname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_set_fflags.3 MLINKS+= archive_entry_perms.3 archive_entry_set_gid.3 MLINKS+= archive_entry_perms.3 archive_entry_set_gname.3 MLINKS+= archive_entry_perms.3 archive_entry_perm.3 MLINKS+= archive_entry_perms.3 archive_entry_set_perm.3 MLINKS+= archive_entry_perms.3 archive_entry_set_uid.3 MLINKS+= archive_entry_perms.3 archive_entry_set_uname.3 MLINKS+= archive_entry_perms.3 archive_entry_strmode.3 MLINKS+= archive_entry_perms.3 archive_entry_uid.3 MLINKS+= archive_entry_perms.3 archive_entry_uname.3 MLINKS+= archive_entry_perms.3 archive_entry_uname_w.3 MLINKS+= archive_entry_perms.3 archive_entry_update_gname_utf8.3 MLINKS+= archive_entry_perms.3 archive_entry_update_uname_utf8.3 MLINKS+= archive_entry_stat.3 archive_entry_copy_stat.3 MLINKS+= archive_entry_stat.3 archive_entry_dev.3 MLINKS+= archive_entry_stat.3 archive_entry_dev_is_set.3 MLINKS+= archive_entry_stat.3 archive_entry_devmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_devminor.3 MLINKS+= archive_entry_stat.3 archive_entry_filetype.3 MLINKS+= archive_entry_stat.3 archive_entry_ino.3 MLINKS+= archive_entry_stat.3 archive_entry_ino64.3 MLINKS+= archive_entry_stat.3 archive_entry_ino_is_set.3 MLINKS+= archive_entry_stat.3 archive_entry_mode.3 MLINKS+= archive_entry_stat.3 archive_entry_nlink.3 MLINKS+= archive_entry_stat.3 archive_entry_rdev.3 MLINKS+= archive_entry_stat.3 archive_entry_rdevmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_rdevminor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_dev.3 MLINKS+= archive_entry_stat.3 archive_entry_set_devmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_devminor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_filetype.3 MLINKS+= archive_entry_stat.3 archive_entry_set_ino.3 MLINKS+= archive_entry_stat.3 archive_entry_set_ino64.3 MLINKS+= archive_entry_stat.3 archive_entry_set_mode.3 MLINKS+= archive_entry_stat.3 archive_entry_set_nlink.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdev.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdevmajor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_rdevminor.3 MLINKS+= archive_entry_stat.3 archive_entry_set_size.3 MLINKS+= archive_entry_stat.3 archive_entry_size.3 MLINKS+= archive_entry_stat.3 archive_entry_size_is_set.3 MLINKS+= archive_entry_stat.3 archive_entry_unset_size.3 MLINKS+= archive_entry_time.3 archive_entry_atime.3 MLINKS+= archive_entry_time.3 archive_entry_atime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_atime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_birthtime.3 MLINKS+= archive_entry_time.3 archive_entry_birthtime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_birthtime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_ctime.3 MLINKS+= archive_entry_time.3 archive_entry_ctime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_ctime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_mtime.3 MLINKS+= archive_entry_time.3 archive_entry_mtime_is_set.3 MLINKS+= archive_entry_time.3 archive_entry_mtime_nsec.3 MLINKS+= archive_entry_time.3 archive_entry_set_atime.3 MLINKS+= archive_entry_time.3 archive_entry_set_birthtime.3 MLINKS+= archive_entry_time.3 archive_entry_set_ctime.3 MLINKS+= archive_entry_time.3 archive_entry_set_mtime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_atime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_birthtime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_ctime.3 MLINKS+= archive_entry_time.3 archive_entry_unset_mtime.3 MLINKS+= archive_read_data.3 archive_read_data_block.3 MLINKS+= archive_read_data.3 archive_read_data_into_fd.3 MLINKS+= archive_read_data.3 archive_read_data_skip.3 MLINKS+= archive_read_header.3 archive_read_next_header.3 MLINKS+= archive_read_header.3 archive_read_next_header2.3 MLINKS+= archive_read_extract.3 archive_read_extract2.3 MLINKS+= archive_read_extract.3 archive_read_extract_set_progress_callback.3 MLINKS+= archive_read_extract.3 archive_read_extract_set_skip_file.3 MLINKS+= archive_read_open.3 archive_read_open2.3 MLINKS+= archive_read_open.3 archive_read_open_FILE.3 MLINKS+= archive_read_open.3 archive_read_open_fd.3 MLINKS+= archive_read_open.3 archive_read_open_file.3 MLINKS+= archive_read_open.3 archive_read_open_filename.3 MLINKS+= archive_read_open.3 archive_read_open_memory.3 MLINKS+= archive_read_free.3 archive_read_close.3 MLINKS+= archive_read_free.3 archive_read_finish.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_all.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_bzip2.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_compress.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_gzip.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_lzma.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_none.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_xz.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_program.3 MLINKS+= archive_read_filter.3 archive_read_support_filter_program_signature.3 MLINKS+= archive_read_format.3 archive_read_support_format_7zip.3 MLINKS+= archive_read_format.3 archive_read_support_format_all.3 MLINKS+= archive_read_format.3 archive_read_support_format_ar.3 MLINKS+= archive_read_format.3 archive_read_support_format_by_code.3 MLINKS+= archive_read_format.3 archive_read_support_format_cab.3 MLINKS+= archive_read_format.3 archive_read_support_format_cpio.3 MLINKS+= archive_read_format.3 archive_read_support_format_empty.3 MLINKS+= archive_read_format.3 archive_read_support_format_iso9660.3 MLINKS+= archive_read_format.3 archive_read_support_format_lha.3 MLINKS+= archive_read_format.3 archive_read_support_format_mtree.3 MLINKS+= archive_read_format.3 archive_read_support_format_rar.3 MLINKS+= archive_read_format.3 archive_read_support_format_raw.3 MLINKS+= archive_read_format.3 archive_read_support_format_tar.3 MLINKS+= archive_read_format.3 archive_read_support_format_xar.3 MLINKS+= archive_read_format.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_read_set_options.3 archive_read_set_filter_option.3 MLINKS+= archive_read_set_options.3 archive_read_set_format_option.3 MLINKS+= archive_read_set_options.3 archive_read_set_option.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_copy_error.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_filter_code.3 MLINKS+= archive_util.3 archive_filter_count.3 MLINKS+= archive_util.3 archive_filter_name.3 MLINKS+= archive_util.3 archive_format.3 MLINKS+= archive_util.3 archive_format_name.3 MLINKS+= archive_util.3 archive_position.3 MLINKS+= archive_util.3 archive_set_error.3 MLINKS+= archive_write_blocksize.3 archive_write_get_bytes_in_last_block.3 MLINKS+= archive_write_blocksize.3 archive_write_get_bytes_per_block.3 MLINKS+= archive_write_blocksize.3 archive_write_set_bytes_in_last_block.3 MLINKS+= archive_write_blocksize.3 archive_write_set_bytes_per_block.3 MLINKS+= archive_write_disk.3 archive_write_data_block.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+= archive_write_filter.3 archive_write_add_filter_bzip2.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_compress.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_gzip.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_lzip.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_lzma.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_none.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_program.3 MLINKS+= archive_write_filter.3 archive_write_add_filter_xz.3 MLINKS+= archive_write_format.3 archive_write_set_format_cpio.3 MLINKS+= archive_write_format.3 archive_write_set_format_pax.3 MLINKS+= archive_write_format.3 archive_write_set_format_pax_restricted.3 MLINKS+= archive_write_format.3 archive_write_set_format_shar.3 MLINKS+= archive_write_format.3 archive_write_set_format_shar_dump.3 MLINKS+= archive_write_format.3 archive_write_set_format_ustar.3 MLINKS+= archive_write_free.3 archive_write_close.3 MLINKS+= archive_write_free.3 archive_write_fail.3 MLINKS+= archive_write_free.3 archive_write_finish.3 MLINKS+= archive_write_open.3 archive_write_open_FILE.3 MLINKS+= archive_write_open.3 archive_write_open_fd.3 MLINKS+= archive_write_open.3 archive_write_open_file.3 MLINKS+= archive_write_open.3 archive_write_open_filename.3 MLINKS+= archive_write_open.3 archive_write_open_memory.3 MLINKS+= archive_write_set_options.3 archive_write_set_filter_option.3 MLINKS+= archive_write_set_options.3 archive_write_set_format_option.3 MLINKS+= archive_write_set_options.3 archive_write_set_option.3 MLINKS+= libarchive.3 archive.3 .PHONY: check test clean-test check test: cd ${.CURDIR}/test && make obj && make test clean-test: cd ${.CURDIR}/test && make clean .include Index: head/lib/libarchive/test/Makefile =================================================================== --- head/lib/libarchive/test/Makefile (revision 275023) +++ head/lib/libarchive/test/Makefile (revision 275024) @@ -1,256 +1,255 @@ # $FreeBSD$ LIBARCHIVEDIR= ${.CURDIR}/../../../contrib/libarchive MAN= PROG=libarchive_test INTERNALPROG=yes # Don't install this; it's just for testing -DPADD=${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBCRYPTO} ${LIBBSDXML} LDADD= -L ${.OBJDIR}/.. -larchive -LDADD+= -lz -lbz2 -llzma -lmd -lcrypto -lbsdxml +LIBADD= z bz2 lzma md crypto bsdxml CFLAGS+= -g CFLAGS+= -I${.CURDIR}/.. -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= \ 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_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 # Build the test program. SRCS= \ ${TESTS} \ list.h \ main.c \ read_open_memory.c .PATH: ${LIBARCHIVEDIR}/test_utils SRCS+= test_utils.c # Build libarchive_test and run it. check test: libarchive_test ./libarchive_test -r ${LIBARCHIVEDIR}/libarchive/test # list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines list.h: ${TESTS} Makefile (cd ${LIBARCHIVEDIR}/libarchive/test; cat test_*.c) | \ grep DEFINE_TEST > ${.OBJDIR}/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 Index: head/lib/libbsnmp/libbsnmp/Makefile =================================================================== --- head/lib/libbsnmp/libbsnmp/Makefile (revision 275023) +++ head/lib/libbsnmp/libbsnmp/Makefile (revision 275024) @@ -1,26 +1,25 @@ # $FreeBSD$ # # Author: Harti Brandt .include CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib .PATH: ${CONTRIB} LIB= bsnmp SHLIB_MAJOR= 6 CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"' .if ${MK_OPENSSL} != "no" CFLAGS+= -DHAVE_LIBCRYPTO -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD= crypto .endif SRCS= asn1.c snmp.c snmpagent.c snmpclient.c snmpcrypto.c support.c INCS= asn1.h snmp.h snmpagent.h snmpclient.h MAN= asn1.3 bsnmplib.3 bsnmpclient.3 bsnmpagent.3 .include Index: head/lib/libc/Makefile =================================================================== --- head/lib/libc/Makefile (revision 275023) +++ head/lib/libc/Makefile (revision 275024) @@ -1,174 +1,172 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # $FreeBSD$ SHLIBDIR?= /lib .include LIBC_SRCTOP?= ${.CURDIR} # Pick the current architecture directory for libc. In general, this is # named MACHINE_CPUARCH, but some ABIs are different enough to require # their own libc, so allow a directory named MACHINE_ARCH to override this. .if exists(${LIBC_SRCTOP}/${MACHINE_ARCH}) LIBC_ARCH=${MACHINE_ARCH} .else LIBC_ARCH=${MACHINE_CPUARCH} .endif # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does # not contain these strings, add -DSTRIP_FBSDID (see ) to CFLAGS # below. Note: there are no IDs for syscall stubs whose sources are generated. # To include legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # to CFLAGS below. -DSYSLIBC_SCCS affects just the system call stubs. LIB=c SHLIB_MAJOR= 7 SHLIB_LDSCRIPT=libc.ldscript WARNS?= 2 CFLAGS+=-I${LIBC_SRCTOP}/include -I${LIBC_SRCTOP}/../../include CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH} .if ${MK_NLS} != "no" CFLAGS+=-DNLS .endif CLEANFILES+=tags INSTALL_PIC_ARCHIVE= PRECIOUSLIB= .ifndef NO_THREAD_STACK_UNWIND CANCELPOINTS_CFLAGS=-fexceptions CFLAGS+=${CANCELPOINTS_CFLAGS} .endif # # Link with static libcompiler_rt.a. # -DPADD+= ${LIBCOMPILER_RT} LDFLAGS+= -nodefaultlibs -LDADD+= -lcompiler_rt +LIBADD+= compiler_rt .if ${MK_SSP} != "no" -DPADD+= ${LIBSSP_NONSHARED} -LDADD+= -lssp_nonshared +LIBADD+= ssp_nonshared .endif # Extras that live in either libc.a or libc_nonshared.a LIBC_NONSHARED_SRCS= # Define (empty) variables so that make doesn't give substitution # errors if the included makefiles don't change these: MDSRCS= MISRCS= MDASM= MIASM= NOASM= .include "${LIBC_SRCTOP}/${LIBC_ARCH}/Makefile.inc" .include "${LIBC_SRCTOP}/db/Makefile.inc" .include "${LIBC_SRCTOP}/compat-43/Makefile.inc" .include "${LIBC_SRCTOP}/gdtoa/Makefile.inc" .include "${LIBC_SRCTOP}/gen/Makefile.inc" .include "${LIBC_SRCTOP}/gmon/Makefile.inc" .if ${MK_ICONV} != "no" .include "${LIBC_SRCTOP}/iconv/Makefile.inc" .endif .include "${LIBC_SRCTOP}/inet/Makefile.inc" .include "${LIBC_SRCTOP}/isc/Makefile.inc" .include "${LIBC_SRCTOP}/locale/Makefile.inc" .include "${LIBC_SRCTOP}/md/Makefile.inc" .include "${LIBC_SRCTOP}/nameser/Makefile.inc" .include "${LIBC_SRCTOP}/net/Makefile.inc" .include "${LIBC_SRCTOP}/nls/Makefile.inc" .include "${LIBC_SRCTOP}/posix1e/Makefile.inc" .if ${LIBC_ARCH} != "amd64" && \ ${LIBC_ARCH} != "powerpc64" && \ ${LIBC_ARCH} != "sparc64" && \ ${MACHINE_ARCH:Mmipsn32*} == "" && \ ${MACHINE_ARCH:Mmips64*} == "" .include "${LIBC_SRCTOP}/quad/Makefile.inc" .endif .include "${LIBC_SRCTOP}/regex/Makefile.inc" .include "${LIBC_SRCTOP}/resolv/Makefile.inc" .include "${LIBC_SRCTOP}/stdio/Makefile.inc" .include "${LIBC_SRCTOP}/stdlib/Makefile.inc" .include "${LIBC_SRCTOP}/stdlib/jemalloc/Makefile.inc" .include "${LIBC_SRCTOP}/stdtime/Makefile.inc" .include "${LIBC_SRCTOP}/string/Makefile.inc" .include "${LIBC_SRCTOP}/sys/Makefile.inc" .include "${LIBC_SRCTOP}/rpc/Makefile.inc" .include "${LIBC_SRCTOP}/uuid/Makefile.inc" .include "${LIBC_SRCTOP}/xdr/Makefile.inc" .if (${LIBC_ARCH} == "arm" && ${MACHINE_ARCH} != "armv6hf") ||\ ${LIBC_ARCH} == "mips" .include "${LIBC_SRCTOP}/softfloat/Makefile.inc" .endif .if ${MK_NIS} != "no" CFLAGS+= -DYP .include "${LIBC_SRCTOP}/yp/Makefile.inc" .endif .include "${LIBC_SRCTOP}/capability/Makefile.inc" .if ${MK_HESIOD} != "no" CFLAGS+= -DHESIOD .endif .if ${MK_FP_LIBC} == "no" CFLAGS+= -DNO_FLOATING_POINT .endif .if ${MK_NS_CACHING} != "no" CFLAGS+= -DNS_CACHING .endif .if defined(_FREEFALL_CONFIG) CFLAGS+=-D_FREEFALL_CONFIG .endif STATICOBJS+=${LIBC_NONSHARED_SRCS:S/.c$/.o/} VERSION_DEF=${LIBC_SRCTOP}/Versions.def SYMBOL_MAPS=${SYM_MAPS} CFLAGS+= -DSYMBOL_VERSIONING # If there are no machine dependent sources, append all the # machine-independent sources: .if empty(MDSRCS) SRCS+= ${MISRCS} .else # Append machine-dependent sources, then append machine-independent sources # for which there is no machine-dependent variant. SRCS+= ${MDSRCS} .for _src in ${MISRCS} .if ${MDSRCS:R:M${_src:R}} == "" SRCS+= ${_src} .endif .endfor .endif KQSRCS= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \ lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \ subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c KSRCS= bcmp.c ffs.c ffsl.c fls.c flsl.c mcount.c strcat.c strchr.c \ strcmp.c strcpy.c strlen.c strncpy.c strrchr.c libkern: libkern.gen libkern.${LIBC_ARCH} libkern.gen: ${KQSRCS} ${KSRCS} cp -fp ${LIBC_SRCTOP}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern libkern.${LIBC_ARCH}:: ${KMSRCS} .if defined(KMSRCS) && !empty(KMSRCS) cp -fp ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH} .endif .include .include # Disable warnings in contributed sources. CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/} # XXX For now, we don't allow libc to be compiled with # -fstack-protector-all because it breaks rtld. We may want to make a librtld # in the future to circumvent this. SSP_CFLAGS:= ${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/} # Disable stack protection for SSP symbols. SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/} # Generate stack unwinding tables for cancellation points CANCELPOINTS_CFLAGS:= ${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//} Index: head/lib/libc++/Makefile =================================================================== --- head/lib/libc++/Makefile (revision 275023) +++ head/lib/libc++/Makefile (revision 275024) @@ -1,207 +1,206 @@ # $FreeBSD$ .include LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt HDRDIR= ${.CURDIR}/../../contrib/libc++/include SRCDIR= ${.CURDIR}/../../contrib/libc++/src CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR} .PATH: ${SRCDIR} LIB= c++ SHLIB_MAJOR= 1 SHLIB_LDSCRIPT= libc++.ldscript SRCS+= algorithm.cpp\ bind.cpp\ chrono.cpp\ condition_variable.cpp\ debug.cpp\ exception.cpp\ future.cpp\ hash.cpp\ ios.cpp\ iostream.cpp\ locale.cpp\ memory.cpp\ mutex.cpp\ new.cpp\ optional.cpp\ random.cpp\ regex.cpp\ shared_mutex.cpp\ stdexcept.cpp\ string.cpp\ strstream.cpp\ system_error.cpp\ thread.cpp\ typeinfo.cpp\ utility.cpp\ valarray.cpp CXXRT_SRCS+= libelftc_dem_gnu3.c\ terminate.cc\ dynamic_cast.cc\ memory.cc\ auxhelper.cc\ exception.cc\ stdexcept.cc\ typeinfo.cc\ guard.cc .for _S in ${CXXRT_SRCS} STATICOBJS+= cxxrt_${_S:R}.o cxxrt_${_S}: ln -sf ${LIBCXXRTDIR}/${_S} ${.TARGET} .endfor WARNS= 0 CFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -nostdlib -DLIBCXXRT .if empty(CXXFLAGS:M-std=*) CXXFLAGS+= -std=c++11 .endif -DPADD= ${LIBCXXRT} -LDADD= -lcxxrt +LIBADD+= cxxrt LDFLAGS+= --verbose INCSGROUPS= STD EXP EXT STD_HEADERS= __bit_reference\ __config\ __debug\ __functional_03\ __functional_base\ __functional_base_03\ __hash_table\ __locale\ __mutex_base\ __split_buffer\ __sso_allocator\ __std_stream\ __tree\ __tuple\ __tuple_03\ __undef_min_max\ algorithm\ array\ atomic\ bitset\ cassert\ ccomplex\ cctype\ cerrno\ cfenv\ cfloat\ chrono\ cinttypes\ ciso646\ climits\ clocale\ cmath\ codecvt\ complex\ complex.h\ condition_variable\ csetjmp\ csignal\ cstdarg\ cstdbool\ cstddef\ cstdint\ cstdio\ cstdlib\ cstring\ ctgmath\ ctime\ cwchar\ cwctype\ deque\ exception\ forward_list\ fstream\ functional\ future\ initializer_list\ iomanip\ ios\ iosfwd\ iostream\ istream\ iterator\ limits\ list\ locale\ map\ memory\ mutex\ new\ numeric\ ostream\ queue\ random\ ratio\ regex\ scoped_allocator\ set\ shared_mutex\ sstream\ stack\ stdexcept\ streambuf\ string\ strstream\ system_error\ tgmath.h\ thread\ tuple\ type_traits\ typeindex\ typeinfo\ unordered_map\ unordered_set\ utility\ valarray\ vector RT_HEADERS= cxxabi.h\ unwind.h\ unwind-arm.h\ unwind-itanium.h .for hdr in ${STD_HEADERS} STD+= ${HDRDIR}/${hdr} INCSLINKS+= ${CXXINCLUDEDIR}/${hdr} ${CXXINCLUDEDIR}/tr1/${hdr} .endfor .for hdr in ${RT_HEADERS} STD+= ${LIBCXXRTDIR}/${hdr} .endfor STDDIR= ${CXXINCLUDEDIR} EXP_HEADERS= dynarray\ optional .for hdr in ${EXP_HEADERS} EXP+= ${HDRDIR}/experimental/${hdr} .endfor EXPDIR= ${CXXINCLUDEDIR}/experimental EXT_HEADERS= __hash\ hash_map\ hash_set .for hdr in ${EXT_HEADERS} EXT+= ${HDRDIR}/ext/${hdr} .endfor EXTDIR= ${CXXINCLUDEDIR}/ext .if ${MK_GNUCXX} == "no" && ${COMPILER_TYPE} == "gcc" CLEANFILES+= libstdc++.so libstdc++.a afterinstall: ln -sf ${DESTDIR}${LIBDIR}/lib${LIB}.so \ ${.OBJDIR}/libstdc++.so ln -sf ${DESTDIR}${LIBDIR}/lib${LIB}.a \ ${.OBJDIR}/libstdc++.a .endif .include Index: head/lib/libcam/Makefile =================================================================== --- head/lib/libcam/Makefile (revision 275023) +++ head/lib/libcam/Makefile (revision 275024) @@ -1,47 +1,46 @@ # $FreeBSD$ LIB= cam SHLIBDIR?= /lib SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \ ata_all.c smp_all.c INCS= camlib.h -DPADD= ${LIBSBUF} -LDADD= -lsbuf +LIBADD= sbuf MAN= cam.3 cam_cdbparse.3 WARNS?= 2 MLINKS+= cam.3 cam_open_device.3 \ cam.3 cam_open_spec_device.3 \ cam.3 cam_open_btl.3 \ cam.3 cam_open_pass.3 \ cam.3 cam_close_device.3 \ cam.3 cam_close_spec_device.3 \ cam.3 cam_getccb.3 \ cam.3 cam_send_ccb.3 \ cam.3 cam_freeccb.3 \ cam.3 cam_path_string.3 \ cam.3 cam_device_dup.3 \ cam.3 cam_device_copy.3 \ cam.3 cam_get_device.3 \ cam_cdbparse.3 csio_build.3 \ cam_cdbparse.3 csio_build_visit.3 \ cam_cdbparse.3 csio_decode.3 \ cam_cdbparse.3 csio_decode_visit.3 \ cam_cdbparse.3 buff_decode.3 \ cam_cdbparse.3 buff_decode_visit.3 \ cam_cdbparse.3 csio_encode.3 \ cam_cdbparse.3 csio_encode_visit.3 \ cam_cdbparse.3 buff_encode_visit.3 .PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam/ata \ ${.CURDIR}/../../sys/cam SDIR= ${.CURDIR}/../../sys CFLAGS+= -I${.CURDIR} -I${SDIR} SHLIB_MAJOR= 7 .include Index: head/lib/libcapsicum/Makefile =================================================================== --- head/lib/libcapsicum/Makefile (revision 275023) +++ head/lib/libcapsicum/Makefile (revision 275024) @@ -1,47 +1,46 @@ # $FreeBSD$ LIB= capsicum SHLIB_MAJOR= 0 SHLIBDIR?= /lib SRCS= libcapsicum.c SRCS+= libcapsicum_dns.c SRCS+= libcapsicum_grp.c SRCS+= libcapsicum_pwd.c SRCS+= libcapsicum_random.c SRCS+= libcapsicum_service.c SRCS+= libcapsicum_sysctl.c INCS= libcapsicum.h INCS+= libcapsicum_dns.h INCS+= libcapsicum_grp.h INCS+= libcapsicum_pwd.h INCS+= libcapsicum_random.h INCS+= libcapsicum_service.h INCS+= libcapsicum_sysctl.h -DPADD= ${LIBNV} -LDADD= -lnv +LIBADD= nv CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../libnv WARNS?= 6 MAN+= libcapsicum.3 MLINKS+=libcapsicum.3 cap_init.3 MLINKS+=libcapsicum.3 cap_wrap.3 MLINKS+=libcapsicum.3 cap_unwrap.3 MLINKS+=libcapsicum.3 cap_sock.3 MLINKS+=libcapsicum.3 cap_clone.3 MLINKS+=libcapsicum.3 cap_close.3 MLINKS+=libcapsicum.3 cap_limit_get.3 MLINKS+=libcapsicum.3 cap_limit_set.3 MLINKS+=libcapsicum.3 cap_send_nvlist.3 MLINKS+=libcapsicum.3 cap_recv_nvlist.3 MLINKS+=libcapsicum.3 cap_xfer_nvlist.3 MLINKS+=libcapsicum.3 cap_service_open.3 .include Index: head/lib/libcasper/Makefile =================================================================== --- head/lib/libcasper/Makefile (revision 275023) +++ head/lib/libcasper/Makefile (revision 275024) @@ -1,20 +1,19 @@ # $FreeBSD$ LIB= casper SHLIB_MAJOR= 0 SHLIBDIR?= /lib SRCS= libcasper.c INCS= libcasper.h -DPADD= ${LIBCAPSICUM} ${LIBNV} ${LIBPJDLOG} -LDADD= -lcapsicum -lnv -lpjdlog +LIBADD= capsicum nv pjdlog CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../libpjdlog CFLAGS+=-I${.CURDIR}/../../sbin/casper WARNS?= 6 .include Index: head/lib/libcrypt/tests/Makefile =================================================================== --- head/lib/libcrypt/tests/Makefile (revision 275023) +++ head/lib/libcrypt/tests/Makefile (revision 275024) @@ -1,13 +1,12 @@ # $FreeBSD$ # exercise libcrypt TESTSDIR= ${TESTSBASE}/lib/libcrypt ATF_TESTS_C= crypt_tests CFLAGS+= -I${.CURDIR:H} -DPADD+= ${LIBCRYPT} -LDADD+= -lcrypt +LIBADD= crypt .include Index: head/lib/libcuse/Makefile =================================================================== --- head/lib/libcuse/Makefile (revision 275023) +++ head/lib/libcuse/Makefile (revision 275024) @@ -1,70 +1,68 @@ # $FreeBSD$ # # Copyright (c) 2010 Hans Petter Selasky. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # LIB= cuse SHLIB_MAJOR= 1 SHLIB_MINOR= 0 SRCS= cuse_lib.c INCS= cuse.h MAN= cuse.3 -PTHREAD_LIBS?= -lpthread CFLAGS+= -D_GNU_SOURCE .if defined(HAVE_DEBUG) CFLAGS+= -g CFLAGS+= -DHAVE_DEBUG .endif -DPADD+= ${LIBPTHREAD} -LDADD+= ${PTHREAD_LIBS} +LIBADD= pthread MLINKS= MLINKS+= cuse.3 cuse_alloc_unit_number.3 MLINKS+= cuse.3 cuse_alloc_unit_number_by_id.3 MLINKS+= cuse.3 cuse_copy_in.3 MLINKS+= cuse.3 cuse_copy_out.3 MLINKS+= cuse.3 cuse_dev_create.3 MLINKS+= cuse.3 cuse_dev_destroy.3 MLINKS+= cuse.3 cuse_dev_get_current.3 MLINKS+= cuse.3 cuse_dev_get_per_file_handle.3 MLINKS+= cuse.3 cuse_dev_get_priv0.3 MLINKS+= cuse.3 cuse_dev_get_priv1.3 MLINKS+= cuse.3 cuse_dev_set_per_file_handle.3 MLINKS+= cuse.3 cuse_dev_set_priv0.3 MLINKS+= cuse.3 cuse_dev_set_priv1.3 MLINKS+= cuse.3 cuse_free_unit_number.3 MLINKS+= cuse.3 cuse_free_unit_number_by_id.3 MLINKS+= cuse.3 cuse_got_peer_signal.3 MLINKS+= cuse.3 cuse_init.3 MLINKS+= cuse.3 cuse_poll_wakeup.3 MLINKS+= cuse.3 cuse_set_local.3 MLINKS+= cuse.3 cuse_get_local.3 MLINKS+= cuse.3 cuse_uninit.3 MLINKS+= cuse.3 cuse_vmalloc.3 MLINKS+= cuse.3 cuse_is_vmalloc_addr.3 MLINKS+= cuse.3 cuse_vmfree.3 MLINKS+= cuse.3 cuse_vmoffset.3 MLINKS+= cuse.3 cuse_wait_and_process.3 .include Index: head/lib/libdevstat/Makefile =================================================================== --- head/lib/libdevstat/Makefile (revision 275023) +++ head/lib/libdevstat/Makefile (revision 275024) @@ -1,38 +1,37 @@ # $FreeBSD$ LIB= devstat SHLIBDIR?= /lib # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented. SHLIB_MAJOR= 7 SRCS= devstat.c INCS= devstat.h -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm MAN= devstat.3 MLINKS+=devstat.3 devstat_getnumdevs.3 MLINKS+=devstat.3 devstat_getgeneration.3 MLINKS+=devstat.3 devstat_getversion.3 MLINKS+=devstat.3 devstat_checkversion.3 MLINKS+=devstat.3 devstat_getdevs.3 MLINKS+=devstat.3 devstat_selectdevs.3 MLINKS+=devstat.3 devstat_buildmatch.3 MLINKS+=devstat.3 devstat_compute_statistics.3 MLINKS+=devstat.3 devstat_compute_etime.3 MLINKS+=devstat.3 getnumdevs.3 MLINKS+=devstat.3 getgeneration.3 MLINKS+=devstat.3 getversion.3 MLINKS+=devstat.3 checkversion.3 MLINKS+=devstat.3 getdevs.3 MLINKS+=devstat.3 selectdevs.3 MLINKS+=devstat.3 buildmatch.3 MLINKS+=devstat.3 compute_stats.3 MLINKS+=devstat.3 compute_etime.3 CFLAGS+=-I${.CURDIR} WARNS?= 3 .include Index: head/lib/libdpv/Makefile =================================================================== --- head/lib/libdpv/Makefile (revision 275023) +++ head/lib/libdpv/Makefile (revision 275024) @@ -1,18 +1,17 @@ # $FreeBSD$ LIB= dpv SHLIB_MAJOR= 1 INCS= dpv.h MAN= dpv.3 MLINKS= dpv.3 dpv_free.3 -DPADD= ${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSESW} ${LIBUTIL} -LDADD= -ldialog -lfigpar -lncursesw -lutil +LIBADD= dialog figpar util ncursesw SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c CFLAGS+= -I${.CURDIR} WARNS?= 6 .include Index: head/lib/libdwarf/Makefile =================================================================== --- head/lib/libdwarf/Makefile (revision 275023) +++ head/lib/libdwarf/Makefile (revision 275024) @@ -1,346 +1,345 @@ # $FreeBSD$ .include TOP= ${.CURDIR}/../../contrib/elftoolchain SRCDIR= ${TOP}/libdwarf .PATH: ${SRCDIR} LIB= dwarf SRCS= \ dwarf_abbrev.c \ dwarf_arange.c \ dwarf_attr.c \ dwarf_attrval.c \ dwarf_cu.c \ dwarf_dealloc.c \ dwarf_die.c \ dwarf_dump.c \ dwarf_errmsg.c \ dwarf_finish.c \ dwarf_form.c \ dwarf_frame.c \ dwarf_funcs.c \ dwarf_init.c \ dwarf_lineno.c \ dwarf_loclist.c \ dwarf_macinfo.c \ dwarf_pro_arange.c \ dwarf_pro_attr.c \ dwarf_pro_die.c \ dwarf_pro_expr.c \ dwarf_pro_finish.c \ dwarf_pro_frame.c \ dwarf_pro_funcs.c \ dwarf_pro_init.c \ dwarf_pro_lineno.c \ dwarf_pro_macinfo.c \ dwarf_pro_pubnames.c \ dwarf_pro_reloc.c \ dwarf_pro_sections.c \ dwarf_pro_types.c \ dwarf_pro_vars.c \ dwarf_pro_weaks.c \ dwarf_pubnames.c \ dwarf_pubtypes.c \ dwarf_ranges.c \ dwarf_reloc.c \ dwarf_seterror.c \ dwarf_str.c \ dwarf_types.c \ dwarf_vars.c \ dwarf_weaks.c \ libdwarf.c \ libdwarf_abbrev.c \ libdwarf_arange.c \ libdwarf_attr.c \ libdwarf_die.c \ libdwarf_error.c \ libdwarf_elf_access.c \ libdwarf_elf_init.c \ libdwarf_frame.c \ libdwarf_info.c \ libdwarf_init.c \ libdwarf_lineno.c \ libdwarf_loc.c \ libdwarf_loclist.c \ libdwarf_macinfo.c \ libdwarf_nametbl.c \ libdwarf_ranges.c \ libdwarf_reloc.c \ libdwarf_rw.c \ libdwarf_sections.c \ libdwarf_str.c INCS= dwarf.h libdwarf.h # # We need to link against the correct version of these files. One # solution is to include ../../sys in the include path. This causes # problems when a header file in sys depends on a file in another # part of the tree, e.g. a machine dependent header. # SRCS+= sys/elf32.h sys/elf64.h sys/elf_common.h GENSRCS= dwarf_pubnames.c dwarf_pubtypes.c dwarf_weaks.c \ dwarf_funcs.c dwarf_vars.c dwarf_types.c \ dwarf_pro_pubnames.c dwarf_pro_weaks.c \ dwarf_pro_funcs.c dwarf_pro_types.c \ dwarf_pro_vars.c CLEANFILES= ${GENSRCS} CLEANDIRS= sys CFLAGS+= -I. -I${SRCDIR} -I${TOP}/common -I${TOP}/libelf sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET} mkdir -p ${.OBJDIR}/sys ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET} -LDADD+= -lelf -DPADD+= ${LIBELF} +LIBADD+= elf SHLIB_MAJOR= 4 MAN= dwarf.3 \ dwarf_add_arange.3 \ dwarf_add_AT_comp_dir.3 \ dwarf_add_AT_const_value_string.3 \ dwarf_add_AT_dataref.3 \ dwarf_add_AT_flag.3 \ dwarf_add_AT_location_expr.3 \ dwarf_add_AT_name.3 \ dwarf_add_AT_producer.3 \ dwarf_add_AT_ref_address.3 \ dwarf_add_AT_reference.3 \ dwarf_add_AT_signed_const.3 \ dwarf_add_AT_string.3 \ dwarf_add_AT_targ_address.3 \ dwarf_add_die_to_debug.3 \ dwarf_add_directory_decl.3 \ dwarf_add_expr_addr.3 \ dwarf_add_expr_gen.3 \ dwarf_add_fde_inst.3 \ dwarf_add_file_decl.3 \ dwarf_add_frame_cie.3 \ dwarf_add_frame_fde.3 \ dwarf_add_funcname.3 \ dwarf_add_line_entry.3 \ dwarf_add_pubname.3 \ dwarf_add_typename.3 \ dwarf_add_varname.3 \ dwarf_add_weakname.3 \ dwarf_attr.3 \ dwarf_attrlist.3 \ dwarf_attrval_signed.3 \ dwarf_child.3 \ dwarf_dealloc.3 \ dwarf_def_macro.3 \ dwarf_die_abbrev_code.3 \ dwarf_die_link.3 \ dwarf_diename.3 \ dwarf_dieoffset.3 \ dwarf_end_macro_file.3 \ dwarf_errmsg.3 \ dwarf_errno.3 \ dwarf_expand_frame_instructions.3 \ dwarf_expr_current_offset.3 \ dwarf_expr_into_block.3 \ dwarf_fde_cfa_offset.3 \ dwarf_find_macro_value_start.3 \ dwarf_finish.3 \ dwarf_formaddr.3 \ dwarf_formblock.3 \ dwarf_formexprloc.3 \ dwarf_formflag.3 \ dwarf_formref.3 \ dwarf_formsig8.3 \ dwarf_formstring.3 \ dwarf_formudata.3 \ dwarf_get_abbrev.3 \ dwarf_get_abbrev_children_flag.3 \ dwarf_get_abbrev_code.3 \ dwarf_get_abbrev_entry.3 \ dwarf_get_abbrev_tag.3 \ dwarf_get_address_size.3 \ dwarf_get_arange.3 \ dwarf_get_arange_info.3 \ dwarf_get_aranges.3 \ dwarf_get_AT_name.3 \ dwarf_get_cie_index.3 \ dwarf_get_cie_info.3 \ dwarf_get_cie_of_fde.3 \ dwarf_get_cu_die_offset.3 \ dwarf_get_elf.3 \ dwarf_get_fde_at_pc.3 \ dwarf_get_fde_info_for_all_regs.3 \ dwarf_get_fde_info_for_all_regs3.3 \ dwarf_get_fde_info_for_cfa_reg3.3 \ dwarf_get_fde_info_for_reg.3 \ dwarf_get_fde_info_for_reg3.3 \ dwarf_get_fde_instr_bytes.3 \ dwarf_get_fde_list.3 \ dwarf_get_fde_n.3 \ dwarf_get_fde_range.3 \ dwarf_get_form_class.3 \ dwarf_get_funcs.3 \ dwarf_get_globals.3 \ dwarf_get_loclist_entry.3 \ dwarf_get_macro_details.3 \ dwarf_get_pubtypes.3 \ dwarf_get_ranges.3 \ dwarf_get_relocation_info.3 \ dwarf_get_relocation_info_count.3 \ dwarf_get_section_bytes.3 \ dwarf_get_str.3 \ dwarf_get_types.3 \ dwarf_get_vars.3 \ dwarf_get_weaks.3 \ dwarf_hasattr.3 \ dwarf_hasform.3 \ dwarf_highpc.3 \ dwarf_init.3 \ dwarf_lineno.3 \ dwarf_lne_end_sequence.3 \ dwarf_lne_set_address.3 \ dwarf_loclist.3 \ dwarf_loclist_from_expr.3 \ dwarf_new_die.3 \ dwarf_new_expr.3 \ dwarf_new_fde.3 \ dwarf_next_cu_header.3 \ dwarf_object_init.3 \ dwarf_producer_init.3 \ dwarf_producer_set_isa.3 \ dwarf_reset_section_bytes.3 \ dwarf_seterrarg.3 \ dwarf_set_frame_cfa_value.3 \ dwarf_set_reloc_application.3 \ dwarf_srcfiles.3 \ dwarf_srclines.3 \ dwarf_start_macro_file.3 \ dwarf_tag.3 \ dwarf_transform_to_disk_form.3 \ dwarf_undef_macro.3 \ dwarf_vendor_ext.3 \ dwarf_whatattr.3 MLINKS+= \ dwarf_add_AT_const_value_string.3 dwarf_add_AT_const_value_signedint.3 \ dwarf_add_AT_const_value_string.3 dwarf_add_AT_const_value_unsignedint.3 \ dwarf_add_AT_signed_const.3 dwarf_add_AT_unsigned_const.3 \ dwarf_add_AT_targ_address.3 dwarf_add_AT_targ_address_b.3 \ dwarf_add_arange.3 dwarf_add_arange_b.3 \ dwarf_add_expr_addr.3 dwarf_add_expr_addr_b.3 \ dwarf_add_frame_fde.3 dwarf_add_frame_fde_b.3 \ dwarf_attrval_signed.3 dwarf_attrval_flag.3 \ dwarf_attrval_signed.3 dwarf_attrval_string.3 \ dwarf_attrval_signed.3 dwarf_attrval_unsigned.3 \ dwarf_child.3 dwarf_offdie.3 \ dwarf_child.3 dwarf_siblingof.3 \ dwarf_dealloc.3 dwarf_fde_cie_list_dealloc.3 \ dwarf_dealloc.3 dwarf_funcs_dealloc.3 \ dwarf_dealloc.3 dwarf_globals_dealloc.3 \ dwarf_dealloc.3 dwarf_pubtypes_dealloc.3 \ dwarf_dealloc.3 dwarf_types_dealloc.3 \ dwarf_dealloc.3 dwarf_vars_dealloc.3 \ dwarf_dealloc.3 dwarf_weaks_dealloc.3 \ dwarf_dealloc.3 dwarf_ranges_dealloc.3 \ dwarf_dealloc.3 dwarf_srclines_dealloc.3 \ dwarf_init.3 dwarf_elf_init.3 \ dwarf_dieoffset.3 dwarf_die_CU_offset.3 \ dwarf_dieoffset.3 dwarf_die_CU_offset_range.3 \ dwarf_dieoffset.3 dwarf_get_cu_die_offset_given_cu_header_offset.3 \ dwarf_finish.3 dwarf_object_finish.3 \ dwarf_formref.3 dwarf_global_formref.3 \ dwarf_formudata.3 dwarf_formsdata.3 \ dwarf_get_AT_name.3 dwarf_get_ACCESS_name.3 \ dwarf_get_AT_name.3 dwarf_get_ATE_name.3 \ dwarf_get_AT_name.3 dwarf_get_CC_name.3 \ dwarf_get_AT_name.3 dwarf_get_CFA_name.3 \ dwarf_get_AT_name.3 dwarf_get_CHILDREN_name.3 \ dwarf_get_AT_name.3 dwarf_get_DS_name.3 \ dwarf_get_AT_name.3 dwarf_get_DSC_name.3 \ dwarf_get_AT_name.3 dwarf_get_EH_name.3 \ dwarf_get_AT_name.3 dwarf_get_END_name.3 \ dwarf_get_AT_name.3 dwarf_get_FORM_name.3 \ dwarf_get_AT_name.3 dwarf_get_ID_name.3 \ dwarf_get_AT_name.3 dwarf_get_INL_name.3 \ dwarf_get_AT_name.3 dwarf_get_LANG_name.3 \ dwarf_get_AT_name.3 dwarf_get_LNE_name.3 \ dwarf_get_AT_name.3 dwarf_get_LNS_name.3 \ dwarf_get_AT_name.3 dwarf_get_MACINFO_name.3 \ dwarf_get_AT_name.3 dwarf_get_OP_name.3 \ dwarf_get_AT_name.3 dwarf_get_ORD_name.3 \ dwarf_get_AT_name.3 dwarf_get_TAG_name.3 \ dwarf_get_AT_name.3 dwarf_get_VIRTUALITY_name.3 \ dwarf_get_AT_name.3 dwarf_get_VIS_name.3 \ dwarf_get_cu_die_offset.3 dwarf_get_arange_cu_header_offset.3 \ dwarf_get_fde_list.3 dwarf_get_fde_list_eh.3 \ dwarf_get_funcs.3 dwarf_func_die_offset.3 \ dwarf_get_funcs.3 dwarf_func_cu_offset.3 \ dwarf_get_funcs.3 dwarf_func_name_offsets.3 \ dwarf_get_funcs.3 dwarf_funcname.3 \ dwarf_get_globals.3 dwarf_global_die_offset.3 \ dwarf_get_globals.3 dwarf_global_cu_offset.3 \ dwarf_get_globals.3 dwarf_global_name_offsets.3 \ dwarf_get_globals.3 dwarf_globname.3 \ dwarf_get_pubtypes.3 dwarf_pubtype_die_offset.3 \ dwarf_get_pubtypes.3 dwarf_pubtype_cu_offset.3 \ dwarf_get_pubtypes.3 dwarf_pubtype_name_offsets.3 \ dwarf_get_pubtypes.3 dwarf_pubtypename.3 \ dwarf_get_ranges.3 dwarf_get_ranges_a.3 \ dwarf_get_types.3 dwarf_type_die_offset.3 \ dwarf_get_types.3 dwarf_type_cu_offset.3 \ dwarf_get_types.3 dwarf_type_name_offsets.3 \ dwarf_get_types.3 dwarf_typename.3 \ dwarf_get_vars.3 dwarf_var_die_offset.3 \ dwarf_get_vars.3 dwarf_var_cu_offset.3 \ dwarf_get_vars.3 dwarf_var_name_offsets.3 \ dwarf_get_vars.3 dwarf_varname.3 \ dwarf_get_weaks.3 dwarf_weak_die_offset.3 \ dwarf_get_weaks.3 dwarf_weak_cu_offset.3 \ dwarf_get_weaks.3 dwarf_weak_name_offsets.3 \ dwarf_get_weaks.3 dwarf_weakname.3 \ dwarf_hasform.3 dwarf_whatform.3 \ dwarf_hasform.3 dwarf_whatform_direct.3 \ dwarf_highpc.3 dwarf_arrayorder.3 \ dwarf_highpc.3 dwarf_bitoffset.3 \ dwarf_highpc.3 dwarf_bitsize.3 \ dwarf_highpc.3 dwarf_bytesize.3 \ dwarf_highpc.3 dwarf_lowpc.3 \ dwarf_highpc.3 dwarf_srclang.3 \ dwarf_lineno.3 dwarf_lineaddr.3 \ dwarf_lineno.3 dwarf_linebeginstatement.3 \ dwarf_lineno.3 dwarf_lineblock.3 \ dwarf_lineno.3 dwarf_lineendsequence.3 \ dwarf_lineno.3 dwarf_lineoff.3 \ dwarf_lineno.3 dwarf_linesrc.3 \ dwarf_lineno.3 dwarf_line_srcfileno.3 \ dwarf_loclist.3 dwarf_loclist_n.3 \ dwarf_loclist_from_expr.3 dwarf_loclist_from_expr_a.3 \ dwarf_producer_init.3 dwarf_producer_init_b.3 \ dwarf_seterrarg.3 dwarf_seterrhand.3 \ dwarf_set_frame_cfa_value.3 dwarf_set_frame_rule_initial_value.3 \ dwarf_set_frame_cfa_value.3 dwarf_set_frame_rule_table_size.3 \ dwarf_set_frame_cfa_value.3 dwarf_set_frame_same_value.3 \ dwarf_set_frame_cfa_value.3 dwarf_set_frame_undefined_value.3 dwarf_pubnames.c: dwarf_nametbl.m4 dwarf_pubnames.m4 dwarf_pubtypes.c: dwarf_nametbl.m4 dwarf_pubtypes.m4 dwarf_weaks.c: dwarf_nametbl.m4 dwarf_weaks.m4 dwarf_funcs.c: dwarf_nametbl.m4 dwarf_funcs.m4 dwarf_vars.c: dwarf_nametbl.m4 dwarf_vars.m4 dwarf_types.c: dwarf_nametbl.m4 dwarf_types.m4 dwarf_pro_pubnames.c: dwarf_pro_nametbl.m4 dwarf_pro_pubnames.m4 dwarf_pro_weaks.c: dwarf_pro_nametbl.m4 dwarf_pro_weaks.m4 dwarf_pro_funcs.c: dwarf_pro_nametbl.m4 dwarf_pro_funcs.m4 dwarf_pro_types.c: dwarf_pro_nametbl.m4 dwarf_pro_types.m4 dwarf_pro_vars.c: dwarf_pro_nametbl.m4 dwarf_pro_vars.m4 .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .m4 .c .m4.c: m4 -D SRCDIR=${SRCDIR} ${M4FLAGS} ${.IMPSRC} > ${.TARGET} Index: head/lib/libedit/Makefile =================================================================== --- head/lib/libedit/Makefile (revision 275023) +++ head/lib/libedit/Makefile (revision 275024) @@ -1,78 +1,77 @@ # $NetBSD: Makefile,v 1.37 2009/01/18 12:17:49 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ LIB= edit SHLIB_MAJOR= 7 SHLIBDIR?= /lib OSRCS= chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \ hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c -DPADD= ${LIBNCURSESW} -LDADD= -lncursesw +LIBADD= ncursesw MAN= editline.3 editrc.5 MLINKS= editline.3 el_deletestr.3 editline.3 el_end.3 editline.3 el_init.3 \ editline.3 el_get.3 editline.3 el_getc.3 editline.3 el_gets.3 \ editline.3 history.3 editline.3 history_end.3 \ editline.3 history_init.3 editline.3 el_insertstr.3 \ editline.3 el_line.3 editline.3 el_parse.3 editline.3 el_push.3 \ editline.3 el_reset.3 editline.3 el_resize.3 editline.3 el_set.3 \ editline.3 el_source.3 \ editline.3 tok_init.3 editline.3 tok_end.3 editline.3 tok_reset.3 \ editline.3 tok_line.3 editline.3 tok_str.3 # For speed and debugging #SRCS= ${OSRCS} # For protection SRCS= editline.c SRCS+= tokenizer.c history.c readline.c SRCS+= common.h emacs.h fcns.h help.h vi.h CLEANFILES+= common.h editline.c emacs.h fcns.c fcns.h help.c help.h vi.h INCS= histedit.h CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/edit CFLAGS+= #-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH CFLAGS+= #-DDEBUG_PASTE -DDEBUG_EDIT WARNS?= 1 SUBDIR= edit/readline AHDR= vi.h emacs.h common.h ASRC= ${.CURDIR}/vi.c ${.CURDIR}/emacs.c ${.CURDIR}/common.c .for hdr in vi emacs common ${hdr}.h: ${hdr}.c makelist sh ${.CURDIR}/makelist -h ${.CURDIR}/${hdr}.c > ${.TARGET} .endfor fcns.h: ${AHDR} makelist sh ${.CURDIR}/makelist -fh ${AHDR} > ${.TARGET} fcns.c: ${AHDR} fcns.h makelist sh ${.CURDIR}/makelist -fc ${AHDR} > ${.TARGET} help.c: ${ASRC} makelist sh ${.CURDIR}/makelist -bc ${ASRC} > ${.TARGET} help.h: ${ASRC} makelist sh ${.CURDIR}/makelist -bh ${ASRC} > ${.TARGET} editline.c: ${OSRCS} sh ${.CURDIR}/makelist -e ${.ALLSRC:T} > ${.TARGET} # minimal dependency to make "make depend" optional editline.o editline.po editline.So editline.ln: \ common.h emacs.h fcns.c fcns.h help.c help.h vi.h tc1.o: ${.CURDIR}/TEST/tc1.c test: tc1.o libedit.a ${DPADD} ${LIBTERMCAP} ${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} .include Index: head/lib/libexecinfo/Makefile =================================================================== --- head/lib/libexecinfo/Makefile (revision 275023) +++ head/lib/libexecinfo/Makefile (revision 275024) @@ -1,23 +1,22 @@ # $FreeBSD$ LIBEXECINFO= ${.CURDIR}/../../contrib/libexecinfo LIB= execinfo SHLIB_MAJOR= 1 .PATH: ${LIBEXECINFO} INCS= execinfo.h SRCS= backtrace.c symtab.c unwind.c -DPADD= ${LIBELF} -LDADD= -lelf +LIBADD= elf MAN= backtrace.3 MLINKS+= backtrace.3 backtrace_symbols.3 MLINKS+= backtrace.3 backtrace_symbols_fmt.3 MLINKS+= backtrace.3 backtrace_symbols_fd.3 MLINKS+= backtrace.3 backtrace_symbols_fd_fmt.3 .include Index: head/lib/libfetch/Makefile =================================================================== --- head/lib/libfetch/Makefile (revision 275023) +++ head/lib/libfetch/Makefile (revision 275024) @@ -1,83 +1,81 @@ # $FreeBSD$ .include LIB= fetch CFLAGS+= -I. SRCS= fetch.c common.c ftp.c http.c file.c \ ftperr.h httperr.h INCS= fetch.h MAN= fetch.3 CLEANFILES= ftperr.h httperr.h .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_SSL -DPADD= ${LIBSSL} ${LIBCRYPTO} -LDADD= -lssl -lcrypto +LIBADD+= ssl crypto .else -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD+= md .endif CFLAGS+= -DFTP_COMBINE_CWDS CSTD?= c99 SHLIB_MAJOR= 6 ftperr.h: ftp.errors ${.CURDIR}/Makefile @echo "static struct fetcherr ftp_errlist[] = {" > ${.TARGET} @cat ${.CURDIR}/ftp.errors \ | grep -v ^# \ | sort \ | while read NUM CAT STRING; do \ echo " { $${NUM}, FETCH_$${CAT}, \"$${STRING}\" },"; \ done >> ${.TARGET} @echo " { -1, FETCH_UNKNOWN, \"Unknown FTP error\" }" >> ${.TARGET} @echo "};" >> ${.TARGET} httperr.h: http.errors ${.CURDIR}/Makefile @echo "static struct fetcherr http_errlist[] = {" > ${.TARGET} @cat ${.CURDIR}/http.errors \ | grep -v ^# \ | sort \ | while read NUM CAT STRING; do \ echo " { $${NUM}, FETCH_$${CAT}, \"$${STRING}\" },"; \ done >> ${.TARGET} @echo " { -1, FETCH_UNKNOWN, \"Unknown HTTP error\" }" >> ${.TARGET} @echo "};" >> ${.TARGET} MLINKS+= fetch.3 fetchFreeURL.3 MLINKS+= fetch.3 fetchGet.3 MLINKS+= fetch.3 fetchGetFTP.3 MLINKS+= fetch.3 fetchGetFile.3 MLINKS+= fetch.3 fetchGetHTTP.3 MLINKS+= fetch.3 fetchGetURL.3 MLINKS+= fetch.3 fetchList.3 MLINKS+= fetch.3 fetchListFTP.3 MLINKS+= fetch.3 fetchListFile.3 MLINKS+= fetch.3 fetchListHTTP.3 MLINKS+= fetch.3 fetchListURL.3 MLINKS+= fetch.3 fetchMakeURL.3 MLINKS+= fetch.3 fetchParseURL.3 MLINKS+= fetch.3 fetchPut.3 MLINKS+= fetch.3 fetchPutFTP.3 MLINKS+= fetch.3 fetchPutFile.3 MLINKS+= fetch.3 fetchPutHTTP.3 MLINKS+= fetch.3 fetchPutURL.3 MLINKS+= fetch.3 fetchStat.3 MLINKS+= fetch.3 fetchStatFTP.3 MLINKS+= fetch.3 fetchStatFile.3 MLINKS+= fetch.3 fetchStatHTTP.3 MLINKS+= fetch.3 fetchStatURL.3 MLINKS+= fetch.3 fetchXGet.3 MLINKS+= fetch.3 fetchXGetFTP.3 MLINKS+= fetch.3 fetchXGetFile.3 MLINKS+= fetch.3 fetchXGetHTTP.3 MLINKS+= fetch.3 fetchXGetURL.3 .include Index: head/lib/libgeom/Makefile =================================================================== --- head/lib/libgeom/Makefile (revision 275023) +++ head/lib/libgeom/Makefile (revision 275024) @@ -1,48 +1,47 @@ # $FreeBSD$ LIB= geom SHLIBDIR?= /lib SRCS+= geom_getxml.c SRCS+= geom_stats.c SRCS+= geom_xml2tree.c SRCS+= geom_ctl.c SRCS+= geom_util.c INCS= libgeom.h CFLAGS += -I${.CURDIR} WARNS?= 3 -DPADD= ${LIBBSDXML} ${LIBSBUF} -LDADD= -lbsdxml -lsbuf +LIBADD+= bsdxml sbuf MAN= libgeom.3 MLINKS+= \ libgeom.3 geom_stats_open.3 \ libgeom.3 geom_stats_close.3 \ libgeom.3 geom_stats_resync.3 \ libgeom.3 geom_stats_snapshot_get.3 \ libgeom.3 geom_stats_snapshot_free.3 \ libgeom.3 geom_stats_snapshot_timestamp.3 \ libgeom.3 geom_stats_snapshot_reset.3 \ libgeom.3 geom_stats_snapshot_next.3 \ libgeom.3 gctl_get_handle.3 \ libgeom.3 gctl_ro_param.3 \ libgeom.3 gctl_rw_param.3 \ libgeom.3 gctl_issue.3 \ libgeom.3 gctl_free.3 \ libgeom.3 gctl_dump.3 \ libgeom.3 g_close.3 \ libgeom.3 g_delete.3 \ libgeom.3 g_device_path.3 \ libgeom.3 g_flush.3 \ libgeom.3 g_get_ident.3 \ libgeom.3 g_get_name.3 \ libgeom.3 g_mediasize.3 \ libgeom.3 g_open.3 \ libgeom.3 g_open_by_ident.3 \ libgeom.3 g_providername.3 \ libgeom.3 g_sectorsize.3 .include Index: head/lib/libldns/Makefile =================================================================== --- head/lib/libldns/Makefile (revision 275023) +++ head/lib/libldns/Makefile (revision 275024) @@ -1,26 +1,25 @@ # $FreeBSD$ # Vendor sources and generated files LDNSDIR = ${.CURDIR}/../../contrib/ldns .PATH: ${LDNSDIR} ${LDNSDIR}/compat LIB= ldns PRIVATELIB= true CFLAGS+= -I${LDNSDIR} SRCS= buffer.c dane.c dname.c dnssec.c dnssec_sign.c dnssec_verify.c \ dnssec_zone.c duration.c error.c higher.c host2str.c host2wire.c \ keys.c net.c packet.c parse.c radix.c rbtree.c rdata.c resolver.c \ rr.c rr_functions.c sha1.c sha2.c str2host.c tsig.c update.c util.c \ wire2host.c zone.c SRCS+= b64_ntop.c b64_pton.c -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD= crypto WARNS ?= 3 .include Index: head/lib/libmagic/Makefile =================================================================== --- head/lib/libmagic/Makefile (revision 275023) +++ head/lib/libmagic/Makefile (revision 275024) @@ -1,57 +1,56 @@ # $FreeBSD$ # Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009 CONTRDIR= ${.CURDIR}/../../contrib/file .PATH: ${CONTRDIR}/src .PATH: ${CONTRDIR}/doc LIB= magic SHLIB_MAJOR= 4 -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \ encoding.c fsmagic.c funcs.c \ is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c INCS= magic.h MAGICPATH?= /usr/share/misc CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${CONTRDIR}/src WARNS?= 3 CLEANFILES+= magic magic.mgc FILES= magic magic.mgc FILESDIR= ${MAGICPATH} MAGFILES= ${CONTRDIR}/magic/Header \ ${CONTRDIR}/magic/Localstuff \ ${CONTRDIR}/magic/Magdir/[a-z]* magic: ${MAGFILES} cat ${.ALLSRC:O} > ${.TARGET} magic.mgc: mkmagic magic ./mkmagic magic CLEANFILES+= mkmagic build-tools: mkmagic mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} \ ${LDADD} FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ ${.CURDIR}/config.h CLEANFILES+= ${MAN} .for mp in ${MAN} ${mp}: ${mp:C/[0-9]/man/} sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \ -e 's/__VERSION__/${FILEVER}/g' \ -e 's,__MAGIC__,${MAGICPATH}/magic,g' ${.ALLSRC} > ${.TARGET} .endfor .include Index: head/lib/libmemstat/Makefile =================================================================== --- head/lib/libmemstat/Makefile (revision 275023) +++ head/lib/libmemstat/Makefile (revision 275024) @@ -1,30 +1,29 @@ # $FreeBSD$ WARNS?= 3 LIB= memstat SHLIB_MAJOR= 3 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD+= kvm SRCS+= memstat.c SRCS+= memstat_all.c SRCS+= memstat_malloc.c SRCS+= memstat_uma.c INCS= memstat.h MAN= libmemstat.3 MLINKS+= libmemstat.3 memstat_mtl_alloc.3 MLINKS+= libmemstat.3 memstat_mtl_first.3 MLINKS+= libmemstat.3 memstat_mtl_next.3 MLINKS+= libmemstat.3 memstat_mtl_find.3 MLINKS+= libmemstat.3 memstat_mtl_free.3 MLINKS+= libmemstat.3 memstat_mtl_geterror.3 MLINKS+= libmemstat.3 memstat_strerror.3 MLINKS+= libmemstat.3 memstat_sysctl_all.3 MLINKS+= libmemstat.3 memstat_sysctl_malloc.3 MLINKS+= libmemstat.3 memstat_sysctl_uma.3 MLINKS+= libmemstat.3 memstat_kvm_all.3 MLINKS+= libmemstat.3 memstat_kvm_malloc.3 MLINKS+= libmemstat.3 memstat_kvm_uma.3 .include Index: head/lib/libmp/Makefile =================================================================== --- head/lib/libmp/Makefile (revision 275023) +++ head/lib/libmp/Makefile (revision 275024) @@ -1,22 +1,21 @@ # $FreeBSD$ .include LIB= mp SHLIB_MAJOR= 7 -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto MAN= libmp.3 INCS= mp.h SRCS= mpasbn.c CFLAGS+= -I${.CURDIR}/../../crypto VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/lib/libmp/tests/Makefile =================================================================== --- head/lib/libmp/tests/Makefile (revision 275023) +++ head/lib/libmp/tests/Makefile (revision 275024) @@ -1,10 +1,9 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/lib/libmp TAP_TESTS_C+= legacy_test -DPADD+= ${LIBCRYPTO} ${LIBMP} -LDADD+= -lcrypto -lmp +LIBADD+= mp .include Index: head/lib/libnv/tests/Makefile =================================================================== --- head/lib/libnv/tests/Makefile (revision 275023) +++ head/lib/libnv/tests/Makefile (revision 275024) @@ -1,17 +1,16 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/lib/libnv TAP_TESTS_C+= nvlist_add_test TAP_TESTS_C+= nvlist_exists_test TAP_TESTS_C+= nvlist_free_test TAP_TESTS_C+= nvlist_get_test TAP_TESTS_C+= nvlist_move_test TAP_TESTS_C+= nvlist_send_recv_test -DPADD+= ${LIBNV} -LDADD+= -lnv +LIBADD+= nv WARNS?= 6 .include Index: head/lib/libopie/Makefile =================================================================== --- head/lib/libopie/Makefile (revision 275023) +++ head/lib/libopie/Makefile (revision 275024) @@ -1,37 +1,36 @@ # Makefile for libopie # # $FreeBSD$ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} SHLIB_MAJOR= 8 KEYFILE?= \"/etc/opiekeys\" .PATH: ${DIST_DIR} LIB= opie SRCS= atob8.c btoa8.c btoh.c challenge.c getsequence.c hash.c hashlen.c \ keycrunch.c lock.c lookup.c newseed.c parsechallenge.c passcheck.c \ passwd.c randomchallenge.c readpass.c unlock.c verify.c version.c \ btoe.c accessfile.c generator.c insecure.c getutmpentry.c \ readrec.c writerec.c open.c SRCS+= opieextra.c INCS= ${OPIE_DIST}/opie.h CFLAGS+=-I${.CURDIR} -I${OPIE_DIST} -I${DIST_DIR} \ -DKEY_FILE=${KEYFILE} ACCESSFILE?= \"/etc/opieaccess\" CFLAGS+= -DINSECURE_OVERRIDE -DPATH_ACCESS_FILE=${ACCESSFILE} WARNS?= 0 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md MAN= ${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5 MLINKS= opie.4 skey.4 .include Index: head/lib/libpam/modules/Makefile.inc =================================================================== --- head/lib/libpam/modules/Makefile.inc (revision 275023) +++ head/lib/libpam/modules/Makefile.inc (revision 275024) @@ -1,21 +1,20 @@ # $FreeBSD$ PAMDIR= ${.CURDIR}/../../../../contrib/openpam MK_INSTALLLIB= no MK_PROFILE= no CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam # This is nasty. # For the static case, libpam.a depends on the modules. # For the dynamic case, the modules depend on libpam.so.N .if defined(_NO_LIBPAM_SO_YET) NO_PIC= .else SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} -DPADD+= ${LIBPAM} -LDADD+= -lpam +LIBADD+= pam .endif .include "../Makefile.inc" Index: head/lib/libpam/modules/pam_krb5/Makefile =================================================================== --- head/lib/libpam/modules/pam_krb5/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_krb5/Makefile (revision 275024) @@ -1,38 +1,37 @@ # Copyright 2001 FreeBSD, Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ LIB= pam_krb5 SRCS= pam_krb5.c MAN= pam_krb5.8 .if defined(_FREEFALL_CONFIG) CFLAGS+=-D_FREEFALL_CONFIG WARNS?= 3 .endif -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} -LDADD= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto +LIBADD+= krb5 .include Index: head/lib/libpam/modules/pam_ksu/Makefile =================================================================== --- head/lib/libpam/modules/pam_ksu/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_ksu/Makefile (revision 275024) @@ -1,34 +1,33 @@ # Copyright 2002 FreeBSD, Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ LIB= pam_ksu SRCS= pam_ksu.c MAN= pam_ksu.8 -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} -LDADD= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto +LIBADD+= krb5 .include Index: head/lib/libpam/modules/pam_nologin/Makefile =================================================================== --- head/lib/libpam/modules/pam_nologin/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_nologin/Makefile (revision 275024) @@ -1,34 +1,33 @@ # Copyright 2001 Mark R V Murray # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ LIB= pam_nologin SRCS= pam_nologin.c MAN= pam_nologin.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD+= util .include Index: head/lib/libpam/modules/pam_opie/Makefile =================================================================== --- head/lib/libpam/modules/pam_opie/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_opie/Makefile (revision 275024) @@ -1,35 +1,34 @@ # Copyright 2000 James Bloom # All rights reserved. # Based upon code Copyright 1998 Juniper Networks, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ LIB= pam_opie SRCS= pam_opie.c MAN= pam_opie.8 -DPADD= ${LIBOPIE} -LDADD= -lopie +LIBADD+= opie .include Index: head/lib/libpam/modules/pam_opieaccess/Makefile =================================================================== --- head/lib/libpam/modules/pam_opieaccess/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_opieaccess/Makefile (revision 275024) @@ -1,10 +1,9 @@ # $FreeBSD$ LIB= pam_opieaccess SRCS= ${LIB}.c MAN= pam_opieaccess.8 -DPADD= ${LIBOPIE} -LDADD= -lopie +LIBADD+= opie .include Index: head/lib/libpam/modules/pam_passwdqc/Makefile =================================================================== --- head/lib/libpam/modules/pam_passwdqc/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_passwdqc/Makefile (revision 275024) @@ -1,17 +1,16 @@ # $FreeBSD$ SRCDIR= ${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc .PATH: ${SRCDIR} LIB= pam_passwdqc SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c MAN= pam_passwdqc.8 WARNS?= 2 CFLAGS+= -I${SRCDIR} -DPADD= ${LIBCRYPT} -LDADD= -lcrypt +LIBADD+= crypt .include Index: head/lib/libpam/modules/pam_radius/Makefile =================================================================== --- head/lib/libpam/modules/pam_radius/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_radius/Makefile (revision 275024) @@ -1,35 +1,34 @@ # Copyright 1998 Juniper Networks, Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ LIB= pam_radius SRCS= pam_radius.c MAN= pam_radius.8 WARNS?= 3 -DPADD= ${LIBRADIUS} -LDADD= -lradius +LIBADD+= radius .include Index: head/lib/libpam/modules/pam_ssh/Makefile =================================================================== --- head/lib/libpam/modules/pam_ssh/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_ssh/Makefile (revision 275024) @@ -1,24 +1,22 @@ # PAM module for SSH # $FreeBSD$ SSHDIR= ${.CURDIR}/../../../../crypto/openssh LIB= pam_ssh MAN= pam_ssh.8 SRCS= pam_ssh.c # required when linking with a dynamic libssh SRCS+= roaming_dummy.c WARNS?= 3 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h -DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} -LDADD= ${LDSSH} -lcrypto -lcrypt -USEPRIVATELIB= ssh +LIBADD= ssh .include .PATH: ${SSHDIR} ${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h Index: head/lib/libpam/modules/pam_tacplus/Makefile =================================================================== --- head/lib/libpam/modules/pam_tacplus/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_tacplus/Makefile (revision 275024) @@ -1,34 +1,33 @@ # Copyright 1998 Juniper Networks, Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ LIB= pam_tacplus SRCS= pam_tacplus.c MAN= pam_tacplus.8 -DPADD= ${LIBTACPLUS} -LDADD= -ltacplus +LIBADD+= tacplus .include Index: head/lib/libpam/modules/pam_unix/Makefile =================================================================== --- head/lib/libpam/modules/pam_unix/Makefile (revision 275023) +++ head/lib/libpam/modules/pam_unix/Makefile (revision 275024) @@ -1,53 +1,51 @@ # Copyright 1998 Juniper Networks, Inc. # All rights reserved. # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. # # Portions of this software was developed for the FreeBSD Project by # ThinkSec AS and NAI Labs, the Security Research Division of Network # Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 # ("CBOSS"), as part of the DARPA CHATS research program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # 3. The name of the author may not be used to endorse or promote # products derived from this software without specific prior written # permission. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ .include .include LIB= pam_unix SRCS= pam_unix.c MAN= pam_unix.8 -DPADD+= ${LIBUTIL} ${LIBCRYPT} -LDADD+= -lutil -lcrypt +LIBADD+= util crypt .if ${MK_NIS} != "no" CFLAGS+= -DYP -DPADD+= ${LIBYPCLNT} -LDADD+= -lypclnt +LIBADD+= ypclnt .endif .include Index: head/lib/libpjdlog/Makefile =================================================================== --- head/lib/libpjdlog/Makefile (revision 275023) +++ head/lib/libpjdlog/Makefile (revision 275024) @@ -1,21 +1,20 @@ # # $FreeBSD$ # SHLIBDIR?= /lib .include LIB= pjdlog SRCS= pjdlog.c SHLIB_MAJOR= 0 CFLAGS+=-I${.CURDIR} -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 6 .include Index: head/lib/libproc/Makefile =================================================================== --- head/lib/libproc/Makefile (revision 275023) +++ head/lib/libproc/Makefile (revision 275024) @@ -1,47 +1,44 @@ # $FreeBSD$ .include LIB= proc SRCS= proc_bkpt.c \ proc_create.c \ proc_regs.c \ proc_sym.c \ proc_rtld.c \ proc_util.c INCS= libproc.h CFLAGS+= -I${.CURDIR} .if ${MK_CXX} == "no" CFLAGS+= -DNO_CXA_DEMANGLE .elif ${MK_LIBCPLUSPLUS} != "no" -LDADD+= -lcxxrt -DPADD+= ${LIBCXXRT} +LIBADD+= cxxrt .else -LDADD+= -lsupc++ -DPADD+= ${LIBSTDCPLUSPLUS} +LIBADD+= supcplusplus .endif .if ${MK_CDDL} != "no" -LDADD+= -lctf -DPADD+= ${LIBCTF} +LIBADD+= ctf IGNORE_PRAGMA= YES CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \ -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../sys/cddl/compat/opensolaris .else CFLAGS+= -DNO_CTF .endif SHLIB_MAJOR= 3 MAN= .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/lib/libprocstat/Makefile =================================================================== --- head/lib/libprocstat/Makefile (revision 275023) +++ head/lib/libprocstat/Makefile (revision 275024) @@ -1,42 +1,41 @@ # $FreeBSD$ .include LIB= procstat SRCS= cd9660.c \ common_kvm.c \ core.c \ libprocstat.c \ msdosfs.c \ smbfs.c \ udf.c VERSION_DEF= ${.CURDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map INCS= libprocstat.h CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE SHLIB_MAJOR= 1 -DPADD= ${LIBELF} ${LIBKVM} ${LIBUTIL} -LDADD= -lelf -lkvm -lutil +LIBADD= elf kvm util MAN= libprocstat.3 # XXX This is a hack. .if ${MK_CDDL} != "no" CFLAGS+= -DLIBPROCSTAT_ZFS OBJS+= zfs/zfs.o SOBJS+= zfs/zfs.So POBJS+= zfs/zfs.po SUBDIR= zfs zfs/zfs.o: .PHONY @cd ${.CURDIR}/zfs && ${MAKE} zfs.o zfs/zfs.So: .PHONY @cd ${.CURDIR}/zfs && ${MAKE} zfs.So zfs/zfs.po: .PHONY @cd ${.CURDIR}/zfs && ${MAKE} zfs.po .endif .include Index: head/lib/libradius/Makefile =================================================================== --- head/lib/libradius/Makefile (revision 275023) +++ head/lib/libradius/Makefile (revision 275024) @@ -1,82 +1,80 @@ # Copyright 1998 Juniper Networks, Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ .include LIB= radius SRCS= radlib.c INCS= radlib.h radlib_vs.h CFLAGS+= -Wall SHLIB_MAJOR= 4 MAN= libradius.3 radius.conf.5 MLINKS+=libradius.3 rad_acct_open.3 \ libradius.3 rad_add_server.3 \ libradius.3 rad_add_server_ex.3 \ libradius.3 rad_auth_open.3 \ libradius.3 rad_bind_to.3 \ libradius.3 rad_close.3 \ libradius.3 rad_config.3 \ libradius.3 rad_continue_send_request.3 \ libradius.3 rad_create_request.3 \ libradius.3 rad_create_response.3 \ libradius.3 rad_cvt_addr.3 \ libradius.3 rad_cvt_int.3 \ libradius.3 rad_cvt_string.3 \ libradius.3 rad_demangle.3 \ libradius.3 rad_demangle_mppe_key.3 \ libradius.3 rad_get_attr.3 \ libradius.3 rad_get_vendor_attr.3 \ libradius.3 rad_init_send_request.3 \ libradius.3 rad_put_addr.3 \ libradius.3 rad_put_attr.3 \ libradius.3 rad_put_int.3 \ libradius.3 rad_put_message_authentic.3 \ libradius.3 rad_put_string.3 \ libradius.3 rad_put_vendor_addr.3 \ libradius.3 rad_put_vendor_attr.3 \ libradius.3 rad_put_vendor_int.3 \ libradius.3 rad_put_vendor_string.3 \ libradius.3 rad_receive_request.3 \ libradius.3 rad_request_authenticator.3 \ libradius.3 rad_send_request.3 \ libradius.3 rad_send_response.3 \ libradius.3 rad_server_open.3 \ libradius.3 rad_server_secret.3 \ libradius.3 rad_strerror.3 WARNS?= 3 -.if ${MK_OPENSSL} == "no" -DPADD= ${LIBMD} -LDADD= -lmd -.else -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +.if ${MK_OPENSSL} != "no" +LIBADD+= crypto CFLAGS+= -DWITH_SSL +.else +LIBADD+= md .endif .include Index: head/lib/librpcsec_gss/Makefile =================================================================== --- head/lib/librpcsec_gss/Makefile (revision 275023) +++ head/lib/librpcsec_gss/Makefile (revision 275024) @@ -1,38 +1,37 @@ # $FreeBSD$ LIB= rpcsec_gss SHLIB_MAJOR= 1 SRCS+= rpcsec_gss.c rpcsec_gss_prot.c rpcsec_gss_conf.c rpcsec_gss_misc.c \ svc_rpcsec_gss.c -DPADD+= ${LIBGSSAPI} -LDADD+= -lgssapi +LIBADD= gssapi VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map CFLAGS+= -I${.CURDIR}/../../include CFLAGS+= -I${.CURDIR}/../../libc_rpc MK_PROFILE= no MAN= rpcsec_gss.3 MAN+= rpc_gss_seccreate.3 MAN+= rpc_gss_set_defaults.3 MAN+= rpc_gss_max_data_length.3 MAN+= rpc_gss_get_error.3 MAN+= rpc_gss_mech_to_oid.3 MAN+= rpc_gss_oid_to_mech.3 MAN+= rpc_gss_qop_to_num.3 MAN+= rpc_gss_get_mechanisms.3 MAN+= rpc_gss_get_mech_info.3 MAN+= rpc_gss_get_versions.3 MAN+= rpc_gss_is_installed.3 MAN+= rpc_gss_set_svc_name.3 MAN+= rpc_gss_getcred.3 MAN+= rpc_gss_set_callback.3 MAN+= rpc_gss_get_principal_name.3 MAN+= rpc_gss_svc_max_data_length.3 .include Index: head/lib/librt/Makefile =================================================================== --- head/lib/librt/Makefile (revision 275023) +++ head/lib/librt/Makefile (revision 275024) @@ -1,25 +1,24 @@ # $FreeBSD$ .include LIB=rt SHLIB_MAJOR= 1 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR} .ifndef NO_THREAD_STACK_UNWIND CFLAGS+=-fexceptions .endif CFLAGS+=-Winline -Wall -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread WARNS?= 2 SRCS+= aio.c mq.c sigev_thread.c timer.c PRECIOUSLIB= VERSION_MAP= ${.CURDIR}/Version.map .include .include Index: head/lib/librt/tests/Makefile =================================================================== --- head/lib/librt/tests/Makefile (revision 275023) +++ head/lib/librt/tests/Makefile (revision 275024) @@ -1,17 +1,16 @@ # $FreeBSD$ OBJTOP= ${.OBJDIR:H:H:H} SRCTOP= ${.CURDIR:H:H:H} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/librt TESTSDIR= ${TESTSBASE}/lib/librt -DPADD+= ${LIBRT} -LDADD+= -lrt +LIBADD= rt NETBSD_ATF_TESTS_C= sched_test NETBSD_ATF_TESTS_C+= sem_test .include .include Index: head/lib/libsmb/Makefile =================================================================== --- head/lib/libsmb/Makefile (revision 275023) +++ head/lib/libsmb/Makefile (revision 275024) @@ -1,25 +1,24 @@ # $FreeBSD$ .include CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs .PATH: ${CONTRIBDIR}/lib/smb LIB= smb SHLIB_MAJOR= 4 -DPADD= ${LIBKICONV} -LDADD= -lkiconv +LIBADD= kiconv SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ print.c \ kiconv.c \ nb.c nb_name.c nb_net.c nbns_rq.c WARNS?= 1 CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include .if ${MK_ICONV} != "no" CFLAGS+= -DHAVE_ICONV=1 .endif .include Index: head/lib/libsqlite3/Makefile =================================================================== --- head/lib/libsqlite3/Makefile (revision 275023) +++ head/lib/libsqlite3/Makefile (revision 275024) @@ -1,38 +1,39 @@ # $FreeBSD$ PRIVATELIB= yes LIB= sqlite3 SHLIB_MAJOR?= 0 +LIBADD+= pthreads SRCS= sqlite3.c SQLITE= ${.CURDIR}/../../contrib/sqlite3 .PATH: ${SQLITE} WARNS= 3 CFLAGS+= -I${SQLITE} \ -DSTDC_HEADERS=1 \ -DHAVE_SYS_TYPES_H=1 \ -DHAVE_SYS_STAT_H=1 \ -DUSE_PREAD=1 \ -DHAVE_STDLIB_H=1 \ -DHAVE_STRING_H=1 \ -DHAVE_MEMORY_H=1 \ -DHAVE_STRINGS_H=1 \ -DHAVE_INTTYPES_H=1 \ -DHAVE_STDINT_H=1 \ -DHAVE_UNISTD_H=1 \ -DHAVE_DLFCN_H=1 \ -DHAVE_USLEEP=1 \ -DHAVE_LOCALTIME_R=1 \ -DHAVE_GMTIME_R=1 \ -DHAVE_DECL_STRERROR_R=1 \ -DHAVE_STRERROR_R=1 \ -DHAVE_POSIX_FALLOCATE=1 \ -D_REENTRANT=1 \ -DSQLITE_THREADSAFE=1 \ -DSQLITE_ENABLE_FTS3 \ -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_RTREE .include Index: head/lib/libstdthreads/Makefile =================================================================== --- head/lib/libstdthreads/Makefile (revision 275023) +++ head/lib/libstdthreads/Makefile (revision 275024) @@ -1,41 +1,40 @@ # $FreeBSD$ LIB= stdthreads SHLIB_MAJOR= 0 INCS= threads.h SRCS= threads.h call_once.c cnd.c mtx.c thrd.c tss.c MAN= thrd_create.3 MLINKS= thrd_create.3 call_once.3 \ thrd_create.3 cnd_broadcast.3 \ thrd_create.3 cnd_destroy.3 \ thrd_create.3 cnd_init.3 \ thrd_create.3 cnd_signal.3 \ thrd_create.3 cnd_timedwait.3 \ thrd_create.3 cnd_wait.3 \ thrd_create.3 mtx_destroy.3 \ thrd_create.3 mtx_init.3 \ thrd_create.3 mtx_lock.3 \ thrd_create.3 mtx_timedlock.3 \ thrd_create.3 mtx_trylock.3 \ thrd_create.3 mtx_unlock.3 \ thrd_create.3 thrd_current.3 \ thrd_create.3 thrd_detach.3 \ thrd_create.3 thrd_equal.3 \ thrd_create.3 thrd_exit.3 \ thrd_create.3 thrd_join.3 \ thrd_create.3 thrd_sleep.3 \ thrd_create.3 thrd_yield.3 \ thrd_create.3 tss_create.3 \ thrd_create.3 tss_delete.3 \ thrd_create.3 tss_get.3 \ thrd_create.3 tss_set.3 -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map .include Index: head/lib/libtacplus/Makefile =================================================================== --- head/lib/libtacplus/Makefile (revision 275023) +++ head/lib/libtacplus/Makefile (revision 275024) @@ -1,38 +1,37 @@ # Copyright (c) 1998, 2001, Juniper Networks, Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ LIB= tacplus SRCS= taclib.c INCS= taclib.h CFLAGS+= -Wall -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md SHLIB_MAJOR= 5 MAN= libtacplus.3 tacplus.conf.5 WARNS?= 2 .include Index: head/lib/libulog/Makefile =================================================================== --- head/lib/libulog/Makefile (revision 275023) +++ head/lib/libulog/Makefile (revision 275024) @@ -1,38 +1,37 @@ # $FreeBSD$ SHLIBDIR?=/lib .include LIB= ulog SHLIB_MAJOR= 0 INCS= ulog.h utempter.h SRCS= ulog.h ulog_login.c ulog_login_pseudo.c utempter.c MAN= ulog_login.3 utempter_add_record.3 MLINKS+=ulog_login.3 ulog_login_pseudo.3 \ ulog_login.3 ulog_logout.3 \ ulog_login.3 ulog_logout_pseudo.3 \ utempter_add_record.3 utempter_remove_added_record.3 \ utempter_add_record.3 utempter_remove_record.3 \ utempter_add_record.3 addToUtmp.3 \ utempter_remove_added_record.3 removeFromUtmp.3 \ utempter_remove_record.3 removeLineFromUtmp.3 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map .if ${MK_INSTALLLIB} != "no" SYMLINKS+=libulog.a ${LIBDIR}/libutempter.a .endif .if !defined(NO_PIC) SYMLINKS+=libulog.so ${LIBDIR}/libutempter.so .endif .if ${MK_PROFILE} != "no" SYMLINKS+=libulog_p.a ${LIBDIR}/libutempter_p.a .endif .include Index: head/lib/libunbound/Makefile =================================================================== --- head/lib/libunbound/Makefile (revision 275023) +++ head/lib/libunbound/Makefile (revision 275024) @@ -1,43 +1,42 @@ # $FreeBSD$ # Vendor sources and generated files LDNSDIR= ${.CURDIR}/../../contrib/ldns UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound # Hold my beer and watch this .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/iterator ${UNBOUNDDIR}/ldns ${UNBOUNDDIR}/libunbound ${UNBOUNDDIR}/services ${UNBOUNDDIR}/services/cache ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/data ${UNBOUNDDIR}/util/storage ${UNBOUNDDIR}/validator LIB= unbound PRIVATELIB= CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} SRCS= alloc.c autotrust.c config_file.c configlexer.l configparser.y \ context.c dname.c dns.c dnstree.c fptr_wlist.c infra.c \ iter_delegpt.c iter_donotq.c iter_fwd.c iter_hints.c iter_priv.c \ iter_resptype.c iter_scrub.c iter_utils.c iterator.c keyraw.c \ libunbound.c libworker.c listen_dnsport.c localzone.c locks.c log.c \ lookup3.c lruhash.c mesh.c mini_event.c modstack.c module.c \ msgencode.c msgparse.c msgreply.c net_help.c netevent.c \ outbound_list.c outside_network.c packed_rrset.c parse.c \ parseutil.c random.c rbtree.c regional.c rrdef.c rrset.c rtt.c \ sbuffer.c slabhash.c str2wire.c timehist.c tube.c val_anchor.c \ val_kcache.c val_kentry.c val_neg.c val_nsec.c val_nsec3.c \ val_secalgo.c val_sigcrypt.c val_utils.c validator.c \ winsock_event.c wire2str.c WARNS?= 3 -DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD+= -lssl -lcrypto -lpthread +LIBADD= ssl crypto pthread # Misnamed file in upstream source configlexer.l: configlexer.lex cp -fp ${.ALLSRC} ${.TARGET} CLEANFILES+= configlexer.l # Symbol prefix for lex and yacc LFLAGS= -Pub_c_ YFLAGS= -pub_c_ -d .include Index: head/lib/libusb/Makefile =================================================================== --- head/lib/libusb/Makefile (revision 275023) +++ head/lib/libusb/Makefile (revision 275024) @@ -1,262 +1,261 @@ # # $FreeBSD$ # # Makefile for the FreeBSD specific LibUSB 2.0 # LIB= usb SHLIB_MAJOR= 3 SHLIB_MINOR= 0 SRCS= libusb20.c SRCS+= libusb20_desc.c SRCS+= libusb20_ugen20.c INCS+= libusb20.h INCS+= libusb20_desc.h MAN= libusb.3 libusb20.3 MKLINT= no NOGCCERROR= PTHREAD_LIBS?= -lpthread WARNS?= 2 -DPADD= ${LIBPTHREAD} -LDADD= ${PTHREAD_LIBS} +LIBADD= pthread MLINKS+= libusb.3 usb.3 # libusb 0.1 compat INCS+= usb.h SRCS+= libusb01.c # libusb 1.0 compat INCS+= libusb.h SRCS+= libusb10.c SRCS+= libusb10_desc.c SRCS+= libusb10_io.c .if defined(COMPAT_32BIT) CFLAGS+= -DCOMPAT_32BIT .endif .ifndef COMPAT_32BIT beforeinstall: ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig .endif # # Cross platform support # # Examples: # make LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h # make COMPAT_32BIT=YES \ # LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h \ # DEBUG_FLAGS="-g" # # From Ubuntu 10.04: # freebsd-make LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h \ # PTHREAD_LIBS="-lpthread -lrt" # freebsd-make COMPAT32_BIT=YES \ # LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h \ # PTHREAD_LIBS="-lpthread -lrt" # # .if defined(LIBUSB_GLOBAL_INCLUDE_FILE) CFLAGS+= -DLIBUSB_GLOBAL_INCLUDE_FILE=\"${LIBUSB_GLOBAL_INCLUDE_FILE}\" CFLAGS+= -DUSB_GLOBAL_INCLUDE_FILE=\"${LIBUSB_GLOBAL_INCLUDE_FILE}\" CFLAGS+= -I ../../sys .endif .include # LibUSB v1.0 MLINKS += libusb.3 libusb_init.3 MLINKS += libusb.3 libusb_exit.3 MLINKS += libusb.3 libusb_strerror.3 MLINKS += libusb.3 libusb_error_name.3 MLINKS += libusb.3 libusb_set_debug.3 MLINKS += libusb.3 libusb_get_device_list.3 MLINKS += libusb.3 libusb_free_device_list.3 MLINKS += libusb.3 libusb_get_bus_number.3 MLINKS += libusb.3 libusb_get_device_address.3 MLINKS += libusb.3 libusb_get_device_speed.3 MLINKS += libusb.3 libusb_get_max_packet_size.3 MLINKS += libusb.3 libusb_get_max_iso_packet_size.3 MLINKS += libusb.3 libusb_ref_device.3 MLINKS += libusb.3 libusb_unref_device.3 MLINKS += libusb.3 libusb_open.3 MLINKS += libusb.3 libusb_open_device_with_vid_pid.3 MLINKS += libusb.3 libusb_close.3 MLINKS += libusb.3 libusb_get_device.3 MLINKS += libusb.3 libusb_get_configuration.3 MLINKS += libusb.3 libusb_set_configuration.3 MLINKS += libusb.3 libusb_claim_interface.3 MLINKS += libusb.3 libusb_release_interface.3 MLINKS += libusb.3 libusb_set_interface_alt_setting.3 MLINKS += libusb.3 libusb_clear_halt.3 MLINKS += libusb.3 libusb_reset_device.3 MLINKS += libusb.3 libusb_check_connected.3 MLINKS += libusb.3 libusb_kernel_driver_active.3 MLINKS += libusb.3 libusb_get_driver.3 MLINKS += libusb.3 libusb_get_driver_np.3 MLINKS += libusb.3 libusb_detach_kernel_driver.3 MLINKS += libusb.3 libusb_detach_kernel_driver_np.3 MLINKS += libusb.3 libusb_attach_kernel_driver.3 MLINKS += libusb.3 libusb_get_device_descriptor.3 MLINKS += libusb.3 libusb_get_active_config_descriptor.3 MLINKS += libusb.3 libusb_get_config_descriptor.3 MLINKS += libusb.3 libusb_get_config_descriptor_by_value.3 MLINKS += libusb.3 libusb_free_config_descriptor.3 MLINKS += libusb.3 libusb_get_string_descriptor.3 MLINKS += libusb.3 libusb_get_string_descriptor_ascii.3 MLINKS += libusb.3 libusb_parse_ss_endpoint_comp.3 MLINKS += libusb.3 libusb_free_ss_endpoint_comp.3 MLINKS += libusb.3 libusb_parse_bos_descriptor.3 MLINKS += libusb.3 libusb_free_bos_descriptor.3 MLINKS += libusb.3 libusb_alloc_transfer.3 MLINKS += libusb.3 libusb_free_transfer.3 MLINKS += libusb.3 libusb_submit_transfer.3 MLINKS += libusb.3 libusb_cancel_transfer.3 MLINKS += libusb.3 libusb_control_transfer.3 MLINKS += libusb.3 libusb_bulk_transfer.3 MLINKS += libusb.3 libusb_interrupt_transfer.3 MLINKS += libusb.3 libusb_try_lock_events.3 MLINKS += libusb.3 libusb_lock_events.3 MLINKS += libusb.3 libusb_unlock_events.3 MLINKS += libusb.3 libusb_event_handling_ok.3 MLINKS += libusb.3 libusb_event_handler_active.3 MLINKS += libusb.3 libusb_lock_event_waiters.3 MLINKS += libusb.3 libusb_unlock_event_waiters.3 MLINKS += libusb.3 libusb_wait_for_event.3 MLINKS += libusb.3 libusb_handle_events_timeout_completed.3 MLINKS += libusb.3 libusb_handle_events_completed.3 MLINKS += libusb.3 libusb_handle_events_timeout.3 MLINKS += libusb.3 libusb_handle_events.3 MLINKS += libusb.3 libusb_handle_events_locked.3 MLINKS += libusb.3 libusb_get_next_timeout.3 MLINKS += libusb.3 libusb_set_pollfd_notifiers.3 MLINKS += libusb.3 libusb_get_pollfds.3 # LibUSB v0.1 MLINKS += libusb.3 usb_open.3 MLINKS += libusb.3 usb_close.3 MLINKS += libusb.3 usb_get_string.3 MLINKS += libusb.3 usb_get_string_simple.3 MLINKS += libusb.3 usb_get_descriptor_by_endpoint.3 MLINKS += libusb.3 usb_get_descriptor.3 MLINKS += libusb.3 usb_parse_descriptor.3 MLINKS += libusb.3 usb_parse_configuration.3 MLINKS += libusb.3 usb_destroy_configuration.3 MLINKS += libusb.3 usb_fetch_and_parse_descriptors.3 MLINKS += libusb.3 usb_bulk_write.3 MLINKS += libusb.3 usb_bulk_read.3 MLINKS += libusb.3 usb_interrupt_write.3 MLINKS += libusb.3 usb_interrupt_read.3 MLINKS += libusb.3 usb_control_msg.3 MLINKS += libusb.3 usb_set_configuration.3 MLINKS += libusb.3 usb_claim_interface.3 MLINKS += libusb.3 usb_release_interface.3 MLINKS += libusb.3 usb_set_altinterface.3 MLINKS += libusb.3 usb_resetep.3 MLINKS += libusb.3 usb_clear_halt.3 MLINKS += libusb.3 usb_reset.3 MLINKS += libusb.3 usb_strerror.3 MLINKS += libusb.3 usb_init.3 MLINKS += libusb.3 usb_set_debug.3 MLINKS += libusb.3 usb_find_busses.3 MLINKS += libusb.3 usb_find_devices.3 MLINKS += libusb.3 usb_device.3 MLINKS += libusb.3 usb_get_busses.3 MLINKS += libusb.3 usb_check_connected.3 # LibUSB v2.0 MLINKS += libusb20.3 libusb20_tr_close.3 MLINKS += libusb20.3 libusb20_tr_open.3 MLINKS += libusb20.3 libusb20_tr_get_pointer.3 MLINKS += libusb20.3 libusb20_tr_get_time_complete.3 MLINKS += libusb20.3 libusb20_tr_get_actual_frames.3 MLINKS += libusb20.3 libusb20_tr_get_actual_length.3 MLINKS += libusb20.3 libusb20_tr_get_max_frames.3 MLINKS += libusb20.3 libusb20_tr_get_max_packet_length.3 MLINKS += libusb20.3 libusb20_tr_get_max_total_length.3 MLINKS += libusb20.3 libusb20_tr_get_status.3 MLINKS += libusb20.3 libusb20_tr_pending.3 MLINKS += libusb20.3 libusb20_tr_callback_wrapper.3 MLINKS += libusb20.3 libusb20_tr_clear_stall_sync.3 MLINKS += libusb20.3 libusb20_tr_drain.3 MLINKS += libusb20.3 libusb20_tr_set_buffer.3 MLINKS += libusb20.3 libusb20_tr_set_callback.3 MLINKS += libusb20.3 libusb20_tr_set_flags.3 MLINKS += libusb20.3 libusb20_tr_get_length.3 MLINKS += libusb20.3 libusb20_tr_set_length.3 MLINKS += libusb20.3 libusb20_tr_set_priv_sc0.3 MLINKS += libusb20.3 libusb20_tr_set_priv_sc1.3 MLINKS += libusb20.3 libusb20_tr_set_timeout.3 MLINKS += libusb20.3 libusb20_tr_set_total_frames.3 MLINKS += libusb20.3 libusb20_tr_setup_bulk.3 MLINKS += libusb20.3 libusb20_tr_setup_control.3 MLINKS += libusb20.3 libusb20_tr_setup_intr.3 MLINKS += libusb20.3 libusb20_tr_setup_isoc.3 MLINKS += libusb20.3 libusb20_tr_bulk_intr_sync.3 MLINKS += libusb20.3 libusb20_tr_start.3 MLINKS += libusb20.3 libusb20_tr_stop.3 MLINKS += libusb20.3 libusb20_tr_submit.3 MLINKS += libusb20.3 libusb20_tr_get_priv_sc0.3 MLINKS += libusb20.3 libusb20_tr_get_priv_sc1.3 MLINKS += libusb20.3 libusb20_dev_get_backend_name.3 MLINKS += libusb20.3 libusb20_dev_get_info.3 MLINKS += libusb20.3 libusb20_dev_get_iface_desc.3 MLINKS += libusb20.3 libusb20_dev_get_desc.3 MLINKS += libusb20.3 libusb20_dev_close.3 MLINKS += libusb20.3 libusb20_dev_detach_kernel_driver.3 MLINKS += libusb20.3 libusb20_dev_set_config_index.3 MLINKS += libusb20.3 libusb20_dev_get_debug.3 MLINKS += libusb20.3 libusb20_dev_get_fd.3 MLINKS += libusb20.3 libusb20_dev_kernel_driver_active.3 MLINKS += libusb20.3 libusb20_dev_open.3 MLINKS += libusb20.3 libusb20_dev_process.3 MLINKS += libusb20.3 libusb20_dev_request_sync.3 MLINKS += libusb20.3 libusb20_dev_req_string_sync.3 MLINKS += libusb20.3 libusb20_dev_req_string_simple_sync.3 MLINKS += libusb20.3 libusb20_dev_reset.3 MLINKS += libusb20.3 libusb20_dev_check_connected.3 MLINKS += libusb20.3 libusb20_dev_set_power_mode.3 MLINKS += libusb20.3 libusb20_dev_get_power_mode.3 MLINKS += libusb20.3 libusb20_dev_get_port_path.3 MLINKS += libusb20.3 libusb20_dev_get_power_usage.3 MLINKS += libusb20.3 libusb20_dev_set_alt_index.3 MLINKS += libusb20.3 libusb20_dev_get_device_desc.3 MLINKS += libusb20.3 libusb20_dev_alloc_config.3 MLINKS += libusb20.3 libusb20_dev_alloc.3 MLINKS += libusb20.3 libusb20_dev_get_address.3 MLINKS += libusb20.3 libusb20_dev_get_parent_address.3 MLINKS += libusb20.3 libusb20_dev_get_parent_port.3 MLINKS += libusb20.3 libusb20_dev_get_bus_number.3 MLINKS += libusb20.3 libusb20_dev_get_mode.3 MLINKS += libusb20.3 libusb20_dev_get_speed.3 MLINKS += libusb20.3 libusb20_dev_get_config_index.3 MLINKS += libusb20.3 libusb20_dev_free.3 MLINKS += libusb20.3 libusb20_dev_set_debug.3 MLINKS += libusb20.3 libusb20_dev_wait_process.3 MLINKS += libusb20.3 libusb20_be_get_template.3 MLINKS += libusb20.3 libusb20_be_set_template.3 MLINKS += libusb20.3 libusb20_be_get_dev_quirk.3 MLINKS += libusb20.3 libusb20_be_get_quirk_name.3 MLINKS += libusb20.3 libusb20_be_add_dev_quirk.3 MLINKS += libusb20.3 libusb20_be_remove_dev_quirk.3 MLINKS += libusb20.3 libusb20_be_alloc_default.3 MLINKS += libusb20.3 libusb20_be_device_foreach.3 MLINKS += libusb20.3 libusb20_be_dequeue_device.3 MLINKS += libusb20.3 libusb20_be_enqueue_device.3 MLINKS += libusb20.3 libusb20_be_free.3 MLINKS += libusb20.3 libusb20_me_get_1.3 MLINKS += libusb20.3 libusb20_me_get_2.3 MLINKS += libusb20.3 libusb20_me_encode.3 MLINKS += libusb20.3 libusb20_me_decode.3 MLINKS += libusb20.3 libusb20_desc_foreach.3 MLINKS += libusb20.3 libusb20_strerror.3 MLINKS += libusb20.3 libusb20_error_name.3 Index: head/lib/libutil/tests/Makefile =================================================================== --- head/lib/libutil/tests/Makefile (revision 275023) +++ head/lib/libutil/tests/Makefile (revision 275024) @@ -1,15 +1,14 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/lib/libutil TAP_TESTS_C+= flopen_test TAP_TESTS_C+= grp_test TAP_TESTS_C+= humanize_number_test TAP_TESTS_C+= pidfile_test TAP_TESTS_C+= trimdomain_test TAP_TESTS_C+= trimdomain-nodomain_test -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD+= util .include Index: head/lib/msun/tests/Makefile =================================================================== --- head/lib/msun/tests/Makefile (revision 275023) +++ head/lib/msun/tests/Makefile (revision 275024) @@ -1,63 +1,62 @@ # $FreeBSD$ OBJTOP= ${.OBJDIR:H:H:H} SRCTOP= ${.CURDIR:H:H:H} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libm TESTSDIR= ${TESTSBASE}/lib/msun .if ${MACHINE} == "sparc" || ${MACHINE} == "i386" \ || ${MACHINE} == "amd64" || ${MACHINE_CPU} == "arm" \ || ${MACHINE} == "sparc64" CFLAGS+= -DHAVE_FENV_H .endif .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" CFLAGS+= -D__HAVE_LONG_DOUBLE .endif NETBSD_ATF_TESTS_C= acos_test NETBSD_ATF_TESTS_C+= asin_test NETBSD_ATF_TESTS_C+= atan_test NETBSD_ATF_TESTS_C+= cbrt_test NETBSD_ATF_TESTS_C+= ceil_test NETBSD_ATF_TESTS_C+= cos_test NETBSD_ATF_TESTS_C+= cosh_test NETBSD_ATF_TESTS_C+= erf_test NETBSD_ATF_TESTS_C+= exp_test NETBSD_ATF_TESTS_C+= fmod_test NETBSD_ATF_TESTS_C+= infinity_test NETBSD_ATF_TESTS_C+= ldexp_test NETBSD_ATF_TESTS_C+= log_test NETBSD_ATF_TESTS_C+= pow_test NETBSD_ATF_TESTS_C+= precision_test NETBSD_ATF_TESTS_C+= round_test NETBSD_ATF_TESTS_C+= scalbn_test NETBSD_ATF_TESTS_C+= sin_test NETBSD_ATF_TESTS_C+= sinh_test NETBSD_ATF_TESTS_C+= sqrt_test NETBSD_ATF_TESTS_C+= tan_test NETBSD_ATF_TESTS_C+= tanh_test CSTD= c99 -LDADD+= -lm -DPADD+= ${LIBM} +LIBADD+= m #COPTS+= -Wfloat-equal # Copied from lib/msun/Makefile .if ${MACHINE_CPUARCH} == "i386" ARCH_SUBDIR= i387 .else ARCH_SUBDIR= ${MACHINE_CPUARCH} .endif .include "../${ARCH_SUBDIR}/Makefile.inc" # XXX: for some odd reason float.h doesn't tell the full story about what the # precision is. CFLAGS+= -DLDBL_PREC=${LDBL_PREC} .include .include Index: head/lib/ncurses/form/Makefile =================================================================== --- head/lib/ncurses/form/Makefile (revision 275023) +++ head/lib/ncurses/form/Makefile (revision 275024) @@ -1,169 +1,168 @@ # $FreeBSD$ .include "${.CURDIR}/../config.mk" SRCDIR= ${NCURSES_DIR}/form LIB= form${LIB_SUFFIX} .PATH: ${SRCDIR} SRCS= \ ncurses_def.h \ fld_arg.c \ fld_attr.c \ fld_current.c \ fld_def.c \ fld_dup.c \ fld_ftchoice.c \ fld_ftlink.c \ fld_info.c \ fld_just.c \ fld_link.c \ fld_max.c \ fld_move.c \ fld_newftyp.c \ fld_opts.c \ fld_pad.c \ fld_page.c \ fld_stat.c \ fld_type.c \ fld_user.c \ frm_cursor.c \ frm_data.c \ frm_def.c \ frm_driver.c \ frm_hook.c \ frm_opts.c \ frm_page.c \ frm_post.c \ frm_req_name.c \ frm_scale.c \ frm_sub.c \ frm_user.c \ frm_win.c \ fty_alnum.c \ fty_alpha.c \ fty_enum.c \ fty_int.c \ fty_ipv4.c \ fty_num.c \ fty_regex.c CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} CFLAGS+= -I${NCURSES_DIR}/menu -DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} -LDADD= -lncurses${LIB_SUFFIX} +LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= form.h .PATH: ${NCURSES_DIR}/man MAN= \ form.3 \ form_cursor.3 \ form_data.3 \ form_driver.3 \ form_field.3 \ form_field_attributes.3 \ form_field_buffer.3 \ form_field_info.3 \ form_field_just.3 \ form_field_new.3 \ form_field_opts.3 \ form_field_userptr.3 \ form_field_validation.3 \ form_fieldtype.3 \ form_hook.3 \ form_new.3 \ form_new_page.3 \ form_opts.3 \ form_page.3 \ form_post.3 \ form_requestname.3 \ form_userptr.3 \ form_variables.3 \ form_win.3 CLEANFILES+= ${MAN:M*.3} MLINKS= form_cursor.3 pos_form_cursor.3 \ form_data.3 data_ahead.3 \ form_data.3 data_behind.3 \ form_field.3 field_count.3 \ form_field.3 form_fields.3 \ form_field.3 move_field.3 \ form_field.3 set_form_fields.3 \ form_field_attributes.3 field_back.3 \ form_field_attributes.3 field_fore.3 \ form_field_attributes.3 field_pad.3 \ form_field_attributes.3 set_field_back.3 \ form_field_attributes.3 set_field_fore.3 \ form_field_attributes.3 set_field_pad.3 \ form_field_buffer.3 field_buffer.3 \ form_field_buffer.3 field_status.3 \ form_field_buffer.3 set_field_buffer.3 \ form_field_buffer.3 set_field_status.3 \ form_field_buffer.3 set_max_field.3 \ form_field_info.3 dynamic_fieldinfo.3 \ form_field_info.3 field_info.3 \ form_field_just.3 field_just.3 \ form_field_just.3 set_field_just.3 \ form_field_new.3 dup_field.3 \ form_field_new.3 free_field.3 \ form_field_new.3 link_field.3 \ form_field_new.3 new_field.3 \ form_field_opts.3 field_opts.3 \ form_field_opts.3 field_opts_off.3 \ form_field_opts.3 field_opts_on.3 \ form_field_opts.3 set_field_opts.3 \ form_field_userptr.3 field_userptr.3 \ form_field_userptr.3 set_field_userptr.3 \ form_field_validation.3 field_arg.3 \ form_field_validation.3 field_type.3 \ form_field_validation.3 set_field_type.3 \ form_fieldtype.3 free_fieldtype.3 \ form_fieldtype.3 link_fieldtype.3 \ form_fieldtype.3 new_fieldtype.3 \ form_fieldtype.3 set_fieldtype_arg.3 \ form_fieldtype.3 set_fieldtype_choice.3 \ form_hook.3 field_init.3 \ form_hook.3 field_term.3 \ form_hook.3 form_init.3 \ form_hook.3 form_term.3 \ form_hook.3 set_field_init.3 \ form_hook.3 set_field_term.3 \ form_hook.3 set_form_init.3 \ form_hook.3 set_form_term.3 \ form_new.3 free_form.3 \ form_new.3 new_form.3 \ form_new_page.3 new_page.3 \ form_new_page.3 set_new_page.3 \ form_opts.3 form_opts_off.3 \ form_opts.3 form_opts_on.3 \ form_opts.3 set_form_opts.3 \ form_page.3 current_field.3 \ form_page.3 field_index.3 \ form_page.3 set_current_field.3 \ form_page.3 set_form_page.3 \ form_post.3 post_form.3 \ form_post.3 unpost_form.3 \ form_requestname.3 form_request_by_name.3 \ form_requestname.3 form_request_name.3 \ form_userptr.3 set_form_userptr.3 \ form_win.3 form_sub.3 \ form_win.3 scale_form.3 \ form_win.3 set_form_sub.3 \ form_win.3 set_form_win.3 .else MAN= .endif .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .3 .3x .3x.3: cat ${.IMPSRC} > ${.TARGET} Index: head/lib/ncurses/menu/Makefile =================================================================== --- head/lib/ncurses/menu/Makefile (revision 275023) +++ head/lib/ncurses/menu/Makefile (revision 275024) @@ -1,141 +1,140 @@ # $FreeBSD$ .include "${.CURDIR}/../config.mk" SRCDIR= ${NCURSES_DIR}/menu LIB= menu${LIB_SUFFIX} .PATH: ${SRCDIR} SRCS= \ ncurses_def.h \ m_attribs.c \ m_cursor.c \ m_driver.c \ m_format.c \ m_global.c \ m_hook.c \ m_item_cur.c \ m_item_nam.c \ m_item_new.c \ m_item_opt.c \ m_item_top.c \ m_item_use.c \ m_item_val.c \ m_item_vis.c \ m_items.c \ m_new.c \ m_opts.c \ m_pad.c \ m_pattern.c \ m_post.c \ m_req_name.c \ m_scale.c \ m_spacing.c \ m_sub.c \ m_userptr.c \ m_win.c CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} -DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} -LDADD= -lncurses${LIB_SUFFIX} +LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= menu.h eti.h .PATH: ${NCURSES_DIR}/man MAN= \ menu.3 \ menu_attributes.3 \ menu_cursor.3 \ menu_driver.3 \ menu_format.3 \ menu_hook.3 \ menu_items.3 \ menu_mark.3 \ menu_new.3 \ menu_opts.3 \ menu_pattern.3 \ menu_post.3 \ menu_requestname.3 \ menu_spacing.3 \ menu_userptr.3 \ menu_win.3 \ mitem_current.3 \ mitem_name.3 \ mitem_new.3 \ mitem_opts.3 \ mitem_userptr.3 \ mitem_value.3 \ mitem_visible.3 CLEANFILES+= ${MAN:M*.3} MLINKS= menu_attributes.3 menu_back.3 \ menu_attributes.3 menu_fore.3 \ menu_attributes.3 menu_grey.3 \ menu_attributes.3 menu_pad.3 \ menu_attributes.3 set_menu_back.3 \ menu_attributes.3 set_menu_fore.3 \ menu_attributes.3 set_menu_grey.3 \ menu_attributes.3 set_menu_pad.3 \ menu_cursor.3 pos_menu_cursor.3 \ menu_format.3 set_menu_format.3 \ menu_hook.3 item_init.3 \ menu_hook.3 item_term.3 \ menu_hook.3 menu_init.3 \ menu_hook.3 menu_term.3 \ menu_hook.3 set_item_init.3 \ menu_hook.3 set_item_term.3 \ menu_hook.3 set_menu_init.3 \ menu_hook.3 set_menu_term.3 \ menu_items.3 item_count.3 \ menu_items.3 set_menu_items.3 \ menu_mark.3 set_menu_mark.3 \ menu_new.3 free_menu.3 \ menu_new.3 new_menu.3 \ menu_opts.3 menu_opts_off.3 \ menu_opts.3 menu_opts_on.3 \ menu_opts.3 set_menu_opts.3 \ menu_pattern.3 set_menu_pattern.3 \ menu_post.3 post_menu.3 \ menu_post.3 unpost_menu.3 \ menu_requestname.3 menu_request_by_name.3 \ menu_requestname.3 menu_request_name.3 \ menu_spacing.3 set_menu_spacing.3 \ menu_userptr.3 set_menu_userptr.3 \ menu_win.3 menu_sub.3 \ menu_win.3 scale_menu.3 \ menu_win.3 set_menu_sub.3 \ menu_win.3 set_menu_win.3 \ mitem_current.3 current_item.3 \ mitem_current.3 item_index.3 \ mitem_current.3 set_current_item.3 \ mitem_current.3 set_top_row.3 \ mitem_current.3 top_row.3 \ mitem_name.3 item_description.3 \ mitem_name.3 item_name.3 \ mitem_new.3 free_item.3 \ mitem_new.3 new_item.3 \ mitem_opts.3 item_opts.3 \ mitem_opts.3 item_opts_off.3 \ mitem_opts.3 item_opts_on.3 \ mitem_opts.3 set_item_opts.3 \ mitem_userptr.3 item_userptr.3 \ mitem_userptr.3 set_item_userptr.3 \ mitem_value.3 item_value.3 \ mitem_value.3 set_item_value.3 \ mitem_visible.3 item_visible.3 .else MAN= .endif .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .3 .3x .3x.3: cat ${.IMPSRC} > ${.TARGET} Index: head/lib/ncurses/panel/Makefile =================================================================== --- head/lib/ncurses/panel/Makefile (revision 275023) +++ head/lib/ncurses/panel/Makefile (revision 275024) @@ -1,69 +1,68 @@ # $FreeBSD$ .include "${.CURDIR}/../config.mk" SRCDIR= ${NCURSES_DIR}/panel LIB= panel${LIB_SUFFIX} .PATH: ${SRCDIR} SRCS= \ ncurses_def.h \ p_above.c \ p_below.c \ p_bottom.c \ p_delete.c \ p_hidden.c \ p_hide.c \ p_move.c \ p_new.c \ p_replace.c \ p_show.c \ p_top.c \ p_update.c \ p_user.c \ p_win.c \ panel.c CLEANFILES= ncurses_def.h CFLAGS+= -I${SRCDIR} -DPADD= ${LIBNCURSES${LIB_SUFFIX:tu}} -LDADD= -lncurses${LIB_SUFFIX} +LIBADD+= ncurses${LIB_SUFFIX} .if defined(ENABLE_WIDEC) INCS= panel.h # generate MAN .PATH: ${NCURSES_DIR}/man MAN= \ panel.3 CLEANFILES+= ${MAN:M*.3} MLINKS= panel.3 bottom_panel.3 \ panel.3 del_panel.3 \ panel.3 hide_panel.3 \ panel.3 move_panel.3 \ panel.3 new_panel.3 \ panel.3 panel_above.3 \ panel.3 panel_below.3 \ panel.3 panel_hidden.3 \ panel.3 panel_userptr.3 \ panel.3 panel_window.3 \ panel.3 replace_panel.3 \ panel.3 set_panel_userptr.3 \ panel.3 show_panel.3 \ panel.3 top_panel.3 \ panel.3 update_panels.3 .else MAN= .endif .include # Keep the .SUFFIXES line after the include of bsd.lib.mk .SUFFIXES: .3 .3x .3x.3: cat ${.IMPSRC} > ${.TARGET}