socsvn commit: r271358 - in soc2014/op/freebsd-base: . bin/csh bin/ls bin/sh bin/sh/tests/builtins cddl cddl/contrib/opensolaris cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/ztes...

Fri Jul 25 10:35:23 UTC 2014

Author: op
Date: Fri Jul 25 10:35:00 2014
New Revision: 271358
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271358

Log:
  MFH @20140725 - Merging r270886 through r271357
  
  Signed-off-by: Oliver Pinter <oliver.pntr at gmail.com>
  
  

Added:
  soc2014/op/freebsd-base/bin/sh/tests/builtins/break6.0
     - copied unchanged from r271357, mirror/FreeBSD/head/bin/sh/tests/builtins/break6.0
  soc2014/op/freebsd-base/contrib/libucl/ChangeLog.md
     - copied unchanged from r271357, mirror/FreeBSD/head/contrib/libucl/ChangeLog.md
  soc2014/op/freebsd-base/contrib/libucl/src/ucl_emitter_streamline.c
     - copied unchanged from r271357, mirror/FreeBSD/head/contrib/libucl/src/ucl_emitter_streamline.c
  soc2014/op/freebsd-base/contrib/libucl/src/ucl_emitter_utils.c
     - copied unchanged from r271357, mirror/FreeBSD/head/contrib/libucl/src/ucl_emitter_utils.c
  soc2014/op/freebsd-base/contrib/libucl/tests/basic/11.in
     - copied unchanged from r271357, mirror/FreeBSD/head/contrib/libucl/tests/basic/11.in
  soc2014/op/freebsd-base/contrib/libucl/tests/basic/11.res
     - copied unchanged from r271357, mirror/FreeBSD/head/contrib/libucl/tests/basic/11.res
  soc2014/op/freebsd-base/contrib/libucl/tests/streamline.res
     - copied unchanged from r271357, mirror/FreeBSD/head/contrib/libucl/tests/streamline.res
  soc2014/op/freebsd-base/contrib/libucl/tests/streamline.test
     - copied unchanged from r271357, mirror/FreeBSD/head/contrib/libucl/tests/streamline.test
  soc2014/op/freebsd-base/contrib/libucl/tests/test_streamline.c
     - copied unchanged from r271357, mirror/FreeBSD/head/contrib/libucl/tests/test_streamline.c
  soc2014/op/freebsd-base/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
     - copied unchanged from r271357, mirror/FreeBSD/head/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
  soc2014/op/freebsd-base/share/man/man9/PCBGROUP.9
     - copied unchanged from r271357, mirror/FreeBSD/head/share/man/man9/PCBGROUP.9
  soc2014/op/freebsd-base/share/man/man9/pmap_protect.9
     - copied unchanged from r271357, mirror/FreeBSD/head/share/man/man9/pmap_protect.9
  soc2014/op/freebsd-base/share/man/man9/pmap_unwire.9
     - copied unchanged from r271357, mirror/FreeBSD/head/share/man/man9/pmap_unwire.9
  soc2014/op/freebsd-base/sys/arm/conf/APALIS-IMX6
     - copied unchanged from r271357, mirror/FreeBSD/head/sys/arm/conf/APALIS-IMX6
  soc2014/op/freebsd-base/sys/arm/freescale/imx/imx_gpio.c
     - copied unchanged from r271357, mirror/FreeBSD/head/sys/arm/freescale/imx/imx_gpio.c
  soc2014/op/freebsd-base/sys/arm/freescale/imx/imx_i2c.c
     - copied unchanged from r271357, mirror/FreeBSD/head/sys/arm/freescale/imx/imx_i2c.c
  soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/apalis-imx6.dts
     - copied unchanged from r271357, mirror/FreeBSD/head/sys/boot/fdt/dts/arm/apalis-imx6.dts
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_tpc.c
     - copied unchanged from r271357, mirror/FreeBSD/head/sys/cam/ctl/ctl_tpc.c
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_tpc.h
     - copied unchanged from r271357, mirror/FreeBSD/head/sys/cam/ctl/ctl_tpc.h
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_tpc_local.c
     - copied unchanged from r271357, mirror/FreeBSD/head/sys/cam/ctl/ctl_tpc_local.c
  soc2014/op/freebsd-base/tools/build/options/WITHOUT_TESTS
     - copied unchanged from r271357, mirror/FreeBSD/head/tools/build/options/WITHOUT_TESTS
  soc2014/op/freebsd-base/usr.bin/timeout/
     - copied from r271357, mirror/FreeBSD/head/usr.bin/timeout/
  soc2014/op/freebsd-base/usr.bin/units/tests/
     - copied from r271357, mirror/FreeBSD/head/usr.bin/units/tests/
  soc2014/op/freebsd-base/usr.bin/yacc/tests/yacc_tests.sh
     - copied unchanged from r271357, mirror/FreeBSD/head/usr.bin/yacc/tests/yacc_tests.sh
  soc2014/op/freebsd-base/usr.sbin/bhyve/task_switch.c
     - copied unchanged from r271357, mirror/FreeBSD/head/usr.sbin/bhyve/task_switch.c
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/examples/add_some_packages.sh
     - copied unchanged from r271357, mirror/FreeBSD/head/usr.sbin/bsdconfig/examples/add_some_packages.sh
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
     - copied unchanged from r271357, mirror/FreeBSD/head/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
Deleted:
  soc2014/op/freebsd-base/contrib/byacc/NOTES-btyacc-Changes
  soc2014/op/freebsd-base/contrib/byacc/NOTES-btyacc-Disposition
  soc2014/op/freebsd-base/contrib/unbound/util/configlexer.c
  soc2014/op/freebsd-base/contrib/unbound/util/configparser.c
  soc2014/op/freebsd-base/contrib/unbound/util/configparser.h
  soc2014/op/freebsd-base/share/man/man9/pmap_page_protect.9
  soc2014/op/freebsd-base/share/man/man9/zero_copy.9
  soc2014/op/freebsd-base/sys/arm/freescale/imx/i2c.c
  soc2014/op/freebsd-base/sys/arm/freescale/imx/imx51_gpio.c
  soc2014/op/freebsd-base/tools/build/options/WITH_TESTS
  soc2014/op/freebsd-base/usr.bin/yacc/tests/calc.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/calc1.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/calc2.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/calc3.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/code_calc.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/code_error.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/error.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/ftp.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/grammar.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/legacy_test.sh
  soc2014/op/freebsd-base/usr.bin/yacc/tests/pure_calc.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/pure_error.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/quote_calc.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/quote_calc2.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/quote_calc3.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/quote_calc4.y
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.00.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.01.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.02.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.03.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.04.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.05.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.06.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.07.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.08.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.09.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.10.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.11.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.12.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.13.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.14.out
  soc2014/op/freebsd-base/usr.bin/yacc/tests/regress.sh
  soc2014/op/freebsd-base/usr.bin/yacc/tests/undefined.y
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh
Modified:
  soc2014/op/freebsd-base/   (props changed)
  soc2014/op/freebsd-base/Makefile
  soc2014/op/freebsd-base/Makefile.inc1
  soc2014/op/freebsd-base/ObsoleteFiles.inc
  soc2014/op/freebsd-base/UPDATING
  soc2014/op/freebsd-base/bin/csh/Makefile
  soc2014/op/freebsd-base/bin/ls/Makefile
  soc2014/op/freebsd-base/bin/sh/Makefile
  soc2014/op/freebsd-base/bin/sh/eval.c
  soc2014/op/freebsd-base/bin/sh/exec.c
  soc2014/op/freebsd-base/bin/sh/jobs.c
  soc2014/op/freebsd-base/bin/sh/miscbltin.c
  soc2014/op/freebsd-base/bin/sh/mystring.c
  soc2014/op/freebsd-base/bin/sh/mystring.h
  soc2014/op/freebsd-base/bin/sh/tests/builtins/Makefile
  soc2014/op/freebsd-base/cddl/   (props changed)
  soc2014/op/freebsd-base/cddl/contrib/opensolaris/   (props changed)
  soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  soc2014/op/freebsd-base/contrib/byacc/   (props changed)
  soc2014/op/freebsd-base/contrib/byacc/CHANGES
  soc2014/op/freebsd-base/contrib/byacc/MANIFEST
  soc2014/op/freebsd-base/contrib/byacc/VERSION
  soc2014/op/freebsd-base/contrib/byacc/aclocal.m4
  soc2014/op/freebsd-base/contrib/byacc/main.c
  soc2014/op/freebsd-base/contrib/byacc/package/byacc.spec
  soc2014/op/freebsd-base/contrib/byacc/package/debian/changelog
  soc2014/op/freebsd-base/contrib/byacc/package/mingw-byacc.spec
  soc2014/op/freebsd-base/contrib/byacc/package/pkgsrc/Makefile
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/big_b.output
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/big_l.output
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit1.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit2.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit3.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit4.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit5.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax1.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax10.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax11.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax12.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax13.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax14.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax15.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax16.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax17.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax18.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax19.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax2.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax21.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax22.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax23.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax24.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax25.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax26.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax27.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax3.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax4.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax5.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax6.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7a.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7b.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax8.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax8a.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax9.error
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/help.output
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_b_opt.output
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_output2.output
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_p_opt.output
  soc2014/op/freebsd-base/contrib/byacc/test/btyacc/nostdin.output
  soc2014/op/freebsd-base/contrib/byacc/test/run_test.sh
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/big_b.output
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/big_l.output
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax1.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax10.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax11.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax12.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax13.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax14.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax15.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax16.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax17.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax18.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax19.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax2.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax21.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax22.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax23.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax24.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax25.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax26.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax27.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax3.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax4.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax5.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax6.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax7.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax7a.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax7b.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax8.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax8a.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/err_syntax9.error
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/help.output
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/no_b_opt.output
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/no_output2.output
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/no_p_opt.output
  soc2014/op/freebsd-base/contrib/byacc/test/yacc/nostdin.output
  soc2014/op/freebsd-base/contrib/gcc/   (props changed)
  soc2014/op/freebsd-base/contrib/gcc/config/arm/unwind-arm.h
  soc2014/op/freebsd-base/contrib/libstdc++/   (props changed)
  soc2014/op/freebsd-base/contrib/libstdc++/libsupc++/unwind-cxx.h
  soc2014/op/freebsd-base/contrib/libucl/   (props changed)
  soc2014/op/freebsd-base/contrib/libucl/configure.ac
  soc2014/op/freebsd-base/contrib/libucl/doc/api.md
  soc2014/op/freebsd-base/contrib/libucl/doc/libucl.3
  soc2014/op/freebsd-base/contrib/libucl/doc/pandoc.template
  soc2014/op/freebsd-base/contrib/libucl/include/ucl.h
  soc2014/op/freebsd-base/contrib/libucl/src/Makefile.am
  soc2014/op/freebsd-base/contrib/libucl/src/ucl_emitter.c
  soc2014/op/freebsd-base/contrib/libucl/src/ucl_internal.h
  soc2014/op/freebsd-base/contrib/libucl/src/ucl_parser.c
  soc2014/op/freebsd-base/contrib/libucl/tests/Makefile.am
  soc2014/op/freebsd-base/contrib/libucl/tests/test_basic.c
  soc2014/op/freebsd-base/contrib/libucl/uthash/utstring.h
  soc2014/op/freebsd-base/contrib/serf/   (props changed)
  soc2014/op/freebsd-base/contrib/serf/CHANGES
  soc2014/op/freebsd-base/contrib/serf/auth/auth.c
  soc2014/op/freebsd-base/contrib/serf/outgoing.c
  soc2014/op/freebsd-base/contrib/serf/serf.h
  soc2014/op/freebsd-base/contrib/unbound/   (props changed)
  soc2014/op/freebsd-base/contrib/unbound/doc/example.conf.in
  soc2014/op/freebsd-base/contrib/unbound/doc/unbound.conf.5
  soc2014/op/freebsd-base/contrib/unbound/doc/unbound.conf.5.in
  soc2014/op/freebsd-base/contrib/unbound/freebsd-configure.sh
  soc2014/op/freebsd-base/contrib/unbound/services/localzone.c
  soc2014/op/freebsd-base/contrib/unbound/util/config_file.c
  soc2014/op/freebsd-base/contrib/unbound/util/config_file.h
  soc2014/op/freebsd-base/contrib/unbound/util/configlexer.lex
  soc2014/op/freebsd-base/contrib/unbound/util/configparser.y
  soc2014/op/freebsd-base/etc/   (props changed)
  soc2014/op/freebsd-base/etc/mtree/BSD.tests.dist
  soc2014/op/freebsd-base/games/grdc/Makefile
  soc2014/op/freebsd-base/gnu/lib/   (props changed)
  soc2014/op/freebsd-base/gnu/lib/libreadline/readline/Makefile
  soc2014/op/freebsd-base/gnu/usr.bin/gdb/   (props changed)
  soc2014/op/freebsd-base/gnu/usr.bin/gdb/gdb/Makefile
  soc2014/op/freebsd-base/gnu/usr.bin/gdb/gdbtui/Makefile
  soc2014/op/freebsd-base/gnu/usr.bin/gdb/kgdb/Makefile
  soc2014/op/freebsd-base/gnu/usr.bin/texinfo/info/Makefile
  soc2014/op/freebsd-base/include/   (props changed)
  soc2014/op/freebsd-base/include/search.h
  soc2014/op/freebsd-base/kerberos5/usr.bin/kadmin/Makefile
  soc2014/op/freebsd-base/lib/libc/   (props changed)
  soc2014/op/freebsd-base/lib/libc/arm/Symbol.map
  soc2014/op/freebsd-base/lib/libc/arm/aeabi/Makefile.inc
  soc2014/op/freebsd-base/lib/libc/gen/rewinddir.c
  soc2014/op/freebsd-base/lib/libc/gen/ttyname.3
  soc2014/op/freebsd-base/lib/libc/net/sourcefilter.c
  soc2014/op/freebsd-base/lib/libc/stdio/fflush.c
  soc2014/op/freebsd-base/lib/libc/stdio/fputs.c
  soc2014/op/freebsd-base/lib/libc/stdio/fputws.c
  soc2014/op/freebsd-base/lib/libc/stdio/freopen.c
  soc2014/op/freebsd-base/lib/libc/stdio/ftell.c
  soc2014/op/freebsd-base/lib/libc/stdio/gets.c
  soc2014/op/freebsd-base/lib/libc/stdio/puts.c
  soc2014/op/freebsd-base/lib/libc/stdio/putw.c
  soc2014/op/freebsd-base/lib/libc/stdio/rewind.c
  soc2014/op/freebsd-base/lib/libc/stdio/vfprintf.c
  soc2014/op/freebsd-base/lib/libc/stdio/vfwprintf.c
  soc2014/op/freebsd-base/lib/libc/stdio/wbuf.c
  soc2014/op/freebsd-base/lib/libc/stdlib/Makefile.inc
  soc2014/op/freebsd-base/lib/libc/stdlib/Symbol.map
  soc2014/op/freebsd-base/lib/libc/stdlib/hcreate.3
  soc2014/op/freebsd-base/lib/libc/stdlib/hcreate.c
  soc2014/op/freebsd-base/lib/libc/sys/kqueue.2
  soc2014/op/freebsd-base/lib/libedit/Makefile
  soc2014/op/freebsd-base/lib/libedit/TEST/tc1.c
  soc2014/op/freebsd-base/lib/libfetch/common.c
  soc2014/op/freebsd-base/lib/libpam/modules/pam_group/pam_group.8
  soc2014/op/freebsd-base/lib/libpam/modules/pam_group/pam_group.c
  soc2014/op/freebsd-base/lib/libstand/qdivrem.c
  soc2014/op/freebsd-base/lib/libstand/quad.h
  soc2014/op/freebsd-base/lib/libucl/Makefile
  soc2014/op/freebsd-base/lib/libunbound/Makefile
  soc2014/op/freebsd-base/lib/libutil/   (props changed)
  soc2014/op/freebsd-base/lib/libutil/fparseln.c
  soc2014/op/freebsd-base/lib/libvmmapi/   (props changed)
  soc2014/op/freebsd-base/lib/libvmmapi/vmmapi.c
  soc2014/op/freebsd-base/lib/libvmmapi/vmmapi.h
  soc2014/op/freebsd-base/libexec/rtld-elf/tests/libpythagoras/Makefile
  soc2014/op/freebsd-base/libexec/save-entropy/save-entropy.sh
  soc2014/op/freebsd-base/libexec/telnetd/Makefile
  soc2014/op/freebsd-base/release/arm/release.sh
  soc2014/op/freebsd-base/rescue/rescue/Makefile
  soc2014/op/freebsd-base/sbin/   (props changed)
  soc2014/op/freebsd-base/sbin/fsdb/Makefile
  soc2014/op/freebsd-base/sbin/gvinum/Makefile
  soc2014/op/freebsd-base/secure/usr.bin/sftp/Makefile
  soc2014/op/freebsd-base/share/   (props changed)
  soc2014/op/freebsd-base/share/man/man4/   (props changed)
  soc2014/op/freebsd-base/share/man/man4/ddb.4
  soc2014/op/freebsd-base/share/man/man5/src.conf.5
  soc2014/op/freebsd-base/share/man/man9/Makefile
  soc2014/op/freebsd-base/share/man/man9/kthread.9
  soc2014/op/freebsd-base/share/man/man9/pmap.9
  soc2014/op/freebsd-base/share/man/man9/pmap_clear_modify.9
  soc2014/op/freebsd-base/share/man/man9/pmap_is_modified.9
  soc2014/op/freebsd-base/share/man/man9/rman.9
  soc2014/op/freebsd-base/share/man/man9/socket.9
  soc2014/op/freebsd-base/share/man/man9/timeout.9
  soc2014/op/freebsd-base/share/man/man9/usbdi.9
  soc2014/op/freebsd-base/share/mk/bsd.dep.mk
  soc2014/op/freebsd-base/share/mk/bsd.lib.mk
  soc2014/op/freebsd-base/share/mk/bsd.obj.mk
  soc2014/op/freebsd-base/share/mk/src.opts.mk
  soc2014/op/freebsd-base/sys/   (props changed)
  soc2014/op/freebsd-base/sys/amd64/acpica/acpi_wakecode.S
  soc2014/op/freebsd-base/sys/amd64/amd64/exception.S
  soc2014/op/freebsd-base/sys/amd64/amd64/machdep.c
  soc2014/op/freebsd-base/sys/amd64/amd64/mpboot.S
  soc2014/op/freebsd-base/sys/amd64/amd64/pmap.c
  soc2014/op/freebsd-base/sys/amd64/amd64/trap.c
  soc2014/op/freebsd-base/sys/amd64/include/vmm.h   (contents, props changed)
  soc2014/op/freebsd-base/sys/amd64/include/vmm_dev.h   (contents, props changed)
  soc2014/op/freebsd-base/sys/amd64/include/vmm_instruction_emul.h   (contents, props changed)
  soc2014/op/freebsd-base/sys/amd64/vmm/   (props changed)
  soc2014/op/freebsd-base/sys/amd64/vmm/intel/vmcs.c
  soc2014/op/freebsd-base/sys/amd64/vmm/intel/vmcs.h
  soc2014/op/freebsd-base/sys/amd64/vmm/intel/vmx.c
  soc2014/op/freebsd-base/sys/amd64/vmm/vmm.c
  soc2014/op/freebsd-base/sys/amd64/vmm/vmm_dev.c
  soc2014/op/freebsd-base/sys/amd64/vmm/vmm_instruction_emul.c
  soc2014/op/freebsd-base/sys/arm/arm/pmap-v6.c
  soc2014/op/freebsd-base/sys/arm/arm/pmap.c
  soc2014/op/freebsd-base/sys/arm/conf/IMX6
  soc2014/op/freebsd-base/sys/arm/freescale/imx/files.imx51
  soc2014/op/freebsd-base/sys/arm/freescale/imx/files.imx53
  soc2014/op/freebsd-base/sys/arm/freescale/imx/files.imx6
  soc2014/op/freebsd-base/sys/arm/freescale/vybrid/vf_i2c.c
  soc2014/op/freebsd-base/sys/arm/include/elf.h
  soc2014/op/freebsd-base/sys/boot/   (props changed)
  soc2014/op/freebsd-base/sys/boot/amd64/boot1.efi/Makefile
  soc2014/op/freebsd-base/sys/boot/efi/libefi/Makefile
  soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/imx6.dtsi
  soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/wandboard-dual.dts
  soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/wandboard-quad.dts
  soc2014/op/freebsd-base/sys/boot/fdt/dts/arm/wandboard-solo.dts
  soc2014/op/freebsd-base/sys/boot/i386/libi386/Makefile
  soc2014/op/freebsd-base/sys/boot/i386/libi386/amd64_tramp.S
  soc2014/op/freebsd-base/sys/boot/i386/loader/Makefile
  soc2014/op/freebsd-base/sys/boot/libstand32/Makefile
  soc2014/op/freebsd-base/sys/boot/userboot/test/test.c
  soc2014/op/freebsd-base/sys/cam/ctl/ctl.c
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_backend_ramdisk.c
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_cmd_table.c
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_frontend.c
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_frontend.h
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_frontend_iscsi.c
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_io.h
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_ioctl.h
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_private.h
  soc2014/op/freebsd-base/sys/cam/ctl/ctl_ser_table.c
  soc2014/op/freebsd-base/sys/cam/ctl/scsi_ctl.c
  soc2014/op/freebsd-base/sys/cam/scsi/scsi_all.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/   (props changed)
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  soc2014/op/freebsd-base/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
  soc2014/op/freebsd-base/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  soc2014/op/freebsd-base/sys/cddl/dev/fbt/fbt.c
  soc2014/op/freebsd-base/sys/conf/   (props changed)
  soc2014/op/freebsd-base/sys/conf/files
  soc2014/op/freebsd-base/sys/conf/kern.mk
  soc2014/op/freebsd-base/sys/conf/kmod.mk
  soc2014/op/freebsd-base/sys/dev/bge/if_bge.c
  soc2014/op/freebsd-base/sys/dev/bxe/bxe.c
  soc2014/op/freebsd-base/sys/dev/bxe/bxe.h
  soc2014/op/freebsd-base/sys/dev/bxe/bxe_stats.c
  soc2014/op/freebsd-base/sys/dev/bxe/ecore_reg.h
  soc2014/op/freebsd-base/sys/dev/bxe/ecore_sp.h
  soc2014/op/freebsd-base/sys/dev/cxgbe/adapter.h
  soc2014/op/freebsd-base/sys/dev/cxgbe/offload.h
  soc2014/op/freebsd-base/sys/dev/cxgbe/t4_main.c
  soc2014/op/freebsd-base/sys/dev/cxgbe/t4_sge.c
  soc2014/op/freebsd-base/sys/dev/cxgbe/tom/t4_cpl_io.c
  soc2014/op/freebsd-base/sys/dev/cxgbe/tom/t4_ddp.c
  soc2014/op/freebsd-base/sys/dev/cxgbe/tom/t4_tom.h
  soc2014/op/freebsd-base/sys/dev/drm2/drm_fb_helper.c
  soc2014/op/freebsd-base/sys/dev/drm2/i915/intel_fb.c
  soc2014/op/freebsd-base/sys/dev/drm2/radeon/rs690.c
  soc2014/op/freebsd-base/sys/dev/drm2/radeon/rv515.c
  soc2014/op/freebsd-base/sys/dev/e1000/if_em.c
  soc2014/op/freebsd-base/sys/dev/e1000/if_igb.c
  soc2014/op/freebsd-base/sys/dev/fb/fbd.c
  soc2014/op/freebsd-base/sys/dev/ixgbe/ixgbe.c
  soc2014/op/freebsd-base/sys/dev/usb/controller/xhci_pci.c
  soc2014/op/freebsd-base/sys/dev/usb/serial/u3g.c
  soc2014/op/freebsd-base/sys/dev/usb/usbdevs
  soc2014/op/freebsd-base/sys/dev/vt/hw/efifb/efifb.c
  soc2014/op/freebsd-base/sys/dev/vt/hw/fb/vt_fb.c
  soc2014/op/freebsd-base/sys/dev/vt/hw/fb/vt_fb.h
  soc2014/op/freebsd-base/sys/dev/vt/vt_core.c
  soc2014/op/freebsd-base/sys/fs/ext2fs/ext2_vnops.c
  soc2014/op/freebsd-base/sys/fs/nandfs/nandfs_vnops.c
  soc2014/op/freebsd-base/sys/fs/nfsclient/nfs_clvnops.c
  soc2014/op/freebsd-base/sys/fs/nullfs/null_vnops.c
  soc2014/op/freebsd-base/sys/fs/tmpfs/tmpfs_vnops.c
  soc2014/op/freebsd-base/sys/geom/uzip/g_uzip.c
  soc2014/op/freebsd-base/sys/i386/i386/pmap.c
  soc2014/op/freebsd-base/sys/kern/kern_descrip.c
  soc2014/op/freebsd-base/sys/kern/kern_event.c
  soc2014/op/freebsd-base/sys/kern/kern_proc.c
  soc2014/op/freebsd-base/sys/kern/subr_rman.c
  soc2014/op/freebsd-base/sys/kern/sys_capability.c
  soc2014/op/freebsd-base/sys/kern/uipc_mbuf.c
  soc2014/op/freebsd-base/sys/kern/uipc_usrreq.c
  soc2014/op/freebsd-base/sys/kern/vfs_syscalls.c
  soc2014/op/freebsd-base/sys/modules/ctl/Makefile
  soc2014/op/freebsd-base/sys/net/if.c
  soc2014/op/freebsd-base/sys/net/if_spppsubr.c
  soc2014/op/freebsd-base/sys/netinet/in.h
  soc2014/op/freebsd-base/sys/netinet/in_gif.c
  soc2014/op/freebsd-base/sys/netinet/in_pcbgroup.c
  soc2014/op/freebsd-base/sys/netinet/in_rss.c
  soc2014/op/freebsd-base/sys/netinet/in_rss.h
  soc2014/op/freebsd-base/sys/netinet/sctp_uio.h
  soc2014/op/freebsd-base/sys/netinet/sctputil.c
  soc2014/op/freebsd-base/sys/netinet6/in6_gif.c
  soc2014/op/freebsd-base/sys/netinet6/in6_pcbgroup.c
  soc2014/op/freebsd-base/sys/powerpc/aim/trap.c
  soc2014/op/freebsd-base/sys/powerpc/powerpc/mem.c
  soc2014/op/freebsd-base/sys/powerpc/ps3/platform_ps3.c
  soc2014/op/freebsd-base/sys/powerpc/ps3/ps3_syscons.c
  soc2014/op/freebsd-base/sys/sys/capsicum.h
  soc2014/op/freebsd-base/sys/sys/event.h
  soc2014/op/freebsd-base/sys/sys/fbio.h
  soc2014/op/freebsd-base/sys/sys/link_elf.h
  soc2014/op/freebsd-base/sys/sys/mbuf.h
  soc2014/op/freebsd-base/sys/sys/param.h
  soc2014/op/freebsd-base/sys/sys/rman.h
  soc2014/op/freebsd-base/sys/ufs/ufs/ufs_vnops.c
  soc2014/op/freebsd-base/sys/vm/vm_object.c
  soc2014/op/freebsd-base/sys/x86/x86/mca.c
  soc2014/op/freebsd-base/sys/x86/xen/pv.c
  soc2014/op/freebsd-base/sys/x86/xen/xen_apic.c
  soc2014/op/freebsd-base/tools/bsdbox/Makefile
  soc2014/op/freebsd-base/tools/build/mk/OptionalObsoleteFiles.inc
  soc2014/op/freebsd-base/tools/tools/net80211/stumbler/Makefile
  soc2014/op/freebsd-base/usr.bin/Makefile
  soc2014/op/freebsd-base/usr.bin/clang/clang.prog.mk
  soc2014/op/freebsd-base/usr.bin/ee/Makefile
  soc2014/op/freebsd-base/usr.bin/ftp/Makefile
  soc2014/op/freebsd-base/usr.bin/grep/grep.c
  soc2014/op/freebsd-base/usr.bin/grep/queue.c
  soc2014/op/freebsd-base/usr.bin/grep/util.c
  soc2014/op/freebsd-base/usr.bin/iscsictl/iscsictl.8
  soc2014/op/freebsd-base/usr.bin/less/Makefile
  soc2014/op/freebsd-base/usr.bin/make/Makefile
  soc2014/op/freebsd-base/usr.bin/mkimg/   (props changed)
  soc2014/op/freebsd-base/usr.bin/mkimg/vhd.c
  soc2014/op/freebsd-base/usr.bin/msgs/Makefile
  soc2014/op/freebsd-base/usr.bin/ncal/Makefile
  soc2014/op/freebsd-base/usr.bin/procstat/   (props changed)
  soc2014/op/freebsd-base/usr.bin/procstat/procstat.1
  soc2014/op/freebsd-base/usr.bin/procstat/procstat_files.c
  soc2014/op/freebsd-base/usr.bin/procstat/procstat_vm.c
  soc2014/op/freebsd-base/usr.bin/tabs/Makefile
  soc2014/op/freebsd-base/usr.bin/telnet/Makefile
  soc2014/op/freebsd-base/usr.bin/tftp/Makefile
  soc2014/op/freebsd-base/usr.bin/tput/Makefile
  soc2014/op/freebsd-base/usr.bin/tset/Makefile
  soc2014/op/freebsd-base/usr.bin/ul/Makefile
  soc2014/op/freebsd-base/usr.bin/units/Makefile
  soc2014/op/freebsd-base/usr.bin/units/units.1
  soc2014/op/freebsd-base/usr.bin/units/units.c
  soc2014/op/freebsd-base/usr.bin/vi/Makefile
  soc2014/op/freebsd-base/usr.bin/vtfontcvt/vtfontcvt.8
  soc2014/op/freebsd-base/usr.bin/vtfontcvt/vtfontcvt.c
  soc2014/op/freebsd-base/usr.bin/yacc/tests/Makefile
  soc2014/op/freebsd-base/usr.sbin/bhyve/   (props changed)
  soc2014/op/freebsd-base/usr.sbin/bhyve/Makefile
  soc2014/op/freebsd-base/usr.sbin/bhyve/bhyverun.c
  soc2014/op/freebsd-base/usr.sbin/bhyve/bhyverun.h
  soc2014/op/freebsd-base/usr.sbin/bhyve/inout.c
  soc2014/op/freebsd-base/usr.sbin/bhyve/mem.c
  soc2014/op/freebsd-base/usr.sbin/bhyve/mem.h
  soc2014/op/freebsd-base/usr.sbin/bhyvectl/   (props changed)
  soc2014/op/freebsd-base/usr.sbin/bhyvectl/bhyvectl.c
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/dot/dot
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/dot/include/messages.subr
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/examples/Makefile
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/examples/browse_packages_http.sh
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/include/messages.subr
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/share/common.subr
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/share/media/http.subr
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/share/media/httpproxy.subr
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/share/packages/Makefile
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/share/packages/categories.subr   (props changed)
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/share/packages/index.subr   (contents, props changed)
  soc2014/op/freebsd-base/usr.sbin/bsdconfig/share/packages/packages.subr   (contents, props changed)
  soc2014/op/freebsd-base/usr.sbin/bsdinstall/scripts/mirrorselect
  soc2014/op/freebsd-base/usr.sbin/cdcontrol/Makefile
  soc2014/op/freebsd-base/usr.sbin/chown/tests/chown-f_test.sh
  soc2014/op/freebsd-base/usr.sbin/ctladm/ctladm.8
  soc2014/op/freebsd-base/usr.sbin/ctld/ctl.conf.5
  soc2014/op/freebsd-base/usr.sbin/ctld/ctld.8
  soc2014/op/freebsd-base/usr.sbin/ctld/kernel.c
  soc2014/op/freebsd-base/usr.sbin/lpr/lpc/Makefile
  soc2014/op/freebsd-base/usr.sbin/ndp/ndp.c
  soc2014/op/freebsd-base/usr.sbin/nfsd/nfsd.8
  soc2014/op/freebsd-base/usr.sbin/ngctl/Makefile
  soc2014/op/freebsd-base/usr.sbin/ntp/ntpdc/Makefile
  soc2014/op/freebsd-base/usr.sbin/ntp/ntpq/Makefile
  soc2014/op/freebsd-base/usr.sbin/pkg/pkg.c
  soc2014/op/freebsd-base/usr.sbin/pmcstat/Makefile
  soc2014/op/freebsd-base/usr.sbin/pppctl/Makefile
  soc2014/op/freebsd-base/usr.sbin/service/service.sh
  soc2014/op/freebsd-base/usr.sbin/sysrc/sysrc
  soc2014/op/freebsd-base/usr.sbin/sysrc/sysrc.8
  soc2014/op/freebsd-base/usr.sbin/unbound/local-setup/local-unbound-setup.sh
  soc2014/op/freebsd-base/usr.sbin/watch/Makefile
  soc2014/op/freebsd-base/usr.sbin/wpa/wpa_cli/Makefile

Modified: soc2014/op/freebsd-base/Makefile
==============================================================================

--- soc2014/op/freebsd-base/Makefile	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/Makefile	Fri Jul 25 10:35:00 2014	(r271358)
@@ -174,6 +174,13 @@
 .if defined(TARGET_ARCH) && !defined(_TARGET_ARCH)
 _TARGET_ARCH=${TARGET_ARCH}
 .endif
+# for historical compatibility for xdev targets
+.if defined(XDEV)
+_TARGET=	${XDEV}
+.endif
+.if defined(XDEV_ARCH)
+_TARGET_ARCH=	${XDEV_ARCH}
+.endif
 # Otherwise, default to current machine type and architecture.
 _TARGET?=	${MACHINE}
 _TARGET_ARCH?=	${MACHINE_ARCH}

Modified: soc2014/op/freebsd-base/Makefile.inc1
==============================================================================
--- soc2014/op/freebsd-base/Makefile.inc1	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/Makefile.inc1	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1366,9 +1366,6 @@
 #
 # cross-tools: Build cross-building tools
 #
-.if !defined(TARGET_ARCH) && defined(XDEV_ARCH)
-TARGET_ARCH=	${XDEV_ARCH}
-.endif
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
@@ -1497,6 +1494,7 @@
 .if ${MK_GNUCXX} != "no"
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
 gnu/lib/libstdc++__L: lib/msun__L
+gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
 .endif
 
 .if defined(WITH_ATF) || ${MK_TESTS} != "no"
@@ -1853,9 +1851,9 @@
 
 ###############
 
-.if defined(XDEV) && defined(XDEV_ARCH)
+.if defined(TARGET) && defined(TARGET_ARCH)
 
-.if ${XDEV} == ${MACHINE} && ${XDEV_ARCH} == ${MACHINE_ARCH}
+.if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH}
 XDEV_CPUTYPE?=${CPUTYPE}
 .else
 XDEV_CPUTYPE?=${TARGET_CPUTYPE}
@@ -1864,10 +1862,10 @@
 NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
 	MK_MAN=no MK_NLS=no MK_PROFILE=no \
 	MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WARNS=no \
-	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
+	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
 
-XDDIR=${XDEV_ARCH}-freebsd
+XDDIR=${TARGET_ARCH}-freebsd
 XDTP?=/usr/${XDDIR}
 .if ${XDTP:N/*}
 .error XDTP variable should be an absolute path
@@ -1883,7 +1881,7 @@
 	-B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib
 CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \
 	CPP="${CPP} ${CD2CFLAGS}" \
-	MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH}
+	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}
 
 CDTMP=	${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
 CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
@@ -1942,6 +1940,10 @@
 	    -p ${XDDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${XDDESTDIR}/usr/include >/dev/null
+.if ${MK_TESTS} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+	    -p ${XDDESTDIR}/usr >/dev/null
+.endif
 
 .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
@@ -1978,5 +1980,5 @@
 		done
 .else
 xdev xdev-build xdev-install xdev-links:
-	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
+	@echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${.TARGET}\" target"
 .endif

Modified: soc2014/op/freebsd-base/ObsoleteFiles.inc
==============================================================================
--- soc2014/op/freebsd-base/ObsoleteFiles.inc	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/ObsoleteFiles.inc	Fri Jul 25 10:35:00 2014	(r271358)
@@ -38,6 +38,19 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140723: renamed to PCBGROUP.9
+OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
+# 20140719: libsbuf version bump
+OLD_LIBS+=lib/libsbuf.so.6
+# 20140718: Remove obsolete man pages
+OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
+OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
+# 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
@@ -70,8 +83,10 @@
 OLD_FILES+=usr/share/examples/cvsup/standard-supfile
 OLD_DIRS+=usr/share/examples/cvsup
 # 20140614: send-pr removal
+OLD_FILES+=usr/bin/sendbug
 OLD_FILES+=usr/share/info/send-pr.info.gz
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
+OLD_FILES+=usr/share/man/man1/sendbug.1.gz
 OLD_FILES+=etc/gnats/freefall
 OLD_DIRS+=etc/gnats
 # 20140512: new clang import which bumps version from 3.4 to 3.4.1.

Modified: soc2014/op/freebsd-base/UPDATING
==============================================================================
--- soc2014/op/freebsd-base/UPDATING	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/UPDATING	Fri Jul 25 10:35:00 2014	(r271358)
@@ -31,6 +31,18 @@
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140723:
+	The xdev targets have been converted to using TARGET and
+	TARGET_ARCH instead of XDEV and XDEV_ARCH.
+
+20140719:
+	The default unbound configuration has been modified to address
+	issues with reverse lookups on networks that use private
+	address ranges.  If you use the local_unbound service, run
+	"service local_unbound setup" as root to regenerate your
+	configuration, then "service local_unbound reload" to load the
+	new configuration.
+
 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

Modified: soc2014/op/freebsd-base/bin/csh/Makefile
==============================================================================
--- soc2014/op/freebsd-base/bin/csh/Makefile	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/csh/Makefile	Fri Jul 25 10:35:00 2014	(r271358)
@@ -40,8 +40,8 @@
 # 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: soc2014/op/freebsd-base/bin/ls/Makefile
==============================================================================
--- soc2014/op/freebsd-base/bin/ls/Makefile	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/ls/Makefile	Fri Jul 25 10:35:00 2014	(r271358)
@@ -11,8 +11,8 @@
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no
 CFLAGS+= -DCOLORLS
-DPADD+=	${LIBTERMCAP}
-LDADD+=	-ltermcap
+DPADD+=	${LIBTERMCAPW}
+LDADD+=	-ltermcapw
 .endif
 
 .include <bsd.prog.mk>

Modified: soc2014/op/freebsd-base/bin/sh/Makefile
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/Makefile	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/sh/Makefile	Fri Jul 25 10:35:00 2014	(r271358)
@@ -18,8 +18,8 @@
 # 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: soc2014/op/freebsd-base/bin/sh/eval.c
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/eval.c	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/sh/eval.c	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1250,8 +1250,16 @@
 int
 breakcmd(int argc, char **argv)
 {
-	int n = argc > 1 ? number(argv[1]) : 1;
+	long n;
+	char *end;
 
+	if (argc > 1) {
+		/* Allow arbitrarily large numbers. */
+		n = strtol(argv[1], &end, 10);
+		if (!is_digit(argv[1][0]) || *end != '\0')
+			error("Illegal number: %s", argv[1]);
+	} else
+		n = 1;
 	if (n > loopnest)
 		n = loopnest;
 	if (n > 0) {

Modified: soc2014/op/freebsd-base/bin/sh/exec.c
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/exec.c	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/sh/exec.c	Fri Jul 25 10:35:00 2014	(r271358)
@@ -365,7 +365,7 @@
 	for (;(fullname = padvance(&path, name)) != NULL; stunalloc(fullname)) {
 		idx++;
 		if (pathopt) {
-			if (prefix("func", pathopt)) {
+			if (strncmp(pathopt, "func", 4) == 0) {
 				/* handled below */
 			} else {
 				continue; /* ignore unimplemented options */

Modified: soc2014/op/freebsd-base/bin/sh/jobs.c
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/jobs.c	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/sh/jobs.c	Fri Jul 25 10:35:00 2014	(r271358)
@@ -562,6 +562,7 @@
 {
 	int jobno;
 	struct job *found, *jp;
+	size_t namelen;
 	pid_t pid;
 	int i;
 
@@ -603,10 +604,12 @@
 			if (found != NULL)
 				return (found);
 		} else {
+			namelen = strlen(name);
 			found = NULL;
 			for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
 				if (jp->used && jp->nprocs > 0
-				 && prefix(name + 1, jp->ps[0].cmd)) {
+				 && strncmp(jp->ps[0].cmd, name + 1,
+				 namelen - 1) == 0) {
 					if (found)
 						error("%s: ambiguous", name);
 					found = jp;

Modified: soc2014/op/freebsd-base/bin/sh/miscbltin.c
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/miscbltin.c	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/sh/miscbltin.c	Fri Jul 25 10:35:00 2014	(r271358)
@@ -411,12 +411,32 @@
 	{ (char *) 0,		(char *)0,	0,		   0, '\0' }
 };
 
+enum limithow { SOFT = 0x1, HARD = 0x2 };
+
+static void
+printlimit(enum limithow how, const struct rlimit *limit,
+    const struct limits *l)
+{
+	rlim_t val = 0;
+
+	if (how & SOFT)
+		val = limit->rlim_cur;
+	else if (how & HARD)
+		val = limit->rlim_max;
+	if (val == RLIM_INFINITY)
+		out1str("unlimited\n");
+	else
+	{
+		val /= l->factor;
+		out1fmt("%jd\n", (intmax_t)val);
+	}
+}
+
 int
 ulimitcmd(int argc __unused, char **argv __unused)
 {
 	rlim_t val = 0;
-	enum { SOFT = 0x1, HARD = 0x2 }
-			how = SOFT | HARD;
+	enum limithow how = SOFT | HARD;
 	const struct limits	*l;
 	int		set, all = 0;
 	int		optc, what;
@@ -475,10 +495,6 @@
 			char optbuf[40];
 			if (getrlimit(l->cmd, &limit) < 0)
 				error("can't get limit: %s", strerror(errno));
-			if (how & SOFT)
-				val = limit.rlim_cur;
-			else if (how & HARD)
-				val = limit.rlim_max;
 
 			if (l->units)
 				snprintf(optbuf, sizeof(optbuf),
@@ -487,13 +503,7 @@
 				snprintf(optbuf, sizeof(optbuf),
 					"(-%c) ", l->option);
 			out1fmt("%-18s %18s ", l->name, optbuf);
-			if (val == RLIM_INFINITY)
-				out1str("unlimited\n");
-			else
-			{
-				val /= l->factor;
-				out1fmt("%jd\n", (intmax_t)val);
-			}
+			printlimit(how, &limit, l);
 		}
 		return 0;
 	}
@@ -507,19 +517,7 @@
 			limit.rlim_max = val;
 		if (setrlimit(l->cmd, &limit) < 0)
 			error("bad limit: %s", strerror(errno));
-	} else {
-		if (how & SOFT)
-			val = limit.rlim_cur;
-		else if (how & HARD)
-			val = limit.rlim_max;
-
-		if (val == RLIM_INFINITY)
-			out1str("unlimited\n");
-		else
-		{
-			val /= l->factor;
-			out1fmt("%jd\n", (intmax_t)val);
-		}
-	}
+	} else
+		printlimit(how, &limit, l);
 	return 0;
 }

Modified: soc2014/op/freebsd-base/bin/sh/mystring.c
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/mystring.c	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/sh/mystring.c	Fri Jul 25 10:35:00 2014	(r271358)
@@ -61,21 +61,6 @@
 
 
 /*
- * prefix -- see if pfx is a prefix of string.
- */
-
-int
-prefix(const char *pfx, const char *string)
-{
-	while (*pfx) {
-		if (*pfx++ != *string++)
-			return 0;
-	}
-	return 1;
-}
-
-
-/*
  * Convert a string of digits to an integer, printing an error message on
  * failure.
  */

Modified: soc2014/op/freebsd-base/bin/sh/mystring.h
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/mystring.h	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/sh/mystring.h	Fri Jul 25 10:35:00 2014	(r271358)
@@ -35,7 +35,6 @@
 
 #include <string.h>
 
-int prefix(const char *, const char *);
 int number(const char *);
 int is_number(const char *);
 

Modified: soc2014/op/freebsd-base/bin/sh/tests/builtins/Makefile
==============================================================================
--- soc2014/op/freebsd-base/bin/sh/tests/builtins/Makefile	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/bin/sh/tests/builtins/Makefile	Fri Jul 25 10:35:00 2014	(r271358)
@@ -14,6 +14,7 @@
 FILES+=		break3.0
 FILES+=		break4.4
 FILES+=		break5.4
+FILES+=		break6.0
 FILES+=		builtin1.0
 FILES+=		case1.0
 FILES+=		case2.0

Copied: soc2014/op/freebsd-base/bin/sh/tests/builtins/break6.0 (from r271357, mirror/FreeBSD/head/bin/sh/tests/builtins/break6.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2014/op/freebsd-base/bin/sh/tests/builtins/break6.0	Fri Jul 25 10:35:00 2014	(r271358, copy of r271357, mirror/FreeBSD/head/bin/sh/tests/builtins/break6.0)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+# Per POSIX, this need only work if LONG_MAX > 4294967295.
+
+while :; do
+	break 4294967296
+	echo bad
+	exit 3
+done

Modified: soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Fri Jul 25 10:35:00 2014	(r271358)
@@ -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 at FreeBSD.org>. All rights reserved.
  * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
@@ -2033,7 +2033,7 @@
 			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"));

Modified: soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Fri Jul 25 10:35:00 2014	(r271358)
@@ -810,7 +810,7 @@
 ztest_get_ashift(void)
 {
 	if (ztest_opts.zo_ashift == 0)
-		return (SPA_MINBLOCKSHIFT + ztest_random(3));
+		return (SPA_MINBLOCKSHIFT + ztest_random(5));
 	return (ztest_opts.zo_ashift);
 }
 
@@ -969,11 +969,28 @@
 	return (version);
 }
 
+/*
+ * Find the largest ashift used
+ */
+static uint64_t
+ztest_spa_get_ashift() {
+	uint64_t i;
+	uint64_t ashift = SPA_MINBLOCKSHIFT;
+	vdev_t *rvd = ztest_spa->spa_root_vdev;
+
+	for (i = 0; i < rvd->vdev_children; i++) {
+		ashift = MAX(ashift, rvd->vdev_child[i]->vdev_ashift);
+	}
+	return (ashift);
+}
+
 static int
 ztest_random_blocksize(void)
 {
-	return (1 << (SPA_MINBLOCKSHIFT +
-	    ztest_random(SPA_MAXBLOCKSHIFT - SPA_MINBLOCKSHIFT + 1)));
+	// Choose a block size >= the ashift.
+	uint64_t block_shift =
+	    ztest_random(SPA_MAXBLOCKSHIFT - ztest_spa_get_ashift() + 1);
+	return (1 << (SPA_MINBLOCKSHIFT + block_shift));
 }
 
 static int
@@ -5768,16 +5785,30 @@
 	spa_freeze(spa);
 
 	/*
+	 * Because it is hard to predict how much space a write will actually
+	 * require beforehand, we leave ourselves some fudge space to write over
+	 * capacity.
+	 */
+	uint64_t capacity = metaslab_class_get_space(spa_normal_class(spa)) / 2;
+
+	/*
 	 * Run tests that generate log records but don't alter the pool config
 	 * or depend on DSL sync tasks (snapshots, objset create/destroy, etc).
 	 * We do a txg_wait_synced() after each iteration to force the txg
 	 * to increase well beyond the last synced value in the uberblock.
 	 * The ZIL should be OK with that.
+	 *
+	 * Run a random number of times less than zo_maxloops and ensure we do
+	 * not run out of space on the pool.
 	 */
 	while (ztest_random(10) != 0 &&
-	    numloops++ < ztest_opts.zo_maxloops) {
-		ztest_dmu_write_parallel(zd, 0);
-		ztest_dmu_object_alloc_free(zd, 0);
+	    numloops++ < ztest_opts.zo_maxloops &&
+	    metaslab_class_get_alloc(spa_normal_class(spa)) < capacity) {
+		ztest_od_t od;
+		ztest_od_init(&od, 0, FTAG, 0, DMU_OT_UINT64_OTHER, 0, 0);
+		VERIFY0(ztest_object_init(zd, &od, sizeof (od), B_FALSE));
+		ztest_io(zd, od.od_object,
+		    ztest_random(ZTEST_RANGE_LOCKS) << SPA_MAXBLOCKSHIFT);
 		txg_wait_synced(spa_get_dsl(spa), 0);
 	}
 

Modified: soc2014/op/freebsd-base/contrib/byacc/CHANGES
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/CHANGES	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/CHANGES	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,38 @@
+2014-07-15  Thomas E. Dickey  <tom at invisible-island.net>
+
+	* aclocal.m4: resync with my-autoconf (no change to configure script)
+
+	* VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+	bump
+
+	* test/run_test.sh:
+	make top-level "make check" work again, by adding another step to filtering
+	the test results.
+
+2014-07-14  Thomas E. Dickey  <tom at invisible-island.net>
+
+	* test/run_test.sh: changes from Garrett Cooper's patch:
+		a) ensure that the script returns an error-code if there are differences
+		b) escape "." character in left side of sed expression for $YACC
+		c) ensure that $ifBTYACC has a value
+
+	* test/btyacc/big_b.output, test/btyacc/big_l.output, test/btyacc/help.output, test/btyacc/no_b_opt.output, test/btyacc/no_output2.output, test/btyacc/no_p_opt.output, test/btyacc/nostdin.output:
+	regen (reminder by Garrett Cooper)
+
+2014-07-14  Garrett.Cooper
+
+	* test/btyacc/err_inherit1.error, test/btyacc/err_inherit2.error, test/btyacc/err_inherit3.error, test/btyacc/err_inherit4.error, test/btyacc/err_inherit5.error, test/btyacc/err_syntax1.error, test/btyacc/err_syntax10.error, test/btyacc/err_syntax11.error, test/btyacc/err_syntax12.error, test/btyacc/err_syntax13.error, test/btyacc/err_syntax14.error, test/btyacc/err_syntax15.error, test/btyacc/err_syntax16.error, test/btyacc/err_syntax17.error, test/btyacc/err_syntax18.error, test/btyacc/err_syntax19.error, test/btyacc/err_syntax2.error, test/btyacc/err_syntax21.error, test/btyacc/err_syntax22.error, test/btyacc/err_syntax23.error, test/btyacc/err_syntax24.error, test/btyacc/err_syntax25.error, test/btyacc/err_syntax26.error, test/btyacc/err_syntax27.error, test/btyacc/err_syntax3.error, test/btyacc/err_syntax4.error, test/btyacc/err_syntax5.error, test/btyacc/err_syntax6.error, test/btyacc/err_syntax7.error, test/btyacc/err_syntax7a.error, test/btyacc/err_syntax7b.error, test/btya
 cc/err_syntax8.error, test/btyacc/err_syntax8a.error, test/btyacc/err_syntax9.error, test/yacc/err_syntax1.error, test/yacc/err_syntax10.error, test/yacc/err_syntax11.error, test/yacc/err_syntax12.error, test/yacc/err_syntax13.error, test/yacc/err_syntax14.error, test/yacc/err_syntax15.error, test/yacc/err_syntax16.error, test/yacc/err_syntax17.error, test/yacc/err_syntax18.error, test/yacc/err_syntax19.error, test/yacc/err_syntax2.error, test/yacc/err_syntax21.error, test/yacc/err_syntax22.error, test/yacc/err_syntax23.error, test/yacc/err_syntax24.error, test/yacc/err_syntax25.error, test/yacc/err_syntax26.error, test/yacc/err_syntax27.error, test/yacc/err_syntax3.error, test/yacc/err_syntax4.error, test/yacc/err_syntax5.error, test/yacc/err_syntax6.error, test/yacc/err_syntax7.error, test/yacc/err_syntax7a.error, test/yacc/err_syntax7b.error, test/yacc/err_syntax8.error, test/yacc/err_syntax8a.error, test/yacc/err_syntax9.error:
+	regen
+
+2014-05-27  Tom.Shields
+
+	* main.c: remove obsolete -D option from usage message
+
+2014-05-27  Thomas E. Dickey  <tom at invisible-island.net>
+
+	* VERSION, package/byacc.spec, package/debian/changelog, test/yacc/big_b.output, test/yacc/big_l.output, test/yacc/help.output, test/yacc/no_b_opt.output, test/yacc/no_output2.output, test/yacc/no_p_opt.output, test/yacc/nostdin.output:
+	bump
+
 2014-04-22  Thomas E. Dickey  <tom at invisible-island.net>
 
 	* mstring.c:

Modified: soc2014/op/freebsd-base/contrib/byacc/MANIFEST
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/MANIFEST	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/MANIFEST	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,4 +1,4 @@
-MANIFEST for byacc-20140422, version t20140422
+MANIFEST for byacc-20140715, version t20140715
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 ACKNOWLEDGEMENTS                original version of byacc - 1993

Modified: soc2014/op/freebsd-base/contrib/byacc/VERSION
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/VERSION	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/VERSION	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-20140422
+20140715

Modified: soc2014/op/freebsd-base/contrib/byacc/aclocal.m4
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/aclocal.m4	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/aclocal.m4	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.34 2014/04/06 19:16:18 tom Exp $
+dnl $Id: aclocal.m4,v 1.35 2014/07/15 19:38:05 tom Exp $
 dnl Macros for byacc configure script (Thomas E. Dickey)
 dnl ---------------------------------------------------------------------------
 dnl Copyright 2004-2013,2014 Thomas E. Dickey
@@ -28,7 +28,7 @@
 dnl authorization.
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
 dnl ------------------
 dnl Conditionally generate script according to whether we're using a given autoconf.
 dnl
@@ -37,7 +37,7 @@
 dnl $3 = code to use if AC_ACVERSION is older than $1.
 define([CF_ACVERSION_CHECK],
 [
-ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([AC_ACVERSION], ,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
 ifdef([m4_version_compare],
 [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
 [CF_ACVERSION_COMPARE(
@@ -930,7 +930,7 @@
 test -z "$AWK" && AC_MSG_ERROR(No awk program found)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
 dnl ----------
 dnl standard check for CC, plus followup sanity checks
 dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
@@ -940,7 +940,7 @@
 CF_ACVERSION_CHECK(2.52,
 	[AC_PROG_CC_STDC],
 	[CF_ANSI_CC_REQD])
-CF_CC_ENV_FLAGS 
+CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14

Modified: soc2014/op/freebsd-base/contrib/byacc/main.c
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/main.c	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/main.c	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.50 2014/04/22 23:34:47 tom Exp $ */
+/* $Id: main.c,v 1.51 2014/05/28 02:01:55 Tom.Shields Exp $ */
 
 #include <signal.h>
 #ifndef _WIN32
@@ -208,7 +208,6 @@
 	,"  -b file_prefix        set filename prefix (default \"y.\")"
 	,"  -B                    create a backtracking parser"
 	,"  -d                    write definitions (" DEFINES_SUFFIX ")"
-	,"  -D                    enable value stack memory reclamation"
 	,"  -i                    write interface (y.tab.i)"
 	,"  -g                    write a graphical description"
 	,"  -l                    suppress #line directives"

Modified: soc2014/op/freebsd-base/contrib/byacc/package/byacc.spec
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/package/byacc.spec	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/package/byacc.spec	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,8 +1,8 @@
 Summary: byacc - public domain Berkeley LALR Yacc parser generator
 %define AppProgram byacc
-%define AppVersion 20140422
+%define AppVersion 20140715
 %define UseProgram yacc
-# $XTermId: byacc.spec,v 1.20 2014/04/22 08:13:20 tom Exp $
+# $XTermId: byacc.spec,v 1.22 2014/07/15 19:36:54 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1

Modified: soc2014/op/freebsd-base/contrib/byacc/package/debian/changelog
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/package/debian/changelog	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/package/debian/changelog	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,15 @@
+byacc (20140715) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey at invisible-island.net>  Tue, 15 Jul 2014 15:36:54 -0400
+
+byacc (20140527) unstable; urgency=low
+
+  * remove obsolete option from usage message
+
+ -- Thomas E. Dickey <dickey at invisible-island.net>  Tue, 27 May 2014 22:01:55 -0400
+
 byacc (20140422) unstable; urgency=low
 
   * maintenance updates

Modified: soc2014/op/freebsd-base/contrib/byacc/package/mingw-byacc.spec
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/package/mingw-byacc.spec	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/package/mingw-byacc.spec	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,8 +1,8 @@
 Summary: byacc - public domain Berkeley LALR Yacc parser generator
 %define AppProgram byacc
-%define AppVersion 20140422
+%define AppVersion 20140715
 %define UseProgram yacc
-# $XTermId: mingw-byacc.spec,v 1.3 2014/04/22 08:13:20 tom Exp $
+# $XTermId: mingw-byacc.spec,v 1.4 2014/07/15 19:36:54 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1

Modified: soc2014/op/freebsd-base/contrib/byacc/package/pkgsrc/Makefile
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/package/pkgsrc/Makefile	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/package/pkgsrc/Makefile	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $
 #
 
-DISTNAME=	byacc-20140422
+DISTNAME=	byacc-20140715
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/byacc/

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/big_b.output
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/big_b.output	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/big_b.output	Fri Jul 25 10:35:00 2014	(r271358)
@@ -4,7 +4,6 @@
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/big_l.output
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/big_l.output	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/big_l.output	Fri Jul 25 10:35:00 2014	(r271358)
@@ -4,7 +4,6 @@
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit1.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit1.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit1.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 64 of "./test/err_inherit1.y", unterminated argument list
+YACC: e - line 64 of "./err_inherit1.y", unterminated argument list
 namelist($c, $t
         ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit2.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit2.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit2.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,5 +1,5 @@
-YACC: w - line 64 of "./test/err_inherit2.y", number of arguments of namelist doesn't agree with previous declaration
-YACC: w - line 64 of "./test/err_inherit2.y", type of argument 1 to namelist doesn't agree with previous declaration
-YACC: e - line 64 of "./test/err_inherit2.y", bad formal argument list
+YACC: w - line 64 of "./err_inherit2.y", number of arguments of namelist doesn't agree with previous declaration
+YACC: w - line 64 of "./err_inherit2.y", type of argument 1 to namelist doesn't agree with previous declaration
+YACC: e - line 64 of "./err_inherit2.y", bad formal argument list
 namelist($<tval>c, $t, extra): namelist NAME
                              ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit3.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit3.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit3.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,23 +1,23 @@
-YACC: w - line 64 of "./test/err_inherit3.y", number of arguments of namelist doesn't agree with previous declaration
-YACC: w - line 64 of "./test/err_inherit3.y", wrong number of arguments for namelist
+YACC: w - line 64 of "./err_inherit3.y", number of arguments of namelist doesn't agree with previous declaration
+YACC: w - line 64 of "./err_inherit3.y", wrong number of arguments for namelist
 namelist: namelist($c) NAME
                        ^
-YACC: w - line 64 of "./test/err_inherit3.y", unknown argument $c
-YACC: w - line 64 of "./test/err_inherit3.y", untyped argument $c
-YACC: w - line 65 of "./test/err_inherit3.y", unknown argument $t
+YACC: w - line 64 of "./err_inherit3.y", unknown argument $c
+YACC: w - line 64 of "./err_inherit3.y", untyped argument $c
+YACC: w - line 65 of "./err_inherit3.y", unknown argument $t
 	    { $$->s = mksymbol($<tval>t, $<cval>c, $2);
 	                       ^
-YACC: w - line 65 of "./test/err_inherit3.y", unknown argument $c
+YACC: w - line 65 of "./err_inherit3.y", unknown argument $c
 	    { $$->s = mksymbol($<tval>t, $<cval>c, $2);
 	                                 ^
-YACC: w - line 69 of "./test/err_inherit3.y", unknown argument $t
+YACC: w - line 69 of "./err_inherit3.y", unknown argument $t
 	    { $$->s = mksymbol($t, $c, $1);
 	                         ^
-YACC: w - line 69 of "./test/err_inherit3.y", untyped argument $t
-YACC: w - line 69 of "./test/err_inherit3.y", unknown argument $c
+YACC: w - line 69 of "./err_inherit3.y", untyped argument $t
+YACC: w - line 69 of "./err_inherit3.y", unknown argument $c
 	    { $$->s = mksymbol($t, $c, $1);
 	                             ^
-YACC: w - line 69 of "./test/err_inherit3.y", untyped argument $c
-YACC: w - line 0 of "./test/err_inherit3.y", start symbol declaration requires arguments
+YACC: w - line 69 of "./err_inherit3.y", untyped argument $c
+YACC: w - line 0 of "./err_inherit3.y", start symbol declaration requires arguments
 YACC: 1 rule never reduced
 YACC: 3 shift/reduce conflicts.

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit4.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit4.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit4.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,13 +1,13 @@
-YACC: w - line 32 of "./test/err_inherit4.y", destructor redeclared
+YACC: w - line 32 of "./err_inherit4.y", destructor redeclared
 %destructor	{
            	^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong number of default arguments for namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong number of default arguments for namelist
 	{ $$ = $1; @$ = @2; }
 	^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong type for default argument 2 to namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong type for default argument 2 to namelist
 	{ $$ = $1; @$ = @2; }
 	^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong type for default argument 1 to namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong type for default argument 1 to namelist
 	{ $$ = $1; @$ = @2; }
 	^
-YACC: w - line 77 of "./test/err_inherit4.y", @2 references beyond the end of the current rule
+YACC: w - line 77 of "./err_inherit4.y", @2 references beyond the end of the current rule

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit5.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit5.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_inherit5.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 74 of "./test/err_inherit5.y", illegal @$ or @N reference
+YACC: e - line 74 of "./err_inherit5.y", illegal @$ or @N reference

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax1.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax1.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax1.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax1.y", syntax error
+YACC: e - line 1 of "./err_syntax1.y", syntax error
 	?%	{
 	^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax10.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax10.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax10.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '(' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '*' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '&' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '(' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '*' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '&' has been redeclared

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax11.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax11.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax11.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax11.y", the precedence of '|' has been redeclared
+YACC: w - line 7 of "./err_syntax11.y", the precedence of '|' has been redeclared

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax12.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax12.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax12.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax12.y", the value of text has been redeclared
+YACC: w - line 7 of "./err_syntax12.y", the value of text has been redeclared

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax13.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax13.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax13.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax13.y", the start symbol text is a token
+YACC: e - line 7 of "./err_syntax13.y", the start symbol text is a token

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax14.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax14.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax14.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,2 +1,2 @@
-YACC: w - line 7 of "./test/err_syntax14.y", the start symbol has been redeclared
+YACC: w - line 7 of "./err_syntax14.y", the start symbol has been redeclared
 YACC: e - the start symbol text2 is undefined

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax15.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax15.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax15.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 9 of "./test/err_syntax15.y", no grammar has been specified
+YACC: e - line 9 of "./err_syntax15.y", no grammar has been specified

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax16.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax16.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax16.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 14 of "./test/err_syntax16.y", a token appears on the lhs of a production
+YACC: e - line 14 of "./err_syntax16.y", a token appears on the lhs of a production

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax17.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax17.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax17.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 8 of "./test/err_syntax17.y", unterminated action
+YACC: e - line 8 of "./err_syntax17.y", unterminated action
 S: { error
    ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax18.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax18.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax18.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: w - line 9 of "./test/err_syntax18.y", $4 references beyond the end of the current rule
+YACC: w - line 9 of "./err_syntax18.y", $4 references beyond the end of the current rule

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax19.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax19.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax19.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 9 of "./test/err_syntax19.y", illegal $-name
+YACC: e - line 9 of "./err_syntax19.y", illegal $-name
             {  $$ = $<oops>; }
                     ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax2.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax2.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax2.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax2.y", unmatched /*
+YACC: e - line 1 of "./err_syntax2.y", unmatched /*
 %{ /*
    ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax21.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax21.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax21.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 12 of "./test/err_syntax21.y", $0 is untyped
+YACC: e - line 12 of "./err_syntax21.y", $0 is untyped

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax22.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax22.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax22.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 17 of "./test/err_syntax22.y", $2 (recur) is untyped
+YACC: e - line 17 of "./err_syntax22.y", $2 (recur) is untyped

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax23.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax23.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax23.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 18 of "./test/err_syntax23.y", $$ is untyped
+YACC: e - line 18 of "./err_syntax23.y", $$ is untyped

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax24.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax24.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax24.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,2 +1,2 @@
-YACC: w - line 21 of "./test/err_syntax24.y", the default action assigns an undefined value to $$
-YACC: e - line 22 of "./test/err_syntax24.y", $$ is untyped
+YACC: w - line 21 of "./err_syntax24.y", the default action assigns an undefined value to $$
+YACC: e - line 22 of "./err_syntax24.y", $$ is untyped

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax25.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax25.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax25.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 11 of "./test/err_syntax25.y", too many %union declarations
+YACC: e - line 11 of "./err_syntax25.y", too many %union declarations
 %union {
 ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax26.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax26.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax26.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax26.y", unexpected end-of-file
+YACC: e - line 6 of "./err_syntax26.y", unexpected end-of-file

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax27.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax27.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax27.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 3 of "./test/err_syntax27.y", missing '}'
+YACC: e - line 3 of "./err_syntax27.y", missing '}'

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax3.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax3.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax3.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax3.y", unterminated string
+YACC: e - line 6 of "./err_syntax3.y", unterminated string
 %token <text> '(' '*' '&
                       ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax4.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax4.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax4.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax4.y", unmatched %{
+YACC: e - line 1 of "./err_syntax4.y", unmatched %{
 %{
 ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax5.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax5.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax5.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax5.y", unterminated %union declaration
+YACC: e - line 6 of "./err_syntax5.y", unterminated %union declaration
 %union {
 ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax6.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax6.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax6.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax6.y", illegal tag
+YACC: e - line 6 of "./err_syntax6.y", illegal tag
 %token <text) '(' '*' '&
        ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7.y", illegal character
+YACC: e - line 6 of "./err_syntax7.y", illegal character
 %token <text> '\777'
                ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7a.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7a.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7a.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7a.y", illegal character
+YACC: e - line 6 of "./err_syntax7a.y", illegal character
 %token <text> '\xfff'
                ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7b.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7b.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax7b.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7b.y", illegal character
+YACC: e - line 6 of "./err_syntax7b.y", illegal character
 %token <text> '\x.'
                ^

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax8.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax8.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax8.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8.y", illegal use of reserved symbol .
+YACC: e - line 6 of "./err_syntax8.y", illegal use of reserved symbol .

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax8a.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax8a.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax8a.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8a.y", illegal use of reserved symbol $$123
+YACC: e - line 6 of "./err_syntax8a.y", illegal use of reserved symbol $$123

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax9.error
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax9.error	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/err_syntax9.error	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax9.y", the start symbol text cannot be declared to be a token
+YACC: e - line 7 of "./err_syntax9.y", the start symbol text cannot be declared to be a token

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/help.output
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/help.output	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/help.output	Fri Jul 25 10:35:00 2014	(r271358)
@@ -4,7 +4,6 @@
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_b_opt.output
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_b_opt.output	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_b_opt.output	Fri Jul 25 10:35:00 2014	(r271358)
@@ -4,7 +4,6 @@
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_output2.output
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_output2.output	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_output2.output	Fri Jul 25 10:35:00 2014	(r271358)
@@ -4,7 +4,6 @@
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_p_opt.output
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_p_opt.output	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/no_p_opt.output	Fri Jul 25 10:35:00 2014	(r271358)
@@ -4,7 +4,6 @@
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives

Modified: soc2014/op/freebsd-base/contrib/byacc/test/btyacc/nostdin.output
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/btyacc/nostdin.output	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/btyacc/nostdin.output	Fri Jul 25 10:35:00 2014	(r271358)
@@ -4,7 +4,6 @@
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives

Modified: soc2014/op/freebsd-base/contrib/byacc/test/run_test.sh
==============================================================================
--- soc2014/op/freebsd-base/contrib/byacc/test/run_test.sh	Fri Jul 25 06:53:20 2014	(r271357)
+++ soc2014/op/freebsd-base/contrib/byacc/test/run_test.sh	Fri Jul 25 10:35:00 2014	(r271358)
@@ -1,7 +1,9 @@
 #!/bin/sh
-# $Id: run_test.sh,v 1.22 2014/04/09 11:00:45 tom Exp $
+# $Id: run_test.sh,v 1.24 2014/07/15 19:21:10 tom Exp $
 # vi:ts=4 sw=4:
 
+errors=0
+
 # NEW is the file created by the testcase
 # REF is the reference file against which to compare
 test_diffs() {
@@ -11,13 +13,15 @@
 	if test ! -f $CMP
 	then
 		echo "...not found $CMP"
+		errors=1
 	else
 		sed	-e s,$NEW,$REF, \
-			-e "s%$YACC%YACC%" \
+			-e "s%$YACC_escaped%YACC%" \
 			-e '/YYPATCH/s/[0-9][0-9]*/"yyyymmdd"/' \
 			-e '/#define YYPATCH/s/PATCH/CHECK/' \
 			-e 's,#line \([1-9][0-9]*\) "'$REF_DIR'/,#line \1 ",' \
 			-e 's,#line \([1-9][0-9]*\) "'$TEST_DIR'/,#line \1 ",' \
+			-e 's,\(YACC:.* line [0-9][0-9]* of "\)'$TEST_DIR/',\1./,' \
 			< $CMP >$tmpfile \
 			&& mv $tmpfile $CMP
 		if test ! -f $REF
@@ -31,6 +35,7 @@
 		else

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