From owner-svn-src-projects@freebsd.org Mon Oct 3 15:15:02 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68D68AF321E for ; Mon, 3 Oct 2016 15:15:02 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 365A3CBE; Mon, 3 Oct 2016 15:15:02 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u93FF1LY070142; Mon, 3 Oct 2016 15:15:01 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u93FExdU070113; Mon, 3 Oct 2016 15:14:59 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201610031514.u93FExdU070113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Mon, 3 Oct 2016 15:14:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306643 - in projects/mips64-clang: . bin/chio bin/chmod bin/ed bin/kill contrib/atf/atf-sh contrib/blacklist/bin contrib/dma contrib/libucl contrib/libucl/haskell contrib/libucl/includ... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2016 15:15:02 -0000 Author: sbruno Date: Mon Oct 3 15:14:58 2016 New Revision: 306643 URL: https://svnweb.freebsd.org/changeset/base/306643 Log: MFC r306637 Added: projects/mips64-clang/contrib/libucl/haskell/ - copied from r306637, head/contrib/libucl/haskell/ projects/mips64-clang/contrib/libucl/m4/gcov.m4 - copied unchanged from r306637, head/contrib/libucl/m4/gcov.m4 projects/mips64-clang/contrib/libucl/python/tests/ - copied from r306637, head/contrib/libucl/python/tests/ projects/mips64-clang/contrib/unbound/contrib/ - copied from r306637, head/contrib/unbound/contrib/ projects/mips64-clang/lib/librss/ - copied from r306637, head/lib/librss/ projects/mips64-clang/share/man/man4/mlx4en.4 - copied unchanged from r306637, head/share/man/man4/mlx4en.4 projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c - copied unchanged from r306637, head/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2836_mp.h - copied unchanged from r306637, head/sys/arm/broadcom/bcm2835/bcm2836_mp.h projects/mips64-clang/sys/dev/mlx4/ - copied from r306637, head/sys/dev/mlx4/ projects/mips64-clang/sys/modules/dtb/nvidia/ - copied from r306637, head/sys/modules/dtb/nvidia/ projects/mips64-clang/sys/modules/evdev/ - copied from r306637, head/sys/modules/evdev/ projects/mips64-clang/sys/modules/mlx4en/ - copied from r306637, head/sys/modules/mlx4en/ projects/mips64-clang/sys/modules/rpi_ft5406/ - copied from r306637, head/sys/modules/rpi_ft5406/ projects/mips64-clang/sys/modules/uinput/ - copied from r306637, head/sys/modules/uinput/ Deleted: projects/mips64-clang/contrib/libucl/python/test.sh projects/mips64-clang/contrib/libucl/python/test_uclmodule.py projects/mips64-clang/sys/dev/hyperv/stordisengage/ projects/mips64-clang/sys/modules/hyperv/stordisengage/ projects/mips64-clang/sys/modules/mlxen/ projects/mips64-clang/sys/ofed/drivers/infiniband/hw/mlx4/ projects/mips64-clang/sys/ofed/drivers/net/ projects/mips64-clang/sys/ofed/include/linux/ Modified: projects/mips64-clang/.arcconfig projects/mips64-clang/bin/chio/chio.1 projects/mips64-clang/bin/chmod/chmod.c projects/mips64-clang/bin/ed/ed.1 projects/mips64-clang/bin/kill/kill.1 projects/mips64-clang/contrib/atf/atf-sh/atf-check.cpp projects/mips64-clang/contrib/blacklist/bin/blacklistd.8 projects/mips64-clang/contrib/blacklist/bin/blacklistd.c projects/mips64-clang/contrib/blacklist/bin/state.c projects/mips64-clang/contrib/dma/dma-mbox-create.c projects/mips64-clang/contrib/libucl/CMakeLists.txt projects/mips64-clang/contrib/libucl/Makefile.unix projects/mips64-clang/contrib/libucl/Makefile.w32 projects/mips64-clang/contrib/libucl/README.md projects/mips64-clang/contrib/libucl/include/ucl++.h projects/mips64-clang/contrib/libucl/include/ucl.h projects/mips64-clang/contrib/libucl/python/setup.py projects/mips64-clang/contrib/libucl/python/src/uclmodule.c projects/mips64-clang/contrib/libucl/src/ucl_parser.c projects/mips64-clang/contrib/libucl/src/ucl_schema.c projects/mips64-clang/contrib/libucl/src/ucl_util.c projects/mips64-clang/contrib/libucl/tests/schema/patternProperties.json projects/mips64-clang/contrib/libucl/tests/schema/refRemote.json projects/mips64-clang/contrib/unbound/Makefile.in projects/mips64-clang/contrib/unbound/acx_python.m4 projects/mips64-clang/contrib/unbound/compat/arc4random.c projects/mips64-clang/contrib/unbound/compat/getentropy_linux.c projects/mips64-clang/contrib/unbound/config.h projects/mips64-clang/contrib/unbound/config.h.in projects/mips64-clang/contrib/unbound/configure projects/mips64-clang/contrib/unbound/configure.ac projects/mips64-clang/contrib/unbound/daemon/acl_list.c projects/mips64-clang/contrib/unbound/daemon/acl_list.h projects/mips64-clang/contrib/unbound/daemon/daemon.c projects/mips64-clang/contrib/unbound/daemon/remote.c projects/mips64-clang/contrib/unbound/daemon/remote.h projects/mips64-clang/contrib/unbound/daemon/unbound.c projects/mips64-clang/contrib/unbound/daemon/worker.c projects/mips64-clang/contrib/unbound/dns64/dns64.c projects/mips64-clang/contrib/unbound/doc/Changelog projects/mips64-clang/contrib/unbound/doc/README projects/mips64-clang/contrib/unbound/doc/example.conf projects/mips64-clang/contrib/unbound/doc/example.conf.in projects/mips64-clang/contrib/unbound/doc/libunbound.3 projects/mips64-clang/contrib/unbound/doc/libunbound.3.in projects/mips64-clang/contrib/unbound/doc/unbound-anchor.8 projects/mips64-clang/contrib/unbound/doc/unbound-anchor.8.in projects/mips64-clang/contrib/unbound/doc/unbound-checkconf.8 projects/mips64-clang/contrib/unbound/doc/unbound-checkconf.8.in projects/mips64-clang/contrib/unbound/doc/unbound-control.8 projects/mips64-clang/contrib/unbound/doc/unbound-control.8.in projects/mips64-clang/contrib/unbound/doc/unbound-host.1 projects/mips64-clang/contrib/unbound/doc/unbound-host.1.in projects/mips64-clang/contrib/unbound/doc/unbound.8 projects/mips64-clang/contrib/unbound/doc/unbound.8.in projects/mips64-clang/contrib/unbound/doc/unbound.conf.5 projects/mips64-clang/contrib/unbound/doc/unbound.conf.5.in projects/mips64-clang/contrib/unbound/doc/unbound.doxygen projects/mips64-clang/contrib/unbound/iterator/iter_hints.c projects/mips64-clang/contrib/unbound/iterator/iter_utils.c projects/mips64-clang/contrib/unbound/iterator/iterator.c projects/mips64-clang/contrib/unbound/iterator/iterator.h projects/mips64-clang/contrib/unbound/libunbound/libworker.c projects/mips64-clang/contrib/unbound/services/listen_dnsport.c projects/mips64-clang/contrib/unbound/services/localzone.c projects/mips64-clang/contrib/unbound/services/localzone.h projects/mips64-clang/contrib/unbound/services/mesh.c projects/mips64-clang/contrib/unbound/services/outside_network.c projects/mips64-clang/contrib/unbound/services/outside_network.h projects/mips64-clang/contrib/unbound/sldns/keyraw.c projects/mips64-clang/contrib/unbound/sldns/rrdef.h projects/mips64-clang/contrib/unbound/sldns/wire2str.h projects/mips64-clang/contrib/unbound/smallapp/unbound-anchor.c projects/mips64-clang/contrib/unbound/smallapp/unbound-checkconf.c projects/mips64-clang/contrib/unbound/smallapp/unbound-control.c projects/mips64-clang/contrib/unbound/smallapp/unbound-host.c projects/mips64-clang/contrib/unbound/smallapp/worker_cb.c projects/mips64-clang/contrib/unbound/util/alloc.c projects/mips64-clang/contrib/unbound/util/config_file.c projects/mips64-clang/contrib/unbound/util/config_file.h projects/mips64-clang/contrib/unbound/util/configlexer.lex projects/mips64-clang/contrib/unbound/util/configparser.y projects/mips64-clang/contrib/unbound/util/iana_ports.inc projects/mips64-clang/contrib/unbound/util/net_help.c projects/mips64-clang/contrib/unbound/util/netevent.c projects/mips64-clang/contrib/unbound/util/netevent.h projects/mips64-clang/contrib/unbound/util/storage/dnstree.c projects/mips64-clang/contrib/unbound/util/storage/dnstree.h projects/mips64-clang/contrib/unbound/util/storage/lookup3.c projects/mips64-clang/contrib/unbound/util/ub_event.c projects/mips64-clang/contrib/unbound/util/ub_event_pluggable.c projects/mips64-clang/contrib/unbound/util/winsock_event.c projects/mips64-clang/contrib/unbound/validator/autotrust.c projects/mips64-clang/contrib/unbound/validator/val_secalgo.c projects/mips64-clang/contrib/unbound/validator/val_sigcrypt.c projects/mips64-clang/contrib/unbound/validator/validator.c projects/mips64-clang/include/mqueue.h projects/mips64-clang/include/stdio.h projects/mips64-clang/include/time.h projects/mips64-clang/lib/Makefile projects/mips64-clang/lib/libc/gen/arc4random.c projects/mips64-clang/lib/libc/sys/cap_enter.2 projects/mips64-clang/lib/libc/sys/getrlimit.2 projects/mips64-clang/lib/libc/sys/open.2 projects/mips64-clang/lib/libc/sys/sigaction.2 projects/mips64-clang/lib/libc/sys/thr_suspend.2 projects/mips64-clang/lib/libjail/jail.c projects/mips64-clang/lib/librt/Symbol.map projects/mips64-clang/lib/librt/mq.c projects/mips64-clang/lib/librt/timer.c projects/mips64-clang/lib/libstand/cd9660.c projects/mips64-clang/lib/msun/src/e_coshl.c projects/mips64-clang/lib/msun/src/e_sinhl.c projects/mips64-clang/lib/msun/src/s_tanhl.c projects/mips64-clang/sbin/ccdconfig/ccdconfig.8 projects/mips64-clang/sbin/dmesg/dmesg.8 projects/mips64-clang/sbin/dump/dump.8 projects/mips64-clang/sbin/dumpon/dumpon.8 projects/mips64-clang/sbin/etherswitchcfg/etherswitchcfg.8 projects/mips64-clang/sbin/fsck_msdosfs/fsck_msdosfs.8 projects/mips64-clang/sbin/fsdb/fsdb.8 projects/mips64-clang/sbin/gbde/gbde.8 projects/mips64-clang/sbin/init/init.8 projects/mips64-clang/sbin/mknod/mknod.8 projects/mips64-clang/sbin/mksnap_ffs/mksnap_ffs.8 projects/mips64-clang/sbin/mount_fusefs/mount_fusefs.8 projects/mips64-clang/sbin/mount_msdosfs/mount_msdosfs.8 projects/mips64-clang/sbin/mount_nullfs/mount_nullfs.8 projects/mips64-clang/sbin/mount_unionfs/mount_unionfs.8 projects/mips64-clang/sbin/pfctl/pfctl.8 projects/mips64-clang/sbin/sconfig/sconfig.8 projects/mips64-clang/sbin/setkey/setkey.8 projects/mips64-clang/sbin/shutdown/shutdown.8 projects/mips64-clang/sbin/swapon/swapon.8 projects/mips64-clang/share/man/man4/Makefile projects/mips64-clang/share/man/man9/sysctl.9 projects/mips64-clang/share/man/man9/taskqueue.9 projects/mips64-clang/share/misc/bsd-family-tree projects/mips64-clang/share/misc/committers-doc.dot projects/mips64-clang/share/mk/src.opts.mk projects/mips64-clang/sys/amd64/conf/NOTES projects/mips64-clang/sys/arm/allwinner/a10_ahci.c projects/mips64-clang/sys/arm/arm/cpufunc.c projects/mips64-clang/sys/arm/arm/vm_machdep.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/mips64-clang/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/mips64-clang/sys/arm/broadcom/bcm2835/files.bcm283x projects/mips64-clang/sys/arm/conf/BEAGLEBONE projects/mips64-clang/sys/arm/conf/GENERIC projects/mips64-clang/sys/arm/conf/RPI-B projects/mips64-clang/sys/arm/conf/RPI2 projects/mips64-clang/sys/arm/conf/TEGRA124 projects/mips64-clang/sys/arm/include/armreg.h projects/mips64-clang/sys/arm/include/platformvar.h projects/mips64-clang/sys/arm/nvidia/as3722.c projects/mips64-clang/sys/arm/nvidia/tegra124/files.tegra124 projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_car.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_clk_pll.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_coretemp.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_cpufreq.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_machdep.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_pmc.c projects/mips64-clang/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c projects/mips64-clang/sys/arm/nvidia/tegra_abpmisc.c projects/mips64-clang/sys/arm/nvidia/tegra_ahci.c projects/mips64-clang/sys/arm/nvidia/tegra_efuse.c projects/mips64-clang/sys/arm/nvidia/tegra_ehci.c projects/mips64-clang/sys/arm/nvidia/tegra_gpio.c projects/mips64-clang/sys/arm/nvidia/tegra_i2c.c projects/mips64-clang/sys/arm/nvidia/tegra_lic.c projects/mips64-clang/sys/arm/nvidia/tegra_pcie.c projects/mips64-clang/sys/arm/nvidia/tegra_pinmux.c projects/mips64-clang/sys/arm/nvidia/tegra_rtc.c projects/mips64-clang/sys/arm/nvidia/tegra_sdhci.c projects/mips64-clang/sys/arm/nvidia/tegra_soctherm.c projects/mips64-clang/sys/arm/nvidia/tegra_usbphy.c projects/mips64-clang/sys/arm/ti/cpsw/if_cpsw.c projects/mips64-clang/sys/arm/ti/ti_adc.c projects/mips64-clang/sys/arm/ti/ti_adcvar.h projects/mips64-clang/sys/boot/efi/loader/main.c projects/mips64-clang/sys/boot/fdt/dts/arm/rpi.dts projects/mips64-clang/sys/boot/fdt/dts/arm/rpi2.dts projects/mips64-clang/sys/cam/cam_iosched.c projects/mips64-clang/sys/cam/cam_periph.c projects/mips64-clang/sys/cam/cam_periph.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/mips64-clang/sys/cddl/dev/fbt/arm/fbt_isa.c projects/mips64-clang/sys/cddl/dev/fbt/fbt.c projects/mips64-clang/sys/cddl/dev/fbt/powerpc/fbt_isa.c projects/mips64-clang/sys/cddl/dev/fbt/x86/fbt_isa.c projects/mips64-clang/sys/compat/linuxkpi/common/include/linux/pci.h projects/mips64-clang/sys/conf/NOTES projects/mips64-clang/sys/conf/files projects/mips64-clang/sys/conf/files.amd64 projects/mips64-clang/sys/conf/files.i386 projects/mips64-clang/sys/conf/options projects/mips64-clang/sys/contrib/ipfilter/netinet/fil.c projects/mips64-clang/sys/contrib/ipfilter/netinet/ip_compat.h projects/mips64-clang/sys/dev/atkbdc/psm.c projects/mips64-clang/sys/dev/bwi/if_bwi.c projects/mips64-clang/sys/dev/bwn/if_bwn.c projects/mips64-clang/sys/dev/bxe/bxe.c projects/mips64-clang/sys/dev/bxe/bxe.h projects/mips64-clang/sys/dev/bxe/bxe_stats.h projects/mips64-clang/sys/dev/cxgbe/cxgbei/cxgbei.c projects/mips64-clang/sys/dev/cxgbe/t4_main.c projects/mips64-clang/sys/dev/cxgbe/tom/t4_cpl_io.c projects/mips64-clang/sys/dev/evdev/evdev.c projects/mips64-clang/sys/dev/evdev/uinput.c projects/mips64-clang/sys/dev/fb/fbd.c projects/mips64-clang/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/mips64-clang/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/mips64-clang/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/mips64-clang/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/mips64-clang/sys/dev/iicbus/iicbus.c projects/mips64-clang/sys/dev/iwm/if_iwm.c projects/mips64-clang/sys/dev/iwm/if_iwmvar.h projects/mips64-clang/sys/dev/iwn/if_iwn.c projects/mips64-clang/sys/dev/iwn/if_iwnvar.h projects/mips64-clang/sys/dev/lmc/if_lmc.c projects/mips64-clang/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/mips64-clang/sys/dev/otus/if_otus.c projects/mips64-clang/sys/dev/otus/if_otusreg.h projects/mips64-clang/sys/dev/qlxgbe/ql_boot.c projects/mips64-clang/sys/dev/qlxgbe/ql_fw.c projects/mips64-clang/sys/dev/qlxgbe/ql_minidump.c projects/mips64-clang/sys/dev/qlxgbe/ql_reset.c projects/mips64-clang/sys/dev/ral/if_ral_pci.c projects/mips64-clang/sys/dev/ral/rt2560.c projects/mips64-clang/sys/dev/ral/rt2560var.h projects/mips64-clang/sys/dev/ral/rt2661.c projects/mips64-clang/sys/dev/ral/rt2661var.h projects/mips64-clang/sys/dev/ral/rt2860.c projects/mips64-clang/sys/dev/ral/rt2860var.h projects/mips64-clang/sys/dev/urtwn/if_urtwn.c projects/mips64-clang/sys/dev/urtwn/if_urtwnreg.h projects/mips64-clang/sys/dev/urtwn/if_urtwnvar.h projects/mips64-clang/sys/dev/usb/input/ukbd.c projects/mips64-clang/sys/dev/usb/input/ums.c projects/mips64-clang/sys/dev/usb/serial/u3g.c projects/mips64-clang/sys/dev/usb/usbdevs projects/mips64-clang/sys/dev/usb/wlan/if_rum.c projects/mips64-clang/sys/dev/usb/wlan/if_rumvar.h projects/mips64-clang/sys/dev/usb/wlan/if_run.c projects/mips64-clang/sys/dev/usb/wlan/if_runvar.h projects/mips64-clang/sys/dev/usb/wlan/if_ural.c projects/mips64-clang/sys/dev/usb/wlan/if_uralvar.h projects/mips64-clang/sys/dev/usb/wlan/if_zyd.c projects/mips64-clang/sys/dev/usb/wlan/if_zydreg.h projects/mips64-clang/sys/dev/wpi/if_wpi.c projects/mips64-clang/sys/dev/wpi/if_wpivar.h projects/mips64-clang/sys/fs/nandfs/nandfs_subr.c projects/mips64-clang/sys/i386/conf/NOTES projects/mips64-clang/sys/kern/kern_mib.c projects/mips64-clang/sys/kern/subr_taskqueue.c projects/mips64-clang/sys/kern/vfs_bio.c projects/mips64-clang/sys/kern/vfs_cache.c projects/mips64-clang/sys/kern/vfs_mount.c projects/mips64-clang/sys/kern/vfs_subr.c projects/mips64-clang/sys/modules/Makefile projects/mips64-clang/sys/modules/hyperv/Makefile projects/mips64-clang/sys/modules/hyperv/vmbus/Makefile projects/mips64-clang/sys/modules/mlx4/Makefile projects/mips64-clang/sys/modules/mlx4ib/Makefile projects/mips64-clang/sys/net/if_var.h projects/mips64-clang/sys/net/rndis.h projects/mips64-clang/sys/net80211/ieee80211_amrr.c projects/mips64-clang/sys/net80211/ieee80211_node.c projects/mips64-clang/sys/net80211/ieee80211_node.h projects/mips64-clang/sys/net80211/ieee80211_ratectl.h projects/mips64-clang/sys/net80211/ieee80211_ratectl_none.c projects/mips64-clang/sys/net80211/ieee80211_rssadapt.c projects/mips64-clang/sys/net80211/ieee80211_scan_sw.c projects/mips64-clang/sys/netinet/if_ether.c projects/mips64-clang/sys/netinet/in.c projects/mips64-clang/sys/netinet/in_var.h projects/mips64-clang/sys/netinet/tcp_hostcache.c projects/mips64-clang/sys/netinet/tcp_input.c projects/mips64-clang/sys/netinet/tcp_syncache.c projects/mips64-clang/sys/netinet/udp_usrreq.c projects/mips64-clang/sys/netinet6/icmp6.c projects/mips64-clang/sys/netinet6/nd6_nbr.c projects/mips64-clang/sys/sys/bufobj.h projects/mips64-clang/sys/sys/errno.h projects/mips64-clang/sys/sys/fbio.h projects/mips64-clang/sys/sys/mount.h projects/mips64-clang/sys/sys/param.h projects/mips64-clang/sys/sys/sysctl.h projects/mips64-clang/sys/sys/vnode.h projects/mips64-clang/sys/ufs/ffs/ffs_snapshot.c projects/mips64-clang/sys/ufs/ffs/ffs_vfsops.c projects/mips64-clang/sys/vm/vm_init.c projects/mips64-clang/sys/x86/x86/io_apic.c projects/mips64-clang/sys/xen/interface/io/libxenvchan.h projects/mips64-clang/tests/sys/mqueue/Makefile projects/mips64-clang/tests/sys/mqueue/mqtest3.c projects/mips64-clang/tests/sys/mqueue/mqtest4.c projects/mips64-clang/usr.bin/kdump/kdump.c projects/mips64-clang/usr.bin/mkimg/apm.c projects/mips64-clang/usr.bin/mkimg/bsd.c projects/mips64-clang/usr.bin/mkimg/ebr.c projects/mips64-clang/usr.bin/mkimg/format.c projects/mips64-clang/usr.bin/mkimg/gpt.c projects/mips64-clang/usr.bin/mkimg/image.c projects/mips64-clang/usr.bin/mkimg/mbr.c projects/mips64-clang/usr.bin/mkimg/mkimg.c projects/mips64-clang/usr.bin/mkimg/mkimg.h projects/mips64-clang/usr.bin/mkimg/pc98.c projects/mips64-clang/usr.bin/mkimg/qcow.c projects/mips64-clang/usr.bin/mkimg/raw.c projects/mips64-clang/usr.bin/mkimg/scheme.c projects/mips64-clang/usr.bin/mkimg/vhd.c projects/mips64-clang/usr.bin/mkimg/vmdk.c projects/mips64-clang/usr.bin/mkimg/vtoc8.c projects/mips64-clang/usr.bin/patch/common.h projects/mips64-clang/usr.bin/primes/primes.c projects/mips64-clang/usr.sbin/bhyve/dbgport.c projects/mips64-clang/usr.sbin/crunch/crunchgen/crunchgen.c projects/mips64-clang/usr.sbin/portsnap/portsnap/portsnap.sh projects/mips64-clang/usr.sbin/rtsold/rtsol.c projects/mips64-clang/usr.sbin/sesutil/sesutil.c Directory Properties: projects/mips64-clang/ (props changed) projects/mips64-clang/contrib/atf/ (props changed) projects/mips64-clang/contrib/dma/ (props changed) projects/mips64-clang/contrib/libucl/ (props changed) projects/mips64-clang/contrib/unbound/ (props changed) projects/mips64-clang/lib/libc/locale/ascii.c (props changed) projects/mips64-clang/sys/cddl/contrib/opensolaris/ (props changed) projects/mips64-clang/sys/contrib/ipfilter/ (props changed) Modified: projects/mips64-clang/.arcconfig ============================================================================== --- projects/mips64-clang/.arcconfig Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/.arcconfig Mon Oct 3 15:14:58 2016 (r306643) @@ -1,5 +1,4 @@ { - "repository.callsign" : "S", "phabricator.uri" : "https://reviews.freebsd.org/", "history.immutable" : true } Modified: projects/mips64-clang/bin/chio/chio.1 ============================================================================== --- projects/mips64-clang/bin/chio/chio.1 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/bin/chio/chio.1 Mon Oct 3 15:14:58 2016 (r306643) @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 14, 1998 +.Dd October 2, 2016 .Dt CHIO 1 .Os .Sh NAME @@ -61,10 +61,6 @@ rather than the default device .Pa /dev/ch0 . .El .Pp -The default changer may be overridden by setting the environment variable -.Ev CHANGER -to the desired changer device. -.Pp A medium changer apparatus is made up of .Em elements . There are five element types: @@ -265,6 +261,12 @@ Element supports passing media (exportin .It INENAB Element supports receiving media (importing) from an outside human operator. .El +.Sh ENVIRONMENT +.Bl -tag -width CHANGER +.It Ev CHANGER +The default changer may be overridden by setting this environmental +variable to the desired changer device. +.El .Sh FILES .Bl -tag -width /dev/ch0 -compact .It Pa /dev/ch0 Modified: projects/mips64-clang/bin/chmod/chmod.c ============================================================================== --- projects/mips64-clang/bin/chmod/chmod.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/bin/chmod/chmod.c Mon Oct 3 15:14:58 2016 (r306643) @@ -91,12 +91,11 @@ main(int argc, char *argv[]) break; case 'h': /* - * In System V (and probably POSIX.2) the -h option - * causes chmod to change the mode of the symbolic - * link. 4.4BSD's symbolic links didn't have modes, - * so it was an undocumented noop. In FreeBSD 3.0, - * lchmod(2) is introduced and this option does real - * work. + * In System V the -h option causes chmod to change + * the mode of the symbolic link. 4.4BSD's symbolic + * links didn't have modes, so it was an undocumented + * noop. In FreeBSD 3.0, lchmod(2) is introduced and + * this option does real work. */ hflag = 1; break; Modified: projects/mips64-clang/bin/ed/ed.1 ============================================================================== --- projects/mips64-clang/bin/ed/ed.1 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/bin/ed/ed.1 Mon Oct 3 15:14:58 2016 (r306643) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd July 3, 2004 +.Dd October 2, 2016 .Dt ED 1 .Os .Sh NAME @@ -998,7 +998,7 @@ per line overhead: 4 ints An .Nm command appeared in -Version 1 AT&T UNIX. +.At v1 . .Sh BUGS The .Nm Modified: projects/mips64-clang/bin/kill/kill.1 ============================================================================== --- projects/mips64-clang/bin/kill/kill.1 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/bin/kill/kill.1 Mon Oct 3 15:14:58 2016 (r306643) @@ -32,7 +32,7 @@ .\" @(#)kill.1 8.2 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd April 28, 1995 +.Dd October 3, 2016 .Dt KILL 1 .Os .Sh NAME @@ -147,7 +147,8 @@ compatible. A .Nm command appeared in -.At v3 . +.At v3 +in section 8 of the manual. .Sh BUGS A replacement for the command .Dq Li kill 0 Modified: projects/mips64-clang/contrib/atf/atf-sh/atf-check.cpp ============================================================================== --- projects/mips64-clang/contrib/atf/atf-sh/atf-check.cpp Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/atf/atf-sh/atf-check.cpp Mon Oct 3 15:14:58 2016 (r306643) @@ -346,9 +346,10 @@ std::auto_ptr< atf::check::check_result execute_with_shell(char* const* argv) { const std::string cmd = flatten_argv(argv); + const std::string shell = atf::env::get("ATF_SHELL", ATF_SHELL); const char* sh_argv[4]; - sh_argv[0] = atf::env::get("ATF_SHELL", ATF_SHELL).c_str(); + sh_argv[0] = shell.c_str(); sh_argv[1] = "-c"; sh_argv[2] = cmd.c_str(); sh_argv[3] = NULL; Modified: projects/mips64-clang/contrib/blacklist/bin/blacklistd.8 ============================================================================== --- projects/mips64-clang/contrib/blacklist/bin/blacklistd.8 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/blacklist/bin/blacklistd.8 Mon Oct 3 15:14:58 2016 (r306643) @@ -1,4 +1,4 @@ -.\" $NetBSD: blacklistd.8,v 1.15 2016/03/11 17:16:40 christos Exp $ +.\" $NetBSD: blacklistd.8,v 1.18 2016/07/30 06:09:29 dholland Exp $ .\" .\" Copyright (c) 2015 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -47,7 +47,7 @@ .Nm is a daemon similar to .Xr syslogd 8 -that listens to a sockets at paths specified in the +that listens to sockets at paths specified in the .Ar sockpathsfile for notifications from other daemons about successful or failed connection attempts. @@ -218,7 +218,8 @@ Socket to receive connection notificatio .Nm first appeared in .Nx 7 . -.Fx support for +.Fx +support for .Nm was implemented in .Fx 11 . Modified: projects/mips64-clang/contrib/blacklist/bin/blacklistd.c ============================================================================== --- projects/mips64-clang/contrib/blacklist/bin/blacklistd.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/blacklist/bin/blacklistd.c Mon Oct 3 15:14:58 2016 (r306643) @@ -1,4 +1,4 @@ -/* $NetBSD: blacklistd.c,v 1.34 2016/04/04 15:52:56 christos Exp $ */ +/* $NetBSD: blacklistd.c,v 1.35 2016/09/26 19:43:43 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include "config.h" #endif #include -__RCSID("$NetBSD: blacklistd.c,v 1.34 2016/04/04 15:52:56 christos Exp $"); +__RCSID("$NetBSD: blacklistd.c,v 1.35 2016/09/26 19:43:43 christos Exp $"); #include #include @@ -473,9 +473,6 @@ main(int argc, char *argv[]) flags |= O_TRUNC; } - if (restore) - rules_restore(); - struct pollfd *pfd = NULL; bl_t *bl = NULL; size_t nfd = 0; @@ -500,6 +497,9 @@ main(int argc, char *argv[]) if (state == NULL) return EXIT_FAILURE; + if (restore) + rules_restore(); + if (!debug) { if (daemon(0, 0) == -1) err(EXIT_FAILURE, "daemon failed"); Modified: projects/mips64-clang/contrib/blacklist/bin/state.c ============================================================================== --- projects/mips64-clang/contrib/blacklist/bin/state.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/blacklist/bin/state.c Mon Oct 3 15:14:58 2016 (r306643) @@ -1,4 +1,4 @@ -/* $NetBSD: state.c,v 1.18 2016/04/04 15:52:56 christos Exp $ */ +/* $NetBSD: state.c,v 1.19 2016/09/26 19:43:43 christos Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #endif #include -__RCSID("$NetBSD: state.c,v 1.18 2016/04/04 15:52:56 christos Exp $"); +__RCSID("$NetBSD: state.c,v 1.19 2016/09/26 19:43:43 christos Exp $"); #include #include @@ -200,8 +200,10 @@ state_iterate(DB *db, struct conf *c, st int rv; DBT k, v; - if (db == NULL) + if (db == NULL) { + (*lfun)(LOG_ERR, "%s: called with no database file", __func__); return -1; + } first = first ? R_FIRST : R_NEXT; Modified: projects/mips64-clang/contrib/dma/dma-mbox-create.c ============================================================================== --- projects/mips64-clang/contrib/dma/dma-mbox-create.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/dma/dma-mbox-create.c Mon Oct 3 15:14:58 2016 (r306643) @@ -89,9 +89,7 @@ main(int argc, char **argv) struct group *gr; uid_t user_uid; gid_t mail_gid; - int error; - char fn[PATH_MAX+1]; - int f; + int f, maildirfd; openlog("dma-mbox-create", 0, LOG_MAIL); @@ -131,26 +129,22 @@ main(int argc, char **argv) if (!pw) logfail(EX_NOUSER, "cannot find user `%s'", user); - user_uid = pw->pw_uid; + maildirfd = open(_PATH_MAILDIR, O_RDONLY); + if (maildirfd < 0) + logfail(EX_NOINPUT, "cannot open maildir %s", _PATH_MAILDIR); - error = snprintf(fn, sizeof(fn), "%s/%s", _PATH_MAILDIR, user); - if (error < 0 || (size_t)error >= sizeof(fn)) { - if (error >= 0) { - errno = 0; - logfail(EX_USAGE, "mbox path too long"); - } - logfail(EX_CANTCREAT, "cannot build mbox path for `%s/%s'", _PATH_MAILDIR, user); - } + user_uid = pw->pw_uid; - f = open(fn, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600); + f = openat(maildirfd, user, O_RDONLY|O_CREAT|O_NOFOLLOW, 0600); if (f < 0) - logfail(EX_NOINPUT, "cannt open mbox `%s'", fn); + logfail(EX_NOINPUT, "cannot open mbox `%s'", user); if (fchown(f, user_uid, mail_gid)) - logfail(EX_OSERR, "cannot change owner of mbox `%s'", fn); + logfail(EX_OSERR, "cannot change owner of mbox `%s'", user); if (fchmod(f, 0620)) - logfail(EX_OSERR, "cannot change permissions of mbox `%s'", fn); + logfail(EX_OSERR, "cannot change permissions of mbox `%s'", + user); /* file should be present with the right owner and permissions */ Modified: projects/mips64-clang/contrib/libucl/CMakeLists.txt ============================================================================== --- projects/mips64-clang/contrib/libucl/CMakeLists.txt Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/CMakeLists.txt Mon Oct 3 15:14:58 2016 (r306643) @@ -205,8 +205,7 @@ SET(UCLSRC src/ucl_util.c src/ucl_hash.c src/ucl_schema.c src/ucl_msgpack.c - src/ucl_sexp.c - src/xxhash.c) + src/ucl_sexp.c) SET (LIB_TYPE STATIC) Modified: projects/mips64-clang/contrib/libucl/Makefile.unix ============================================================================== --- projects/mips64-clang/contrib/libucl/Makefile.unix Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/Makefile.unix Mon Oct 3 15:14:58 2016 (r306643) @@ -1,7 +1,7 @@ CC ?= gcc DESTDIR ?= /usr/local LD ?= gcc -C_COMMON_FLAGS ?= -fPIC -Wall -W -Wno-unused-parameter -Wno-pointer-sign -I./include -I./uthash -I./src +C_COMMON_FLAGS ?= -fPIC -Wall -W -Wno-unused-parameter -Wno-pointer-sign -I./include -I./uthash -I./src -I./klib MAJOR_VERSION = 0 MINOR_VERSION = 2 PATCH_VERSION = 9 @@ -25,13 +25,12 @@ HDEPS = $(SRCDIR)/ucl_hash.h \ $(SRCDIR)/ucl_chartable.h \ $(SRCDIR)/ucl_internal.h \ $(INCLUDEDIR)/ucl.h \ - $(SRCDIR)/xxhash.h + $(SRCDIR)/mum.h OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ - $(OBJDIR)/ucl_schema.o \ - $(OBJDIR)/xxhash.o + $(OBJDIR)/ucl_schema.o all: $(OBJDIR) $(OBJDIR)/$(SONAME) @@ -55,8 +54,6 @@ $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash $(CC) -o $(OBJDIR)/ucl_hash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_hash.c $(OBJDIR)/ucl_schema.o: $(SRCDIR)/ucl_schema.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_schema.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_schema.c -$(OBJDIR)/xxhash.o: $(SRCDIR)/xxhash.c $(HDEPS) - $(CC) -o $(OBJDIR)/xxhash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/xxhash.c clean: $(RM) $(OBJDIR)/*.o $(OBJDIR)/$(SONAME_FULL) $(OBJDIR)/$(SONAME) $(OBJDIR)/chargen $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/objdump $(OBJDIR)/test_generate $(OBJDIR)/test_schema || true Modified: projects/mips64-clang/contrib/libucl/Makefile.w32 ============================================================================== --- projects/mips64-clang/contrib/libucl/Makefile.w32 Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/Makefile.w32 Mon Oct 3 15:14:58 2016 (r306643) @@ -28,14 +28,13 @@ HDEPS = $(SRCDIR)/ucl_hash.h \ $(SRCDIR)/ucl_chartable.h \ $(SRCDIR)/ucl_internal.h \ $(INCLUDEDIR)/ucl.h \ - $(SRCDIR)/xxhash.h + $(SRCDIR)/mum.h OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ $(OBJDIR)/ucl_emitter_utils.o \ - $(OBJDIR)/ucl_schema.o \ - $(OBJDIR)/xxhash.o + $(OBJDIR)/ucl_schema.o all: $(OBJDIR) $(OBJDIR)/$(SONAME) Modified: projects/mips64-clang/contrib/libucl/README.md ============================================================================== --- projects/mips64-clang/contrib/libucl/README.md Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/README.md Mon Oct 3 15:14:58 2016 (r306643) @@ -12,7 +12,7 @@ - [Named keys hierarchy](#named-keys-hierarchy) - [Convenient numbers and booleans](#convenient-numbers-and-booleans) - [General improvements](#general-improvements) - - [Commments](#commments) + - [Comments](#comments) - [Macros support](#macros-support) - [Variables support](#variables-support) - [Multiline strings](#multiline-strings) @@ -21,7 +21,7 @@ - [Performance](#performance) - [Conclusion](#conclusion) -## Introduction +## Introduction This document describes the main features and principles of the configuration language called `UCL` - universal configuration language. @@ -47,7 +47,7 @@ section { string = "something"; subsection { host = { - host = "hostname"; + host = "hostname"; port = 900; } host = { @@ -163,9 +163,9 @@ section { } } ``` - + Plain definitions may be more complex and contain more than a single level of nested objects: - + ```nginx section "blah" "foo" { key = value; @@ -174,7 +174,7 @@ section "blah" "foo" { is presented as: -```nginx +```nginx section { blah { foo { @@ -196,17 +196,17 @@ section { ## General improvements -### Commments +### Comments UCL supports different style of comments: -* single line: `#` +* single line: `#` * multiline: `/* ... */` Multiline comments may be nested: ```c # Sample single line comment -/* +/* some comment /* nested comment */ end of comment @@ -263,7 +263,7 @@ all files that matches the specified pat for your operating system). This option is meaningless for URL includes. * `url` (default: **true**) - allow URL includes. * `path` (default: empty) - A UCL_ARRAY of directories to search for the include file. -Search ends after the first patch, unless `glob` is true, then all matches are included. +Search ends after the first match, unless `glob` is true, then all matches are included. * `prefix` (default false) - Put included contents inside an object, instead of loading them into the root. If no `key` is provided, one is automatically generated based on each files basename() * `key` (default: ) - Key to load contents of include into. If @@ -273,7 +273,7 @@ object or an array. * `priority` (default: 0) - specify priority for the include (see below). * `duplicate` (default: 'append') - specify policy of duplicates resolving: - `append` - default strategy, if we have new object of higher priority then it replaces old one, if we have new object with less priority it is ignored completely, and if we have two duplicate objects with the same priority then we have a multi-value key (implicit array) - - `merge` - if we have object or array, then new keys are merged inside, if we have a plain object then an implicit array is formed (regardeless of priorities) + - `merge` - if we have object or array, then new keys are merged inside, if we have a plain object then an implicit array is formed (regardless of priorities) - `error` - create error on duplicate keys and stop parsing - `rewrite` - always rewrite an old value with new one (ignoring priorities) @@ -320,7 +320,7 @@ Here are some rules for this syntax: * Multiline terminator must start just after `<<` symbols and it must consist of capital letters only (e.g. `< +#include +#include +#include #include #include @@ -100,6 +103,68 @@ private: return func; }; + static bool ucl_variable_getter(const unsigned char *data, size_t len, + unsigned char ** /*replace*/, size_t * /*replace_len*/, bool *need_free, void* ud) + { + *need_free = false; + + auto vars = reinterpret_cast *>(ud); + if (vars && data && len != 0) { + vars->emplace (data, data + len); + } + return false; + } + + static bool ucl_variable_replacer (const unsigned char *data, size_t len, + unsigned char **replace, size_t *replace_len, bool *need_free, void* ud) + { + *need_free = false; + + auto replacer = reinterpret_cast(ud); + if (!replacer) { + return false; + } + + std::string var_name (data, data + len); + if (!replacer->is_variable (var_name)) { + return false; + } + + std::string var_value = replacer->replace (var_name); + if (var_value.empty ()) { + return false; + } + + *replace = (unsigned char *)UCL_ALLOC (var_value.size ()); + memcpy (*replace, var_value.data (), var_value.size ()); + + *replace_len = var_value.size (); + *need_free = true; + + return true; + } + + template + static Ucl parse_with_strategy_function (C config_func, P parse_func, std::string &err) + { + auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); + + config_func (parser); + + if (!parse_func (parser)) { + err.assign (ucl_parser_get_error (parser)); + ucl_parser_free (parser); + + return nullptr; + } + + auto obj = ucl_parser_get_object (parser); + ucl_parser_free (parser); + + // Obj will handle ownership + return Ucl (obj); + } + std::unique_ptr obj; public: @@ -117,9 +182,9 @@ public: const_iterator(const Ucl &obj) { it = std::shared_ptr(ucl_object_iterate_new (obj.obj.get()), - ucl_iter_deleter()); + ucl_iter_deleter()); cur.reset (new Ucl(ucl_object_iterate_safe (it.get(), true))); - if (!*cur) { + if (cur->type() == UCL_NULL) { it.reset (); cur.reset (); } @@ -153,7 +218,7 @@ public: cur.reset (new Ucl(ucl_object_iterate_safe (it.get(), true))); } - if (!*cur) { + if (cur && cur->type() == UCL_NULL) { it.reset (); cur.reset (); } @@ -171,6 +236,17 @@ public: } }; + struct variable_replacer { + virtual ~variable_replacer() {} + + virtual bool is_variable (const std::string &str) const + { + return !str.empty (); + } + + virtual std::string replace (const std::string &var) const = 0; + }; + // We grab ownership if get non-const ucl_object_t Ucl(ucl_object_t *other) { obj.reset (other); @@ -211,20 +287,20 @@ public: obj.reset (ucl_object_fromstring_common (value.data (), value.size (), UCL_STRING_RAW)); } - Ucl(const char * value) { + Ucl(const char *value) { obj.reset (ucl_object_fromstring_common (value, 0, UCL_STRING_RAW)); } // Implicit constructor: anything with a to_json() function. template - Ucl(const T & t) : Ucl(t.to_ucl()) {} + Ucl(const T &t) : Ucl(t.to_ucl()) {} // Implicit constructor: map-like objects (std::map, std::unordered_map, etc) template ::value && std::is_constructible::value, int>::type = 0> - Ucl(const M & m) { + Ucl(const M &m) { obj.reset (ucl_object_typed_new (UCL_OBJECT)); auto cobj = obj.get (); @@ -238,7 +314,7 @@ public: template ::value, int>::type = 0> - Ucl(const V & v) { + Ucl(const V &v) { obj.reset (ucl_object_typed_new (UCL_ARRAY)); auto cobj = obj.get (); @@ -356,46 +432,138 @@ public: return out; } - static Ucl parse (const std::string & in, std::string & err) + static Ucl parse (const std::string &in, std::string &err) { - auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); + return parse (in, std::map(), err); + } - if (!ucl_parser_add_chunk (parser, (const unsigned char *)in.data (), - in.size ())) { - err.assign (ucl_parser_get_error (parser)); - ucl_parser_free (parser); + static Ucl parse (const std::string &in, const std::map &vars, std::string &err) + { + auto config_func = [&vars] (ucl_parser *parser) { + for (const auto & item : vars) { + ucl_parser_register_variable (parser, item.first.c_str (), item.second.c_str ()); + } + }; + + auto parse_func = [&in] (ucl_parser *parser) { + return ucl_parser_add_chunk (parser, (unsigned char *)in.data (), in.size ()); + }; + + return parse_with_strategy_function (config_func, parse_func, err); + } + static Ucl parse (const std::string &in, const variable_replacer &replacer, std::string &err) + { + auto config_func = [&replacer] (ucl_parser *parser) { + ucl_parser_set_variables_handler (parser, ucl_variable_replacer, + &const_cast(replacer)); + }; + + auto parse_func = [&in] (ucl_parser *parser) { + return ucl_parser_add_chunk (parser, (unsigned char *) in.data (), in.size ()); + }; + + return parse_with_strategy_function (config_func, parse_func, err); + } + + static Ucl parse (const char *in, std::string &err) + { + return parse (in, std::map(), err); + } + + static Ucl parse (const char *in, const std::map &vars, std::string &err) + { + if (!in) { + err = "null input"; return nullptr; } + return parse (std::string (in), vars, err); + } - auto obj = ucl_parser_get_object (parser); + static Ucl parse (const char *in, const variable_replacer &replacer, std::string &err) + { + if (!in) { + err = "null input"; + return nullptr; + } + return parse (std::string(in), replacer, err); + } + + static Ucl parse_from_file (const std::string &filename, std::string &err) + { + return parse_from_file (filename, std::map(), err); + } + + static Ucl parse_from_file (const std::string &filename, const std::map &vars, std::string &err) + { + auto config_func = [&vars] (ucl_parser *parser) { + for (const auto & item : vars) { + ucl_parser_register_variable (parser, item.first.c_str (), item.second.c_str ()); + } + }; + + auto parse_func = [&filename] (ucl_parser *parser) { + return ucl_parser_add_file (parser, filename.c_str ()); + }; + + return parse_with_strategy_function (config_func, parse_func, err); + } + + static Ucl parse_from_file (const std::string &filename, const variable_replacer &replacer, std::string &err) + { + auto config_func = [&replacer] (ucl_parser *parser) { + ucl_parser_set_variables_handler (parser, ucl_variable_replacer, + &const_cast(replacer)); + }; + + auto parse_func = [&filename] (ucl_parser *parser) { + return ucl_parser_add_file (parser, filename.c_str ()); + }; + + return parse_with_strategy_function (config_func, parse_func, err); + } + + static std::vector find_variable (const std::string &in) + { + auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); + + std::set vars; + ucl_parser_set_variables_handler (parser, ucl_variable_getter, &vars); + ucl_parser_add_chunk (parser, (const unsigned char *)in.data (), in.size ()); ucl_parser_free (parser); - // Obj will handle ownership - return Ucl (obj); + std::vector result; + std::move (vars.begin (), vars.end (), std::back_inserter (result)); + return result; } - static Ucl parse (const char * in, std::string & err) + static std::vector find_variable (const char *in) { - if (in) { - return parse (std::string(in), err); - } else { - err = "null input"; - return nullptr; + if (!in) { + return std::vector(); } + return find_variable (std::string (in)); } - static Ucl parse (std::istream &ifs, std::string &err) + static std::vector find_variable_from_file (const std::string &filename) { - return Ucl::parse (std::string(std::istreambuf_iterator(ifs), - std::istreambuf_iterator()), err); + auto parser = ucl_parser_new (UCL_PARSER_DEFAULT); + + std::set vars; + ucl_parser_set_variables_handler (parser, ucl_variable_getter, &vars); + ucl_parser_add_file (parser, filename.c_str ()); + ucl_parser_free (parser); + + std::vector result; + std::move (vars.begin (), vars.end (), std::back_inserter (result)); + return std::move (result); } - Ucl& operator= (Ucl rhs) - { - obj.swap (rhs.obj); - return *this; - } + Ucl& operator= (Ucl rhs) + { + obj.swap (rhs.obj); + return *this; + } bool operator== (const Ucl &rhs) const { Modified: projects/mips64-clang/contrib/libucl/include/ucl.h ============================================================================== --- projects/mips64-clang/contrib/libucl/include/ucl.h Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/include/ucl.h Mon Oct 3 15:14:58 2016 (r306643) @@ -1016,7 +1016,6 @@ UCL_EXTERN bool ucl_parser_add_string_pr * Load and add data from a file * @param parser parser structure * @param filename the name of file - * @param err if *err is NULL it is set to parser error * @return true if chunk has been added and false in case of error */ UCL_EXTERN bool ucl_parser_add_file (struct ucl_parser *parser, @@ -1026,7 +1025,6 @@ UCL_EXTERN bool ucl_parser_add_file (str * Load and add data from a file * @param parser parser structure * @param filename the name of file - * @param err if *err is NULL it is set to parser error * @param priority the desired priority of a chunk (only 4 least significant bits * are considered for this parameter) * @return true if chunk has been added and false in case of error @@ -1035,6 +1033,20 @@ UCL_EXTERN bool ucl_parser_add_file_prio const char *filename, unsigned priority); /** + * Load and add data from a file + * @param parser parser structure + * @param filename the name of file + * @param priority the desired priority of a chunk (only 4 least significant bits + * are considered for this parameter) + * @param strat Merge strategy to use while parsing this file + * @param parse_type Parser type to use while parsing this file + * @return true if chunk has been added and false in case of error + */ +UCL_EXTERN bool ucl_parser_add_file_full (struct ucl_parser *parser, const char *filename, + unsigned priority, enum ucl_duplicate_strategy strat, + enum ucl_parse_type parse_type); + +/** * Load and add data from a file descriptor * @param parser parser structure * @param filename the name of file Copied: projects/mips64-clang/contrib/libucl/m4/gcov.m4 (from r306637, head/contrib/libucl/m4/gcov.m4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips64-clang/contrib/libucl/m4/gcov.m4 Mon Oct 3 15:14:58 2016 (r306643, copy of r306637, head/contrib/libucl/m4/gcov.m4) @@ -0,0 +1,89 @@ +# SYNOPSIS +# +# Add code coverage support with gcov/lcov. +# +# AX_CODE_COVERAGE() +# +# DESCRIPTION +# +# Provides a --enable-coverage option which checks for available +# gcov/lcov binaries and provides ENABLE_CODE_COVERAGE conditional. +# +# LAST MODIFICATION +# +# $Id: coverage.m4 40881 2013-08-20 17:54:39Z damon $ +# +# COPYLEFT +# +# Copyright (c) 2012 Roy H. Stogner +# Copyright (c) 2010 Karl W. Schulz +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +AC_DEFUN([AX_CODE_COVERAGE], +[ + +AC_ARG_ENABLE(coverage, AC_HELP_STRING([--enable-coverage],[configure code coverage analysis tools])) + +HAVE_GCOV_TOOLS=0 + +GCOV_FLAGS="" + +if test "x$enable_coverage" = "xyes"; then + + # ---------------------------- + # Check for gcov/lcov binaries + # ---------------------------- + + AC_ARG_VAR([GCOV], [Coverage testing command]) + if test "x$GCOV" = "x"; then + AC_PATH_PROG(GCOV, gcov, no) + else + AC_PATH_PROG(GCOV, $GCOV, no) + fi + + AC_PATH_PROG(LCOV, lcov, no) + AC_PATH_PROG(GENHTML, genhtml) + + # ---------------------------------- + # include coverage compiler options + # ---------------------------------- + AC_MSG_CHECKING([for clang]) + + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([], [[ + #ifndef __clang__ + not clang + #endif + ]])], + [CLANG=yes], [CLANG=no]) + + AC_MSG_RESULT([$CLANG]) + HAVE_GCOV_TOOLS=1 + COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage" + COVERAGE_LDFLAGS="--coverage -fprofile-arcs -ftest-coverage" + COVERAGE_OPTFLAGS="-O0" + + # Test for C... + CFLAGS="${GCOV_FLAGS} ${CFLAGS}" + CXXFLAGS="${GCOV_FLAGS} ${CXXFLAGS}" + if test "x$GCC" = "xyes" -a "x$CLANG" = "xno"; then + COVERAGE_LIBS="-lgcov" + else + COVERAGE_LIBS="" + fi +fi + +AC_SUBST([GCOV]) +AC_SUBST([LCOV]) +AC_SUBST([GENHTML]) +AC_SUBST([GENHTML_OPTIONS]) +AC_SUBST([COVERAGE_CFLAGS]) +AC_SUBST([COVERAGE_OPTFLAGS]) +AC_SUBST([COVERAGE_LDFLAGS]) +AC_SUBST([COVERAGE_LIBS]) +AM_CONDITIONAL(CODE_COVERAGE_ENABLED,test x$HAVE_GCOV_TOOLS = x1) + +]) Modified: projects/mips64-clang/contrib/libucl/python/setup.py ============================================================================== --- projects/mips64-clang/contrib/libucl/python/setup.py Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/python/setup.py Mon Oct 3 15:14:58 2016 (r306643) @@ -1,37 +1,43 @@ -import distutils.ccompiler -import distutils.sysconfig -from distutils.core import setup, Extension +try: + from setuptools import setup, Extension +except ImportError: + from distutils.core import setup, Extension + import os +import sys +tests_require = [] -compiler = distutils.ccompiler.new_compiler() -search_paths=[os.path.expanduser('~/{}'), '/opt/local/{}', '/usr/local/{}', '/usr/{}'] -lib_paths = [ a.format("lib") for a in search_paths] -inc_paths = [ a.format("include") for a in search_paths] +if sys.version < '2.7': + tests_require.append('unittest2') -uclmodule = Extension('ucl', - include_dirs = inc_paths, - library_dirs = lib_paths, - libraries = ['ucl'], - sources = ['src/uclmodule.c'], - runtime_library_dirs = lib_paths, - language='c') +uclmodule = Extension( + 'ucl', + libraries = ['ucl'], + sources = ['src/uclmodule.c'], + language = 'c' +) -setup(name='ucl', - version='1.0', - description='ucl parser and emmitter', +setup( + name = 'ucl', + version = '0.8', + description = 'ucl parser and emmitter', ext_modules = [uclmodule], - author="Eitan Adler", - author_email="lists@eitanadler.com", - url="https://github.com/vstakhov/libucl/", - license="MIT", - classifiers=["Development Status :: 3 - Alpha", + test_suite = 'tests', + tests_require = tests_require, + author = "Eitan Adler, Denis Volpato Martins", + author_email = "lists@eitanadler.com", + url = "https://github.com/vstakhov/libucl/", + license = "MIT", + classifiers = [ + "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "License :: DFSG approved", "License :: OSI Approved :: MIT License", "Programming Language :: C", + "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development :: Libraries", - ] - ) + ] +) Modified: projects/mips64-clang/contrib/libucl/python/src/uclmodule.c ============================================================================== --- projects/mips64-clang/contrib/libucl/python/src/uclmodule.c Mon Oct 3 14:59:32 2016 (r306642) +++ projects/mips64-clang/contrib/libucl/python/src/uclmodule.c Mon Oct 3 15:14:58 2016 (r306643) @@ -2,6 +2,8 @@ #include #include +static PyObject *SchemaError; + static PyObject * _basic_ucl_type (ucl_object_t const *obj) { @@ -13,9 +15,11 @@ _basic_ucl_type (ucl_object_t const *obj case UCL_STRING: return Py_BuildValue ("s", ucl_object_tostring (obj)); case UCL_BOOLEAN: - return ucl_object_toboolean (obj) ? Py_True : Py_False; + return PyBool_FromLong (ucl_object_toboolean (obj)); case UCL_TIME: return Py_BuildValue ("d", ucl_object_todouble (obj)); + case UCL_NULL: + Py_RETURN_NONE; } return NULL; } @@ -124,26 +128,60 @@ _iterate_python (PyObject *obj) { if (obj == Py_None) { return ucl_object_new(); - } else if (PyBool_Check (obj)) { + } + else if (PyBool_Check (obj)) { return ucl_object_frombool (obj == Py_True); - } else if (PyInt_Check (obj)) { + } +#if PY_MAJOR_VERSION < 3 + else if (PyInt_Check (obj)) { return ucl_object_fromint (PyInt_AsLong (obj)); - } else if (PyFloat_Check (obj)) { + } +#endif + else if (PyLong_Check (obj)) { + return ucl_object_fromint (PyLong_AsLong (obj)); + } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Thu Oct 6 21:43:20 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69068BEC32D for ; Thu, 6 Oct 2016 21:43:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1BE051C0; Thu, 6 Oct 2016 21:43:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u96LhJ7j088445; Thu, 6 Oct 2016 21:43:19 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u96LhJAe088444; Thu, 6 Oct 2016 21:43:19 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610062143.u96LhJAe088444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 6 Oct 2016 21:43:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306791 - projects/doctools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2016 21:43:20 -0000 Author: bapt Date: Thu Oct 6 21:43:19 2016 New Revision: 306791 URL: https://svnweb.freebsd.org/changeset/base/306791 Log: Create a branch to work on importing heirloom doctools The goal here is to replace the old GNU groff with heirloom doctools The import would be partial, only the tools that are not yet in base Added: - copied from r306790, head/ Directory Properties: projects/doctools/ (props changed) From owner-svn-src-projects@freebsd.org Sat Oct 8 17:58:42 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21A83C06621 for ; Sat, 8 Oct 2016 17:58:42 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CF9B0C93; Sat, 8 Oct 2016 17:58:41 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98HweZ2089511; Sat, 8 Oct 2016 17:58:40 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98Hwenw089510; Sat, 8 Oct 2016 17:58:40 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081758.u98Hwenw089510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 17:58:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306856 - projects/doctools/contrib/heirloom-doctools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 17:58:42 -0000 Author: bapt Date: Sat Oct 8 17:58:40 2016 New Revision: 306856 URL: https://svnweb.freebsd.org/changeset/base/306856 Log: Import heirloom doctools into contrib Added: projects/doctools/contrib/heirloom-doctools/ - copied from r306854, vendor/heirloom-doctools/ From owner-svn-src-projects@freebsd.org Sat Oct 8 18:15:13 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45848C06B19 for ; Sat, 8 Oct 2016 18:15:13 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1CA99CA; Sat, 8 Oct 2016 18:15:12 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98IFCnE096822; Sat, 8 Oct 2016 18:15:12 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98IFCjB096821; Sat, 8 Oct 2016 18:15:12 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081815.u98IFCjB096821@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 18:15:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306858 - projects/doctools/contrib/heirloom-doctools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 18:15:13 -0000 Author: bapt Date: Sat Oct 8 18:15:11 2016 New Revision: 306858 URL: https://svnweb.freebsd.org/changeset/base/306858 Log: Remove badly imported heirloom-doctools Deleted: projects/doctools/contrib/heirloom-doctools/ From owner-svn-src-projects@freebsd.org Sat Oct 8 18:16:20 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51ABEC06B72 for ; Sat, 8 Oct 2016 18:16:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09D78AFB; Sat, 8 Oct 2016 18:16:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98IGJQA096909; Sat, 8 Oct 2016 18:16:19 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98IGJhU096908; Sat, 8 Oct 2016 18:16:19 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081816.u98IGJhU096908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 18:16:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306859 - projects/doctools/contrib/heirloom-doctools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 18:16:20 -0000 Author: bapt Date: Sat Oct 8 18:16:18 2016 New Revision: 306859 URL: https://svnweb.freebsd.org/changeset/base/306859 Log: Import properly heirloom doctools this time Added: projects/doctools/contrib/heirloom-doctools/ - copied from r306858, vendor/heirloom-doctools/dist/ From owner-svn-src-projects@freebsd.org Sat Oct 8 18:20:24 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96748C06C9B for ; Sat, 8 Oct 2016 18:20:24 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37B56E9F; Sat, 8 Oct 2016 18:20:24 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98IKNI0097314; Sat, 8 Oct 2016 18:20:23 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98IKMWN097304; Sat, 8 Oct 2016 18:20:22 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081820.u98IKMWN097304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 18:20:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306861 - in projects/doctools/cddl/usr.bin/doctools: . eqn eqn/eqn eqn/eqnchar eqn/neqn grap pic picpack ptx refer tbl troff troff/libhnj troff/nroff troff/troff troff/troff/dpost trof... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 18:20:24 -0000 Author: bapt Date: Sat Oct 8 18:20:22 2016 New Revision: 306861 URL: https://svnweb.freebsd.org/changeset/base/306861 Log: Add a doctools subdirectory in cddl/usr.bin Given that most of the heirloom doctools are under CDDL license, make it live under the CDDL directory. Only build the doctools components which does not already exists in FreeBSD. Added: projects/doctools/cddl/usr.bin/doctools/ projects/doctools/cddl/usr.bin/doctools/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/Makefile.inc (contents, props changed) projects/doctools/cddl/usr.bin/doctools/eqn/ projects/doctools/cddl/usr.bin/doctools/eqn/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/eqn/Makefile.inc (contents, props changed) projects/doctools/cddl/usr.bin/doctools/eqn/eqn/ projects/doctools/cddl/usr.bin/doctools/eqn/eqn/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/eqn/eqnchar/ projects/doctools/cddl/usr.bin/doctools/eqn/eqnchar/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/eqn/neqn/ projects/doctools/cddl/usr.bin/doctools/eqn/neqn/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/grap/ projects/doctools/cddl/usr.bin/doctools/grap/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/pic/ projects/doctools/cddl/usr.bin/doctools/pic/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/pic/picl.c (contents, props changed) projects/doctools/cddl/usr.bin/doctools/picpack/ projects/doctools/cddl/usr.bin/doctools/picpack/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/ptx/ projects/doctools/cddl/usr.bin/doctools/ptx/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/refer/ projects/doctools/cddl/usr.bin/doctools/refer/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/tbl/ projects/doctools/cddl/usr.bin/doctools/tbl/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/troff/ projects/doctools/cddl/usr.bin/doctools/troff/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/troff/Makefile.inc (contents, props changed) projects/doctools/cddl/usr.bin/doctools/troff/libhnj/ projects/doctools/cddl/usr.bin/doctools/troff/libhnj/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/troff/nroff/ projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/troff/troff/ projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile.inc (contents, props changed) projects/doctools/cddl/usr.bin/doctools/troff/troff/dhtml.c (contents, props changed) projects/doctools/cddl/usr.bin/doctools/troff/troff/dpost/ projects/doctools/cddl/usr.bin/doctools/troff/troff/dpost/Makefile (contents, props changed) projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/ projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile (contents, props changed) Added: projects/doctools/cddl/usr.bin/doctools/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/Makefile Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,11 @@ +SUBDIR= \ + eqn \ + tbl \ + pic \ + grap \ + refer \ + troff \ + picpack \ + ptx + +.include Added: projects/doctools/cddl/usr.bin/doctools/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/Makefile.inc Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,13 @@ +DOCTOOLSDIR= ${SRCTOP}/contrib/heirloom-doctools +CFLAGS+= -I${DOCTOOLSDIR}/include +NO_WERROR= yes +LIBDIR= /usr/libexec/doctools +REDFIR= ${LIBDIR}/reftools +HYPDIR= ${LIBDIR}/hyphen +SHAREDIR= /usr/share/doctools +FNTDIR= ${SHAREDIR}/font +MACDIR= ${SHAREDIR}/tmac +PSTDIR= ${SHAREDIR}/devpost/postscript +PUBDIR= ${SHAREDIR}/pub +TABDIR= ${SHAREDIR}/nterm +.include "../Makefile.inc" Added: projects/doctools/cddl/usr.bin/doctools/eqn/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/eqn/Makefile Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,6 @@ +SUBDIR= \ + eqn \ + eqnchar \ + neqn + +.include Added: projects/doctools/cddl/usr.bin/doctools/eqn/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/eqn/Makefile.inc Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,6 @@ +CFLAGS+= -I${DOCTOOLSDIR}/eqn \ + -DPUBDIR="${PUBDIR}" + +.include "../Makefile.inc" + +.PATH: ${DOCTOOLSDIR}/eqn Added: projects/doctools/cddl/usr.bin/doctools/eqn/eqn/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/eqn/eqn/Makefile Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,39 @@ + +PROGS= eqn checkeq +SRCS.eqn= diacrit.c \ + e.y \ + y.tab.h \ + eqnbox.c \ + font.c \ + fromto.c \ + funny.c \ + glob.c \ + integral.c \ + io.c \ + lex.c \ + lookup.c \ + mark.c \ + matrix.c \ + move.c \ + over.c \ + paren.c \ + pile.c \ + shift.c \ + size.c \ + sqrt.c \ + text.c + +SRCS.checkeq= checkeq.c + +MAN= eqn.1 \ + eqnchar.7 +MLINKS= eqn.1 checkeq.1 \ + eqn.1 neqn.1 + +CLEANFILES+= y.tab.h + +CFLAGS+= -I. + +.include + +.PATH: ${DOCTOOLSDIR}/eqn/eqn.d ${DOCTOOLSDIR}/eqn/checkeq.d Added: projects/doctools/cddl/usr.bin/doctools/eqn/eqnchar/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/eqn/eqnchar/Makefile Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,17 @@ +CLEANFILES= genutf8 utf-8 + +FILES+= ascii eqnchar greek iso utf-8 +FILESDIR+= ${PUBDIR} +CFLAGS+= -DEUC + +build-tools: genutf8 + +genutf8: genutf8.c + ${CC} -o $@ ${CFLAGS} $< + +utf-8: genutf8 + ./genutf8 >utf-8 + +.include + +.PATH: ${DOCTOOLSDIR}/eqn/eqnchar.d Added: projects/doctools/cddl/usr.bin/doctools/eqn/neqn/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/eqn/neqn/Makefile Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,33 @@ +PROG= neqn +SRCS= diacrit.c \ + e.y \ + y.tab.h \ + eqnbox.c \ + font.c \ + fromto.c \ + funny.c \ + glob.c \ + integral.c \ + io.c \ + lex.c \ + lookup.c \ + mark.c \ + matrix.c \ + move.c \ + over.c \ + paren.c \ + pile.c \ + shift.c \ + size.c \ + sqrt.c \ + text.c + +MAN= + +CLEANFILES+= y.tab.h + +CFLAGS+= -I. -DNEON + +.include + +.PATH: ${DOCTOOLSDIR}/eqn/neqn.d Added: projects/doctools/cddl/usr.bin/doctools/grap/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/grap/Makefile Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,27 @@ +PROG= grap +SRCS= coord.c \ + for.c \ + frame.c \ + grap.y \ + grapl.c \ + input.c \ + label.c \ + main.c \ + misc.c \ + plot.c \ + print.c \ + ticks.c \ + version.c \ + y.tab.h + +FILES= grap.defines +FILESDIR= ${LIBDIR} + +CLEANFILES= grapl.c + +CFLAGS= -I. -I${DOCTOOLSDIR}/grap -DLIBDIR='"${LIBDIR}"' +LIBADD= m + +.include + +.PATH: ${DOCTOOLSDIR}/grap Added: projects/doctools/cddl/usr.bin/doctools/pic/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/pic/Makefile Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,26 @@ +PROG= pic +SRCS= arcgen.c \ + blockgen.c \ + boxgen.c \ + circgen.c \ + for.c \ + input.c \ + linegen.c \ + main.c \ + misc.c \ + movegen.c \ + picl.c \ + picy.y \ + pltroff.c \ + print.c \ + symtab.c \ + textgen.c \ + version.c \ + y.tab.h + +LIBADD= m + +CFLAGS+= -I${DOCTOOLSDIR}/pic -I. + +.include +.PATH: ${DOCTOOLSDIR}/pic Added: projects/doctools/cddl/usr.bin/doctools/pic/picl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/cddl/usr.bin/doctools/pic/picl.c Sat Oct 8 18:20:22 2016 (r306861) @@ -0,0 +1,3045 @@ + +#line 3 "" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 37 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +#if defined(__FreeBSD__) +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS +#endif +#include +#include +#else +#define __dead2 +#endif + +/* begin standard C headers. */ +#include +#include +#include +#include + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined(__FreeBSD__) || \ + (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! C99 */ + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* Returned upon end-of-file. */ +#define YY_NULL 0 + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. + */ +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +/* Enter a start condition. This macro really ought to take a parameter, + * but we do it the disgusting crufty way forced on us by the ()-less + * definition of BEGIN. + */ +#define BEGIN (yy_start) = 1 + 2 * + +/* Translate the current start state into a value that can be later handed + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. + */ +#define YY_START (((yy_start) - 1) / 2) +#define YYSTATE YY_START + +/* Action number for EOF rule of a given start state. */ +#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + +/* Special action meaning "start processing a new file". */ +#define YY_NEW_FILE yyrestart(yyin ) + +#define YY_END_OF_BUFFER_CHAR 0 + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t yyleng; + +extern FILE *yyin, *yyout; + +#define EOB_ACT_CONTINUE_SCAN 0 +#define EOB_ACT_END_OF_FILE 1 +#define EOB_ACT_LAST_MATCH 2 + + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ + YY_RESTORE_YY_MORE_OFFSET \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + } \ + while ( 0 ) + +#define unput(c) yyunput( c, (yytext_ptr) ) + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + yy_size_t yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + +#define YY_BUFFER_NEW 0 +#define YY_BUFFER_NORMAL 1 + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ +#define YY_BUFFER_EOF_PENDING 2 + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ + +/* We provide macros for accessing buffer states in case in the + * future we want to put the buffer states in a more general + * "scanner state". + * + * Returns the top of the stack, or NULL. + */ +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) +#define yy_current_buffer YY_CURRENT_BUFFER + +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] + +/* yy_hold_char holds the character lost when yytext is formed. */ +static char yy_hold_char; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t yyleng; + +/* Points to current character in buffer. */ +static char *yy_c_buf_p = (char *) 0; +static int yy_init = 0; /* whether we need to initialize */ +static int yy_start = 0; /* start state number */ + +/* Flag which is used to allow yywrap()'s to do buffer switches + * instead of setting up a fresh yyin. A bit of a hack ... + */ +static int yy_did_buffer_switch_on_eof; + +void yyrestart (FILE *input_file ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); +void yy_delete_buffer (YY_BUFFER_STATE b ); +void yy_flush_buffer (YY_BUFFER_STATE b ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state (void ); + +static void yyensure_buffer_stack (void ); +static void yy_load_buffer_state (void ); +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); + +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); + +void *yyalloc (yy_size_t ); +void *yyrealloc (void *,yy_size_t ); +void yyfree (void * ); + +#define yy_new_buffer yy_create_buffer + +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +/* Begin user sect3 */ + +typedef unsigned char YY_CHAR; + +FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; + +typedef int yy_state_type; + +extern int yylineno; + +int yylineno = 1; + +extern char *yytext; +#define yytext_ptr yytext + +static yy_state_type yy_get_previous_state (void ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); +static int yy_get_next_buffer (void ); +static void yy_fatal_error (yyconst char msg[] ) __dead2; + +/* Done after the current pattern has been matched and before the + * corresponding action - sets up yytext. + */ +#define YY_DO_BEFORE_ACTION \ + (yytext_ptr) = yy_bp; \ + yyleng = (size_t) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ + *yy_cp = '\0'; \ + (yy_c_buf_p) = yy_cp; + +#define YY_NUM_RULES 147 +#define YY_END_OF_BUFFER 148 +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[610] = + { 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 148, 147, 146, 1, + 3, 116, 138, 145, 146, 146, 146, 136, 4, 113, + 146, 112, 137, 137, 146, 146, 6, 137, 137, 137, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 146, 146, 5, 10, 10, + 137, 144, 140, 139, 144, 132, 123, 123, 130, 129, + 111, 145, 114, 85, 136, 36, 37, 29, 0, 32, + 33, 30, 35, 34, 31, 87, 88, 136, 136, 0, + 136, 0, 0, 0, 0, 84, 110, 108, 109, 137, + + 137, 20, 2, 137, 137, 137, 94, 137, 137, 95, + 137, 137, 137, 137, 137, 137, 68, 137, 137, 137, + 120, 137, 137, 137, 137, 137, 137, 137, 137, 59, + 125, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 26, 137, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 137, 137, 137, 93, 137, 66, 137, 137, + 137, 0, 7, 0, 115, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 137, 141, 143, 142, 132, 123, 129, 0, 0, + 0, 0, 0, 89, 0, 40, 0, 42, 0, 0, + + 41, 0, 0, 43, 0, 0, 0, 136, 0, 136, + 135, 86, 137, 137, 25, 14, 137, 137, 137, 137, + 137, 12, 70, 137, 137, 137, 137, 137, 101, 137, + 137, 137, 75, 137, 137, 137, 137, 137, 99, 137, + 137, 118, 137, 137, 137, 107, 137, 137, 137, 137, + 137, 98, 137, 105, 106, 137, 137, 137, 137, 61, + 137, 137, 137, 137, 137, 128, 100, 137, 137, 137, + 137, 137, 137, 137, 27, 137, 137, 137, 137, 137, + 28, 137, 60, 137, 0, 10, 10, 9, 8, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + + 10, 10, 10, 10, 10, 10, 10, 10, 137, 36, + 0, 0, 39, 0, 0, 0, 91, 0, 0, 0, + 34, 0, 90, 117, 137, 137, 137, 137, 137, 137, + 137, 77, 137, 137, 121, 76, 137, 62, 137, 67, + 137, 137, 127, 0, 0, 73, 137, 92, 137, 137, + 137, 97, 64, 18, 137, 137, 19, 137, 137, 137, + 137, 104, 137, 137, 137, 23, 63, 137, 137, 137, + 137, 137, 103, 137, 126, 137, 137, 0, 0, 137, + 137, 137, 137, 137, 96, 10, 10, 9, 8, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + + 10, 10, 10, 137, 0, 0, 29, 0, 32, 0, + 0, 0, 0, 0, 31, 0, 81, 16, 102, 82, + 137, 137, 137, 137, 137, 137, 137, 137, 137, 0, + 0, 137, 0, 134, 137, 137, 71, 0, 0, 79, + 137, 137, 137, 11, 137, 21, 65, 80, 74, 137, + 137, 137, 137, 137, 137, 122, 0, 137, 124, 137, + 0, 0, 60, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 137, 0, 0, 0, 33, + 0, 30, 35, 38, 90, 137, 137, 83, 13, 137, + 76, 137, 137, 75, 0, 137, 54, 137, 137, 0, + + 0, 0, 72, 0, 0, 61, 0, 0, 0, 0, + 17, 78, 137, 0, 0, 137, 44, 0, 137, 0, + 0, 0, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 137, 36, 37, 91, 24, 0, 0, 0, 0, + 137, 131, 137, 51, 15, 137, 48, 0, 0, 0, + 0, 0, 22, 0, 133, 137, 0, 0, 49, 10, + 10, 10, 119, 0, 0, 137, 62, 137, 0, 0, + 45, 50, 47, 53, 133, 137, 0, 0, 46, 52, + 69, 71, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 58, 0, 57, 0, 56, 55, 0 + } ; + +static yyconst flex_int32_t yy_ec[256] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 4, 5, 6, 1, 1, 7, 8, 1, + 1, 1, 9, 1, 10, 11, 1, 12, 12, 13, + 12, 12, 12, 12, 12, 12, 12, 1, 14, 15, + 16, 17, 1, 1, 18, 18, 18, 18, 19, 18, + 18, 20, 18, 18, 18, 18, 18, 18, 18, 21, + 18, 18, 22, 18, 18, 18, 18, 18, 18, 18, + 23, 24, 25, 1, 18, 1, 26, 27, 28, 29, + + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + } ; + +static yyconst flex_int32_t yy_meta[55] = + { 0, + 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 4, 4, 1, 1, 1, 1, 5, 5, 5, + 5, 5, 1, 1, 1, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 1, 1, 1 + } ; + +static yyconst flex_int16_t yy_base[623] = + { 0, + 0, 0, 0, 47, 54, 57, 81, 0, 0, 0, + 0, 0, 135, 0, 189, 0, 899, 900, 900, 900, + 900, 882, 900, 0, 890, 879, 232, 272, 900, 51, + 879, 878, 0, 863, 867, 888, 900, 29, 216, 224, + 39, 260, 37, 218, 216, 270, 253, 850, 858, 845, + 288, 286, 30, 210, 244, 286, 834, 900, 0, 330, + 847, 900, 900, 900, 289, 0, 900, 0, 900, 0, + 900, 0, 900, 900, 325, 845, 854, 264, 223, 853, + 299, 299, 300, 842, 316, 900, 900, 352, 0, 375, + 900, 852, 851, 834, 845, 860, 900, 900, 900, 0, + + 833, 900, 900, 835, 845, 293, 847, 304, 307, 0, + 824, 832, 830, 826, 828, 254, 0, 823, 835, 839, + 344, 820, 264, 834, 821, 230, 818, 820, 825, 0, + 0, 325, 814, 826, 817, 809, 329, 805, 814, 805, + 338, 0, 817, 337, 806, 817, 802, 809, 844, 25, + 353, 354, 802, 818, 353, 802, 364, 801, 791, 796, + 365, 398, 836, 835, 900, 0, 333, 393, 376, 797, + 806, 376, 373, 805, 377, 382, 381, 794, 390, 0, + 0, 804, 900, 900, 900, 0, 0, 0, 787, 792, + 786, 800, 794, 900, 796, 900, 783, 900, 796, 792, + + 900, 777, 796, 900, 780, 776, 790, 418, 401, 420, + 900, 900, 788, 770, 0, 0, 776, 776, 774, 765, + 767, 0, 0, 766, 769, 781, 780, 757, 0, 773, + 771, 766, 758, 763, 756, 766, 769, 417, 0, 761, + 753, 0, 758, 763, 757, 0, 759, 747, 746, 760, + 745, 0, 758, 0, 0, 757, 757, 740, 745, 749, + 753, 751, 747, 735, 748, 775, 0, 746, 741, 729, + 739, 404, 727, 728, 731, 382, 433, 739, 734, 737, + 0, 721, 720, 731, 760, 430, 0, 0, 0, 717, + 722, 716, 730, 724, 0, 726, 0, 713, 0, 726, + + 722, 0, 707, 726, 0, 710, 706, 720, 717, 702, + 701, 700, 900, 712, 698, 697, 707, 707, 694, 695, + 900, 692, 691, 0, 705, 686, 720, 684, 701, 690, + 699, 0, 691, 691, 0, 696, 686, 694, 693, 0, + 434, 681, 0, 442, 718, 0, 675, 0, 686, 672, + 673, 0, 443, 0, 671, 672, 0, 682, 680, 667, + 665, 0, 665, 664, 663, 0, 0, 678, 673, 666, + 678, 664, 0, 657, 0, 655, 698, 444, 696, 667, + 660, 653, 445, 662, 0, 437, 443, 0, 0, 649, + 648, 647, 0, 659, 645, 644, 654, 654, 641, 642, + + 0, 639, 638, 642, 641, 650, 900, 646, 900, 645, + 631, 631, 642, 629, 900, 640, 0, 0, 0, 0, + 642, 633, 627, 639, 620, 638, 636, 620, 635, 449, + 660, 618, 630, 0, 615, 630, 624, 451, 654, 0, + 457, 626, 459, 0, 611, 0, 461, 0, 0, 462, + 624, 624, 607, 463, 619, 648, 618, 458, 0, 469, + 470, 645, 0, 607, 616, 0, 612, 0, 611, 597, + 597, 608, 595, 0, 606, 595, 599, 593, 590, 900, + 590, 900, 900, 900, 900, 594, 472, 474, 0, 598, + 0, 629, 600, 0, 598, 598, 900, 597, 599, 594, + + 458, 621, 0, 476, 620, 0, 478, 619, 488, 618, + 0, 0, 589, 495, 616, 585, 900, 615, 577, 462, + 612, 583, 575, 569, 566, 0, 566, 0, 0, 0, + 0, 606, 900, 900, 900, 0, 501, 602, 502, 601, + 556, 593, 536, 900, 0, 535, 900, 528, 523, 525, + 523, 522, 0, 520, 0, 520, 519, 514, 900, 0, + 0, 0, 900, 515, 514, 514, 0, 510, 507, 502, + 900, 900, 900, 900, 0, 530, 496, 492, 900, 900, + 0, 0, 478, 489, 475, 480, 505, 461, 506, 443, + 507, 476, 509, 512, 467, 513, 431, 515, 359, 293, + + 519, 304, 900, 219, 900, 44, 900, 900, 900, 559, + 564, 569, 571, 576, 578, 580, 582, 587, 592, 597, + 601, 603 + } ; + +static yyconst flex_int16_t yy_def[623] = + { 0, + 610, 610, 609, 3, 611, 611, 609, 7, 610, 610, + 610, 610, 609, 13, 609, 15, 609, 609, 609, 609, + 609, 609, 609, 612, 609, 609, 609, 609, 609, 609, + 609, 609, 613, 613, 609, 609, 609, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 609, 609, 609, 614, 614, + 613, 609, 609, 609, 609, 615, 609, 616, 609, 617, + 609, 612, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 28, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 613, + + 613, 609, 609, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 609, 609, 618, 609, 614, 614, 614, 614, 614, + 614, 614, 614, 614, 614, 614, 614, 614, 614, 614, + 614, 613, 609, 609, 609, 615, 616, 617, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 609, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 618, 614, 614, 619, 620, 614, + 614, 614, 614, 614, 614, 614, 614, 614, 614, 614, + + 614, 614, 614, 614, 614, 614, 614, 614, 613, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 609, 609, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 609, 609, 613, + 613, 613, 613, 613, 613, 614, 614, 619, 620, 614, + 614, 614, 614, 614, 614, 614, 614, 614, 614, 614, + + 614, 614, 614, 613, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 609, + 609, 613, 609, 613, 613, 613, 613, 609, 609, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 609, 609, 613, 613, 613, + 609, 609, 613, 614, 614, 614, 614, 614, 614, 614, + 614, 614, 614, 614, 614, 613, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 609, 613, 609, 613, 613, 609, + + 609, 609, 613, 609, 609, 613, 609, 609, 609, 609, + 613, 613, 613, 609, 609, 613, 609, 621, 613, 609, + 609, 609, 614, 614, 614, 614, 614, 614, 614, 614, + 614, 613, 609, 609, 609, 613, 609, 609, 609, 609, + 613, 609, 613, 609, 613, 613, 609, 609, 609, 609, + 609, 609, 613, 609, 622, 613, 609, 609, 609, 614, + 614, 614, 609, 609, 609, 613, 613, 613, 609, 609, + 609, 609, 609, 609, 622, 613, 609, 609, 609, 609, + 613, 613, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + + 609, 609, 609, 609, 609, 609, 609, 609, 0, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609 + } ; + +static yyconst flex_int16_t yy_nxt[955] = + { 0, + 19, 20, 21, 22, 23, 24, 25, 19, 19, 26, + 27, 28, 28, 29, 30, 31, 32, 33, 33, 34, + 33, 33, 35, 36, 37, 38, 39, 40, 41, 42, + 43, 33, 44, 45, 33, 33, 46, 47, 48, 49, + 50, 33, 51, 52, 53, 54, 33, 55, 33, 33, + 33, 56, 57, 58, 59, 104, 63, 60, 64, 63, + 96, 64, 155, 267, 118, 61, 97, 105, 119, 156, + 126, 106, 120, 107, 608, 268, 127, 65, 121, 128, + 65, 18, 18, 18, 18, 18, 18, 18, 18, 18, + 18, 18, 18, 18, 18, 18, 18, 18, 66, 66, + + 66, 66, 66, 18, 18, 18, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 18, 18, 18, 67, 67, 18, 67, 67, + 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, + 67, 67, 68, 68, 68, 68, 68, 67, 67, 67, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, + 68, 68, 68, 68, 68, 68, 67, 67, 67, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + + 69, 69, 69, 69, 69, 69, 70, 70, 70, 70, + 70, 69, 69, 69, 70, 70, 70, 70, 70, 70, + 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, + 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, + 69, 69, 69, 75, 75, 108, 131, 129, 157, 607, + 158, 111, 193, 112, 132, 109, 113, 114, 76, 77, + 115, 78, 130, 116, 79, 110, 240, 194, 80, 159, + 81, 117, 241, 160, 82, 83, 84, 161, 138, 85, + 86, 87, 88, 89, 89, 122, 139, 162, 163, 191, + 90, 164, 140, 183, 228, 133, 123, 229, 124, 134, + + 236, 90, 192, 135, 136, 91, 601, 237, 125, 137, + 92, 148, 184, 144, 93, 94, 95, 145, 149, 150, + 216, 146, 147, 605, 199, 151, 152, 153, 196, 201, + 154, 167, 200, 185, 167, 217, 75, 75, 197, 202, + 219, 168, 168, 90, 203, 206, 198, 204, 220, 207, + 169, 221, 245, 169, 90, 222, 170, 171, 91, 172, + 252, 598, 173, 208, 208, 260, 174, 257, 175, 246, + 90, 247, 176, 177, 178, 261, 253, 179, 180, 181, + 258, 90, 275, 209, 209, 91, 210, 210, 233, 269, + 271, 234, 278, 283, 288, 276, 272, 289, 270, 162, + + 163, 292, 294, 164, 168, 168, 297, 300, 279, 284, + 302, 286, 210, 210, 293, 301, 298, 295, 344, 307, + 303, 376, 286, 308, 299, 304, 287, 377, 305, 208, + 208, 210, 210, 371, 378, 430, 90, 372, 386, 386, + 345, 387, 387, 344, 438, 378, 461, 90, 387, 387, + 430, 91, 438, 91, 387, 387, 379, 431, 501, 518, + 504, 603, 507, 509, 514, 345, 439, 379, 462, 594, + 520, 461, 431, 537, 439, 539, 287, 504, 591, 507, + 502, 433, 505, 457, 508, 510, 515, 596, 495, 509, + 500, 519, 521, 462, 548, 538, 514, 540, 557, 505, + + 549, 508, 537, 539, 558, 593, 591, 594, 591, 522, + 598, 510, 590, 594, 601, 550, 598, 551, 515, 589, + 601, 588, 587, 586, 538, 540, 585, 552, 592, 595, + 592, 518, 599, 584, 554, 595, 602, 583, 599, 582, + 564, 565, 602, 581, 580, 579, 597, 578, 577, 576, + 574, 600, 573, 572, 604, 571, 570, 569, 606, 18, + 18, 18, 18, 18, 62, 62, 62, 62, 62, 72, + 72, 568, 72, 72, 100, 100, 166, 166, 567, 166, + 166, 186, 186, 187, 187, 188, 188, 285, 285, 285, + 285, 285, 388, 388, 542, 388, 388, 389, 389, 566, + + 389, 389, 555, 539, 537, 555, 575, 575, 563, 562, + 295, 561, 560, 559, 520, 556, 518, 377, 514, 553, + 509, 507, 504, 501, 547, 546, 335, 545, 544, 543, + 542, 541, 536, 535, 194, 534, 533, 532, 531, 530, + 529, 528, 527, 526, 525, 524, 523, 461, 517, 456, + 516, 513, 512, 511, 506, 503, 438, 499, 498, 130, + 497, 496, 430, 494, 493, 492, 491, 490, 489, 488, + 487, 486, 485, 484, 483, 482, 481, 480, 479, 478, + 477, 476, 475, 474, 473, 472, 471, 470, 469, 468, + 467, 466, 465, 464, 463, 460, 459, 458, 378, 456, + + 455, 454, 453, 452, 451, 450, 449, 448, 447, 446, + 445, 444, 443, 442, 441, 440, 437, 436, 435, 434, + 344, 432, 429, 428, 427, 426, 425, 424, 423, 422, + 421, 420, 419, 418, 417, 416, 415, 414, 413, 412, + 411, 410, 409, 408, 407, 406, 405, 404, 403, 402, + 401, 400, 399, 398, 397, 396, 395, 394, 393, 392, + 391, 390, 163, 385, 384, 383, 382, 381, 380, 375, + 374, 373, 370, 369, 368, 367, 266, 366, 365, 364, + 363, 362, 361, 360, 359, 358, 357, 356, 355, 354, + 353, 352, 351, 350, 349, 348, 347, 346, 343, 342, + + 341, 340, 339, 338, 337, 336, 335, 334, 333, 332, + 331, 330, 329, 328, 327, 326, 325, 324, 323, 322, + 321, 320, 319, 318, 317, 316, 315, 314, 313, 312, + 311, 310, 309, 306, 296, 291, 290, 163, 163, 282, + 281, 280, 277, 274, 273, 266, 265, 264, 263, 262, + 259, 256, 255, 254, 251, 250, 249, 248, 244, 243, + 242, 239, 238, 235, 232, 231, 230, 227, 226, 225, + 224, 223, 218, 215, 214, 213, 212, 211, 211, 211, + 211, 205, 195, 190, 189, 182, 165, 143, 142, 141, + 103, 102, 101, 99, 98, 74, 73, 71, 609, 17, + + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, + 609, 609, 609, 609 + } ; + +static yyconst flex_int16_t yy_chk[955] = + { 0, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 4, 38, 5, 4, 5, 6, + 30, 6, 53, 150, 41, 4, 30, 38, 41, 53, + 43, 38, 41, 38, 606, 150, 43, 5, 41, 43, + 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 27, 27, 39, 45, 44, 54, 604, + 54, 40, 79, 40, 45, 39, 40, 40, 27, 27, + 40, 27, 44, 40, 27, 39, 126, 79, 27, 55, + 27, 40, 126, 55, 27, 27, 27, 55, 47, 27, + 27, 27, 28, 28, 28, 42, 47, 56, 56, 78, + 28, 56, 47, 65, 116, 46, 42, 116, 42, 46, + + 123, 28, 78, 46, 46, 28, 602, 123, 42, 46, + 28, 52, 65, 51, 28, 28, 28, 51, 52, 52, + 106, 51, 51, 600, 82, 52, 52, 52, 81, 83, + 52, 60, 82, 65, 167, 106, 75, 75, 81, 83, + 108, 60, 60, 75, 83, 85, 81, 83, 108, 85, + 60, 109, 132, 167, 75, 109, 60, 60, 75, 60, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Oct 8 18:27:21 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 086FCC06FA6 for ; Sat, 8 Oct 2016 18:27:21 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CEAEC752; Sat, 8 Oct 2016 18:27:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98IRJu5001189; Sat, 8 Oct 2016 18:27:19 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98IRJbP001188; Sat, 8 Oct 2016 18:27:19 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081827.u98IRJbP001188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 18:27:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306862 - projects/doctools/cddl/usr.bin/doctools/troff/troff X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 18:27:21 -0000 Author: bapt Date: Sat Oct 8 18:27:19 2016 New Revision: 306862 URL: https://svnweb.freebsd.org/changeset/base/306862 Log: Remove source added by accident Deleted: projects/doctools/cddl/usr.bin/doctools/troff/troff/dhtml.c Modified: projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile Modified: projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile Sat Oct 8 18:20:22 2016 (r306861) +++ projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile Sat Oct 8 18:27:19 2016 (r306862) @@ -39,7 +39,7 @@ LIBADD.devaps= m MAN.devaps= SRCS.dhtml= main.c \ - dhtml.c \ + dhtml.l \ tr_out.c \ char.c \ lib.c \ From owner-svn-src-projects@freebsd.org Sat Oct 8 18:44:30 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9AC8DC064B2 for ; Sat, 8 Oct 2016 18:44:30 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67AC7EF0; Sat, 8 Oct 2016 18:44:30 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98IiTIr008599; Sat, 8 Oct 2016 18:44:29 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98IiTvI008598; Sat, 8 Oct 2016 18:44:29 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081844.u98IiTvI008598@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 18:44:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306863 - projects/doctools/etc/mtree X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 18:44:30 -0000 Author: bapt Date: Sat Oct 8 18:44:29 2016 New Revision: 306863 URL: https://svnweb.freebsd.org/changeset/base/306863 Log: Add directories in mtree needed for doctools Modified: projects/doctools/etc/mtree/BSD.usr.dist Modified: projects/doctools/etc/mtree/BSD.usr.dist ============================================================================== --- projects/doctools/etc/mtree/BSD.usr.dist Sat Oct 8 18:27:19 2016 (r306862) +++ projects/doctools/etc/mtree/BSD.usr.dist Sat Oct 8 18:44:29 2016 (r306863) @@ -118,6 +118,12 @@ .. bsdinstall .. + doctools + reftools + .. + hyphen + .. + .. hyperv .. lpr @@ -308,6 +314,20 @@ .. .. .. + doctools + devpost + postscript + .. + .. + font + .. + pub + .. + tmac + .. + nterm + .. + .. dtrace .. examples From owner-svn-src-projects@freebsd.org Sat Oct 8 19:05:22 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5AF6C06AB8 for ; Sat, 8 Oct 2016 19:05:22 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79782B9A; Sat, 8 Oct 2016 19:05:22 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98J5LFL016140; Sat, 8 Oct 2016 19:05:21 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98J5KZt016129; Sat, 8 Oct 2016 19:05:20 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081905.u98J5KZt016129@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:05:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306865 - in projects/doctools: . bin/sh bin/sh/tests/parameters contrib/tzcode/zic contrib/tzdata etc/mtree include sbin/devd sbin/ifconfig sbin/init share/man/man9 share/misc sys/arm/... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:05:22 -0000 Author: bapt Date: Sat Oct 8 19:05:20 2016 New Revision: 306865 URL: https://svnweb.freebsd.org/changeset/base/306865 Log: Merge from head Added: projects/doctools/bin/sh/tests/parameters/ifs1.0 - copied unchanged from r306864, head/bin/sh/tests/parameters/ifs1.0 projects/doctools/sys/sys/disk/ - copied from r306864, head/sys/sys/disk/ Replaced: projects/doctools/sys/sys/apm.h - copied unchanged from r306864, head/sys/sys/apm.h projects/doctools/sys/sys/disklabel.h - copied unchanged from r306864, head/sys/sys/disklabel.h projects/doctools/sys/sys/diskmbr.h - copied unchanged from r306864, head/sys/sys/diskmbr.h projects/doctools/sys/sys/diskpc98.h - copied unchanged from r306864, head/sys/sys/diskpc98.h projects/doctools/sys/sys/gpt.h - copied unchanged from r306864, head/sys/sys/gpt.h projects/doctools/sys/sys/vtoc.h - copied unchanged from r306864, head/sys/sys/vtoc.h Modified: projects/doctools/Makefile.inc1 projects/doctools/bin/sh/sh.1 projects/doctools/bin/sh/tests/parameters/Makefile projects/doctools/bin/sh/var.c projects/doctools/contrib/tzcode/zic/zdump.c projects/doctools/contrib/tzcode/zic/zic.c projects/doctools/contrib/tzdata/africa projects/doctools/contrib/tzdata/antarctica projects/doctools/contrib/tzdata/asia projects/doctools/contrib/tzdata/australasia projects/doctools/contrib/tzdata/backward projects/doctools/contrib/tzdata/etcetera projects/doctools/contrib/tzdata/europe projects/doctools/contrib/tzdata/factory projects/doctools/contrib/tzdata/leap-seconds.list projects/doctools/contrib/tzdata/leapseconds projects/doctools/contrib/tzdata/northamerica projects/doctools/contrib/tzdata/southamerica projects/doctools/contrib/tzdata/zone.tab projects/doctools/contrib/tzdata/zone1970.tab projects/doctools/etc/mtree/BSD.include.dist projects/doctools/include/Makefile projects/doctools/sbin/devd/devd.conf.5 projects/doctools/sbin/ifconfig/ifieee80211.c projects/doctools/sbin/init/init.c projects/doctools/share/man/man9/ifnet.9 projects/doctools/share/misc/pci_vendors projects/doctools/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c projects/doctools/sys/boot/common/self_reloc.c projects/doctools/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/doctools/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/doctools/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/doctools/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c projects/doctools/sys/contrib/ipfilter/netinet/fil.c projects/doctools/sys/contrib/ipfilter/netinet/ip_compat.h projects/doctools/sys/contrib/ncsw/inc/xx_ext.h projects/doctools/sys/contrib/ncsw/user/env/xx.c projects/doctools/sys/dev/cxgbe/t4_ioctl.h projects/doctools/sys/dev/cxgbe/t4_main.c projects/doctools/sys/dev/evdev/evdev.c projects/doctools/sys/dev/evdev/evdev.h projects/doctools/sys/dev/evdev/evdev_mt.c projects/doctools/sys/dev/evdev/evdev_private.h projects/doctools/sys/dev/iwm/if_iwm.c projects/doctools/sys/dev/otus/if_otus.c projects/doctools/sys/dev/usb/wlan/if_rsu.c projects/doctools/sys/kern/vfs_cache.c projects/doctools/sys/kern/vfs_mount.c projects/doctools/sys/kern/vfs_mountroot.c projects/doctools/sys/kern/vfs_subr.c projects/doctools/sys/net80211/ieee80211_freebsd.h projects/doctools/sys/net80211/ieee80211_input.c projects/doctools/sys/netinet/sctp_output.c projects/doctools/sys/netinet6/in6.c projects/doctools/sys/netinet6/in6_ifattach.c projects/doctools/sys/netinet6/nd6.c projects/doctools/sys/netinet6/nd6.h projects/doctools/sys/netinet6/nd6_rtr.c projects/doctools/sys/powerpc/mpc85xx/fsl_diu.c projects/doctools/sys/sys/vnode.h projects/doctools/tools/tools/cxgbetool/cxgbetool.8 projects/doctools/tools/tools/cxgbetool/cxgbetool.c projects/doctools/usr.bin/cmp/cmp.c projects/doctools/usr.bin/col/col.c projects/doctools/usr.bin/dtc/checking.cc projects/doctools/usr.bin/dtc/checking.hh projects/doctools/usr.bin/dtc/dtb.cc projects/doctools/usr.bin/dtc/dtb.hh projects/doctools/usr.bin/dtc/dtc.1 projects/doctools/usr.bin/dtc/dtc.cc projects/doctools/usr.bin/dtc/fdt.cc projects/doctools/usr.bin/dtc/fdt.hh projects/doctools/usr.bin/dtc/input_buffer.cc projects/doctools/usr.bin/dtc/input_buffer.hh projects/doctools/usr.bin/dtc/string.cc projects/doctools/usr.bin/dtc/util.hh projects/doctools/usr.bin/elfdump/elfdump.c projects/doctools/usr.bin/kdump/kdump.c projects/doctools/usr.bin/tee/tee.c projects/doctools/usr.bin/tr/tr.c projects/doctools/usr.sbin/arp/arp.4 projects/doctools/usr.sbin/makefs/cd9660.c projects/doctools/usr.sbin/pmcstat/pmcstat.c projects/doctools/usr.sbin/portsnap/portsnap/portsnap.sh Directory Properties: projects/doctools/ (props changed) projects/doctools/contrib/tzcode/zic/ (props changed) projects/doctools/contrib/tzdata/ (props changed) projects/doctools/sys/cddl/contrib/opensolaris/ (props changed) projects/doctools/sys/contrib/ipfilter/ (props changed) Modified: projects/doctools/Makefile.inc1 ============================================================================== --- projects/doctools/Makefile.inc1 Sat Oct 8 18:57:11 2016 (r306864) +++ projects/doctools/Makefile.inc1 Sat Oct 8 19:05:20 2016 (r306865) @@ -1586,7 +1586,7 @@ _strfile= usr.bin/fortune/strfile _gperf= gnu/usr.bin/gperf .endif -.if ${MK_GROFF} != "no" +.if ${MK_SHAREDOCS} != "no" || ${MK_GROFF} != "no" _groff= gnu/usr.bin/groff \ usr.bin/soelim .endif Modified: projects/doctools/bin/sh/sh.1 ============================================================================== --- projects/doctools/bin/sh/sh.1 Sat Oct 8 18:57:11 2016 (r306864) +++ projects/doctools/bin/sh/sh.1 Sat Oct 8 19:05:20 2016 (r306865) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd May 30, 2016 +.Dd October 8, 2016 .Dt SH 1 .Os .Sh NAME @@ -1349,13 +1349,13 @@ used in tilde expansion and as a default built-in. .It Va IFS Input Field Separators. -The default value is +This is initialized at startup to .Aq space , .Aq tab , and .Aq newline in that order. -This default also applies if +This value also applies if .Va IFS is unset, but not if it is set to the empty string. See the Modified: projects/doctools/bin/sh/tests/parameters/Makefile ============================================================================== --- projects/doctools/bin/sh/tests/parameters/Makefile Sat Oct 8 18:57:11 2016 (r306864) +++ projects/doctools/bin/sh/tests/parameters/Makefile Sat Oct 8 19:05:20 2016 (r306865) @@ -9,6 +9,7 @@ ATF_TESTS_SH= functional_test ${PACKAGE}FILES+= env1.0 ${PACKAGE}FILES+= exitstatus1.0 +${PACKAGE}FILES+= ifs1.0 ${PACKAGE}FILES+= mail1.0 ${PACKAGE}FILES+= mail2.0 ${PACKAGE}FILES+= optind1.0 Copied: projects/doctools/bin/sh/tests/parameters/ifs1.0 (from r306864, head/bin/sh/tests/parameters/ifs1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/bin/sh/tests/parameters/ifs1.0 Sat Oct 8 19:05:20 2016 (r306865, copy of r306864, head/bin/sh/tests/parameters/ifs1.0) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +env IFS=_ ${SH} -c ' +rc=2 +nosuchtool_function() { + rc=0 +} +v=nosuchtool_function +$v && exit "$rc" +' Modified: projects/doctools/bin/sh/var.c ============================================================================== --- projects/doctools/bin/sh/var.c Sat Oct 8 18:57:11 2016 (r306864) +++ projects/doctools/bin/sh/var.c Sat Oct 8 19:05:20 2016 (r306865) @@ -186,6 +186,7 @@ initvar(void) } } setvareq_const("OPTIND=1", 0); + setvareq_const("IFS= \t\n", 0); } /* Modified: projects/doctools/contrib/tzcode/zic/zdump.c ============================================================================== --- projects/doctools/contrib/tzcode/zic/zdump.c Sat Oct 8 18:57:11 2016 (r306864) +++ projects/doctools/contrib/tzcode/zic/zdump.c Sat Oct 8 19:05:20 2016 (r306865) @@ -212,24 +212,16 @@ const char * const zone; return; cp = abbrp; wp = NULL; - while (isascii((unsigned char) *cp) && isalpha((unsigned char) *cp)) + while (isascii((unsigned char) *cp) && + (isalnum((unsigned char)*cp) || *cp == '-' || *cp == '+')) ++cp; - if (cp - abbrp == 0) - wp = _("lacks alphabetic at start"); - else if (cp - abbrp < 3) - wp = _("has fewer than 3 alphabetics"); + if (cp - abbrp < 3) + wp = _("has fewer than 3 characters"); else if (cp - abbrp > 6) - wp = _("has more than 6 alphabetics"); - if (wp == NULL && (*cp == '+' || *cp == '-')) { - ++cp; - if (isascii((unsigned char) *cp) && - isdigit((unsigned char) *cp)) - if (*cp++ == '1' && *cp >= '0' && *cp <= '4') - ++cp; - if (*cp != '\0') - wp = _("differs from POSIX standard"); - } - if (wp == NULL) + wp = _("has more than 6 characters"); + else if (*cp) + wp = "has characters other than ASCII alphanumerics, '-' or '+'"; + else return; (void) fflush(stdout); (void) fprintf(stderr, Modified: projects/doctools/contrib/tzcode/zic/zic.c ============================================================================== --- projects/doctools/contrib/tzcode/zic/zic.c Sat Oct 8 18:57:11 2016 (r306864) +++ projects/doctools/contrib/tzcode/zic/zic.c Sat Oct 8 19:05:20 2016 (r306865) @@ -2615,29 +2615,15 @@ const char * const string; register const char * cp; register char * wp; - /* - ** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics - ** optionally followed by a + or - and a number from 1 to 14. - */ cp = string; wp = NULL; while (isascii((unsigned char) *cp) && - isalpha((unsigned char) *cp)) + (isalnum((unsigned char)*cp) || *cp == '-' || *cp == '+')) ++cp; - if (cp - string == 0) -wp = _("time zone abbreviation lacks alphabetic at start"); if (noise && cp - string > 3) -wp = _("time zone abbreviation has more than 3 alphabetics"); +wp = _("time zone abbreviation has more than 3 characters"); if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN) -wp = _("time zone abbreviation has too many alphabetics"); - if (wp == NULL && (*cp == '+' || *cp == '-')) { - ++cp; - if (isascii((unsigned char) *cp) && - isdigit((unsigned char) *cp)) - if (*cp++ == '1' && - *cp >= '0' && *cp <= '4') - ++cp; - } +wp = _("time zone abbreviation has too many characters"); if (*cp != '\0') wp = _("time zone abbreviation differs from POSIX standard"); if (wp != NULL) { Modified: projects/doctools/contrib/tzdata/africa ============================================================================== --- projects/doctools/contrib/tzdata/africa Sat Oct 8 18:57:11 2016 (r306864) +++ projects/doctools/contrib/tzdata/africa Sat Oct 8 19:05:20 2016 (r306865) @@ -343,6 +343,12 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 # decision to abandon DST permanently. See Ahram Online 2015-04-24. # http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx +# From Steffen Thorsen (2016-04-29): +# Egypt will have DST from July 7 until the end of October.... +# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx +# From Mina Samuel (2016-07-04): +# Egyptian government took the decision to cancel the DST, + Rule Egypt 2008 only - Aug lastThu 24:00 0 - Rule Egypt 2009 only - Aug 20 24:00 0 - Rule Egypt 2010 only - Aug 10 24:00 0 - @@ -458,7 +464,7 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ # # From Paul Eggert (2013-10-25): -# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2. +# For now, assume they're reverting to the pre-2012 rules of permanent UT +02. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S @@ -858,11 +864,11 @@ Rule Morocco 2009 only - Aug 21 0:00 0 Rule Morocco 2010 only - May 2 0:00 1:00 S Rule Morocco 2010 only - Aug 8 0:00 0 - Rule Morocco 2011 only - Apr 3 0:00 1:00 S -Rule Morocco 2011 only - Jul 31 0 0 - +Rule Morocco 2011 only - Jul 31 0:00 0 - Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S -Rule Morocco 2012 only - Sep 30 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20 2:00 1:00 S +Rule Morocco 2012 only - Sep 30 3:00 0 - Rule Morocco 2013 only - Jul 7 3:00 0 - Rule Morocco 2013 only - Aug 10 2:00 1:00 S Rule Morocco 2013 max - Oct lastSun 3:00 0 - Modified: projects/doctools/contrib/tzdata/antarctica ============================================================================== --- projects/doctools/contrib/tzdata/antarctica Sat Oct 8 18:57:11 2016 (r306864) +++ projects/doctools/contrib/tzdata/antarctica Sat Oct 8 19:05:20 2016 (r306865) @@ -10,10 +10,8 @@ # http://www.spri.cam.ac.uk/bob/periant.htm # for information. # Unless otherwise specified, we have no time zone information. -# -# Except for the French entries, -# I made up all time zone abbreviations mentioned here; corrections welcome! -# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited. + +# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited. # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 @@ -29,7 +27,7 @@ # previously sealers and scientific personnel wintered # Margaret Turner reports # http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html -# (1999-09-30) that they're UTC+5, with no DST; +# (1999-09-30) that they're UT +05, with no DST; # presumably this is when they have visitors. # # year-round bases @@ -67,24 +65,23 @@ # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/Casey 0 - zzz 1969 - 8:00 - AWST 2009 Oct 18 2:00 - # Australian Western Std Time - 11:00 - CAST 2010 Mar 5 2:00 # Casey Time - 8:00 - AWST 2011 Oct 28 2:00 - 11:00 - CAST 2012 Feb 21 17:00u - 8:00 - AWST -Zone Antarctica/Davis 0 - zzz 1957 Jan 13 - 7:00 - DAVT 1964 Nov # Davis Time - 0 - zzz 1969 Feb - 7:00 - DAVT 2009 Oct 18 2:00 - 5:00 - DAVT 2010 Mar 10 20:00u - 7:00 - DAVT 2011 Oct 28 2:00 - 5:00 - DAVT 2012 Feb 21 20:00u - 7:00 - DAVT -Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 - 6:00 - MAWT 2009 Oct 18 2:00 # Mawson Time - 5:00 - MAWT +Zone Antarctica/Casey 0 - -00 1969 + 8:00 - +08 2009 Oct 18 2:00 + 11:00 - +11 2010 Mar 5 2:00 + 8:00 - +08 2011 Oct 28 2:00 + 11:00 - +11 2012 Feb 21 17:00u + 8:00 - +08 +Zone Antarctica/Davis 0 - -00 1957 Jan 13 + 7:00 - +07 1964 Nov + 0 - -00 1969 Feb + 7:00 - +07 2009 Oct 18 2:00 + 5:00 - +05 2010 Mar 10 20:00u + 7:00 - +07 2011 Oct 28 2:00 + 5:00 - +05 2012 Feb 21 20:00u + 7:00 - +07 +Zone Antarctica/Mawson 0 - -00 1954 Feb 13 + 6:00 - +06 2009 Oct 18 2:00 + 5:00 - +05 # References: # Casey Weather (1998-02-26) # http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html @@ -137,8 +134,8 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb # fishing stations operated variously 1819/1931 # # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Indian/Kerguelen 0 - zzz 1950 # Port-aux-Français - 5:00 - TFT # ISO code TF Time +Zone Indian/Kerguelen 0 - -00 1950 # Port-aux-Français + 5:00 - +05 # # year-round base in the main continent # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11 @@ -148,10 +145,10 @@ Zone Indian/Kerguelen 0 - zzz 1950 # Por # It was destroyed by fire on 1952-01-14. # # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/DumontDUrville 0 - zzz 1947 - 10:00 - PMT 1952 Jan 14 # Port-Martin Time - 0 - zzz 1956 Nov - 10:00 - DDUT # Dumont-d'Urville Time +Zone Antarctica/DumontDUrville 0 - -00 1947 + 10:00 - +10 1952 Jan 14 + 0 - -00 1956 Nov + 10:00 - +10 # France & Italy - year-round base # Concordia, -750600+1232000, since 2005 @@ -176,8 +173,8 @@ Zone Antarctica/DumontDUrville 0 - zzz 1 # was established on 1957-01-29. Since Syowa station is still the main # station of Japan, it's appropriate for the principal location. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/Syowa 0 - zzz 1957 Jan 29 - 3:00 - SYOT # Syowa Time +Zone Antarctica/Syowa 0 - -00 1957 Jan 29 + 3:00 - +03 # See: # NIPR Antarctic Research Activities (1999-08-17) # http://www.nipr.ac.jp/english/ara01.html @@ -214,19 +211,19 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2 # correct, but they should be quite close to the actual dates. # # From Paul Eggert (2014-03-21): -# The CET-switching Troll rules require zic from tzcode 2014b or later, so as +# The CET-switching Troll rules require zic from tz 2014b or later, so as # suggested by Bengt-Inge Larsson comment them out for now, and approximate # with only UTC and CEST. Uncomment them when 2014b is more prevalent. # # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET -Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST -#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET -#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC +#Rule Troll 2005 max - Mar 1 1:00u 1:00 +01 +Rule Troll 2005 max - Mar lastSun 1:00u 2:00 +02 +#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 +01 +#Rule Troll 2004 max - Nov 7 1:00u 0:00 +00 # Remove the following line when uncommenting the above '#Rule' lines. -Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC +Rule Troll 2004 max - Oct lastSun 1:00u 0:00 +00 # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/Troll 0 - zzz 2005 Feb 12 +Zone Antarctica/Troll 0 - -00 2005 Feb 12 0:00 Troll %s # Poland - year-round base @@ -265,10 +262,10 @@ Zone Antarctica/Troll 0 - zzz 2005 Feb 1 # changes during the year and does not necessarily correspond to mean # solar noon. So the Vostok time might have been whatever the clocks # happened to be during their visit. So we still don't really know what time -# it is at Vostok. But we'll guess UTC+6. +# it is at Vostok. But we'll guess +06. # -Zone Antarctica/Vostok 0 - zzz 1957 Dec 16 - 6:00 - VOST # Vostok time +Zone Antarctica/Vostok 0 - -00 1957 Dec 16 + 6:00 - +06 # S Africa - year-round bases # Marion Island, -4653+03752 @@ -300,8 +297,8 @@ Zone Antarctica/Vostok 0 - zzz 1957 Dec # says Rothera is -03 all year. # # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Antarctica/Rothera 0 - zzz 1976 Dec 1 - -3:00 - ROTT # Rothera time +Zone Antarctica/Rothera 0 - -00 1976 Dec 1 + -3:00 - -03 # Uruguay - year round base # Artigas, King George Island, -621104-0585107 Modified: projects/doctools/contrib/tzdata/asia ============================================================================== --- projects/doctools/contrib/tzdata/asia Sat Oct 8 18:57:11 2016 (r306864) +++ projects/doctools/contrib/tzdata/asia Sat Oct 8 19:05:20 2016 (r306865) @@ -79,13 +79,9 @@ Rule E-EurAsia 1979 1995 - Sep lastSun Rule E-EurAsia 1996 max - Oct lastSun 0:00 0 - Rule RussiaAsia 1981 1984 - Apr 1 0:00 1:00 S Rule RussiaAsia 1981 1983 - Oct 1 0:00 0 - -Rule RussiaAsia 1984 1991 - Sep lastSun 2:00s 0 - -Rule RussiaAsia 1985 1991 - Mar lastSun 2:00s 1:00 S -Rule RussiaAsia 1992 only - Mar lastSat 23:00 1:00 S -Rule RussiaAsia 1992 only - Sep lastSat 23:00 0 - -Rule RussiaAsia 1993 max - Mar lastSun 2:00s 1:00 S -Rule RussiaAsia 1993 1995 - Sep lastSun 2:00s 0 - -Rule RussiaAsia 1996 max - Oct lastSun 2:00s 0 - +Rule RussiaAsia 1984 1995 - Sep lastSun 2:00s 0 - +Rule RussiaAsia 1985 2011 - Mar lastSun 2:00s 1:00 S +Rule RussiaAsia 1996 2011 - Oct lastSun 2:00s 0 - # Afghanistan # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -120,31 +116,37 @@ Zone Asia/Kabul 4:36:48 - LMT 1890 # http://www.worldtimezone.com/dst_news/dst_news_armenia03.html # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2 - 3:00 - YERT 1957 Mar # Yerevan Time - 4:00 RussiaAsia YER%sT 1991 Mar 31 2:00s - 3:00 1:00 YERST 1991 Sep 23 # independence - 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s - 4:00 - AMT 1997 - 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s - 4:00 - AMT + 3:00 - +03 1957 Mar + 4:00 RussiaAsia +04/+05 1991 Mar 31 2:00s + 3:00 RussiaAsia +03/+04 1995 Sep 24 2:00s + 4:00 - +04 1997 + 4:00 RussiaAsia +04/+05 # Azerbaijan + # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23): # According to the resolution of Cabinet of Ministers, 1997 # From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17). # http://code.az/files/daylight_res.pdf + +# From Steffen Thorsen (2016-03-17): +# ... the Azerbaijani Cabinet of Ministers has cancelled switching to +# daylight saving time.... +# http://www.azernews.az/azerbaijan/94137.html +# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html +# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Azer 1997 max - Mar lastSun 4:00 1:00 S -Rule Azer 1997 max - Oct lastSun 5:00 0 - +Rule Azer 1997 2015 - Mar lastSun 4:00 1:00 S +Rule Azer 1997 2015 - Oct lastSun 5:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Baku 3:19:24 - LMT 1924 May 2 - 3:00 - BAKT 1957 Mar # Baku Time - 4:00 RussiaAsia BAK%sT 1991 Mar 31 2:00s - 3:00 1:00 BAKST 1991 Aug 30 # independence - 3:00 RussiaAsia AZ%sT 1992 Sep lastSat 23:00 - 4:00 - AZT 1996 # Azerbaijan Time - 4:00 EUAsia AZ%sT 1997 - 4:00 Azer AZ%sT + 3:00 - +03 1957 Mar + 4:00 RussiaAsia +04/+05 1991 Mar 31 2:00s + 3:00 RussiaAsia +03/+04 1992 Sep lastSun 2:00s + 4:00 - +04 1996 + 4:00 EUAsia +04/+05 1997 + 4:00 Azer +04/+05 # Bahrain # See Asia/Qatar. @@ -263,7 +265,7 @@ Zone Asia/Brunei 7:39:40 - LMT 1926 Mar # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon. # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Rangoon 6:24:40 - LMT 1880 # or Yangon +Zone Asia/Yangon 6:24:40 - LMT 1880 # or Rangoon 6:24:40 - RMT 1920 # Rangoon Mean Time? 6:30 - BURT 1942 May # Burma Time 9:00 - JST 1945 May 3 @@ -378,7 +380,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # Lewiston (ME) Daily Sun (1939-05-29), p 17, said "Even the time is # different - the occupied districts going by Tokyo time, an hour # ahead of that prevailing in the rest of Shanghai." Guess that the -# Xujiahui Observatory was under French control and stuck with UT+8. +# Xujiahui Observatory was under French control and stuck with UT +08. # # In earlier versions of this file, China had many separate Zone entries, but # this was based on what were apparently incorrect data in Shanks & Pottenger. @@ -387,26 +389,26 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # Proposed in 1918 and theoretically in effect until 1949 (although in practice # mainly observed in coastal areas), the five zones were: # -# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT+8.5 +# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT +08:30 # Asia/Harbin (currently a link to Asia/Shanghai) # Heilongjiang (except Mohe county), Jilin # -# Zhongyuan Time ("Central plain Time") UT+8 +# Zhongyuan Time ("Central plain Time") UT +08 # Asia/Shanghai # most of China # This currently represents most other zones as well, # as apparently these regions have been the same since 1970. # Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest. -# Guo says Shanghai switched to UT+8 "from the end of the 19th century". +# Guo says Shanghai switched to UT +08 "from the end of the 19th century". # -# Long-shu Time (probably due to Long and Shu being two names of that area) UT+7 +# Long-shu Time (probably due to Long and Shu being two names of the area) UT +07 # Asia/Chongqing (currently a link to Asia/Shanghai) # Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan; # most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong # counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing, # Yangchun, Yangjiang, Yu'nan, and Yunfu. # -# Xin-zang Time ("Xinjiang-Tibet Time") UT+6 +# Xin-zang Time ("Xinjiang-Tibet Time") UT +06 # Asia/Urumqi # This currently represents Kunlun Time as well, # as apparently the two regions have been the same since 1970. @@ -419,7 +421,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami, # Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan. # -# Kunlun Time UT+5.5 +# Kunlun Time UT +05:30 # Asia/Kashgar (currently a link to Asia/Urumqi) # West Tibet, including Pulan, Aheqi, Shufu, Shule; # West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke, @@ -435,7 +437,7 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # # On the other hand, ethnic Uyghurs, who make up about half the # population of Xinjiang, typically use "Xinjiang time" which is two -# hours behind Beijing time, or UTC +0600. The government of the Xinjiang +# hours behind Beijing time, or UT +06. The government of the Xinjiang # Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as # local governments such as the Ürümqi city government use both times in # publications, referring to what is popularly called Xinjiang time as @@ -491,8 +493,8 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # having the same time as Beijing. # From Paul Eggert (2014-06-30): -# In the early days of the PRC, Tibet was given its own time zone (UT+6) but -# this was withdrawn in 1959 and never reinstated; see Tubten Khétsun, +# In the early days of the PRC, Tibet was given its own time zone (UT +06) +# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun, # Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN # 978-0231142861 (2008), translator's introduction by Matthew Akester, p x. # As this is before our 1970 cutoff, Tibet doesn't need a separate zone. @@ -506,12 +508,12 @@ Rule PRC 1987 1991 - Apr Sun>=10 0:00 1: # Republics, the Soviet Union, the Kuomintang, and the People's Republic of # China, and tracking down all these organizations' timekeeping rules would be # quite a trick. Approximate this lost history by a transition from LMT to -# XJT at the start of 1928, the year of accession of the warlord Jin Shuren, +# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren, # which happens to be the date given by Shanks & Pottenger (no doubt as a -# guess) as the transition from LMT. Ignore the usage of UT+8 before -# 1986-02-01 under the theory that the transition date to UT+8 is unknown and +# guess) as the transition from LMT. Ignore the usage of +08 before +# 1986-02-01 under the theory that the transition date to +08 is unknown and # that the sort of users who prefer Asia/Urumqi now typically ignored the -# UT+8 mandate back then. +# +08 mandate back then. # Zone NAME GMTOFF RULES FORMAT [UNTIL] # Beijing time, used throughout China; represented by Shanghai. @@ -716,7 +718,7 @@ Zone Asia/Hong_Kong 7:36:42 - LMT 1904 O # be found from historical government announcement database. # From Paul Eggert (2014-07-03): -# As per Yu-Cheng Chuang, say that Taiwan was at UT+9 from 1937-10-01 +# As per Yu-Cheng Chuang, say that Taiwan was at UT +09 from 1937-10-01 # until 1945-09-21 at 01:00, overriding Shanks & Pottenger. # Likewise, use Yu-Cheng Chuang's data for DST in Taiwan. @@ -830,16 +832,15 @@ Link Asia/Nicosia Europe/Nicosia # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Tbilisi 2:59:11 - LMT 1880 2:59:11 - TBMT 1924 May 2 # Tbilisi Mean Time - 3:00 - TBIT 1957 Mar # Tbilisi Time - 4:00 RussiaAsia TBI%sT 1991 Mar 31 2:00s - 3:00 1:00 TBIST 1991 Apr 9 # independence - 3:00 RussiaAsia GE%sT 1992 # Georgia Time - 3:00 E-EurAsia GE%sT 1994 Sep lastSun - 4:00 E-EurAsia GE%sT 1996 Oct lastSun - 4:00 1:00 GEST 1997 Mar lastSun - 4:00 E-EurAsia GE%sT 2004 Jun 27 - 3:00 RussiaAsia GE%sT 2005 Mar lastSun 2:00 - 4:00 - GET + 3:00 - +03 1957 Mar + 4:00 RussiaAsia +04/+05 1991 Mar 31 2:00s + 3:00 RussiaAsia +03/+04 1992 + 3:00 E-EurAsia +03/+04 1994 Sep lastSun + 4:00 E-EurAsia +04/+05 1996 Oct lastSun + 4:00 1:00 +05 1997 Mar lastSun + 4:00 E-EurAsia +04/+05 2004 Jun 27 + 3:00 RussiaAsia +03/+04 2005 Mar lastSun 2:00 + 4:00 - +04 # East Timor @@ -874,6 +875,15 @@ Zone Asia/Dili 8:22:20 - LMT 1912 Jan 1 9:00 - TLT # India + +# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic +# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/ +# (2015-12-22): +# In January 1906, several thousand cotton-mill workers rioted on the +# outskirts of Bombay.... They were protesting the proposed abolition of +# local time in favor of Indian Standard Time.... Journalists called this +# dispute the "Battle of the Clocks." It lasted nearly half a century. + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata 5:53:20 - HMT 1941 Oct # Howrah Mean Time? @@ -907,7 +917,7 @@ Zone Asia/Kolkata 5:53:28 - LMT 1880 # These would be the earliest possible times for a change. # Régimes horaires pour le monde entier, by Henri Le Corre, (Éditions # Traditionnelles, 1987, Paris) says that Java and Madura switched -# from JST to UTC+07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura +# from UT +09 to +07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura # (Hollandia). For now, assume all Indonesian locations other than Jayapura # switched on 1945-09-23. # @@ -918,11 +928,11 @@ Zone Asia/Kolkata 5:53:28 - LMT 1880 # summary published by the Time and Frequency Laboratory of the # Research Center for Calibration, Instrumentation and Metrology, # Indonesia, (2006-09-29). -# The abbreviations are: +# The time zone abbreviations and UT offsets are: # -# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time) -# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time) -# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time) +# WIB - +07 - Waktu Indonesia Barat (Indonesia western time) +# WITA - +08 - Waktu Indonesia Tengah (Indonesia central time) +# WIT - +09 - Waktu Indonesia Timur (Indonesia eastern time) # # Zone NAME GMTOFF RULES FORMAT [UNTIL] # Java, Sumatra @@ -1084,8 +1094,15 @@ Rule Iran 2032 2033 - Mar 21 0:00 1:00 D Rule Iran 2032 2033 - Sep 21 0:00 0 S Rule Iran 2034 2035 - Mar 22 0:00 1:00 D Rule Iran 2034 2035 - Sep 22 0:00 0 S -Rule Iran 2036 2037 - Mar 21 0:00 1:00 D -Rule Iran 2036 2037 - Sep 21 0:00 0 S +# +# The following rules are approximations starting in the year 2038. +# These are the best post-2037 approximations available, given the +# restrictions of a single rule using a Gregorian-based data format. +# At some point this table will need to be extended, though quite +# possibly Iran will change the rules first. +Rule Iran 2036 max - Mar 21 0:00 1:00 D +Rule Iran 2036 max - Sep 21 0:00 0 S + # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Tehran 3:25:44 - LMT 1916 3:25:44 - TMT 1946 # Tehran Mean Time @@ -1542,23 +1559,6 @@ Zone Asia/Amman 2:23:44 - LMT 1931 # Kazakhstan -# From Paul Eggert (1996-11-22): -# Andrew Evtichov (1996-04-13) writes that Kazakhstan -# stayed in sync with Moscow after 1990, and that Aqtobe (formerly Aktyubinsk) -# and Aqtau (formerly Shevchenko) are the largest cities in their zones. -# Guess that Aqtau and Aqtobe diverged in 1995, since that's the first time -# IATA SSIM mentions a third time zone in Kazakhstan. - -# From Paul Eggert (2006-03-22): -# German Iofis, ELSI, Almaty (2001-10-09) reports that Kazakhstan uses -# RussiaAsia rules, instead of switching at 00:00 as the IATA has it. -# Go with Shanks & Pottenger, who have them always using RussiaAsia rules. -# Also go with the following claims of Shanks & Pottenger: -# -# - Kazakhstan did not observe DST in 1991. -# - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00. -# - Oral switched from +5:00 to +4:00 in spring 1989. - # From Kazakhstan Embassy's News Bulletin No. 11 # (2005-03-21): # The Government of Kazakhstan passed a resolution March 15 abolishing @@ -1575,61 +1575,232 @@ Zone Asia/Amman 2:23:44 - LMT 1931 # everything else.... I guess that would make Kazakhstan time zones # de jure UTC+5 and UTC+6 respectively. +# From Stepan Golosunov (2016-03-27) ([*] means see later comments below): +# Review of the linked documents from http://adilet.zan.kz/ +# produced the following data for post-1991 Kazakhstan: +# +# 0. Act of the Cabinet of Ministers of the USSR +# from 1991-02-04 No. 20 +# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545 +# removed the extra hour ("decree time") on the territory of the USSR +# starting with the last Sunday of March 1991. +# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR, +# Turkmen SSR and Uzbek SSR to not have "summer" time. +# +# The 1992-01-13 act also refers to the act of the Cabinet of Ministers +# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet +# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its +# text. +# +# According to Izvestia newspaper No. 68 (23334) from 1991-03-20 +# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via +# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during +# transition to "summer" time: +# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova, +# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug +# were to move clocks 1 hour forward. +# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik +# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts +# of the Uzbek SSR were to move clocks 1 hour backwards. +# Other territories were to not move clocks. +# When the "summer" time would end on 1991-09-29, clocks were to be +# moved 1 hour backwards on the territory of the USSR excluding +# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan. +# +# Apparently there were last minute changes. Apparently Kazakh act No. 170 +# was one of such changes. +# +# https://ru.wikipedia.org/wiki/Декретное время +# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that +# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast) +# were to not move clocks and Uralsk oblast was to move clocks +# forward; on 1991-09-29 Kazakhstan was to move clocks backwards. +# (Probably there were changes even after that publication. There is an +# article claiming that Kaliningrad oblast decided on 1991-03-29 to not +# move clocks.) +# +# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while +# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06 +# to +04/+05. It's unclear how Kzyl-Orda oblast moved into the fifth +# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ... +# +# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan +# from 1992-01-13 No. 28 +# http://adilet.zan.kz/rus/docs/P920000028_ +# (text includes modification from the 1996 act) +# introduced new rules for calculation of time, mirroring Russian +# 1992-01-08 act. It specified that time would be calculated +# according to time belts plus extra hour ("decree time"), moved clocks +# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at +# 2:00, specified DST rules. It acknowledged that Kazakhstan was +# located in the fourth and the fifth time belts and specified the +# border between them to be located east of Kustanay and Aktyubinsk +# oblasts (notably including Turgai and Kzyl-Orda oblasts into the fifth +# time belt). +# +# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for +# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyrau and Kustanay oblasts; from +# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk) [*].... +# +# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan +# from 1992-03-27 No. 284 +# http://adilet.zan.kz/rus/docs/P920000284_ +# cancels extra hour ("decree time") for Uralsk and Kzyl-Orda oblasts +# since the last Sunday of March 1992, while keeping them in the fourth +# and the fifth time belts respectively. +# +# 3. Order of the Prime Minister of the Republic of Kazakhstan +# from 1994-09-23 No. 384 +# http://adilet.zan.kz/rus/docs/R940000384_ +# cancels the extra hour ("decree time") on the territory of Mangystau +# oblast since the last Sunday of September 1994 (saying that time on +# the territory would correspond to the third time belt as a +# result).... +# +# 4. Act of the Government of the Republic of Kazakhstan +# from 1996-05-08 No. 575 +# http://adilet.zan.kz/rus/docs/P960000575_ +# amends the 1992-01-13 act to end summer time in October instead +# of September, mirroring identical Russian change from 1996-04-23 act. +# +# 5. Act of the Government of the Republic of Kazakhstan +# from 1999-03-26 No. 305 +# http://adilet.zan.kz/rus/docs/P990000305_ +# cancels the extra hour ("decree time") for Atyrau oblast since the +# last Sunday of March 1999 while retaining the oblast in the fourth +# time belt. +# +# This means change from +05/+06 to +04/+05. +# +# There is no zone for Atyrau currently (listed under Asia/Aqtau in +# zone1970.tab).[*] +# +# 6. Act of the Government of the Republic of Kazakhstan +# from 2000-11-23 No. 1749 +# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000 +# replaces the previous five documents. +# +# The only changes I noticed are in definition of the border between the +# fourth and the fifth time belts. They account for changes in spelling +# and administrative division (splitting of Turgai oblast in 1997 +# probably changed time in territories incorporated into Kostanay oblast +# (including Arkalyk) from +06/+07 to +05/+06) and move Kyzylorda oblast +# from being in the fifth time belt and not using decree time into the +# fourth time belt (no change in practice).[*] +# +# 7. Act of the Government of the Republic of Kazakhstan +# from 2003-12-29 No. 1342 +# http://adilet.zan.kz/rus/docs/P030001342_ +# modified the 2000-11-23 act. No relevant changes, apparently. +# +# 8. Act of the Government of the Republic of Kazakhstan +# from 2004-07-20 No. 775 +# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004 +# modified the 2000-11-23 act to move Kostanay and Kyzylorda oblasts into +# the fifth time belt and add Aktobe oblast to the list of regions not +# using extra hour ("decree time"), leaving Kazakhstan with only 2 time +# zones (+04/+05 and +06/+07). The changes were to be implemented +# during DST transitions in 2004 and 2005 but the acts got radically +# amended before implementation happened. +# +# 9. Act of the Government of the Republic of Kazakhstan +# from 2004-09-15 No. 1059 +# http://adilet.zan.kz/rus/docs/P040001059_ +# modified the 2000-11-23 act to remove exceptions from the "decree time" +# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the +# 2004-07-20 act to implement changes for Atyrau, West Kazakhstan, +# Kostanay, Kyzylorda and Mangystau oblasts by not moving clocks +# during the 2014 transition to "winter" time. +# +# This means transition from +04/+05 to +05/+06 for Atyrau oblast (no +# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to +# +06/+07 for Kostanay oblast (Kostanay and Arkalyk, no zones currently) +# and Asia/Qyzylorda on 2004-10-31 at 3:00....[*] +# +# 10. Act of the Government of the Republic of Kazakhstan +# from 2005-03-15 No. 231 +# http://adilet.zan.kz/rus/docs/P050000231_ +# removes DST provisions from the 2000-11-23 act, removes most of the +# (already implemented) provisions from the 2004-07-20 and 2004-09-15 +# acts, comes into effect 10 days after official publication. +# The only practical effect seems to be the abolition of the summer +# time. +# +# Unamended version of the act of the Government of the Russian Federation +# No. 23 from 1992-01-08 [See 'europe' file for details]. +# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27 +# act was to be enacted on the last Sunday of March 1992. + +# From Paul Eggert (2016-04-15): +# The tables below should reflect Stepan Golosunov's remarks above, +# except for the items marked "[*]" which I haven't gotten to yet. +# It looks like we will need new zones Asia/Atyrau and Asia/Qostanay +# to handle changes from 1992 through 2004 that we did not previously +# know about. + # # Zone NAME GMTOFF RULES FORMAT [UNTIL] # # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan +# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA, +# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ. Zone Asia/Almaty 5:07:48 - LMT 1924 May 2 # or Alma-Ata - 5:00 - ALMT 1930 Jun 21 # Alma-Ata Time - 6:00 RussiaAsia ALM%sT 1991 - 6:00 - ALMT 1992 - 6:00 RussiaAsia ALM%sT 2005 Mar 15 - 6:00 - ALMT -# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) + 5:00 - +05 1930 Jun 21 + 6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s + 5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s + 6:00 RussiaAsia +06/+07 2004 Oct 31 2:00s + 6:00 - +06 +# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY) Zone Asia/Qyzylorda 4:21:52 - LMT 1924 May 2 - 4:00 - KIZT 1930 Jun 21 # Kizilorda Time - 5:00 - KIZT 1981 Apr 1 - 5:00 1:00 KIZST 1981 Oct 1 - 6:00 - KIZT 1982 Apr 1 - 5:00 RussiaAsia KIZ%sT 1991 - 5:00 - KIZT 1991 Dec 16 # independence - 5:00 - QYZT 1992 Jan 19 2:00 - 6:00 RussiaAsia QYZ%sT 2005 Mar 15 - 6:00 - QYZT -# Aqtobe (aka Aktobe, formerly Aktyubinsk) + 4:00 - +04 1930 Jun 21 + 5:00 - +05 1981 Apr 1 + 5:00 1:00 +06 1981 Oct 1 + 6:00 - +06 1982 Apr 1 + 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s + 4:00 RussiaAsia +04/+05 1991 Sep 29 2:00s + 5:00 RussiaAsia +05/+06 1992 Jan 19 2:00s + 6:00 RussiaAsia +06/+07 1992 Mar 29 2:00s + 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s + 6:00 - +06 +# Aqtobe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT) Zone Asia/Aqtobe 3:48:40 - LMT 1924 May 2 - 4:00 - AKTT 1930 Jun 21 # Aktyubinsk Time - 5:00 - AKTT 1981 Apr 1 - 5:00 1:00 AKTST 1981 Oct 1 - 6:00 - AKTT 1982 Apr 1 - 5:00 RussiaAsia AKT%sT 1991 - 5:00 - AKTT 1991 Dec 16 # independence - 5:00 RussiaAsia AQT%sT 2005 Mar 15 # Aqtobe Time - 5:00 - AQTT -# Mangghystau + 4:00 - +04 1930 Jun 21 + 5:00 - +05 1981 Apr 1 + 5:00 1:00 +06 1981 Oct 1 + 6:00 - +06 1982 Apr 1 + 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s + 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s + 5:00 RussiaAsia +05/+06 2004 Oct 31 2:00s + 5:00 - +05 +# Qostanay (KZ-KUS) + +# Mangghystau (KZ-MAN) # Aqtau was not founded until 1963, but it represents an inhabited region, # so include time stamps before 1963. Zone Asia/Aqtau 3:21:04 - LMT 1924 May 2 - 4:00 - FORT 1930 Jun 21 # Fort Shevchenko T - 5:00 - FORT 1963 - 5:00 - SHET 1981 Oct 1 # Shevchenko Time - 6:00 - SHET 1982 Apr 1 - 5:00 RussiaAsia SHE%sT 1991 - 5:00 - SHET 1991 Dec 16 # independence - 5:00 RussiaAsia AQT%sT 1995 Mar lastSun 2:00 # Aqtau Time - 4:00 RussiaAsia AQT%sT 2005 Mar 15 - 5:00 - AQTT -# West Kazakhstan + 4:00 - +04 1930 Jun 21 + 5:00 - +05 1963 + 5:00 - +05 1981 Oct 1 + 6:00 - +06 1982 Apr 1 + 5:00 RussiaAsia +05/+06 1991 Mar 31 2:00s + 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s + 5:00 RussiaAsia +05/+06 1994 Sep 25 2:00s + 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s + 5:00 - +05 + +# West Kazakhstan (KZ-ZAP) +# From Paul Eggert (2016-03-18): +# The 1989 transition is from USSR act No. 227 (1989-03-14). Zone Asia/Oral 3:25:24 - LMT 1924 May 2 # or Ural'sk - 4:00 - URAT 1930 Jun 21 # Ural'sk time - 5:00 - URAT 1981 Apr 1 - 5:00 1:00 URAST 1981 Oct 1 - 6:00 - URAT 1982 Apr 1 - 5:00 RussiaAsia URA%sT 1989 Mar 26 2:00 - 4:00 RussiaAsia URA%sT 1991 - 4:00 - URAT 1991 Dec 16 # independence - 4:00 RussiaAsia ORA%sT 2005 Mar 15 # Oral Time - 5:00 - ORAT + 4:00 - +04 1930 Jun 21 + 5:00 - +05 1981 Apr 1 + 5:00 1:00 +06 1981 Oct 1 + 6:00 - +06 1982 Apr 1 + 5:00 RussiaAsia +05/+06 1989 Mar 26 2:00s + 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00s + 5:00 RussiaAsia +05/+06 1992 Mar 29 2:00s + 4:00 RussiaAsia +04/+05 2004 Oct 31 2:00s + 5:00 - +05 # Kyrgyzstan (Kirgizstan) # Transitions through 1991 are from Shanks & Pottenger. @@ -1650,11 +1821,11 @@ Rule Kyrgyz 1997 2005 - Mar lastSun 2:30 Rule Kyrgyz 1997 2004 - Oct lastSun 2:30 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Bishkek 4:58:24 - LMT 1924 May 2 - 5:00 - FRUT 1930 Jun 21 # Frunze Time - 6:00 RussiaAsia FRU%sT 1991 Mar 31 2:00s - 5:00 1:00 FRUST 1991 Aug 31 2:00 # independence - 5:00 Kyrgyz KG%sT 2005 Aug 12 # Kyrgyzstan Time - 6:00 - KGT + 5:00 - +05 1930 Jun 21 + 6:00 RussiaAsia +06/+07 1991 Mar 31 2:00s + 5:00 RussiaAsia +05/+06 1991 Aug 31 2:00 + 5:00 Kyrgyz +05/+06 2005 Aug 12 + 6:00 - +06 ############################################################################### @@ -1693,25 +1864,24 @@ Rule ROK 1957 1960 - Sep Sun>=18 0:00 0 Rule ROK 1987 1988 - May Sun>=8 2:00 1:00 D Rule ROK 1987 1988 - Oct Sun>=8 3:00 0 S -# From Paul Eggert (2014-10-30): +# From Paul Eggert (2016-08-23): # The Korean Wikipedia entry gives the following sources for UT offsets: # -# 1908: Official Journal Article No. 3994 (Edict No. 5) +# 1908: Official Journal Article No. 3994 (decree No. 5) # 1912: Governor-General of Korea Official Gazette Issue No. 367 # (Announcement No. 338) # 1954: Presidential Decree No. 876 (1954-03-17) # 1961: Law No. 676 (1961-08-07) -# 1987: Law No. 3919 (1986-12-31) # -# The Wikipedia entry also has confusing information about a change -# to UT+9 in April 1910, but then what would be the point of the later change -# to UT+9 on 1912-01-01? Omit the 1910 change for now. +# (Another source "1987: Law No. 3919 (1986-12-31)" was in the 2014-10-30 +# edition of the Korean Wikipedia entry.) # # I guessed that time zone abbreviations through 1945 followed the same # rules as discussed under Taiwan, with nominal switches from JST to KST # when the respective cities were taken over by the Allies after WWII. # -# For Pyongyang we have no information; guess no changes since World War II. +# For Pyongyang, guess no changes from World War II until 2015, as we +# have no information otherwise. # From Steffen Thorsen (2015-08-07): # According to many news sources, North Korea is going to change to @@ -1871,7 +2041,7 @@ Zone Indian/Maldives 4:54:00 - LMT 1880 # Bill Bonnet (2005-05-19) reports that the US Embassy in Ulaanbaatar says # there is only one time zone and that DST is observed, citing Microsoft # Windows XP as the source. Risto Nykänen (2005-05-16) reports that -# travelmongolia.org says there are two time zones (UTC+7, UTC+8) with no DST. +# travelmongolia.org says there are two time zones (UT +07, +08) with no DST. # Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in # Washington, DC says there are two time zones, with DST observed. # He also found @@ -2111,8 +2281,8 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920 # http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2 # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S -Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 - +Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S +Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 - Rule Pakistan 2008 only - Jun 1 0:00 1:00 S Rule Pakistan 2008 2009 - Nov 1 0:00 0 - Rule Pakistan 2009 only - Apr 15 0:00 1:00 S @@ -2380,6 +2550,16 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # http://www.timeanddate.com/time/change/gaza-strip/gaza # http://www.timeanddate.com/time/change/west-bank/hebron +# From Hannah Kreitem (2016-03-09): +# http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728 +# [Google translation]: "The Council also decided to start daylight +# saving in Palestine as of one o'clock on Saturday morning, +# 2016-03-26, to provide the clock 60 minutes ahead." +# +# From Paul Eggert (2016-03-12): +# Predict spring transitions on March's last Saturday at 01:00 from now on. +# Leave fall predictions alone for now. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 - @@ -2408,7 +2588,8 @@ Rule Palestine 2012 2014 - Mar lastThu 2 Rule Palestine 2012 only - Sep 21 1:00 0 - Rule Palestine 2013 only - Sep Fri>=21 0:00 0 - Rule Palestine 2014 max - Oct Fri>=21 0:00 0 - -Rule Palestine 2015 max - Mar lastFri 24:00 1:00 S +Rule Palestine 2015 only - Mar lastFri 24:00 1:00 S +Rule Palestine 2016 max - Mar lastSat 1:00 1:00 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2496,7 +2677,7 @@ Link Asia/Qatar Asia/Bahrain # earlier date. # # Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two -# time zones; the other zone, at UTC+4, was in the far eastern part of +# time zones; the other zone, at UT +04, was in the far eastern part of *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Oct 8 19:07:26 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9D1BC06B18 for ; Sat, 8 Oct 2016 19:07:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E950CD8; Sat, 8 Oct 2016 19:07:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98J7Pgp016252; Sat, 8 Oct 2016 19:07:25 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98J7PBi016250; Sat, 8 Oct 2016 19:07:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081907.u98J7PBi016250@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:07:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306866 - in projects/doctools: tools/build/mk usr.bin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:07:26 -0000 Author: bapt Date: Sat Oct 8 19:07:25 2016 New Revision: 306866 URL: https://svnweb.freebsd.org/changeset/base/306866 Log: vgrind(1) will be kept as the version in base with doctools decouple it from the groff option for now will be added to the upcoming DOCTOOLS option Modified: projects/doctools/tools/build/mk/OptionalObsoleteFiles.inc projects/doctools/usr.bin/Makefile Modified: projects/doctools/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/doctools/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 8 19:05:20 2016 (r306865) +++ projects/doctools/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 8 19:07:25 2016 (r306866) @@ -2172,7 +2172,6 @@ OLD_FILES+=usr/share/man/man3/gpio_pin_t OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif -# Also includes vgrind(1) .if ${MK_GROFF} == no OLD_FILES+=usr/bin/addftinfo OLD_FILES+=usr/bin/afmtodit @@ -2201,7 +2200,6 @@ OLD_FILES+=usr/bin/refer OLD_FILES+=usr/bin/tbl OLD_FILES+=usr/bin/tfmtodit OLD_FILES+=usr/bin/troff -OLD_FILES+=usr/bin/vgrind OLD_FILES+=usr/libexec/vfontedpr OLD_FILES+=usr/share/dict/eign OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz @@ -2607,13 +2605,11 @@ OLD_FILES+=usr/share/man/man1/refer.1.gz OLD_FILES+=usr/share/man/man1/tbl.1.gz OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz OLD_FILES+=usr/share/man/man1/troff.1.gz -OLD_FILES+=usr/share/man/man1/vgrind.1.gz OLD_FILES+=usr/share/man/man5/groff_font.5.gz OLD_FILES+=usr/share/man/man5/groff_out.5.gz OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz OLD_FILES+=usr/share/man/man5/lj4_font.5.gz OLD_FILES+=usr/share/man/man5/tmac.5.gz -OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz OLD_FILES+=usr/share/man/man7/ditroff.7.gz OLD_FILES+=usr/share/man/man7/groff.7.gz OLD_FILES+=usr/share/man/man7/groff_char.7.gz @@ -2649,8 +2645,6 @@ OLD_FILES+=usr/share/me/sh.me OLD_FILES+=usr/share/me/tbl.me OLD_FILES+=usr/share/me/thesis.me OLD_DIRS+=usr/share/me -OLD_FILES+=usr/share/misc/vgrindefs -OLD_FILES+=usr/share/misc/vgrindefs.db OLD_FILES+=usr/share/tmac/X.tmac OLD_FILES+=usr/share/tmac/Xps.tmac OLD_FILES+=usr/share/tmac/a4.tmac @@ -2712,7 +2706,6 @@ OLD_FILES+=usr/share/tmac/pspic.tmac OLD_FILES+=usr/share/tmac/s.tmac OLD_FILES+=usr/share/tmac/safer.tmac OLD_FILES+=usr/share/tmac/tmac.orig_me -OLD_FILES+=usr/share/tmac/tmac.vgrind OLD_FILES+=usr/share/tmac/trace.tmac OLD_FILES+=usr/share/tmac/troffrc OLD_FILES+=usr/share/tmac/troffrc-end Modified: projects/doctools/usr.bin/Makefile ============================================================================== --- projects/doctools/usr.bin/Makefile Sat Oct 8 19:05:20 2016 (r306865) +++ projects/doctools/usr.bin/Makefile Sat Oct 8 19:07:25 2016 (r306866) @@ -174,6 +174,7 @@ SUBDIR= alias \ unvis \ uudecode \ uuencode \ + vgrind \ vis \ vmstat \ w \ @@ -218,7 +219,6 @@ SUBDIR.${MK_GAMES}+= random SUBDIR+= dtc .endif .endif -SUBDIR.${MK_GROFF}+= vgrind SUBDIR.${MK_HESIOD}+= hesinfo SUBDIR.${MK_ICONV}+= iconv SUBDIR.${MK_ICONV}+= mkcsmapper From owner-svn-src-projects@freebsd.org Sat Oct 8 19:09:23 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81A59C06BF3 for ; Sat, 8 Oct 2016 19:09:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 505A9E26; Sat, 8 Oct 2016 19:09:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98J9MRI016360; Sat, 8 Oct 2016 19:09:22 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98J9M96016359; Sat, 8 Oct 2016 19:09:22 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081909.u98J9M96016359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:09:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306867 - projects/doctools/usr.bin/vgrind X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:09:23 -0000 Author: bapt Date: Sat Oct 8 19:09:22 2016 New Revision: 306867 URL: https://svnweb.freebsd.org/changeset/base/306867 Log: Move the tmac.vgrind into the directory expected by doctools Modified: projects/doctools/usr.bin/vgrind/Makefile Modified: projects/doctools/usr.bin/vgrind/Makefile ============================================================================== --- projects/doctools/usr.bin/vgrind/Makefile Sat Oct 8 19:07:25 2016 (r306866) +++ projects/doctools/usr.bin/vgrind/Makefile Sat Oct 8 19:09:22 2016 (r306867) @@ -8,7 +8,7 @@ FILES= vgrindefs.src vgrindefs.src.db tm FILESNAME_vgrindefs.src= vgrindefs FILESNAME_vgrindefs.src.db= vgrindefs.db FILESDIR= ${SHAREDIR}/misc -FILESDIR_tmac.vgrind= ${SHAREDIR}/tmac +FILESDIR_tmac.vgrind= ${SHAREDIR}/doctools/tmac MAN= vgrind.1 vgrindefs.5 WARNS?= 3 From owner-svn-src-projects@freebsd.org Sat Oct 8 19:12:13 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F0F9C06D0C for ; Sat, 8 Oct 2016 19:12:13 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4EB20173; Sat, 8 Oct 2016 19:12:13 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98JCCvl019325; Sat, 8 Oct 2016 19:12:12 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98JCC6Z019324; Sat, 8 Oct 2016 19:12:12 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081912.u98JCC6Z019324@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:12:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306868 - projects/doctools/usr.bin/vgrind X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:12:13 -0000 Author: bapt Date: Sat Oct 8 19:12:12 2016 New Revision: 306868 URL: https://svnweb.freebsd.org/changeset/base/306868 Log: Update the vgrind manpage with the new path Modified: projects/doctools/usr.bin/vgrind/vgrind.1 Modified: projects/doctools/usr.bin/vgrind/vgrind.1 ============================================================================== --- projects/doctools/usr.bin/vgrind/vgrind.1 Sat Oct 8 19:09:22 2016 (r306867) +++ projects/doctools/usr.bin/vgrind/vgrind.1 Sat Oct 8 19:12:12 2016 (r306868) @@ -28,7 +28,7 @@ .\" @(#)vgrind.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd August 29, 2006 +.Dd October 8, 2016 .Dt VGRIND 1 .Os .Sh NAME @@ -181,7 +181,7 @@ as argument. .Bl -tag -width /usr/share/misc/vgrindefsxx -compact .It Pa index file where source for index is created -.It Pa /usr/share/tmac/tmac.vgrind +.It Pa /usr/share/doctools/tmac/tmac.vgrind macro package .It Pa /usr/libexec/vfontedpr preprocessor From owner-svn-src-projects@freebsd.org Sat Oct 8 19:13:35 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75C5CC06D59 for ; Sat, 8 Oct 2016 19:13:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 480612EC; Sat, 8 Oct 2016 19:13:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98JDY1i020081; Sat, 8 Oct 2016 19:13:34 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98JDY5n020080; Sat, 8 Oct 2016 19:13:34 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081913.u98JDY5n020080@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:13:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306869 - projects/doctools/usr.bin/vgrind X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:13:35 -0000 Author: bapt Date: Sat Oct 8 19:13:34 2016 New Revision: 306869 URL: https://svnweb.freebsd.org/changeset/base/306869 Log: Make vgrind(1) use the new path to find tmac.misc Modified: projects/doctools/usr.bin/vgrind/vgrind.sh Modified: projects/doctools/usr.bin/vgrind/vgrind.sh ============================================================================== --- projects/doctools/usr.bin/vgrind/vgrind.sh Sat Oct 8 19:12:12 2016 (r306868) +++ projects/doctools/usr.bin/vgrind/vgrind.sh Sat Oct 8 19:13:34 2016 (r306869) @@ -38,7 +38,7 @@ files="" f="" head="" vf="/usr/libexec/vfontedpr" -tm="/usr/share/tmac" +tm="/usr/share/doctools/tmac" postproc="psroff" # Parse args From owner-svn-src-projects@freebsd.org Sat Oct 8 19:20:04 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41228C06E67 for ; Sat, 8 Oct 2016 19:20:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13260862; Sat, 8 Oct 2016 19:20:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98JK3eB020383; Sat, 8 Oct 2016 19:20:03 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98JK3e2020381; Sat, 8 Oct 2016 19:20:03 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081920.u98JK3e2020381@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:20:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306870 - in projects/doctools: share/mk tools/build/options X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:20:04 -0000 Author: bapt Date: Sat Oct 8 19:20:02 2016 New Revision: 306870 URL: https://svnweb.freebsd.org/changeset/base/306870 Log: Add a new DOCTOOLS option Added: projects/doctools/tools/build/options/WITHOUT_DOCTOOLS (contents, props changed) Modified: projects/doctools/share/mk/src.opts.mk Modified: projects/doctools/share/mk/src.opts.mk ============================================================================== --- projects/doctools/share/mk/src.opts.mk Sat Oct 8 19:13:34 2016 (r306869) +++ projects/doctools/share/mk/src.opts.mk Sat Oct 8 19:20:02 2016 (r306870) @@ -78,6 +78,7 @@ __DEFAULT_YES_OPTIONS = \ CXX \ DIALOG \ DICT \ + DOCTOOLS \ DMAGENT \ DYNAMICROOT \ ED_CRYPTO \ @@ -313,6 +314,7 @@ MK_SOURCELESS_UCODE:= no .if ${MK_CDDL} == "no" MK_ZFS:= no MK_CTF:= no +MK_DOCTOOLS:= no .endif .if ${MK_CRYPT} == "no" @@ -358,6 +360,7 @@ MK_DTRACE_TESTS:= no .if ${MK_TEXTPROC} == "no" MK_GROFF:= no +MK_DOCTOOLS:= no .endif .if ${MK_CROSS_COMPILER} == "no" Added: projects/doctools/tools/build/options/WITHOUT_DOCTOOLS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/doctools/tools/build/options/WITHOUT_DOCTOOLS Sat Oct 8 19:20:02 2016 (r306870) @@ -0,0 +1,9 @@ +.\" $FreeBSD$ +Set to not build the +.Xr roff 7 +toolchain +You should consider installing the textproc/groff ports or the +textproc/heirloom-doctools port to not break +.Xr man 1 +on man pages not supported by +.Xr mandoc 1 From owner-svn-src-projects@freebsd.org Sat Oct 8 19:21:30 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21EBBC06EC5 for ; Sat, 8 Oct 2016 19:21:30 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E896FAEB; Sat, 8 Oct 2016 19:21:29 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98JLTg6023163; Sat, 8 Oct 2016 19:21:29 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98JLTp8023162; Sat, 8 Oct 2016 19:21:29 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081921.u98JLTp8023162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:21:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306871 - projects/doctools/cddl/usr.bin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:21:30 -0000 Author: bapt Date: Sat Oct 8 19:21:28 2016 New Revision: 306871 URL: https://svnweb.freebsd.org/changeset/base/306871 Log: Connect doctools to the build Modified: projects/doctools/cddl/usr.bin/Makefile Modified: projects/doctools/cddl/usr.bin/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/Makefile Sat Oct 8 19:20:02 2016 (r306870) +++ projects/doctools/cddl/usr.bin/Makefile Sat Oct 8 19:21:28 2016 (r306871) @@ -12,6 +12,8 @@ SUBDIR= \ ${_zstreamdump} \ ${_ztest} +SUBDIR.${MK_DOCTOOLS}= doctools + .if ${MK_TESTS} != "no" _tests= tests .endif From owner-svn-src-projects@freebsd.org Sat Oct 8 19:25:23 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84D3AC06067 for ; Sat, 8 Oct 2016 19:25:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5180EDFD; Sat, 8 Oct 2016 19:25:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98JPMGi024280; Sat, 8 Oct 2016 19:25:22 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98JPM0j024278; Sat, 8 Oct 2016 19:25:22 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081925.u98JPM0j024278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:25:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306872 - in projects/doctools: . share/doc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:25:23 -0000 Author: bapt Date: Sat Oct 8 19:25:22 2016 New Revision: 306872 URL: https://svnweb.freebsd.org/changeset/base/306872 Log: While this is not working yet, prepare the build system for using doctools instead of groff Modified: projects/doctools/Makefile.inc1 projects/doctools/share/doc/Makefile Modified: projects/doctools/Makefile.inc1 ============================================================================== --- projects/doctools/Makefile.inc1 Sat Oct 8 19:21:28 2016 (r306871) +++ projects/doctools/Makefile.inc1 Sat Oct 8 19:25:22 2016 (r306872) @@ -1586,8 +1586,8 @@ _strfile= usr.bin/fortune/strfile _gperf= gnu/usr.bin/gperf .endif -.if ${MK_SHAREDOCS} != "no" || ${MK_GROFF} != "no" -_groff= gnu/usr.bin/groff \ +.if ${MK_SHAREDOCS} != "no" || ${MK_DOCTOOLS} != "no" +_doctools= cddl/usr.bin/doctools \ usr.bin/soelim .endif @@ -1700,7 +1700,7 @@ bootstrap-tools: .PHONY ${_kerberos5_bootstrap_tools} \ ${_strfile} \ ${_gperf} \ - ${_groff} \ + ${_doctools} \ ${_dtc} \ ${_cat} \ ${_dd} \ Modified: projects/doctools/share/doc/Makefile ============================================================================== --- projects/doctools/share/doc/Makefile Sat Oct 8 19:21:28 2016 (r306871) +++ projects/doctools/share/doc/Makefile Sat Oct 8 19:25:22 2016 (r306872) @@ -24,7 +24,7 @@ _IPv6= IPv6 .endif # FIXME this is not a real solution ... -.if ${MK_GROFF} != "no" +.if ${MK_DOCTOOLS} != "no" _roffdocs= papers psd smm usd .endif From owner-svn-src-projects@freebsd.org Sat Oct 8 19:32:19 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 87769C06348 for ; Sat, 8 Oct 2016 19:32:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F848693; Sat, 8 Oct 2016 19:32:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98JWIpk025497; Sat, 8 Oct 2016 19:32:18 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98JWIvx025494; Sat, 8 Oct 2016 19:32:18 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081932.u98JWIvx025494@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:32:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306873 - in projects/doctools: etc/mtree share share/me X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:32:19 -0000 Author: bapt Date: Sat Oct 8 19:32:17 2016 New Revision: 306873 URL: https://svnweb.freebsd.org/changeset/base/306873 Log: Install the orig_me macros only when DOCTOOLS is installed and under the new directory Modified: projects/doctools/etc/mtree/BSD.usr.dist projects/doctools/share/Makefile projects/doctools/share/me/Makefile Modified: projects/doctools/etc/mtree/BSD.usr.dist ============================================================================== --- projects/doctools/etc/mtree/BSD.usr.dist Sat Oct 8 19:25:22 2016 (r306872) +++ projects/doctools/etc/mtree/BSD.usr.dist Sat Oct 8 19:32:17 2016 (r306873) @@ -321,12 +321,14 @@ .. font .. + me + .. + nterm + .. pub .. tmac .. - nterm - .. .. dtrace .. Modified: projects/doctools/share/Makefile ============================================================================== --- projects/doctools/share/Makefile Sat Oct 8 19:25:22 2016 (r306872) +++ projects/doctools/share/Makefile Sat Oct 8 19:32:17 2016 (r306873) @@ -49,9 +49,7 @@ _dict= dict _examples= examples .endif -.if ${MK_GROFF} != "no" -_me= me -.endif +SUBDIR.${MK_DOCTOOLS}+= me .if ${MK_ICONV} != "no" _i18n= i18n Modified: projects/doctools/share/me/Makefile ============================================================================== --- projects/doctools/share/me/Makefile Sat Oct 8 19:25:22 2016 (r306872) +++ projects/doctools/share/me/Makefile Sat Oct 8 19:32:17 2016 (r306873) @@ -1,8 +1,8 @@ # @(#)Makefile 8.2 (Berkeley) 3/27/94 # $FreeBSD$ -MELIB= ${BINDIR}/me -TMLIB= ${BINDIR}/tmac +MELIB= ${BINDIR}/doctools/me +TMLIB= ${BINDIR}/doctools/tmac MESRCS= acm.me chars.me deltext.me eqn.me float.me footnote.me \ index.me letterhead.me local.me null.me refer.me sh.me \ tbl.me thesis.me From owner-svn-src-projects@freebsd.org Sat Oct 8 19:43:29 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 30AA9C0665C for ; Sat, 8 Oct 2016 19:43:29 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DABCCCBF; Sat, 8 Oct 2016 19:43:28 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98JhSGZ031873; Sat, 8 Oct 2016 19:43:28 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98JhRQX031864; Sat, 8 Oct 2016 19:43:27 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081943.u98JhRQX031864@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:43:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306875 - in projects/doctools: . etc etc/mtree gnu/usr.bin gnu/usr.bin/groff release share/mk tools/build/mk tools/build/options X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:43:29 -0000 Author: bapt Date: Sat Oct 8 19:43:27 2016 New Revision: 306875 URL: https://svnweb.freebsd.org/changeset/base/306875 Log: Remove entirely groff Groff cannot be installed along with doctools, removing it entirely now will help figuring out what breaks Deleted: projects/doctools/gnu/usr.bin/groff/ projects/doctools/tools/build/options/WITHOUT_GROFF Modified: projects/doctools/Makefile.inc1 projects/doctools/ObsoleteFiles.inc projects/doctools/etc/Makefile projects/doctools/etc/mtree/Makefile projects/doctools/gnu/usr.bin/Makefile projects/doctools/release/Makefile projects/doctools/share/mk/src.opts.mk projects/doctools/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/doctools/Makefile.inc1 ============================================================================== --- projects/doctools/Makefile.inc1 Sat Oct 8 19:40:58 2016 (r306874) +++ projects/doctools/Makefile.inc1 Sat Oct 8 19:43:27 2016 (r306875) @@ -465,7 +465,8 @@ CROSSENV+= MAKEOBJDIRPREFIX=${OBJTREE} \ # Don't rebuild build-tools targets during normal build. CROSSENV+= BUILD_TOOLS_META=.NOMETA_CMP .endif -.if ${MK_GROFF} != "no" +.if ${MK_DOCTOOLS} != "no" +# XXX TODO CROSSENV+= GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac @@ -681,10 +682,6 @@ _worldtmp: .PHONY .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${WORLDTMP}/legacy/usr >/dev/null -.if ${MK_GROFF} != "no" - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \ - -p ${WORLDTMP}/legacy/usr >/dev/null -.endif mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${WORLDTMP}/legacy/usr/include >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ Modified: projects/doctools/ObsoleteFiles.inc ============================================================================== --- projects/doctools/ObsoleteFiles.inc Sat Oct 8 19:40:58 2016 (r306874) +++ projects/doctools/ObsoleteFiles.inc Sat Oct 8 19:43:27 2016 (r306875) @@ -38,6 +38,461 @@ # xargs -n1 | sort | uniq -d; # done +# 2016XXXX: GNU roff is replaced by heirloom doctools +OLD_FILES+=usr/bin/addftinfo +OLD_FILES+=usr/bin/afmtodit +OLD_FILES+=usr/bin/grn +OLD_FILES+=usr/bin/grodvi +OLD_FILES+=usr/bin/groff +OLD_FILES+=usr/bin/grog +OLD_FILES+=usr/bin/grolbp +OLD_FILES+=usr/bin/grolj4 +OLD_FILES+=usr/bin/grops +OLD_FILES+=usr/bin/grotty +OLD_FILES+=usr/bin/hpftodit +OLD_FILES+=usr/bin/lkbib +OLD_FILES+=usr/bin/mmroff +OLD_FILES+=usr/bin/pfbtops +OLD_FILES+=usr/bin/post-grohtml +OLD_FILES+=usr/bin/pre-grohtml +OLD_FILES+=usr/bin/psroff +OLD_FILES+=usr/bin/tfmtodit +OLD_FILES+=usr/libexec/vfontedpr +OLD_FILES+=usr/share/dict/eign +OLD_FILES+=usr/share/groff_font/devX100-12/CB +OLD_FILES+=usr/share/groff_font/devX100-12/CBI +OLD_FILES+=usr/share/groff_font/devX100-12/CI +OLD_FILES+=usr/share/groff_font/devX100-12/CR +OLD_FILES+=usr/share/groff_font/devX100-12/DESC +OLD_FILES+=usr/share/groff_font/devX100-12/HB +OLD_FILES+=usr/share/groff_font/devX100-12/HBI +OLD_FILES+=usr/share/groff_font/devX100-12/HI +OLD_FILES+=usr/share/groff_font/devX100-12/HR +OLD_FILES+=usr/share/groff_font/devX100-12/NB +OLD_FILES+=usr/share/groff_font/devX100-12/NBI +OLD_FILES+=usr/share/groff_font/devX100-12/NI +OLD_FILES+=usr/share/groff_font/devX100-12/NR +OLD_FILES+=usr/share/groff_font/devX100-12/S +OLD_FILES+=usr/share/groff_font/devX100-12/TB +OLD_FILES+=usr/share/groff_font/devX100-12/TBI +OLD_FILES+=usr/share/groff_font/devX100-12/TI +OLD_FILES+=usr/share/groff_font/devX100-12/TR +OLD_DIRS+=usr/share/groff_font/devX100-12 +OLD_FILES+=usr/share/groff_font/devX100/CB +OLD_FILES+=usr/share/groff_font/devX100/CBI +OLD_FILES+=usr/share/groff_font/devX100/CI +OLD_FILES+=usr/share/groff_font/devX100/CR +OLD_FILES+=usr/share/groff_font/devX100/DESC +OLD_FILES+=usr/share/groff_font/devX100/HB +OLD_FILES+=usr/share/groff_font/devX100/HBI +OLD_FILES+=usr/share/groff_font/devX100/HI +OLD_FILES+=usr/share/groff_font/devX100/HR +OLD_FILES+=usr/share/groff_font/devX100/NB +OLD_FILES+=usr/share/groff_font/devX100/NBI +OLD_FILES+=usr/share/groff_font/devX100/NI +OLD_FILES+=usr/share/groff_font/devX100/NR +OLD_FILES+=usr/share/groff_font/devX100/S +OLD_FILES+=usr/share/groff_font/devX100/TB +OLD_FILES+=usr/share/groff_font/devX100/TBI +OLD_FILES+=usr/share/groff_font/devX100/TI +OLD_FILES+=usr/share/groff_font/devX100/TR +OLD_DIRS+=usr/share/groff_font/devX100 +OLD_FILES+=usr/share/groff_font/devX75-12/CB +OLD_FILES+=usr/share/groff_font/devX75-12/CBI +OLD_FILES+=usr/share/groff_font/devX75-12/CI +OLD_FILES+=usr/share/groff_font/devX75-12/CR +OLD_FILES+=usr/share/groff_font/devX75-12/DESC +OLD_FILES+=usr/share/groff_font/devX75-12/HB +OLD_FILES+=usr/share/groff_font/devX75-12/HBI +OLD_FILES+=usr/share/groff_font/devX75-12/HI +OLD_FILES+=usr/share/groff_font/devX75-12/HR +OLD_FILES+=usr/share/groff_font/devX75-12/NB +OLD_FILES+=usr/share/groff_font/devX75-12/NBI +OLD_FILES+=usr/share/groff_font/devX75-12/NI +OLD_FILES+=usr/share/groff_font/devX75-12/NR +OLD_FILES+=usr/share/groff_font/devX75-12/S +OLD_FILES+=usr/share/groff_font/devX75-12/TB +OLD_FILES+=usr/share/groff_font/devX75-12/TBI +OLD_FILES+=usr/share/groff_font/devX75-12/TI +OLD_FILES+=usr/share/groff_font/devX75-12/TR +OLD_DIRS+=usr/share/groff_font/devX75-12 +OLD_FILES+=usr/share/groff_font/devX75/CB +OLD_FILES+=usr/share/groff_font/devX75/CBI +OLD_FILES+=usr/share/groff_font/devX75/CI +OLD_FILES+=usr/share/groff_font/devX75/CR +OLD_FILES+=usr/share/groff_font/devX75/DESC +OLD_FILES+=usr/share/groff_font/devX75/HB +OLD_FILES+=usr/share/groff_font/devX75/HBI +OLD_FILES+=usr/share/groff_font/devX75/HI +OLD_FILES+=usr/share/groff_font/devX75/HR +OLD_FILES+=usr/share/groff_font/devX75/NB +OLD_FILES+=usr/share/groff_font/devX75/NBI +OLD_FILES+=usr/share/groff_font/devX75/NI +OLD_FILES+=usr/share/groff_font/devX75/NR +OLD_FILES+=usr/share/groff_font/devX75/S +OLD_FILES+=usr/share/groff_font/devX75/TB +OLD_FILES+=usr/share/groff_font/devX75/TBI +OLD_FILES+=usr/share/groff_font/devX75/TI +OLD_FILES+=usr/share/groff_font/devX75/TR +OLD_DIRS+=usr/share/groff_font/devX75 +OLD_FILES+=usr/share/groff_font/devascii/B +OLD_FILES+=usr/share/groff_font/devascii/BI +OLD_FILES+=usr/share/groff_font/devascii/CW +OLD_FILES+=usr/share/groff_font/devascii/DESC +OLD_FILES+=usr/share/groff_font/devascii/I +OLD_FILES+=usr/share/groff_font/devascii/L +OLD_FILES+=usr/share/groff_font/devascii/R +OLD_FILES+=usr/share/groff_font/devascii/S +OLD_DIRS+=usr/share/groff_font/devascii +OLD_FILES+=usr/share/groff_font/devcp1047/B +OLD_FILES+=usr/share/groff_font/devcp1047/BI +OLD_FILES+=usr/share/groff_font/devcp1047/CW +OLD_FILES+=usr/share/groff_font/devcp1047/DESC +OLD_FILES+=usr/share/groff_font/devcp1047/I +OLD_FILES+=usr/share/groff_font/devcp1047/L +OLD_FILES+=usr/share/groff_font/devcp1047/R +OLD_FILES+=usr/share/groff_font/devcp1047/S +OLD_DIRS+=usr/share/groff_font/devcp1047 +OLD_FILES+=usr/share/groff_font/devdvi/CW +OLD_FILES+=usr/share/groff_font/devdvi/CWEC +OLD_FILES+=usr/share/groff_font/devdvi/CWI +OLD_FILES+=usr/share/groff_font/devdvi/CWIEC +OLD_FILES+=usr/share/groff_font/devdvi/CWITC +OLD_FILES+=usr/share/groff_font/devdvi/CWTC +OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts +OLD_FILES+=usr/share/groff_font/devdvi/DESC +OLD_FILES+=usr/share/groff_font/devdvi/EX +OLD_FILES+=usr/share/groff_font/devdvi/HB +OLD_FILES+=usr/share/groff_font/devdvi/HBEC +OLD_FILES+=usr/share/groff_font/devdvi/HBI +OLD_FILES+=usr/share/groff_font/devdvi/HBIEC +OLD_FILES+=usr/share/groff_font/devdvi/HBITC +OLD_FILES+=usr/share/groff_font/devdvi/HBTC +OLD_FILES+=usr/share/groff_font/devdvi/HI +OLD_FILES+=usr/share/groff_font/devdvi/HIEC +OLD_FILES+=usr/share/groff_font/devdvi/HITC +OLD_FILES+=usr/share/groff_font/devdvi/HR +OLD_FILES+=usr/share/groff_font/devdvi/HREC +OLD_FILES+=usr/share/groff_font/devdvi/HRTC +OLD_FILES+=usr/share/groff_font/devdvi/MI +OLD_FILES+=usr/share/groff_font/devdvi/Makefile +OLD_FILES+=usr/share/groff_font/devdvi/S +OLD_FILES+=usr/share/groff_font/devdvi/SA +OLD_FILES+=usr/share/groff_font/devdvi/SB +OLD_FILES+=usr/share/groff_font/devdvi/SC +OLD_FILES+=usr/share/groff_font/devdvi/TB +OLD_FILES+=usr/share/groff_font/devdvi/TBEC +OLD_FILES+=usr/share/groff_font/devdvi/TBI +OLD_FILES+=usr/share/groff_font/devdvi/TBIEC +OLD_FILES+=usr/share/groff_font/devdvi/TBITC +OLD_FILES+=usr/share/groff_font/devdvi/TBTC +OLD_FILES+=usr/share/groff_font/devdvi/TI +OLD_FILES+=usr/share/groff_font/devdvi/TIEC +OLD_FILES+=usr/share/groff_font/devdvi/TITC +OLD_FILES+=usr/share/groff_font/devdvi/TR +OLD_FILES+=usr/share/groff_font/devdvi/TREC +OLD_FILES+=usr/share/groff_font/devdvi/TRTC +OLD_FILES+=usr/share/groff_font/devdvi/ec.map +OLD_FILES+=usr/share/groff_font/devdvi/msam.map +OLD_FILES+=usr/share/groff_font/devdvi/msbm.map +OLD_FILES+=usr/share/groff_font/devdvi/tc.map +OLD_FILES+=usr/share/groff_font/devdvi/texb.map +OLD_FILES+=usr/share/groff_font/devdvi/texex.map +OLD_FILES+=usr/share/groff_font/devdvi/texi.map +OLD_FILES+=usr/share/groff_font/devdvi/texmi.map +OLD_FILES+=usr/share/groff_font/devdvi/texr.map +OLD_FILES+=usr/share/groff_font/devdvi/texsy.map +OLD_FILES+=usr/share/groff_font/devdvi/textex.map +OLD_FILES+=usr/share/groff_font/devdvi/textt.map +OLD_DIRS+=usr/share/groff_font/devdvi +OLD_FILES+=usr/share/groff_font/devhtml/B +OLD_FILES+=usr/share/groff_font/devhtml/BI +OLD_FILES+=usr/share/groff_font/devhtml/CB +OLD_FILES+=usr/share/groff_font/devhtml/CBI +OLD_FILES+=usr/share/groff_font/devhtml/CI +OLD_FILES+=usr/share/groff_font/devhtml/CR +OLD_FILES+=usr/share/groff_font/devhtml/DESC +OLD_FILES+=usr/share/groff_font/devhtml/I +OLD_FILES+=usr/share/groff_font/devhtml/R +OLD_FILES+=usr/share/groff_font/devhtml/S +OLD_DIRS+=usr/share/groff_font/devhtml +OLD_FILES+=usr/share/groff_font/devkoi8-r/B +OLD_FILES+=usr/share/groff_font/devkoi8-r/BI +OLD_FILES+=usr/share/groff_font/devkoi8-r/CW +OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC +OLD_FILES+=usr/share/groff_font/devkoi8-r/I +OLD_FILES+=usr/share/groff_font/devkoi8-r/L +OLD_FILES+=usr/share/groff_font/devkoi8-r/R +OLD_FILES+=usr/share/groff_font/devkoi8-r/S +OLD_DIRS+=usr/share/groff_font/devkoi8-r +OLD_FILES+=usr/share/groff_font/devlatin1/B +OLD_FILES+=usr/share/groff_font/devlatin1/BI +OLD_FILES+=usr/share/groff_font/devlatin1/CW +OLD_FILES+=usr/share/groff_font/devlatin1/DESC +OLD_FILES+=usr/share/groff_font/devlatin1/I +OLD_FILES+=usr/share/groff_font/devlatin1/L +OLD_FILES+=usr/share/groff_font/devlatin1/R +OLD_FILES+=usr/share/groff_font/devlatin1/S +OLD_DIRS+=usr/share/groff_font/devlatin1 +OLD_FILES+=usr/share/groff_font/devlbp/CB +OLD_FILES+=usr/share/groff_font/devlbp/CI +OLD_FILES+=usr/share/groff_font/devlbp/CR +OLD_FILES+=usr/share/groff_font/devlbp/DESC +OLD_FILES+=usr/share/groff_font/devlbp/EB +OLD_FILES+=usr/share/groff_font/devlbp/EI +OLD_FILES+=usr/share/groff_font/devlbp/ER +OLD_FILES+=usr/share/groff_font/devlbp/HB +OLD_FILES+=usr/share/groff_font/devlbp/HBI +OLD_FILES+=usr/share/groff_font/devlbp/HI +OLD_FILES+=usr/share/groff_font/devlbp/HNB +OLD_FILES+=usr/share/groff_font/devlbp/HNBI +OLD_FILES+=usr/share/groff_font/devlbp/HNI +OLD_FILES+=usr/share/groff_font/devlbp/HNR +OLD_FILES+=usr/share/groff_font/devlbp/HR +OLD_FILES+=usr/share/groff_font/devlbp/TB +OLD_FILES+=usr/share/groff_font/devlbp/TBI +OLD_FILES+=usr/share/groff_font/devlbp/TI +OLD_FILES+=usr/share/groff_font/devlbp/TR +OLD_DIRS+=usr/share/groff_font/devlbp +OLD_FILES+=usr/share/groff_font/devlj4/AB +OLD_FILES+=usr/share/groff_font/devlj4/ABI +OLD_FILES+=usr/share/groff_font/devlj4/AI +OLD_FILES+=usr/share/groff_font/devlj4/ALBB +OLD_FILES+=usr/share/groff_font/devlj4/ALBR +OLD_FILES+=usr/share/groff_font/devlj4/AOB +OLD_FILES+=usr/share/groff_font/devlj4/AOI +OLD_FILES+=usr/share/groff_font/devlj4/AOR +OLD_FILES+=usr/share/groff_font/devlj4/AR +OLD_FILES+=usr/share/groff_font/devlj4/CB +OLD_FILES+=usr/share/groff_font/devlj4/CBI +OLD_FILES+=usr/share/groff_font/devlj4/CI +OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON +OLD_FILES+=usr/share/groff_font/devlj4/CORONET +OLD_FILES+=usr/share/groff_font/devlj4/CR +OLD_FILES+=usr/share/groff_font/devlj4/DESC +OLD_FILES+=usr/share/groff_font/devlj4/GB +OLD_FILES+=usr/share/groff_font/devlj4/GBI +OLD_FILES+=usr/share/groff_font/devlj4/GI +OLD_FILES+=usr/share/groff_font/devlj4/GR +OLD_FILES+=usr/share/groff_font/devlj4/LGB +OLD_FILES+=usr/share/groff_font/devlj4/LGI +OLD_FILES+=usr/share/groff_font/devlj4/LGR +OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD +OLD_FILES+=usr/share/groff_font/devlj4/OB +OLD_FILES+=usr/share/groff_font/devlj4/OBI +OLD_FILES+=usr/share/groff_font/devlj4/OI +OLD_FILES+=usr/share/groff_font/devlj4/OR +OLD_FILES+=usr/share/groff_font/devlj4/S +OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL +OLD_FILES+=usr/share/groff_font/devlj4/TB +OLD_FILES+=usr/share/groff_font/devlj4/TBI +OLD_FILES+=usr/share/groff_font/devlj4/TI +OLD_FILES+=usr/share/groff_font/devlj4/TNRB +OLD_FILES+=usr/share/groff_font/devlj4/TNRBI +OLD_FILES+=usr/share/groff_font/devlj4/TNRI +OLD_FILES+=usr/share/groff_font/devlj4/TNRR +OLD_FILES+=usr/share/groff_font/devlj4/TR +OLD_FILES+=usr/share/groff_font/devlj4/UB +OLD_FILES+=usr/share/groff_font/devlj4/UBI +OLD_FILES+=usr/share/groff_font/devlj4/UCB +OLD_FILES+=usr/share/groff_font/devlj4/UCBI +OLD_FILES+=usr/share/groff_font/devlj4/UCI +OLD_FILES+=usr/share/groff_font/devlj4/UCR +OLD_FILES+=usr/share/groff_font/devlj4/UI +OLD_FILES+=usr/share/groff_font/devlj4/UR +OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS +OLD_DIRS+=usr/share/groff_font/devlj4 +OLD_FILES+=usr/share/groff_font/devps/AB +OLD_FILES+=usr/share/groff_font/devps/ABI +OLD_FILES+=usr/share/groff_font/devps/AI +OLD_FILES+=usr/share/groff_font/devps/AR +OLD_FILES+=usr/share/groff_font/devps/BMB +OLD_FILES+=usr/share/groff_font/devps/BMBI +OLD_FILES+=usr/share/groff_font/devps/BMI +OLD_FILES+=usr/share/groff_font/devps/BMR +OLD_FILES+=usr/share/groff_font/devps/CB +OLD_FILES+=usr/share/groff_font/devps/CBI +OLD_FILES+=usr/share/groff_font/devps/CI +OLD_FILES+=usr/share/groff_font/devps/CR +OLD_FILES+=usr/share/groff_font/devps/DESC +OLD_FILES+=usr/share/groff_font/devps/EURO +OLD_FILES+=usr/share/groff_font/devps/HB +OLD_FILES+=usr/share/groff_font/devps/HBI +OLD_FILES+=usr/share/groff_font/devps/HI +OLD_FILES+=usr/share/groff_font/devps/HNB +OLD_FILES+=usr/share/groff_font/devps/HNBI +OLD_FILES+=usr/share/groff_font/devps/HNI +OLD_FILES+=usr/share/groff_font/devps/HNR +OLD_FILES+=usr/share/groff_font/devps/HR +OLD_FILES+=usr/share/groff_font/devps/Makefile +OLD_FILES+=usr/share/groff_font/devps/NB +OLD_FILES+=usr/share/groff_font/devps/NBI +OLD_FILES+=usr/share/groff_font/devps/NI +OLD_FILES+=usr/share/groff_font/devps/NR +OLD_FILES+=usr/share/groff_font/devps/PB +OLD_FILES+=usr/share/groff_font/devps/PBI +OLD_FILES+=usr/share/groff_font/devps/PI +OLD_FILES+=usr/share/groff_font/devps/PR +OLD_FILES+=usr/share/groff_font/devps/S +OLD_FILES+=usr/share/groff_font/devps/SS +OLD_FILES+=usr/share/groff_font/devps/TB +OLD_FILES+=usr/share/groff_font/devps/TBI +OLD_FILES+=usr/share/groff_font/devps/TI +OLD_FILES+=usr/share/groff_font/devps/TR +OLD_FILES+=usr/share/groff_font/devps/ZCMI +OLD_FILES+=usr/share/groff_font/devps/ZD +OLD_FILES+=usr/share/groff_font/devps/ZDR +OLD_FILES+=usr/share/groff_font/devps/afmname +OLD_FILES+=usr/share/groff_font/devps/dingbats.map +OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap +OLD_FILES+=usr/share/groff_font/devps/download +OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa +OLD_FILES+=usr/share/groff_font/devps/lgreekmap +OLD_FILES+=usr/share/groff_font/devps/prologue +OLD_FILES+=usr/share/groff_font/devps/symbol.sed +OLD_FILES+=usr/share/groff_font/devps/symbolchars +OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm +OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa +OLD_FILES+=usr/share/groff_font/devps/text.enc +OLD_FILES+=usr/share/groff_font/devps/textmap +OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa +OLD_DIRS+=usr/share/groff_font/devps +OLD_FILES+=usr/share/groff_font/devutf8/B +OLD_FILES+=usr/share/groff_font/devutf8/BI +OLD_FILES+=usr/share/groff_font/devutf8/CW +OLD_FILES+=usr/share/groff_font/devutf8/DESC +OLD_FILES+=usr/share/groff_font/devutf8/I +OLD_FILES+=usr/share/groff_font/devutf8/L +OLD_FILES+=usr/share/groff_font/devutf8/R +OLD_FILES+=usr/share/groff_font/devutf8/S +OLD_DIRS+=usr/share/groff_font/devutf8 +OLD_DIRS+=usr/share/groff_font +OLD_FILES+=usr/share/info/groff.info.gz +OLD_FILES+=usr/share/man/man1/addftinfo.1.gz +OLD_FILES+=usr/share/man/man1/afmtodit.1.gz +OLD_FILES+=usr/share/man/man1/grn.1.gz +OLD_FILES+=usr/share/man/man1/grodvi.1.gz +OLD_FILES+=usr/share/man/man1/groff.1.gz +OLD_FILES+=usr/share/man/man1/grog.1.gz +OLD_FILES+=usr/share/man/man1/grolbp.1.gz +OLD_FILES+=usr/share/man/man1/grolj4.1.gz +OLD_FILES+=usr/share/man/man1/grops.1.gz +OLD_FILES+=usr/share/man/man1/grotty.1.gz +OLD_FILES+=usr/share/man/man1/hpftodit.1.gz +OLD_FILES+=usr/share/man/man1/indxbib.1.gz +OLD_FILES+=usr/share/man/man1/lkbib.1.gz +OLD_FILES+=usr/share/man/man1/mmroff.1.gz +OLD_FILES+=usr/share/man/man1/pfbtops.1.gz +OLD_FILES+=usr/share/man/man1/psroff.1.gz +OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz +OLD_FILES+=usr/share/man/man5/groff_font.5.gz +OLD_FILES+=usr/share/man/man5/groff_out.5.gz +OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz +OLD_FILES+=usr/share/man/man5/lj4_font.5.gz +OLD_FILES+=usr/share/man/man5/tmac.5.gz +OLD_FILES+=usr/share/man/man7/ditroff.7.gz +OLD_FILES+=usr/share/man/man7/groff.7.gz +OLD_FILES+=usr/share/man/man7/groff_char.7.gz +OLD_FILES+=usr/share/man/man7/groff_diff.7.gz +OLD_FILES+=usr/share/man/man7/groff_man.7.gz +OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz +OLD_FILES+=usr/share/man/man7/groff_me.7.gz +OLD_FILES+=usr/share/man/man7/groff_mm.7.gz +OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz +OLD_FILES+=usr/share/man/man7/groff_ms.7.gz +OLD_FILES+=usr/share/man/man7/groff_trace.7.gz +OLD_FILES+=usr/share/man/man7/groff_www.7.gz +OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz +OLD_FILES+=usr/share/man/man7/me.7.gz +OLD_FILES+=usr/share/man/man7/mm.7.gz +OLD_FILES+=usr/share/man/man7/mmse.7.gz +OLD_FILES+=usr/share/man/man7/ms.7.gz +OLD_FILES+=usr/share/me/acm.me +OLD_FILES+=usr/share/me/chars.me +OLD_FILES+=usr/share/me/deltext.me +OLD_FILES+=usr/share/me/eqn.me +OLD_FILES+=usr/share/me/float.me +OLD_FILES+=usr/share/me/footnote.me +OLD_FILES+=usr/share/me/index.me +OLD_FILES+=usr/share/me/letterhead.me +OLD_FILES+=usr/share/me/local.me +OLD_FILES+=usr/share/me/null.me +OLD_FILES+=usr/share/me/refer.me +OLD_FILES+=usr/share/me/revisions +OLD_FILES+=usr/share/me/sh.me +OLD_FILES+=usr/share/me/tbl.me +OLD_FILES+=usr/share/me/thesis.me +OLD_DIRS+=usr/share/me +OLD_FILES+=usr/share/tmac/X.tmac +OLD_FILES+=usr/share/tmac/Xps.tmac +OLD_FILES+=usr/share/tmac/a4.tmac +OLD_FILES+=usr/share/tmac/an-old.tmac +OLD_FILES+=usr/share/tmac/an.tmac +OLD_FILES+=usr/share/tmac/andoc.tmac +OLD_FILES+=usr/share/tmac/composite.tmac +OLD_FILES+=usr/share/tmac/cp1047.tmac +OLD_FILES+=usr/share/tmac/devtag.tmac +OLD_FILES+=usr/share/tmac/doc.tmac +OLD_FILES+=usr/share/tmac/dvi.tmac +OLD_FILES+=usr/share/tmac/e.tmac +OLD_FILES+=usr/share/tmac/ec.tmac +OLD_FILES+=usr/share/tmac/eqnrc +OLD_FILES+=usr/share/tmac/europs.tmac +OLD_FILES+=usr/share/tmac/html-end.tmac +OLD_FILES+=usr/share/tmac/html.tmac +OLD_FILES+=usr/share/tmac/hyphen.ru +OLD_FILES+=usr/share/tmac/hyphen.us +OLD_FILES+=usr/share/tmac/hyphenex.us +OLD_FILES+=usr/share/tmac/koi8-r.tmac +OLD_FILES+=usr/share/tmac/latin1.tmac +OLD_FILES+=usr/share/tmac/latin2.tmac +OLD_FILES+=usr/share/tmac/latin9.tmac +OLD_FILES+=usr/share/tmac/lbp.tmac +OLD_FILES+=usr/share/tmac/lj4.tmac +OLD_FILES+=usr/share/tmac/m.tmac +OLD_FILES+=usr/share/tmac/man.local +OLD_FILES+=usr/share/tmac/man.tmac +OLD_FILES+=usr/share/tmac/mandoc.tmac +OLD_FILES+=usr/share/tmac/mdoc.local +OLD_FILES+=usr/share/tmac/mdoc.tmac +OLD_FILES+=usr/share/tmac/mdoc/doc-common +OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff +OLD_FILES+=usr/share/tmac/mdoc/doc-nroff +OLD_FILES+=usr/share/tmac/mdoc/doc-syms +OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1 +OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R +OLD_DIRS+=usr/share/tmac/mdoc +OLD_FILES+=usr/share/tmac/me.tmac +OLD_FILES+=usr/share/tmac/mm/0.MT +OLD_FILES+=usr/share/tmac/mm/4.MT +OLD_FILES+=usr/share/tmac/mm/5.MT +OLD_FILES+=usr/share/tmac/mm/locale +OLD_FILES+=usr/share/tmac/mm/mm.tmac +OLD_FILES+=usr/share/tmac/mm/mmse.tmac +OLD_FILES+=usr/share/tmac/mm/ms.cov +OLD_FILES+=usr/share/tmac/mm/se_locale +OLD_FILES+=usr/share/tmac/mm/se_ms.cov +OLD_DIRS+=usr/share/tmac/mm +OLD_FILES+=usr/share/tmac/ms.tmac +OLD_FILES+=usr/share/tmac/mse.tmac +OLD_FILES+=usr/share/tmac/papersize.tmac +OLD_FILES+=usr/share/tmac/pic.tmac +OLD_FILES+=usr/share/tmac/ps.tmac +OLD_FILES+=usr/share/tmac/psatk.tmac +OLD_FILES+=usr/share/tmac/psold.tmac +OLD_FILES+=usr/share/tmac/pspic.tmac +OLD_FILES+=usr/share/tmac/s.tmac +OLD_FILES+=usr/share/tmac/safer.tmac +OLD_FILES+=usr/share/tmac/tmac.orig_me +OLD_FILES+=usr/share/tmac/trace.tmac +OLD_FILES+=usr/share/tmac/troffrc +OLD_FILES+=usr/share/tmac/troffrc-end +OLD_FILES+=usr/share/tmac/tty-char.tmac +OLD_FILES+=usr/share/tmac/tty.tmac +OLD_FILES+=usr/share/tmac/unicode.tmac +OLD_FILES+=usr/share/tmac/vgrind.tmac +OLD_FILES+=usr/share/tmac/www.tmac +OLD_DIRS+=usr/share/tmac # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired OLD_FILES+=usr/bin/elfcopy OLD_FILES+=usr/share/man/man1/elfcopy.1.gz Modified: projects/doctools/etc/Makefile ============================================================================== --- projects/doctools/etc/Makefile Sat Oct 8 19:40:58 2016 (r306874) +++ projects/doctools/etc/Makefile Sat Oct 8 19:43:27 2016 (r306875) @@ -359,9 +359,6 @@ MTREES= mtree/BSD.root.dist / \ mtree/BSD.usr.dist /usr \ mtree/BSD.include.dist /usr/include \ mtree/BSD.debug.dist /usr/lib -.if ${MK_GROFF} != "no" -MTREES+= mtree/BSD.groff.dist /usr -.endif .if ${MK_LIB32} != "no" MTREES+= mtree/BSD.lib32.dist /usr MTREES+= mtree/BSD.lib32.dist /usr/lib/debug/usr Modified: projects/doctools/etc/mtree/Makefile ============================================================================== --- projects/doctools/etc/mtree/Makefile Sat Oct 8 19:40:58 2016 (r306874) +++ projects/doctools/etc/mtree/Makefile Sat Oct 8 19:43:27 2016 (r306875) @@ -15,9 +15,6 @@ FILES= ${_BSD.debug.dist} \ .if ${MK_DEBUG_FILES} != "no" _BSD.debug.dist= BSD.debug.dist .endif -.if ${MK_GROFF} != "no" -_BSD.groff.dist= BSD.groff.dist -.endif .if ${MK_LIB32} != "no" _BSD.lib32.dist= BSD.lib32.dist .endif Modified: projects/doctools/gnu/usr.bin/Makefile ============================================================================== --- projects/doctools/gnu/usr.bin/Makefile Sat Oct 8 19:40:58 2016 (r306874) +++ projects/doctools/gnu/usr.bin/Makefile Sat Oct 8 19:43:27 2016 (r306875) @@ -10,20 +10,14 @@ SUBDIR= ${_binutils} \ ${_gdb} \ ${_gperf} \ grep \ - ${_groff} \ ${_rcs} \ ${_tests} SUBDIR_DEPEND_gdb= ${_binutils} -.if ${MK_CXX} != "no" -.if ${MK_GCC} != "no" +.if ${MK_CXX} != "no" || ${MK_GCC} != "no" _gperf= gperf .endif -.if ${MK_GROFF} != "no" -_groff= groff -.endif -.endif .if ${MK_GPL_DTC} != "no" _dtc= dtc Modified: projects/doctools/release/Makefile ============================================================================== --- projects/doctools/release/Makefile Sat Oct 8 19:40:58 2016 (r306874) +++ projects/doctools/release/Makefile Sat Oct 8 19:43:27 2016 (r306875) @@ -202,7 +202,7 @@ bootonly: packagesystem mkdir -p ${.TARGET} cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ DESTDIR=${.OBJDIR}/${.TARGET} MK_AMD=no MK_AT=no \ - MK_GAMES=no MK_GROFF=no \ + MK_GAMES=no MK_DOCTOOLS=no \ MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \ MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \ MK_RESCUE=no MK_DICT=no \ Modified: projects/doctools/share/mk/src.opts.mk ============================================================================== --- projects/doctools/share/mk/src.opts.mk Sat Oct 8 19:40:58 2016 (r306874) +++ projects/doctools/share/mk/src.opts.mk Sat Oct 8 19:43:27 2016 (r306875) @@ -325,7 +325,6 @@ MK_KERBEROS:= no .if ${MK_CXX} == "no" MK_CLANG:= no -MK_GROFF:= no MK_GNUCXX:= no MK_TESTS:= no .endif @@ -359,7 +358,6 @@ MK_DTRACE_TESTS:= no .endif .if ${MK_TEXTPROC} == "no" -MK_GROFF:= no MK_DOCTOOLS:= no .endif Modified: projects/doctools/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/doctools/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 8 19:40:58 2016 (r306874) +++ projects/doctools/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 8 19:43:27 2016 (r306875) @@ -2172,550 +2172,6 @@ OLD_FILES+=usr/share/man/man3/gpio_pin_t OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif -.if ${MK_GROFF} == no -OLD_FILES+=usr/bin/addftinfo -OLD_FILES+=usr/bin/afmtodit -OLD_FILES+=usr/bin/eqn -OLD_FILES+=usr/bin/grn -OLD_FILES+=usr/bin/grodvi -OLD_FILES+=usr/bin/groff -OLD_FILES+=usr/bin/grog -OLD_FILES+=usr/bin/grolbp -OLD_FILES+=usr/bin/grolj4 -OLD_FILES+=usr/bin/grops -OLD_FILES+=usr/bin/grotty -OLD_FILES+=usr/bin/hpftodit -OLD_FILES+=usr/bin/indxbib -OLD_FILES+=usr/bin/lkbib -OLD_FILES+=usr/bin/lookbib -OLD_FILES+=usr/bin/mmroff -OLD_FILES+=usr/bin/neqn -OLD_FILES+=usr/bin/nroff -OLD_FILES+=usr/bin/pfbtops -OLD_FILES+=usr/bin/pic -OLD_FILES+=usr/bin/post-grohtml -OLD_FILES+=usr/bin/pre-grohtml -OLD_FILES+=usr/bin/psroff -OLD_FILES+=usr/bin/refer -OLD_FILES+=usr/bin/tbl -OLD_FILES+=usr/bin/tfmtodit -OLD_FILES+=usr/bin/troff -OLD_FILES+=usr/libexec/vfontedpr -OLD_FILES+=usr/share/dict/eign -OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz -OLD_FILES+=usr/share/doc/papers/bio.ascii.gz -OLD_FILES+=usr/share/doc/papers/contents.ascii.gz -OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz -OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz -OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz -OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz -OLD_FILES+=usr/share/doc/papers/jail.ascii.gz -OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz -OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz -OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz -OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz -OLD_FILES+=usr/share/doc/papers/releng.ascii.gz -OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz -OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz -OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz -OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz -OLD_FILES+=usr/share/doc/psd/Title.ascii.gz -OLD_FILES+=usr/share/doc/psd/contents.ascii.gz -OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz -OLD_FILES+=usr/share/doc/smm/Title.ascii.gz -OLD_FILES+=usr/share/doc/smm/contents.ascii.gz -OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz -OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz -OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz -OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/Title.ascii.gz -OLD_FILES+=usr/share/doc/usd/contents.ascii.gz -OLD_FILES+=usr/share/groff_font/devX100-12/CB -OLD_FILES+=usr/share/groff_font/devX100-12/CBI -OLD_FILES+=usr/share/groff_font/devX100-12/CI -OLD_FILES+=usr/share/groff_font/devX100-12/CR -OLD_FILES+=usr/share/groff_font/devX100-12/DESC -OLD_FILES+=usr/share/groff_font/devX100-12/HB -OLD_FILES+=usr/share/groff_font/devX100-12/HBI -OLD_FILES+=usr/share/groff_font/devX100-12/HI -OLD_FILES+=usr/share/groff_font/devX100-12/HR -OLD_FILES+=usr/share/groff_font/devX100-12/NB -OLD_FILES+=usr/share/groff_font/devX100-12/NBI -OLD_FILES+=usr/share/groff_font/devX100-12/NI -OLD_FILES+=usr/share/groff_font/devX100-12/NR -OLD_FILES+=usr/share/groff_font/devX100-12/S -OLD_FILES+=usr/share/groff_font/devX100-12/TB -OLD_FILES+=usr/share/groff_font/devX100-12/TBI -OLD_FILES+=usr/share/groff_font/devX100-12/TI -OLD_FILES+=usr/share/groff_font/devX100-12/TR -OLD_DIRS+=usr/share/groff_font/devX100-12 -OLD_FILES+=usr/share/groff_font/devX100/CB -OLD_FILES+=usr/share/groff_font/devX100/CBI -OLD_FILES+=usr/share/groff_font/devX100/CI -OLD_FILES+=usr/share/groff_font/devX100/CR -OLD_FILES+=usr/share/groff_font/devX100/DESC -OLD_FILES+=usr/share/groff_font/devX100/HB -OLD_FILES+=usr/share/groff_font/devX100/HBI -OLD_FILES+=usr/share/groff_font/devX100/HI -OLD_FILES+=usr/share/groff_font/devX100/HR -OLD_FILES+=usr/share/groff_font/devX100/NB -OLD_FILES+=usr/share/groff_font/devX100/NBI -OLD_FILES+=usr/share/groff_font/devX100/NI -OLD_FILES+=usr/share/groff_font/devX100/NR -OLD_FILES+=usr/share/groff_font/devX100/S -OLD_FILES+=usr/share/groff_font/devX100/TB -OLD_FILES+=usr/share/groff_font/devX100/TBI -OLD_FILES+=usr/share/groff_font/devX100/TI -OLD_FILES+=usr/share/groff_font/devX100/TR -OLD_DIRS+=usr/share/groff_font/devX100 -OLD_FILES+=usr/share/groff_font/devX75-12/CB -OLD_FILES+=usr/share/groff_font/devX75-12/CBI -OLD_FILES+=usr/share/groff_font/devX75-12/CI -OLD_FILES+=usr/share/groff_font/devX75-12/CR -OLD_FILES+=usr/share/groff_font/devX75-12/DESC -OLD_FILES+=usr/share/groff_font/devX75-12/HB -OLD_FILES+=usr/share/groff_font/devX75-12/HBI -OLD_FILES+=usr/share/groff_font/devX75-12/HI -OLD_FILES+=usr/share/groff_font/devX75-12/HR -OLD_FILES+=usr/share/groff_font/devX75-12/NB -OLD_FILES+=usr/share/groff_font/devX75-12/NBI -OLD_FILES+=usr/share/groff_font/devX75-12/NI -OLD_FILES+=usr/share/groff_font/devX75-12/NR -OLD_FILES+=usr/share/groff_font/devX75-12/S -OLD_FILES+=usr/share/groff_font/devX75-12/TB -OLD_FILES+=usr/share/groff_font/devX75-12/TBI -OLD_FILES+=usr/share/groff_font/devX75-12/TI -OLD_FILES+=usr/share/groff_font/devX75-12/TR -OLD_DIRS+=usr/share/groff_font/devX75-12 -OLD_FILES+=usr/share/groff_font/devX75/CB -OLD_FILES+=usr/share/groff_font/devX75/CBI -OLD_FILES+=usr/share/groff_font/devX75/CI -OLD_FILES+=usr/share/groff_font/devX75/CR -OLD_FILES+=usr/share/groff_font/devX75/DESC -OLD_FILES+=usr/share/groff_font/devX75/HB -OLD_FILES+=usr/share/groff_font/devX75/HBI -OLD_FILES+=usr/share/groff_font/devX75/HI -OLD_FILES+=usr/share/groff_font/devX75/HR -OLD_FILES+=usr/share/groff_font/devX75/NB -OLD_FILES+=usr/share/groff_font/devX75/NBI -OLD_FILES+=usr/share/groff_font/devX75/NI -OLD_FILES+=usr/share/groff_font/devX75/NR -OLD_FILES+=usr/share/groff_font/devX75/S -OLD_FILES+=usr/share/groff_font/devX75/TB -OLD_FILES+=usr/share/groff_font/devX75/TBI -OLD_FILES+=usr/share/groff_font/devX75/TI -OLD_FILES+=usr/share/groff_font/devX75/TR -OLD_DIRS+=usr/share/groff_font/devX75 -OLD_FILES+=usr/share/groff_font/devascii/B -OLD_FILES+=usr/share/groff_font/devascii/BI -OLD_FILES+=usr/share/groff_font/devascii/CW -OLD_FILES+=usr/share/groff_font/devascii/DESC -OLD_FILES+=usr/share/groff_font/devascii/I -OLD_FILES+=usr/share/groff_font/devascii/L -OLD_FILES+=usr/share/groff_font/devascii/R -OLD_FILES+=usr/share/groff_font/devascii/S -OLD_DIRS+=usr/share/groff_font/devascii -OLD_FILES+=usr/share/groff_font/devcp1047/B -OLD_FILES+=usr/share/groff_font/devcp1047/BI -OLD_FILES+=usr/share/groff_font/devcp1047/CW -OLD_FILES+=usr/share/groff_font/devcp1047/DESC -OLD_FILES+=usr/share/groff_font/devcp1047/I -OLD_FILES+=usr/share/groff_font/devcp1047/L -OLD_FILES+=usr/share/groff_font/devcp1047/R -OLD_FILES+=usr/share/groff_font/devcp1047/S -OLD_DIRS+=usr/share/groff_font/devcp1047 -OLD_FILES+=usr/share/groff_font/devdvi/CW -OLD_FILES+=usr/share/groff_font/devdvi/CWEC -OLD_FILES+=usr/share/groff_font/devdvi/CWI -OLD_FILES+=usr/share/groff_font/devdvi/CWIEC -OLD_FILES+=usr/share/groff_font/devdvi/CWITC -OLD_FILES+=usr/share/groff_font/devdvi/CWTC -OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts -OLD_FILES+=usr/share/groff_font/devdvi/DESC -OLD_FILES+=usr/share/groff_font/devdvi/EX -OLD_FILES+=usr/share/groff_font/devdvi/HB -OLD_FILES+=usr/share/groff_font/devdvi/HBEC -OLD_FILES+=usr/share/groff_font/devdvi/HBI -OLD_FILES+=usr/share/groff_font/devdvi/HBIEC -OLD_FILES+=usr/share/groff_font/devdvi/HBITC -OLD_FILES+=usr/share/groff_font/devdvi/HBTC -OLD_FILES+=usr/share/groff_font/devdvi/HI -OLD_FILES+=usr/share/groff_font/devdvi/HIEC -OLD_FILES+=usr/share/groff_font/devdvi/HITC -OLD_FILES+=usr/share/groff_font/devdvi/HR -OLD_FILES+=usr/share/groff_font/devdvi/HREC -OLD_FILES+=usr/share/groff_font/devdvi/HRTC -OLD_FILES+=usr/share/groff_font/devdvi/MI -OLD_FILES+=usr/share/groff_font/devdvi/Makefile -OLD_FILES+=usr/share/groff_font/devdvi/S -OLD_FILES+=usr/share/groff_font/devdvi/SA -OLD_FILES+=usr/share/groff_font/devdvi/SB -OLD_FILES+=usr/share/groff_font/devdvi/SC -OLD_FILES+=usr/share/groff_font/devdvi/TB -OLD_FILES+=usr/share/groff_font/devdvi/TBEC -OLD_FILES+=usr/share/groff_font/devdvi/TBI -OLD_FILES+=usr/share/groff_font/devdvi/TBIEC -OLD_FILES+=usr/share/groff_font/devdvi/TBITC -OLD_FILES+=usr/share/groff_font/devdvi/TBTC -OLD_FILES+=usr/share/groff_font/devdvi/TI -OLD_FILES+=usr/share/groff_font/devdvi/TIEC -OLD_FILES+=usr/share/groff_font/devdvi/TITC -OLD_FILES+=usr/share/groff_font/devdvi/TR -OLD_FILES+=usr/share/groff_font/devdvi/TREC -OLD_FILES+=usr/share/groff_font/devdvi/TRTC -OLD_FILES+=usr/share/groff_font/devdvi/ec.map -OLD_FILES+=usr/share/groff_font/devdvi/msam.map -OLD_FILES+=usr/share/groff_font/devdvi/msbm.map -OLD_FILES+=usr/share/groff_font/devdvi/tc.map -OLD_FILES+=usr/share/groff_font/devdvi/texb.map -OLD_FILES+=usr/share/groff_font/devdvi/texex.map -OLD_FILES+=usr/share/groff_font/devdvi/texi.map -OLD_FILES+=usr/share/groff_font/devdvi/texmi.map -OLD_FILES+=usr/share/groff_font/devdvi/texr.map -OLD_FILES+=usr/share/groff_font/devdvi/texsy.map -OLD_FILES+=usr/share/groff_font/devdvi/textex.map -OLD_FILES+=usr/share/groff_font/devdvi/textt.map -OLD_DIRS+=usr/share/groff_font/devdvi -OLD_FILES+=usr/share/groff_font/devhtml/B -OLD_FILES+=usr/share/groff_font/devhtml/BI -OLD_FILES+=usr/share/groff_font/devhtml/CB -OLD_FILES+=usr/share/groff_font/devhtml/CBI -OLD_FILES+=usr/share/groff_font/devhtml/CI -OLD_FILES+=usr/share/groff_font/devhtml/CR -OLD_FILES+=usr/share/groff_font/devhtml/DESC -OLD_FILES+=usr/share/groff_font/devhtml/I -OLD_FILES+=usr/share/groff_font/devhtml/R -OLD_FILES+=usr/share/groff_font/devhtml/S -OLD_DIRS+=usr/share/groff_font/devhtml -OLD_FILES+=usr/share/groff_font/devkoi8-r/B -OLD_FILES+=usr/share/groff_font/devkoi8-r/BI -OLD_FILES+=usr/share/groff_font/devkoi8-r/CW -OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC -OLD_FILES+=usr/share/groff_font/devkoi8-r/I -OLD_FILES+=usr/share/groff_font/devkoi8-r/L -OLD_FILES+=usr/share/groff_font/devkoi8-r/R -OLD_FILES+=usr/share/groff_font/devkoi8-r/S -OLD_DIRS+=usr/share/groff_font/devkoi8-r -OLD_FILES+=usr/share/groff_font/devlatin1/B -OLD_FILES+=usr/share/groff_font/devlatin1/BI -OLD_FILES+=usr/share/groff_font/devlatin1/CW -OLD_FILES+=usr/share/groff_font/devlatin1/DESC -OLD_FILES+=usr/share/groff_font/devlatin1/I -OLD_FILES+=usr/share/groff_font/devlatin1/L -OLD_FILES+=usr/share/groff_font/devlatin1/R -OLD_FILES+=usr/share/groff_font/devlatin1/S -OLD_DIRS+=usr/share/groff_font/devlatin1 -OLD_FILES+=usr/share/groff_font/devlbp/CB -OLD_FILES+=usr/share/groff_font/devlbp/CI -OLD_FILES+=usr/share/groff_font/devlbp/CR -OLD_FILES+=usr/share/groff_font/devlbp/DESC -OLD_FILES+=usr/share/groff_font/devlbp/EB -OLD_FILES+=usr/share/groff_font/devlbp/EI -OLD_FILES+=usr/share/groff_font/devlbp/ER -OLD_FILES+=usr/share/groff_font/devlbp/HB -OLD_FILES+=usr/share/groff_font/devlbp/HBI -OLD_FILES+=usr/share/groff_font/devlbp/HI -OLD_FILES+=usr/share/groff_font/devlbp/HNB -OLD_FILES+=usr/share/groff_font/devlbp/HNBI -OLD_FILES+=usr/share/groff_font/devlbp/HNI -OLD_FILES+=usr/share/groff_font/devlbp/HNR -OLD_FILES+=usr/share/groff_font/devlbp/HR -OLD_FILES+=usr/share/groff_font/devlbp/TB -OLD_FILES+=usr/share/groff_font/devlbp/TBI -OLD_FILES+=usr/share/groff_font/devlbp/TI -OLD_FILES+=usr/share/groff_font/devlbp/TR -OLD_DIRS+=usr/share/groff_font/devlbp -OLD_FILES+=usr/share/groff_font/devlj4/AB -OLD_FILES+=usr/share/groff_font/devlj4/ABI -OLD_FILES+=usr/share/groff_font/devlj4/AI -OLD_FILES+=usr/share/groff_font/devlj4/ALBB -OLD_FILES+=usr/share/groff_font/devlj4/ALBR -OLD_FILES+=usr/share/groff_font/devlj4/AOB -OLD_FILES+=usr/share/groff_font/devlj4/AOI -OLD_FILES+=usr/share/groff_font/devlj4/AOR -OLD_FILES+=usr/share/groff_font/devlj4/AR -OLD_FILES+=usr/share/groff_font/devlj4/CB -OLD_FILES+=usr/share/groff_font/devlj4/CBI -OLD_FILES+=usr/share/groff_font/devlj4/CI -OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON -OLD_FILES+=usr/share/groff_font/devlj4/CORONET -OLD_FILES+=usr/share/groff_font/devlj4/CR -OLD_FILES+=usr/share/groff_font/devlj4/DESC -OLD_FILES+=usr/share/groff_font/devlj4/GB -OLD_FILES+=usr/share/groff_font/devlj4/GBI -OLD_FILES+=usr/share/groff_font/devlj4/GI -OLD_FILES+=usr/share/groff_font/devlj4/GR -OLD_FILES+=usr/share/groff_font/devlj4/LGB -OLD_FILES+=usr/share/groff_font/devlj4/LGI -OLD_FILES+=usr/share/groff_font/devlj4/LGR -OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD -OLD_FILES+=usr/share/groff_font/devlj4/OB -OLD_FILES+=usr/share/groff_font/devlj4/OBI -OLD_FILES+=usr/share/groff_font/devlj4/OI -OLD_FILES+=usr/share/groff_font/devlj4/OR -OLD_FILES+=usr/share/groff_font/devlj4/S -OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL -OLD_FILES+=usr/share/groff_font/devlj4/TB -OLD_FILES+=usr/share/groff_font/devlj4/TBI -OLD_FILES+=usr/share/groff_font/devlj4/TI -OLD_FILES+=usr/share/groff_font/devlj4/TNRB -OLD_FILES+=usr/share/groff_font/devlj4/TNRBI -OLD_FILES+=usr/share/groff_font/devlj4/TNRI -OLD_FILES+=usr/share/groff_font/devlj4/TNRR -OLD_FILES+=usr/share/groff_font/devlj4/TR -OLD_FILES+=usr/share/groff_font/devlj4/UB -OLD_FILES+=usr/share/groff_font/devlj4/UBI -OLD_FILES+=usr/share/groff_font/devlj4/UCB -OLD_FILES+=usr/share/groff_font/devlj4/UCBI -OLD_FILES+=usr/share/groff_font/devlj4/UCI -OLD_FILES+=usr/share/groff_font/devlj4/UCR -OLD_FILES+=usr/share/groff_font/devlj4/UI -OLD_FILES+=usr/share/groff_font/devlj4/UR -OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS -OLD_DIRS+=usr/share/groff_font/devlj4 -OLD_FILES+=usr/share/groff_font/devps/AB -OLD_FILES+=usr/share/groff_font/devps/ABI -OLD_FILES+=usr/share/groff_font/devps/AI -OLD_FILES+=usr/share/groff_font/devps/AR -OLD_FILES+=usr/share/groff_font/devps/BMB -OLD_FILES+=usr/share/groff_font/devps/BMBI -OLD_FILES+=usr/share/groff_font/devps/BMI -OLD_FILES+=usr/share/groff_font/devps/BMR -OLD_FILES+=usr/share/groff_font/devps/CB -OLD_FILES+=usr/share/groff_font/devps/CBI -OLD_FILES+=usr/share/groff_font/devps/CI -OLD_FILES+=usr/share/groff_font/devps/CR -OLD_FILES+=usr/share/groff_font/devps/DESC -OLD_FILES+=usr/share/groff_font/devps/EURO -OLD_FILES+=usr/share/groff_font/devps/HB -OLD_FILES+=usr/share/groff_font/devps/HBI -OLD_FILES+=usr/share/groff_font/devps/HI -OLD_FILES+=usr/share/groff_font/devps/HNB -OLD_FILES+=usr/share/groff_font/devps/HNBI -OLD_FILES+=usr/share/groff_font/devps/HNI -OLD_FILES+=usr/share/groff_font/devps/HNR -OLD_FILES+=usr/share/groff_font/devps/HR -OLD_FILES+=usr/share/groff_font/devps/Makefile -OLD_FILES+=usr/share/groff_font/devps/NB -OLD_FILES+=usr/share/groff_font/devps/NBI -OLD_FILES+=usr/share/groff_font/devps/NI -OLD_FILES+=usr/share/groff_font/devps/NR -OLD_FILES+=usr/share/groff_font/devps/PB -OLD_FILES+=usr/share/groff_font/devps/PBI -OLD_FILES+=usr/share/groff_font/devps/PI -OLD_FILES+=usr/share/groff_font/devps/PR -OLD_FILES+=usr/share/groff_font/devps/S -OLD_FILES+=usr/share/groff_font/devps/SS -OLD_FILES+=usr/share/groff_font/devps/TB -OLD_FILES+=usr/share/groff_font/devps/TBI -OLD_FILES+=usr/share/groff_font/devps/TI -OLD_FILES+=usr/share/groff_font/devps/TR -OLD_FILES+=usr/share/groff_font/devps/ZCMI -OLD_FILES+=usr/share/groff_font/devps/ZD -OLD_FILES+=usr/share/groff_font/devps/ZDR -OLD_FILES+=usr/share/groff_font/devps/afmname -OLD_FILES+=usr/share/groff_font/devps/dingbats.map -OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap -OLD_FILES+=usr/share/groff_font/devps/download -OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa -OLD_FILES+=usr/share/groff_font/devps/lgreekmap -OLD_FILES+=usr/share/groff_font/devps/prologue -OLD_FILES+=usr/share/groff_font/devps/symbol.sed -OLD_FILES+=usr/share/groff_font/devps/symbolchars -OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm -OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa -OLD_FILES+=usr/share/groff_font/devps/text.enc -OLD_FILES+=usr/share/groff_font/devps/textmap -OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa -OLD_DIRS+=usr/share/groff_font/devps -OLD_FILES+=usr/share/groff_font/devutf8/B -OLD_FILES+=usr/share/groff_font/devutf8/BI -OLD_FILES+=usr/share/groff_font/devutf8/CW -OLD_FILES+=usr/share/groff_font/devutf8/DESC -OLD_FILES+=usr/share/groff_font/devutf8/I -OLD_FILES+=usr/share/groff_font/devutf8/L -OLD_FILES+=usr/share/groff_font/devutf8/R -OLD_FILES+=usr/share/groff_font/devutf8/S -OLD_DIRS+=usr/share/groff_font/devutf8 -OLD_DIRS+=usr/share/groff_font -OLD_FILES+=usr/share/info/groff.info.gz -OLD_FILES+=usr/share/man/man1/addftinfo.1.gz -OLD_FILES+=usr/share/man/man1/afmtodit.1.gz -OLD_FILES+=usr/share/man/man1/eqn.1.gz -OLD_FILES+=usr/share/man/man1/grn.1.gz -OLD_FILES+=usr/share/man/man1/grodvi.1.gz -OLD_FILES+=usr/share/man/man1/groff.1.gz -OLD_FILES+=usr/share/man/man1/grog.1.gz -OLD_FILES+=usr/share/man/man1/grolbp.1.gz -OLD_FILES+=usr/share/man/man1/grolj4.1.gz -OLD_FILES+=usr/share/man/man1/grops.1.gz -OLD_FILES+=usr/share/man/man1/grotty.1.gz -OLD_FILES+=usr/share/man/man1/hpftodit.1.gz -OLD_FILES+=usr/share/man/man1/indxbib.1.gz -OLD_FILES+=usr/share/man/man1/lkbib.1.gz -OLD_FILES+=usr/share/man/man1/lookbib.1.gz -OLD_FILES+=usr/share/man/man1/mmroff.1.gz -OLD_FILES+=usr/share/man/man1/neqn.1.gz -OLD_FILES+=usr/share/man/man1/nroff.1.gz -OLD_FILES+=usr/share/man/man1/pfbtops.1.gz -OLD_FILES+=usr/share/man/man1/pic.1.gz -OLD_FILES+=usr/share/man/man1/psroff.1.gz -OLD_FILES+=usr/share/man/man1/refer.1.gz *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Oct 8 19:43:53 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E249C0668B for ; Sat, 8 Oct 2016 19:43:53 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 16B4FDD7; Sat, 8 Oct 2016 19:43:53 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98JhqqU031932; Sat, 8 Oct 2016 19:43:52 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98JhqYD031931; Sat, 8 Oct 2016 19:43:52 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610081943.u98JhqYD031931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 19:43:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306876 - projects/doctools/contrib/groff X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 19:43:53 -0000 Author: bapt Date: Sat Oct 8 19:43:52 2016 New Revision: 306876 URL: https://svnweb.freebsd.org/changeset/base/306876 Log: Remove the groff sources as well Deleted: projects/doctools/contrib/groff/ From owner-svn-src-projects@freebsd.org Sat Oct 8 22:57:46 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D35BC06603 for ; Sat, 8 Oct 2016 22:57:46 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5A1121EC; Sat, 8 Oct 2016 22:57:46 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98MvjTw006326; Sat, 8 Oct 2016 22:57:45 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98MvjjZ006325; Sat, 8 Oct 2016 22:57:45 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610082257.u98MvjjZ006325@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 22:57:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306881 - projects/doctools/cddl/usr.bin/doctools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 22:57:46 -0000 Author: bapt Date: Sat Oct 8 22:57:45 2016 New Revision: 306881 URL: https://svnweb.freebsd.org/changeset/base/306881 Log: Do not overwrite SHAREDIR Modified: projects/doctools/cddl/usr.bin/doctools/Makefile.inc Modified: projects/doctools/cddl/usr.bin/doctools/Makefile.inc ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/Makefile.inc Sat Oct 8 21:19:44 2016 (r306880) +++ projects/doctools/cddl/usr.bin/doctools/Makefile.inc Sat Oct 8 22:57:45 2016 (r306881) @@ -4,10 +4,10 @@ NO_WERROR= yes LIBDIR= /usr/libexec/doctools REDFIR= ${LIBDIR}/reftools HYPDIR= ${LIBDIR}/hyphen -SHAREDIR= /usr/share/doctools -FNTDIR= ${SHAREDIR}/font -MACDIR= ${SHAREDIR}/tmac -PSTDIR= ${SHAREDIR}/devpost/postscript -PUBDIR= ${SHAREDIR}/pub -TABDIR= ${SHAREDIR}/nterm +DTSHAREDIR= /usr/share/doctools +FNTDIR= ${DTSHAREDIR}/font +MACDIR= ${DTSHAREDIR}/tmac +PSTDIR= ${DTSHAREDIR}/devpost/postscript +PUBDIR= ${DTSHAREDIR}/pub +TABDIR= ${DTSHAREDIR}/nterm .include "../Makefile.inc" From owner-svn-src-projects@freebsd.org Sat Oct 8 22:58:17 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B396DC06620 for ; Sat, 8 Oct 2016 22:58:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 836B1321; Sat, 8 Oct 2016 22:58:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98MwGk5006391; Sat, 8 Oct 2016 22:58:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98MwGbq006390; Sat, 8 Oct 2016 22:58:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610082258.u98MwGbq006390@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 22:58:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306882 - projects/doctools/cddl/usr.bin/doctools/troff/nroff X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 22:58:17 -0000 Author: bapt Date: Sat Oct 8 22:58:16 2016 New Revision: 306882 URL: https://svnweb.freebsd.org/changeset/base/306882 Log: Generate and install terms files Modified: projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile Modified: projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile Sat Oct 8 22:57:45 2016 (r306881) +++ projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile Sat Oct 8 22:58:16 2016 (r306882) @@ -16,6 +16,15 @@ SRCS= n10.c \ draw.c \ bst.c \ version.c + + +FILESDIR= ${TABDIR} + +TERMSFILES= tab.2631 tab.2631-c tab.2631-e tab.lp \ + tab.300 tab.300-12 tab.300s tab.300s-12 tab.382 \ + tab.4000a tab.450 tab.450-12 tab.832 \ + tab.37 tab.8510 tab.X tab.tn300 +FILES= ${TERMSFILES} tab.utf8 DPADD= ${.OBJDIR}/../libhnj/libhnj.a LDADD= ${.OBJDIR}/../libhnj/libhnj.a @@ -29,7 +38,24 @@ CFLAGS+= -I${DOCTOOLSDIR}/stuff/bst -I${ -DTABDIR='"${TABDIR}"' \ -DNROFF -DUSG -DEUC +NLTERM= ${DOCTOOLSDIR}/troff/nroff.d/terms.d + +.for f in tab.2631 tab.2631-c tab.2631-e tab.lp +$f: a.${f:E} b.lp + cat ${.ALLSRC} >${.TARGET} +.endfor + +.for f in tab.300 tab.300-12 tab.300s tab.300s-12 tab.382 tab.4000a tab.450-12 tab.832 +$f: a.${f:E} b.300 + cat ${.ALLSRC} >${.TARGET} +.endfor + +.for f in tab.37 tab.8510 tab.X tab.tn300 +$f: ab.${f:E} + cat ${.ALLSRC} >${.TARGET} +.endfor + .include RELEASE!= awk -F= '/^RELEASE/ { print $$2 }' ${DOCTOOLSDIR}/version.mk -.PATH: ${DOCTOOLSDIR}/troff/nroff.d ${DOCTOOLSDIR}/stuff/bst ${DOCTOOLSDIR}/troff/ +.PATH: ${DOCTOOLSDIR}/troff/nroff.d ${DOCTOOLSDIR}/stuff/bst ${DOCTOOLSDIR}/troff/ ${NLTERM} From owner-svn-src-projects@freebsd.org Sat Oct 8 22:59:28 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8809C06647 for ; Sat, 8 Oct 2016 22:59:28 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A758651; Sat, 8 Oct 2016 22:59:28 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98MxRlt006473; Sat, 8 Oct 2016 22:59:27 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98MxRkd006472; Sat, 8 Oct 2016 22:59:27 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610082259.u98MxRkd006472@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 22:59:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306883 - projects/doctools/cddl/usr.bin/doctools/troff/nroff X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 22:59:28 -0000 Author: bapt Date: Sat Oct 8 22:59:27 2016 New Revision: 306883 URL: https://svnweb.freebsd.org/changeset/base/306883 Log: Cleanup generated terms files Modified: projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile Modified: projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile Sat Oct 8 22:58:16 2016 (r306882) +++ projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile Sat Oct 8 22:59:27 2016 (r306883) @@ -25,6 +25,7 @@ TERMSFILES= tab.2631 tab.2631-c tab.2631 tab.4000a tab.450 tab.450-12 tab.832 \ tab.37 tab.8510 tab.X tab.tn300 FILES= ${TERMSFILES} tab.utf8 +CLEANFILES= ${TERMSFILES} DPADD= ${.OBJDIR}/../libhnj/libhnj.a LDADD= ${.OBJDIR}/../libhnj/libhnj.a From owner-svn-src-projects@freebsd.org Sat Oct 8 23:10:59 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8E55CC069B7 for ; Sat, 8 Oct 2016 23:10:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3E40CE04; Sat, 8 Oct 2016 23:10:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98NAwhu010712; Sat, 8 Oct 2016 23:10:58 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98NAwxS010711; Sat, 8 Oct 2016 23:10:58 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610082310.u98NAwxS010711@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 23:10:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306884 - in projects/doctools/cddl/usr.bin/doctools/troff/troff: . tmac X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 23:10:59 -0000 Author: bapt Date: Sat Oct 8 23:10:57 2016 New Revision: 306884 URL: https://svnweb.freebsd.org/changeset/base/306884 Log: Install tmac files Modified: projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile Modified: projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile Sat Oct 8 22:59:27 2016 (r306883) +++ projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile Sat Oct 8 23:10:57 2016 (r306884) @@ -1,5 +1,6 @@ SUBDIR= \ - dpost + dpost \ + tmac PROGS= troff \ devaps \ Modified: projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile Sat Oct 8 22:59:27 2016 (r306883) +++ projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile Sat Oct 8 23:10:57 2016 (r306884) @@ -7,6 +7,61 @@ SRCS= pm.in \ m.in \ s.in +GENFILES= an \ + bib \ + doc \ + g \ + pm \ + andoc \ + doc-ditroff \ + e \ + m \ + s +CLEANFILES+= ${GENFILES} + +FILES= acm.me \ + deltext.me \ + eqn.me \ + local.me \ + ms.acc \ + ms.tbl\ + null.me \ + refer.me \ + taa \ + v \ + an-ext \ + doc-common \ + float.me \ + mmn \ + ms.cov \ + ms.ths \ + padj \ + safe \ + tbl.me \ + vgrind \ + chars.me \ + doc-nroff \ + footnote.me \ + mmt \ + ms.eqn \ + ms.toc \ + pictures \ + sh.me \ + thesis.me \ + color \ + doc-syms \ + index.me \ + ms.ref \ + naa \ + ptx \ + srefs \ + tmac.gchar \ + ${GENFILES} + +FILESDIR= ${MACDIR} + +MAN= mcolor.7 mpictures.7 man.7 + IMACS= an \ doc-ditroff @@ -15,3 +70,4 @@ IMACS= an \ sed 's:@MACDIR@:${MACDIR}:; s:@LIBDIR@:${LIBDIR}:' ${.IMPSRC} >${.TARGET} .include +.PATH: ${DOCTOOLSDIR}/troff/troff.d/tmac.d From owner-svn-src-projects@freebsd.org Sat Oct 8 23:18:42 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA3F8C06A79 for ; Sat, 8 Oct 2016 23:18:42 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AC8541D3; Sat, 8 Oct 2016 23:18:42 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98NIfdD014316; Sat, 8 Oct 2016 23:18:41 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98NIfxu014315; Sat, 8 Oct 2016 23:18:41 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610082318.u98NIfxu014315@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 23:18:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306885 - projects/doctools/usr.bin/man X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 23:18:42 -0000 Author: bapt Date: Sat Oct 8 23:18:41 2016 New Revision: 306885 URL: https://svnweb.freebsd.org/changeset/base/306885 Log: When a manpage cannot be rendered with mandoc(1) fallback on heirloom-doctools then groff(1) Modified: projects/doctools/usr.bin/man/man.sh Modified: projects/doctools/usr.bin/man/man.sh ============================================================================== --- projects/doctools/usr.bin/man/man.sh Sat Oct 8 23:10:57 2016 (r306884) +++ projects/doctools/usr.bin/man/man.sh Sat Oct 8 23:18:41 2016 (r306885) @@ -322,15 +322,23 @@ man_display_page() { fi if ! eval "$cattool $manpage | $testline" ;then - if which -s groff; then + if which -s picpack; then + pipeline="soelim | tbl | eqn | nroff -u1 -Tlocale -man - | col -x" + if [ -z "$tflags" ]; then + pipeline="${pipeline} | $MANPAGER" + fi + elif which -s groff; then man_display_page_groff + return else - echo "This manpage needs groff(1) to be rendered" >&2 - echo "First install groff(1): " >&2 + echo "This manpage needs heirloom-doctools or groff(1) to be rendered" >&2 + echo "First install heirloom doctools or groff(1): " >&2 + echo "pkg install heirloom-doctools " >&2 + echo "or" >&2 echo "pkg install groff " >&2 ret=1 + return fi - return fi if [ $debug -gt 0 ]; then From owner-svn-src-projects@freebsd.org Sat Oct 8 23:30:00 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB6FCC06D38 for ; Sat, 8 Oct 2016 23:30:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 885A5882; Sat, 8 Oct 2016 23:30:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98NTxQQ018022; Sat, 8 Oct 2016 23:29:59 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98NTx8P018021; Sat, 8 Oct 2016 23:29:59 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610082329.u98NTx8P018021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 23:29:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306886 - projects/doctools/cddl/usr.bin/doctools/troff/troff/dpost X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 23:30:00 -0000 Author: bapt Date: Sat Oct 8 23:29:59 2016 New Revision: 306886 URL: https://svnweb.freebsd.org/changeset/base/306886 Log: Install postscript files Modified: projects/doctools/cddl/usr.bin/doctools/troff/troff/dpost/Makefile Modified: projects/doctools/cddl/usr.bin/doctools/troff/troff/dpost/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/troff/troff/dpost/Makefile Sat Oct 8 23:18:41 2016 (r306885) +++ projects/doctools/cddl/usr.bin/doctools/troff/troff/dpost/Makefile Sat Oct 8 23:29:59 2016 (r306886) @@ -16,6 +16,16 @@ SRCS= dpost.c \ version.c \ bst.c LIBADD= m +FILESDIR= ${PSTDIR} +FILES= aps.ps \ + baseline.ps \ + color.ps \ + cutmarks.ps \ + dpost.ps \ + draw.ps \ + fatcourier.ps \ + forms.ps \ + ps_include.ps CFLAGS+= -I${DOCTOOLSDIR}/stuff/bst -I${DOCTOOLSDIR}/troff/troff.d/dpost.d-I${DOCTOOLSDIR}/troff/troff.d/dpost.d \ -I${DOCTOOLSDIR}/troff/troff.d/ \ @@ -32,3 +42,4 @@ RELEASE!= awk -F= '/^RELEASE/ { print $$ .PATH: ${DOCTOOLSDIR}/stuff/bst .PATH: ${DOCTOOLSDIR}/troff/troff.d/dpost.d .PATH: ${DOCTOOLSDIR}/troff +.PATH: ${DOCTOOLSDIR}/troff/troff.d/postscript From owner-svn-src-projects@freebsd.org Sat Oct 8 23:30:25 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A1CDC06D99 for ; Sat, 8 Oct 2016 23:30:25 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C5749BA; Sat, 8 Oct 2016 23:30:24 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98NUOVV018106; Sat, 8 Oct 2016 23:30:24 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98NUOUl018105; Sat, 8 Oct 2016 23:30:24 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610082330.u98NUOUl018105@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 23:30:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306887 - projects/doctools/usr.bin/man X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 23:30:25 -0000 Author: bapt Date: Sat Oct 8 23:30:24 2016 New Revision: 306887 URL: https://svnweb.freebsd.org/changeset/base/306887 Log: Fix man -t with heirloom doctools Modified: projects/doctools/usr.bin/man/man.sh Modified: projects/doctools/usr.bin/man/man.sh ============================================================================== --- projects/doctools/usr.bin/man/man.sh Sat Oct 8 23:29:59 2016 (r306886) +++ projects/doctools/usr.bin/man/man.sh Sat Oct 8 23:30:24 2016 (r306887) @@ -323,9 +323,10 @@ man_display_page() { if ! eval "$cattool $manpage | $testline" ;then if which -s picpack; then - pipeline="soelim | tbl | eqn | nroff -u1 -Tlocale -man - | col -x" if [ -z "$tflags" ]; then - pipeline="${pipeline} | $MANPAGER" + pipeline="soelim | tbl | eqn | troff -u1 -Tps -man - | dpost" + else + pipeline="soelim | tbl | eqn | nroff -u1 -Tlocale -man - | col -x | $MANPAGER" fi elif which -s groff; then man_display_page_groff From owner-svn-src-projects@freebsd.org Sat Oct 8 23:41:55 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6566CC063A7 for ; Sat, 8 Oct 2016 23:41:55 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2EE55283; Sat, 8 Oct 2016 23:41:55 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98NfsjN023303; Sat, 8 Oct 2016 23:41:54 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98Nfs8v023302; Sat, 8 Oct 2016 23:41:54 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201610082341.u98Nfs8v023302@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Oct 2016 23:41:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306888 - projects/doctools/etc/mtree X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Oct 2016 23:41:55 -0000 Author: bapt Date: Sat Oct 8 23:41:54 2016 New Revision: 306888 URL: https://svnweb.freebsd.org/changeset/base/306888 Log: Add directories for fonts Modified: projects/doctools/etc/mtree/BSD.usr.dist Modified: projects/doctools/etc/mtree/BSD.usr.dist ============================================================================== --- projects/doctools/etc/mtree/BSD.usr.dist Sat Oct 8 23:30:24 2016 (r306887) +++ projects/doctools/etc/mtree/BSD.usr.dist Sat Oct 8 23:41:54 2016 (r306888) @@ -320,6 +320,18 @@ .. .. font + devhtml + .. + devpost + charlib + .. + .. + devps + .. + devpslow + .. + devpsmed + .. .. me ..