svn commit: r275078 - in projects/clang350-import: . bin/csh bin/df bin/ed bin/ls bin/pkill bin/ps bin/rmail bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/mdocml contrib/netbsd-tests...

Tue Nov 25 21:43:22 UTC 2014

Author: dim
Date: Tue Nov 25 21:43:01 2014
New Revision: 275078
URL: https://svnweb.freebsd.org/changeset/base/275078

Log:
  r274961 through r275075

Added:
  projects/clang350-import/lib/libgpio/
     - copied from r275077, head/lib/libgpio/
  projects/clang350-import/sys/dev/beri/virtio/virtio.c
     - copied unchanged from r275077, head/sys/dev/beri/virtio/virtio.c
  projects/clang350-import/sys/dev/beri/virtio/virtio.h
     - copied unchanged from r275077, head/sys/dev/beri/virtio/virtio.h
  projects/clang350-import/sys/dev/beri/virtio/virtio_block.c
     - copied unchanged from r275077, head/sys/dev/beri/virtio/virtio_block.c
  projects/clang350-import/sys/mips/conf/WZR-HPAG300H
     - copied unchanged from r275077, head/sys/mips/conf/WZR-HPAG300H
  projects/clang350-import/sys/mips/conf/WZR-HPAG300H.hints
     - copied unchanged from r275077, head/sys/mips/conf/WZR-HPAG300H.hints
Deleted:
  projects/clang350-import/usr.sbin/cron/Makefile.inc
  projects/clang350-import/usr.sbin/fifolog/Makefile.inc
Modified:
  projects/clang350-import/MAINTAINERS   (contents, props changed)
  projects/clang350-import/bin/csh/Makefile
  projects/clang350-import/bin/df/Makefile
  projects/clang350-import/bin/ed/Makefile
  projects/clang350-import/bin/ls/Makefile
  projects/clang350-import/bin/pkill/Makefile
  projects/clang350-import/bin/ps/Makefile
  projects/clang350-import/bin/rmail/Makefile
  projects/clang350-import/bin/sh/Makefile
  projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
  projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
  projects/clang350-import/contrib/mdocml/lib.in
  projects/clang350-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
  projects/clang350-import/gnu/lib/libdialog/Makefile
  projects/clang350-import/gnu/lib/libgcc/Makefile
  projects/clang350-import/gnu/lib/libreadline/readline/Makefile
  projects/clang350-import/gnu/lib/libstdc++/Makefile
  projects/clang350-import/gnu/usr.bin/dialog/Makefile
  projects/clang350-import/gnu/usr.bin/diff/Makefile
  projects/clang350-import/gnu/usr.bin/gdb/gdb/Makefile
  projects/clang350-import/gnu/usr.bin/gdb/gdbtui/Makefile
  projects/clang350-import/gnu/usr.bin/gdb/kgdb/Makefile
  projects/clang350-import/gnu/usr.bin/grep/Makefile
  projects/clang350-import/kerberos5/Makefile.inc
  projects/clang350-import/kerberos5/lib/libasn1/Makefile
  projects/clang350-import/kerberos5/lib/libgssapi_krb5/Makefile
  projects/clang350-import/kerberos5/lib/libgssapi_ntlm/Makefile
  projects/clang350-import/kerberos5/lib/libgssapi_spnego/Makefile
  projects/clang350-import/kerberos5/lib/libhdb/Makefile
  projects/clang350-import/kerberos5/lib/libheimbase/Makefile
  projects/clang350-import/kerberos5/lib/libheimipcc/Makefile
  projects/clang350-import/kerberos5/lib/libheimipcs/Makefile
  projects/clang350-import/kerberos5/lib/libheimntlm/Makefile
  projects/clang350-import/kerberos5/lib/libheimsqlite/Makefile
  projects/clang350-import/kerberos5/lib/libhx509/Makefile
  projects/clang350-import/kerberos5/lib/libkadm5clnt/Makefile
  projects/clang350-import/kerberos5/lib/libkadm5srv/Makefile
  projects/clang350-import/kerberos5/lib/libkafs5/Makefile
  projects/clang350-import/kerberos5/lib/libkdc/Makefile
  projects/clang350-import/kerberos5/lib/libkrb5/Makefile
  projects/clang350-import/kerberos5/lib/libroken/Makefile
  projects/clang350-import/kerberos5/lib/libwind/Makefile
  projects/clang350-import/kerberos5/libexec/digest-service/Makefile
  projects/clang350-import/kerberos5/libexec/hprop/Makefile
  projects/clang350-import/kerberos5/libexec/hpropd/Makefile
  projects/clang350-import/kerberos5/libexec/ipropd-master/Makefile
  projects/clang350-import/kerberos5/libexec/ipropd-slave/Makefile
  projects/clang350-import/kerberos5/libexec/kadmind/Makefile
  projects/clang350-import/kerberos5/libexec/kcm/Makefile
  projects/clang350-import/kerberos5/libexec/kdc/Makefile
  projects/clang350-import/kerberos5/libexec/kdigest/Makefile
  projects/clang350-import/kerberos5/libexec/kfd/Makefile
  projects/clang350-import/kerberos5/libexec/kimpersonate/Makefile
  projects/clang350-import/kerberos5/libexec/kpasswdd/Makefile
  projects/clang350-import/kerberos5/tools/asn1_compile/Makefile
  projects/clang350-import/kerberos5/tools/slc/Makefile
  projects/clang350-import/kerberos5/usr.bin/hxtool/Makefile
  projects/clang350-import/kerberos5/usr.bin/kadmin/Makefile
  projects/clang350-import/kerberos5/usr.bin/kcc/Makefile
  projects/clang350-import/kerberos5/usr.bin/kdestroy/Makefile
  projects/clang350-import/kerberos5/usr.bin/kf/Makefile
  projects/clang350-import/kerberos5/usr.bin/kgetcred/Makefile
  projects/clang350-import/kerberos5/usr.bin/kinit/Makefile
  projects/clang350-import/kerberos5/usr.bin/kpasswd/Makefile
  projects/clang350-import/kerberos5/usr.bin/ksu/Makefile
  projects/clang350-import/kerberos5/usr.bin/string2key/Makefile
  projects/clang350-import/kerberos5/usr.bin/verify_krb5_conf/Makefile
  projects/clang350-import/kerberos5/usr.sbin/iprop-log/Makefile
  projects/clang350-import/kerberos5/usr.sbin/kstash/Makefile
  projects/clang350-import/kerberos5/usr.sbin/ktutil/Makefile
  projects/clang350-import/lib/Makefile
  projects/clang350-import/lib/atf/libatf-c++/Makefile
  projects/clang350-import/lib/libarchive/Makefile
  projects/clang350-import/lib/libarchive/test/Makefile
  projects/clang350-import/lib/libbsnmp/libbsnmp/Makefile
  projects/clang350-import/lib/libc++/Makefile
  projects/clang350-import/lib/libc/Makefile
  projects/clang350-import/lib/libc/gen/errlst.c
  projects/clang350-import/lib/libc/gen/isnan.c
  projects/clang350-import/lib/libc/gen/syslog.c
  projects/clang350-import/lib/libc/gen/tls.c
  projects/clang350-import/lib/libc/include/errlst.h
  projects/clang350-import/lib/libc/net/base64.c
  projects/clang350-import/lib/libc/net/getifaddrs.3
  projects/clang350-import/lib/libc/net/nsdispatch.c
  projects/clang350-import/lib/libc/sys/stack_protector.c
  projects/clang350-import/lib/libc/sys/stack_protector_compat.c
  projects/clang350-import/lib/libcam/Makefile
  projects/clang350-import/lib/libcapsicum/Makefile
  projects/clang350-import/lib/libcasper/Makefile
  projects/clang350-import/lib/libcrypt/tests/Makefile
  projects/clang350-import/lib/libcuse/Makefile
  projects/clang350-import/lib/libdevstat/Makefile
  projects/clang350-import/lib/libdpv/Makefile
  projects/clang350-import/lib/libdwarf/Makefile
  projects/clang350-import/lib/libedit/Makefile
  projects/clang350-import/lib/libexecinfo/Makefile
  projects/clang350-import/lib/libfetch/Makefile
  projects/clang350-import/lib/libgeom/Makefile
  projects/clang350-import/lib/libjail/jail.c
  projects/clang350-import/lib/libjail/jail_getid.c
  projects/clang350-import/lib/libkiconv/quirks.c
  projects/clang350-import/lib/libkiconv/xlat16_iconv.c
  projects/clang350-import/lib/libkiconv/xlat16_sysctl.c
  projects/clang350-import/lib/libldns/Makefile
  projects/clang350-import/lib/libmagic/Makefile
  projects/clang350-import/lib/libmd/rmd160c.c
  projects/clang350-import/lib/libmd/sha1c.c
  projects/clang350-import/lib/libmemstat/Makefile
  projects/clang350-import/lib/libmp/Makefile
  projects/clang350-import/lib/libmp/tests/Makefile
  projects/clang350-import/lib/libnv/tests/Makefile
  projects/clang350-import/lib/libopie/Makefile
  projects/clang350-import/lib/libpam/modules/Makefile.inc
  projects/clang350-import/lib/libpam/modules/pam_krb5/Makefile
  projects/clang350-import/lib/libpam/modules/pam_ksu/Makefile
  projects/clang350-import/lib/libpam/modules/pam_nologin/Makefile
  projects/clang350-import/lib/libpam/modules/pam_opie/Makefile
  projects/clang350-import/lib/libpam/modules/pam_opieaccess/Makefile
  projects/clang350-import/lib/libpam/modules/pam_passwdqc/Makefile
  projects/clang350-import/lib/libpam/modules/pam_radius/Makefile
  projects/clang350-import/lib/libpam/modules/pam_ssh/Makefile
  projects/clang350-import/lib/libpam/modules/pam_tacplus/Makefile
  projects/clang350-import/lib/libpam/modules/pam_unix/Makefile
  projects/clang350-import/lib/libpjdlog/Makefile
  projects/clang350-import/lib/libproc/Makefile
  projects/clang350-import/lib/libprocstat/Makefile
  projects/clang350-import/lib/libradius/Makefile
  projects/clang350-import/lib/librpcsec_gss/Makefile
  projects/clang350-import/lib/librt/Makefile
  projects/clang350-import/lib/librt/tests/Makefile
  projects/clang350-import/lib/libsmb/Makefile
  projects/clang350-import/lib/libsqlite3/Makefile
  projects/clang350-import/lib/libstdthreads/Makefile
  projects/clang350-import/lib/libtacplus/Makefile
  projects/clang350-import/lib/libthr/thread/thr_exit.c
  projects/clang350-import/lib/libthr/thread/thr_private.h
  projects/clang350-import/lib/libulog/Makefile
  projects/clang350-import/lib/libunbound/Makefile
  projects/clang350-import/lib/libusb/Makefile
  projects/clang350-import/lib/libutil/tests/Makefile
  projects/clang350-import/lib/msun/src/s_isnan.c
  projects/clang350-import/lib/msun/tests/Makefile
  projects/clang350-import/lib/ncurses/form/Makefile
  projects/clang350-import/lib/ncurses/menu/Makefile
  projects/clang350-import/lib/ncurses/panel/Makefile
  projects/clang350-import/libexec/atf/atf-check/Makefile
  projects/clang350-import/libexec/atf/atf-sh/Makefile
  projects/clang350-import/libexec/atrun/Makefile
  projects/clang350-import/libexec/casper/dns/Makefile
  projects/clang350-import/libexec/casper/grp/Makefile
  projects/clang350-import/libexec/casper/pwd/Makefile
  projects/clang350-import/libexec/casper/random/Makefile
  projects/clang350-import/libexec/casper/sysctl/Makefile
  projects/clang350-import/libexec/dma/Makefile
  projects/clang350-import/libexec/fingerd/Makefile
  projects/clang350-import/libexec/ftpd/Makefile
  projects/clang350-import/libexec/getty/Makefile
  projects/clang350-import/libexec/mail.local/Makefile
  projects/clang350-import/libexec/pppoed/Makefile
  projects/clang350-import/libexec/rlogind/Makefile
  projects/clang350-import/libexec/rpc.rquotad/Makefile
  projects/clang350-import/libexec/rpc.rstatd/Makefile
  projects/clang350-import/libexec/rpc.rusersd/Makefile
  projects/clang350-import/libexec/rpc.rwalld/Makefile
  projects/clang350-import/libexec/rpc.sprayd/Makefile
  projects/clang350-import/libexec/rshd/Makefile
  projects/clang350-import/libexec/rtld-elf/Makefile
  projects/clang350-import/libexec/rtld-elf/rtld.c
  projects/clang350-import/libexec/smrsh/Makefile
  projects/clang350-import/libexec/tcpd/Makefile
  projects/clang350-import/libexec/telnetd/Makefile
  projects/clang350-import/libexec/tftpd/Makefile
  projects/clang350-import/libexec/ulog-helper/Makefile
  projects/clang350-import/libexec/ypxfr/Makefile
  projects/clang350-import/sbin/atm/atmconfig/Makefile
  projects/clang350-import/sbin/badsect/Makefile
  projects/clang350-import/sbin/bsdlabel/Makefile
  projects/clang350-import/sbin/camcontrol/Makefile
  projects/clang350-import/sbin/casperd/Makefile
  projects/clang350-import/sbin/ccdconfig/Makefile
  projects/clang350-import/sbin/ddb/Makefile
  projects/clang350-import/sbin/devd/Makefile
  projects/clang350-import/sbin/dhclient/Makefile
  projects/clang350-import/sbin/dmesg/Makefile
  projects/clang350-import/sbin/dumpfs/Makefile
  projects/clang350-import/sbin/fdisk/Makefile
  projects/clang350-import/sbin/fdisk_pc98/Makefile
  projects/clang350-import/sbin/ffsinfo/Makefile
  projects/clang350-import/sbin/fsck_ffs/Makefile
  projects/clang350-import/sbin/fsck_ffs/dir.c
  projects/clang350-import/sbin/fsdb/Makefile
  projects/clang350-import/sbin/gbde/Makefile
  projects/clang350-import/sbin/geom/Makefile
  projects/clang350-import/sbin/geom/class/eli/Makefile
  projects/clang350-import/sbin/geom/class/journal/Makefile
  projects/clang350-import/sbin/geom/class/mirror/Makefile
  projects/clang350-import/sbin/geom/class/part/Makefile
  projects/clang350-import/sbin/geom/class/raid/Makefile
  projects/clang350-import/sbin/geom/class/raid3/Makefile
  projects/clang350-import/sbin/geom/core/Makefile
  projects/clang350-import/sbin/ggate/ggatec/Makefile
  projects/clang350-import/sbin/ggate/ggated/Makefile
  projects/clang350-import/sbin/ggate/ggatel/Makefile
  projects/clang350-import/sbin/growfs/Makefile
  projects/clang350-import/sbin/gvinum/Makefile
  projects/clang350-import/sbin/hastctl/Makefile
  projects/clang350-import/sbin/hastd/Makefile
  projects/clang350-import/sbin/ifconfig/Makefile
  projects/clang350-import/sbin/init/Makefile
  projects/clang350-import/sbin/ipf/Makefile.inc
  projects/clang350-import/sbin/ipf/ipf/Makefile
  projects/clang350-import/sbin/ipf/ipfstat/Makefile
  projects/clang350-import/sbin/ipf/ipsend/Makefile
  projects/clang350-import/sbin/ipfw/Makefile
  projects/clang350-import/sbin/iscontrol/Makefile
  projects/clang350-import/sbin/md5/Makefile
  projects/clang350-import/sbin/mdconfig/Makefile
  projects/clang350-import/sbin/mount/Makefile
  projects/clang350-import/sbin/mount_cd9660/Makefile
  projects/clang350-import/sbin/mount_msdosfs/Makefile
  projects/clang350-import/sbin/mount_udf/Makefile
  projects/clang350-import/sbin/nandfs/Makefile
  projects/clang350-import/sbin/natd/Makefile
  projects/clang350-import/sbin/newfs/Makefile
  projects/clang350-import/sbin/newfs_nandfs/Makefile
  projects/clang350-import/sbin/pfctl/Makefile
  projects/clang350-import/sbin/pflogd/Makefile
  projects/clang350-import/sbin/ping/Makefile
  projects/clang350-import/sbin/ping6/Makefile
  projects/clang350-import/sbin/quotacheck/Makefile
  projects/clang350-import/sbin/rcorder/Makefile
  projects/clang350-import/sbin/routed/Makefile
  projects/clang350-import/sbin/routed/rtquery/Makefile
  projects/clang350-import/sbin/savecore/Makefile
  projects/clang350-import/sbin/setkey/Makefile
  projects/clang350-import/sbin/sunlabel/Makefile
  projects/clang350-import/sbin/swapon/Makefile
  projects/clang350-import/sbin/tunefs/Makefile
  projects/clang350-import/secure/lib/libssh/Makefile
  projects/clang350-import/secure/lib/libssl/Makefile
  projects/clang350-import/secure/libexec/sftp-server/Makefile
  projects/clang350-import/secure/libexec/ssh-keysign/Makefile
  projects/clang350-import/secure/libexec/ssh-pkcs11-helper/Makefile
  projects/clang350-import/secure/usr.bin/bdes/Makefile
  projects/clang350-import/secure/usr.bin/openssl/Makefile
  projects/clang350-import/secure/usr.bin/scp/Makefile
  projects/clang350-import/secure/usr.bin/sftp/Makefile
  projects/clang350-import/secure/usr.bin/ssh-add/Makefile
  projects/clang350-import/secure/usr.bin/ssh-agent/Makefile
  projects/clang350-import/secure/usr.bin/ssh-keygen/Makefile
  projects/clang350-import/secure/usr.bin/ssh-keyscan/Makefile
  projects/clang350-import/secure/usr.bin/ssh/Makefile
  projects/clang350-import/secure/usr.sbin/sshd/Makefile
  projects/clang350-import/share/man/man9/Makefile
  projects/clang350-import/share/man/man9/timeout.9
  projects/clang350-import/share/mk/bsd.libnames.mk
  projects/clang350-import/share/mk/src.libnames.mk
  projects/clang350-import/sys/amd64/include/asm.h
  projects/clang350-import/sys/arm/altera/socfpga/files.socfpga
  projects/clang350-import/sys/arm/altera/socfpga/socfpga_machdep.c
  projects/clang350-import/sys/arm/conf/SOCKIT-BERI
  projects/clang350-import/sys/arm/include/asm.h
  projects/clang350-import/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts
  projects/clang350-import/sys/boot/i386/boot2/boot2.c
  projects/clang350-import/sys/cam/ctl/ctl.c
  projects/clang350-import/sys/cam/ctl/ctl_backend_block.c
  projects/clang350-import/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/clang350-import/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/clang350-import/sys/cam/ctl/ctl_io.h
  projects/clang350-import/sys/cam/ctl/ctl_tpc.c
  projects/clang350-import/sys/cam/ctl/scsi_ctl.c
  projects/clang350-import/sys/conf/files
  projects/clang350-import/sys/conf/files.amd64
  projects/clang350-import/sys/conf/files.i386
  projects/clang350-import/sys/contrib/dev/ral/Makefile
  projects/clang350-import/sys/dev/usb/controller/ohci_pci.c
  projects/clang350-import/sys/i386/i386/machdep.c
  projects/clang350-import/sys/i386/include/asm.h
  projects/clang350-import/sys/netinet6/nd6.c
  projects/clang350-import/sys/powerpc/include/asm.h
  projects/clang350-import/sys/powerpc/include/profile.h
  projects/clang350-import/sys/sparc64/include/asm.h
  projects/clang350-import/sys/sys/callout.h
  projects/clang350-import/usr.bin/apply/Makefile
  projects/clang350-import/usr.bin/ar/Makefile
  projects/clang350-import/usr.bin/atm/sscop/Makefile
  projects/clang350-import/usr.bin/awk/Makefile
  projects/clang350-import/usr.bin/bc/Makefile
  projects/clang350-import/usr.bin/bluetooth/bthost/Makefile
  projects/clang350-import/usr.bin/bluetooth/btsockstat/Makefile
  projects/clang350-import/usr.bin/bluetooth/rfcomm_sppd/Makefile
  projects/clang350-import/usr.bin/bsdiff/bsdiff/Makefile
  projects/clang350-import/usr.bin/bsdiff/bspatch/Makefile
  projects/clang350-import/usr.bin/bzip2/Makefile
  projects/clang350-import/usr.bin/calendar/Makefile
  projects/clang350-import/usr.bin/chkey/Makefile
  projects/clang350-import/usr.bin/chpass/Makefile
  projects/clang350-import/usr.bin/colldef/Makefile
  projects/clang350-import/usr.bin/compile_et/Makefile
  projects/clang350-import/usr.bin/cpio/Makefile
  projects/clang350-import/usr.bin/cpio/test/Makefile
  projects/clang350-import/usr.bin/dc/Makefile
  projects/clang350-import/usr.bin/demandoc/Makefile
  projects/clang350-import/usr.bin/dpv/Makefile
  projects/clang350-import/usr.bin/drill/Makefile
  projects/clang350-import/usr.bin/du/Makefile
  projects/clang350-import/usr.bin/ee/Makefile
  projects/clang350-import/usr.bin/enigma/Makefile
  projects/clang350-import/usr.bin/fetch/Makefile
  projects/clang350-import/usr.bin/file/Makefile
  projects/clang350-import/usr.bin/fstat/Makefile
  projects/clang350-import/usr.bin/ftp/Makefile
  projects/clang350-import/usr.bin/gcore/Makefile
  projects/clang350-import/usr.bin/grep/Makefile
  projects/clang350-import/usr.bin/gzip/Makefile
  projects/clang350-import/usr.bin/host/Makefile
  projects/clang350-import/usr.bin/ipcrm/Makefile
  projects/clang350-import/usr.bin/ipcs/Makefile
  projects/clang350-import/usr.bin/iscsictl/Makefile
  projects/clang350-import/usr.bin/kdump/Makefile
  projects/clang350-import/usr.bin/keylogin/Makefile
  projects/clang350-import/usr.bin/killall/Makefile
  projects/clang350-import/usr.bin/ktrdump/Makefile
  projects/clang350-import/usr.bin/less/Makefile
  projects/clang350-import/usr.bin/limits/Makefile
  projects/clang350-import/usr.bin/lock/Makefile
  projects/clang350-import/usr.bin/login/Makefile
  projects/clang350-import/usr.bin/lzmainfo/Makefile
  projects/clang350-import/usr.bin/m4/Makefile
  projects/clang350-import/usr.bin/makewhatis/Makefile
  projects/clang350-import/usr.bin/mandoc/Makefile
  projects/clang350-import/usr.bin/minigzip/Makefile
  projects/clang350-import/usr.bin/ministat/Makefile
  projects/clang350-import/usr.bin/mkimg/Makefile
  projects/clang350-import/usr.bin/mkulzma/Makefile
  projects/clang350-import/usr.bin/mkuzip/Makefile
  projects/clang350-import/usr.bin/msgs/Makefile
  projects/clang350-import/usr.bin/nc/Makefile
  projects/clang350-import/usr.bin/ncal/Makefile
  projects/clang350-import/usr.bin/netstat/Makefile
  projects/clang350-import/usr.bin/newgrp/Makefile
  projects/clang350-import/usr.bin/newkey/Makefile
  projects/clang350-import/usr.bin/nfsstat/Makefile
  projects/clang350-import/usr.bin/opieinfo/Makefile
  projects/clang350-import/usr.bin/opiekey/Makefile
  projects/clang350-import/usr.bin/opiepasswd/Makefile
  projects/clang350-import/usr.bin/pamtest/Makefile
  projects/clang350-import/usr.bin/passwd/Makefile
  projects/clang350-import/usr.bin/procstat/Makefile
  projects/clang350-import/usr.bin/quota/Makefile
  projects/clang350-import/usr.bin/rctl/Makefile
  projects/clang350-import/usr.bin/rup/Makefile
  projects/clang350-import/usr.bin/rusers/Makefile
  projects/clang350-import/usr.bin/script/Makefile
  projects/clang350-import/usr.bin/seq/Makefile
  projects/clang350-import/usr.bin/smbutil/Makefile
  projects/clang350-import/usr.bin/sort/Makefile
  projects/clang350-import/usr.bin/split/Makefile
  projects/clang350-import/usr.bin/su/Makefile
  projects/clang350-import/usr.bin/systat/Makefile
  projects/clang350-import/usr.bin/tabs/Makefile
  projects/clang350-import/usr.bin/talk/Makefile
  projects/clang350-import/usr.bin/tar/Makefile
  projects/clang350-import/usr.bin/telnet/Makefile
  projects/clang350-import/usr.bin/tftp/Makefile
  projects/clang350-import/usr.bin/top/Makefile
  projects/clang350-import/usr.bin/tput/Makefile
  projects/clang350-import/usr.bin/truncate/Makefile
  projects/clang350-import/usr.bin/tset/Makefile
  projects/clang350-import/usr.bin/ul/Makefile
  projects/clang350-import/usr.bin/units/Makefile
  projects/clang350-import/usr.bin/unzip/Makefile
  projects/clang350-import/usr.bin/usbhidaction/Makefile
  projects/clang350-import/usr.bin/usbhidctl/Makefile
  projects/clang350-import/usr.bin/vacation/Makefile
  projects/clang350-import/usr.bin/vi/Makefile
  projects/clang350-import/usr.bin/vmstat/Makefile
  projects/clang350-import/usr.bin/w/Makefile
  projects/clang350-import/usr.bin/wc/Makefile
  projects/clang350-import/usr.bin/xinstall/Makefile
  projects/clang350-import/usr.bin/xlint/lint1/Makefile
  projects/clang350-import/usr.bin/xo/Makefile
  projects/clang350-import/usr.bin/xz/Makefile
  projects/clang350-import/usr.bin/xzdec/Makefile
  projects/clang350-import/usr.sbin/acpi/acpidb/Makefile
  projects/clang350-import/usr.sbin/amd/Makefile.inc
  projects/clang350-import/usr.sbin/amd/amd/Makefile
  projects/clang350-import/usr.sbin/amd/amq/Makefile
  projects/clang350-import/usr.sbin/amd/fixmount/Makefile
  projects/clang350-import/usr.sbin/amd/fsinfo/Makefile
  projects/clang350-import/usr.sbin/amd/hlfsd/Makefile
  projects/clang350-import/usr.sbin/amd/mk-amd-map/Makefile
  projects/clang350-import/usr.sbin/amd/pawd/Makefile
  projects/clang350-import/usr.sbin/amd/wire-test/Makefile
  projects/clang350-import/usr.sbin/ancontrol/Makefile
  projects/clang350-import/usr.sbin/apmd/Makefile
  projects/clang350-import/usr.sbin/asf/Makefile
  projects/clang350-import/usr.sbin/audit/Makefile
  projects/clang350-import/usr.sbin/auditd/Makefile
  projects/clang350-import/usr.sbin/auditdistd/Makefile
  projects/clang350-import/usr.sbin/auditreduce/Makefile
  projects/clang350-import/usr.sbin/authpf/Makefile
  projects/clang350-import/usr.sbin/autofs/Makefile
  projects/clang350-import/usr.sbin/bhyve/Makefile
  projects/clang350-import/usr.sbin/bhyvectl/Makefile
  projects/clang350-import/usr.sbin/bhyveload/Makefile
  projects/clang350-import/usr.sbin/bluetooth/ath3kfw/Makefile
  projects/clang350-import/usr.sbin/bluetooth/bt3cfw/Makefile
  projects/clang350-import/usr.sbin/bluetooth/bthidcontrol/Makefile
  projects/clang350-import/usr.sbin/bluetooth/bthidd/Makefile
  projects/clang350-import/usr.sbin/bluetooth/btpand/Makefile
  projects/clang350-import/usr.sbin/bluetooth/hccontrol/Makefile
  projects/clang350-import/usr.sbin/bluetooth/hcsecd/Makefile
  projects/clang350-import/usr.sbin/bluetooth/hcseriald/Makefile
  projects/clang350-import/usr.sbin/bluetooth/l2control/Makefile
  projects/clang350-import/usr.sbin/bluetooth/l2ping/Makefile
  projects/clang350-import/usr.sbin/bluetooth/rfcomm_pppd/Makefile
  projects/clang350-import/usr.sbin/bluetooth/sdpcontrol/Makefile
  projects/clang350-import/usr.sbin/boot0cfg/Makefile
  projects/clang350-import/usr.sbin/boot98cfg/Makefile
  projects/clang350-import/usr.sbin/bsdinstall/distextract/Makefile
  projects/clang350-import/usr.sbin/bsdinstall/distfetch/Makefile
  projects/clang350-import/usr.sbin/bsdinstall/partedit/Makefile
  projects/clang350-import/usr.sbin/bsnmpd/bsnmpd/Makefile
  projects/clang350-import/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
  projects/clang350-import/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile
  projects/clang350-import/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
  projects/clang350-import/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
  projects/clang350-import/usr.sbin/cdcontrol/Makefile
  projects/clang350-import/usr.sbin/ckdist/Makefile
  projects/clang350-import/usr.sbin/clear_locks/Makefile
  projects/clang350-import/usr.sbin/config/Makefile
  projects/clang350-import/usr.sbin/cron/cron/Makefile
  projects/clang350-import/usr.sbin/cron/crontab/Makefile
  projects/clang350-import/usr.sbin/ctladm/Makefile
  projects/clang350-import/usr.sbin/ctld/Makefile
  projects/clang350-import/usr.sbin/ctm/ctm/Makefile
  projects/clang350-import/usr.sbin/ctm/mkCTM/Makefile
  projects/clang350-import/usr.sbin/daemon/Makefile
  projects/clang350-import/usr.sbin/dconschat/Makefile
  projects/clang350-import/usr.sbin/devinfo/Makefile
  projects/clang350-import/usr.sbin/diskinfo/Makefile
  projects/clang350-import/usr.sbin/editmap/Makefile
  projects/clang350-import/usr.sbin/edquota/Makefile
  projects/clang350-import/usr.sbin/fifolog/fifolog_create/Makefile
  projects/clang350-import/usr.sbin/fifolog/fifolog_reader/Makefile
  projects/clang350-import/usr.sbin/fifolog/fifolog_writer/Makefile
  projects/clang350-import/usr.sbin/flowctl/Makefile
  projects/clang350-import/usr.sbin/ftp-proxy/Makefile
  projects/clang350-import/usr.sbin/gssd/Makefile
  projects/clang350-import/usr.sbin/gstat/Makefile
  projects/clang350-import/usr.sbin/ifmcstat/Makefile
  projects/clang350-import/usr.sbin/inetd/Makefile
  projects/clang350-import/usr.sbin/iostat/Makefile
  projects/clang350-import/usr.sbin/ipfwpcap/Makefile
  projects/clang350-import/usr.sbin/iscsid/Makefile
  projects/clang350-import/usr.sbin/jail/Makefile
  projects/clang350-import/usr.sbin/jail/command.c
  projects/clang350-import/usr.sbin/jail/jail.c
  projects/clang350-import/usr.sbin/jail/state.c
  projects/clang350-import/usr.sbin/jexec/Makefile
  projects/clang350-import/usr.sbin/jls/Makefile
  projects/clang350-import/usr.sbin/kbdcontrol/Makefile
  projects/clang350-import/usr.sbin/keyserv/Makefile
  projects/clang350-import/usr.sbin/kgmon/Makefile
  projects/clang350-import/usr.sbin/lmcconfig/Makefile
  projects/clang350-import/usr.sbin/lpr/Makefile.inc
  projects/clang350-import/usr.sbin/lpr/chkprintcap/Makefile
  projects/clang350-import/usr.sbin/lpr/lpc/Makefile
  projects/clang350-import/usr.sbin/lpr/lpd/Makefile
  projects/clang350-import/usr.sbin/lpr/lpq/Makefile
  projects/clang350-import/usr.sbin/lpr/lpr/Makefile
  projects/clang350-import/usr.sbin/lpr/lprm/Makefile
  projects/clang350-import/usr.sbin/lpr/pac/Makefile
  projects/clang350-import/usr.sbin/mailstats/Makefile
  projects/clang350-import/usr.sbin/mailwrapper/Makefile
  projects/clang350-import/usr.sbin/makefs/Makefile
  projects/clang350-import/usr.sbin/makemap/Makefile
  projects/clang350-import/usr.sbin/mfiutil/Makefile
  projects/clang350-import/usr.sbin/mount_smbfs/Makefile
  projects/clang350-import/usr.sbin/mountd/Makefile
  projects/clang350-import/usr.sbin/moused/Makefile
  projects/clang350-import/usr.sbin/mptutil/Makefile
  projects/clang350-import/usr.sbin/mtree/Makefile
  projects/clang350-import/usr.sbin/nandtool/Makefile
  projects/clang350-import/usr.sbin/ndiscvt/Makefile
  projects/clang350-import/usr.sbin/ngctl/Makefile
  projects/clang350-import/usr.sbin/nghook/Makefile
  projects/clang350-import/usr.sbin/nmtree/Makefile
  projects/clang350-import/usr.sbin/nscd/Makefile
  projects/clang350-import/usr.sbin/ntp/Makefile.inc
  projects/clang350-import/usr.sbin/ntp/ntp-keygen/Makefile
  projects/clang350-import/usr.sbin/ntp/ntpd/Makefile
  projects/clang350-import/usr.sbin/ntp/ntpdate/Makefile
  projects/clang350-import/usr.sbin/ntp/ntpdc/Makefile
  projects/clang350-import/usr.sbin/ntp/ntpq/Makefile
  projects/clang350-import/usr.sbin/ntp/ntptime/Makefile
  projects/clang350-import/usr.sbin/ntp/sntp/Makefile
  projects/clang350-import/usr.sbin/pkg/Makefile
  projects/clang350-import/usr.sbin/pmccontrol/Makefile
  projects/clang350-import/usr.sbin/pmcstat/Makefile
  projects/clang350-import/usr.sbin/powerd/Makefile
  projects/clang350-import/usr.sbin/ppp/Makefile
  projects/clang350-import/usr.sbin/pppctl/Makefile
  projects/clang350-import/usr.sbin/praliases/Makefile
  projects/clang350-import/usr.sbin/praudit/Makefile
  projects/clang350-import/usr.sbin/pstat/Makefile
  projects/clang350-import/usr.sbin/pw/Makefile
  projects/clang350-import/usr.sbin/quotaon/Makefile
  projects/clang350-import/usr.sbin/rarpd/Makefile
  projects/clang350-import/usr.sbin/repquota/Makefile
  projects/clang350-import/usr.sbin/rpc.lockd/Makefile
  projects/clang350-import/usr.sbin/rpc.statd/Makefile
  projects/clang350-import/usr.sbin/rpc.yppasswdd/Makefile
  projects/clang350-import/usr.sbin/rpc.ypupdated/Makefile
  projects/clang350-import/usr.sbin/rpc.ypxfrd/Makefile
  projects/clang350-import/usr.sbin/rpcbind/Makefile
  projects/clang350-import/usr.sbin/rrenumd/Makefile
  projects/clang350-import/usr.sbin/rtadvd/Makefile
  projects/clang350-import/usr.sbin/rtsold/Makefile
  projects/clang350-import/usr.sbin/sendmail/Makefile
  projects/clang350-import/usr.sbin/services_mkdb/Makefile
  projects/clang350-import/usr.sbin/snapinfo/Makefile
  projects/clang350-import/usr.sbin/spray/Makefile
  projects/clang350-import/usr.sbin/syslogd/Makefile
  projects/clang350-import/usr.sbin/tcpdchk/Makefile
  projects/clang350-import/usr.sbin/tcpdmatch/Makefile
  projects/clang350-import/usr.sbin/tcpdump/tcpdump/Makefile
  projects/clang350-import/usr.sbin/timed/timed/Makefile
  projects/clang350-import/usr.sbin/traceroute/Makefile
  projects/clang350-import/usr.sbin/traceroute6/Makefile
  projects/clang350-import/usr.sbin/tzsetup/Makefile
  projects/clang350-import/usr.sbin/ugidfw/Makefile
  projects/clang350-import/usr.sbin/uhsoctl/Makefile
  projects/clang350-import/usr.sbin/unbound/anchor/Makefile
  projects/clang350-import/usr.sbin/unbound/checkconf/Makefile
  projects/clang350-import/usr.sbin/unbound/control/Makefile
  projects/clang350-import/usr.sbin/unbound/daemon/Makefile
  projects/clang350-import/usr.sbin/usbconfig/Makefile
  projects/clang350-import/usr.sbin/vipw/Makefile
  projects/clang350-import/usr.sbin/watch/Makefile
  projects/clang350-import/usr.sbin/watchdogd/Makefile
  projects/clang350-import/usr.sbin/wpa/Makefile.crypto
  projects/clang350-import/usr.sbin/wpa/hostapd/Makefile
  projects/clang350-import/usr.sbin/wpa/hostapd_cli/Makefile
  projects/clang350-import/usr.sbin/wpa/wpa_cli/Makefile
  projects/clang350-import/usr.sbin/wpa/wpa_passphrase/Makefile
  projects/clang350-import/usr.sbin/wpa/wpa_priv/Makefile
  projects/clang350-import/usr.sbin/wpa/wpa_supplicant/Makefile
  projects/clang350-import/usr.sbin/ypserv/Makefile
Directory Properties:
  projects/clang350-import/   (props changed)

Modified: projects/clang350-import/MAINTAINERS
==============================================================================

--- projects/clang350-import/MAINTAINERS	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/MAINTAINERS	Tue Nov 25 21:43:01 2014	(r275078)
@@ -48,7 +48,6 @@ cd(4)		ken	Pre-commit review requested.
 pass(4)		ken	Pre-commit review requested.
 ch(4)		ken	Pre-commit review requested.
 em(4)		jfv	Pre-commit review requested.
-tdfx(4)		cokane  Just keep me informed of changes, try not to break it.
 sendmail	gshapiro	Pre-commit review requested.
 etc/mail	gshapiro	Pre-commit review requested.
 				Keep in sync with -STABLE.
@@ -118,7 +117,6 @@ lib/libc/stdtime	edwin   Heads-up apprec
 				is maintained by a third party source.
 sbin/routed	bms	Pre-commit review; notify vendor at rhyolite.com
 isci(4)		jimharris	Pre-commit review requested.
-3dfx		cokane		Pre-commit review preferred.
 cmx		daniel at roe.ch	Pre-commit review preferred.
 filemon		obrien		Pre-commit review preferred.
 sysdoc		trhodes		Pre-commit review preferred.

Modified: projects/clang350-import/bin/csh/Makefile
==============================================================================
--- projects/clang350-import/bin/csh/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/bin/csh/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -40,8 +40,7 @@ MLINKS= csh.1 tcsh.1
 # utilities of the same name are handled with the associated manpage,
 # builtin.1 in share/man/man1/.
 
-DPADD=	${LIBTERMCAPW} ${LIBCRYPT}
-LDADD=	-ltermcapw -lcrypt
+LIBADD=	termcapw crypt
 
 LINKS=	${BINDIR}/csh ${BINDIR}/tcsh
 

Modified: projects/clang350-import/bin/df/Makefile
==============================================================================
--- projects/clang350-import/bin/df/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/bin/df/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -9,7 +9,6 @@ SRCS=	df.c vfslist.c
 
 CFLAGS+= -I${MOUNT}
 
-DPADD=	${LIBUTIL} ${LIBXO}
-LDADD=	-lutil -lxo
+LIBADD=	xo util
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/bin/ed/Makefile
==============================================================================
--- projects/clang350-import/bin/ed/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/bin/ed/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -9,8 +9,7 @@ MLINKS=	ed.1 red.1
 
 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no"
 CFLAGS+=-DDES
-DPADD=	${LIBCRYPTO}
-LDADD=	-lcrypto
+LIBADD=	crypto
 .endif
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/bin/ls/Makefile
==============================================================================
--- projects/clang350-import/bin/ls/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/bin/ls/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -5,14 +5,12 @@
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
+LIBADD=	util
 
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no
 CFLAGS+= -DCOLORLS
-DPADD+=	${LIBTERMCAPW}
-LDADD+=	-ltermcapw
+LIBADD+=	termcapw
 .endif
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/bin/pkill/Makefile
==============================================================================
--- projects/clang350-import/bin/pkill/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/bin/pkill/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -5,8 +5,7 @@
 
 PROG=	pkill
 
-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm
 
 LINKS=	${BINDIR}/pkill ${BINDIR}/pgrep
 MLINKS=	pkill.1 pgrep.1

Modified: projects/clang350-import/bin/ps/Makefile
==============================================================================
--- projects/clang350-import/bin/ps/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/bin/ps/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -11,7 +11,6 @@ SRCS=	fmt.c keyword.c nlist.c print.c ps
 # on large systems.
 #
 CFLAGS+=-DLAZY_PS
-DPADD=	${LIBM} ${LIBKVM} ${LIBJAIL}
-LDADD=	-lm -lkvm -ljail
+LIBADD=	m kvm jail
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/bin/rmail/Makefile
==============================================================================
--- projects/clang350-import/bin/rmail/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/bin/rmail/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -14,11 +14,7 @@ MAN=	rmail.8
 WARNS?=	2
 CFLAGS+=-I${SENDMAIL_DIR}/include -I.
 
-LIBSMDIR=	${.OBJDIR}/../../lib/libsm
-LIBSM=		${LIBSMDIR}/libsm.a
-
-DPADD=	${LIBSM}
-LDADD=	${LIBSM}
+LIBADD=	sm
 
 SRCS+=	sm_os.h
 CLEANFILES+=sm_os.h

Modified: projects/clang350-import/bin/sh/Makefile
==============================================================================
--- projects/clang350-import/bin/sh/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/bin/sh/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -18,8 +18,7 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS}
 # utilities of the same name are handled with the associated manpage,
 # builtin.1 in share/man/man1/.
 
-DPADD= ${LIBEDIT} ${LIBTERMCAPW}
-LDADD= -ledit -ltermcapw
+LIBADD=	edit
 
 CFLAGS+=-DSHELL -I. -I${.CURDIR}
 # for debug:

Modified: projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
==============================================================================
--- projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c	Tue Nov 25 21:43:01 2014	(r275078)
@@ -1211,13 +1211,13 @@ dt_module_update(dtrace_hdl_t *dtp, stru
 #if defined(__FreeBSD__)
 		if (sh.sh_size == 0)
 			continue;
-		if (is_elf_obj && (sh.sh_type == SHT_PROGBITS ||
-		    sh.sh_type == SHT_NOBITS)) {
+		if (sh.sh_type == SHT_PROGBITS || sh.sh_type == SHT_NOBITS) {
 			alignmask = sh.sh_addralign - 1;
 			mapbase += alignmask;
 			mapbase &= ~alignmask;
 			sh.sh_addr = mapbase;
-			dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr;
+			if (is_elf_obj)
+				dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr;
 			mapbase += sh.sh_size;
 		}
 #endif

Modified: projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
==============================================================================
--- projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c	Tue Nov 25 21:43:01 2014	(r275078)
@@ -545,8 +545,9 @@ dt_probe_define(dt_provider_t *pvp, dt_p
 
 	for (pip = prp->pr_inst; pip != NULL; pip = pip->pi_next) {
 		if (strcmp(pip->pi_fname, fname) == 0 &&
-		    ((rname == NULL && pip->pi_rname[0] == '\0') ||
-		    (rname != NULL && strcmp(pip->pi_rname, rname)) == 0))
+		    ((rname == NULL && pip->pi_rname == NULL) ||
+		    (rname != NULL && pip->pi_rname != NULL &&
+		    strcmp(pip->pi_rname, rname) == 0)))
 			break;
 	}
 

Modified: projects/clang350-import/contrib/mdocml/lib.in
==============================================================================
--- projects/clang350-import/contrib/mdocml/lib.in	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/contrib/mdocml/lib.in	Tue Nov 25 21:43:01 2014	(r275078)
@@ -56,6 +56,7 @@ LINE("libftpio",	"FTP Connection Managem
 LINE("libform",		"Curses Form Library (libform, \\-lform)")
 LINE("libgeom",		"Userland API Library for Kernel GEOM subsystem (libgeom, \\-lgeom)")
 LINE("libgpib",		"General-Purpose Instrument Bus (GPIB) library (libgpib, \\-lgpib)")
+LINE("libgpio",		"General-Purpose Input Output (GPIO) library (libgpio, \\-lgpio)")
 LINE("libhammer",	"HAMMER Filesystem Userland Library (libhammer, \\-lhammer)")
 LINE("libi386",		"i386 Architecture Library (libi386, \\-li386)")
 LINE("libintl",		"Internationalized Message Handling Library (libintl, \\-lintl)")

Modified: projects/clang350-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c
==============================================================================
--- projects/clang350-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c	Tue Nov 25 21:43:01 2014	(r275078)
@@ -51,7 +51,11 @@ run(int n, ...)
 	ATF_REQUIRE_EQ(n, DEPTH - calls - 1);
 
 	va_start(va, n);
+#if defined(__FreeBSD__) && defined(__amd64__)
+	for (i = 0; i < 5; i++) {
+#else
 	for (i = 0; i < 9; i++) {
+#endif
 		ia = va_arg(va, int);
 		ATF_REQUIRE_EQ(i, ia);
 	}
@@ -101,13 +105,6 @@ ATF_TC_BODY(setcontext_link, tc)
 	ucontext_t save;
 	volatile int i = 0; /* avoid longjmp clobbering */
 
-#ifdef __FreeBSD__
-#ifdef __amd64__
-	atf_tc_expect_fail("setcontext in this testcase fails on "
-	    "FreeBSD/amd64 with rc == -1/errno == EINVAL; see PR # 194828");
-#endif
-#endif
-
 	for (i = 0; i < DEPTH; ++i) {
 		ATF_REQUIRE_EQ(getcontext(&uc[i]), 0);
 
@@ -115,21 +112,20 @@ ATF_TC_BODY(setcontext_link, tc)
 		uc[i].uc_stack.ss_size = STACKSZ;
 		uc[i].uc_link = (i > 0) ? &uc[i - 1] : &save;
 
+#if defined(__FreeBSD__) && defined(__amd64__)
+		/* FreeBSD/amd64 only permits up to 6 arguments. */
+		makecontext(&uc[i], (void *)run, 6, i,
+			0, 1, 2, 3, 4);
+#else
 		makecontext(&uc[i], (void *)run, 10, i,
 			0, 1, 2, 3, 4, 5, 6, 7, 8);
+#endif
 	}
 
 	ATF_REQUIRE_EQ(getcontext(&save), 0);
 
-#ifdef __FreeBSD__
-	if (calls == 0) {
-		int rc = setcontext(&uc[DEPTH-1]);
-		ATF_REQUIRE_EQ_MSG(rc, 0, "%d != 0; (errno = %d)", rc, errno);
-	}
-#else
 	if (calls == 0)
 		ATF_REQUIRE_EQ(setcontext(&uc[DEPTH-1]), 0);
-#endif
 }
 
 ATF_TP_ADD_TCS(tp)

Modified: projects/clang350-import/gnu/lib/libdialog/Makefile
==============================================================================
--- projects/clang350-import/gnu/lib/libdialog/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/lib/libdialog/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -13,8 +13,7 @@ SRCS=		argv.c arrows.c buildlist.c butto
 INCS=		dialog.h dlg_colors.h dlg_config.h dlg_keys.h
 MAN=		dialog.3
 
-DPADD=		${LIBNCURSESW} ${LIBM}
-LDADD=		-lncursesw -lm
+LIBADD=		ncursesw m
 
 CFLAGS+= 	-I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused
 .PATH:		${DIALOG}

Modified: projects/clang350-import/gnu/lib/libgcc/Makefile
==============================================================================
--- projects/clang350-import/gnu/lib/libgcc/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/lib/libgcc/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -28,8 +28,7 @@ CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_F
 		-I${.CURDIR}/../../usr.bin/cc/cc_tools
 
 LDFLAGS+=	-nodefaultlibs
-DPADD+=		${LIBC}
-LDADD+=		-lc
+LIBADD+=	c
 
 OBJS=		# added to below in various ways depending on TARGET_CPUARCH
 
@@ -119,8 +118,7 @@ LIB1ASMSRC =	lib1funcs.asm
 LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
 LIB2ADDEH =	unwind-arm.c libunwind.S pr-support.c unwind-c.c
 # Some compilers generate __aeabi_ functions libgcc_s is missing
-DPADD+=		${LIBCOMPILER_RT}
-LDADD+=		-lcompiler_rt
+LIBADD+=	compiler_rt
 .endif
 
 .if ${TARGET_CPUARCH} == mips

Modified: projects/clang350-import/gnu/lib/libreadline/readline/Makefile
==============================================================================
--- projects/clang350-import/gnu/lib/libreadline/readline/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/lib/libreadline/readline/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -23,7 +23,6 @@ ${.OBJDIR}/${_h}:	${SRCDIR}/${_h}
 	${INSTALL} ${.ALLSRC} ${.TARGET}
 .endfor
 
-DPADD=	${LIBTERMCAPW}
-LDADD=	-ltermcapw
+LIBADD=	ncursesw
 
 .include <bsd.lib.mk>

Modified: projects/clang350-import/gnu/lib/libstdc++/Makefile
==============================================================================
--- projects/clang350-import/gnu/lib/libstdc++/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/lib/libstdc++/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -23,8 +23,8 @@ CXXFLAGS+=	-fno-implicit-templates -ffun
 		-Wno-deprecated
 PO_CXXFLAGS=	${CXXFLAGS:N-ffunction-sections}
 
-DPADD=		${LIBM}
-LDADD=		-lm  -Wl,-f,libsupc++.so.1
+LIBADD+=	m
+LDADD=		-Wl,-f,libsupc++.so.1
 
 # libstdc++ sources
 SRCS+=	bitmap_allocator.cc pool_allocator.cc \

Modified: projects/clang350-import/gnu/usr.bin/dialog/Makefile
==============================================================================
--- projects/clang350-import/gnu/usr.bin/dialog/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/usr.bin/dialog/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,8 +3,7 @@
 DIALOG=	${.CURDIR}/../../../contrib/dialog
 PROG=   dialog
 
-DPADD=	${LIBDIALOG} ${LIBNCURSESW} ${LIBM}
-LDADD=	-ldialog -lncursesw -lm
+LIBADD=	dialog ncursesw m
 CFLAGS+= -I${.CURDIR} -I${DIALOG}
 .PATH:	${DIALOG}
 

Modified: projects/clang350-import/gnu/usr.bin/diff/Makefile
==============================================================================
--- projects/clang350-import/gnu/usr.bin/diff/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/usr.bin/diff/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -26,8 +26,7 @@ CFLAGS+=-I${DESTDIR}/usr/include/gnu
 
 SUBDIR+=doc
 
-DPADD=	${LIBGNUREGEX}
-LDADD=	-lgnuregex
+LIBADD+=	gnuregex
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests

Modified: projects/clang350-import/gnu/usr.bin/gdb/gdb/Makefile
==============================================================================
--- projects/clang350-import/gnu/usr.bin/gdb/gdb/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/usr.bin/gdb/gdb/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -11,8 +11,9 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 # global symbols visible.
 LDFLAGS+= -Wl,-E
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
-LDADD=	${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex
+DPADD=	${GDBLIBS} ${BULIBS}
+LDADD=	${GDBLIBS} ${BULIBS}
+LIBADD+=	m readline ncursesw gnuregex
 
 .include <bsd.prog.mk>
 CFLAGS+=	-DDEBUGDIR=\"${DEBUGDIR}\"

Modified: projects/clang350-import/gnu/usr.bin/gdb/gdbtui/Makefile
==============================================================================
--- projects/clang350-import/gnu/usr.bin/gdb/gdbtui/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/usr.bin/gdb/gdbtui/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -12,7 +12,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 # global symbols visible.
 LDFLAGS+= -Wl,-E
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
-LDADD=	${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex
+DPADD=	${GDBLIBS} ${BULIBS}
+LDADD=	${GDBLIBS} ${BULIBS}
+LIBADD+=	m readline ncursesw gnuregex
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/gnu/usr.bin/gdb/kgdb/Makefile
==============================================================================
--- projects/clang350-import/gnu/usr.bin/gdb/kgdb/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/usr.bin/gdb/kgdb/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -8,10 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_
 	${OBJ_BU}/libiberty/libiberty.a
 GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \
-	${LIBGNUREGEX}
-LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LDREADLINE} -ltermcapw \
-	-lgnuregex
+DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM}
+LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX}
+LIBADD+=	m readline ncursesw gnuregex
 
 .if defined(GDB_CROSS_DEBUGGER)
 CFLAGS+= -Wl,-export-dynamic

Modified: projects/clang350-import/gnu/usr.bin/grep/Makefile
==============================================================================
--- projects/clang350-import/gnu/usr.bin/grep/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/gnu/usr.bin/grep/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -22,8 +22,7 @@ LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \
 MLINKS=	grep.1 egrep.1 grep.1 fgrep.1
 .endif
 
-DPADD=	${LIBGNUREGEX} ${LIBBZ2}
-LDADD=	-lgnuregex -lbz2
+LIBADD=	gnuregex bz2
 
 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/bzgrep \
@@ -33,8 +32,7 @@ MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1
 .endif
 
 .if defined(GREP_LIBZ) && !empty(GREP_LIBZ)
-LDADD+=	-lz
-DPADD+=	${LIBZ}
+LIBADD+=	z
 CFLAGS+=-DHAVE_LIBZ=1
 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/zgrep \

Modified: projects/clang350-import/kerberos5/Makefile.inc
==============================================================================
--- projects/clang350-import/kerberos5/Makefile.inc	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/Makefile.inc	Tue Nov 25 21:43:01 2014	(r275078)
@@ -16,9 +16,6 @@ LDAPCFLAGS=	-I${OPENLDAPBASE}/include -D
 LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
 .endif
 
-LIBVERS=	${.OBJDIR}/../../lib/libvers/libvers.a
-LIBSL=		${.OBJDIR}/../../lib/libsl/libsl.a
-
 .if defined(SRCS)
 
 ETSRCS=	\

Modified: projects/clang350-import/kerberos5/lib/libasn1/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libasn1/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libasn1/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,8 +3,7 @@
 LIB=	asn1
 LDFLAGS=	-Wl,--no-undefined
 INCS=	asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h
-LDADD=	-lcom_err -lroken
-DPADD=	${LIBCOM_ERR} ${LIBROKEN}
+LIBADD=	com_err roken
 VERSION_MAP=	${.CURDIR}/version.map
 
 SRCS=	asn1_err.c \

Modified: projects/clang350-import/kerberos5/lib/libgssapi_krb5/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libgssapi_krb5/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libgssapi_krb5/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,9 +2,7 @@
 
 LIB=	gssapi_krb5
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
-LDADD=	-lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt
-DPADD=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \
-	${LIBCOM_ERR} ${LIBCRYPT}
+LIBADD=	gssapi krb5 crypto roken asn1 com_err
 SHLIB_MAJOR=	10
 
 INCS=	${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h

Modified: projects/clang350-import/kerberos5/lib/libgssapi_ntlm/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libgssapi_ntlm/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libgssapi_ntlm/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,8 +2,7 @@
 
 LIB=	gssapi_ntlm
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
-LDADD=	-lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken
-DPADD=	${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN}
+LIBADD=	crypto gssapi krb5 heimntlm roken
 SHLIB_MAJOR=	10
 
 SRCS=	accept_sec_context.c \

Modified: projects/clang350-import/kerberos5/lib/libgssapi_spnego/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libgssapi_spnego/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libgssapi_spnego/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,8 +2,7 @@
 
 LIB=	gssapi_spnego
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
-LDADD=	-lgssapi -lheimbase -lasn1 -lroken
-DPADD=	${LIBGSSAPI} ${LIBHEIMBASE} ${LIBASN1} ${LIBROKEN}
+LIBADD=	gssapi heimbase asn1 roken
 SHLIB_MAJOR=	10
 
 SRCS=	accept_sec_context.c \

Modified: projects/clang350-import/kerberos5/lib/libhdb/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libhdb/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libhdb/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,8 +3,8 @@
 LIB=	hdb
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP=	${KRB5DIR}/lib/hdb/version-script.map
-LDADD=	-lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD}
+LIBADD=	asn1 com_err krb5 roken heimsqlite
+DPADD=	${LDAPDPADD}
 
 MAN=	HDB.3 hdb_entry_ex.3
 

Modified: projects/clang350-import/kerberos5/lib/libheimbase/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libheimbase/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libheimbase/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,7 +2,7 @@
 
 LIB=	heimbase
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lpthread
+LIBADD=	pthread
 VERSION_MAP= ${KRB5DIR}/base/version-script.map
 
 INCS=	heimbase.h

Modified: projects/clang350-import/kerberos5/lib/libheimipcc/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libheimipcc/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libheimipcc/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,8 +2,7 @@
 
 LIB=	heimipcc
 PRIVATELIB=
-LDADD=	-lheimbase -lroken -lpthread
-DPADD=	${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD}
+LIBADD=	heimbase roken pthread
 
 SRCS=	\
 	client.c \

Modified: projects/clang350-import/kerberos5/lib/libheimipcs/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libheimipcs/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libheimipcs/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,9 +2,7 @@
 
 LIB=	heimipcs
 PRIVATELIB=
-LDADD=	-lheimbase -lroken
-LDFLAGS=	-pthread
-DPADD=	${LIBHEIMBASE} ${LIBROKEN}
+LIBADD=	heimbase roken pthread
 
 SRCS=	\
 	server.c \

Modified: projects/clang350-import/kerberos5/lib/libheimntlm/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libheimntlm/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libheimntlm/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,8 +2,7 @@
 
 LIB=	heimntlm
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lcrypto -lcom_err -lkrb5 -lroken
-DPADD=	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	crypto com_err krb5 roken
 SRCS=	ntlm.c ntlm_err.c
 INCS=	heimntlm.h heimntlm-protos.h ntlm_err.h
 CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken

Modified: projects/clang350-import/kerberos5/lib/libheimsqlite/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libheimsqlite/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libheimsqlite/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,8 +2,7 @@
 
 LIB=	heimsqlite
 SRCS=	sqlite3.c
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 CFLAGS+=-I${KRB5DIR}/lib/sqlite
 
 .include <bsd.lib.mk>

Modified: projects/clang350-import/kerberos5/lib/libhx509/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libhx509/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libhx509/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,8 +3,7 @@
 LIB=	hx509
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
-LDADD=	-lasn1 -lcom_err -lcrypto -lroken -lwind
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN} ${LIBWIND}
+LIBADD=	asn1 com_err crypto roken wind
 
 MAN=	hx509.3 \
 	hx509_ca.3 \

Modified: projects/clang350-import/kerberos5/lib/libkadm5clnt/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libkadm5clnt/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libkadm5clnt/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,8 +2,7 @@
 
 LIB=	kadm5clnt
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lcom_err -lkrb5 -lroken
-DPADD=	${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	com_err krb5 roken
 
 INCS=	admin.h \
 	kadm5-private.h \

Modified: projects/clang350-import/kerberos5/lib/libkadm5srv/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libkadm5srv/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libkadm5srv/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,8 +2,7 @@
 
 LIB=	kadm5srv
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lcom_err -lhdb -lkrb5 -lroken
-DPADD=	${LIBCOM_ERR} ${LIBHDB} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	com_err hdb krb5 roken
 VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map
 MAN=	kadm5_pwcheck.3
 

Modified: projects/clang350-import/kerberos5/lib/libkafs5/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libkafs5/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libkafs5/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 LIB=	kafs5
-LDADD=	-lasn1 -lroken -lkrb5
 LDFLAGS=	-Wl,--no-undefined
-DPADD=	${LIBASN1} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	asn1 krb5 roken
 INCS=	kafs.h
 MAN=	kafs5.3
 VERSION_MAP=	${.CURDIR}/version.map

Modified: projects/clang350-import/kerberos5/lib/libkdc/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libkdc/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libkdc/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,9 +3,7 @@
 LIB=	kdc
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/kdc/version-script.map
-LDADD=	-lroken -lhdb -lhx509 -lkrb5 -lheimntlm -lasn1 -lcrypt -lcrypto
-DPADD=	${LIBROKEN} ${LIBHDB} ${LIBHX509} ${LIBKRB5} ${LIBHEIMNTLM} \
-	${LIBASN1} ${LIBCRYPT} ${LIBCRYPTO}
+LIBADD=	roken hdb hx509 krb5 heimntlm asn1 crypto
 
 INCS=	kdc.h \
 	kdc-protos.h

Modified: projects/clang350-import/kerberos5/lib/libkrb5/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libkrb5/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libkrb5/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,9 +3,7 @@
 LIB=	krb5
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
-LDADD=	-lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase ${LDHEIMIPCC}
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
-USEPRIVATELIB= heimipcc
+LIBADD=	asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
 
 INCS=	heim_err.h \
 	heim_threads.h \
@@ -628,3 +626,4 @@ CFLAGS+=	-I${KRB5DIR}/lib/krb5 \
 .include <bsd.lib.mk>
 
 .PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${.CURDIR}/../../include ${KRB5DIR}/doc/doxyout/krb5/man/man3/
+USEPRIVATELIB= heimipcc

Modified: projects/clang350-import/kerberos5/lib/libroken/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libroken/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libroken/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 LIB=	roken
-LDADD=	-lcrypt
-DPADD=	${LIBCRYPT}
+LIBADD=	crypt
 VERSION_MAP=	${KRB5DIR}/lib/roken/version-script.map
 INCS=	roken.h \
 	roken-common.h \

Modified: projects/clang350-import/kerberos5/lib/libwind/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/lib/libwind/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/lib/libwind/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,8 +3,7 @@
 LIB=	wind
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map
-LDADD=	-lcom_err -lroken
-DPADD=	${LIBCOM_ERR} ${LIBROKEN}
+LIBADD=	com_err roken
 
 INCS=	wind.h \
 	wind_err.h

Modified: projects/clang350-import/kerberos5/libexec/digest-service/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/digest-service/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/digest-service/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -8,11 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/ipc \
 		-I${KRB5DIR}/lib/wind \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lhdb -lkdc ${LDHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS} -lheimntlm
-USEPRIVATELIB= heimipcs
+LIBADD=	hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/libexec/hprop/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/hprop/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/hprop/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -10,10 +10,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509
 CFLAGS+=-I${KRB5DIR}/lib/ntlm
 CFLAGS+=-I${KRB5DIR}/kdc
 CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/kerberos5/libexec/hpropd/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/hpropd/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/hpropd/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -4,10 +4,9 @@ PROG=	hpropd
 MAN=	hpropd.8
 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/kerberos5/libexec/ipropd-master/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/ipropd-master/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/ipropd-master/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -5,10 +5,9 @@ MAN=	iprop.8
 SRCS=	ipropd_common.c ipropd_master.c kadm5_err.h
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I. ${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	kadm5srv hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 foo::

Modified: projects/clang350-import/kerberos5/libexec/ipropd-slave/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/ipropd-slave/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/ipropd-slave/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -5,10 +5,9 @@ MAN=
 SRCS=	ipropd_common.c ipropd_slave.c kadm5_err.h
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I. ${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	kadm5srv hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/kerberos5/libexec/kadmind/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/kadmind/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/kadmind/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -9,10 +9,9 @@ SRCS=	rpc.c \
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBGSSAPI} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} \
-	${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lgssapi -lhdb -lkrb5 -lroken \
-	-lasn1 ${LIBVERS} -lcrypto -lcrypt ${LDAPLDADD}
+LIBADD=	kadm5srv gssapi hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/kerberos5/libexec/kcm/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/kcm/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/kcm/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -19,11 +19,9 @@ SRCS=	acl.c \
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
-	${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lheimntlm ${LDHEIMIPCS} \
-	-lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD}
-USEPRIVATELIB= heimipcs
+LIBADD=	krb5 roken heimntlm heimipcs crypto
+DPADD=	${LDAPDPADD}
+LDADD=	${LIBVERS} ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/kerberos5/libexec/kdc/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/kdc/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/kdc/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -10,9 +10,7 @@ SRCS=	config.c \
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD=	${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD=	kdc hdb krb5 roken crypt vers
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/libexec/kdigest/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/kdigest/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/kdigest/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -5,10 +5,7 @@ MAN=	kdigest.8
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} \
-	${LIBVERS} -ledit
+LIBADD=	krb5 heimntlm roken crypto edit sl vers
 SRCS=	kdigest.c \
 	kdigest-commands.c \
 	kdigest-commands.h

Modified: projects/clang350-import/kerberos5/libexec/kfd/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/kfd/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/kfd/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -4,10 +4,7 @@ PROG=	kfd
 MAN=	kfd.8
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS}
+LIBADD=	krb5 roken vers
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/libexec/kimpersonate/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/kimpersonate/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/kimpersonate/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -6,10 +6,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS}
+LIBADD=	krb5 roken asn1 vers
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/libexec/kpasswdd/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/libexec/kpasswdd/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/libexec/kpasswdd/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,10 +3,9 @@
 PROG=	kpasswdd
 MAN=	kpasswdd.8
 CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	kadm5srv hdb krb5 roken vers asn1
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/kerberos5/tools/asn1_compile/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/tools/asn1_compile/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/tools/asn1_compile/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,8 +3,9 @@
 PROG=	asn1_compile
 MAN=
 LIBROKEN_A=	${.OBJDIR}/../../lib/libroken/libroken.a
-LDADD=	${LIBROKEN_A} ${LIBVERS}
-DPADD=	${LIBROKEN_A} ${LIBVERS}
+LIBADD=	vers
+LDADD=	${LIBROKEN_A}
+DPADD=	${LIBROKEN_A}
 
 SRCS=	\
 	asn1parse.y \

Modified: projects/clang350-import/kerberos5/tools/slc/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/tools/slc/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/tools/slc/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,8 +2,9 @@
 
 PROG=	slc
 LIBROKEN_A=     ${.OBJDIR}/../../lib/libroken/libroken.a
-LDADD=  ${LIBROKEN_A} ${LIBVERS}
-DPADD=  ${LIBROKEN_A} ${LIBVERS}
+LIBADD=	vers
+LDADD=  ${LIBROKEN_A}
+DPADD=  ${LIBROKEN_A}
 MAN=
 
 SRCS=	roken.h \

Modified: projects/clang350-import/kerberos5/usr.bin/hxtool/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/hxtool/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/hxtool/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -6,8 +6,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit
+LIBADD=	hx509 roken asn1 crypto sl vers edit
 SRCS=	hxtool.c hxtool-commands.c hxtool-commands.h
 
 hxtool-commands.h: hxtool-commands.in

Modified: projects/clang350-import/kerberos5/usr.bin/kadmin/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/kadmin/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/kadmin/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -26,14 +26,9 @@ SRCS=	add_enctype.c \
 
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS}
-DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
-	${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
-	${LIBEDIT} ${LIBNCURSESW} ${LDAPDPADD}
-LDADD=	-lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \
-	${LIBSL} -lroken ${LIBVERS} -lasn1 \
-	-lcrypto -lcrypt -lcom_err \
-	-ledit -lncursesw ${LDAPLDADD}
+LIBADD=	kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/kerberos5/usr.bin/kcc/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/kcc/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/kcc/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -8,10 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBKAFS5} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt -lkafs5 ${LIBSL} \
-	${LIBVERS} -ledit
+LIBADD=	krb5 roken asn1 kafs5 edit sl vers
 SRCS=	kcc.c \
 	kcc-commands.c \
 	kcc-commands.h \

Modified: projects/clang350-import/kerberos5/usr.bin/kdestroy/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/kdestroy/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/kdestroy/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,10 +2,7 @@
 
 PROG=	kdestroy
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
-LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt
+LIBADD=	kafs5 krb5 roken vers
 MAN=	kdestroy.1
 
 .include <bsd.prog.mk>

Modified: projects/clang350-import/kerberos5/usr.bin/kf/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/kf/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/kf/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -4,10 +4,7 @@ PROG=	kf
 MAN=	kf.1
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS}
+LIBADD=	krb5 roken vers
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/usr.bin/kgetcred/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/kgetcred/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/kgetcred/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,8 +3,7 @@
 PROG=	kgetcred
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD=	krb5 roken asn1 vers
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/usr.bin/kinit/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/kinit/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/kinit/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,10 +2,7 @@
 
 PROG=	kinit
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
-LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	kafs5 krb5 heimntlm roken crypto vers
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/usr.bin/kpasswd/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/kpasswd/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/kpasswd/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -2,10 +2,7 @@
 
 PROG=	kpasswd
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	hdb krb5 roken vers crypto
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/usr.bin/ksu/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/ksu/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/ksu/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -8,10 +8,7 @@ PRECIOUSPROG=
 MAN=
 SRCS=	su.c
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	kafs5 krb5 roken vers crypto crypt
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/usr.bin/string2key/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/string2key/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/string2key/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -7,9 +7,7 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/windc
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD=	krb5 roken crypto vers
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/usr.bin/verify_krb5_conf/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.bin/verify_krb5_conf/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.bin/verify_krb5_conf/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -3,10 +3,7 @@
 PROG=	verify_krb5_conf
 MAN=	verify_krb5_conf.8
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	krb5 roken  vers
 
 .include <bsd.prog.mk>
 

Modified: projects/clang350-import/kerberos5/usr.sbin/iprop-log/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.sbin/iprop-log/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.sbin/iprop-log/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -8,10 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl \
 		-I.
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \
-	${LIBVERS} -ledit
+LIBADD=	kadm5srv hdb krb5 roken edit sl vers
 
 iprop-commands.h: iprop-commands.in
 	${SLC} ${.ALLSRC:M*.in}

Modified: projects/clang350-import/kerberos5/usr.sbin/kstash/Makefile
==============================================================================
--- projects/clang350-import/kerberos5/usr.sbin/kstash/Makefile	Tue Nov 25 21:18:18 2014	(r275077)
+++ projects/clang350-import/kerberos5/usr.sbin/kstash/Makefile	Tue Nov 25 21:43:01 2014	(r275078)
@@ -4,10 +4,9 @@ PROG=	kstash
 MAN=	kstash.8
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt ${LDAPLDADD}
+LIBADD=	hdb krb5 crypto vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
