Date: Fri, 18 Jul 2014 12:36:19 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r268841 - in projects/sendfile: . bin/csh bin/ls bin/sh bin/sh/tests/builtins bin/sh/tests/parameters cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zhack cddl/contrib/op... Message-ID: <201407181236.s6ICaJq9043330@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Fri Jul 18 12:36:18 2014 New Revision: 268841 URL: http://svnweb.freebsd.org/changeset/base/268841 Log: Merge head r258543 through r268838. Added: projects/sendfile/bin/sh/tests/parameters/positional3.0 - copied unchanged from r268838, head/bin/sh/tests/parameters/positional3.0 projects/sendfile/bin/sh/tests/parameters/positional4.0 - copied unchanged from r268838, head/bin/sh/tests/parameters/positional4.0 projects/sendfile/bin/sh/tests/parameters/positional5.0 - copied unchanged from r268838, head/bin/sh/tests/parameters/positional5.0 projects/sendfile/contrib/libucl/ChangeLog.md - copied unchanged from r268838, head/contrib/libucl/ChangeLog.md projects/sendfile/contrib/libucl/src/ucl_emitter_streamline.c - copied unchanged from r268838, head/contrib/libucl/src/ucl_emitter_streamline.c projects/sendfile/contrib/libucl/src/ucl_emitter_utils.c - copied unchanged from r268838, head/contrib/libucl/src/ucl_emitter_utils.c projects/sendfile/contrib/libucl/tests/streamline.res - copied unchanged from r268838, head/contrib/libucl/tests/streamline.res projects/sendfile/contrib/libucl/tests/streamline.test - copied unchanged from r268838, head/contrib/libucl/tests/streamline.test projects/sendfile/contrib/libucl/tests/test_streamline.c - copied unchanged from r268838, head/contrib/libucl/tests/test_streamline.c projects/sendfile/lib/libedit/TEST/tc1.c - copied unchanged from r268838, head/lib/libedit/TEST/tc1.c projects/sendfile/lib/msun/ld128/s_erfl.c - copied unchanged from r268838, head/lib/msun/ld128/s_erfl.c projects/sendfile/lib/msun/ld80/s_erfl.c - copied unchanged from r268838, head/lib/msun/ld80/s_erfl.c projects/sendfile/share/man/man9/pmap_protect.9 - copied unchanged from r268838, head/share/man/man9/pmap_protect.9 projects/sendfile/share/man/man9/pmap_unwire.9 - copied unchanged from r268838, head/share/man/man9/pmap_unwire.9 projects/sendfile/sys/arm/conf/APALIS-IMX6 - copied unchanged from r268838, head/sys/arm/conf/APALIS-IMX6 projects/sendfile/sys/arm/freescale/imx/imx_gpio.c - copied unchanged from r268838, head/sys/arm/freescale/imx/imx_gpio.c projects/sendfile/sys/boot/fdt/dts/arm/apalis-imx6.dts - copied unchanged from r268838, head/sys/boot/fdt/dts/arm/apalis-imx6.dts projects/sendfile/sys/cam/ctl/ctl_tpc.c - copied unchanged from r268838, head/sys/cam/ctl/ctl_tpc.c projects/sendfile/sys/cam/ctl/ctl_tpc.h - copied unchanged from r268838, head/sys/cam/ctl/ctl_tpc.h projects/sendfile/sys/cam/ctl/ctl_tpc_local.c - copied unchanged from r268838, head/sys/cam/ctl/ctl_tpc_local.c projects/sendfile/tools/build/options/WITHOUT_TESTS - copied unchanged from r268838, head/tools/build/options/WITHOUT_TESTS projects/sendfile/tools/build/options/WITH_INFO - copied unchanged from r268838, head/tools/build/options/WITH_INFO projects/sendfile/usr.bin/timeout/ - copied from r268838, head/usr.bin/timeout/ projects/sendfile/usr.bin/units/tests/ - copied from r268838, head/usr.bin/units/tests/ projects/sendfile/usr.bin/users/users.cc - copied unchanged from r268838, head/usr.bin/users/users.cc projects/sendfile/usr.bin/yacc/tests/yacc_tests.sh - copied unchanged from r268838, head/usr.bin/yacc/tests/yacc_tests.sh projects/sendfile/usr.sbin/bhyve/task_switch.c - copied unchanged from r268838, head/usr.sbin/bhyve/task_switch.c Replaced: projects/sendfile/sys/dev/iicbus/iic.h - copied unchanged from r268838, head/sys/dev/iicbus/iic.h Deleted: projects/sendfile/contrib/byacc/NOTES-btyacc-Changes projects/sendfile/contrib/byacc/NOTES-btyacc-Disposition projects/sendfile/gnu/lib/libreadline/history/ projects/sendfile/gnu/lib/libreadline/readline/doc/ projects/sendfile/lib/libedit/TEST/test.c projects/sendfile/share/man/man9/pmap_page_protect.9 projects/sendfile/share/mk/bsd.dtrace.mk projects/sendfile/sys/arm/freescale/imx/imx51_gpio.c projects/sendfile/tools/build/options/WITH_TESTS projects/sendfile/usr.bin/users/users.c projects/sendfile/usr.bin/yacc/tests/calc.y projects/sendfile/usr.bin/yacc/tests/calc1.y projects/sendfile/usr.bin/yacc/tests/calc2.y projects/sendfile/usr.bin/yacc/tests/calc3.y projects/sendfile/usr.bin/yacc/tests/code_calc.y projects/sendfile/usr.bin/yacc/tests/code_error.y projects/sendfile/usr.bin/yacc/tests/error.y projects/sendfile/usr.bin/yacc/tests/ftp.y projects/sendfile/usr.bin/yacc/tests/grammar.y projects/sendfile/usr.bin/yacc/tests/legacy_test.sh projects/sendfile/usr.bin/yacc/tests/pure_calc.y projects/sendfile/usr.bin/yacc/tests/pure_error.y projects/sendfile/usr.bin/yacc/tests/quote_calc.y projects/sendfile/usr.bin/yacc/tests/quote_calc2.y projects/sendfile/usr.bin/yacc/tests/quote_calc3.y projects/sendfile/usr.bin/yacc/tests/quote_calc4.y projects/sendfile/usr.bin/yacc/tests/regress.00.out projects/sendfile/usr.bin/yacc/tests/regress.01.out projects/sendfile/usr.bin/yacc/tests/regress.02.out projects/sendfile/usr.bin/yacc/tests/regress.03.out projects/sendfile/usr.bin/yacc/tests/regress.04.out projects/sendfile/usr.bin/yacc/tests/regress.05.out projects/sendfile/usr.bin/yacc/tests/regress.06.out projects/sendfile/usr.bin/yacc/tests/regress.07.out projects/sendfile/usr.bin/yacc/tests/regress.08.out projects/sendfile/usr.bin/yacc/tests/regress.09.out projects/sendfile/usr.bin/yacc/tests/regress.10.out projects/sendfile/usr.bin/yacc/tests/regress.11.out projects/sendfile/usr.bin/yacc/tests/regress.12.out projects/sendfile/usr.bin/yacc/tests/regress.13.out projects/sendfile/usr.bin/yacc/tests/regress.14.out projects/sendfile/usr.bin/yacc/tests/regress.sh projects/sendfile/usr.bin/yacc/tests/undefined.y Modified: projects/sendfile/Makefile projects/sendfile/Makefile.inc1 projects/sendfile/ObsoleteFiles.inc projects/sendfile/UPDATING projects/sendfile/bin/csh/Makefile projects/sendfile/bin/ls/Makefile projects/sendfile/bin/sh/Makefile projects/sendfile/bin/sh/expand.c projects/sendfile/bin/sh/tests/builtins/Makefile projects/sendfile/bin/sh/tests/parameters/Makefile projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/sendfile/cddl/contrib/opensolaris/cmd/zhack/zhack.c projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8 projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c projects/sendfile/contrib/bmake/ChangeLog projects/sendfile/contrib/bmake/Makefile projects/sendfile/contrib/bmake/README projects/sendfile/contrib/bmake/bmake.1 projects/sendfile/contrib/bmake/bmake.cat1 projects/sendfile/contrib/bmake/boot-strap projects/sendfile/contrib/bmake/bsd.after-import.mk projects/sendfile/contrib/bmake/config.h.in projects/sendfile/contrib/bmake/configure projects/sendfile/contrib/bmake/configure.in projects/sendfile/contrib/bmake/main.c projects/sendfile/contrib/bmake/make.1 projects/sendfile/contrib/bmake/mk/ChangeLog projects/sendfile/contrib/bmake/mk/autodep.mk projects/sendfile/contrib/bmake/mk/dirdeps.mk projects/sendfile/contrib/bmake/mk/dpadd.mk projects/sendfile/contrib/bmake/mk/gendirdeps.mk projects/sendfile/contrib/bmake/mk/host-target.mk projects/sendfile/contrib/bmake/mk/install-mk projects/sendfile/contrib/bmake/mk/lib.mk projects/sendfile/contrib/bmake/mk/meta.autodep.mk projects/sendfile/contrib/bmake/mk/meta2deps.py projects/sendfile/contrib/bmake/mk/meta2deps.sh projects/sendfile/contrib/bmake/mk/options.mk projects/sendfile/contrib/bmake/mk/rst2htm.mk projects/sendfile/contrib/bmake/mk/sys.mk projects/sendfile/contrib/bmake/mk/sys/SunOS.mk projects/sendfile/contrib/bmake/mk/target-flags.mk projects/sendfile/contrib/bmake/mk/warnings.mk projects/sendfile/contrib/bmake/os.sh projects/sendfile/contrib/bmake/parse.c projects/sendfile/contrib/bmake/str.c projects/sendfile/contrib/bmake/var.c projects/sendfile/contrib/byacc/CHANGES projects/sendfile/contrib/byacc/MANIFEST projects/sendfile/contrib/byacc/VERSION projects/sendfile/contrib/byacc/aclocal.m4 projects/sendfile/contrib/byacc/main.c projects/sendfile/contrib/byacc/package/byacc.spec projects/sendfile/contrib/byacc/package/debian/changelog projects/sendfile/contrib/byacc/package/mingw-byacc.spec projects/sendfile/contrib/byacc/package/pkgsrc/Makefile projects/sendfile/contrib/byacc/test/btyacc/big_b.output projects/sendfile/contrib/byacc/test/btyacc/big_l.output projects/sendfile/contrib/byacc/test/btyacc/err_inherit1.error projects/sendfile/contrib/byacc/test/btyacc/err_inherit2.error projects/sendfile/contrib/byacc/test/btyacc/err_inherit3.error projects/sendfile/contrib/byacc/test/btyacc/err_inherit4.error projects/sendfile/contrib/byacc/test/btyacc/err_inherit5.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax1.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax10.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax11.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax12.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax13.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax14.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax15.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax16.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax17.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax18.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax19.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax2.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax21.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax22.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax23.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax24.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax25.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax26.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax27.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax3.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax4.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax5.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax6.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax7.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax7a.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax7b.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax8.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax8a.error projects/sendfile/contrib/byacc/test/btyacc/err_syntax9.error projects/sendfile/contrib/byacc/test/btyacc/help.output projects/sendfile/contrib/byacc/test/btyacc/no_b_opt.output projects/sendfile/contrib/byacc/test/btyacc/no_output2.output projects/sendfile/contrib/byacc/test/btyacc/no_p_opt.output projects/sendfile/contrib/byacc/test/btyacc/nostdin.output projects/sendfile/contrib/byacc/test/run_test.sh projects/sendfile/contrib/byacc/test/yacc/big_b.output projects/sendfile/contrib/byacc/test/yacc/big_l.output projects/sendfile/contrib/byacc/test/yacc/err_syntax1.error projects/sendfile/contrib/byacc/test/yacc/err_syntax10.error projects/sendfile/contrib/byacc/test/yacc/err_syntax11.error projects/sendfile/contrib/byacc/test/yacc/err_syntax12.error projects/sendfile/contrib/byacc/test/yacc/err_syntax13.error projects/sendfile/contrib/byacc/test/yacc/err_syntax14.error projects/sendfile/contrib/byacc/test/yacc/err_syntax15.error projects/sendfile/contrib/byacc/test/yacc/err_syntax16.error projects/sendfile/contrib/byacc/test/yacc/err_syntax17.error projects/sendfile/contrib/byacc/test/yacc/err_syntax18.error projects/sendfile/contrib/byacc/test/yacc/err_syntax19.error projects/sendfile/contrib/byacc/test/yacc/err_syntax2.error projects/sendfile/contrib/byacc/test/yacc/err_syntax21.error projects/sendfile/contrib/byacc/test/yacc/err_syntax22.error projects/sendfile/contrib/byacc/test/yacc/err_syntax23.error projects/sendfile/contrib/byacc/test/yacc/err_syntax24.error projects/sendfile/contrib/byacc/test/yacc/err_syntax25.error projects/sendfile/contrib/byacc/test/yacc/err_syntax26.error projects/sendfile/contrib/byacc/test/yacc/err_syntax27.error projects/sendfile/contrib/byacc/test/yacc/err_syntax3.error projects/sendfile/contrib/byacc/test/yacc/err_syntax4.error projects/sendfile/contrib/byacc/test/yacc/err_syntax5.error projects/sendfile/contrib/byacc/test/yacc/err_syntax6.error projects/sendfile/contrib/byacc/test/yacc/err_syntax7.error projects/sendfile/contrib/byacc/test/yacc/err_syntax7a.error projects/sendfile/contrib/byacc/test/yacc/err_syntax7b.error projects/sendfile/contrib/byacc/test/yacc/err_syntax8.error projects/sendfile/contrib/byacc/test/yacc/err_syntax8a.error projects/sendfile/contrib/byacc/test/yacc/err_syntax9.error projects/sendfile/contrib/byacc/test/yacc/help.output projects/sendfile/contrib/byacc/test/yacc/no_b_opt.output projects/sendfile/contrib/byacc/test/yacc/no_output2.output projects/sendfile/contrib/byacc/test/yacc/no_p_opt.output projects/sendfile/contrib/byacc/test/yacc/nostdin.output projects/sendfile/contrib/ipfilter/lib/printipfexpr.c projects/sendfile/contrib/libucl/configure.ac projects/sendfile/contrib/libucl/doc/api.md projects/sendfile/contrib/libucl/doc/libucl.3 projects/sendfile/contrib/libucl/doc/pandoc.template projects/sendfile/contrib/libucl/include/ucl.h projects/sendfile/contrib/libucl/src/Makefile.am projects/sendfile/contrib/libucl/src/ucl_emitter.c projects/sendfile/contrib/libucl/src/ucl_internal.h projects/sendfile/contrib/libucl/src/ucl_parser.c projects/sendfile/contrib/libucl/tests/Makefile.am projects/sendfile/contrib/libucl/tests/test_basic.c projects/sendfile/contrib/libucl/uthash/utstring.h projects/sendfile/contrib/llvm/tools/lldb/tools/driver/Platform.h projects/sendfile/etc/mtree/BSD.tests.dist projects/sendfile/games/fortune/fortune/pathnames.h projects/sendfile/games/grdc/Makefile projects/sendfile/gnu/lib/Makefile projects/sendfile/gnu/lib/libreadline/Makefile projects/sendfile/gnu/lib/libreadline/readline/Makefile projects/sendfile/gnu/usr.bin/cc/Makefile projects/sendfile/gnu/usr.bin/gdb/Makefile.inc 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/texinfo/info/Makefile projects/sendfile/include/dirent.h projects/sendfile/include/search.h projects/sendfile/kerberos5/usr.bin/kadmin/Makefile projects/sendfile/lib/libc/gen/arc4random.c projects/sendfile/lib/libc/gen/gen-private.h projects/sendfile/lib/libc/gen/opendir.c projects/sendfile/lib/libc/gen/readdir.c projects/sendfile/lib/libc/gen/readpassphrase.c projects/sendfile/lib/libc/gen/rewinddir.c projects/sendfile/lib/libc/gen/sysconf.c projects/sendfile/lib/libc/gen/telldir.h projects/sendfile/lib/libc/net/Makefile.inc projects/sendfile/lib/libc/stdlib/getopt.3 projects/sendfile/lib/libc/stdlib/hcreate.c projects/sendfile/lib/libc/stdlib/strfmon.c projects/sendfile/lib/libc/stdlib/tsearch.c projects/sendfile/lib/libc/stdlib/twalk.c projects/sendfile/lib/libc/sys/listen.2 projects/sendfile/lib/libc/sys/procctl.2 projects/sendfile/lib/libedit/Makefile projects/sendfile/lib/libedit/common.c projects/sendfile/lib/libedit/emacs.c projects/sendfile/lib/libedit/filecomplete.h projects/sendfile/lib/libedit/histedit.h projects/sendfile/lib/libedit/prompt.c projects/sendfile/lib/libedit/prompt.h projects/sendfile/lib/libedit/read.h projects/sendfile/lib/libedit/sys.h projects/sendfile/lib/libedit/term.h projects/sendfile/lib/libedit/tty.c projects/sendfile/lib/libfetch/common.c projects/sendfile/lib/libproc/Makefile projects/sendfile/lib/libproc/proc_sym.c projects/sendfile/lib/libsbuf/Makefile projects/sendfile/lib/libucl/Makefile projects/sendfile/lib/msun/Makefile projects/sendfile/lib/msun/Symbol.map projects/sendfile/lib/msun/man/erf.3 projects/sendfile/lib/msun/src/e_pow.c projects/sendfile/lib/msun/src/imprecise.c projects/sendfile/lib/msun/src/math.h projects/sendfile/lib/msun/src/s_erf.c projects/sendfile/lib/msun/src/s_erff.c projects/sendfile/libexec/atf/atf-sh/tests/Makefile projects/sendfile/libexec/rtld-elf/tests/libpythagoras/Makefile projects/sendfile/libexec/telnetd/Makefile projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/sendfile/release/doc/share/xml/sponsor.ent projects/sendfile/rescue/rescue/Makefile projects/sendfile/sbin/fsck_msdosfs/check.c projects/sendfile/sbin/fsck_msdosfs/dir.c projects/sendfile/sbin/fsck_msdosfs/ext.h projects/sendfile/sbin/fsck_msdosfs/fat.c projects/sendfile/sbin/fsdb/Makefile projects/sendfile/sbin/geom/class/part/gpart.8 projects/sendfile/sbin/gvinum/Makefile projects/sendfile/sbin/ifconfig/ifconfig.8 projects/sendfile/secure/usr.bin/sftp/Makefile projects/sendfile/share/man/man4/ddb.4 projects/sendfile/share/man/man5/src.conf.5 projects/sendfile/share/man/man9/Makefile projects/sendfile/share/man/man9/kthread.9 projects/sendfile/share/man/man9/pmap.9 projects/sendfile/share/man/man9/pmap_clear_modify.9 projects/sendfile/share/man/man9/pmap_is_modified.9 projects/sendfile/share/man/man9/rman.9 projects/sendfile/share/man/man9/socket.9 projects/sendfile/share/man/man9/timeout.9 projects/sendfile/share/man/man9/usbdi.9 projects/sendfile/share/misc/organization.dot projects/sendfile/share/mk/Makefile projects/sendfile/share/mk/atf.test.mk projects/sendfile/share/mk/bsd.cpu.mk projects/sendfile/share/mk/bsd.dep.mk projects/sendfile/share/mk/bsd.libnames.mk projects/sendfile/share/mk/bsd.opts.mk projects/sendfile/share/mk/plain.test.mk projects/sendfile/share/mk/src.opts.mk projects/sendfile/share/mk/tap.test.mk projects/sendfile/sys/amd64/amd64/exception.S projects/sendfile/sys/amd64/amd64/machdep.c projects/sendfile/sys/amd64/amd64/pmap.c projects/sendfile/sys/amd64/amd64/trap.c projects/sendfile/sys/amd64/include/vmm.h (contents, props changed) projects/sendfile/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/sendfile/sys/amd64/vmm/intel/vmcs.c projects/sendfile/sys/amd64/vmm/intel/vmcs.h projects/sendfile/sys/amd64/vmm/intel/vmx.c projects/sendfile/sys/amd64/vmm/vmm.c projects/sendfile/sys/amd64/vmm/vmm_instruction_emul.c projects/sendfile/sys/arm/arm/pmap-v6.c projects/sendfile/sys/arm/arm/pmap.c projects/sendfile/sys/arm/conf/IMX6 projects/sendfile/sys/arm/freescale/imx/files.imx51 projects/sendfile/sys/arm/freescale/imx/files.imx53 projects/sendfile/sys/arm/freescale/imx/files.imx6 projects/sendfile/sys/arm/freescale/imx/imx6_mp.c projects/sendfile/sys/arm/xilinx/zy7_slcr.c projects/sendfile/sys/arm/xilinx/zy7_slcr.h projects/sendfile/sys/boot/fdt/dts/arm/imx6.dtsi projects/sendfile/sys/boot/fdt/dts/arm/wandboard-dual.dts projects/sendfile/sys/boot/fdt/dts/arm/wandboard-quad.dts projects/sendfile/sys/boot/fdt/dts/arm/wandboard-solo.dts projects/sendfile/sys/boot/fdt/dts/arm/zedboard.dts projects/sendfile/sys/boot/i386/boot2/boot2.c projects/sendfile/sys/boot/pc98/boot2/Makefile projects/sendfile/sys/boot/pc98/boot2/boot2.c projects/sendfile/sys/cam/ctl/ctl.c projects/sendfile/sys/cam/ctl/ctl_cmd_table.c projects/sendfile/sys/cam/ctl/ctl_error.c projects/sendfile/sys/cam/ctl/ctl_error.h projects/sendfile/sys/cam/ctl/ctl_frontend.c projects/sendfile/sys/cam/ctl/ctl_frontend.h projects/sendfile/sys/cam/ctl/ctl_frontend_cam_sim.c projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c projects/sendfile/sys/cam/ctl/ctl_io.h projects/sendfile/sys/cam/ctl/ctl_ioctl.h projects/sendfile/sys/cam/ctl/ctl_private.h projects/sendfile/sys/cam/ctl/ctl_ser_table.c projects/sendfile/sys/cam/ctl/scsi_ctl.c projects/sendfile/sys/cam/scsi/scsi_all.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/sendfile/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/sendfile/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/sendfile/sys/cddl/dev/dtrace/mips/dtrace_subr.c projects/sendfile/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/sendfile/sys/compat/ndis/kern_ndis.c projects/sendfile/sys/compat/ndis/ndis_var.h projects/sendfile/sys/conf/files projects/sendfile/sys/conf/kern.mk projects/sendfile/sys/contrib/ipfilter/netinet/ip_compat.h projects/sendfile/sys/dev/bge/if_bge.c projects/sendfile/sys/dev/cadence/if_cgem.c projects/sendfile/sys/dev/cas/if_cas.c projects/sendfile/sys/dev/cxgbe/adapter.h projects/sendfile/sys/dev/cxgbe/common/common.h projects/sendfile/sys/dev/cxgbe/common/t4_hw.c projects/sendfile/sys/dev/cxgbe/t4_main.c projects/sendfile/sys/dev/cxgbe/t4_sge.c projects/sendfile/sys/dev/e1000/if_em.c projects/sendfile/sys/dev/fb/fbd.c projects/sendfile/sys/dev/hatm/if_hatm_intr.c projects/sendfile/sys/dev/iscsi_initiator/isc_soc.c projects/sendfile/sys/dev/isp/isp_freebsd.c projects/sendfile/sys/dev/ixgbe/ixgbe.c projects/sendfile/sys/dev/lge/if_lge.c projects/sendfile/sys/dev/mwl/if_mwl.c projects/sendfile/sys/dev/netmap/netmap_freebsd.c projects/sendfile/sys/dev/netmap/netmap_generic.c projects/sendfile/sys/dev/sound/pci/hda/hdaa_patches.c projects/sendfile/sys/dev/sound/pci/hda/hdac.h projects/sendfile/sys/dev/usb/controller/xhci_pci.c projects/sendfile/sys/dev/usb/input/uhid.c projects/sendfile/sys/dev/usb/net/if_axge.c projects/sendfile/sys/dev/usb/wlan/if_urtwn.c projects/sendfile/sys/dev/virtio/network/if_vtnet.c projects/sendfile/sys/dev/virtio/network/if_vtnetvar.h projects/sendfile/sys/dev/virtio/virtqueue.c projects/sendfile/sys/dev/virtio/virtqueue.h projects/sendfile/sys/dev/vt/hw/efifb/efifb.c projects/sendfile/sys/dev/vt/hw/fb/vt_fb.c projects/sendfile/sys/dev/vt/hw/fb/vt_fb.h projects/sendfile/sys/dev/vt/vt_core.c projects/sendfile/sys/dev/wb/if_wb.c projects/sendfile/sys/fs/cd9660/cd9660_lookup.c projects/sendfile/sys/fs/ext2fs/ext2_vnops.c projects/sendfile/sys/fs/msdosfs/msdosfs_lookup.c projects/sendfile/sys/fs/nandfs/nandfs_vnops.c projects/sendfile/sys/fs/nfsclient/nfs_clvnops.c projects/sendfile/sys/fs/nullfs/null_vnops.c projects/sendfile/sys/fs/tmpfs/tmpfs.h projects/sendfile/sys/fs/tmpfs/tmpfs_fifoops.c projects/sendfile/sys/fs/tmpfs/tmpfs_fifoops.h projects/sendfile/sys/fs/tmpfs/tmpfs_subr.c projects/sendfile/sys/fs/tmpfs/tmpfs_vfsops.c projects/sendfile/sys/fs/tmpfs/tmpfs_vnops.c projects/sendfile/sys/fs/tmpfs/tmpfs_vnops.h projects/sendfile/sys/i386/i386/trap.c projects/sendfile/sys/kern/kern_descrip.c projects/sendfile/sys/kern/kern_exec.c projects/sendfile/sys/kern/kern_exit.c projects/sendfile/sys/kern/kern_mbuf.c projects/sendfile/sys/kern/kern_proc.c projects/sendfile/sys/kern/kern_sig.c projects/sendfile/sys/kern/kern_sysctl.c projects/sendfile/sys/kern/subr_bus.c projects/sendfile/sys/kern/subr_mbpool.c projects/sendfile/sys/kern/subr_rman.c projects/sendfile/sys/kern/subr_sbuf.c projects/sendfile/sys/kern/uipc_mbuf.c projects/sendfile/sys/kern/uipc_sockbuf.c projects/sendfile/sys/kern/uipc_syscalls.c projects/sendfile/sys/kern/uipc_usrreq.c projects/sendfile/sys/kern/vfs_syscalls.c projects/sendfile/sys/kern/vfs_vnops.c projects/sendfile/sys/mips/mips/trap.c projects/sendfile/sys/modules/ctl/Makefile projects/sendfile/sys/net/if.c projects/sendfile/sys/net/if_spppsubr.c projects/sendfile/sys/netinet/in.h projects/sendfile/sys/netinet/in_pcb.c projects/sendfile/sys/netinet/in_pcb.h projects/sendfile/sys/netinet/in_pcbgroup.c projects/sendfile/sys/netinet/in_rss.c projects/sendfile/sys/netinet/ip_output.c projects/sendfile/sys/netinet/sctp_auth.c projects/sendfile/sys/netinet/sctp_indata.c projects/sendfile/sys/netinet/sctp_input.c projects/sendfile/sys/netinet/sctp_os_bsd.h projects/sendfile/sys/netinet/sctp_output.c projects/sendfile/sys/netinet/sctp_pcb.c projects/sendfile/sys/netinet/sctp_timer.c projects/sendfile/sys/netinet/sctp_usrreq.c projects/sendfile/sys/netinet/sctp_var.h projects/sendfile/sys/netinet/sctputil.c projects/sendfile/sys/netinet/sctputil.h projects/sendfile/sys/netinet6/in6.h projects/sendfile/sys/netinet6/in6_pcb.c projects/sendfile/sys/netinet6/in6_pcbgroup.c projects/sendfile/sys/netinet6/ip6_output.c projects/sendfile/sys/netinet6/nd6.c projects/sendfile/sys/netipsec/key_debug.c projects/sendfile/sys/netpfil/pf/if_pfsync.c projects/sendfile/sys/powerpc/aim/mmu_oea.c projects/sendfile/sys/powerpc/aim/mmu_oea64.c projects/sendfile/sys/powerpc/aim/trap.c projects/sendfile/sys/powerpc/booke/pmap.c projects/sendfile/sys/powerpc/powerpc/mmu_if.m projects/sendfile/sys/powerpc/powerpc/pmap_dispatch.c projects/sendfile/sys/sys/dtrace_bsd.h projects/sendfile/sys/sys/fbio.h projects/sendfile/sys/sys/mbpool.h projects/sendfile/sys/sys/mbuf.h projects/sendfile/sys/sys/param.h projects/sendfile/sys/sys/rman.h projects/sendfile/sys/sys/sbuf.h projects/sendfile/sys/sys/sdt.h projects/sendfile/sys/sys/sf_buf.h projects/sendfile/sys/sys/signalvar.h projects/sendfile/sys/sys/vnode.h projects/sendfile/sys/ufs/ffs/ffs_vfsops.c projects/sendfile/sys/ufs/ufs/ufs_vnops.c projects/sendfile/sys/vm/vm_object.c projects/sendfile/sys/vm/vm_object.h projects/sendfile/sys/vm/vm_phys.c projects/sendfile/sys/x86/xen/pv.c projects/sendfile/sys/x86/xen/xen_apic.c projects/sendfile/tools/bsdbox/Makefile projects/sendfile/tools/build/mk/OptionalObsoleteFiles.inc projects/sendfile/tools/test/dtrace/Makefile projects/sendfile/tools/tools/net80211/stumbler/Makefile projects/sendfile/usr.bin/Makefile projects/sendfile/usr.bin/bmake/Makefile projects/sendfile/usr.bin/bmake/config.h projects/sendfile/usr.bin/clang/clang.prog.mk projects/sendfile/usr.bin/ee/Makefile projects/sendfile/usr.bin/ftp/Makefile projects/sendfile/usr.bin/grep/grep.c projects/sendfile/usr.bin/grep/queue.c projects/sendfile/usr.bin/grep/util.c projects/sendfile/usr.bin/less/Makefile projects/sendfile/usr.bin/mkimg/apm.c projects/sendfile/usr.bin/mkimg/image.c projects/sendfile/usr.bin/mkimg/image.h projects/sendfile/usr.bin/mkimg/vhd.c projects/sendfile/usr.bin/mkimg/vmdk.c projects/sendfile/usr.bin/msgs/Makefile projects/sendfile/usr.bin/ncal/Makefile projects/sendfile/usr.bin/tabs/Makefile projects/sendfile/usr.bin/telnet/Makefile projects/sendfile/usr.bin/tftp/Makefile projects/sendfile/usr.bin/tput/Makefile projects/sendfile/usr.bin/tset/Makefile projects/sendfile/usr.bin/ul/Makefile projects/sendfile/usr.bin/units/Makefile projects/sendfile/usr.bin/units/units.1 projects/sendfile/usr.bin/units/units.c projects/sendfile/usr.bin/users/Makefile (contents, props changed) projects/sendfile/usr.bin/vi/Makefile projects/sendfile/usr.bin/vmstat/vmstat.c projects/sendfile/usr.bin/yacc/tests/Makefile projects/sendfile/usr.sbin/bhyve/Makefile projects/sendfile/usr.sbin/bhyve/bhyverun.c projects/sendfile/usr.sbin/bhyve/bhyverun.h projects/sendfile/usr.sbin/bhyve/block_if.c projects/sendfile/usr.sbin/bhyve/block_if.h projects/sendfile/usr.sbin/bhyve/pci_ahci.c projects/sendfile/usr.sbin/bsdinstall/partedit/partedit_x86.c projects/sendfile/usr.sbin/cdcontrol/Makefile projects/sendfile/usr.sbin/chown/tests/chown-f_test.sh projects/sendfile/usr.sbin/ctladm/ctladm.8 projects/sendfile/usr.sbin/ctld/kernel.c projects/sendfile/usr.sbin/jail/jail.8 projects/sendfile/usr.sbin/lpr/lpc/Makefile projects/sendfile/usr.sbin/ndp/ndp.c projects/sendfile/usr.sbin/ngctl/Makefile projects/sendfile/usr.sbin/ntp/ntpdc/Makefile projects/sendfile/usr.sbin/ntp/ntpq/Makefile projects/sendfile/usr.sbin/pkg/pkg.c projects/sendfile/usr.sbin/pmcstat/Makefile projects/sendfile/usr.sbin/pppctl/Makefile projects/sendfile/usr.sbin/watch/Makefile projects/sendfile/usr.sbin/wpa/wpa_cli/Makefile Directory Properties: projects/sendfile/ (props changed) projects/sendfile/cddl/ (props changed) projects/sendfile/cddl/contrib/opensolaris/ (props changed) projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/sendfile/contrib/bmake/ (props changed) projects/sendfile/contrib/byacc/ (props changed) projects/sendfile/contrib/ipfilter/ (props changed) projects/sendfile/contrib/libucl/ (props changed) projects/sendfile/contrib/llvm/ (props changed) projects/sendfile/contrib/llvm/tools/lldb/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/gnu/lib/ (props changed) projects/sendfile/gnu/usr.bin/gdb/ (props changed) projects/sendfile/include/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/sbin/ (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/sys/contrib/ipfilter/ (props changed) projects/sendfile/usr.bin/mkimg/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) projects/sendfile/usr.sbin/jail/ (props changed) Modified: projects/sendfile/Makefile ============================================================================== --- projects/sendfile/Makefile Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/Makefile Fri Jul 18 12:36:18 2014 (r268841) @@ -36,6 +36,7 @@ # specified with XDEV and XDEV_ARCH. # xdev-build - Build cross-development tools. # xdev-install - Install cross-development tools. +# xdev-links - Create traditional links in /usr/bin for cc, etc # # "quick" way to test all kernel builds: # _jflag=`sysctl -n hw.ncpu` @@ -110,6 +111,7 @@ TGTS= all all-man buildenv buildenvvars _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ + xdev-links \ TGTS+= ${SUBDIR_TARGETS} @@ -329,6 +331,7 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ MMAKE= ${MMAKEENV} ${MAKE} \ -DNO_MAN -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR \ + MK_TESTS=no \ DESTDIR= PROGNAME=${MYMAKE:T} bmake: .PHONY Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/Makefile.inc1 Fri Jul 18 12:36:18 2014 (r268841) @@ -1494,7 +1494,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ ${_secure_lib_libssh} ${_secure_lib_libssl} -.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no" +.if ${MK_GNUCXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ gnu/lib/libstdc++__L: lib/msun__L .endif @@ -1893,7 +1893,7 @@ XDDESTDIR=${DESTDIR}/${XDTP} OSREL!= uname -r | sed -e 's/[-(].*//' .endif -.ORDER: xdev-build xdev-install +.ORDER: xdev-build xdev-install xdev-links xdev: xdev-build xdev-install .ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools @@ -1943,8 +1943,8 @@ _xi-mtree: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${XDDESTDIR}/usr/include >/dev/null -.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links -xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links +.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries +xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-cross-tools: @echo "_xi-cross-tools" @@ -1967,9 +1967,9 @@ _xi-libraries: ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \ DESTDIR=${XDDESTDIR} -_xi-links: +xdev-links: ${_+_}cd ${XDDESTDIR}/usr/bin; \ - mkdir -p ../../../../usr/bin; \ + mkdir -p ../../../../usr/bin; \ for i in *; do \ ln -sf ../../${XDTP}/usr/bin/$$i \ ../../../../usr/bin/${XDDIR}-$$i; \ @@ -1977,6 +1977,6 @@ _xi-links: ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \ done .else -xdev xdev-build xdev-install: +xdev xdev-build xdev-install xdev-links: @echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target" .endif Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/ObsoleteFiles.inc Fri Jul 18 12:36:18 2014 (r268841) @@ -38,6 +38,33 @@ # xargs -n1 | sort | uniq -d; # done +# 20140718: Remove an obsolete man page +OLD_FILES+=usr/share/man/man9/pmap_page_protect.9.gz +# 20140717: Remove an obsolete man page +OLD_FILES+=usr/share/man/man9/pmap_clear_reference.9.gz +# 20140716: Remove an incorrectly named man page +OLD_FILES+=usr/share/man/man9/pmap_ts_modified.9.gz +# 20140712: Removal of bsd.dtrace.mk +OLD_FILES+=usr/share/mk/bsd.dtrace.mk +# 20140705: turn libreadline into an internal lib +OLD_LIBS+=lib/libreadline.so.8 +OLD_FILES+=usr/lib/libreadline.a +OLD_FILES+=usr/lib/libreadline_p.a +OLD_FILES+=usr/lib/libreadline.so +OLD_FILES+=usr/lib/libhistory.a +OLD_FILES+=usr/lib/libhistory_p.a +OLD_FILES+=usr/lib/libhistory.so +OLD_LIBS+=usr/lib/libhistory.so.8 +OLD_FILES+=usr/include/readline/chardefs.h +OLD_FILES+=usr/include/readline/history.h +OLD_FILES+=usr/include/readline/keymaps.h +OLD_FILES+=usr/include/readline/readline.h +OLD_FILES+=usr/include/readline/rlconf.h +OLD_FILES+=usr/include/readline/rlstdc.h +OLD_FILES+=usr/include/readline/rltypedefs.h +OLD_FILES+=usr/include/readline/rltypedefs.h +OLD_FILES+=usr/share/info/readline.info.gz +OLD_FILES+=usr/share/man/man3/readline.3.gz # 20140625: csup removal OLD_FILES+=usr/bin/csup OLD_FILES+=usr/bin/cpasswd Modified: projects/sendfile/UPDATING ============================================================================== --- projects/sendfile/UPDATING Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/UPDATING Fri Jul 18 12:36:18 2014 (r268841) @@ -31,6 +31,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20140709: + The GNU texinfo and GNU info pages are not built and installed + anymore, WITH_INFO knob has been added to allow to built and install + them again. + +20140708: + The GNU readline library is now an INTERNALLIB - that is, it is + statically linked into consumers (GDB and variants) in the base + system, and the shared library is no longer installed. The + devel/readline port is available for third party software that + requires readline. + 20140702: The Itanium architecture (ia64) has been removed from the list of known architectures. This is the first step in the removal of the Modified: projects/sendfile/bin/csh/Makefile ============================================================================== --- projects/sendfile/bin/csh/Makefile Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/bin/csh/Makefile Fri Jul 18 12:36:18 2014 (r268841) @@ -40,8 +40,8 @@ MLINKS= csh.1 tcsh.1 # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAP} ${LIBCRYPT} -LDADD= -ltermcap -lcrypt +DPADD= ${LIBTERMCAPW} ${LIBCRYPT} +LDADD= -ltermcapw -lcrypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh Modified: projects/sendfile/bin/ls/Makefile ============================================================================== --- projects/sendfile/bin/ls/Makefile Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/bin/ls/Makefile Fri Jul 18 12:36:18 2014 (r268841) @@ -11,8 +11,8 @@ LDADD= -lutil .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAP} -LDADD+= -ltermcap +DPADD+= ${LIBTERMCAPW} +LDADD+= -ltermcapw .endif .include <bsd.prog.mk> Modified: projects/sendfile/bin/sh/Makefile ============================================================================== --- projects/sendfile/bin/sh/Makefile Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/bin/sh/Makefile Fri Jul 18 12:36:18 2014 (r268841) @@ -18,8 +18,8 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAP} -LDADD= -ledit -ltermcap +DPADD= ${LIBEDIT} ${LIBTERMCAPW} +LDADD= -ledit -ltermcapw CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: Modified: projects/sendfile/bin/sh/expand.c ============================================================================== --- projects/sendfile/bin/sh/expand.c Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/bin/sh/expand.c Fri Jul 18 12:36:18 2014 (r268841) @@ -846,9 +846,11 @@ varisset(const char *name, int nulok) } } else if (is_digit(*name)) { char *ap; - int num = atoi(name); + long num; - if (num > shellparam.nparam) + errno = 0; + num = strtol(name, NULL, 10); + if (errno != 0 || num > shellparam.nparam) return 0; if (num == 0) @@ -928,17 +930,16 @@ numvar: STPUTC(sep, expdest); } break; - case '0': - p = arg0; - strtodest(p, flag, subtype, quoted); - break; default: if (is_digit(*name)) { num = atoi(name); - if (num > 0 && num <= shellparam.nparam) { + if (num == 0) + p = arg0; + else if (num > 0 && num <= shellparam.nparam) p = shellparam.p[num - 1]; - strtodest(p, flag, subtype, quoted); - } + else + break; + strtodest(p, flag, subtype, quoted); } break; } Modified: projects/sendfile/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/sendfile/bin/sh/tests/builtins/Makefile Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/bin/sh/tests/builtins/Makefile Fri Jul 18 12:36:18 2014 (r268841) @@ -99,7 +99,9 @@ FILES+= local1.0 FILES+= local2.0 FILES+= local3.0 FILES+= local4.0 +.if ${MK_NLS} != "no" FILES+= locale1.0 +.endif FILES+= printf1.0 FILES+= printf2.0 FILES+= printf3.0 Modified: projects/sendfile/bin/sh/tests/parameters/Makefile ============================================================================== --- projects/sendfile/bin/sh/tests/parameters/Makefile Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/bin/sh/tests/parameters/Makefile Fri Jul 18 12:36:18 2014 (r268841) @@ -13,6 +13,9 @@ FILES+= optind1.0 FILES+= optind2.0 FILES+= positional1.0 FILES+= positional2.0 +FILES+= positional3.0 +FILES+= positional4.0 +FILES+= positional5.0 FILES+= pwd1.0 FILES+= pwd2.0 Copied: projects/sendfile/bin/sh/tests/parameters/positional3.0 (from r268838, head/bin/sh/tests/parameters/positional3.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/bin/sh/tests/parameters/positional3.0 Fri Jul 18 12:36:18 2014 (r268841, copy of r268838, head/bin/sh/tests/parameters/positional3.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +r=$(${SH} -c 'echo ${01:+yes}${010:+yes}' '' a '' '' '' '' '' '' '' '' b) +[ "$r" = yesyes ] Copied: projects/sendfile/bin/sh/tests/parameters/positional4.0 (from r268838, head/bin/sh/tests/parameters/positional4.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/bin/sh/tests/parameters/positional4.0 Fri Jul 18 12:36:18 2014 (r268841, copy of r268838, head/bin/sh/tests/parameters/positional4.0) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +set -- "x$0" 2 3 4 5 6 7 8 9 "y$0" +[ "${01}.${010}" = "$1.${10}" ] Copied: projects/sendfile/bin/sh/tests/parameters/positional5.0 (from r268838, head/bin/sh/tests/parameters/positional5.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/sendfile/bin/sh/tests/parameters/positional5.0 Fri Jul 18 12:36:18 2014 (r268841, copy of r268838, head/bin/sh/tests/parameters/positional5.0) @@ -0,0 +1,14 @@ +# $FreeBSD$ + +i=1 +r=0 +while [ $i -lt $((0x100000000)) ]; do + t= + eval t=\${$i-x} + case $t in + x) ;; + *) echo "Problem with \${$i}" >&2; r=1 ;; + esac + i=$((i + 0x10000000)) +done +exit $r Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Jul 18 12:36:18 2014 (r268841) @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. @@ -6856,6 +6856,9 @@ zfs_do_bookmark(int argc, char **argv) case ENOTSUP: err_msg = "bookmark feature not enabled"; break; + case ENOSPC: + err_msg = "out of space"; + break; default: err_msg = "unknown error"; break; @@ -6864,7 +6867,7 @@ zfs_do_bookmark(int argc, char **argv) dgettext(TEXT_DOMAIN, err_msg)); } - return (ret); + return (ret != 0); usage: usage(B_FALSE); Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zhack/zhack.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zhack/zhack.c Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zhack/zhack.c Fri Jul 18 12:36:18 2014 (r268841) @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. */ @@ -362,7 +362,7 @@ zhack_do_feature_enable(int argc, char * feature.fi_guid); VERIFY0(dsl_sync_task(spa_name(spa), NULL, - zhack_feature_enable_sync, &feature, 5)); + zhack_feature_enable_sync, &feature, 5, ZFS_SPACE_CHECK_NORMAL)); spa_close(spa, FTAG); @@ -473,7 +473,8 @@ zhack_do_feature_ref(int argc, char **ar } VERIFY0(dsl_sync_task(spa_name(spa), NULL, - decr ? feature_decr_sync : feature_incr_sync, &feature, 5)); + decr ? feature_decr_sync : feature_incr_sync, &feature, + 5, ZFS_SPACE_CHECK_NORMAL)); spa_close(spa, FTAG); } Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Fri Jul 18 12:36:18 2014 (r268841) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 28, 2014 +.Dd July 14, 2014 .Dt ZPOOL 8 .Os .Sh NAME @@ -1664,7 +1664,8 @@ can change. .It Fl x Only display status for pools that are exhibiting errors or are otherwise unavailable. -Warnings about pools not using the latest on-disk format will not be included. +Warnings about pools not using the latest on-disk format, having non-native +block size or disabled features will not be included. .It Fl v Displays verbose data error information, printing out a complete list of all data errors since the last complete pool scrub. Modified: projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Jul 18 12:36:18 2014 (r268841) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2012 by Frederik Wessels. All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved. @@ -2033,7 +2033,7 @@ zpool_do_import(int argc, char **argv) break; case 'T': errno = 0; - txg = strtoull(optarg, &endptr, 10); + txg = strtoull(optarg, &endptr, 0); if (errno != 0 || *endptr != '\0') { (void) fprintf(stderr, gettext("invalid txg value\n")); @@ -3076,17 +3076,10 @@ zpool_do_list(int argc, char **argv) if (zprop_get_list(g_zfs, props, &cb.cb_proplist, ZFS_TYPE_POOL) != 0) usage(B_FALSE); - if ((list = pool_list_get(argc, argv, &cb.cb_proplist, &ret)) == NULL) - return (1); - - if (argc == 0 && !cb.cb_scripted && pool_list_count(list) == 0) { - (void) printf(gettext("no pools available\n")); - zprop_free_list(cb.cb_proplist); - return (0); - } - for (;;) { - pool_list_update(list); + if ((list = pool_list_get(argc, argv, &cb.cb_proplist, + &ret)) == NULL) + return (1); if (pool_list_count(list) == 0) break; @@ -3109,9 +3102,16 @@ zpool_do_list(int argc, char **argv) if (count != 0 && --count == 0) break; + pool_list_free(list); (void) sleep(interval); } + if (argc == 0 && !cb.cb_scripted && pool_list_count(list) == 0) { + (void) printf(gettext("no pools available\n")); + ret = 0; + } + + pool_list_free(list); zprop_free_list(cb.cb_proplist); return (ret); } @@ -4101,6 +4101,7 @@ status_callback(zpool_handle_t *zhp, voi if (cbp->cb_explain && (reason == ZPOOL_STATUS_OK || reason == ZPOOL_STATUS_VERSION_OLDER || + reason == ZPOOL_STATUS_NON_NATIVE_ASHIFT || reason == ZPOOL_STATUS_FEAT_DISABLED)) { if (!cbp->cb_allpools) { (void) printf(gettext("pool '%s' is healthy\n"), Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Fri Jul 18 12:36:18 2014 (r268841) @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. @@ -3873,7 +3873,6 @@ zfs_rename(zfs_handle_t *zhp, const char strcmp(property, "none") == 0)) { flags.nounmount = B_TRUE; } - if (flags.recurse) { parentname = zfs_strdup(zhp->zfs_hdl, zhp->zfs_name); @@ -3888,8 +3887,7 @@ zfs_rename(zfs_handle_t *zhp, const char ret = -1; goto error; } - - } else { + } else if (zhp->zfs_type != ZFS_TYPE_SNAPSHOT) { if ((cl = changelist_gather(zhp, ZFS_PROP_NAME, flags.nounmount ? CL_GATHER_DONT_UNMOUNT : 0, flags.forceunmount ? MS_FORCE : 0)) == NULL) { @@ -3941,23 +3939,23 @@ zfs_rename(zfs_handle_t *zhp, const char * On failure, we still want to remount any filesystems that * were previously mounted, so we don't alter the system state. */ - if (!flags.recurse) + if (cl != NULL) (void) changelist_postfix(cl); } else { - if (!flags.recurse) { + if (cl != NULL) { changelist_rename(cl, zfs_get_name(zhp), target); ret = changelist_postfix(cl); } } error: - if (parentname) { + if (parentname != NULL) { free(parentname); } - if (zhrp) { + if (zhrp != NULL) { zfs_close(zhrp); } - if (cl) { + if (cl != NULL) { changelist_free(cl); } return (ret); Modified: projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c ============================================================================== --- projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c Fri Jul 18 12:36:18 2014 (r268841) @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014 by Delphix. All rights reserved. */ /* @@ -736,16 +737,6 @@ zfs_share_proto(zfs_handle_t *zhp, zfs_s if (!zfs_is_mountable(zhp, mountpoint, sizeof (mountpoint), NULL)) return (0); -#ifdef sun - if ((ret = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) { - (void) zfs_error_fmt(hdl, EZFS_SHARENFSFAILED, - dgettext(TEXT_DOMAIN, "cannot share '%s': %s"), - zfs_get_name(zhp), _sa_errorstr != NULL ? - _sa_errorstr(ret) : ""); - return (-1); - } -#endif - for (curr_proto = proto; *curr_proto != PROTO_END; curr_proto++) { /* * Return success if there are no share options. @@ -756,6 +747,17 @@ zfs_share_proto(zfs_handle_t *zhp, zfs_s strcmp(shareopts, "off") == 0) continue; +#ifdef illumos + ret = zfs_init_libshare(hdl, SA_INIT_SHARE_API); + if (ret != SA_OK) { + (void) zfs_error_fmt(hdl, EZFS_SHARENFSFAILED, + dgettext(TEXT_DOMAIN, "cannot share '%s': %s"), + zfs_get_name(zhp), _sa_errorstr != NULL ? + _sa_errorstr(ret) : ""); + return (-1); + } +#endif + /* * If the 'zoned' property is set, then zfs_is_mountable() * will have already bailed out if we are in the global zone. Modified: projects/sendfile/contrib/bmake/ChangeLog ============================================================================== --- projects/sendfile/contrib/bmake/ChangeLog Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/ChangeLog Fri Jul 18 12:36:18 2014 (r268841) @@ -1,3 +1,28 @@ +2014-06-20 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20140620 + Merge with NetBSD make, pick up + o var.c return varNoError rather than var_Error for ::= modidiers. + +2014-05-22 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20140522 + Merge with NetBSD make, pick up + o var.c detect some parse errors. + +2014-04-05 Simon J. Gerraty <sjg@bad.crufty.net> + + * Fix spelling errors - patch from Pedro Giffuni + +2014-02-14 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (MAKE_VERSION): 20140214 + Merge with NetBSD make, pick up + o .INCLUDEFROM* + o use Var_Value to get MAKEOBJDIR[PREFIX] + o reduced realloc'ign in brk_string. + * configure.in: add a check for compiler supporting __func__ + 2014-01-03 Simon J. Gerraty <sjg@bad.crufty.net> * boot-strap: ignore mksrc=none @@ -64,7 +89,7 @@ * Makefile (MAKE_VERSION): 20130716 Merge with NetBSD make, pick up - o number of gmake compatability tweaks + o number of gmake compatibility tweaks -w for gmake style entering/leaving messages if .MAKE.LEVEL > 0 indicate it in progname "make[1]" etc. handle MAKEFLAGS containing only letters. Modified: projects/sendfile/contrib/bmake/Makefile ============================================================================== --- projects/sendfile/contrib/bmake/Makefile Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/Makefile Fri Jul 18 12:36:18 2014 (r268841) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.23 2014/01/02 22:20:52 sjg Exp $ +# $Id: Makefile,v 1.27 2014/06/20 14:51:54 sjg Exp $ # Base version on src date -MAKE_VERSION= 20140101 +MAKE_VERSION= 20140620 PROG= bmake @@ -117,7 +117,7 @@ MANTARGET?= man # turn this on by default - ignored if we are root WITH_INSTALL_AS_USER= -# supress with -DWITHOUT_* +# suppress with -DWITHOUT_* OPTIONS_DEFAULT_YES+= \ AUTOCONF_MK \ INSTALL_MK \ Modified: projects/sendfile/contrib/bmake/README ============================================================================== --- projects/sendfile/contrib/bmake/README Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/README Fri Jul 18 12:36:18 2014 (r268841) @@ -18,7 +18,7 @@ interesting changes, so that bmake track Building: -The prefered way to bootstrap bmake is: +The preferred way to bootstrap bmake is: ./bmake/boot-strap Modified: projects/sendfile/contrib/bmake/bmake.1 ============================================================================== --- projects/sendfile/contrib/bmake/bmake.1 Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/bmake.1 Fri Jul 18 12:36:18 2014 (r268841) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $ +.\" $NetBSD: make.1,v 1.229 2014/01/19 10:23:29 apb Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd October 25, 2013 +.Dd February 14, 2014 .Dt MAKE 1 .Os .Sh NAME @@ -706,6 +706,10 @@ was executed. Refer to the description of .Ql Ev PWD for more details. +.It Va .INCLUDEDFROMDIR +The directory of the file this Makefile was included from. +.It Va .INCLUDEDFROMFILE +The filename of the file this Makefile was included from. .It Ev MAKE The name that .Nm @@ -1246,6 +1250,15 @@ and are orthogonal; the former specifies whether multiple words are potentially affected, the latter whether multiple substitutions can potentially occur within each affected word. +.Pp +As for the +.Cm \&:S +modifier, the +.Ar pattern +and +.Ar replacement +are subjected to variable expansion before being parsed as +regular expressions. .It Cm \&:T Replaces each word in the variable with its last component. .It Cm \&:u Modified: projects/sendfile/contrib/bmake/bmake.cat1 ============================================================================== --- projects/sendfile/contrib/bmake/bmake.cat1 Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/bmake.cat1 Fri Jul 18 12:36:18 2014 (r268841) @@ -450,6 +450,13 @@ VVAARRIIAABBLLEE AASSSSIIGG _._C_U_R_D_I_R A path to the directory where bbmmaakkee was executed. Refer to the description of `PWD' for more details. + _._I_N_C_L_U_D_E_D_F_R_O_M_D_I_R + The directory of the file this Makefile was included + from. + + _._I_N_C_L_U_D_E_D_F_R_O_M_F_I_L_E + The filename of the file this Makefile was included from. + MAKE The name that bbmmaakkee was executed with (_a_r_g_v_[_0_]). For compatibility bbmmaakkee also sets _._M_A_K_E with the same value. The preferred variable to use is the environment variable @@ -796,6 +803,9 @@ VVAARRIIAABBLLEE AASSSSIIGG multiple words are potentially affected, the latter whether multiple substitutions can potentially occur within each affected word. + As for the ::SS modifier, the _p_a_t_t_e_r_n and _r_e_p_l_a_c_e_m_e_n_t are subjected to + variable expansion before being parsed as regular expressions. + ::TT Replaces each word in the variable with its last component. ::uu Remove adjacent duplicate words (like uniq(1)). @@ -1384,4 +1394,4 @@ BBUUGGSS There is no way of escaping a space character in a filename. -NetBSD 5.1 October 25, 2013 NetBSD 5.1 +NetBSD 5.1 February 14, 2014 NetBSD 5.1 Modified: projects/sendfile/contrib/bmake/boot-strap ============================================================================== --- projects/sendfile/contrib/bmake/boot-strap Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/boot-strap Fri Jul 18 12:36:18 2014 (r268841) @@ -111,7 +111,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: boot-strap,v 1.44 2014/01/08 14:49:10 sjg Exp $ +# $Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $ # # @(#) Copyright (c) 2001 Simon J. Gerraty # @@ -197,7 +197,7 @@ get_optarg() { here=`'pwd'` if [ $here = $Mydir ]; then - # avoid polution + # avoid pollution OBJROOT=../ fi @@ -453,7 +453,7 @@ op_all() { echo "Use --install-destdir=/somewhere to set DESTDIR during install" echo "Use --install-host-target to use INSTALL_BIN=$HOST_TARGET/bin" echo "Use -DWITH_PROG_VERSION to install as bmake-$MAKE_VERSION" - echo "Use -DWITHOUT_PROG_LINK to supress bmake -> bmake-$MAKE_VERSION symlink" + echo "Use -DWITHOUT_PROG_LINK to suppress bmake -> bmake-$MAKE_VERSION symlink" echo "Use -DWITHOUT_INSTALL_MK to skip installing files to $prefix/share/mk" fi } Modified: projects/sendfile/contrib/bmake/bsd.after-import.mk ============================================================================== --- projects/sendfile/contrib/bmake/bsd.after-import.mk Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/bsd.after-import.mk Fri Jul 18 12:36:18 2014 (r268841) @@ -1,4 +1,4 @@ -# $Id: bsd.after-import.mk,v 1.11 2012/12/29 19:32:25 sjg Exp $ +# $Id: bsd.after-import.mk,v 1.12 2014/02/14 23:45:49 sjg Exp $ # This makefile is for use when integrating bmake into a BSD build # system. Use this makefile after importing bmake. @@ -41,15 +41,13 @@ SRCTOP := ${srctop} HOST_OS!= uname .endif -# .../share/mk will find ${SRCTOP}/share/mk -# if we are within ${SRCTOP} -DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk - BOOTSTRAP_ARGS = \ - --with-default-sys-path='${DEFAULT_SYS_PATH}' \ --prefix /usr \ --share /usr/share +.if !empty(DEFAULT_SYS_PATH) +BOOTSTRAP_ARGS += --with-default-sys-path='${DEFAULT_SYS_PATH}' +.endif # run boot-strap with minimal influence bootstrap: ${BMAKE_SRC}/boot-strap ${MAKEFILE} Modified: projects/sendfile/contrib/bmake/config.h.in ============================================================================== --- projects/sendfile/contrib/bmake/config.h.in Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/config.h.in Fri Jul 18 12:36:18 2014 (r268841) @@ -144,6 +144,9 @@ `HAVE_STRUCT_STAT_ST_RDEV' instead. */ #undef HAVE_ST_RDEV +/* Define to 1 if you have the `sysctl' function. */ +#undef HAVE_SYSCTL + /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H @@ -164,6 +167,9 @@ /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H +/* Define to 1 if you have the <sys/sysctl.h> header file. */ +#undef HAVE_SYS_SYSCTL_H + /* Define to 1 if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H @@ -298,6 +304,9 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE +/* C99 function name */ +#undef __func__ + /* Define to empty if `const' does not conform to ANSI C. */ #undef const Modified: projects/sendfile/contrib/bmake/configure ============================================================================== Binary file (source and/or target). No diff available. Modified: projects/sendfile/contrib/bmake/configure.in ============================================================================== --- projects/sendfile/contrib/bmake/configure.in Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/configure.in Fri Jul 18 12:36:18 2014 (r268841) @@ -1,12 +1,12 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.51 2014/01/02 22:20:52 sjg Exp $ +dnl $Id: configure.in,v 1.52 2014/02/15 22:27:59 sjg Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl AC_PREREQ(2.50) -AC_INIT([bmake], [20140101], [sjg@NetBSD.org]) -AC_CONFIG_HEADER(config.h) +AC_INIT([bmake], [20140214], [sjg@NetBSD.org]) +AC_CONFIG_HEADERS(config.h) dnl make srcdir absolute case "$srcdir" in @@ -203,6 +203,11 @@ dnl AC_HEADER_STAT AC_STRUCT_ST_RDEV dnl +echo "checking if compiler supports __func__" >&6 +AC_LANG(C) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[[const char *func = __func__;]])],, + AC_DEFINE(__func__, __FUNCTION__, C99 function name)) +dnl dnl we want this for unit-tests/Makefile echo $ECHO_N "checking if diff -u works... $ECHO_C" >&6 if diff -u /dev/null /dev/null > /dev/null 2>&1; then Modified: projects/sendfile/contrib/bmake/main.c ============================================================================== --- projects/sendfile/contrib/bmake/main.c Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/main.c Fri Jul 18 12:36:18 2014 (r268841) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.225 2013/09/14 15:09:34 matt Exp $ */ +/* $NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.225 2013/09/14 15:09:34 matt Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.225 2013/09/14 15:09:34 matt Exp $"); +__RCSID("$NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $"); #endif #endif /* not lint */ #endif @@ -1102,11 +1102,12 @@ main(int argc, char **argv) */ #ifndef NO_PWD_OVERRIDE if (!ignorePWD) { - char *pwd; + char *pwd, *ptmp1 = NULL, *ptmp2 = NULL; if ((pwd = getenv("PWD")) != NULL && - getenv("MAKEOBJDIRPREFIX") == NULL) { - const char *makeobjdir = getenv("MAKEOBJDIR"); + Var_Value("MAKEOBJDIRPREFIX", VAR_CMD, &ptmp1) == NULL) { + const char *makeobjdir = Var_Value("MAKEOBJDIR", + VAR_CMD, &ptmp2); if (makeobjdir == NULL || !strchr(makeobjdir, '$')) { if (stat(pwd, &sb) == 0 && @@ -1115,6 +1116,8 @@ main(int argc, char **argv) (void)strncpy(curdir, pwd, MAXPATHLEN); } } + free(ptmp1); + free(ptmp2); } #endif Var_Set(".CURDIR", curdir, VAR_GLOBAL, 0); @@ -1131,11 +1134,13 @@ main(int argc, char **argv) Dir_Init(curdir); (void)Main_SetObjdir(curdir); - if ((path = getenv("MAKEOBJDIRPREFIX")) != NULL) { + if ((path = Var_Value("MAKEOBJDIRPREFIX", VAR_CMD, &p1)) != NULL) { (void)snprintf(mdpath, MAXPATHLEN, "%s%s", path, curdir); (void)Main_SetObjdir(mdpath); - } else if ((path = getenv("MAKEOBJDIR")) != NULL) { + free(p1); + } else if ((path = Var_Value("MAKEOBJDIR", VAR_CMD, &p1)) != NULL) { (void)Main_SetObjdir(path); + free(p1); } else { (void)snprintf(mdpath, MAXPATHLEN, "%s.%s", _PATH_OBJDIR, machine); if (!Main_SetObjdir(mdpath) && !Main_SetObjdir(_PATH_OBJDIR)) { Modified: projects/sendfile/contrib/bmake/make.1 ============================================================================== --- projects/sendfile/contrib/bmake/make.1 Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/make.1 Fri Jul 18 12:36:18 2014 (r268841) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $ +.\" $NetBSD: make.1,v 1.230 2014/02/15 18:55:30 sjg Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd October 25, 2013 +.Dd February 14, 2014 .Dt MAKE 1 .Os .Sh NAME @@ -706,6 +706,10 @@ was executed. Refer to the description of .Ql Ev PWD for more details. +.It Va .INCLUDEDFROMDIR +The directory of the file this Makefile was included from. +.It Va .INCLUDEDFROMFILE +The filename of the file this Makefile was included from. .It Ev MAKE The name that .Nm @@ -1257,6 +1261,15 @@ and are orthogonal; the former specifies whether multiple words are potentially affected, the latter whether multiple substitutions can potentially occur within each affected word. +.Pp +As for the +.Cm \&:S +modifier, the +.Ar pattern +and +.Ar replacement +are subjected to variable expansion before being parsed as +regular expressions. .It Cm \&:T Replaces each word in the variable with its last component. .It Cm \&:u Modified: projects/sendfile/contrib/bmake/mk/ChangeLog ============================================================================== --- projects/sendfile/contrib/bmake/mk/ChangeLog Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/mk/ChangeLog Fri Jul 18 12:36:18 2014 (r268841) @@ -1,3 +1,60 @@ +2014-05-22 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20140522 + + * lib.mk: use CC to link shlib for linux too + patch from Brendan MacDonell + +2014-05-05 Simon J. Gerraty <sjg@bad.crufty.net> + + * meta.autodep.mk: add _reldir_{finish,failed} for gathering stats + if WITH_META_STATS is defined. + +2014-05-02 Simon J. Gerraty <sjg@bad.crufty.net> + + * dirdeps.mk: accept -DWITHOUT_DIRDEPS (same a as -DNO_DIRDEPS) + to supress dirdeps outside of .CURDIR. + +2014-04-05 Simon J. Gerraty <sjg@bad.crufty.net> + + * Fix spelling errors - patch from Pedro Giffuni + +2014-03-14 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): 20140314 + + * dirdeps.mk (beforedirdeps): a handy hook + + * dirdeps.mk (DIRDEP_MAKE): allow the actual command we run + to visit leaf dirs to be intercepted (eg. for distributed + build). + + * dirdeps.mk (__depdirs): ensure // don't sneak in + + * gendirdeps.mk (DIRDEPS): ensure // don't sneak in + + +2014-02-21 Simon J. Gerraty <sjg@bad.crufty.net> + + * rst2htm.mk (RST2PDF): add support for rst2pdf + +2014-02-14 Simon J. Gerraty <sjg@bad.crufty.net> + + * install-mk (MK_VERSION): bump version + * dirdeps.mk (_last_dependfile): use .INCLUDEDFROMFILE if + available. + +2014-02-10 Simon J. Gerraty <sjg@bad.crufty.net> + + * options.mk: avoid :U so this isn't bmake dependent + +2014-02-09 Simon J. Gerraty <sjg@bad.crufty.net> + + * options.mk: cleanup and simplify semanitcs + NO_* dominates all, if both WITH_* and WITHOUT_* + are defined then result is DOMINATE_* which defaults to "no". + Ie. WITHOUT_ normally wins. + 2013-12-12 Simon J. Gerraty <sjg@bad.crufty.net> * install-mk (MK_VERSION): bump version @@ -490,7 +547,7 @@ * dep.mk: auto.dep.mk does not do 'make depend' so ignore it if asked to do that. fix/simplify the tests for when to run mkdep. - * auto.dep.mk: add some explaination of how/what we do. + * auto.dep.mk: add some explanation of how/what we do. * autodep.mk: skip the .OPTIONAL frobbing of .depend bmake's FROM_DEPEND flag makes it redundant. @@ -640,7 +697,7 @@ 2006-12-30 Simon J. Gerraty <sjg@void.crufty.net> * install-mk (MK_VERSION): bump version - * added libs.mk - analagous to progs.mk + * added libs.mk - analogous to progs.mk make both of them always inlcude {lib,prog}.mk 2006-12-28 Simon J. Gerraty <sjg@void.crufty.net> Modified: projects/sendfile/contrib/bmake/mk/autodep.mk ============================================================================== --- projects/sendfile/contrib/bmake/mk/autodep.mk Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/mk/autodep.mk Fri Jul 18 12:36:18 2014 (r268841) @@ -1,6 +1,6 @@ # # RCSid: -# $Id: autodep.mk,v 1.32 2010/04/19 17:37:56 sjg Exp $ +# $Id: autodep.mk,v 1.33 2014/04/05 22:56:54 sjg Exp $ # # @(#) Copyright (c) 1999-2010, Simon J. Gerraty # @@ -16,7 +16,7 @@ # This module provides automagic dependency generation along the # lines suggested in the GNU make.info -# The depend target is mainly for backwards compatability, +# The depend target is mainly for backwards compatibility, # dependencies are normally updated as part of compilation. # set MKDEP=autodep and dep.mk will include us Modified: projects/sendfile/contrib/bmake/mk/dirdeps.mk ============================================================================== --- projects/sendfile/contrib/bmake/mk/dirdeps.mk Fri Jul 18 12:33:22 2014 (r268840) +++ projects/sendfile/contrib/bmake/mk/dirdeps.mk Fri Jul 18 12:36:18 2014 (r268841) @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.29 2013/10/13 18:43:53 sjg Exp $ +# $Id: dirdeps.mk,v 1.35 2014/05/03 06:27:56 sjg Exp $ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407181236.s6ICaJq9043330>