svn commit: r306711 - in user/alc/PQ_LAUNDRY: contrib/blacklist/libexec contrib/byacc contrib/byacc/package contrib/byacc/package/debian contrib/byacc/package/pkgsrc contrib/byacc/test contrib/byac...

Alan Cox alc at FreeBSD.org
Wed Oct 5 17:26:34 UTC 2016 

Author: alc
Date: Wed Oct  5 17:26:32 2016
New Revision: 306711
URL: https://svnweb.freebsd.org/changeset/base/306711

Log:
  MFH r306655-306707
  
  Note: Due to differences in vm_pageout_scan() between HEAD and the
  PQ_LAUNDRY branch, this merge required manual conflict resolution.

Added:
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_read_format_mtree_crash747.c
     - copied unchanged from r306707, head/contrib/libarchive/libarchive/test/test_read_format_mtree_crash747.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_read_format_mtree_crash747.mtree.bz2.uu
     - copied unchanged from r306707, head/contrib/libarchive/libarchive/test/test_read_format_mtree_crash747.mtree.bz2.uu
  user/alc/PQ_LAUNDRY/lib/libcapsicum/
     - copied from r306707, head/lib/libcapsicum/
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslhelp.c
     - copied unchanged from r306707, head/sys/contrib/dev/acpica/compiler/aslhelp.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslhelpers.y
     - copied unchanged from r306707, head/sys/contrib/dev/acpica/compiler/aslhelpers.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslkeywords.y
     - copied unchanged from r306707, head/sys/contrib/dev/acpica/compiler/aslkeywords.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslprimaries.y
     - copied unchanged from r306707, head/sys/contrib/dev/acpica/compiler/aslprimaries.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c
     - copied unchanged from r306707, head/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/platform/acgccex.h
     - copied unchanged from r306707, head/sys/contrib/dev/acpica/include/platform/acgccex.h
  user/alc/PQ_LAUNDRY/sys/mips/atheros/ar531x/
     - copied from r306707, head/sys/mips/atheros/ar531x/
Deleted:
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utprint.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/os_specific/service_layers/oslibcfs.c
Modified:
  user/alc/PQ_LAUNDRY/contrib/blacklist/libexec/blacklistd-helper
  user/alc/PQ_LAUNDRY/contrib/byacc/CHANGES
  user/alc/PQ_LAUNDRY/contrib/byacc/MANIFEST
  user/alc/PQ_LAUNDRY/contrib/byacc/VERSION
  user/alc/PQ_LAUNDRY/contrib/byacc/aclocal.m4
  user/alc/PQ_LAUNDRY/contrib/byacc/btyaccpar.c
  user/alc/PQ_LAUNDRY/contrib/byacc/btyaccpar.skel
  user/alc/PQ_LAUNDRY/contrib/byacc/configure
  user/alc/PQ_LAUNDRY/contrib/byacc/defs.h
  user/alc/PQ_LAUNDRY/contrib/byacc/error.c
  user/alc/PQ_LAUNDRY/contrib/byacc/lalr.c
  user/alc/PQ_LAUNDRY/contrib/byacc/lr0.c
  user/alc/PQ_LAUNDRY/contrib/byacc/mkpar.c
  user/alc/PQ_LAUNDRY/contrib/byacc/output.c
  user/alc/PQ_LAUNDRY/contrib/byacc/package/byacc.spec
  user/alc/PQ_LAUNDRY/contrib/byacc/package/debian/changelog
  user/alc/PQ_LAUNDRY/contrib/byacc/package/mingw-byacc.spec
  user/alc/PQ_LAUNDRY/contrib/byacc/package/pkgsrc/Makefile
  user/alc/PQ_LAUNDRY/contrib/byacc/reader.c
  user/alc/PQ_LAUNDRY/contrib/byacc/skel2c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/btyacc_demo.error
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/btyacc_demo.output
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/btyacc_demo.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/calc.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/calc1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/calc2.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/calc3.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/code_calc.code.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/code_calc.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/code_calc.tab.h
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/code_error.code.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/empty.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_inherit1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_inherit2.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_inherit3.output
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_inherit3.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_inherit4.output
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_inherit4.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_inherit5.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax10.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax11.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax12.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax13.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax14.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax15.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax16.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax17.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax18.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax19.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax2.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax20.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax21.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax22.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax23.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax24.error
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax24.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax25.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax26.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax27.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax3.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax4.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax5.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax6.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax7.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax7a.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax7b.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax8.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax8a.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/err_syntax9.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/error.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/grammar.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/inherit0.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/inherit1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/inherit2.output
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/inherit2.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/ok_syntax1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/pure_calc.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/pure_error.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/quote_calc-s.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/quote_calc.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/quote_calc2.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/quote_calc3.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/quote_calc4.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/rename_debug.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/code_calc.y
  user/alc/PQ_LAUNDRY/contrib/byacc/test/err_inherit4.y
  user/alc/PQ_LAUNDRY/contrib/byacc/test/run_make.sh
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/calc.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/calc1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/calc2.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/calc3.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/code_calc.code.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/code_calc.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/code_calc.tab.h
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/code_error.code.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/empty.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/err_syntax10.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/err_syntax11.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/err_syntax12.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/err_syntax18.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/err_syntax20.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/err_syntax24.error
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/error.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/grammar.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/ok_syntax1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/pure_calc.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/pure_error.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/quote_calc-s.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/quote_calc.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/quote_calc2-s.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/quote_calc2.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/quote_calc3-s.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/quote_calc3.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/quote_calc4-s.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/quote_calc4.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/rename_debug.c
  user/alc/PQ_LAUNDRY/contrib/byacc/test/yacc/varsyntax_calc1.tab.c
  user/alc/PQ_LAUNDRY/contrib/byacc/verbose.c
  user/alc/PQ_LAUNDRY/contrib/byacc/yaccpar.c
  user/alc/PQ_LAUNDRY/contrib/byacc/yaccpar.skel
  user/alc/PQ_LAUNDRY/contrib/libarchive/cat/test/main.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/cat/test/test.h
  user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/main.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/test.h
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_support_format_7zip.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/main.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_read_set_format.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/subst.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/main.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test.h
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test_option_H_upper.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test_option_L_upper.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test_option_U_upper.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test_option_n.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/write.c
  user/alc/PQ_LAUNDRY/etc/periodic/security/520.pfdenied
  user/alc/PQ_LAUNDRY/lib/Makefile
  user/alc/PQ_LAUNDRY/lib/libarchive/tests/Makefile
  user/alc/PQ_LAUNDRY/lib/libcasper/libcasper/libcasper.3
  user/alc/PQ_LAUNDRY/sbin/pfctl/parse.y
  user/alc/PQ_LAUNDRY/sbin/pfctl/pfctl_parser.c
  user/alc/PQ_LAUNDRY/share/man/man5/pf.conf.5
  user/alc/PQ_LAUNDRY/sys/amd64/amd64/mp_machdep.c
  user/alc/PQ_LAUNDRY/sys/amd64/include/pcpu.h
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/std.allwinner
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/std.allwinner_up
  user/alc/PQ_LAUNDRY/sys/arm/altera/socfpga/std.socfpga
  user/alc/PQ_LAUNDRY/sys/arm/amlogic/aml8726/std.aml8726
  user/alc/PQ_LAUNDRY/sys/arm/annapurna/alpine/std.alpine
  user/alc/PQ_LAUNDRY/sys/arm/arm/cpufunc.c
  user/alc/PQ_LAUNDRY/sys/arm/arm/cpuinfo.c
  user/alc/PQ_LAUNDRY/sys/arm/arm/elf_trampoline.c
  user/alc/PQ_LAUNDRY/sys/arm/arm/generic_timer.c
  user/alc/PQ_LAUNDRY/sys/arm/arm/machdep.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/std.bcm2836
  user/alc/PQ_LAUNDRY/sys/arm/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/std.imx51
  user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/std.imx53
  user/alc/PQ_LAUNDRY/sys/arm/freescale/imx/std.imx6
  user/alc/PQ_LAUNDRY/sys/arm/freescale/vybrid/std.vybrid
  user/alc/PQ_LAUNDRY/sys/arm/include/atomic-v6.h
  user/alc/PQ_LAUNDRY/sys/arm/include/cpuconf.h
  user/alc/PQ_LAUNDRY/sys/arm/include/cpufunc.h
  user/alc/PQ_LAUNDRY/sys/arm/include/cpuinfo.h
  user/alc/PQ_LAUNDRY/sys/arm/include/intr.h
  user/alc/PQ_LAUNDRY/sys/arm/mv/armada38x/std.armada38x
  user/alc/PQ_LAUNDRY/sys/arm/nvidia/tegra124/std.tegra124
  user/alc/PQ_LAUNDRY/sys/arm/nvidia/tegra_pcie.c
  user/alc/PQ_LAUNDRY/sys/arm/qemu/std.virt
  user/alc/PQ_LAUNDRY/sys/arm/rockchip/std.rk30xx
  user/alc/PQ_LAUNDRY/sys/arm/samsung/exynos/std.exynos5250
  user/alc/PQ_LAUNDRY/sys/arm/samsung/exynos/std.exynos5420
  user/alc/PQ_LAUNDRY/sys/arm/ti/am335x/std.am335x
  user/alc/PQ_LAUNDRY/sys/arm/ti/omap4/std.omap4
  user/alc/PQ_LAUNDRY/sys/arm/ti/std.ti
  user/alc/PQ_LAUNDRY/sys/arm/xilinx/std.zynq7
  user/alc/PQ_LAUNDRY/sys/arm64/acpica/OsdEnvironment.c
  user/alc/PQ_LAUNDRY/sys/boot/geli/geliboot.c
  user/alc/PQ_LAUNDRY/sys/cam/scsi/scsi_all.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/alc/PQ_LAUNDRY/sys/conf/Makefile.arm
  user/alc/PQ_LAUNDRY/sys/conf/files
  user/alc/PQ_LAUNDRY/sys/conf/files.arm
  user/alc/PQ_LAUNDRY/sys/conf/options.arm
  user/alc/PQ_LAUNDRY/sys/conf/options.mips
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/acpica_prep.sh
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/changes.txt
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/acfileio.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/acgetline.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/adisasm.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/ahtable.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/cmfsize.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/dmtable.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/dmtables.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/dmtbdump.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/dmtbinfo.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/common/getopt.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslcompiler.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslcstyle.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslmain.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslmaputils.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/asloperands.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslopt.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/asloptions.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslparser.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslresources.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslrules.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslstubs.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/asltokens.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/asltypes.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslutils.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/aslxref.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/dtcompiler.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/dtfield.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/dtparser.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/dttable.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/dttemplate.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/dtutils.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/compiler/prparser.y
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/debugger/dbexec.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/debugger/dbinput.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/events/evgpe.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/events/evgpeinit.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/events/evrgnini.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/events/evxfgpe.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/executer/exconcat.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/executer/exconfig.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/executer/exconvrt.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/executer/exmisc.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/executer/exoparg1.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/executer/exresop.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/executer/extrace.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/executer/exutils.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/namespace/nsload.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/namespace/nsparse.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/namespace/nsutils.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/parser/psparse.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/parser/psxface.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/tables/tbdata.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/tables/tbfadt.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/tables/tbfind.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/tables/tbinstal.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/tables/tbutils.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/tables/tbxface.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/tables/tbxfload.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utaddress.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utdebug.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/uthex.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utinit.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utnonansi.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utosi.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utpredef.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/uttrack.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utxface.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/components/utilities/utxfinit.c
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acapps.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acclib.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acconfig.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acdebug.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acdisasm.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acevents.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acglobal.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/aclocal.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acnamesp.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acparser.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acpiosxf.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acpixf.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/actables.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/actbl.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/actypes.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/acutils.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/platform/acenv.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/platform/acenvex.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/include/platform/acgcc.h
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  user/alc/PQ_LAUNDRY/sys/dev/acpica/Osd/OsdTable.c
  user/alc/PQ_LAUNDRY/sys/dev/atkbdc/psm.c
  user/alc/PQ_LAUNDRY/sys/geom/geom_redboot.c
  user/alc/PQ_LAUNDRY/sys/i386/include/pcpu.h
  user/alc/PQ_LAUNDRY/sys/kern/imgact_elf.c
  user/alc/PQ_LAUNDRY/sys/kern/inflate.c
  user/alc/PQ_LAUNDRY/sys/kern/vfs_subr.c
  user/alc/PQ_LAUNDRY/sys/netpfil/pf/pf.c
  user/alc/PQ_LAUNDRY/sys/netpfil/pf/pf_ioctl.c
  user/alc/PQ_LAUNDRY/sys/powerpc/mpc85xx/platform_mpc85xx.c
  user/alc/PQ_LAUNDRY/sys/vm/vm_pageout.c
  user/alc/PQ_LAUNDRY/sys/x86/acpica/OsdEnvironment.c
  user/alc/PQ_LAUNDRY/sys/x86/acpica/madt.c
  user/alc/PQ_LAUNDRY/sys/x86/acpica/srat.c
  user/alc/PQ_LAUNDRY/sys/x86/include/x86_smp.h
  user/alc/PQ_LAUNDRY/sys/x86/x86/mp_x86.c
  user/alc/PQ_LAUNDRY/sys/x86/xen/pvcpu_enum.c
  user/alc/PQ_LAUNDRY/usr.sbin/acpi/acpidb/Makefile
  user/alc/PQ_LAUNDRY/usr.sbin/acpi/iasl/Makefile
Directory Properties:
  user/alc/PQ_LAUNDRY/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/byacc/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/libarchive/   (props changed)
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/   (props changed)
  user/alc/PQ_LAUNDRY/sys/contrib/dev/acpica/   (props changed)

Modified: user/alc/PQ_LAUNDRY/contrib/blacklist/libexec/blacklistd-helper
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/blacklist/libexec/blacklistd-helper	Wed Oct  5 17:18:24 2016	(r306710)
+++ user/alc/PQ_LAUNDRY/contrib/blacklist/libexec/blacklistd-helper	Wed Oct  5 17:26:32 2016	(r306711)
@@ -19,8 +19,8 @@ fi
 if [ -z "$pf" ]; then
 	for f in npf pf ipf; do
 		if [ -f "/etc/$f.conf" ]; then
-			pf="$f"
-			break
+		    pf="$f"
+		    break
 		fi
 	done
 fi
@@ -54,8 +54,8 @@ add)
 	ipf)
 		/sbin/ipfstat -io | /sbin/ipf -I -f - >/dev/null 2>&1
 		echo block in quick $proto from $addr/$mask to \
-			any port=$6 head port$6 | \
-			/sbin/ipf -I -f - -s >/dev/null 2>&1
+		    any port=$6 head port$6 | \
+		    /sbin/ipf -I -f - -s >/dev/null 2>&1 && echo OK
 		;;
 	ipfw)
 		# use $ipfw_offset+$port for rule number
@@ -64,17 +64,21 @@ add)
 		/sbin/ipfw table $tname create type addr 2>/dev/null
 		/sbin/ipfw -q table $tname add "$addr/$mask"
 		/sbin/ipfw -q add $rule drop $3 from "table("$tname")" to \
-			any dst-port $6
+		    any dst-port $6 && echo OK
 		;;
 	npf)
 		/sbin/npfctl rule "$2" add block in final $proto from \
 		    "$addr/$mask" to any $port
 		;;
 	pf)
-		# insert $ip/$mask into per-protocol anchored table
-		/sbin/pfctl -a "$2" -t "port$6" -T add "$addr/$mask"
-		echo "block in quick $proto from <port$6> to any $port" | \
-		    /sbin/pfctl -a "$2" -f -
+		# if the filtering rule does not exist, create it
+		/sbin/pfctl -a "$2/$6" -sr 2>/dev/null | \
+		    grep -q "<port$6>" || \
+		    echo "block in quick $proto from <port$6> to any $port" | \
+		    /sbin/pfctl -a "$2/$6" -f -
+		# insert $ip/$mask into per-protocol/port anchored table
+		/sbin/pfctl -a "$2/$6" -t "port$6" -T add "$addr/$mask" && \
+		    echo OK
 		;;
 	esac
 	;;
@@ -83,33 +87,35 @@ rem)
 	ipf)
 		/sbin/ipfstat -io | /sbin/ipf -I -f - >/dev/null 2>&1
 		echo block in quick $proto from $addr/$mask to \
-			any port=$6 head port$6 | \
-			/sbin/ipf -I -r -f - -s >/dev/null 2>&1
+		    any port=$6 head port$6 | \
+		    /sbin/ipf -I -r -f - -s >/dev/null 2>&1 && echo OK
 		;;
 	ipfw)
-		/sbin/ipfw table "port$6" delete "$addr/$mask" 2>/dev/null
+		/sbin/ipfw table "port$6" delete "$addr/$mask" 2>/dev/null && \
+		    echo OK
 		;;
 	npf)
 		/sbin/npfctl rule "$2" rem-id "$7"
 		;;
 	pf)
-		/sbin/pfctl -a "$2" -t "port$6" -T delete "$addr/$mask"
+		/sbin/pfctl -a "$2/$6" -t "port$6" -T delete "$addr/$mask" && \
+		    echo OK
 		;;
 	esac
 	;;
 flush)
 	case "$pf" in
 	ipf)
-		/sbin/ipf -Z -I -Fi -s > /dev/null
+		/sbin/ipf -Z -I -Fi -s > /dev/null && echo OK
 		;;
 	ipfw)
-		/sbin/ipfw table "port$6" flush 2>/dev/null
+		/sbin/ipfw table "port$6" flush 2>/dev/null && echo OK
 		;;
 	npf)
 		/sbin/npfctl rule "$2" flush
 		;;
 	pf)
-		/sbin/pfctl -a "$2" -t "port$6" -T flush
+		/sbin/pfctl -a "$2/$6" -t "port$6" -T flush && echo OK
 		;;
 	esac
 	;;

Modified: user/alc/PQ_LAUNDRY/contrib/byacc/CHANGES
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/byacc/CHANGES	Wed Oct  5 17:18:24 2016	(r306710)
+++ user/alc/PQ_LAUNDRY/contrib/byacc/CHANGES	Wed Oct  5 17:26:32 2016	(r306711)
@@ -1,3 +1,82 @@
+2016-06-06  Thomas E. Dickey  <tom at invisible-island.net>
+
+	* configure: regen
+
+	* aclocal.m4: improved autoconf macros:
+	CF_CC_ENV_FLAGS - don't limit the check to -I, -U and -D options, since the
+		added options can include various compiler options before and after
+		preprocessor options.
+	CF_PROG_LINT - add cpplint to programs to use; drop ad hoc tdlint and alint.
+
+	* VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+	bump
+
+	* lalr.c: indented
+
+	* btyaccpar.c: regen
+
+	* skel2c:
+	adjust whitespace so that generated skeleton will follow the same format
+	as other code
+
+	* mkpar.c, verbose.c, lr0.c, reader.c, error.c, output.c: indented
+
+	* reader.c: fix two compiler warnings
+
+	* test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c,
  test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/rename_debug.c, btyaccpar.c, test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/rename_debug.c, yaccpar.c:
+	regen
+
+2016-06-06  Tom.Shields
+
+	* btyaccpar.skel, yaccpar.skel:
+	small fix for an edge case of initialized data in Chris Dodd's btyacc changes:
+	"Avoid crash when input pops up an Action error at the first token"
+
+2016-06-01  Thomas E. Dickey  <tom at invisible-island.net>
+
+	* test/yacc/quote_calc2-s.tab.c, test/yacc/quote_calc3-s.tab.c, test/yacc/quote_calc3.tab.c, test/yacc/quote_calc4-s.tab.c, test/yacc/quote_calc4.tab.c, test/yacc/varsyntax_calc1.tab.c, test/yacc/err_syntax18.tab.c, test/yacc/err_syntax20.tab.c, test/yacc/err_syntax24.error, test/yacc/error.tab.c, test/yacc/grammar.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/pure_calc.tab.c, test/yacc/pure_error.tab.c, test/yacc/quote_calc-s.tab.c, test/yacc/quote_calc.tab.c, test/yacc/quote_calc2.tab.c, test/yacc/calc.tab.c, test/yacc/calc1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/yacc/code_calc.code.c, test/yacc/code_calc.tab.c, test/yacc/code_calc.tab.h, test/yacc/code_error.code.c, test/yacc/empty.tab.c, test/yacc/err_syntax10.tab.c, test/yacc/err_syntax11.tab.c, test/yacc/err_syntax12.tab.c, test/yacc/rename_debug.c, yaccpar.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-
 s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c, test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.error, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, te
 st/btyacc/error.tab.c, test/btyacc/grammar.t!
 ab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.output, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.error, test/btyacc/btyacc_demo.output, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_calc.tab.c, test/btyacc/code_calc.tab.h, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit3.output, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.output, test/btyacc/err_inherit4.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.t
 ab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/rename_debug.c, btyaccpar.c:
+	regen
+
+2016-06-01  Tom.Shields
+
+	* btyaccpar.skel, defs.h, error.c, output.c, reader.c, test/code_calc.y, test/err_inherit4.y, test/run_make.sh, yaccpar.skel:
+	fixes for issues in btyacc (report by Francis Andre):
+
+	+ correction to the placement of the #line directive for a %union specification
+
+	+ recovery of a set of casts originally added into btyaccpar.c rather than into
+	  btyaccpar.skel, and so are lost whenever building from scratch
+
+	+ Chris Dodd's btyacc improved handling of inherited attributes to eliminate
+	  implicit empty copy rules that are not necessary, and thereby avoiding the
+	  introduction of extra parsing ambiguity
+
+	+ Chris Dodd's added support for @-N syntax to reference inherited position
+	  information
+
+	+ correction to bad interaction between %token-table and YYDEBUG, where YYDEBUG
+	  was required to be defined in order to compile the generated code
+
+	+ correction to yyname[] access in code included with YYDEBUG defined for
+	  single character symbols not recognized (e.g., input containing '&' character
+	  where grammar doesn't define that as a symbol) - map to existing
+	  "illegal-symbol" entry in byname[]
+
+	+ fixes to test/run_make.sh:  skip test-err_* files; in the bison test phase
+	  skip additional files that contain features not supported by bison and
+	  inhibit new bison warning messages
+
+	+ minor changes to btyaccpar.skel & yaccpar.skel so they are more similar in
+	  their commonality; makes it easier to maintain the pair of files using
+	  vimdiff
+
+	+ changes to a couple of test cases for coverage of #3, #4 and #5 above
+
+2016-06-01  Thomas E. Dickey  <tom at invisible-island.net>
+
+	* VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+	bump
+
 2016-03-24  Thomas E. Dickey  <tom at invisible-island.net>
 
 	* reader.c: unused variable

Modified: user/alc/PQ_LAUNDRY/contrib/byacc/MANIFEST
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/byacc/MANIFEST	Wed Oct  5 17:18:24 2016	(r306710)
+++ user/alc/PQ_LAUNDRY/contrib/byacc/MANIFEST	Wed Oct  5 17:26:32 2016	(r306711)
@@ -1,4 +1,4 @@
-MANIFEST for byacc-20160324, version t20160324
+MANIFEST for byacc-20160606, version t20160606
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 ACKNOWLEDGEMENTS                original version of byacc - 1993

Modified: user/alc/PQ_LAUNDRY/contrib/byacc/VERSION
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/byacc/VERSION	Wed Oct  5 17:18:24 2016	(r306710)
+++ user/alc/PQ_LAUNDRY/contrib/byacc/VERSION	Wed Oct  5 17:26:32 2016	(r306711)
@@ -1 +1 @@
-20160324
+20160606

Modified: user/alc/PQ_LAUNDRY/contrib/byacc/aclocal.m4
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/byacc/aclocal.m4	Wed Oct  5 17:18:24 2016	(r306710)
+++ user/alc/PQ_LAUNDRY/contrib/byacc/aclocal.m4	Wed Oct  5 17:26:32 2016	(r306711)
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.39 2016/03/25 00:06:44 tom Exp $
+dnl $Id: aclocal.m4,v 1.40 2016/06/07 00:48:07 tom Exp $
 dnl Macros for byacc configure script (Thomas E. Dickey)
 dnl ---------------------------------------------------------------------------
 dnl Copyright 2004-2015,2016 Thomas E. Dickey
@@ -171,11 +171,15 @@ ifelse([$3],,[    :]dnl
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CC_ENV_FLAGS version: 2 updated: 2015/04/12 15:39:00
+dnl CF_CC_ENV_FLAGS version: 3 updated: 2016/05/21 18:10:17
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl into CC.  This will not help with broken scripts that wrap the compiler with
 dnl options, but eliminates a more common category of user confusion.
+dnl
+dnl Caveat: this also disallows blanks in the pathname for the compiler, but
+dnl the nuisance of having inconsistent settings for compiler and preprocessor
+dnl outweighs that limitation.
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC
@@ -183,13 +187,16 @@ AC_DEFUN([CF_CC_ENV_FLAGS],
 
 AC_MSG_CHECKING(\$CC variable)
 case "$CC" in
-(*[[\ \	]]-[[IUD]]*)
+(*[[\ \	]]-*)
 	AC_MSG_RESULT(broken)
 	AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
 	# humor him...
-	cf_flags=`echo "$CC" | sed -e 's/^[[^ 	]]*[[ 	]]//'`
+	cf_flags=`echo "$CC" | sed -e 's/^[[^ 	]]*[[ 	]][[ 	]]*//'`
 	CC=`echo "$CC" | sed -e 's/[[ 	]].*//'`
 	CF_ADD_CFLAGS($cf_flags)
+	CF_VERBOSE(resulting CC: '$CC')
+	CF_VERBOSE(resulting CFLAGS: '$CFLAGS')
+	CF_VERBOSE(resulting CPPFLAGS: '$CPPFLAGS')
 	;;
 (*)
 	AC_MSG_RESULT(ok)
@@ -1010,11 +1017,11 @@ AC_SUBST(GROFF_NOTE)
 AC_SUBST(NROFF_NOTE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14
+dnl CF_PROG_LINT version: 3 updated: 2016/05/22 15:25:54
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
-AC_CHECK_PROGS(LINT, tdlint lint alint splint lclint)
+AC_CHECK_PROGS(LINT, lint cppcheck splint)
 AC_SUBST(LINT_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------

Modified: user/alc/PQ_LAUNDRY/contrib/byacc/btyaccpar.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/byacc/btyaccpar.c	Wed Oct  5 17:18:24 2016	(r306710)
+++ user/alc/PQ_LAUNDRY/contrib/byacc/btyaccpar.c	Wed Oct  5 17:26:32 2016	(r306711)
@@ -2,7 +2,7 @@
  * @Id: skel2c,v 1.3 2014/04/06 19:48:04 tom Exp @
  */
 
-/* @Id: btyaccpar.skel,v 1.1 2014/04/02 22:44:41 tom Exp @ */
+/* @Id: btyaccpar.skel,v 1.3 2016/06/06 23:35:55 Tom.Shields Exp @ */
 
 #include "defs.h"
 
@@ -18,7 +18,7 @@ const char *const banner[] =
 {
     "/* original parser id follows */",
     "/* yysccsid[] = \"@(#)yaccpar	1.9 (Berkeley) 02/21/93\" */",
-    "/* (use YYMAJOR/YYMINOR for ifdefs dependent of parser version) */",
+    "/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */",
     "",
     "#define YYBYACC 1",
     CONCAT1("#define YYMAJOR ", YYMAJOR),
@@ -66,8 +66,10 @@ const char *const tables[] =
     "#endif /* YYBTYACC */",
 #endif			/* defined(YYBTYACC) */
     "",
-    "#if YYDEBUG",
+    "#if YYDEBUG || defined(yytname)",
     "extern const char *const yyname[];",
+    "#endif",
+    "#if YYDEBUG",
     "extern const char *const yyrule[];",
     "#endif",
     0
@@ -148,9 +150,9 @@ const char *const hdr_defs[] =
     "",
     "typedef struct {",
     "    unsigned stacksize;",
-    "    short    *s_base;",
-    "    short    *s_mark;",
-    "    short    *s_last;",
+    "    YYINT    *s_base;",
+    "    YYINT    *s_mark;",
+    "    YYINT    *s_last;",
     "    YYSTYPE  *l_base;",
     "    YYSTYPE  *l_mark;",
     "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -293,18 +295,18 @@ const char *const body_1[] =
 #endif			/* defined(YYBTYACC) */
     "",
     "#if YYDEBUG",
-    "#include <stdio.h>         /* needed for printf */",
+    "#include <stdio.h>	/* needed for printf */",
     "#endif",
     "",
-    "#include <stdlib.h>        /* needed for malloc, etc */",
-    "#include <string.h>        /* needed for memset */",
+    "#include <stdlib.h>	/* needed for malloc, etc */",
+    "#include <string.h>	/* needed for memset */",
     "",
     "/* allocate initial stack or double stack size, up to YYMAXDEPTH */",
     "static int yygrowstack(YYSTACKDATA *data)",
     "{",
     "    int i;",
     "    unsigned newsize;",
-    "    short *newss;",
+    "    YYINT *newss;",
     "    YYSTYPE *newvs;",
     "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
     "    YYLTYPE *newps;",
@@ -318,7 +320,7 @@ const char *const body_1[] =
     "        newsize = YYMAXDEPTH;",
     "",
     "    i = (int) (data->s_mark - data->s_base);",
-    "    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));",
+    "    newss = (YYINT *)realloc(data->s_base, newsize * sizeof(*newss));",
     "    if (newss == 0)",
     "        return YYENOMEM;",
     "",
@@ -383,7 +385,7 @@ const char *const body_1[] =
     "#endif",
     "        return p;",
     "    }",
-    "    p->yystack.s_base    = (short *) malloc(size * sizeof(short));",
+    "    p->yystack.s_base    = (YYINT *) malloc(size * sizeof(YYINT));",
     "    if (p->yystack.s_base == NULL) return NULL;",
     "    p->yystack.l_base    = (YYSTYPE *) malloc(size * sizeof(YYSTYPE));",
     "    if (p->yystack.l_base == NULL) return NULL;",
@@ -455,6 +457,8 @@ const char *const body_2[] =
     "    yyps->save = 0;",
     "#endif /* YYBTYACC */",
 #endif			/* defined(YYBTYACC) */
+    "    yym = 0;",
+    "    yyn = 0;",
     "    yynerrs = 0;",
     "    yyerrflag = 0;",
     "    yychar = YYEMPTY;",
@@ -532,11 +536,10 @@ const char *const body_2[] =
     "#endif /* YYBTYACC */",
 #endif			/* defined(YYBTYACC) */
     "        if (yychar < 0) yychar = YYEOF;",
-    "        /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */",
     "#if YYDEBUG",
     "        if (yydebug)",
     "        {",
-    "            yys = yyname[YYTRANSLATE(yychar)];",
+    "            if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];",
     "            fprintf(stderr, \"%s[%d]: state %d, reading token %d (%s)\",",
     "                            YYDEBUGSTR, yydepth, yystate, yychar, yys);",
     "#ifdef YYSTYPE_TOSTRING",
@@ -598,7 +601,7 @@ const char *const body_2[] =
     "            save->state           = yystate;",
     "            save->errflag         = yyerrflag;",
     "            save->yystack.s_mark  = save->yystack.s_base + (yystack.s_mark - yystack.s_base);",
-    "            memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+    "            memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));",
     "            save->yystack.l_mark  = save->yystack.l_base + (yystack.l_mark - yystack.l_base);",
     "            memcpy (save->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
     "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -679,7 +682,7 @@ const char *const body_2[] =
     "            if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)",
     "                goto yyoverflow;",
     "            yystate = yyctable[ctry];",
-    "            *++yystack.s_mark = (short) yystate;",
+    "            *++yystack.s_mark = (YYINT) yystate;",
     "            *++yystack.l_mark = yylval;",
     "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
     "            *++yystack.p_mark = yylloc;",
@@ -727,9 +730,18 @@ const char *const body_2[] =
     "",
     "    yynewerrflag = 1;",
     "    goto yyerrhandler;",
-    "    goto yyerrlab;",
+    "    goto yyerrlab; /* redundant goto avoids 'unused label' warning */",
     "",
     "yyerrlab:",
+    "    /* explicit YYERROR from an action -- pop the rhs of the rule reduced",
+    "     * before looking for error recovery */",
+    "    yystack.s_mark -= yym;",
+    "    yystate = *yystack.s_mark;",
+    "    yystack.l_mark -= yym;",
+    "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
+    "    yystack.p_mark -= yym;",
+    "#endif",
+    "",
     "    yynewerrflag = 0;",
     "yyerrhandler:",
     "    while (yyps->save)",
@@ -754,7 +766,7 @@ const char *const body_2[] =
     "            yyerrctx->state          = yystate;",
     "            yyerrctx->errflag        = yyerrflag;",
     "            yyerrctx->yystack.s_mark = yyerrctx->yystack.s_base + (yystack.s_mark - yystack.s_base);",
-    "            memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+    "            memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));",
     "            yyerrctx->yystack.l_mark = yyerrctx->yystack.l_base + (yystack.l_mark - yystack.l_base);",
     "            memcpy (yyerrctx->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
     "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -770,7 +782,7 @@ const char *const body_2[] =
     "        yylexp         = yylexemes + save->lexeme;",
     "        yychar         = YYEMPTY;",
     "        yystack.s_mark = yystack.s_base + (save->yystack.s_mark - save->yystack.s_base);",
-    "        memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+    "        memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));",
     "        yystack.l_mark = yystack.l_base + (save->yystack.l_mark - save->yystack.l_base);",
     "        memcpy (yystack.l_base, save->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
     "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -805,7 +817,7 @@ const char *const body_2[] =
     "            yylloc         = yylpp[-1];",
     "#endif",
     "            yystack.s_mark = yystack.s_base + (yyerrctx->yystack.s_mark - yyerrctx->yystack.s_base);",
-    "            memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+    "            memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));",
     "            yystack.l_mark = yystack.l_base + (yyerrctx->yystack.l_mark - yyerrctx->yystack.l_base);",
     "            memcpy (yystack.l_base, yyerrctx->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
     "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -828,7 +840,7 @@ const char *const body_2[] =
     "#endif",
     "",
     "#if !YYBTYACC",
-    "    goto yyerrlab;",
+    "    goto yyerrlab; /* redundant goto avoids 'unused label' warning */",
     "yyerrlab:",
     "#endif",
     "    ++yynerrs;",
@@ -899,7 +911,7 @@ const char *const body_2[] =
     "#if YYDEBUG",
     "        if (yydebug)",
     "        {",
-    "            yys = yyname[YYTRANSLATE(yychar)];",
+    "            if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];",
     "            fprintf(stderr, \"%s[%d]: state %d, error recovery discarding token %d (%s)\\n\",",
     "                            YYDEBUGSTR, yydepth, yystate, yychar, yys);",
     "        }",
@@ -1070,12 +1082,11 @@ const char *const trailer[] =
     "#endif /* YYBTYACC */",
 #endif			/* defined(YYBTYACC) */
     "            if (yychar < 0) yychar = YYEOF;",
-    "            /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */",
     "#if YYDEBUG",
     "            if (yydebug)",
     "            {",
-    "                yys = yyname[YYTRANSLATE(yychar)];",
-    "                fprintf(stderr, \"%s[%d]: state %d, reading %d (%s)\\n\",",
+    "                if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];",
+    "                fprintf(stderr, \"%s[%d]: state %d, reading token %d (%s)\\n\",",
     "                                YYDEBUGSTR, yydepth, YYFINAL, yychar, yys);",
     "            }",
     "#endif",
@@ -1104,7 +1115,7 @@ const char *const trailer[] =
     "    }",
     "#endif",
     "    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;",
-    "    *++yystack.s_mark = (short) yystate;",
+    "    *++yystack.s_mark = (YYINT) yystate;",
     "    *++yystack.l_mark = yyval;",
     "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
     "    *++yystack.p_mark = yyloc;",
@@ -1140,7 +1151,7 @@ const char *const trailer[] =
     "    yylexp         = yylexemes + yypath->lexeme;",
     "    yychar         = YYEMPTY;",
     "    yystack.s_mark = yystack.s_base + (yypath->yystack.s_mark - yypath->yystack.s_base);",
-    "    memcpy (yystack.s_base, yypath->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+    "    memcpy (yystack.s_base, yypath->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));",
     "    yystack.l_mark = yystack.l_base + (yypath->yystack.l_mark - yypath->yystack.l_base);",
     "    memcpy (yystack.l_base, yypath->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
     "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",

Modified: user/alc/PQ_LAUNDRY/contrib/byacc/btyaccpar.skel
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/byacc/btyaccpar.skel	Wed Oct  5 17:18:24 2016	(r306710)
+++ user/alc/PQ_LAUNDRY/contrib/byacc/btyaccpar.skel	Wed Oct  5 17:26:32 2016	(r306711)
@@ -1,4 +1,4 @@
-/* $Id: btyaccpar.skel,v 1.1 2014/04/02 22:44:41 tom Exp $ */
+/* $Id: btyaccpar.skel,v 1.3 2016/06/06 23:35:55 Tom.Shields Exp $ */
 
 #include "defs.h"
 
@@ -45,8 +45,10 @@ extern const YYINT yycheck[];
 extern const YYINT yyctable[];
 %%endif
 
-#if YYDEBUG
+#if YYDEBUG || defined(yytname)
 extern const char *const yyname[];
+#endif
+#if YYDEBUG
 extern const char *const yyrule[];
 #endif
 %% global_vars
@@ -113,9 +115,9 @@ do \
 
 typedef struct {
     unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
+    YYINT    *s_base;
+    YYINT    *s_mark;
+    YYINT    *s_last;
     YYSTYPE  *l_base;
     YYSTYPE  *l_mark;
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
@@ -238,7 +240,7 @@ static short  *yylexemes = 0;
 %%endif
 
 #if YYDEBUG
-#include <stdio.h>		/* needed for printf */
+#include <stdio.h>	/* needed for printf */
 #endif
 
 #include <stdlib.h>	/* needed for malloc, etc */
@@ -249,7 +251,7 @@ static int yygrowstack(YYSTACKDATA *data
 {
     int i;
     unsigned newsize;
-    short *newss;
+    YYINT *newss;
     YYSTYPE *newvs;
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
     YYLTYPE *newps;
@@ -263,7 +265,7 @@ static int yygrowstack(YYSTACKDATA *data
         newsize = YYMAXDEPTH;
 
     i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
+    newss = (YYINT *)realloc(data->s_base, newsize * sizeof(*newss));
     if (newss == 0)
         return YYENOMEM;
 
@@ -327,7 +329,7 @@ yyNewState(unsigned size)
 #endif
         return p;
     }
-    p->yystack.s_base    = (short *) malloc(size * sizeof(short));
+    p->yystack.s_base    = (YYINT *) malloc(size * sizeof(YYINT));
     if (p->yystack.s_base == NULL) return NULL;
     p->yystack.l_base    = (YYSTYPE *) malloc(size * sizeof(YYSTYPE));
     if (p->yystack.l_base == NULL) return NULL;
@@ -388,6 +390,8 @@ YYPARSE_DECL()
     yyps = yyNewState(0); if (yyps == 0) goto yyenomem;
     yyps->save = 0;
 %%endif
+    yym = 0;
+    yyn = 0;
     yynerrs = 0;
     yyerrflag = 0;
     yychar = YYEMPTY;
@@ -427,8 +431,8 @@ yyloop:
             /* in trial mode; save scanner results for future parse attempts */
             if (yylvp == yylvlim)
             {   /* Enlarge lexical value queue */
-                int p = yylvp - yylvals;
-                int s = yylvlim - yylvals;
+                size_t p = (size_t) (yylvp - yylvals);
+                size_t s = (size_t) (yylvlim - yylvals);
 
                 s += YYLVQUEUEGROWTH;
                 if ((yylexemes = (short *)   realloc(yylexemes, s * sizeof(short))) == NULL) goto yyenomem;
@@ -461,11 +465,10 @@ yyloop:
         } while (0);
 %%endif
         if (yychar < 0) yychar = YYEOF;
-        /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */
 #if YYDEBUG
         if (yydebug)
         {
-            yys = yyname[YYTRANSLATE(yychar)];
+            if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
             fprintf(stderr, "%s[%d]: state %d, reading token %d (%s)",
                             YYDEBUGSTR, yydepth, yystate, yychar, yys);
 #ifdef YYSTYPE_TOSTRING
@@ -524,12 +527,12 @@ yyloop:
             save->state           = yystate;
             save->errflag         = yyerrflag;
             save->yystack.s_mark  = save->yystack.s_base + (yystack.s_mark - yystack.s_base);
-            memcpy (save->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));
+            memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));
             save->yystack.l_mark  = save->yystack.l_base + (yystack.l_mark - yystack.l_base);
-            memcpy (save->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
+            memcpy (save->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
             save->yystack.p_mark  = save->yystack.p_base + (yystack.p_mark - yystack.p_base);
-            memcpy (save->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
+            memcpy (save->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
 #endif
             ctry                  = yytable[yyn];
             if (yyctable[ctry] == -1)
@@ -584,7 +587,7 @@ yyloop:
                 yylexp--;
                 yychar = YYEMPTY;
             }
-            save->lexeme = yylvp - yylvals;
+            save->lexeme = (int) (yylvp - yylvals);
             yyps->save   = save;
         }
         if (yytable[yyn] == ctry)
@@ -605,7 +608,7 @@ yyloop:
             if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
                 goto yyoverflow;
             yystate = yyctable[ctry];
-            *++yystack.s_mark = (short) yystate;
+            *++yystack.s_mark = (YYINT) yystate;
             *++yystack.l_mark = yylval;
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
             *++yystack.p_mark = yylloc;
@@ -651,9 +654,18 @@ yyloop:
 
     yynewerrflag = 1;
     goto yyerrhandler;
-    goto yyerrlab;
+    goto yyerrlab; /* redundant goto avoids 'unused label' warning */
 
 yyerrlab:
+    /* explicit YYERROR from an action -- pop the rhs of the rule reduced
+     * before looking for error recovery */
+    yystack.s_mark -= yym;
+    yystate = *yystack.s_mark;
+    yystack.l_mark -= yym;
+#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
+    yystack.p_mark -= yym;
+#endif
+
     yynewerrflag = 0;
 yyerrhandler:
     while (yyps->save)
@@ -678,14 +690,14 @@ yyerrhandler:
             yyerrctx->state          = yystate;
             yyerrctx->errflag        = yyerrflag;
             yyerrctx->yystack.s_mark = yyerrctx->yystack.s_base + (yystack.s_mark - yystack.s_base);
-            memcpy (yyerrctx->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));
+            memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));
             yyerrctx->yystack.l_mark = yyerrctx->yystack.l_base + (yystack.l_mark - yystack.l_base);
-            memcpy (yyerrctx->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
+            memcpy (yyerrctx->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
             yyerrctx->yystack.p_mark = yyerrctx->yystack.p_base + (yystack.p_mark - yystack.p_base);
-            memcpy (yyerrctx->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
+            memcpy (yyerrctx->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
 #endif
-            yyerrctx->lexeme         = yylvp - yylvals;
+            yyerrctx->lexeme         = (int) (yylvp - yylvals);
         }
         yylvp          = yylvals   + save->lexeme;
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
@@ -694,12 +706,12 @@ yyerrhandler:
         yylexp         = yylexemes + save->lexeme;
         yychar         = YYEMPTY;
         yystack.s_mark = yystack.s_base + (save->yystack.s_mark - save->yystack.s_base);
-        memcpy (yystack.s_base, save->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));
+        memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));
         yystack.l_mark = yystack.l_base + (save->yystack.l_mark - save->yystack.l_base);
-        memcpy (yystack.l_base, save->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
+        memcpy (yystack.l_base, save->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
         yystack.p_mark = yystack.p_base + (save->yystack.p_mark - save->yystack.p_base);
-        memcpy (yystack.p_base, save->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
+        memcpy (yystack.p_base, save->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
 #endif
         ctry           = ++save->ctry;
         yystate        = save->state;
@@ -729,12 +741,12 @@ yyerrhandler:
             yylloc         = yylpp[-1];
 #endif
             yystack.s_mark = yystack.s_base + (yyerrctx->yystack.s_mark - yyerrctx->yystack.s_base);
-            memcpy (yystack.s_base, yyerrctx->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));
+            memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));
             yystack.l_mark = yystack.l_base + (yyerrctx->yystack.l_mark - yyerrctx->yystack.l_base);
-            memcpy (yystack.l_base, yyerrctx->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
+            memcpy (yystack.l_base, yyerrctx->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
             yystack.p_mark = yystack.p_base + (yyerrctx->yystack.p_mark - yyerrctx->yystack.p_base);
-            memcpy (yystack.p_base, yyerrctx->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
+            memcpy (yystack.p_base, yyerrctx->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
 #endif
             yystate        = yyerrctx->state;
             yyFreeState(yyerrctx);
@@ -751,7 +763,7 @@ yyerrhandler:
 #endif
 
 #if !YYBTYACC
-    goto yyerrlab;
+    goto yyerrlab; /* redundant goto avoids 'unused label' warning */
 yyerrlab:
 #endif
     ++yynerrs;
@@ -820,7 +832,7 @@ yyinrecovery:
 #if YYDEBUG
         if (yydebug)
         {
-            yys = yyname[YYTRANSLATE(yychar)];
+            if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
             fprintf(stderr, "%s[%d]: state %d, error recovery discarding token %d (%s)\n",
                             YYDEBUGSTR, yydepth, yystate, yychar, yys);
         }
@@ -938,8 +950,8 @@ yyreduce:
                 /* in trial mode; save scanner results for future parse attempts */
                 if (yylvp == yylvlim)
                 {   /* Enlarge lexical value queue */
-                    int p = yylvp - yylvals;
-                    int s = yylvlim - yylvals;
+                    size_t p = (size_t) (yylvp - yylvals);
+                    size_t s = (size_t) (yylvlim - yylvals);
 
                     s += YYLVQUEUEGROWTH;
                     if ((yylexemes = (short *)   realloc(yylexemes, s * sizeof(short))) == NULL)
@@ -975,12 +987,11 @@ yyreduce:
             } while (0);
 %%endif
             if (yychar < 0) yychar = YYEOF;
-            /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */
 #if YYDEBUG
             if (yydebug)
             {
-                yys = yyname[YYTRANSLATE(yychar)];
-                fprintf(stderr, "%s[%d]: state %d, reading %d (%s)\n",
+                if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
+                fprintf(stderr, "%s[%d]: state %d, reading token %d (%s)\n",
                                 YYDEBUGSTR, yydepth, YYFINAL, yychar, yys);
             }
 #endif
@@ -1007,7 +1018,7 @@ yyreduce:
     }
 #endif
     if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
-    *++yystack.s_mark = (short) yystate;
+    *++yystack.s_mark = (YYINT) yystate;
     *++yystack.l_mark = yyval;
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
     *++yystack.p_mark = yyloc;
@@ -1042,12 +1053,12 @@ yyvalid:
     yylexp         = yylexemes + yypath->lexeme;
     yychar         = YYEMPTY;
     yystack.s_mark = yystack.s_base + (yypath->yystack.s_mark - yypath->yystack.s_base);
-    memcpy (yystack.s_base, yypath->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));
+    memcpy (yystack.s_base, yypath->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));
     yystack.l_mark = yystack.l_base + (yypath->yystack.l_mark - yypath->yystack.l_base);
-    memcpy (yystack.l_base, yypath->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
+    memcpy (yystack.l_base, yypath->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));
 #if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
     yystack.p_mark = yystack.p_base + (yypath->yystack.p_mark - yypath->yystack.p_base);
-    memcpy (yystack.p_base, yypath->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
+    memcpy (yystack.p_base, yypath->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));
 #endif
     yystate        = yypath->state;
     goto yyloop;

Modified: user/alc/PQ_LAUNDRY/contrib/byacc/configure
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/byacc/configure	Wed Oct  5 17:18:24 2016	(r306710)
+++ user/alc/PQ_LAUNDRY/contrib/byacc/configure	Wed Oct  5 17:26:32 2016	(r306711)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Revision: 1.21 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20141204.
+# Generated by Autoconf 2.52.20150926.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -767,7 +767,7 @@ This file contains any messages produced
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20141204.  Invocation command line was
+generated by GNU Autoconf 2.52.20150926.  Invocation command line was
 
   $ $0 $@
 
@@ -1949,13 +1949,13 @@ esac
 echo "$as_me:1949: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
-(*[\ \	]-[IUD]*)
+(*[\ \	]-*)
 	echo "$as_me:1953: result: broken" >&5
 echo "${ECHO_T}broken" >&6
 	{ echo "$as_me:1955: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
-	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
+	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	][ 	]*//'`
 	CC=`echo "$CC" | sed -e 's/[ 	].*//'`
 
 cf_fix_cppflags=no
@@ -2036,14 +2036,26 @@ if test -n "$cf_new_extra_cppflags" ; th
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
+	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+
+echo "${as_me:-configure}:2041: testing resulting CC: '$CC' ..." 1>&5
+
+	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+
+echo "${as_me:-configure}:2045: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+echo "${as_me:-configure}:2049: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
 	;;
 (*)
-	echo "$as_me:2041: result: ok" >&5
+	echo "$as_me:2053: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2046: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2058: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -2063,11 +2075,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2066: result: yes" >&5
+  echo "$as_me:2078: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2070: result: no" >&5
+  echo "$as_me:2082: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2084,7 +2096,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2087: checking for a BSD compatible install" >&5
+echo "$as_me:2099: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2133,7 +2145,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2136: result: $INSTALL" >&5
+echo "$as_me:2148: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2144,7 +2156,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:2147: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2159: checking if filesystem supports mixed-case filenames" >&5
 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
 if test "${cf_cv_mixedcase+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2171,7 +2183,7 @@ else
 fi
 
 fi
-echo "$as_me:2174: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2186: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -2182,7 +2194,7 @@ for ac_prog in exctags ctags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2185: checking for $ac_word" >&5
+echo "$as_me:2197: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CTAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2197,7 +2209,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CTAGS="$ac_prog"
-echo "$as_me:2200: found $ac_dir/$ac_word" >&5
+echo "$as_me:2212: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2205,10 +2217,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:2208: result: $CTAGS" >&5
+  echo "$as_me:2220: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:2211: result: no" >&5
+  echo "$as_me:2223: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2219,7 +2231,7 @@ for ac_prog in exetags etags
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2222: checking for $ac_word" >&5
+echo "$as_me:2234: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ETAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2234,7 +2246,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ETAGS="$ac_prog"
-echo "$as_me:2237: found $ac_dir/$ac_word" >&5
+echo "$as_me:2249: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2242,10 +2254,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:2245: result: $ETAGS" >&5
+  echo "$as_me:2257: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:2248: result: no" >&5
+  echo "$as_me:2260: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2254,7 +2266,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:2257: checking for $ac_word" >&5
+echo "$as_me:2269: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2269,7 +2281,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_LOWER_TAGS="yes"
-echo "$as_me:2272: found $ac_dir/$ac_word" >&5
+echo "$as_me:2284: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2278,17 +2290,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2281: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2293: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2284: result: no" >&5
+  echo "$as_me:2296: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
 set dummy ${ETAGS:-etags}; ac_word=$2
-echo "$as_me:2291: checking for $ac_word" >&5
+echo "$as_me:2303: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2303,7 +2315,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_MAKE_UPPER_TAGS="yes"
-echo "$as_me:2306: found $ac_dir/$ac_word" >&5
+echo "$as_me:2318: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2312,10 +2324,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2315: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2327: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2318: result: no" >&5
+  echo "$as_me:2330: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2339,7 +2351,7 @@ for ac_prog in mawk gawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:2342: checking for $ac_word" >&5
+echo "$as_me:2354: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2354,7 +2366,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue

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

More information about the svn-src-user mailing list