Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Apr 2015 05:55:09 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r281640 - in projects/ifnet: . bin/csh cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib/libdtrace cddl/usr.bin/ctfmerge contrib/compiler-rt/lib/builtins contrib/nvi contrib/nvi/ca...
Message-ID:  <201504170555.t3H5t9lC055708@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Fri Apr 17 05:55:07 2015
New Revision: 281640
URL: https://svnweb.freebsd.org/changeset/base/281640

Log:
  Merge head r257698 through r281639.

Added:
  projects/ifnet/contrib/compiler-rt/lib/builtins/floatditf.c
     - copied unchanged from r281639, head/contrib/compiler-rt/lib/builtins/floatditf.c
  projects/ifnet/contrib/compiler-rt/lib/builtins/floatunditf.c
     - copied unchanged from r281639, head/contrib/compiler-rt/lib/builtins/floatunditf.c
  projects/ifnet/contrib/compiler-rt/lib/builtins/multc3.c
     - copied unchanged from r281639, head/contrib/compiler-rt/lib/builtins/multc3.c
  projects/ifnet/contrib/nvi/docs/man/
     - copied from r281639, head/contrib/nvi/docs/man/
  projects/ifnet/lib/libc/aarch64/SYS.h
     - copied unchanged from r281639, head/lib/libc/aarch64/SYS.h
  projects/ifnet/lib/libc/aarch64/Symbol.map
     - copied unchanged from r281639, head/lib/libc/aarch64/Symbol.map
  projects/ifnet/lib/libc/aarch64/_fpmath.h
     - copied unchanged from r281639, head/lib/libc/aarch64/_fpmath.h
  projects/ifnet/lib/libc/aarch64/arith.h
     - copied unchanged from r281639, head/lib/libc/aarch64/arith.h
  projects/ifnet/lib/libc/aarch64/gd_qnan.h
     - copied unchanged from r281639, head/lib/libc/aarch64/gd_qnan.h
  projects/ifnet/lib/libc/aarch64/gen/
     - copied from r281639, head/lib/libc/aarch64/gen/
  projects/ifnet/lib/libc/aarch64/sys/
     - copied from r281639, head/lib/libc/aarch64/sys/
  projects/ifnet/sys/arm/conf/VIRT
     - copied unchanged from r281639, head/sys/arm/conf/VIRT
  projects/ifnet/sys/arm/qemu/
     - copied from r281639, head/sys/arm/qemu/
  projects/ifnet/sys/arm64/arm64/
     - copied from r281639, head/sys/arm64/arm64/
  projects/ifnet/sys/arm64/conf/
     - copied from r281639, head/sys/arm64/conf/
  projects/ifnet/sys/arm64/include/_bus.h
     - copied unchanged from r281639, head/sys/arm64/include/_bus.h
  projects/ifnet/sys/arm64/include/armreg.h
     - copied unchanged from r281639, head/sys/arm64/include/armreg.h
  projects/ifnet/sys/arm64/include/bus.h
     - copied unchanged from r281639, head/sys/arm64/include/bus.h
  projects/ifnet/sys/arm64/include/bus_dma.h
     - copied unchanged from r281639, head/sys/arm64/include/bus_dma.h
  projects/ifnet/sys/arm64/include/clock.h
     - copied unchanged from r281639, head/sys/arm64/include/clock.h
  projects/ifnet/sys/arm64/include/counter.h
     - copied unchanged from r281639, head/sys/arm64/include/counter.h
  projects/ifnet/sys/arm64/include/db_machdep.h
     - copied unchanged from r281639, head/sys/arm64/include/db_machdep.h
  projects/ifnet/sys/arm64/include/debug_monitor.h
     - copied unchanged from r281639, head/sys/arm64/include/debug_monitor.h
  projects/ifnet/sys/arm64/include/devmap.h
     - copied unchanged from r281639, head/sys/arm64/include/devmap.h
  projects/ifnet/sys/arm64/include/dump.h
     - copied unchanged from r281639, head/sys/arm64/include/dump.h
  projects/ifnet/sys/arm64/include/hypervisor.h
     - copied unchanged from r281639, head/sys/arm64/include/hypervisor.h
  projects/ifnet/sys/arm64/include/in_cksum.h
     - copied unchanged from r281639, head/sys/arm64/include/in_cksum.h
  projects/ifnet/sys/arm64/include/intr.h
     - copied unchanged from r281639, head/sys/arm64/include/intr.h
  projects/ifnet/sys/arm64/include/kdb.h
     - copied unchanged from r281639, head/sys/arm64/include/kdb.h
  projects/ifnet/sys/arm64/include/machdep.h
     - copied unchanged from r281639, head/sys/arm64/include/machdep.h
  projects/ifnet/sys/arm64/include/md_var.h
     - copied unchanged from r281639, head/sys/arm64/include/md_var.h
  projects/ifnet/sys/arm64/include/memdev.h
     - copied unchanged from r281639, head/sys/arm64/include/memdev.h
  projects/ifnet/sys/arm64/include/metadata.h
     - copied unchanged from r281639, head/sys/arm64/include/metadata.h
  projects/ifnet/sys/arm64/include/ofw_machdep.h
     - copied unchanged from r281639, head/sys/arm64/include/ofw_machdep.h
  projects/ifnet/sys/arm64/include/psl.h
     - copied unchanged from r281639, head/sys/arm64/include/psl.h
  projects/ifnet/sys/arm64/include/resource.h
     - copied unchanged from r281639, head/sys/arm64/include/resource.h
  projects/ifnet/sys/arm64/include/sf_buf.h
     - copied unchanged from r281639, head/sys/arm64/include/sf_buf.h
  projects/ifnet/sys/arm64/include/smp.h
     - copied unchanged from r281639, head/sys/arm64/include/smp.h
  projects/ifnet/sys/arm64/include/stack.h
     - copied unchanged from r281639, head/sys/arm64/include/stack.h
  projects/ifnet/sys/arm64/include/trap.h
     - copied unchanged from r281639, head/sys/arm64/include/trap.h
  projects/ifnet/sys/arm64/include/vfp.h
     - copied unchanged from r281639, head/sys/arm64/include/vfp.h
  projects/ifnet/sys/boot/Makefile.arm64
     - copied unchanged from r281639, head/sys/boot/Makefile.arm64
  projects/ifnet/sys/boot/arm64/
     - copied from r281639, head/sys/boot/arm64/
  projects/ifnet/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu
     - copied unchanged from r281639, head/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu
  projects/ifnet/sys/boot/efi/boot1/fat-i386.tmpl.bz2.uu
     - copied unchanged from r281639, head/sys/boot/efi/boot1/fat-i386.tmpl.bz2.uu
  projects/ifnet/sys/boot/efi/include/arm64/
     - copied from r281639, head/sys/boot/efi/include/arm64/
  projects/ifnet/sys/boot/efi/loader/arch/arm64/
     - copied from r281639, head/sys/boot/efi/loader/arch/arm64/
  projects/ifnet/sys/boot/efi/loader/arch/i386/Makefile.inc
     - copied unchanged from r281639, head/sys/boot/efi/loader/arch/i386/Makefile.inc
  projects/ifnet/sys/boot/efi/loader/reloc.c
     - copied unchanged from r281639, head/sys/boot/efi/loader/reloc.c
  projects/ifnet/sys/boot/fdt/dts/arm/meson8b.dtsi
     - copied unchanged from r281639, head/sys/boot/fdt/dts/arm/meson8b.dtsi
  projects/ifnet/sys/boot/ficl/aarch64/
     - copied from r281639, head/sys/boot/ficl/aarch64/
  projects/ifnet/sys/conf/Makefile.arm64
     - copied unchanged from r281639, head/sys/conf/Makefile.arm64
  projects/ifnet/sys/conf/files.arm64
     - copied unchanged from r281639, head/sys/conf/files.arm64
  projects/ifnet/sys/conf/ldscript.arm64
     - copied unchanged from r281639, head/sys/conf/ldscript.arm64
  projects/ifnet/sys/conf/options.arm64
     - copied unchanged from r281639, head/sys/conf/options.arm64
  projects/ifnet/sys/crypto/aesni/aesni_os.h
     - copied unchanged from r281639, head/sys/crypto/aesni/aesni_os.h
  projects/ifnet/sys/dev/fdt/fdt_arm64.c
     - copied unchanged from r281639, head/sys/dev/fdt/fdt_arm64.c
  projects/ifnet/sys/dev/psci/
     - copied from r281639, head/sys/dev/psci/
  projects/ifnet/sys/net/altq/
     - copied from r281639, head/sys/net/altq/
  projects/ifnet/sys/netinet/ip_reass.c
     - copied unchanged from r281639, head/sys/netinet/ip_reass.c
  projects/ifnet/sys/pc98/pc98/genassym.c
     - copied unchanged from r281639, head/sys/pc98/pc98/genassym.c
  projects/ifnet/tools/debugscripts/netstat-anr.gdb
     - copied unchanged from r281639, head/tools/debugscripts/netstat-anr.gdb
Deleted:
  projects/ifnet/contrib/nvi/catalog/spell.ok
  projects/ifnet/contrib/nvi/docs/TODO
  projects/ifnet/contrib/nvi/docs/USD.doc/
  projects/ifnet/contrib/nvi/docs/changelog
  projects/ifnet/contrib/nvi/docs/ev
  projects/ifnet/contrib/nvi/docs/features
  projects/ifnet/contrib/nvi/docs/help
  projects/ifnet/contrib/nvi/docs/internals/
  projects/ifnet/contrib/nvi/docs/interp/
  projects/ifnet/contrib/nvi/docs/spell.ok
  projects/ifnet/contrib/nvi/docs/tutorial/
  projects/ifnet/share/doc/usd/10.exref/
  projects/ifnet/share/doc/usd/11.vitut/
  projects/ifnet/share/doc/usd/12.vi/
  projects/ifnet/share/doc/usd/13.viref/
  projects/ifnet/sys/boot/efi/loader/arch/amd64/reloc.c
  projects/ifnet/sys/boot/efi/loader/arch/arm/reloc.c
  projects/ifnet/sys/contrib/altq/
  projects/ifnet/tools/regression/sockets/so_setfib/so_setfib.t
Modified:
  projects/ifnet/Makefile
  projects/ifnet/Makefile.inc1
  projects/ifnet/ObsoleteFiles.inc
  projects/ifnet/README
  projects/ifnet/UPDATING
  projects/ifnet/bin/csh/config.h
  projects/ifnet/bin/csh/iconv_stub.h
  projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  projects/ifnet/cddl/lib/libdtrace/libproc_compat.h
  projects/ifnet/cddl/usr.bin/ctfmerge/Makefile
  projects/ifnet/contrib/nvi/README
  projects/ifnet/contrib/nvi/catalog/dump.c
  projects/ifnet/contrib/nvi/cl/cl.h
  projects/ifnet/contrib/nvi/cl/cl_funcs.c
  projects/ifnet/contrib/nvi/cl/cl_main.c
  projects/ifnet/contrib/nvi/cl/cl_read.c
  projects/ifnet/contrib/nvi/cl/cl_screen.c
  projects/ifnet/contrib/nvi/cl/cl_term.c
  projects/ifnet/contrib/nvi/cl/extern.h
  projects/ifnet/contrib/nvi/common/common.h
  projects/ifnet/contrib/nvi/common/conv.c
  projects/ifnet/contrib/nvi/common/cut.c
  projects/ifnet/contrib/nvi/common/delete.c
  projects/ifnet/contrib/nvi/common/encoding.c
  projects/ifnet/contrib/nvi/common/exf.c
  projects/ifnet/contrib/nvi/common/extern.h
  projects/ifnet/contrib/nvi/common/gs.h
  projects/ifnet/contrib/nvi/common/key.c
  projects/ifnet/contrib/nvi/common/line.c
  projects/ifnet/contrib/nvi/common/log.c
  projects/ifnet/contrib/nvi/common/main.c
  projects/ifnet/contrib/nvi/common/mark.c
  projects/ifnet/contrib/nvi/common/msg.c
  projects/ifnet/contrib/nvi/common/options.c
  projects/ifnet/contrib/nvi/common/options.h
  projects/ifnet/contrib/nvi/common/options_f.c
  projects/ifnet/contrib/nvi/common/put.c
  projects/ifnet/contrib/nvi/common/recover.c
  projects/ifnet/contrib/nvi/common/screen.c
  projects/ifnet/contrib/nvi/common/search.c
  projects/ifnet/contrib/nvi/common/seq.c
  projects/ifnet/contrib/nvi/common/util.c
  projects/ifnet/contrib/nvi/ex/ex.c
  projects/ifnet/contrib/nvi/ex/ex.h
  projects/ifnet/contrib/nvi/ex/ex_abbrev.c
  projects/ifnet/contrib/nvi/ex/ex_append.c
  projects/ifnet/contrib/nvi/ex/ex_args.c
  projects/ifnet/contrib/nvi/ex/ex_argv.c
  projects/ifnet/contrib/nvi/ex/ex_at.c
  projects/ifnet/contrib/nvi/ex/ex_bang.c
  projects/ifnet/contrib/nvi/ex/ex_cd.c
  projects/ifnet/contrib/nvi/ex/ex_cscope.c
  projects/ifnet/contrib/nvi/ex/ex_delete.c
  projects/ifnet/contrib/nvi/ex/ex_display.c
  projects/ifnet/contrib/nvi/ex/ex_edit.c
  projects/ifnet/contrib/nvi/ex/ex_equal.c
  projects/ifnet/contrib/nvi/ex/ex_file.c
  projects/ifnet/contrib/nvi/ex/ex_filter.c
  projects/ifnet/contrib/nvi/ex/ex_global.c
  projects/ifnet/contrib/nvi/ex/ex_init.c
  projects/ifnet/contrib/nvi/ex/ex_join.c
  projects/ifnet/contrib/nvi/ex/ex_map.c
  projects/ifnet/contrib/nvi/ex/ex_mark.c
  projects/ifnet/contrib/nvi/ex/ex_mkexrc.c
  projects/ifnet/contrib/nvi/ex/ex_move.c
  projects/ifnet/contrib/nvi/ex/ex_open.c
  projects/ifnet/contrib/nvi/ex/ex_preserve.c
  projects/ifnet/contrib/nvi/ex/ex_print.c
  projects/ifnet/contrib/nvi/ex/ex_put.c
  projects/ifnet/contrib/nvi/ex/ex_quit.c
  projects/ifnet/contrib/nvi/ex/ex_read.c
  projects/ifnet/contrib/nvi/ex/ex_screen.c
  projects/ifnet/contrib/nvi/ex/ex_script.c
  projects/ifnet/contrib/nvi/ex/ex_set.c
  projects/ifnet/contrib/nvi/ex/ex_shell.c
  projects/ifnet/contrib/nvi/ex/ex_shift.c
  projects/ifnet/contrib/nvi/ex/ex_source.c
  projects/ifnet/contrib/nvi/ex/ex_stop.c
  projects/ifnet/contrib/nvi/ex/ex_subst.c
  projects/ifnet/contrib/nvi/ex/ex_tag.c
  projects/ifnet/contrib/nvi/ex/ex_txt.c
  projects/ifnet/contrib/nvi/ex/ex_undo.c
  projects/ifnet/contrib/nvi/ex/ex_usage.c
  projects/ifnet/contrib/nvi/ex/ex_util.c
  projects/ifnet/contrib/nvi/ex/ex_version.c
  projects/ifnet/contrib/nvi/ex/ex_visual.c
  projects/ifnet/contrib/nvi/ex/ex_write.c
  projects/ifnet/contrib/nvi/ex/ex_yank.c
  projects/ifnet/contrib/nvi/ex/ex_z.c
  projects/ifnet/contrib/nvi/ex/extern.h
  projects/ifnet/contrib/nvi/ex/version.h
  projects/ifnet/contrib/nvi/regex/COPYRIGHT
  projects/ifnet/contrib/nvi/regex/cclass.h
  projects/ifnet/contrib/nvi/regex/cname.h
  projects/ifnet/contrib/nvi/regex/engine.c
  projects/ifnet/contrib/nvi/regex/re_format.7
  projects/ifnet/contrib/nvi/regex/regcomp.c
  projects/ifnet/contrib/nvi/regex/regerror.c
  projects/ifnet/contrib/nvi/regex/regex.3
  projects/ifnet/contrib/nvi/regex/regex.h
  projects/ifnet/contrib/nvi/regex/regex2.h
  projects/ifnet/contrib/nvi/regex/regexec.c
  projects/ifnet/contrib/nvi/regex/regfree.c
  projects/ifnet/contrib/nvi/regex/utils.h
  projects/ifnet/contrib/nvi/vi/extern.h
  projects/ifnet/contrib/nvi/vi/getc.c
  projects/ifnet/contrib/nvi/vi/v_at.c
  projects/ifnet/contrib/nvi/vi/v_ch.c
  projects/ifnet/contrib/nvi/vi/v_delete.c
  projects/ifnet/contrib/nvi/vi/v_ex.c
  projects/ifnet/contrib/nvi/vi/v_increment.c
  projects/ifnet/contrib/nvi/vi/v_init.c
  projects/ifnet/contrib/nvi/vi/v_itxt.c
  projects/ifnet/contrib/nvi/vi/v_left.c
  projects/ifnet/contrib/nvi/vi/v_mark.c
  projects/ifnet/contrib/nvi/vi/v_match.c
  projects/ifnet/contrib/nvi/vi/v_paragraph.c
  projects/ifnet/contrib/nvi/vi/v_put.c
  projects/ifnet/contrib/nvi/vi/v_redraw.c
  projects/ifnet/contrib/nvi/vi/v_replace.c
  projects/ifnet/contrib/nvi/vi/v_right.c
  projects/ifnet/contrib/nvi/vi/v_screen.c
  projects/ifnet/contrib/nvi/vi/v_scroll.c
  projects/ifnet/contrib/nvi/vi/v_search.c
  projects/ifnet/contrib/nvi/vi/v_section.c
  projects/ifnet/contrib/nvi/vi/v_sentence.c
  projects/ifnet/contrib/nvi/vi/v_status.c
  projects/ifnet/contrib/nvi/vi/v_txt.c
  projects/ifnet/contrib/nvi/vi/v_ulcase.c
  projects/ifnet/contrib/nvi/vi/v_undo.c
  projects/ifnet/contrib/nvi/vi/v_util.c
  projects/ifnet/contrib/nvi/vi/v_word.c
  projects/ifnet/contrib/nvi/vi/v_xchar.c
  projects/ifnet/contrib/nvi/vi/v_yank.c
  projects/ifnet/contrib/nvi/vi/v_z.c
  projects/ifnet/contrib/nvi/vi/v_zexit.c
  projects/ifnet/contrib/nvi/vi/vi.c
  projects/ifnet/contrib/nvi/vi/vi.h
  projects/ifnet/contrib/nvi/vi/vs_line.c
  projects/ifnet/contrib/nvi/vi/vs_msg.c
  projects/ifnet/contrib/nvi/vi/vs_refresh.c
  projects/ifnet/contrib/nvi/vi/vs_relative.c
  projects/ifnet/contrib/nvi/vi/vs_smap.c
  projects/ifnet/contrib/nvi/vi/vs_split.c
  projects/ifnet/contrib/pjdfstest/tests/open/20.t
  projects/ifnet/contrib/pjdfstest/tests/truncate/11.t
  projects/ifnet/contrib/smbfs/include/netsmb/smb_lib.h
  projects/ifnet/contrib/smbfs/lib/smb/nls.c
  projects/ifnet/contrib/smbfs/lib/smb/print.c
  projects/ifnet/contrib/smbfs/lib/smb/rq.c
  projects/ifnet/contrib/xz/ChangeLog
  projects/ifnet/contrib/xz/THANKS
  projects/ifnet/contrib/xz/src/common/tuklib_cpucores.c
  projects/ifnet/contrib/xz/src/common/tuklib_integer.h
  projects/ifnet/contrib/xz/src/liblzma/api/lzma/version.h
  projects/ifnet/contrib/xz/src/liblzma/common/memcmplen.h
  projects/ifnet/contrib/xz/src/liblzma/lz/lz_encoder.c
  projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
  projects/ifnet/contrib/xz/src/xz/file_io.c
  projects/ifnet/etc/login.conf
  projects/ifnet/etc/mtree/BSD.include.dist
  projects/ifnet/etc/mtree/BSD.usr.dist
  projects/ifnet/etc/rc.d/hostid_save
  projects/ifnet/include/Makefile
  projects/ifnet/include/iconv.h
  projects/ifnet/lib/libarchive/Makefile
  projects/ifnet/lib/libbluetooth/bluetooth.c
  projects/ifnet/lib/libbluetooth/dev.c
  projects/ifnet/lib/libbluetooth/hci.c
  projects/ifnet/lib/libc/Makefile
  projects/ifnet/lib/libc/aarch64/Makefile.inc
  projects/ifnet/lib/libc/gen/tls.c
  projects/ifnet/lib/libc/iconv/__iconv.c
  projects/ifnet/lib/libc/iconv/bsd_iconv.c
  projects/ifnet/lib/libc/iconv/citrus_iconv.h
  projects/ifnet/lib/libc/iconv/citrus_iconv_local.h
  projects/ifnet/lib/libc/iconv/citrus_none.c
  projects/ifnet/lib/libc/iconv/citrus_stdenc.h
  projects/ifnet/lib/libc/iconv/citrus_stdenc_local.h
  projects/ifnet/lib/libc/iconv/citrus_stdenc_template.h
  projects/ifnet/lib/libc/iconv/iconv-internal.h
  projects/ifnet/lib/libc/iconv/iconv.3
  projects/ifnet/lib/libc/iconv/iconv.c
  projects/ifnet/lib/libc/iconv/iconv_compat.c
  projects/ifnet/lib/libc/locale/cXXrtomb_iconv.h
  projects/ifnet/lib/libc/locale/mbrtocXX_iconv.h
  projects/ifnet/lib/libc/powerpc/gen/_setjmp.S
  projects/ifnet/lib/libc/powerpc/gen/setjmp.S
  projects/ifnet/lib/libc/powerpc/gen/sigsetjmp.S
  projects/ifnet/lib/libc/sys/mount.2
  projects/ifnet/lib/libc/xdr/xdr_float.c
  projects/ifnet/lib/libcompiler_rt/Makefile
  projects/ifnet/lib/libiconv_modules/BIG5/citrus_big5.c
  projects/ifnet/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c
  projects/ifnet/lib/libiconv_modules/EUC/citrus_euc.c
  projects/ifnet/lib/libiconv_modules/EUCTW/citrus_euctw.c
  projects/ifnet/lib/libiconv_modules/GBK2K/citrus_gbk2k.c
  projects/ifnet/lib/libiconv_modules/HZ/citrus_hz.c
  projects/ifnet/lib/libiconv_modules/ISO2022/citrus_iso2022.c
  projects/ifnet/lib/libiconv_modules/JOHAB/citrus_johab.c
  projects/ifnet/lib/libiconv_modules/MSKanji/citrus_mskanji.c
  projects/ifnet/lib/libiconv_modules/UES/citrus_ues.c
  projects/ifnet/lib/libiconv_modules/UTF1632/citrus_utf1632.c
  projects/ifnet/lib/libiconv_modules/UTF7/citrus_utf7.c
  projects/ifnet/lib/libiconv_modules/UTF8/citrus_utf8.c
  projects/ifnet/lib/libiconv_modules/VIQR/citrus_viqr.c
  projects/ifnet/lib/libiconv_modules/ZW/citrus_zw.c
  projects/ifnet/lib/libiconv_modules/iconv_none/citrus_iconv_none.c
  projects/ifnet/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
  projects/ifnet/lib/libkiconv/xlat16_iconv.c
  projects/ifnet/lib/liblzma/Symbol.map
  projects/ifnet/lib/liblzma/config.h
  projects/ifnet/lib/libmt/Makefile
  projects/ifnet/lib/libsdp/search.c
  projects/ifnet/lib/libsdp/service.c
  projects/ifnet/lib/libsdp/session.c
  projects/ifnet/lib/libsdp/util.c
  projects/ifnet/lib/libstand/Makefile
  projects/ifnet/lib/libvmmapi/Makefile
  projects/ifnet/libexec/rtld-elf/aarch64/reloc.c
  projects/ifnet/libexec/rtld-elf/rtld.c
  projects/ifnet/libexec/rtld-elf/rtld.h
  projects/ifnet/sbin/ggate/ggatel/ggatel.8
  projects/ifnet/sbin/ifconfig/ifmedia.c
  projects/ifnet/sbin/newfs_msdos/newfs_msdos.8
  projects/ifnet/sbin/pfctl/parse.y
  projects/ifnet/sbin/pfctl/pfctl.c
  projects/ifnet/sbin/pfctl/pfctl_altq.c
  projects/ifnet/sbin/pfctl/pfctl_qstats.c
  projects/ifnet/share/doc/usd/Makefile
  projects/ifnet/share/man/man3/queue.3
  projects/ifnet/share/man/man4/amdtemp.4
  projects/ifnet/share/man/man4/ctl.4
  projects/ifnet/share/man/man4/inet.4
  projects/ifnet/share/man/man4/tap.4
  projects/ifnet/share/mk/bsd.dep.mk
  projects/ifnet/share/mk/bsd.progs.mk
  projects/ifnet/share/mk/src.libnames.mk
  projects/ifnet/share/mk/src.opts.mk
  projects/ifnet/share/mk/sys.mk
  projects/ifnet/sys/amd64/include/metadata.h
  projects/ifnet/sys/amd64/vmm/amd/svm.c
  projects/ifnet/sys/amd64/vmm/vmm_lapic.c
  projects/ifnet/sys/arm/allwinner/if_emac.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_clkmsr.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_i2c.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_identsoc.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_machdep.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_mmc.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_soc.h
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_timer.c
  projects/ifnet/sys/arm/amlogic/aml8726/aml8726_wdt.c
  projects/ifnet/sys/arm/amlogic/aml8726/uart_dev_aml8726.c
  projects/ifnet/sys/arm/arm/devmap.c
  projects/ifnet/sys/arm/arm/pmap-v6-new.c
  projects/ifnet/sys/arm/arm/pmap-v6.c
  projects/ifnet/sys/arm/arm/pmap.c
  projects/ifnet/sys/arm/freescale/vybrid/vf_uart.c
  projects/ifnet/sys/arm/include/pmap-v6.h
  projects/ifnet/sys/arm/include/pmap.h
  projects/ifnet/sys/arm/samsung/exynos/exynos_uart.c
  projects/ifnet/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c
  projects/ifnet/sys/arm64/include/cpufunc.h
  projects/ifnet/sys/arm64/include/param.h
  projects/ifnet/sys/arm64/include/pmap.h
  projects/ifnet/sys/boot/Makefile.arm
  projects/ifnet/sys/boot/common/Makefile.inc
  projects/ifnet/sys/boot/efi/Makefile
  projects/ifnet/sys/boot/efi/boot1/Makefile
  projects/ifnet/sys/boot/efi/boot1/boot1.c
  projects/ifnet/sys/boot/efi/boot1/generate-fat.sh
  projects/ifnet/sys/boot/efi/fdt/Makefile
  projects/ifnet/sys/boot/efi/libefi/Makefile
  projects/ifnet/sys/boot/efi/loader/Makefile
  projects/ifnet/sys/boot/efi/loader/arch/amd64/Makefile.inc
  projects/ifnet/sys/boot/efi/loader/arch/arm/Makefile.inc
  projects/ifnet/sys/boot/efi/loader/arch/arm/ldscript.arm
  projects/ifnet/sys/boot/efi/loader/arch/arm/start.S
  projects/ifnet/sys/boot/efi/loader/arch/i386/bootinfo.c
  projects/ifnet/sys/boot/efi/loader/arch/i386/elf32_freebsd.c
  projects/ifnet/sys/boot/efi/loader/arch/i386/i386_copy.c
  projects/ifnet/sys/boot/efi/loader/arch/i386/start.S
  projects/ifnet/sys/boot/efi/loader/bootinfo.c
  projects/ifnet/sys/boot/efi/loader/copy.c
  projects/ifnet/sys/boot/fdt/dts/arm/odroidc1.dts
  projects/ifnet/sys/boot/fdt/dts/arm/vsatv102-m6.dts
  projects/ifnet/sys/boot/forth/check-password.4th
  projects/ifnet/sys/boot/forth/check-password.4th.8
  projects/ifnet/sys/boot/forth/loader.4th
  projects/ifnet/sys/boot/forth/loader.conf
  projects/ifnet/sys/boot/forth/logo-beastie.4th
  projects/ifnet/sys/boot/forth/logo-orb.4th
  projects/ifnet/sys/boot/forth/menu.4th
  projects/ifnet/sys/boot/forth/menu.rc
  projects/ifnet/sys/boot/forth/version.4th
  projects/ifnet/sys/cam/cam_xpt.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/ifnet/sys/cddl/dev/dtrace/dtrace_ioctl.c
  projects/ifnet/sys/compat/freebsd32/freebsd32.h
  projects/ifnet/sys/compat/freebsd32/freebsd32_misc.c
  projects/ifnet/sys/compat/linprocfs/linprocfs.c
  projects/ifnet/sys/compat/svr4/svr4_stream.c
  projects/ifnet/sys/conf/Makefile.pc98
  projects/ifnet/sys/conf/files
  projects/ifnet/sys/conf/files.arm
  projects/ifnet/sys/conf/kern.pre.mk
  projects/ifnet/sys/conf/kmod.mk
  projects/ifnet/sys/conf/newvers.sh
  projects/ifnet/sys/conf/options.i386
  projects/ifnet/sys/contrib/dev/acpica/acpica_prep.sh
  projects/ifnet/sys/contrib/dev/acpica/changes.txt
  projects/ifnet/sys/contrib/dev/acpica/common/adfile.c
  projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c
  projects/ifnet/sys/contrib/dev/acpica/common/dmtable.c
  projects/ifnet/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/ifnet/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslfold.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslmapenter.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslrules.y
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/asltree.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/asltypes.y
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/aslwalks.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/dtio.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dttable.c
  projects/ifnet/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/ifnet/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbxface.c
  projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  projects/ifnet/sys/contrib/dev/acpica/components/events/evregion.c
  projects/ifnet/sys/contrib/dev/acpica/components/events/evxfevnt.c
  projects/ifnet/sys/contrib/dev/acpica/components/executer/exdump.c
  projects/ifnet/sys/contrib/dev/acpica/components/executer/exfldio.c
  projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg3.c
  projects/ifnet/sys/contrib/dev/acpica/components/executer/exregion.c
  projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwvalid.c
  projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsdump.c
  projects/ifnet/sys/contrib/dev/acpica/components/parser/psopcode.c
  projects/ifnet/sys/contrib/dev/acpica/components/parser/psopinfo.c
  projects/ifnet/sys/contrib/dev/acpica/components/resources/rsaddr.c
  projects/ifnet/sys/contrib/dev/acpica/components/resources/rsdump.c
  projects/ifnet/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
  projects/ifnet/sys/contrib/dev/acpica/components/resources/rsxface.c
  projects/ifnet/sys/contrib/dev/acpica/components/tables/tbdata.c
  projects/ifnet/sys/contrib/dev/acpica/components/tables/tbinstal.c
  projects/ifnet/sys/contrib/dev/acpica/components/tables/tbprint.c
  projects/ifnet/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utaddress.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utglobal.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utmisc.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utosi.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utprint.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utstate.c
  projects/ifnet/sys/contrib/dev/acpica/components/utilities/utuuid.c
  projects/ifnet/sys/contrib/dev/acpica/include/acdebug.h
  projects/ifnet/sys/contrib/dev/acpica/include/acdisasm.h
  projects/ifnet/sys/contrib/dev/acpica/include/acglobal.h
  projects/ifnet/sys/contrib/dev/acpica/include/aclocal.h
  projects/ifnet/sys/contrib/dev/acpica/include/acmacros.h
  projects/ifnet/sys/contrib/dev/acpica/include/acopcode.h
  projects/ifnet/sys/contrib/dev/acpica/include/acpixf.h
  projects/ifnet/sys/contrib/dev/acpica/include/acresrc.h
  projects/ifnet/sys/contrib/dev/acpica/include/acrestyp.h
  projects/ifnet/sys/contrib/dev/acpica/include/acstruct.h
  projects/ifnet/sys/contrib/dev/acpica/include/actables.h
  projects/ifnet/sys/contrib/dev/acpica/include/actbl2.h
  projects/ifnet/sys/contrib/dev/acpica/include/actypes.h
  projects/ifnet/sys/contrib/dev/acpica/include/acutils.h
  projects/ifnet/sys/contrib/dev/acpica/include/amlcode.h
  projects/ifnet/sys/contrib/dev/acpica/include/platform/acenv.h
  projects/ifnet/sys/contrib/x86emu/x86emu.c
  projects/ifnet/sys/crypto/aesni/aesencdec.h
  projects/ifnet/sys/crypto/aesni/aesni_ghash.c
  projects/ifnet/sys/dev/acpica/acpi_pcib_acpi.c
  projects/ifnet/sys/dev/acpica/acpi_resource.c
  projects/ifnet/sys/dev/acpica/acpivar.h
  projects/ifnet/sys/dev/atkbdc/psm.c
  projects/ifnet/sys/dev/fdt/fdt_pinctrl.c
  projects/ifnet/sys/dev/hptnr/README
  projects/ifnet/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu
  projects/ifnet/sys/dev/hptnr/him.h
  projects/ifnet/sys/dev/hptnr/hptintf.h
  projects/ifnet/sys/dev/hptnr/hptnr_config.c
  projects/ifnet/sys/dev/hptnr/hptnr_config.h
  projects/ifnet/sys/dev/hptnr/hptnr_osm_bsd.c
  projects/ifnet/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu
  projects/ifnet/sys/dev/hptnr/ldm.h
  projects/ifnet/sys/dev/hptnr/os_bsd.h
  projects/ifnet/sys/dev/iwn/if_iwn.c
  projects/ifnet/sys/dev/netmap/netmap.c
  projects/ifnet/sys/dev/nvme/nvme.c
  projects/ifnet/sys/dev/nvme/nvme_ctrlr.c
  projects/ifnet/sys/dev/nvme/nvme_ns.c
  projects/ifnet/sys/dev/nvme/nvme_private.h
  projects/ifnet/sys/dev/nvme/nvme_qpair.c
  projects/ifnet/sys/dev/re/if_re.c
  projects/ifnet/sys/dev/sound/pci/hda/hdaa_patches.c
  projects/ifnet/sys/dev/sound/pci/hda/hdac.c
  projects/ifnet/sys/dev/sound/pci/hda/hdac.h
  projects/ifnet/sys/dev/sound/pci/hda/hdacc.c
  projects/ifnet/sys/dev/streams/streams.c
  projects/ifnet/sys/dev/uart/uart_bus.h
  projects/ifnet/sys/dev/uart/uart_bus_fdt.c
  projects/ifnet/sys/dev/uart/uart_core.c
  projects/ifnet/sys/dev/uart/uart_cpu.h
  projects/ifnet/sys/dev/uart/uart_cpu_fdt.c
  projects/ifnet/sys/dev/uart/uart_dev_imx.c
  projects/ifnet/sys/dev/uart/uart_dev_lpc.c
  projects/ifnet/sys/dev/uart/uart_dev_msm.c
  projects/ifnet/sys/dev/uart/uart_dev_ns8250.c
  projects/ifnet/sys/dev/uart/uart_dev_pl011.c
  projects/ifnet/sys/dev/uart/uart_dev_quicc.c
  projects/ifnet/sys/dev/uart/uart_dev_sab82532.c
  projects/ifnet/sys/dev/uart/uart_dev_ti8250.c
  projects/ifnet/sys/dev/uart/uart_dev_z8530.c
  projects/ifnet/sys/dev/usb/controller/ehci_pci.c
  projects/ifnet/sys/dev/usb/controller/uhci_pci.c
  projects/ifnet/sys/dev/usb/controller/xhci_pci.c
  projects/ifnet/sys/dev/usb/serial/uftdi.c
  projects/ifnet/sys/dev/usb/wlan/if_urtwn.c
  projects/ifnet/sys/dev/vt/vt_font.c
  projects/ifnet/sys/dev/wpi/if_wpi.c
  projects/ifnet/sys/fs/ext2fs/ext2_vfsops.c
  projects/ifnet/sys/fs/fuse/fuse_vfsops.c
  projects/ifnet/sys/fs/msdosfs/msdosfs_vfsops.c
  projects/ifnet/sys/fs/nandfs/nandfs_vfsops.c
  projects/ifnet/sys/fs/nfs/nfs.h
  projects/ifnet/sys/fs/nfs/nfs_commonport.c
  projects/ifnet/sys/fs/nfs/nfsproto.h
  projects/ifnet/sys/fs/nfsclient/nfs_clvfsops.c
  projects/ifnet/sys/fs/nfsserver/nfs_nfsdport.c
  projects/ifnet/sys/fs/nfsserver/nfs_nfsdserv.c
  projects/ifnet/sys/fs/nullfs/null_vfsops.c
  projects/ifnet/sys/fs/tmpfs/tmpfs_vnops.c
  projects/ifnet/sys/geom/geom_dev.c
  projects/ifnet/sys/geom/multipath/g_multipath.c
  projects/ifnet/sys/gnu/dts/arm/meson.dtsi
  projects/ifnet/sys/gnu/dts/arm/meson6.dtsi
  projects/ifnet/sys/gnu/dts/arm/meson8.dtsi
  projects/ifnet/sys/i386/i386/bios.c
  projects/ifnet/sys/i386/i386/initcpu.c
  projects/ifnet/sys/i386/i386/locore.s
  projects/ifnet/sys/i386/i386/machdep.c
  projects/ifnet/sys/i386/i386/minidump_machdep.c
  projects/ifnet/sys/i386/i386/mpboot.s
  projects/ifnet/sys/i386/i386/pmap.c
  projects/ifnet/sys/i386/i386/swtch.s
  projects/ifnet/sys/i386/i386/trap.c
  projects/ifnet/sys/i386/i386/vm86bios.s
  projects/ifnet/sys/i386/i386/vm_machdep.c
  projects/ifnet/sys/i386/include/param.h
  projects/ifnet/sys/i386/include/pmap.h
  projects/ifnet/sys/i386/include/vmparam.h
  projects/ifnet/sys/kern/imgact_elf.c
  projects/ifnet/sys/kern/init_main.c
  projects/ifnet/sys/kern/kern_descrip.c
  projects/ifnet/sys/kern/kern_exec.c
  projects/ifnet/sys/kern/kern_fork.c
  projects/ifnet/sys/kern/kern_resource.c
  projects/ifnet/sys/kern/kern_timeout.c
  projects/ifnet/sys/kern/subr_bus.c
  projects/ifnet/sys/kern/sys_pipe.c
  projects/ifnet/sys/kern/tty_pts.c
  projects/ifnet/sys/kern/uipc_mqueue.c
  projects/ifnet/sys/kern/uipc_sem.c
  projects/ifnet/sys/kern/uipc_shm.c
  projects/ifnet/sys/kern/uipc_syscalls.c
  projects/ifnet/sys/kern/vfs_subr.c
  projects/ifnet/sys/kern/vfs_syscalls.c
  projects/ifnet/sys/mips/adm5120/uart_dev_adm5120.c
  projects/ifnet/sys/mips/atheros/uart_dev_ar933x.c
  projects/ifnet/sys/mips/cavium/uart_dev_oct16550.c
  projects/ifnet/sys/mips/conf/CARAMBOLA2.hints
  projects/ifnet/sys/mips/include/reg.h
  projects/ifnet/sys/mips/rt305x/uart_dev_rt305x.c
  projects/ifnet/sys/net/ieee8023ad_lacp.c
  projects/ifnet/sys/net/if.c
  projects/ifnet/sys/net/if_media.c
  projects/ifnet/sys/net/if_media.h
  projects/ifnet/sys/net/if_tap.c
  projects/ifnet/sys/net/if_types.h
  projects/ifnet/sys/net/if_var.h
  projects/ifnet/sys/net/pfvar.h
  projects/ifnet/sys/net/route.c
  projects/ifnet/sys/net80211/ieee80211_mesh.c
  projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_cmds.c
  projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_evnt.c
  projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_main.c
  projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_misc.c
  projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_misc.h
  projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c
  projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_var.h
  projects/ifnet/sys/netgraph/bluetooth/include/ng_btsocket.h
  projects/ifnet/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h
  projects/ifnet/sys/netgraph/bluetooth/include/ng_hci.h
  projects/ifnet/sys/netgraph/bluetooth/include/ng_l2cap.h
  projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c
  projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
  projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c
  projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
  projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h
  projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
  projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
  projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c
  projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h
  projects/ifnet/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
  projects/ifnet/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  projects/ifnet/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
  projects/ifnet/sys/netinet/igmp.c
  projects/ifnet/sys/netinet/in_var.h
  projects/ifnet/sys/netinet/ip_input.c
  projects/ifnet/sys/netinet/sctp_syscalls.c
  projects/ifnet/sys/netinet/tcp_subr.c
  projects/ifnet/sys/netinet/tcp_timer.c
  projects/ifnet/sys/netinet/tcp_timer.h
  projects/ifnet/sys/netinet/tcp_var.h
  projects/ifnet/sys/netinet6/in6_mcast.c
  projects/ifnet/sys/netinet6/ip6_forward.c
  projects/ifnet/sys/netinet6/nd6.c
  projects/ifnet/sys/netinet6/nd6_nbr.c
  projects/ifnet/sys/netinet6/nd6_rtr.c
  projects/ifnet/sys/netpfil/pf/pf.c
  projects/ifnet/sys/netpfil/pf/pf_ioctl.c
  projects/ifnet/sys/netpfil/pf/pf_norm.c
  projects/ifnet/sys/ofed/include/linux/file.h
  projects/ifnet/sys/opencrypto/gmac.h
  projects/ifnet/sys/powerpc/booke/locore.S
  projects/ifnet/sys/powerpc/include/reg.h
  projects/ifnet/sys/powerpc/powerpc/trap.c
  projects/ifnet/sys/rpc/svc_generic.c
  projects/ifnet/sys/rpc/svc_vc.c
  projects/ifnet/sys/sparc64/include/reg.h
  projects/ifnet/sys/sparc64/pci/sbbc.c
  projects/ifnet/sys/sys/buf.h
  projects/ifnet/sys/sys/cdefs.h
  projects/ifnet/sys/sys/elf_common.h
  projects/ifnet/sys/sys/filedesc.h
  projects/ifnet/sys/sys/imgact.h
  projects/ifnet/sys/sys/kerneldump.h
  projects/ifnet/sys/sys/malloc.h
  projects/ifnet/sys/sys/module.h
  projects/ifnet/sys/sys/mount.h
  projects/ifnet/sys/sys/mouse.h
  projects/ifnet/sys/sys/param.h
  projects/ifnet/sys/sys/procfs.h
  projects/ifnet/sys/sys/socketvar.h
  projects/ifnet/sys/sys/sockio.h
  projects/ifnet/sys/sys/syscallsubr.h
  projects/ifnet/sys/ufs/ffs/ffs_vfsops.c
  projects/ifnet/sys/vm/swap_pager.c
  projects/ifnet/sys/vm/uma_core.c
  projects/ifnet/sys/vm/uma_int.h
  projects/ifnet/sys/vm/vm_reserv.c
  projects/ifnet/sys/x86/acpica/OsdEnvironment.c
  projects/ifnet/sys/x86/acpica/acpi_wakeup.c
  projects/ifnet/sys/x86/include/reg.h
  projects/ifnet/sys/x86/iommu/busdma_dmar.c
  projects/ifnet/sys/x86/iommu/intel_dmar.h
  projects/ifnet/sys/x86/iommu/intel_gas.c
  projects/ifnet/tools/build/check-links.sh
  projects/ifnet/tools/regression/sockets/accept_fd_leak/Makefile
  projects/ifnet/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c
  projects/ifnet/tools/regression/sockets/accf_data_attach/Makefile
  projects/ifnet/tools/regression/sockets/accf_data_attach/accf_data_attach.c
  projects/ifnet/tools/regression/sockets/fstat/Makefile
  projects/ifnet/tools/regression/sockets/fstat/fstat.c
  projects/ifnet/tools/regression/sockets/kqueue/Makefile
  projects/ifnet/tools/regression/sockets/kqueue/kqueue.c
  projects/ifnet/tools/regression/sockets/listen_backlog/Makefile
  projects/ifnet/tools/regression/sockets/listen_backlog/listen_backlog.c
  projects/ifnet/tools/regression/sockets/listenclose/Makefile
  projects/ifnet/tools/regression/sockets/listenclose/listenclose.c
  projects/ifnet/tools/regression/sockets/pr_atomic/Makefile
  projects/ifnet/tools/regression/sockets/pr_atomic/pr_atomic.c
  projects/ifnet/tools/regression/sockets/reconnect/Makefile
  projects/ifnet/tools/regression/sockets/reconnect/reconnect.c
  projects/ifnet/tools/regression/sockets/rtsocket/Makefile
  projects/ifnet/tools/regression/sockets/rtsocket/rtsocket.c
  projects/ifnet/tools/regression/sockets/sblock/Makefile
  projects/ifnet/tools/regression/sockets/sblock/sblock.c
  projects/ifnet/tools/regression/sockets/sendfile/sendfile.c
  projects/ifnet/tools/regression/sockets/shutdown/Makefile
  projects/ifnet/tools/regression/sockets/shutdown/shutdown.c
  projects/ifnet/tools/regression/sockets/sigpipe/Makefile
  projects/ifnet/tools/regression/sockets/sigpipe/sigpipe.c
  projects/ifnet/tools/regression/sockets/so_setfib/Makefile
  projects/ifnet/tools/regression/sockets/so_setfib/so_setfib.c
  projects/ifnet/tools/regression/sockets/socketpair/Makefile
  projects/ifnet/tools/regression/sockets/socketpair/socketpair.c
  projects/ifnet/tools/regression/sockets/unix_bindconnect/Makefile
  projects/ifnet/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c
  projects/ifnet/tools/regression/sockets/unix_close_race/Makefile
  projects/ifnet/tools/regression/sockets/unix_close_race/unix_close_race.c
  projects/ifnet/tools/regression/sockets/unix_passfd/Makefile
  projects/ifnet/tools/regression/sockets/unix_passfd/unix_passfd.c
  projects/ifnet/tools/regression/sockets/unix_sendtorace/Makefile
  projects/ifnet/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c
  projects/ifnet/tools/regression/sockets/unix_socket/Makefile
  projects/ifnet/tools/regression/sockets/unix_socket/unix_socket.c
  projects/ifnet/tools/regression/sockets/unix_sorflush/Makefile
  projects/ifnet/tools/regression/sockets/unix_sorflush/unix_sorflush.c
  projects/ifnet/tools/regression/sockets/zerosend/zerosend.c
  projects/ifnet/usr.bin/Makefile
  projects/ifnet/usr.bin/ar/read.c
  projects/ifnet/usr.bin/bluetooth/bthost/bthost.c
  projects/ifnet/usr.bin/bluetooth/btsockstat/btsockstat.c
  projects/ifnet/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c
  projects/ifnet/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
  projects/ifnet/usr.bin/gcore/elf32core.c
  projects/ifnet/usr.bin/gzip/gzip.1
  projects/ifnet/usr.bin/gzip/gzip.c
  projects/ifnet/usr.bin/iconv/iconv.c
  projects/ifnet/usr.bin/ipcs/Makefile
  projects/ifnet/usr.bin/ipcs/ipc.c
  projects/ifnet/usr.bin/ipcs/ipc.h
  projects/ifnet/usr.bin/ipcs/ipcs.c
  projects/ifnet/usr.bin/iscsictl/Makefile
  projects/ifnet/usr.bin/iscsictl/iscsictl.c
  projects/ifnet/usr.bin/iscsictl/parse.y
  projects/ifnet/usr.bin/iscsictl/periphs.c
  projects/ifnet/usr.bin/jot/jot.1
  projects/ifnet/usr.bin/lam/lam.1
  projects/ifnet/usr.bin/lockf/lockf.c
  projects/ifnet/usr.bin/mt/Makefile
  projects/ifnet/usr.bin/mt/mt.c
  projects/ifnet/usr.bin/patch/inp.c
  projects/ifnet/usr.bin/rs/rs.1
  projects/ifnet/usr.bin/smbutil/Makefile
  projects/ifnet/usr.bin/sockstat/sockstat.1
  projects/ifnet/usr.bin/vi/Makefile
  projects/ifnet/usr.bin/w/Makefile
  projects/ifnet/usr.bin/w/w.c
  projects/ifnet/usr.bin/wc/wc.c
  projects/ifnet/usr.sbin/acpi/acpidump/acpi.c
  projects/ifnet/usr.sbin/authpf/Makefile
  projects/ifnet/usr.sbin/bhyve/Makefile
  projects/ifnet/usr.sbin/bhyve/bhyverun.c
  projects/ifnet/usr.sbin/bhyvectl/Makefile
  projects/ifnet/usr.sbin/bhyvectl/bhyvectl.c
  projects/ifnet/usr.sbin/bhyveload/Makefile
  projects/ifnet/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c
  projects/ifnet/usr.sbin/bluetooth/bthidcontrol/hid.c
  projects/ifnet/usr.sbin/bluetooth/bthidcontrol/sdp.c
  projects/ifnet/usr.sbin/bluetooth/bthidd/bthidd.c
  projects/ifnet/usr.sbin/bluetooth/bthidd/client.c
  projects/ifnet/usr.sbin/bluetooth/bthidd/hid.c
  projects/ifnet/usr.sbin/bluetooth/bthidd/kbd.c
  projects/ifnet/usr.sbin/bluetooth/bthidd/lexer.l
  projects/ifnet/usr.sbin/bluetooth/bthidd/parser.y
  projects/ifnet/usr.sbin/bluetooth/bthidd/server.c
  projects/ifnet/usr.sbin/bluetooth/bthidd/session.c
  projects/ifnet/usr.sbin/bluetooth/btpand/bnep.c
  projects/ifnet/usr.sbin/bluetooth/btpand/btpand.c
  projects/ifnet/usr.sbin/bluetooth/btpand/channel.c
  projects/ifnet/usr.sbin/bluetooth/btpand/client.c
  projects/ifnet/usr.sbin/bluetooth/btpand/event.c
  projects/ifnet/usr.sbin/bluetooth/btpand/packet.c
  projects/ifnet/usr.sbin/bluetooth/btpand/sdp.c
  projects/ifnet/usr.sbin/bluetooth/btpand/server.c
  projects/ifnet/usr.sbin/bluetooth/btpand/tap.c
  projects/ifnet/usr.sbin/bluetooth/hccontrol/hccontrol.c
  projects/ifnet/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
  projects/ifnet/usr.sbin/bluetooth/hccontrol/info.c
  projects/ifnet/usr.sbin/bluetooth/hccontrol/link_control.c
  projects/ifnet/usr.sbin/bluetooth/hccontrol/link_policy.c
  projects/ifnet/usr.sbin/bluetooth/hccontrol/node.c
  projects/ifnet/usr.sbin/bluetooth/hccontrol/util.c
  projects/ifnet/usr.sbin/bluetooth/hcsecd/hcsecd.c
  projects/ifnet/usr.sbin/bluetooth/hcsecd/parser.y
  projects/ifnet/usr.sbin/bluetooth/l2control/l2cap.c
  projects/ifnet/usr.sbin/bluetooth/l2control/l2control.c
  projects/ifnet/usr.sbin/bluetooth/l2ping/l2ping.c
  projects/ifnet/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
  projects/ifnet/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c
  projects/ifnet/usr.sbin/bluetooth/sdpcontrol/search.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/bgd.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/dun.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/ftrn.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/gn.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/irmc.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/irmc_command.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/lan.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/main.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/nap.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/opush.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/panu.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/profile.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/provider.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/sar.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/scr.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/sd.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/server.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/sp.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/srr.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/ssar.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/ssr.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/sur.c
  projects/ifnet/usr.sbin/bluetooth/sdpd/uuid.c
  projects/ifnet/usr.sbin/bsdinstall/scripts/zfsboot
  projects/ifnet/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
  projects/ifnet/usr.sbin/crashinfo/crashinfo.sh
  projects/ifnet/usr.sbin/ctld/discovery.c
  projects/ifnet/usr.sbin/ctld/isns.c
  projects/ifnet/usr.sbin/ctld/keys.c
  projects/ifnet/usr.sbin/ctld/login.c
  projects/ifnet/usr.sbin/ctld/parse.y
  projects/ifnet/usr.sbin/ctld/pdu.c
  projects/ifnet/usr.sbin/ctld/token.l
  projects/ifnet/usr.sbin/fifolog/fifolog_reader/Makefile
  projects/ifnet/usr.sbin/fifolog/fifolog_writer/Makefile
  projects/ifnet/usr.sbin/freebsd-update/freebsd-update.sh
  projects/ifnet/usr.sbin/nfsd/nfsd.c
  projects/ifnet/usr.sbin/rpc.lockd/Makefile
  projects/ifnet/usr.sbin/rtsold/Makefile
  projects/ifnet/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  projects/ifnet/   (props changed)
  projects/ifnet/cddl/   (props changed)
  projects/ifnet/cddl/contrib/opensolaris/   (props changed)
  projects/ifnet/contrib/compiler-rt/   (props changed)
  projects/ifnet/contrib/nvi/   (props changed)
  projects/ifnet/contrib/xz/   (props changed)
  projects/ifnet/etc/   (props changed)
  projects/ifnet/include/   (props changed)
  projects/ifnet/lib/libc/   (props changed)
  projects/ifnet/lib/libvmmapi/   (props changed)
  projects/ifnet/sbin/   (props changed)
  projects/ifnet/share/   (props changed)
  projects/ifnet/share/man/man4/   (props changed)
  projects/ifnet/sys/   (props changed)
  projects/ifnet/sys/amd64/vmm/   (props changed)
  projects/ifnet/sys/boot/   (props changed)
  projects/ifnet/sys/cddl/contrib/opensolaris/   (props changed)
  projects/ifnet/sys/conf/   (props changed)
  projects/ifnet/sys/contrib/dev/acpica/   (props changed)
  projects/ifnet/sys/contrib/x86emu/   (props changed)
  projects/ifnet/sys/gnu/dts/   (props changed)
  projects/ifnet/sys/gnu/dts/arm/   (props changed)
  projects/ifnet/usr.sbin/bhyve/   (props changed)
  projects/ifnet/usr.sbin/bhyvectl/   (props changed)
  projects/ifnet/usr.sbin/bhyveload/   (props changed)
  projects/ifnet/usr.sbin/rtsold/   (props changed)

Modified: projects/ifnet/Makefile
==============================================================================
--- projects/ifnet/Makefile	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/Makefile	Fri Apr 17 05:55:07 2015	(r281640)
@@ -374,6 +374,17 @@ kernel-toolchains:
 #
 .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
 TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64
+# XXX Add arm64 to universe only if we have an external binutils installed.
+# It does not build with the in-tree linnker.
+.if exists(/usr/local/aarch64-freebsd/bin/ld)
+TARGETS+=arm64
+TARGET_ARCHES_arm64?=	aarch64
+.else
+universe: universe_arm64_skip
+universe_epilogue: universe_arm64_skip
+universe_arm64_skip: universe_prologue
+	@echo ">> arm64 skipped - install aarch64-binutils port or package to build"
+.endif
 TARGET_ARCHES_arm?=	arm armeb armv6 armv6hf
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32
 TARGET_ARCHES_powerpc?=	powerpc powerpc64

Modified: projects/ifnet/Makefile.inc1
==============================================================================
--- projects/ifnet/Makefile.inc1	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/Makefile.inc1	Fri Apr 17 05:55:07 2015	(r281640)
@@ -1304,12 +1304,10 @@ _lex=		usr.bin/lex
 _awk=		usr.bin/awk
 .endif
 
-.if ${BOOTSTRAPPING} < 1001506
 _yacc=		lib/liby \
 		usr.bin/yacc
 
 ${_bt}-usr.bin/yacc: ${_bt}-lib/liby
-.endif
 
 .if ${MK_BSNMP} != "no"
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
@@ -1359,8 +1357,13 @@ _kerberos5_bootstrap_tools= \
 	kerberos5/tools/slc \
 	usr.bin/compile_et
 
-${_bt}-kerberos5/tools/slc: ${_bt}-kerberos5/lib/libroken
-${_bt}-kerberos5/tools/asn1_compile: ${_bt}-kerberos5/lib/libroken
+${_bt}-kerberos5/lib/libroken: ${_bt}-kerberos5/tools/make-roken
+${_bt}-kerberos5/tools/asn1_compile: \
+    ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
+${_bt}-kerberos5/tools/slc: \
+    ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
+${_bt}-usr.bin/compile_et: \
+    ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
 .endif
 
 bootstrap-tools: .PHONY

Modified: projects/ifnet/ObsoleteFiles.inc
==============================================================================
--- projects/ifnet/ObsoleteFiles.inc	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/ObsoleteFiles.inc	Fri Apr 17 05:55:07 2015	(r281640)
@@ -38,6 +38,33 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150416: ALTQ moved to net/altq
+OLD_FILES+=usr/include/altq/altq_rmclass_debug.h
+OLD_FILES+=usr/include/altq/altq.h
+OLD_FILES+=usr/include/altq/altq_cdnr.h
+OLD_FILES+=usr/include/altq/altq_hfsc.h
+OLD_FILES+=usr/include/altq/altq_priq.h
+OLD_FILES+=usr/include/altq/altqconf.h
+OLD_FILES+=usr/include/altq/altq_classq.h
+OLD_FILES+=usr/include/altq/altq_red.h
+OLD_FILES+=usr/include/altq/if_altq.h
+OLD_FILES+=usr/include/altq/altq_var.h
+OLD_FILES+=usr/include/altq/altq_rmclass.h
+OLD_FILES+=usr/include/altq/altq_cbq.h
+OLD_FILES+=usr/include/altq/altq_rio.h
+OLD_DIRS+=usr/include/altq
+# 20150410
+OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
+OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/10.exref
+OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/11.edit
+OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz
+OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz
+OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/12.vi
+OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/13.viref
 # 20150329
 .if ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/bootconfig.h

Modified: projects/ifnet/README
==============================================================================
--- projects/ifnet/README	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/README	Fri Apr 17 05:55:07 2015	(r281640)
@@ -34,9 +34,7 @@ The sample kernel configuration files re
 sub-directory (assuming that you've installed the kernel sources), the
 file named GENERIC being the one used to build your initial installation
 kernel.  The file NOTES contains entries and documentation for all possible
-devices, not just those commonly used.  It is the successor of the ancient
-LINT file, but in contrast to LINT, it is not buildable as a kernel but a
-pure reference and documentation file.
+devices, not just those commonly used.
 
 
 Source Roadmap:
@@ -77,6 +75,9 @@ share		Shared resources.
 
 sys		Kernel sources.
 
+tests		Regression tests which can be run by Kyua.  See tests/README
+		for additional information.
+
 tools		Utilities for regression testing and miscellaneous tasks.
 
 usr.bin		User commands.

Modified: projects/ifnet/UPDATING
==============================================================================
--- projects/ifnet/UPDATING	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/UPDATING	Fri Apr 17 05:55:07 2015	(r281640)
@@ -31,6 +31,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150415:
+	The const qualifier has been removed from iconv(3) to comply with
+	POSIX.  The ports tree is aware of this from r384038 onwards.
+
+20150416:
+	Libraries specified by LIBADD in Makefiles must have a corresponding
+	DPADD_<lib> variable to ensure correct dependencies.  This is now
+	enforced in src.libnames.mk.
+
 20150324:
 	From legacy ata(4) driver was removed support for SATA controllers
 	supported by more functional drivers ahci(4), siis(4) and mvs(4).

Modified: projects/ifnet/bin/csh/config.h
==============================================================================
--- projects/ifnet/bin/csh/config.h	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/bin/csh/config.h	Fri Apr 17 05:55:07 2015	(r281640)
@@ -198,7 +198,7 @@
 #define HAVE_WCWIDTH 1
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Support NLS. */
 #define NLS 1

Modified: projects/ifnet/bin/csh/iconv_stub.h
==============================================================================
--- projects/ifnet/bin/csh/iconv_stub.h	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/bin/csh/iconv_stub.h	Fri Apr 17 05:55:07 2015	(r281640)
@@ -30,7 +30,7 @@
 #define _ICONV_H_
 
 typedef void *iconv_t;
-typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *);
+typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *);
 typedef int dl_iconv_close_t(iconv_t);
 
 extern iconv_t dl_iconv_open(const char *, const char *);

Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Fri Apr 17 05:55:07 2015	(r281640)
@@ -147,6 +147,9 @@ dtrace_dof_init(void)
 
 	dh.dofhp_dof = (uintptr_t)dof;
 	dh.dofhp_addr = elf->e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0;
+#ifdef __FreeBSD__
+	dh.dofhp_pid = getpid();
+#endif
 
 	if (lmid == 0) {
 		(void) snprintf(dh.dofhp_mod, sizeof (dh.dofhp_mod),
@@ -184,7 +187,7 @@ dtrace_dof_init(void)
 	else {
 		dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof);
 #ifdef __FreeBSD__
-		gen = dh.gen;
+		gen = dh.dofhp_gen;
 #endif
 	}
 

Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri Apr 17 05:55:07 2015	(r281640)
@@ -1785,11 +1785,17 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		    "failed to open %s: %s", file, strerror(errno)));
 	}
 #else
-	snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file);
-	if ((fd = mkstemp(tfile)) == -1)
-		return (dt_link_error(dtp, NULL, -1, NULL,
-		    "failed to create temporary file %s: %s",
-		    tfile, strerror(errno)));
+	if (dtp->dt_lazyload) {
+		if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0)
+			return (dt_link_error(dtp, NULL, -1, NULL,
+			    "failed to open %s: %s", file, strerror(errno)));
+	} else {
+		snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file);
+		if ((fd = mkstemp(tfile)) == -1)
+			return (dt_link_error(dtp, NULL, -1, NULL,
+			    "failed to create temporary file %s: %s",
+			    tfile, strerror(errno)));
+	}
 #endif
 
 	/*

Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Fri Apr 17 05:55:07 2015	(r281640)
@@ -44,10 +44,15 @@
 #include <dt_program.h>
 #include <dt_pid.h>
 #include <dt_string.h>
+#include <dt_module.h>
+
 #ifndef illumos
+#include <sys/sysctl.h>
+#include <unistd.h>
 #include <libproc_compat.h>
+#include <libelf.h>
+#include <gelf.h>
 #endif
-#include <dt_module.h>
 
 typedef struct dt_pid_probe {
 	dtrace_hdl_t *dpp_dtp;
@@ -566,6 +571,12 @@ dt_pid_usdt_mapping(void *data, const pr
 	prsyminfo_t sip;
 	dof_helper_t dh;
 	GElf_Half e_type;
+#ifdef __FreeBSD__
+	dof_hdr_t hdr;
+	size_t sz;
+	uint64_t dofmax;
+	void *dof;
+#endif
 	const char *mname;
 	const char *syms[] = { "___SUNW_dof", "__SUNW_dof" };
 	int i, fd = -1;
@@ -595,17 +606,61 @@ dt_pid_usdt_mapping(void *data, const pr
 			continue;
 		}
 
-		dh.dofhp_dof = sym.st_value;
+#ifdef __FreeBSD__
 		dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
+		if (Pread(P, &hdr, sizeof (hdr), sym.st_value) !=
+		    sizeof (hdr)) {
+			dt_dprintf("read of DOF header failed\n");
+			continue;
+		}
+
+		sz = sizeof(dofmax);
+		if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz,
+		    NULL, 0) != 0) {
+			dt_dprintf("failed to read dof_maxsize: %s\n",
+			    strerror(errno));
+			continue;
+		}
+		if (dofmax < hdr.dofh_loadsz) {
+			dt_dprintf("DOF load size exceeds maximum\n");
+			continue;
+		}
+
+		if ((dof = malloc(hdr.dofh_loadsz)) == NULL)
+			return (-1);
+
+		if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) !=
+		    hdr.dofh_loadsz) {
+			free(dof);
+			dt_dprintf("read of DOF section failed\n");
+			continue;
+		}
+
+		dh.dofhp_dof = (uintptr_t)dof;
+		dh.dofhp_pid = proc_getpid(P);
 
 		dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
-#ifdef illumos
 		    sip.prs_lmid, mname);
+
+		if (fd == -1 &&
+		    (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) {
+			dt_dprintf("open of helper device failed: %s\n",
+			    strerror(errno));
+			free(dof);
+			return (-1); /* errno is set for us */
+		}
+
+		if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0)
+			dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod);
+
+		free(dof);
 #else
-		    0, mname);
-#endif
+		dh.dofhp_dof = sym.st_value;
+		dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
+
+		dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
+		    sip.prs_lmid, mname);
 
-#ifdef illumos
 		if (fd == -1 &&
 		    (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) {
 			dt_dprintf("pr_open of helper device failed: %s\n",
@@ -618,8 +673,10 @@ dt_pid_usdt_mapping(void *data, const pr
 #endif
 	}
 
-#ifdef illumos
 	if (fd != -1)
+#ifdef __FreeBSD__
+		(void) close(fd);
+#else
 		(void) pr_close(P, fd);
 #endif
 
@@ -634,7 +691,6 @@ dt_pid_create_usdt_probes(dtrace_probede
 	int ret = 0;
 
 	assert(DT_MUTEX_HELD(&dpr->dpr_lock));
-#ifdef illumos
 	(void) Pupdate_maps(P);
 	if (Pobject_iter(P, dt_pid_usdt_mapping, P) != 0) {
 		ret = -1;
@@ -646,9 +702,6 @@ dt_pid_create_usdt_probes(dtrace_probede
 		    (int)proc_getpid(P), strerror(errno));
 #endif
 	}
-#else
-	ret = 0;
-#endif
 
 	/*
 	 * Put the module name in its canonical form.

Modified: projects/ifnet/cddl/lib/libdtrace/libproc_compat.h
==============================================================================
--- projects/ifnet/cddl/lib/libdtrace/libproc_compat.h	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/cddl/lib/libdtrace/libproc_compat.h	Fri Apr 17 05:55:07 2015	(r281640)
@@ -59,6 +59,6 @@
 #define	Pstate proc_state
 #define	Psymbol_iter_by_addr proc_iter_symbyaddr
 #define	Punsetflags proc_clearflags
-#define	Pupdate_maps(p) do { } while (0)
+#define	Pupdate_maps proc_rdagent
 #define	Pupdate_syms proc_updatesyms
 #define	Pxecbkpt proc_bkptexec

Modified: projects/ifnet/cddl/usr.bin/ctfmerge/Makefile
==============================================================================
--- projects/ifnet/cddl/usr.bin/ctfmerge/Makefile	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/cddl/usr.bin/ctfmerge/Makefile	Fri Apr 17 05:55:07 2015	(r281640)
@@ -33,7 +33,6 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-DPADD=		${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
-LDADD=		-ldwarf -lelf -lz -lpthread
+LIBADD=		elf z pthread
 
 .include <bsd.prog.mk>

Copied: projects/ifnet/contrib/compiler-rt/lib/builtins/floatditf.c (from r281639, head/contrib/compiler-rt/lib/builtins/floatditf.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ifnet/contrib/compiler-rt/lib/builtins/floatditf.c	Fri Apr 17 05:55:07 2015	(r281640, copy of r281639, head/contrib/compiler-rt/lib/builtins/floatditf.c)
@@ -0,0 +1,52 @@
+//===-- lib/floatditf.c - integer -> quad-precision conversion ----*- C -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements di_int to quad-precision conversion for the
+// compiler-rt library in the IEEE-754 default round-to-nearest, ties-to-even
+// mode.
+//
+//===----------------------------------------------------------------------===//
+
+#define QUAD_PRECISION
+#include "fp_lib.h"
+
+#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT)
+COMPILER_RT_ABI fp_t __floatditf(di_int a) {
+
+    const int aWidth = sizeof a * CHAR_BIT;
+
+    // Handle zero as a special case to protect clz
+    if (a == 0)
+        return fromRep(0);
+
+    // All other cases begin by extracting the sign and absolute value of a
+    rep_t sign = 0;
+    unsigned aAbs = (unsigned)a;
+    if (a < 0) {
+        sign = signBit;
+        aAbs += 0x80000000;
+    }
+
+    // Exponent of (fp_t)a is the width of abs(a).
+    const int exponent = (aWidth - 1) - __builtin_clz(a);
+    rep_t result;
+
+    // Shift a into the significand field and clear the implicit bit.  Extra
+    // cast to unsigned int is necessary to get the correct behavior for
+    // the input INT_MIN.
+    const int shift = significandBits - exponent;
+    result = (rep_t)aAbs << shift ^ implicitBit;
+
+    // Insert the exponent
+    result += (rep_t)(exponent + exponentBias) << significandBits;
+    // Insert the sign bit and return
+    return fromRep(result | sign);
+}
+
+#endif

Copied: projects/ifnet/contrib/compiler-rt/lib/builtins/floatunditf.c (from r281639, head/contrib/compiler-rt/lib/builtins/floatunditf.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ifnet/contrib/compiler-rt/lib/builtins/floatunditf.c	Fri Apr 17 05:55:07 2015	(r281640, copy of r281639, head/contrib/compiler-rt/lib/builtins/floatunditf.c)
@@ -0,0 +1,40 @@
+//===-- lib/floatunditf.c - uint -> quad-precision conversion -----*- C -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements du_int to quad-precision conversion for the
+// compiler-rt library in the IEEE-754 default round-to-nearest, ties-to-even
+// mode.
+//
+//===----------------------------------------------------------------------===//
+
+#define QUAD_PRECISION
+#include "fp_lib.h"
+
+#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT)
+COMPILER_RT_ABI fp_t __floatunditf(du_int a) {
+
+    const int aWidth = sizeof a * CHAR_BIT;
+
+    // Handle zero as a special case to protect clz
+    if (a == 0) return fromRep(0);
+
+    // Exponent of (fp_t)a is the width of abs(a).
+    const int exponent = (aWidth - 1) - __builtin_clz(a);
+    rep_t result;
+
+    // Shift a into the significand field and clear the implicit bit.
+    const int shift = significandBits - exponent;
+    result = (rep_t)a << shift ^ implicitBit;
+
+    // Insert the exponent
+    result += (rep_t)(exponent + exponentBias) << significandBits;
+    return fromRep(result);
+}
+
+#endif

Copied: projects/ifnet/contrib/compiler-rt/lib/builtins/multc3.c (from r281639, head/contrib/compiler-rt/lib/builtins/multc3.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/ifnet/contrib/compiler-rt/lib/builtins/multc3.c	Fri Apr 17 05:55:07 2015	(r281640, copy of r281639, head/contrib/compiler-rt/lib/builtins/multc3.c)
@@ -0,0 +1,73 @@
+/* ===-- multc3.c - Implement __multc3 -------------------------------------===
+ *
+ *                     The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===----------------------------------------------------------------------===
+ *
+ * This file implements __multc3 for the compiler_rt library.
+ *
+ * ===----------------------------------------------------------------------===
+ */
+
+#include "int_lib.h"
+#include "int_math.h"
+
+/* Returns: the product of a + ib and c + id */
+
+COMPILER_RT_ABI long double _Complex
+__multc3(long double __a, long double __b, long double __c, long double __d)
+{
+    long double __ac = __a * __c;
+    long double __bd = __b * __d;
+    long double __ad = __a * __d;
+    long double __bc = __b * __c;
+    long double _Complex z;
+    __real__ z = __ac - __bd;
+    __imag__ z = __ad + __bc;
+    if (crt_isnan(__real__ z) && crt_isnan(__imag__ z))
+    {
+        int __recalc = 0;
+        if (crt_isinf(__a) || crt_isinf(__b))
+        {
+            __a = crt_copysignl(crt_isinf(__a) ? 1 : 0, __a);
+            __b = crt_copysignl(crt_isinf(__b) ? 1 : 0, __b);
+            if (crt_isnan(__c))
+                __c = crt_copysignl(0, __c);
+            if (crt_isnan(__d))
+                __d = crt_copysignl(0, __d);
+            __recalc = 1;
+        }
+        if (crt_isinf(__c) || crt_isinf(__d))
+        {
+            __c = crt_copysignl(crt_isinf(__c) ? 1 : 0, __c);
+            __d = crt_copysignl(crt_isinf(__d) ? 1 : 0, __d);
+            if (crt_isnan(__a))
+                __a = crt_copysignl(0, __a);
+            if (crt_isnan(__b))
+                __b = crt_copysignl(0, __b);
+            __recalc = 1;
+        }
+        if (!__recalc && (crt_isinf(__ac) || crt_isinf(__bd) ||
+                          crt_isinf(__ad) || crt_isinf(__bc)))
+        {
+            if (crt_isnan(__a))
+                __a = crt_copysignl(0, __a);
+            if (crt_isnan(__b))
+                __b = crt_copysignl(0, __b);
+            if (crt_isnan(__c))
+                __c = crt_copysignl(0, __c);
+            if (crt_isnan(__d))
+                __d = crt_copysignl(0, __d);
+            __recalc = 1;
+        }
+        if (__recalc)
+        {
+            __real__ z = CRT_INFINITY * (__a * __c - __b * __d);
+            __imag__ z = CRT_INFINITY * (__a * __d + __b * __c);
+        }
+    }
+    return z;
+}

Modified: projects/ifnet/contrib/nvi/README
==============================================================================
--- projects/ifnet/contrib/nvi/README	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/contrib/nvi/README	Fri Apr 17 05:55:07 2015	(r281640)
@@ -1,6 +1,6 @@
-#	$Id: README,v 9.1 2013/11/02 02:50:23 zy Exp $
+#	$Id: README,v 9.2 2015/04/08 17:18:56 zy Exp $
 
-This is version 2.1.2 (2012-11-02) of nex/nvi, a reimplementation of the ex/vi
+This is version 2.1.3 (2015-04-08) of nex/nvi, a reimplementation of the ex/vi
 text editors originally distributed as part of the Fourth Berkeley
 Software Distribution (4BSD), by the University of California, Berkeley.
 

Modified: projects/ifnet/contrib/nvi/catalog/dump.c
==============================================================================
--- projects/ifnet/contrib/nvi/catalog/dump.c	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/contrib/nvi/catalog/dump.c	Fri Apr 17 05:55:07 2015	(r281640)
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -32,12 +28,6 @@
  */
 
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
 static char sccsid[] = "@(#)dump.c	8.1 (Berkeley) 8/31/94";
 #endif /* not lint */
 
@@ -45,8 +35,7 @@ static char sccsid[] = "@(#)dump.c	8.1 (
 #include <stdio.h>
 
 static void
-parse(fp)
-	FILE *fp;
+parse(FILE *fp)
 {
 	int ch, s1, s2, s3;
 
@@ -96,9 +85,7 @@ parse(fp)
 }
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	FILE *fp;
 

Modified: projects/ifnet/contrib/nvi/cl/cl.h
==============================================================================
--- projects/ifnet/contrib/nvi/cl/cl.h	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/contrib/nvi/cl/cl.h	Fri Apr 17 05:55:07 2015	(r281640)
@@ -80,16 +80,4 @@ typedef enum { INP_OK=0, INP_EOF, INP_ER
 #define	RCNO(sp, cno)	(cno)
 #define	RLNO(sp, lno)	(lno)
 
-/*
- * XXX
- * Some implementations of curses.h don't define these for us.  Used for
- * compatibility only.
- */
-#ifndef TRUE
-#define	TRUE	1
-#endif
-#ifndef FALSE
-#define	FALSE	0
-#endif
-
 #include "extern.h"

Modified: projects/ifnet/contrib/nvi/cl/cl_funcs.c
==============================================================================
--- projects/ifnet/contrib/nvi/cl/cl_funcs.c	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/contrib/nvi/cl/cl_funcs.c	Fri Apr 17 05:55:07 2015	(r281640)
@@ -33,7 +33,7 @@ static const char sccsid[] = "$Id: cl_fu
 #include "../vi/vi.h"
 #include "cl.h"
 
-static void cl_rdiv __P((SCR *));
+static void cl_rdiv(SCR *);
 
 static int 
 addstr4(SCR *sp, void *str, size_t len, int wide)
@@ -76,31 +76,31 @@ addstr4(SCR *sp, void *str, size_t len, 
  * cl_waddstr --
  *	Add len bytes from the string at the cursor, advancing the cursor.
  *
- * PUBLIC: int cl_waddstr __P((SCR *, const CHAR_T *, size_t));
+ * PUBLIC: int cl_waddstr(SCR *, const CHAR_T *, size_t);
  */
 int
 cl_waddstr(SCR *sp, const CHAR_T *str, size_t len)
 {
-    return addstr4(sp, (void *)str, len, 1);
+	return addstr4(sp, (void *)str, len, 1);
 }
 
 /*
  * cl_addstr --
  *	Add len bytes from the string at the cursor, advancing the cursor.
  *
- * PUBLIC: int cl_addstr __P((SCR *, const char *, size_t));
+ * PUBLIC: int cl_addstr(SCR *, const char *, size_t);
  */
 int
 cl_addstr(SCR *sp, const char *str, size_t len)
 {
-    return addstr4(sp, (void *)str, len, 0);
+	return addstr4(sp, (void *)str, len, 0);
 }
 
 /*
  * cl_attr --
  *	Toggle a screen attribute on/off.
  *
- * PUBLIC: int cl_attr __P((SCR *, scr_attr_t, int));
+ * PUBLIC: int cl_attr(SCR *, scr_attr_t, int);
  */
 int
 cl_attr(SCR *sp, scr_attr_t attribute, int on)
@@ -187,7 +187,7 @@ cl_attr(SCR *sp, scr_attr_t attribute, i
  * cl_baud --
  *	Return the baud rate.
  *
- * PUBLIC: int cl_baud __P((SCR *, u_long *));
+ * PUBLIC: int cl_baud(SCR *, u_long *);
  */
 int
 cl_baud(SCR *sp, u_long *ratep)
@@ -228,7 +228,7 @@ cl_baud(SCR *sp, u_long *ratep)
  * cl_bell --
  *	Ring the bell/flash the screen.
  *
- * PUBLIC: int cl_bell __P((SCR *));
+ * PUBLIC: int cl_bell(SCR *);
  */
 int
 cl_bell(SCR *sp)
@@ -252,7 +252,7 @@ cl_bell(SCR *sp)
  * cl_clrtoeol --
  *	Clear from the current cursor to the end of the line.
  *
- * PUBLIC: int cl_clrtoeol __P((SCR *));
+ * PUBLIC: int cl_clrtoeol(SCR *);
  */
 int
 cl_clrtoeol(SCR *sp)
@@ -281,7 +281,7 @@ cl_clrtoeol(SCR *sp)
  * cl_cursor --
  *	Return the current cursor position.
  *
- * PUBLIC: int cl_cursor __P((SCR *, size_t *, size_t *));
+ * PUBLIC: int cl_cursor(SCR *, size_t *, size_t *);
  */
 int
 cl_cursor(SCR *sp, size_t *yp, size_t *xp)
@@ -307,7 +307,7 @@ cl_cursor(SCR *sp, size_t *yp, size_t *x
  * cl_deleteln --
  *	Delete the current line, scrolling all lines below it.
  *
- * PUBLIC: int cl_deleteln __P((SCR *));
+ * PUBLIC: int cl_deleteln(SCR *);
  */
 int
 cl_deleteln(SCR *sp)
@@ -344,7 +344,7 @@ cl_deleteln(SCR *sp)
  * cl_discard --
  *	Discard a screen.
  *
- * PUBLIC: int cl_discard __P((SCR *, SCR **));
+ * PUBLIC: int cl_discard(SCR *, SCR **);
  */
 int
 cl_discard(SCR *discardp, SCR **acquirep)
@@ -385,7 +385,7 @@ cl_discard(SCR *discardp, SCR **acquirep
  *	Adjust the screen for ex.  This routine is purely for standalone
  *	ex programs.  All special purpose, all special case.
  *
- * PUBLIC: int cl_ex_adjust __P((SCR *, exadj_t));
+ * PUBLIC: int cl_ex_adjust(SCR *, exadj_t);
  */
 int
 cl_ex_adjust(SCR *sp, exadj_t action)
@@ -440,7 +440,7 @@ cl_ex_adjust(SCR *sp, exadj_t action)
  * cl_insertln --
  *	Push down the current line, discarding the bottom line.
  *
- * PUBLIC: int cl_insertln __P((SCR *));
+ * PUBLIC: int cl_insertln(SCR *);
  */
 int
 cl_insertln(SCR *sp)
@@ -458,7 +458,7 @@ cl_insertln(SCR *sp)
  * cl_keyval --
  *	Return the value for a special key.
  *
- * PUBLIC: int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *));
+ * PUBLIC: int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *);
  */
 int
 cl_keyval(SCR *sp, scr_keyval_t val, CHAR_T *chp, int *dnep)
@@ -496,7 +496,7 @@ cl_keyval(SCR *sp, scr_keyval_t val, CHA
  * cl_move --
  *	Move the cursor.
  *
- * PUBLIC: int cl_move __P((SCR *, size_t, size_t));
+ * PUBLIC: int cl_move(SCR *, size_t, size_t);
  */
 int
 cl_move(SCR *sp, size_t lno, size_t cno)
@@ -516,7 +516,7 @@ cl_move(SCR *sp, size_t lno, size_t cno)
  * cl_refresh --
  *	Refresh the screen.
  *
- * PUBLIC: int cl_refresh __P((SCR *, int));
+ * PUBLIC: int cl_refresh(SCR *, int);
  */
 int
 cl_refresh(SCR *sp, int repaint)
@@ -599,7 +599,7 @@ cl_rdiv(SCR *sp)
  * cl_rename --
  *	Rename the file.
  *
- * PUBLIC: int cl_rename __P((SCR *, char *, int));
+ * PUBLIC: int cl_rename(SCR *, char *, int);
  */
 int
 cl_rename(SCR *sp, char *name, int on)
@@ -621,7 +621,7 @@ cl_rename(SCR *sp, char *name, int on)
 	if (on) {
 		clp->focus = sp;
 		if (!F_ISSET(clp, CL_RENAME_OK) ||
-				strncmp(OG_STR(gp, GO_TERM), "xterm", 5))
+		    strncmp(OG_STR(gp, GO_TERM), "xterm", 5))
 			return (0);
 
 		if (clp->oname == NULL && (wid = getenv("WINDOWID"))) {
@@ -654,7 +654,7 @@ rename:		cl_setname(gp, name);
  * cl_setname --
  *	Set a X11 icon/window name.
  *
- * PUBLIC: void cl_setname __P((GS *, char *));
+ * PUBLIC: void cl_setname(GS *, char *);
  */
 void
 cl_setname(GS *gp, char *name)
@@ -671,7 +671,7 @@ cl_setname(GS *gp, char *name)
  * cl_split --
  *	Split a screen.
  *
- * PUBLIC: int cl_split __P((SCR *, SCR *));
+ * PUBLIC: int cl_split(SCR *, SCR *);
  */
 int
 cl_split(SCR *origp, SCR *newp)
@@ -697,7 +697,7 @@ cl_split(SCR *origp, SCR *newp)
  * cl_suspend --
  *	Suspend a screen.
  *
- * PUBLIC: int cl_suspend __P((SCR *, int *));
+ * PUBLIC: int cl_suspend(SCR *, int *);
  */
 int
 cl_suspend(SCR *sp, int *allowedp)
@@ -825,7 +825,7 @@ cl_suspend(SCR *sp, int *allowedp)
  * cl_usage --
  *	Print out the curses usage messages.
  * 
- * PUBLIC: void cl_usage __P((void));
+ * PUBLIC: void cl_usage(void);
  */
 void
 cl_usage(void)

Modified: projects/ifnet/contrib/nvi/cl/cl_main.c
==============================================================================
--- projects/ifnet/contrib/nvi/cl/cl_main.c	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/contrib/nvi/cl/cl_main.c	Fri Apr 17 05:55:07 2015	(r281640)
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_main.c,v 10.55 2011/08/15 19:52:28 zy Exp $";
+static const char sccsid[] = "$Id: cl_main.c,v 10.56 2015/04/05 06:20:53 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -36,20 +36,20 @@ static const char sccsid[] = "$Id: cl_ma
 GS *__global_list;				/* GLOBAL: List of screens. */
 sigset_t __sigblockset;				/* GLOBAL: Blocked signals. */
 
-static void	   cl_func_std __P((GS *));
-static CL_PRIVATE *cl_init __P((GS *));
-static GS	  *gs_init __P((char *));
-static void	   perr __P((char *, char *));
-static int	   setsig __P((int, struct sigaction *, void (*)(int)));
-static void	   sig_end __P((GS *));
-static void	   term_init __P((char *, char *));
+static void	   cl_func_std(GS *);
+static CL_PRIVATE *cl_init(GS *);
+static GS	  *gs_init(char *);
+static void	   perr(char *, char *);
+static int	   setsig(int, struct sigaction *, void (*)(int));
+static void	   sig_end(GS *);
+static void	   term_init(char *, char *);
 
 /*
  * main --
  *	This is the main loop for the standalone curses editor.
  */
 int
-main(int argc, char **argv)
+main(int argc, char *argv[])
 {
 	static int reenter;
 	CL_PRIVATE *clp;
@@ -92,7 +92,7 @@ main(int argc, char **argv)
 	 * have to use termcap/terminfo to find out how big the screen is.
 	 */
 	if ((ttype = getenv("TERM")) == NULL)
-		ttype = "unknown";
+		ttype = "ansi";
 	term_init(gp->progname, ttype);
 
 	/* Add the terminal type to the global structure. */
@@ -146,7 +146,7 @@ main(int argc, char **argv)
 	}
 
 	/* Free the global and CL private areas. */
-#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY)
+#if defined(DEBUG) || defined(PURIFY)
 	if (clp->oname != NULL)
 		free(clp->oname);
 	free(clp);
@@ -292,7 +292,7 @@ h_winch(int signo)
  * sig_init --
  *	Initialize signals.
  *
- * PUBLIC: int sig_init __P((GS *, SCR *));
+ * PUBLIC: int sig_init(GS *, SCR *);
  */
 int
 sig_init(GS *gp, SCR *sp)
@@ -337,7 +337,7 @@ sig_init(GS *gp, SCR *sp)
  *	Set a signal handler.
  */
 static int
-setsig(int signo, struct sigaction *oactp, void (*handler) (int))
+setsig(int signo, struct sigaction *oactp, void (*handler)(int))
 {
 	struct sigaction act;
 
@@ -345,21 +345,12 @@ setsig(int signo, struct sigaction *oact
 	 * Use sigaction(2), not signal(3), since we don't always want to
 	 * restart system calls.  The example is when waiting for a command
 	 * mode keystroke and SIGWINCH arrives.  Besides, you can't portably
-	 * restart system calls (thanks, POSIX!).  On the other hand, you
-	 * can't portably NOT restart system calls (thanks, Sun!).  SunOS
-	 * used SA_INTERRUPT as their extension to NOT restart read calls.
-	 * We sure hope nobody else used it for anything else.  Mom told me
-	 * there'd be days like this.  She just never told me that there'd
-	 * be so many.
+	 * restart system calls (thanks, POSIX!).
 	 */
 	act.sa_handler = handler;
 	sigemptyset(&act.sa_mask);
 
-#ifdef SA_INTERRUPT
-	act.sa_flags = SA_INTERRUPT;
-#else
 	act.sa_flags = 0;
-#endif
 	return (sigaction(signo, &act, oactp));
 }
 

Modified: projects/ifnet/contrib/nvi/cl/cl_read.c
==============================================================================
--- projects/ifnet/contrib/nvi/cl/cl_read.c	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/contrib/nvi/cl/cl_read.c	Fri Apr 17 05:55:07 2015	(r281640)
@@ -35,15 +35,15 @@ static const char sccsid[] = "$Id: cl_re
 #undef columns
 #undef lines  
 
-static input_t	cl_read __P((SCR *,
-    u_int32_t, char *, size_t, int *, struct timeval *));
-static int	cl_resize __P((SCR *, size_t, size_t));
+static input_t	cl_read(SCR *,
+    u_int32_t, char *, size_t, int *, struct timeval *);
+static int	cl_resize(SCR *, size_t, size_t);
 
 /*
  * cl_event --
  *	Return a single event.
  *
- * PUBLIC: int cl_event __P((SCR *, EVENT *, u_int32_t, int));
+ * PUBLIC: int cl_event(SCR *, EVENT *, u_int32_t, int);
  */
 int
 cl_event(SCR *sp, EVENT *evp, u_int32_t flags, int ms)
@@ -143,7 +143,8 @@ read:
  *	Read characters from the input.
  */
 static input_t
-cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp, struct timeval *tp)
+cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp,
+    struct timeval *tp)
 {
 	struct termios term1, term2;
 	CL_PRIVATE *clp;

Modified: projects/ifnet/contrib/nvi/cl/cl_screen.c
==============================================================================
--- projects/ifnet/contrib/nvi/cl/cl_screen.c	Fri Apr 17 03:56:50 2015	(r281639)
+++ projects/ifnet/contrib/nvi/cl/cl_screen.c	Fri Apr 17 05:55:07 2015	(r281640)
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_screen.c,v 10.56 2002/05/03 19:59:44 skimo Exp $";
+static const char sccsid[] = "$Id: cl_screen.c,v 10.58 2015/04/08 02:12:11 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -32,18 +32,18 @@ static const char sccsid[] = "$Id: cl_sc
 #include "../common/common.h"
 #include "cl.h"
 
-static int	cl_ex_end __P((GS *));
-static int	cl_ex_init __P((SCR *));
-static void	cl_freecap __P((CL_PRIVATE *));
-static int	cl_vi_end __P((GS *));
-static int	cl_vi_init __P((SCR *));
-static int	cl_putenv __P((char *, char *, u_long));
+static int	cl_ex_end(GS *);
+static int	cl_ex_init(SCR *);
+static void	cl_freecap(CL_PRIVATE *);
+static int	cl_vi_end(GS *);
+static int	cl_vi_init(SCR *);
+static int	cl_putenv(char *, char *, u_long);
 
 /*
  * cl_screen --
  *	Switch screen types.
  *
- * PUBLIC: int cl_screen __P((SCR *, u_int32_t));
+ * PUBLIC: int cl_screen(SCR *, u_int32_t);
  */
 int
 cl_screen(SCR *sp, u_int32_t flags)
@@ -58,11 +58,9 @@ cl_screen(SCR *sp, u_int32_t flags)
 
 	/* See if the current information is incorrect. */
 	if (F_ISSET(gp, G_SRESTART)) {
-		if (CLSP(sp)) {
-		    delwin(CLSP(sp));
-		    sp->cl_private = NULL;
-		}
-		if (cl_quit(gp))
+		if ((!F_ISSET(sp, SC_SCR_EX | SC_SCR_VI) ||
+		     resizeterm(O_VAL(sp, O_LINES), O_VAL(sp, O_COLUMNS))) &&
+		    cl_quit(gp))
 			return (1);
 		F_CLR(gp, G_SRESTART);
 	}
@@ -131,7 +129,7 @@ cl_screen(SCR *sp, u_int32_t flags)
  * cl_quit --
  *	Shutdown the screens.
  *
- * PUBLIC: int cl_quit __P((GS *));
+ * PUBLIC: int cl_quit(GS *);
  */
 int
 cl_quit(GS *gp)
@@ -234,20 +232,15 @@ cl_vi_init(SCR *sp)
 	cl_putenv("COLUMNS", NULL, (u_long)O_VAL(sp, O_COLUMNS));
 
 	/*
-	 * We don't care about the SCREEN reference returned by newterm, we
-	 * never have more than one SCREEN at a time.
-	 *
-	 * XXX

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504170555.t3H5t9lC055708>