Date: Wed, 26 Nov 2014 11:41:14 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275111 - in projects/sendfile: . bin/csh bin/df bin/ed bin/ls bin/pkill bin/ps bin/rmail bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/llvm/tools/lldb/docs contrib/mdocm... Message-ID: <201411261141.sAQBfEK4096858@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Wed Nov 26 11:41:12 2014 New Revision: 275111 URL: https://svnweb.freebsd.org/changeset/base/275111 Log: Merge head r258543 through r275110. Added: projects/sendfile/lib/libgpio/ - copied from r275110, head/lib/libgpio/ projects/sendfile/sys/dev/beri/virtio/virtio.c - copied unchanged from r275110, head/sys/dev/beri/virtio/virtio.c projects/sendfile/sys/dev/beri/virtio/virtio.h - copied unchanged from r275110, head/sys/dev/beri/virtio/virtio.h projects/sendfile/sys/dev/beri/virtio/virtio_block.c - copied unchanged from r275110, head/sys/dev/beri/virtio/virtio_block.c projects/sendfile/sys/mips/conf/WZR-HPAG300H - copied unchanged from r275110, head/sys/mips/conf/WZR-HPAG300H projects/sendfile/sys/mips/conf/WZR-HPAG300H.hints - copied unchanged from r275110, head/sys/mips/conf/WZR-HPAG300H.hints Deleted: projects/sendfile/usr.sbin/cron/Makefile.inc projects/sendfile/usr.sbin/fifolog/Makefile.inc Modified: projects/sendfile/MAINTAINERS (contents, props changed) projects/sendfile/ObsoleteFiles.inc projects/sendfile/bin/csh/Makefile projects/sendfile/bin/df/Makefile projects/sendfile/bin/ed/Makefile projects/sendfile/bin/ls/Makefile projects/sendfile/bin/pkill/Makefile projects/sendfile/bin/ps/Makefile projects/sendfile/bin/rmail/Makefile projects/sendfile/bin/sh/Makefile projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/sendfile/contrib/llvm/tools/lldb/docs/lldb.1 projects/sendfile/contrib/mdocml/lib.in projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/sendfile/contrib/ofed/libmlx4/src/cq.c projects/sendfile/contrib/ofed/libmlx4/src/mlx4-abi.h projects/sendfile/contrib/ofed/libmlx4/src/mlx4.c projects/sendfile/contrib/ofed/libmlx4/src/mlx4.h projects/sendfile/contrib/ofed/libmlx4/src/verbs.c projects/sendfile/etc/defaults/rc.conf projects/sendfile/etc/rc.d/automount projects/sendfile/gnu/lib/libdialog/Makefile projects/sendfile/gnu/lib/libgcc/Makefile projects/sendfile/gnu/lib/libreadline/readline/Makefile projects/sendfile/gnu/lib/libstdc++/Makefile projects/sendfile/gnu/usr.bin/binutils/addr2line/addr2line.1 projects/sendfile/gnu/usr.bin/binutils/as/as.1 projects/sendfile/gnu/usr.bin/binutils/ld/ld.1 projects/sendfile/gnu/usr.bin/binutils/nm/nm.1 projects/sendfile/gnu/usr.bin/binutils/objcopy/objcopy.1 projects/sendfile/gnu/usr.bin/binutils/objdump/objdump.1 projects/sendfile/gnu/usr.bin/binutils/readelf/readelf.1 projects/sendfile/gnu/usr.bin/binutils/size/size.1 projects/sendfile/gnu/usr.bin/binutils/strings/strings.1 projects/sendfile/gnu/usr.bin/binutils/strip/strip.1 projects/sendfile/gnu/usr.bin/dialog/Makefile projects/sendfile/gnu/usr.bin/diff/Makefile projects/sendfile/gnu/usr.bin/gdb/gdb/Makefile projects/sendfile/gnu/usr.bin/gdb/gdbtui/Makefile projects/sendfile/gnu/usr.bin/gdb/kgdb/Makefile projects/sendfile/gnu/usr.bin/grep/Makefile projects/sendfile/gnu/usr.bin/groff/tmac/Makefile projects/sendfile/kerberos5/Makefile.inc projects/sendfile/kerberos5/lib/libasn1/Makefile projects/sendfile/kerberos5/lib/libgssapi_krb5/Makefile projects/sendfile/kerberos5/lib/libgssapi_ntlm/Makefile projects/sendfile/kerberos5/lib/libgssapi_spnego/Makefile projects/sendfile/kerberos5/lib/libhdb/Makefile projects/sendfile/kerberos5/lib/libheimbase/Makefile projects/sendfile/kerberos5/lib/libheimipcc/Makefile projects/sendfile/kerberos5/lib/libheimipcs/Makefile projects/sendfile/kerberos5/lib/libheimntlm/Makefile projects/sendfile/kerberos5/lib/libheimsqlite/Makefile projects/sendfile/kerberos5/lib/libhx509/Makefile projects/sendfile/kerberos5/lib/libkadm5clnt/Makefile projects/sendfile/kerberos5/lib/libkadm5srv/Makefile projects/sendfile/kerberos5/lib/libkafs5/Makefile projects/sendfile/kerberos5/lib/libkdc/Makefile projects/sendfile/kerberos5/lib/libkrb5/Makefile projects/sendfile/kerberos5/lib/libroken/Makefile projects/sendfile/kerberos5/lib/libwind/Makefile projects/sendfile/kerberos5/libexec/digest-service/Makefile projects/sendfile/kerberos5/libexec/hprop/Makefile projects/sendfile/kerberos5/libexec/hpropd/Makefile projects/sendfile/kerberos5/libexec/ipropd-master/Makefile projects/sendfile/kerberos5/libexec/ipropd-slave/Makefile projects/sendfile/kerberos5/libexec/kadmind/Makefile projects/sendfile/kerberos5/libexec/kcm/Makefile projects/sendfile/kerberos5/libexec/kdc/Makefile projects/sendfile/kerberos5/libexec/kdigest/Makefile projects/sendfile/kerberos5/libexec/kfd/Makefile projects/sendfile/kerberos5/libexec/kimpersonate/Makefile projects/sendfile/kerberos5/libexec/kpasswdd/Makefile projects/sendfile/kerberos5/tools/asn1_compile/Makefile projects/sendfile/kerberos5/tools/slc/Makefile projects/sendfile/kerberos5/usr.bin/hxtool/Makefile projects/sendfile/kerberos5/usr.bin/kadmin/Makefile projects/sendfile/kerberos5/usr.bin/kcc/Makefile projects/sendfile/kerberos5/usr.bin/kdestroy/Makefile projects/sendfile/kerberos5/usr.bin/kf/Makefile projects/sendfile/kerberos5/usr.bin/kgetcred/Makefile projects/sendfile/kerberos5/usr.bin/kinit/Makefile projects/sendfile/kerberos5/usr.bin/kpasswd/Makefile projects/sendfile/kerberos5/usr.bin/ksu/Makefile projects/sendfile/kerberos5/usr.bin/string2key/Makefile projects/sendfile/kerberos5/usr.bin/verify_krb5_conf/Makefile projects/sendfile/kerberos5/usr.sbin/iprop-log/Makefile projects/sendfile/kerberos5/usr.sbin/kstash/Makefile projects/sendfile/kerberos5/usr.sbin/ktutil/Makefile projects/sendfile/lib/Makefile projects/sendfile/lib/atf/libatf-c++/Makefile projects/sendfile/lib/libarchive/Makefile projects/sendfile/lib/libarchive/test/Makefile projects/sendfile/lib/libbsnmp/libbsnmp/Makefile projects/sendfile/lib/libc++/Makefile projects/sendfile/lib/libc/Makefile projects/sendfile/lib/libc/gen/errlst.c projects/sendfile/lib/libc/gen/isnan.c projects/sendfile/lib/libc/gen/syslog.c projects/sendfile/lib/libc/gen/tls.c projects/sendfile/lib/libc/include/errlst.h projects/sendfile/lib/libc/net/base64.c projects/sendfile/lib/libc/net/getifaddrs.3 projects/sendfile/lib/libc/net/nsdispatch.c projects/sendfile/lib/libc/sys/mount.2 projects/sendfile/lib/libc/sys/poll.2 projects/sendfile/lib/libc/sys/stack_protector.c projects/sendfile/lib/libc/sys/stack_protector_compat.c projects/sendfile/lib/libc/tests/ssp/Makefile projects/sendfile/lib/libcam/Makefile projects/sendfile/lib/libcapsicum/Makefile projects/sendfile/lib/libcasper/Makefile projects/sendfile/lib/libcrypt/tests/Makefile projects/sendfile/lib/libcuse/Makefile projects/sendfile/lib/libdevstat/Makefile projects/sendfile/lib/libdpv/Makefile projects/sendfile/lib/libdpv/dpv.3 projects/sendfile/lib/libdwarf/Makefile projects/sendfile/lib/libedit/Makefile projects/sendfile/lib/libexecinfo/Makefile projects/sendfile/lib/libfetch/Makefile projects/sendfile/lib/libgeom/Makefile projects/sendfile/lib/libjail/jail.c projects/sendfile/lib/libjail/jail_getid.c projects/sendfile/lib/libkiconv/quirks.c projects/sendfile/lib/libkiconv/xlat16_iconv.c projects/sendfile/lib/libkiconv/xlat16_sysctl.c projects/sendfile/lib/libldns/Makefile projects/sendfile/lib/libmagic/Makefile projects/sendfile/lib/libmd/rmd160c.c projects/sendfile/lib/libmd/sha1c.c projects/sendfile/lib/libmemstat/Makefile projects/sendfile/lib/libmp/Makefile projects/sendfile/lib/libmp/tests/Makefile projects/sendfile/lib/libnv/tests/Makefile projects/sendfile/lib/libopie/Makefile projects/sendfile/lib/libpam/libpam/tests/Makefile projects/sendfile/lib/libpam/modules/Makefile.inc projects/sendfile/lib/libpam/modules/pam_krb5/Makefile projects/sendfile/lib/libpam/modules/pam_ksu/Makefile projects/sendfile/lib/libpam/modules/pam_nologin/Makefile projects/sendfile/lib/libpam/modules/pam_opie/Makefile projects/sendfile/lib/libpam/modules/pam_opieaccess/Makefile projects/sendfile/lib/libpam/modules/pam_passwdqc/Makefile projects/sendfile/lib/libpam/modules/pam_radius/Makefile projects/sendfile/lib/libpam/modules/pam_ssh/Makefile projects/sendfile/lib/libpam/modules/pam_tacplus/Makefile projects/sendfile/lib/libpam/modules/pam_unix/Makefile projects/sendfile/lib/libpjdlog/Makefile projects/sendfile/lib/libproc/Makefile projects/sendfile/lib/libprocstat/Makefile projects/sendfile/lib/libradius/Makefile projects/sendfile/lib/librpcsec_gss/Makefile projects/sendfile/lib/librt/Makefile projects/sendfile/lib/librt/tests/Makefile projects/sendfile/lib/libsmb/Makefile projects/sendfile/lib/libsqlite3/Makefile projects/sendfile/lib/libstdthreads/Makefile projects/sendfile/lib/libtacplus/Makefile projects/sendfile/lib/libthr/thread/thr_exit.c projects/sendfile/lib/libthr/thread/thr_private.h projects/sendfile/lib/libulog/Makefile projects/sendfile/lib/libunbound/Makefile projects/sendfile/lib/libusb/Makefile projects/sendfile/lib/libutil/tests/Makefile projects/sendfile/lib/msun/src/s_isnan.c projects/sendfile/lib/msun/tests/Makefile projects/sendfile/lib/ncurses/form/Makefile projects/sendfile/lib/ncurses/menu/Makefile projects/sendfile/lib/ncurses/panel/Makefile projects/sendfile/libexec/atf/atf-check/Makefile projects/sendfile/libexec/atf/atf-sh/Makefile projects/sendfile/libexec/atrun/Makefile projects/sendfile/libexec/casper/dns/Makefile projects/sendfile/libexec/casper/grp/Makefile projects/sendfile/libexec/casper/pwd/Makefile projects/sendfile/libexec/casper/random/Makefile projects/sendfile/libexec/casper/sysctl/Makefile projects/sendfile/libexec/dma/Makefile projects/sendfile/libexec/fingerd/Makefile projects/sendfile/libexec/ftpd/Makefile projects/sendfile/libexec/getty/Makefile projects/sendfile/libexec/mail.local/Makefile projects/sendfile/libexec/pppoed/Makefile projects/sendfile/libexec/rlogind/Makefile projects/sendfile/libexec/rpc.rquotad/Makefile projects/sendfile/libexec/rpc.rstatd/Makefile projects/sendfile/libexec/rpc.rusersd/Makefile projects/sendfile/libexec/rpc.rwalld/Makefile projects/sendfile/libexec/rpc.sprayd/Makefile projects/sendfile/libexec/rshd/Makefile projects/sendfile/libexec/rtld-elf/Makefile projects/sendfile/libexec/rtld-elf/rtld.c projects/sendfile/libexec/smrsh/Makefile projects/sendfile/libexec/tcpd/Makefile projects/sendfile/libexec/telnetd/Makefile projects/sendfile/libexec/tftpd/Makefile projects/sendfile/libexec/ulog-helper/Makefile projects/sendfile/libexec/ypxfr/Makefile projects/sendfile/release/picobsd/tinyware/login/Makefile projects/sendfile/release/picobsd/tinyware/oinit/Makefile projects/sendfile/release/picobsd/tinyware/passwd/Makefile projects/sendfile/sbin/atm/atmconfig/Makefile projects/sendfile/sbin/badsect/Makefile projects/sendfile/sbin/bsdlabel/Makefile projects/sendfile/sbin/camcontrol/Makefile projects/sendfile/sbin/casperd/Makefile projects/sendfile/sbin/ccdconfig/Makefile projects/sendfile/sbin/ddb/Makefile projects/sendfile/sbin/devd/Makefile projects/sendfile/sbin/dhclient/Makefile projects/sendfile/sbin/dmesg/Makefile projects/sendfile/sbin/dumpfs/Makefile projects/sendfile/sbin/fdisk/Makefile projects/sendfile/sbin/fdisk_pc98/Makefile projects/sendfile/sbin/ffsinfo/Makefile projects/sendfile/sbin/fsck_ffs/Makefile projects/sendfile/sbin/fsck_ffs/dir.c projects/sendfile/sbin/fsdb/Makefile projects/sendfile/sbin/gbde/Makefile projects/sendfile/sbin/geom/Makefile projects/sendfile/sbin/geom/class/eli/Makefile projects/sendfile/sbin/geom/class/journal/Makefile projects/sendfile/sbin/geom/class/mirror/Makefile projects/sendfile/sbin/geom/class/part/Makefile projects/sendfile/sbin/geom/class/raid/Makefile projects/sendfile/sbin/geom/class/raid3/Makefile projects/sendfile/sbin/geom/core/Makefile projects/sendfile/sbin/ggate/ggatec/Makefile projects/sendfile/sbin/ggate/ggated/Makefile projects/sendfile/sbin/ggate/ggatel/Makefile projects/sendfile/sbin/growfs/Makefile projects/sendfile/sbin/gvinum/Makefile projects/sendfile/sbin/hastctl/Makefile projects/sendfile/sbin/hastd/Makefile projects/sendfile/sbin/ifconfig/Makefile projects/sendfile/sbin/init/Makefile projects/sendfile/sbin/ipf/Makefile.inc projects/sendfile/sbin/ipf/ipf/Makefile projects/sendfile/sbin/ipf/ipfstat/Makefile projects/sendfile/sbin/ipf/ipsend/Makefile projects/sendfile/sbin/ipfw/Makefile projects/sendfile/sbin/ipfw/ipfw.8 projects/sendfile/sbin/iscontrol/Makefile projects/sendfile/sbin/md5/Makefile projects/sendfile/sbin/mdconfig/Makefile projects/sendfile/sbin/mount/Makefile projects/sendfile/sbin/mount_cd9660/Makefile projects/sendfile/sbin/mount_msdosfs/Makefile projects/sendfile/sbin/mount_udf/Makefile projects/sendfile/sbin/nandfs/Makefile projects/sendfile/sbin/natd/Makefile projects/sendfile/sbin/newfs/Makefile projects/sendfile/sbin/newfs_nandfs/Makefile projects/sendfile/sbin/pfctl/Makefile projects/sendfile/sbin/pflogd/Makefile projects/sendfile/sbin/ping/Makefile projects/sendfile/sbin/ping6/Makefile projects/sendfile/sbin/quotacheck/Makefile projects/sendfile/sbin/rcorder/Makefile projects/sendfile/sbin/routed/Makefile projects/sendfile/sbin/routed/rtquery/Makefile projects/sendfile/sbin/savecore/Makefile projects/sendfile/sbin/setkey/Makefile projects/sendfile/sbin/sunlabel/Makefile projects/sendfile/sbin/swapon/Makefile projects/sendfile/sbin/tunefs/Makefile projects/sendfile/secure/lib/libssh/Makefile projects/sendfile/secure/lib/libssl/Makefile projects/sendfile/secure/libexec/sftp-server/Makefile projects/sendfile/secure/libexec/ssh-keysign/Makefile projects/sendfile/secure/libexec/ssh-pkcs11-helper/Makefile projects/sendfile/secure/usr.bin/bdes/Makefile projects/sendfile/secure/usr.bin/openssl/Makefile projects/sendfile/secure/usr.bin/scp/Makefile projects/sendfile/secure/usr.bin/sftp/Makefile projects/sendfile/secure/usr.bin/ssh-add/Makefile projects/sendfile/secure/usr.bin/ssh-agent/Makefile projects/sendfile/secure/usr.bin/ssh-keygen/Makefile projects/sendfile/secure/usr.bin/ssh-keyscan/Makefile projects/sendfile/secure/usr.bin/ssh/Makefile projects/sendfile/secure/usr.sbin/sshd/Makefile projects/sendfile/share/man/man4/gre.4 projects/sendfile/share/man/man4/man4.arm/cgem.4 projects/sendfile/share/man/man4/me.4 projects/sendfile/share/man/man4/netmap.4 projects/sendfile/share/man/man9/Makefile projects/sendfile/share/man/man9/get_cyclecount.9 projects/sendfile/share/man/man9/malloc.9 projects/sendfile/share/man/man9/sleepqueue.9 projects/sendfile/share/man/man9/timeout.9 projects/sendfile/share/mk/bsd.libnames.mk projects/sendfile/share/mk/src.libnames.mk projects/sendfile/sys/amd64/include/asm.h projects/sendfile/sys/amd64/vmm/vmm.c projects/sendfile/sys/arm/altera/socfpga/files.socfpga projects/sendfile/sys/arm/altera/socfpga/socfpga_machdep.c projects/sendfile/sys/arm/conf/SOCKIT-BERI projects/sendfile/sys/arm/include/asm.h projects/sendfile/sys/arm/include/cpuconf.h projects/sendfile/sys/boot/common/zfsloader.8 projects/sendfile/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts projects/sendfile/sys/boot/i386/boot2/boot2.c projects/sendfile/sys/boot/i386/gptzfsboot/gptzfsboot.8 projects/sendfile/sys/cam/ctl/ctl.c projects/sendfile/sys/cam/ctl/ctl_backend_block.c projects/sendfile/sys/cam/ctl/ctl_backend_ramdisk.c projects/sendfile/sys/cam/ctl/ctl_frontend.c projects/sendfile/sys/cam/ctl/ctl_frontend_cam_sim.c projects/sendfile/sys/cam/ctl/ctl_frontend_internal.c projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c projects/sendfile/sys/cam/ctl/ctl_io.h projects/sendfile/sys/cam/ctl/ctl_private.h projects/sendfile/sys/cam/ctl/ctl_tpc.c projects/sendfile/sys/cam/ctl/scsi_ctl.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/sendfile/sys/conf/files projects/sendfile/sys/conf/files.amd64 projects/sendfile/sys/conf/files.arm projects/sendfile/sys/conf/files.i386 projects/sendfile/sys/conf/options.arm projects/sendfile/sys/contrib/dev/ral/Makefile projects/sendfile/sys/dev/ahci/ahci_pci.c projects/sendfile/sys/dev/ata/ata-pci.h projects/sendfile/sys/dev/ata/chipsets/ata-intel.c projects/sendfile/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c projects/sendfile/sys/dev/ffec/if_ffec.c projects/sendfile/sys/dev/ichsmb/ichsmb_pci.c projects/sendfile/sys/dev/ichwd/ichwd.c projects/sendfile/sys/dev/ichwd/ichwd.h projects/sendfile/sys/dev/mpt/mpt.c projects/sendfile/sys/dev/sound/pci/hda/hdac.c projects/sendfile/sys/dev/sound/pci/hda/hdac.h projects/sendfile/sys/dev/sound/usb/uaudio.c projects/sendfile/sys/dev/uart/uart_bus_pci.c projects/sendfile/sys/dev/usb/controller/ehci_pci.c projects/sendfile/sys/dev/usb/controller/ohci_pci.c projects/sendfile/sys/dev/usb/controller/xhci_pci.c projects/sendfile/sys/dev/usb/quirk/usb_quirk.c projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/i386/i386/machdep.c projects/sendfile/sys/i386/include/asm.h projects/sendfile/sys/kern/kern_descrip.c projects/sendfile/sys/kern/subr_bus.c projects/sendfile/sys/mips/include/cache_mipsNN.h projects/sendfile/sys/net/if_tap.c projects/sendfile/sys/netinet6/nd6.c projects/sendfile/sys/powerpc/include/asm.h projects/sendfile/sys/powerpc/include/profile.h projects/sendfile/sys/sparc64/include/asm.h projects/sendfile/sys/sys/bus.h projects/sendfile/sys/sys/callout.h projects/sendfile/sys/vm/swap_pager.c projects/sendfile/sys/vm/vnode_pager.c projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc projects/sendfile/tools/tools/ath/athaggrstats/Makefile projects/sendfile/tools/tools/ath/athstats/Makefile projects/sendfile/tools/tools/mwl/mwlstats/Makefile projects/sendfile/tools/tools/net80211/wlanstats/Makefile projects/sendfile/tools/tools/npe/npestats/Makefile projects/sendfile/usr.bin/apply/Makefile projects/sendfile/usr.bin/ar/Makefile projects/sendfile/usr.bin/atm/sscop/Makefile projects/sendfile/usr.bin/awk/Makefile projects/sendfile/usr.bin/bc/Makefile projects/sendfile/usr.bin/bluetooth/bthost/Makefile projects/sendfile/usr.bin/bluetooth/btsockstat/Makefile projects/sendfile/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/sendfile/usr.bin/bsdiff/bsdiff/Makefile projects/sendfile/usr.bin/bsdiff/bspatch/Makefile projects/sendfile/usr.bin/bzip2/Makefile projects/sendfile/usr.bin/calendar/Makefile projects/sendfile/usr.bin/chkey/Makefile projects/sendfile/usr.bin/chpass/Makefile projects/sendfile/usr.bin/clang/clang/clang.1 projects/sendfile/usr.bin/colldef/Makefile projects/sendfile/usr.bin/compile_et/Makefile projects/sendfile/usr.bin/cpio/Makefile projects/sendfile/usr.bin/cpio/test/Makefile projects/sendfile/usr.bin/dc/Makefile projects/sendfile/usr.bin/demandoc/Makefile projects/sendfile/usr.bin/dpv/Makefile projects/sendfile/usr.bin/dpv/dpv.1 projects/sendfile/usr.bin/drill/Makefile projects/sendfile/usr.bin/du/Makefile projects/sendfile/usr.bin/ee/Makefile projects/sendfile/usr.bin/elfdump/elfdump.c projects/sendfile/usr.bin/enigma/Makefile projects/sendfile/usr.bin/fetch/Makefile projects/sendfile/usr.bin/file/Makefile projects/sendfile/usr.bin/fstat/Makefile projects/sendfile/usr.bin/ftp/Makefile projects/sendfile/usr.bin/gcore/Makefile projects/sendfile/usr.bin/grep/Makefile projects/sendfile/usr.bin/gzip/Makefile projects/sendfile/usr.bin/host/Makefile projects/sendfile/usr.bin/ipcrm/Makefile projects/sendfile/usr.bin/ipcs/Makefile projects/sendfile/usr.bin/iscsictl/Makefile projects/sendfile/usr.bin/kdump/Makefile projects/sendfile/usr.bin/keylogin/Makefile projects/sendfile/usr.bin/killall/Makefile projects/sendfile/usr.bin/ktrdump/Makefile projects/sendfile/usr.bin/less/Makefile projects/sendfile/usr.bin/lex/lex.1 projects/sendfile/usr.bin/limits/Makefile projects/sendfile/usr.bin/lock/Makefile projects/sendfile/usr.bin/login/Makefile projects/sendfile/usr.bin/lzmainfo/Makefile projects/sendfile/usr.bin/m4/Makefile projects/sendfile/usr.bin/makewhatis/Makefile projects/sendfile/usr.bin/mandoc/Makefile projects/sendfile/usr.bin/minigzip/Makefile projects/sendfile/usr.bin/ministat/Makefile projects/sendfile/usr.bin/mkimg/Makefile projects/sendfile/usr.bin/mkulzma/Makefile projects/sendfile/usr.bin/mkuzip/Makefile projects/sendfile/usr.bin/msgs/Makefile projects/sendfile/usr.bin/nc/Makefile projects/sendfile/usr.bin/ncal/Makefile projects/sendfile/usr.bin/netstat/Makefile projects/sendfile/usr.bin/newgrp/Makefile projects/sendfile/usr.bin/newkey/Makefile projects/sendfile/usr.bin/nfsstat/Makefile projects/sendfile/usr.bin/opieinfo/Makefile projects/sendfile/usr.bin/opiekey/Makefile projects/sendfile/usr.bin/opiepasswd/Makefile projects/sendfile/usr.bin/pamtest/Makefile projects/sendfile/usr.bin/passwd/Makefile projects/sendfile/usr.bin/procstat/Makefile projects/sendfile/usr.bin/quota/Makefile projects/sendfile/usr.bin/rctl/Makefile projects/sendfile/usr.bin/rup/Makefile projects/sendfile/usr.bin/rusers/Makefile projects/sendfile/usr.bin/script/Makefile projects/sendfile/usr.bin/seq/Makefile projects/sendfile/usr.bin/smbutil/Makefile projects/sendfile/usr.bin/sort/Makefile projects/sendfile/usr.bin/split/Makefile projects/sendfile/usr.bin/su/Makefile projects/sendfile/usr.bin/svn/svn/Makefile projects/sendfile/usr.bin/svn/svnadmin/Makefile projects/sendfile/usr.bin/svn/svndumpfilter/Makefile projects/sendfile/usr.bin/svn/svnlook/Makefile projects/sendfile/usr.bin/svn/svnmucc/Makefile projects/sendfile/usr.bin/svn/svnrdump/Makefile projects/sendfile/usr.bin/svn/svnserve/Makefile projects/sendfile/usr.bin/svn/svnsync/Makefile projects/sendfile/usr.bin/svn/svnversion/Makefile projects/sendfile/usr.bin/systat/Makefile projects/sendfile/usr.bin/tabs/Makefile projects/sendfile/usr.bin/talk/Makefile projects/sendfile/usr.bin/tar/Makefile projects/sendfile/usr.bin/telnet/Makefile projects/sendfile/usr.bin/tftp/Makefile projects/sendfile/usr.bin/top/Makefile projects/sendfile/usr.bin/tput/Makefile projects/sendfile/usr.bin/truncate/Makefile projects/sendfile/usr.bin/tset/Makefile projects/sendfile/usr.bin/ul/Makefile projects/sendfile/usr.bin/units/Makefile projects/sendfile/usr.bin/unzip/Makefile projects/sendfile/usr.bin/usbhidaction/Makefile projects/sendfile/usr.bin/usbhidctl/Makefile projects/sendfile/usr.bin/vacation/Makefile projects/sendfile/usr.bin/vi/Makefile projects/sendfile/usr.bin/vmstat/Makefile projects/sendfile/usr.bin/w/Makefile projects/sendfile/usr.bin/wc/Makefile projects/sendfile/usr.bin/xinstall/Makefile projects/sendfile/usr.bin/xlint/lint1/Makefile projects/sendfile/usr.bin/xo/Makefile projects/sendfile/usr.bin/xz/Makefile projects/sendfile/usr.bin/xzdec/Makefile projects/sendfile/usr.sbin/acpi/acpidb/Makefile projects/sendfile/usr.sbin/amd/Makefile.inc projects/sendfile/usr.sbin/amd/amd/Makefile projects/sendfile/usr.sbin/amd/amq/Makefile projects/sendfile/usr.sbin/amd/fixmount/Makefile projects/sendfile/usr.sbin/amd/fsinfo/Makefile projects/sendfile/usr.sbin/amd/hlfsd/Makefile projects/sendfile/usr.sbin/amd/mk-amd-map/Makefile projects/sendfile/usr.sbin/amd/pawd/Makefile projects/sendfile/usr.sbin/amd/wire-test/Makefile projects/sendfile/usr.sbin/ancontrol/Makefile projects/sendfile/usr.sbin/apmd/Makefile projects/sendfile/usr.sbin/asf/Makefile projects/sendfile/usr.sbin/audit/Makefile projects/sendfile/usr.sbin/auditd/Makefile projects/sendfile/usr.sbin/auditdistd/Makefile projects/sendfile/usr.sbin/auditreduce/Makefile projects/sendfile/usr.sbin/authpf/Makefile projects/sendfile/usr.sbin/autofs/Makefile projects/sendfile/usr.sbin/bhyve/Makefile projects/sendfile/usr.sbin/bhyvectl/Makefile projects/sendfile/usr.sbin/bhyveload/Makefile projects/sendfile/usr.sbin/bluetooth/ath3kfw/Makefile projects/sendfile/usr.sbin/bluetooth/bt3cfw/Makefile projects/sendfile/usr.sbin/bluetooth/bthidcontrol/Makefile projects/sendfile/usr.sbin/bluetooth/bthidd/Makefile projects/sendfile/usr.sbin/bluetooth/btpand/Makefile projects/sendfile/usr.sbin/bluetooth/hccontrol/Makefile projects/sendfile/usr.sbin/bluetooth/hcsecd/Makefile projects/sendfile/usr.sbin/bluetooth/hcseriald/Makefile projects/sendfile/usr.sbin/bluetooth/l2control/Makefile projects/sendfile/usr.sbin/bluetooth/l2ping/Makefile projects/sendfile/usr.sbin/bluetooth/rfcomm_pppd/Makefile projects/sendfile/usr.sbin/bluetooth/sdpcontrol/Makefile projects/sendfile/usr.sbin/boot0cfg/Makefile projects/sendfile/usr.sbin/boot98cfg/Makefile projects/sendfile/usr.sbin/bsdinstall/distextract/Makefile projects/sendfile/usr.sbin/bsdinstall/distfetch/Makefile projects/sendfile/usr.sbin/bsdinstall/partedit/Makefile projects/sendfile/usr.sbin/bsnmpd/bsnmpd/Makefile projects/sendfile/usr.sbin/bsnmpd/modules/snmp_hast/Makefile projects/sendfile/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile projects/sendfile/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile projects/sendfile/usr.sbin/bsnmpd/tools/bsnmptools/Makefile projects/sendfile/usr.sbin/cdcontrol/Makefile projects/sendfile/usr.sbin/ckdist/Makefile projects/sendfile/usr.sbin/clear_locks/Makefile projects/sendfile/usr.sbin/config/Makefile projects/sendfile/usr.sbin/config/main.c projects/sendfile/usr.sbin/config/mkmakefile.c projects/sendfile/usr.sbin/cron/cron/Makefile projects/sendfile/usr.sbin/cron/crontab/Makefile projects/sendfile/usr.sbin/ctladm/Makefile projects/sendfile/usr.sbin/ctld/Makefile projects/sendfile/usr.sbin/ctld/ctl.conf.5 projects/sendfile/usr.sbin/ctm/ctm/Makefile projects/sendfile/usr.sbin/ctm/mkCTM/Makefile projects/sendfile/usr.sbin/daemon/Makefile projects/sendfile/usr.sbin/dconschat/Makefile projects/sendfile/usr.sbin/devinfo/Makefile projects/sendfile/usr.sbin/diskinfo/Makefile projects/sendfile/usr.sbin/editmap/Makefile projects/sendfile/usr.sbin/edquota/Makefile projects/sendfile/usr.sbin/fifolog/fifolog_create/Makefile projects/sendfile/usr.sbin/fifolog/fifolog_reader/Makefile projects/sendfile/usr.sbin/fifolog/fifolog_writer/Makefile projects/sendfile/usr.sbin/flowctl/Makefile projects/sendfile/usr.sbin/ftp-proxy/Makefile projects/sendfile/usr.sbin/gssd/Makefile projects/sendfile/usr.sbin/gstat/Makefile projects/sendfile/usr.sbin/ifmcstat/Makefile projects/sendfile/usr.sbin/inetd/Makefile projects/sendfile/usr.sbin/iostat/Makefile projects/sendfile/usr.sbin/ipfwpcap/Makefile projects/sendfile/usr.sbin/iscsid/Makefile projects/sendfile/usr.sbin/jail/Makefile projects/sendfile/usr.sbin/jail/command.c projects/sendfile/usr.sbin/jail/jail.c projects/sendfile/usr.sbin/jail/state.c projects/sendfile/usr.sbin/jexec/Makefile projects/sendfile/usr.sbin/jls/Makefile projects/sendfile/usr.sbin/kbdcontrol/Makefile projects/sendfile/usr.sbin/keyserv/Makefile projects/sendfile/usr.sbin/kgmon/Makefile projects/sendfile/usr.sbin/lmcconfig/Makefile projects/sendfile/usr.sbin/lpr/Makefile.inc projects/sendfile/usr.sbin/lpr/chkprintcap/Makefile projects/sendfile/usr.sbin/lpr/lpc/Makefile projects/sendfile/usr.sbin/lpr/lpd/Makefile projects/sendfile/usr.sbin/lpr/lpq/Makefile projects/sendfile/usr.sbin/lpr/lpr/Makefile projects/sendfile/usr.sbin/lpr/lprm/Makefile projects/sendfile/usr.sbin/lpr/pac/Makefile projects/sendfile/usr.sbin/mailstats/Makefile projects/sendfile/usr.sbin/mailwrapper/Makefile projects/sendfile/usr.sbin/makefs/Makefile projects/sendfile/usr.sbin/makemap/Makefile projects/sendfile/usr.sbin/mfiutil/Makefile projects/sendfile/usr.sbin/mount_smbfs/Makefile projects/sendfile/usr.sbin/mountd/Makefile projects/sendfile/usr.sbin/moused/Makefile projects/sendfile/usr.sbin/mptutil/Makefile projects/sendfile/usr.sbin/mtree/Makefile projects/sendfile/usr.sbin/nandtool/Makefile projects/sendfile/usr.sbin/ndiscvt/Makefile projects/sendfile/usr.sbin/ngctl/Makefile projects/sendfile/usr.sbin/nghook/Makefile projects/sendfile/usr.sbin/nmtree/Makefile projects/sendfile/usr.sbin/nscd/Makefile projects/sendfile/usr.sbin/ntp/Makefile.inc projects/sendfile/usr.sbin/ntp/ntp-keygen/Makefile projects/sendfile/usr.sbin/ntp/ntpd/Makefile projects/sendfile/usr.sbin/ntp/ntpdate/Makefile projects/sendfile/usr.sbin/ntp/ntpdc/Makefile projects/sendfile/usr.sbin/ntp/ntpq/Makefile projects/sendfile/usr.sbin/ntp/ntptime/Makefile projects/sendfile/usr.sbin/ntp/sntp/Makefile projects/sendfile/usr.sbin/pkg/Makefile projects/sendfile/usr.sbin/pmccontrol/Makefile projects/sendfile/usr.sbin/pmcstat/Makefile projects/sendfile/usr.sbin/powerd/Makefile projects/sendfile/usr.sbin/ppp/Makefile projects/sendfile/usr.sbin/pppctl/Makefile projects/sendfile/usr.sbin/praliases/Makefile projects/sendfile/usr.sbin/praudit/Makefile projects/sendfile/usr.sbin/pstat/Makefile projects/sendfile/usr.sbin/pw/Makefile projects/sendfile/usr.sbin/quotaon/Makefile projects/sendfile/usr.sbin/rarpd/Makefile projects/sendfile/usr.sbin/repquota/Makefile projects/sendfile/usr.sbin/rpc.lockd/Makefile projects/sendfile/usr.sbin/rpc.statd/Makefile projects/sendfile/usr.sbin/rpc.yppasswdd/Makefile projects/sendfile/usr.sbin/rpc.ypupdated/Makefile projects/sendfile/usr.sbin/rpc.ypxfrd/Makefile projects/sendfile/usr.sbin/rpcbind/Makefile projects/sendfile/usr.sbin/rrenumd/Makefile projects/sendfile/usr.sbin/rtadvd/Makefile projects/sendfile/usr.sbin/rtsold/Makefile projects/sendfile/usr.sbin/sendmail/Makefile projects/sendfile/usr.sbin/services_mkdb/Makefile projects/sendfile/usr.sbin/snapinfo/Makefile projects/sendfile/usr.sbin/spray/Makefile projects/sendfile/usr.sbin/syslogd/Makefile projects/sendfile/usr.sbin/tcpdchk/Makefile projects/sendfile/usr.sbin/tcpdmatch/Makefile projects/sendfile/usr.sbin/tcpdump/tcpdump/Makefile projects/sendfile/usr.sbin/timed/timed/Makefile projects/sendfile/usr.sbin/traceroute/Makefile projects/sendfile/usr.sbin/traceroute6/Makefile projects/sendfile/usr.sbin/tzsetup/Makefile projects/sendfile/usr.sbin/ugidfw/Makefile projects/sendfile/usr.sbin/uhsoctl/Makefile projects/sendfile/usr.sbin/unbound/anchor/Makefile projects/sendfile/usr.sbin/unbound/checkconf/Makefile projects/sendfile/usr.sbin/unbound/control/Makefile projects/sendfile/usr.sbin/unbound/daemon/Makefile projects/sendfile/usr.sbin/usbconfig/Makefile projects/sendfile/usr.sbin/vipw/Makefile projects/sendfile/usr.sbin/watch/Makefile projects/sendfile/usr.sbin/watchdogd/Makefile projects/sendfile/usr.sbin/wpa/Makefile.crypto projects/sendfile/usr.sbin/wpa/hostapd/Makefile projects/sendfile/usr.sbin/wpa/hostapd_cli/Makefile projects/sendfile/usr.sbin/wpa/wpa_cli/Makefile projects/sendfile/usr.sbin/wpa/wpa_passphrase/Makefile projects/sendfile/usr.sbin/wpa/wpa_priv/Makefile projects/sendfile/usr.sbin/wpa/wpa_supplicant/Makefile projects/sendfile/usr.sbin/ypserv/Makefile Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/contrib/llvm/ (props changed) projects/sendfile/contrib/llvm/tools/lldb/ (props changed) projects/sendfile/contrib/mdocml/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/gnu/lib/ (props changed) projects/sendfile/gnu/usr.bin/binutils/ (props changed) projects/sendfile/gnu/usr.bin/gdb/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/lib/libutil/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/sbin/ipfw/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/amd64/vmm/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/usr.bin/calendar/ (props changed) projects/sendfile/usr.bin/mkimg/ (props changed) projects/sendfile/usr.bin/procstat/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) projects/sendfile/usr.sbin/bhyvectl/ (props changed) projects/sendfile/usr.sbin/bhyveload/ (props changed) projects/sendfile/usr.sbin/jail/ (props changed) projects/sendfile/usr.sbin/ndiscvt/ (props changed) projects/sendfile/usr.sbin/rtadvd/ (props changed) projects/sendfile/usr.sbin/rtsold/ (props changed) Modified: projects/sendfile/MAINTAINERS ============================================================================== --- projects/sendfile/MAINTAINERS Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/MAINTAINERS Wed Nov 26 11:41:12 2014 (r275111) @@ -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@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/ObsoleteFiles.inc Wed Nov 26 11:41:12 2014 (r275111) @@ -44,6 +44,8 @@ OLD_FILES+=usr/share/man/man4/faith.4.gz OLD_FILES+=usr/share/man/man4/if_faith.4.gz OLD_FILES+=usr/sbin/faithd OLD_FILES+=usr/share/man/man8/faithd.8.gz +# 20141107: overhaul if_gre(4) +OLD_FILES+=usr/include/netinet/ip_gre.h # 20141102: postrandom obsoleted by new /dev/random code OLD_FILES+=etc/rc.d/postrandom # 20141031: initrandom obsoleted by new /dev/random code Modified: projects/sendfile/bin/csh/Makefile ============================================================================== --- projects/sendfile/bin/csh/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/csh/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/bin/df/Makefile ============================================================================== --- projects/sendfile/bin/df/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/df/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/bin/ed/Makefile ============================================================================== --- projects/sendfile/bin/ed/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/ed/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/bin/ls/Makefile ============================================================================== --- projects/sendfile/bin/ls/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/ls/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/bin/pkill/Makefile ============================================================================== --- projects/sendfile/bin/pkill/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/pkill/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -5,8 +5,7 @@ PROG= pkill -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 Modified: projects/sendfile/bin/ps/Makefile ============================================================================== --- projects/sendfile/bin/ps/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/ps/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/bin/rmail/Makefile ============================================================================== --- projects/sendfile/bin/rmail/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/rmail/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/bin/sh/Makefile ============================================================================== --- projects/sendfile/bin/sh/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/bin/sh/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/contrib/llvm/tools/lldb/docs/lldb.1 ============================================================================== --- projects/sendfile/contrib/llvm/tools/lldb/docs/lldb.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/llvm/tools/lldb/docs/lldb.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -1,4 +1,4 @@ -.Dd 7 June, 2012 \" DATE +.Dd June 7, 2012 \" DATE .Dt LLDB 1 \" Program name and manual section number .Os Darwin \" Operating System .Sh NAME \" Section Header - required - don't modify @@ -15,30 +15,30 @@ .Ar [[--] <PROGRAM-ARG1> <PROGRAM-ARG2> ...] .Sh DESCRIPTION \" Section Header - required - don't modify .Nm -is the command line interface for the LLDB debugger library. +is the command line interface for the LLDB debugger library. .Nm can debug C, C++, Objective-C, and Objective-C++ programs. .Pp The following options are available: .Bl -tag -width indent -.It Fl h, -help -Prints out the usage information for the +.It Fl h, -help +Prints out the usage information for the .Nm debugger. The \fB\-\-help\fR text may be more up-to-date and authoritative than the command line options described in this man page. -.It Fl v, -version -Prints out the version number of the -.Nm +.It Fl v, -version +Prints out the version number of the +.Nm debugger. .It Fl a, -arch Ar arch -Specifies which architecture +Specifies which architecture .Nm will use when launching the specified program (assuming the provided executable is built for multiple architectures.) .It Fl f, -file Ar filename Specifies the executable file that -.nm +.Nm will be launching / attaching to. .It Fl n, -attach-name Ar process-name Specifies the name of a currently-running process to attach to. @@ -60,10 +60,10 @@ Currently only the Python extensions hav .It Fl d, -debug Tells the debugger to print out extra information for debugging itself. .It Fl s, -source Ar filename -Tells +Tells .Nm to read in and execute the file "\fBfilename\fR", which -should contain +should contain .Nm commands. .It Fl e, -editor @@ -81,7 +81,7 @@ Remember to end the options with "--" if In .Nm there is a \fBhelp\fR command which can be used to find descriptions and examples of -all +all .Nm commands. To get help on "\fBbreakpoint set\fR" you would type "\fBhelp breakpoint set\fR". .Pp @@ -94,18 +94,18 @@ will read settings/aliases/commands from .Pp First, it will read a \fB~/.lldbinit-\fIdebugger\fR command file. If you are using the .Nm -command line interface, this is \fB~/.lldbinit-lldb\fR. If you are using +command line interface, this is \fB~/.lldbinit-lldb\fR. If you are using .Nm inside a GUI debugger like .Nm Xcode this will be \fB~/.lldbinit-Xcode\fR. This is a useful place to put settings that you -want to apply only when a given +want to apply only when a given .Nm command interpreter is used. .Pp Second, \fB~/.lldbinit\fR is read. .Pp -Third, an \fR.lldbinit\fR file in the current working directory (where +Third, an \fR.lldbinit\fR file in the current working directory (where .Nm is started) will be read. .Sh SEE ALSO Modified: projects/sendfile/contrib/mdocml/lib.in ============================================================================== --- projects/sendfile/contrib/mdocml/lib.in Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/mdocml/lib.in Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c ============================================================================== --- projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/contrib/ofed/libmlx4/src/cq.c ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/cq.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/cq.c Wed Nov 26 11:41:12 2014 (r275111) @@ -109,15 +109,16 @@ struct mlx4_err_cqe { static struct mlx4_cqe *get_cqe(struct mlx4_cq *cq, int entry) { - return cq->buf.buf + entry * MLX4_CQ_ENTRY_SIZE; + return cq->buf.buf + entry * cq->cqe_size; } static void *get_sw_cqe(struct mlx4_cq *cq, int n) { struct mlx4_cqe *cqe = get_cqe(cq, n & cq->ibv_cq.cqe); + struct mlx4_cqe *tcqe = cq->cqe_size == 64 ? cqe + 1 : cqe; - return (!!(cqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^ - !!(n & (cq->ibv_cq.cqe + 1))) ? NULL : cqe; + return (!!(tcqe->owner_sr_opcode & MLX4_CQE_OWNER_MASK) ^ + !!(n & (cq->ibv_cq.cqe + 1))) ? NULL : tcqe; } static struct mlx4_cqe *next_cqe_sw(struct mlx4_cq *cq) @@ -402,6 +403,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, uint8_t owner_bit; int nfreed = 0; int is_xrc_srq = 0; + int cqe_inc = cq->cqe_size == 64 ? 1 : 0; if (srq && srq->ibv_srq.xrc_cq) is_xrc_srq = 1; @@ -423,6 +425,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, */ while ((int) --prod_index - (int) cq->cons_index >= 0) { cqe = get_cqe(cq, prod_index & cq->ibv_cq.cqe); + cqe += cqe_inc; if (is_xrc_srq && (ntohl(cqe->g_mlpath_rqpn & 0xffffff) == srq->srqn) && !(cqe->owner_sr_opcode & MLX4_CQE_IS_SEND_MASK)) { @@ -434,6 +437,7 @@ void __mlx4_cq_clean(struct mlx4_cq *cq, ++nfreed; } else if (nfreed) { dest = get_cqe(cq, (prod_index + nfreed) & cq->ibv_cq.cqe); + dest += cqe_inc; owner_bit = dest->owner_sr_opcode & MLX4_CQE_OWNER_MASK; memcpy(dest, cqe, sizeof *cqe); dest->owner_sr_opcode = owner_bit | @@ -473,28 +477,32 @@ void mlx4_cq_resize_copy_cqes(struct mlx { struct mlx4_cqe *cqe; int i; + int cqe_inc = cq->cqe_size == 64 ? 1 : 0; i = cq->cons_index; cqe = get_cqe(cq, (i & old_cqe)); + cqe += cqe_inc; while ((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) != MLX4_CQE_OPCODE_RESIZE) { cqe->owner_sr_opcode = (cqe->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK) | (((i + 1) & (cq->ibv_cq.cqe + 1)) ? MLX4_CQE_OWNER_MASK : 0); - memcpy(buf + ((i + 1) & cq->ibv_cq.cqe) * MLX4_CQ_ENTRY_SIZE, - cqe, MLX4_CQ_ENTRY_SIZE); + memcpy(buf + ((i + 1) & cq->ibv_cq.cqe) * cq->cqe_size, + cqe - cqe_inc, cq->cqe_size); ++i; cqe = get_cqe(cq, (i & old_cqe)); + cqe += cqe_inc; } ++cq->cons_index; } -int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent) +int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent, + int entry_size) { - if (mlx4_alloc_buf(buf, align(nent * MLX4_CQ_ENTRY_SIZE, dev->page_size), + if (mlx4_alloc_buf(buf, align(nent * entry_size, dev->page_size), dev->page_size)) return -1; - memset(buf->buf, 0, nent * MLX4_CQ_ENTRY_SIZE); + memset(buf->buf, 0, nent * entry_size); return 0; } Modified: projects/sendfile/contrib/ofed/libmlx4/src/mlx4-abi.h ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/mlx4-abi.h Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/mlx4-abi.h Wed Nov 26 11:41:12 2014 (r275111) @@ -40,9 +40,11 @@ struct mlx4_alloc_ucontext_resp { struct ibv_get_context_resp ibv_resp; + __u32 dev_caps; __u32 qp_tab_size; __u16 bf_reg_size; __u16 bf_regs_per_page; + __u32 cqe_size; }; struct mlx4_alloc_pd_resp { Modified: projects/sendfile/contrib/ofed/libmlx4/src/mlx4.c ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/mlx4.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/mlx4.c Wed Nov 26 11:41:12 2014 (r275111) @@ -201,6 +201,7 @@ static struct ibv_context *mlx4_alloc_co context->bf_buf_size = 0; } + context->cqe_size = resp.cqe_size; pthread_spin_init(&context->uar_lock, PTHREAD_PROCESS_PRIVATE); context->ibv_ctx.ops = mlx4_ctx_ops; Modified: projects/sendfile/contrib/ofed/libmlx4/src/mlx4.h ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/mlx4.h Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/mlx4.h Wed Nov 26 11:41:12 2014 (r275111) @@ -103,10 +103,6 @@ #endif enum { - MLX4_CQ_ENTRY_SIZE = 0x20 -}; - -enum { MLX4_STAT_RATE_OFFSET = 5 }; @@ -192,6 +188,7 @@ struct mlx4_context { int max_qp_wr; int max_sge; int max_cqe; + int cqe_size; struct { struct mlx4_srq **table; @@ -226,6 +223,7 @@ struct mlx4_cq { uint32_t *set_ci_db; uint32_t *arm_db; int arm_sn; + int cqe_size; }; struct mlx4_srq { @@ -369,7 +367,8 @@ int mlx4_dereg_mr(struct ibv_mr *mr); struct ibv_cq *mlx4_create_cq(struct ibv_context *context, int cqe, struct ibv_comp_channel *channel, int comp_vector); -int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent); +int mlx4_alloc_cq_buf(struct mlx4_device *dev, struct mlx4_buf *buf, int nent, + int entry_size); int mlx4_resize_cq(struct ibv_cq *cq, int cqe); int mlx4_destroy_cq(struct ibv_cq *cq); int mlx4_poll_cq(struct ibv_cq *cq, int ne, struct ibv_wc *wc); Modified: projects/sendfile/contrib/ofed/libmlx4/src/verbs.c ============================================================================== --- projects/sendfile/contrib/ofed/libmlx4/src/verbs.c Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/contrib/ofed/libmlx4/src/verbs.c Wed Nov 26 11:41:12 2014 (r275111) @@ -168,6 +168,7 @@ struct ibv_cq *mlx4_create_cq(struct ibv struct mlx4_create_cq_resp resp; struct mlx4_cq *cq; int ret; + struct mlx4_context *mctx = to_mctx(context); /* Sanity check CQ size before proceeding */ if (cqe > 0x3fffff) @@ -184,9 +185,11 @@ struct ibv_cq *mlx4_create_cq(struct ibv cqe = align_queue_size(cqe + 1); - if (mlx4_alloc_cq_buf(to_mdev(context->device), &cq->buf, cqe)) + if (mlx4_alloc_cq_buf(to_mdev(context->device), &cq->buf, cqe, mctx->cqe_size)) goto err; + cq->cqe_size = mctx->cqe_size; + cq->set_ci_db = mlx4_alloc_db(to_mctx(context), MLX4_DB_TYPE_CQ); if (!cq->set_ci_db) goto err_buf; @@ -247,7 +250,8 @@ int mlx4_resize_cq(struct ibv_cq *ibcq, goto out; } - ret = mlx4_alloc_cq_buf(to_mdev(ibcq->context->device), &buf, cqe); + ret = mlx4_alloc_cq_buf(to_mdev(ibcq->context->device), &buf, cqe, + cq->cqe_size); if (ret) goto out; Modified: projects/sendfile/etc/defaults/rc.conf ============================================================================== --- projects/sendfile/etc/defaults/rc.conf Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/etc/defaults/rc.conf Wed Nov 26 11:41:12 2014 (r275111) @@ -317,7 +317,10 @@ amd_enable="NO" # Run amd service with amd_program="/usr/sbin/amd" # path to amd, if you want a different one. amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map" amd_map_program="NO" # Can be set to "ypcat -k amd.master" -autofs_enable="NO" # Run automountd(8) +autofs_enable="NO" # Run autofs daemons. +automount_flags="" # Flags to automount(8) (if autofs enabled). +automountd_flags="" # Flags to automountd(8) (if autofs enabled). +autounmountd_flags="" # Flags to autounmountd(8) (if autofs enabled). nfs_client_enable="NO" # This host is an NFS client (or NO). nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). Modified: projects/sendfile/etc/rc.d/automount ============================================================================== --- projects/sendfile/etc/rc.d/automount Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/etc/rc.d/automount Wed Nov 26 11:41:12 2014 (r275111) @@ -18,7 +18,7 @@ required_modules="autofs" automount_start() { - /usr/sbin/automount + /usr/sbin/automount ${automount_flags} } automount_stop() Modified: projects/sendfile/gnu/lib/libdialog/Makefile ============================================================================== --- projects/sendfile/gnu/lib/libdialog/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/lib/libdialog/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/gnu/lib/libgcc/Makefile ============================================================================== --- projects/sendfile/gnu/lib/libgcc/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/lib/libgcc/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/gnu/lib/libreadline/readline/Makefile ============================================================================== --- projects/sendfile/gnu/lib/libreadline/readline/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/lib/libreadline/readline/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -23,7 +23,6 @@ ${.OBJDIR}/${_h}: ${SRCDIR}/${_h} ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw .include <bsd.lib.mk> Modified: projects/sendfile/gnu/lib/libstdc++/Makefile ============================================================================== --- projects/sendfile/gnu/lib/libstdc++/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/lib/libstdc++/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/gnu/usr.bin/binutils/addr2line/addr2line.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/addr2line/addr2line.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/addr2line/addr2line.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/as/as.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/as/as.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/as/as.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/ld/ld.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/ld/ld.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/ld/ld.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/nm/nm.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/nm/nm.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/nm/nm.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/objcopy/objcopy.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/objcopy/objcopy.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/objcopy/objcopy.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/objdump/objdump.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/objdump/objdump.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/objdump/objdump.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/readelf/readelf.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/readelf/readelf.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/readelf/readelf.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/size/size.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/size/size.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/size/size.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/strings/strings.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/strings/strings.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/strings/strings.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/binutils/strip/strip.1 ============================================================================== --- projects/sendfile/gnu/usr.bin/binutils/strip/strip.1 Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/binutils/strip/strip.1 Wed Nov 26 11:41:12 2014 (r275111) @@ -33,7 +33,7 @@ . ds R" "" . ds C` "" . ds C' "" -'br\} +\} .el\{\ . ds -- \|\(em\| . ds PI \(*p @@ -107,7 +107,6 @@ .ds Ae A\h'-(\w'A'u*4/10)'E . \" corrections for vroff .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' . \" for low resolution devices (crt and lpr) .if \n(.H>23 .if \n(.V>19 \ \{\ Modified: projects/sendfile/gnu/usr.bin/dialog/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/dialog/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/dialog/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/gnu/usr.bin/diff/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/diff/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/diff/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/gnu/usr.bin/gdb/gdb/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/gdb/gdb/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/gdb/gdb/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/gnu/usr.bin/gdb/gdbtui/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/gdb/gdbtui/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/gdb/gdbtui/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/gnu/usr.bin/gdb/kgdb/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/gdb/kgdb/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/gdb/kgdb/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/gnu/usr.bin/grep/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/grep/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/grep/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/gnu/usr.bin/groff/tmac/Makefile ============================================================================== --- projects/sendfile/gnu/usr.bin/groff/tmac/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/gnu/usr.bin/groff/tmac/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -11,9 +11,8 @@ MDOCDIR?= ${TMACDIR}/mdoc MAN= groff_ms.7 groff_man.7 groff_me.7 groff_mdoc.7 MAN+= groff_trace.7 groff_www.7 MLINKS= groff_ms.7 ms.7 -MLINKS+= groff_man.7 man.7 MLINKS+= groff_me.7 me.7 -MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 +MLINKS+= groff_mdoc.7 mdoc.samples.7 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} Modified: projects/sendfile/kerberos5/Makefile.inc ============================================================================== --- projects/sendfile/kerberos5/Makefile.inc Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/Makefile.inc Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/kerberos5/lib/libasn1/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libasn1/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libasn1/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libgssapi_krb5/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libgssapi_krb5/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/kerberos5/lib/libgssapi_ntlm/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libgssapi_ntlm/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libgssapi_ntlm/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libgssapi_spnego/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libgssapi_spnego/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/kerberos5/lib/libhdb/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libhdb/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libhdb/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/kerberos5/lib/libheimbase/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libheimbase/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libheimbase/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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/sendfile/kerberos5/lib/libheimipcc/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libheimipcc/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libheimipcc/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -2,8 +2,7 @@ LIB= heimipcc PRIVATELIB= -LDADD= -lheimbase -lroken -lpthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD} +LIBADD= heimbase roken pthread SRCS= \ client.c \ Modified: projects/sendfile/kerberos5/lib/libheimipcs/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libheimipcs/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libheimipcs/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -2,9 +2,7 @@ LIB= heimipcs PRIVATELIB= -LDADD= -lheimbase -lroken -LDFLAGS= -pthread -DPADD= ${LIBHEIMBASE} ${LIBROKEN} +LIBADD= heimbase roken pthread SRCS= \ server.c \ Modified: projects/sendfile/kerberos5/lib/libheimntlm/Makefile ============================================================================== --- projects/sendfile/kerberos5/lib/libheimntlm/Makefile Wed Nov 26 10:58:08 2014 (r275110) +++ projects/sendfile/kerberos5/lib/libheimntlm/Makefile Wed Nov 26 11:41:12 2014 (r275111) @@ -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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411261141.sAQBfEK4096858>