svn commit: r257889 - in projects/ifq: . cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/opensolaris/lib/libnvpair cddl/lib/libnvpair contrib/libreadl...

Andre Oppermann andre at FreeBSD.org
Sat Nov 9 15:05:01 UTC 2013 

Author: andre
Date: Sat Nov  9 15:04:56 2013
New Revision: 257889
URL: http://svnweb.freebsd.org/changeset/base/257889

Log:
  IFC @257888.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/ifq/contrib/tzdata/leap-seconds.list
     - copied unchanged from r257888, head/contrib/tzdata/leap-seconds.list
  projects/ifq/lib/atf/libatf-c++/Makefile.inc
     - copied unchanged from r257888, head/lib/atf/libatf-c++/Makefile.inc
  projects/ifq/lib/atf/libatf-c++/tests/
     - copied from r257888, head/lib/atf/libatf-c++/tests/
  projects/ifq/lib/atf/libatf-c/Makefile.inc
     - copied unchanged from r257888, head/lib/atf/libatf-c/Makefile.inc
  projects/ifq/lib/atf/libatf-c/tests/
     - copied from r257888, head/lib/atf/libatf-c/tests/
  projects/ifq/lib/atf/tests/
     - copied from r257888, head/lib/atf/tests/
  projects/ifq/lib/tests/
     - copied from r257888, head/lib/tests/
  projects/ifq/libexec/atf/atf-check/Makefile.inc
     - copied unchanged from r257888, head/libexec/atf/atf-check/Makefile.inc
  projects/ifq/libexec/atf/atf-check/tests/
     - copied from r257888, head/libexec/atf/atf-check/tests/
  projects/ifq/libexec/atf/tests/
     - copied from r257888, head/libexec/atf/tests/
  projects/ifq/libexec/tests/
     - copied from r257888, head/libexec/tests/
  projects/ifq/share/examples/libusb20/util.c
     - copied unchanged from r257888, head/share/examples/libusb20/util.c
  projects/ifq/share/examples/libusb20/util.h
     - copied unchanged from r257888, head/share/examples/libusb20/util.h
  projects/ifq/sys/arm/arm/bus_space-v6.c
     - copied unchanged from r257888, head/sys/arm/arm/bus_space-v6.c
  projects/ifq/sys/arm/arm/devmap.c
     - copied unchanged from r257888, head/sys/arm/arm/devmap.c
  projects/ifq/sys/arm/include/devmap.h
     - copied unchanged from r257888, head/sys/arm/include/devmap.h
  projects/ifq/usr.bin/atf/atf-sh/tests/
     - copied from r257888, head/usr.bin/atf/atf-sh/tests/
  projects/ifq/usr.bin/atf/tests/
     - copied from r257888, head/usr.bin/atf/tests/
  projects/ifq/usr.bin/tests/
     - copied from r257888, head/usr.bin/tests/
  projects/ifq/usr.sbin/mfiutil/mfi_properties.c
     - copied unchanged from r257888, head/usr.sbin/mfiutil/mfi_properties.c
Deleted:
  projects/ifq/etc/namedb/
  projects/ifq/etc/periodic/daily/470.status-named
  projects/ifq/etc/rc.d/named
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
  projects/ifq/release/generate-release.sh
  projects/ifq/share/examples/libusb20/aux.c
  projects/ifq/share/examples/libusb20/aux.h
  projects/ifq/sys/amd64/vmm/io/vdev.c
  projects/ifq/sys/amd64/vmm/io/vdev.h
  projects/ifq/sys/arm/allwinner/bus_space.c
  projects/ifq/sys/arm/broadcom/bcm2835/bus_space.c
  projects/ifq/sys/arm/freescale/imx/bus_space.c
  projects/ifq/sys/arm/rockchip/bus_space.c
  projects/ifq/sys/arm/ti/bus_space.c
Modified:
  projects/ifq/Makefile.inc1
  projects/ifq/ObsoleteFiles.inc
  projects/ifq/UPDATING
  projects/ifq/cddl/contrib/opensolaris/common/ctf/ctf_create.c
  projects/ifq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/ifq/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
  projects/ifq/cddl/lib/libnvpair/Makefile
  projects/ifq/contrib/libreadline/search.c
  projects/ifq/contrib/smbfs/lib/smb/nls.c
  projects/ifq/contrib/telnet/telnetd/sys_term.c
  projects/ifq/contrib/tzdata/africa
  projects/ifq/contrib/tzdata/antarctica
  projects/ifq/contrib/tzdata/asia
  projects/ifq/contrib/tzdata/australasia
  projects/ifq/contrib/tzdata/backward
  projects/ifq/contrib/tzdata/etcetera
  projects/ifq/contrib/tzdata/europe
  projects/ifq/contrib/tzdata/northamerica
  projects/ifq/contrib/tzdata/southamerica
  projects/ifq/contrib/tzdata/zone.tab
  projects/ifq/etc/defaults/periodic.conf
  projects/ifq/etc/defaults/rc.conf
  projects/ifq/etc/freebsd-update.conf
  projects/ifq/etc/mtree/BSD.tests.dist
  projects/ifq/etc/network.subr
  projects/ifq/etc/pkg/FreeBSD.conf
  projects/ifq/etc/rc.d/Makefile
  projects/ifq/etc/rc.d/ntpdate
  projects/ifq/etc/rc.d/rpcbind
  projects/ifq/etc/rc.d/syslogd
  projects/ifq/lib/Makefile
  projects/ifq/lib/atf/Makefile
  projects/ifq/lib/atf/Makefile.inc
  projects/ifq/lib/atf/libatf-c++/Makefile
  projects/ifq/lib/atf/libatf-c/Makefile
  projects/ifq/lib/libc/iconv/citrus_csmapper.h
  projects/ifq/lib/libc/string/strlcpy.3
  projects/ifq/lib/libc/sys/Makefile.inc
  projects/ifq/lib/libproc/proc_bkpt.c
  projects/ifq/lib/msun/Makefile
  projects/ifq/lib/msun/src/s_round.c
  projects/ifq/lib/msun/src/s_roundf.c
  projects/ifq/lib/msun/src/s_roundl.c
  projects/ifq/libexec/Makefile
  projects/ifq/libexec/atf/Makefile
  projects/ifq/libexec/atf/Makefile.inc
  projects/ifq/libexec/atf/atf-check/Makefile
  projects/ifq/libexec/rbootd/bpf.c
  projects/ifq/libexec/rtld-elf/rtld.c
  projects/ifq/release/Makefile
  projects/ifq/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/errata/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/install.ent
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/install.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/layout.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/readme/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
  projects/ifq/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
  projects/ifq/release/doc/en_US.ISO8859-1/errata/article.xml
  projects/ifq/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/ifq/release/doc/en_US.ISO8859-1/readme/article.xml
  projects/ifq/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/errata/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
  projects/ifq/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/errata/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/common/dev.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/common/intro.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/i386/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
  projects/ifq/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/relnotes/common/new.xml
  projects/ifq/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
  projects/ifq/release/doc/ja_JP.eucJP/share/xml/catalog.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/errata/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/install.ent
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/install.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
  projects/ifq/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/readme/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
  projects/ifq/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
  projects/ifq/release/doc/share/misc/man2hwnotes.pl
  projects/ifq/release/doc/share/xml/catalog.xml
  projects/ifq/release/doc/zh_CN.GB2312/errata/article.xml
  projects/ifq/release/doc/zh_CN.GB2312/hardware/article.xml
  projects/ifq/release/doc/zh_CN.GB2312/readme/article.xml
  projects/ifq/release/doc/zh_CN.GB2312/relnotes/article.xml
  projects/ifq/release/picobsd/build/picobsd
  projects/ifq/release/release.sh
  projects/ifq/sbin/devd/devd.cc
  projects/ifq/sbin/ifconfig/ifconfig.c
  projects/ifq/share/doc/Makefile
  projects/ifq/share/examples/Makefile
  projects/ifq/share/examples/libusb20/Makefile
  projects/ifq/share/examples/libusb20/bulk.c
  projects/ifq/share/examples/libusb20/control.c
  projects/ifq/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src
  projects/ifq/share/i18n/csmapper/JIS/JISX0208 at 1990%UCS.src
  projects/ifq/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src
  projects/ifq/share/i18n/csmapper/JIS/UCS%JISX0208 at 1990.src
  projects/ifq/share/i18n/csmapper/JIS/charset.pivot.JIS.src
  projects/ifq/share/i18n/csmapper/JIS/mapper.dir.JIS.src
  projects/ifq/share/i18n/esdb/EUC/EUC-JP.src
  projects/ifq/share/man/man1/Makefile
  projects/ifq/share/man/man3/tree.3
  projects/ifq/share/man/man4/Makefile
  projects/ifq/share/man/man4/altera_atse.4
  projects/ifq/share/man/man4/ddb.4
  projects/ifq/share/man/man4/natm.4
  projects/ifq/share/man/man4/netmap.4
  projects/ifq/share/man/man4/rights.4
  projects/ifq/share/man/man4/tcp.4
  projects/ifq/share/man/man7/release.7
  projects/ifq/share/man/man9/ifnet.9
  projects/ifq/share/mk/Makefile
  projects/ifq/share/mk/bsd.own.mk
  projects/ifq/share/mk/bsd.prog.mk
  projects/ifq/sys/amd64/amd64/identcpu.c
  projects/ifq/sys/amd64/include/vmparam.h
  projects/ifq/sys/amd64/vmm/io/vlapic.c
  projects/ifq/sys/amd64/vmm/io/vlapic.h
  projects/ifq/sys/amd64/vmm/vmm_lapic.c
  projects/ifq/sys/arm/allwinner/a10_machdep.c
  projects/ifq/sys/arm/allwinner/a20/files.a20
  projects/ifq/sys/arm/allwinner/files.a10
  projects/ifq/sys/arm/arm/bus_space_generic.c
  projects/ifq/sys/arm/arm/machdep.c
  projects/ifq/sys/arm/arm/nexus.c
  projects/ifq/sys/arm/arm/pmap-v6.c
  projects/ifq/sys/arm/arm/pmap.c
  projects/ifq/sys/arm/at91/at91.c
  projects/ifq/sys/arm/at91/at91_machdep.c
  projects/ifq/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  projects/ifq/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
  projects/ifq/sys/arm/broadcom/bcm2835/files.bcm2835
  projects/ifq/sys/arm/econa/econa_machdep.c
  projects/ifq/sys/arm/freescale/imx/files.imx51
  projects/ifq/sys/arm/freescale/imx/files.imx53
  projects/ifq/sys/arm/freescale/imx/files.imx6
  projects/ifq/sys/arm/freescale/imx/imx51_machdep.c
  projects/ifq/sys/arm/freescale/imx/imx53_machdep.c
  projects/ifq/sys/arm/freescale/imx/imx6_machdep.c
  projects/ifq/sys/arm/freescale/imx/imx_machdep.c
  projects/ifq/sys/arm/freescale/imx/tzic.c
  projects/ifq/sys/arm/include/fdt.h
  projects/ifq/sys/arm/include/machdep.h
  projects/ifq/sys/arm/include/pmap.h
  projects/ifq/sys/arm/include/vmparam.h
  projects/ifq/sys/arm/lpc/lpc_machdep.c
  projects/ifq/sys/arm/mv/mv_localbus.c
  projects/ifq/sys/arm/mv/mv_machdep.c
  projects/ifq/sys/arm/mv/mv_pci.c
  projects/ifq/sys/arm/mv/mvvar.h
  projects/ifq/sys/arm/rockchip/files.rk30xx
  projects/ifq/sys/arm/rockchip/rk30xx_machdep.c
  projects/ifq/sys/arm/s3c2xx0/files.s3c2xx0
  projects/ifq/sys/arm/s3c2xx0/s3c24x0_machdep.c
  projects/ifq/sys/arm/s3c2xx0/s3c2xx0_space.c
  projects/ifq/sys/arm/sa11x0/assabet_machdep.c
  projects/ifq/sys/arm/samsung/exynos/exynos5_machdep.c
  projects/ifq/sys/arm/tegra/tegra2_machdep.c
  projects/ifq/sys/arm/ti/files.ti
  projects/ifq/sys/arm/ti/ti_machdep.c
  projects/ifq/sys/arm/versatile/versatile_machdep.c
  projects/ifq/sys/arm/xilinx/zy7_machdep.c
  projects/ifq/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/ifq/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/ifq/sys/arm/xscale/i8134x/crb_machdep.c
  projects/ifq/sys/arm/xscale/ixp425/avila_machdep.c
  projects/ifq/sys/arm/xscale/pxa/pxa_machdep.c
  projects/ifq/sys/boot/forth/beastie.4th
  projects/ifq/sys/boot/forth/loader.4th
  projects/ifq/sys/boot/forth/loader.4th.8
  projects/ifq/sys/boot/forth/loader.conf
  projects/ifq/sys/boot/forth/loader.conf.5
  projects/ifq/sys/boot/forth/loader.rc
  projects/ifq/sys/boot/forth/menu-commands.4th
  projects/ifq/sys/boot/forth/menu.4th
  projects/ifq/sys/boot/forth/menu.rc
  projects/ifq/sys/boot/forth/menusets.4th
  projects/ifq/sys/boot/i386/loader/loader.rc
  projects/ifq/sys/cam/scsi/scsi_da.c
  projects/ifq/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
  projects/ifq/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  projects/ifq/sys/compat/linux/linux_ioctl.c
  projects/ifq/sys/compat/svr4/svr4_sockio.c
  projects/ifq/sys/conf/files
  projects/ifq/sys/conf/files.arm
  projects/ifq/sys/conf/kern.pre.mk
  projects/ifq/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
  projects/ifq/sys/crypto/aesni/aesencdec.h
  projects/ifq/sys/crypto/aesni/aesni.h
  projects/ifq/sys/crypto/aesni/aesni_wrap.c
  projects/ifq/sys/dev/aacraid/aacraid.c
  projects/ifq/sys/dev/aacraid/aacraid_cam.c
  projects/ifq/sys/dev/aacraid/aacraid_reg.h
  projects/ifq/sys/dev/aacraid/aacraid_var.h
  projects/ifq/sys/dev/aic7xxx/aicasm/Makefile
  projects/ifq/sys/dev/cxgbe/t4_main.c
  projects/ifq/sys/dev/drm2/drm_crtc.c
  projects/ifq/sys/dev/drm2/radeon/radeon_display.c
  projects/ifq/sys/dev/drm2/radeon/radeon_gem.c
  projects/ifq/sys/dev/fdt/fdt_pci.c
  projects/ifq/sys/dev/fdt/simplebus.c
  projects/ifq/sys/dev/iwn/if_iwnreg.h
  projects/ifq/sys/dev/ixgbe/ixgbe.c
  projects/ifq/sys/dev/mii/atphy.c
  projects/ifq/sys/dev/mii/miidevs
  projects/ifq/sys/dev/netmap/netmap.c
  projects/ifq/sys/dev/ofw/ofw_fdt.c
  projects/ifq/sys/dev/ppc/ppc_pci.c
  projects/ifq/sys/dev/uart/uart_bus_pci.c
  projects/ifq/sys/dev/usb/wlan/if_rsu.c
  projects/ifq/sys/dev/usb/wlan/if_rum.c
  projects/ifq/sys/dev/usb/wlan/if_run.c
  projects/ifq/sys/dev/usb/wlan/if_uath.c
  projects/ifq/sys/dev/usb/wlan/if_upgt.c
  projects/ifq/sys/dev/usb/wlan/if_ural.c
  projects/ifq/sys/dev/usb/wlan/if_urtw.c
  projects/ifq/sys/dev/usb/wlan/if_urtwn.c
  projects/ifq/sys/dev/usb/wlan/if_zyd.c
  projects/ifq/sys/dev/xen/control/control.c
  projects/ifq/sys/i386/i386/identcpu.c
  projects/ifq/sys/i386/i386/machdep.c
  projects/ifq/sys/i386/include/vmparam.h
  projects/ifq/sys/ia64/include/vmparam.h
  projects/ifq/sys/kern/capabilities.conf
  projects/ifq/sys/kern/kern_malloc.c
  projects/ifq/sys/kern/uipc_socket.c
  projects/ifq/sys/mips/cavium/std.octeon1
  projects/ifq/sys/mips/include/vmparam.h
  projects/ifq/sys/mips/mips/nexus.c
  projects/ifq/sys/modules/aic7xxx/Makefile
  projects/ifq/sys/modules/aic7xxx/ahc/Makefile
  projects/ifq/sys/modules/aic7xxx/ahd/Makefile
  projects/ifq/sys/modules/bwi/Makefile
  projects/ifq/sys/modules/iwnfw/Makefile
  projects/ifq/sys/modules/vmm/Makefile
  projects/ifq/sys/net/if.c
  projects/ifq/sys/net/if.h
  projects/ifq/sys/net/if_tap.c
  projects/ifq/sys/net/if_var.h
  projects/ifq/sys/net80211/ieee80211_amrr.c
  projects/ifq/sys/net80211/ieee80211_output.c
  projects/ifq/sys/netgraph/ng_pipe.c
  projects/ifq/sys/netinet/if_ether.c
  projects/ifq/sys/netinet/in.c
  projects/ifq/sys/netinet/raw_ip.c
  projects/ifq/sys/netinet/sctp_asconf.c
  projects/ifq/sys/netinet/sctp_auth.c
  projects/ifq/sys/netinet/sctp_auth.h
  projects/ifq/sys/netinet/sctputil.c
  projects/ifq/sys/netinet/tcp_usrreq.c
  projects/ifq/sys/netpfil/ipfw/ip_fw2.c
  projects/ifq/sys/netpfil/pf/pf.c
  projects/ifq/sys/netsmb/smb_trantcp.c
  projects/ifq/sys/ofed/drivers/net/mlx4/en_ethtool.c
  projects/ifq/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/ifq/sys/ofed/drivers/net/mlx4/mlx4_en.h
  projects/ifq/sys/ofed/include/linux/bitops.h
  projects/ifq/sys/powerpc/booke/pmap.c
  projects/ifq/sys/powerpc/include/vmparam.h
  projects/ifq/sys/powerpc/mpc85xx/lbc.c
  projects/ifq/sys/powerpc/mpc85xx/pci_mpc85xx.c
  projects/ifq/sys/powerpc/powerpc/dump_machdep.c
  projects/ifq/sys/sparc64/include/vmparam.h
  projects/ifq/sys/sys/param.h
  projects/ifq/sys/sys/sockio.h
  projects/ifq/sys/vm/vm_object.c
  projects/ifq/sys/x86/cpufreq/hwpstate.c
  projects/ifq/sys/x86/include/specialreg.h
  projects/ifq/sys/x86/iommu/busdma_dmar.c
  projects/ifq/tests/Makefile
  projects/ifq/tests/README
  projects/ifq/tools/build/mk/OptionalObsoleteFiles.inc
  projects/ifq/tools/tools/syscall_timing/syscall_timing.c
  projects/ifq/usr.bin/Makefile
  projects/ifq/usr.bin/atf/Makefile
  projects/ifq/usr.bin/atf/Makefile.inc
  projects/ifq/usr.bin/atf/atf-sh/Makefile
  projects/ifq/usr.bin/calendar/calendars/calendar.freebsd
  projects/ifq/usr.bin/dtc/fdt.cc
  projects/ifq/usr.bin/split/Makefile
  projects/ifq/usr.bin/split/split.c
  projects/ifq/usr.sbin/arp/arp.4
  projects/ifq/usr.sbin/bhyve/bhyverun.c
  projects/ifq/usr.sbin/bhyve/block_if.c
  projects/ifq/usr.sbin/bhyve/mevent.c
  projects/ifq/usr.sbin/bhyve/pci_ahci.c
  projects/ifq/usr.sbin/bhyve/pci_emul.c
  projects/ifq/usr.sbin/bhyve/pci_virtio_net.c
  projects/ifq/usr.sbin/bsdconfig/bsdconfig
  projects/ifq/usr.sbin/bsdconfig/include/messages.subr
  projects/ifq/usr.sbin/bsdconfig/share/common.subr
  projects/ifq/usr.sbin/bsdconfig/share/dialog.subr
  projects/ifq/usr.sbin/bsdconfig/share/media/http.subr
  projects/ifq/usr.sbin/bsdconfig/share/media/tcpip.subr
  projects/ifq/usr.sbin/bsdconfig/share/packages/index.subr
  projects/ifq/usr.sbin/bsdconfig/share/packages/packages.subr
  projects/ifq/usr.sbin/bsdconfig/share/strings.subr
  projects/ifq/usr.sbin/bsdconfig/startup/share/rcconf.subr
  projects/ifq/usr.sbin/bsdinstall/bsdinstall
  projects/ifq/usr.sbin/bsdinstall/bsdinstall.8
  projects/ifq/usr.sbin/bsdinstall/scripts/auto
  projects/ifq/usr.sbin/bsdinstall/scripts/config
  projects/ifq/usr.sbin/bsdinstall/scripts/docsinstall
  projects/ifq/usr.sbin/bsdinstall/scripts/jail
  projects/ifq/usr.sbin/bsdinstall/scripts/netconfig_ipv4
  projects/ifq/usr.sbin/bsdinstall/scripts/netconfig_ipv6
  projects/ifq/usr.sbin/bsdinstall/scripts/script
  projects/ifq/usr.sbin/bsdinstall/scripts/wlanconfig
  projects/ifq/usr.sbin/bsdinstall/scripts/zfsboot
  projects/ifq/usr.sbin/freebsd-update/freebsd-update.sh
  projects/ifq/usr.sbin/mfiutil/Makefile
  projects/ifq/usr.sbin/mfiutil/mfiutil.8
  projects/ifq/usr.sbin/mfiutil/mfiutil.c
  projects/ifq/usr.sbin/mount_smbfs/Makefile
  projects/ifq/usr.sbin/pkg/pkg.7
  projects/ifq/usr.sbin/pkg/pkg.c
  projects/ifq/usr.sbin/route6d/route6d.c
  projects/ifq/usr.sbin/sysrc/sysrc
  projects/ifq/usr.sbin/sysrc/sysrc.8
Directory Properties:
  projects/ifq/   (props changed)
  projects/ifq/cddl/   (props changed)
  projects/ifq/cddl/contrib/opensolaris/   (props changed)
  projects/ifq/contrib/tzdata/   (props changed)
  projects/ifq/lib/libc/   (props changed)
  projects/ifq/sbin/   (props changed)
  projects/ifq/share/man/man4/   (props changed)
  projects/ifq/sys/   (props changed)
  projects/ifq/sys/amd64/vmm/   (props changed)
  projects/ifq/sys/boot/   (props changed)
  projects/ifq/sys/cddl/contrib/opensolaris/   (props changed)
  projects/ifq/sys/conf/   (props changed)
  projects/ifq/sys/modules/vmm/   (props changed)
  projects/ifq/usr.bin/calendar/   (props changed)
  projects/ifq/usr.sbin/bhyve/   (props changed)

Modified: projects/ifq/Makefile.inc1
==============================================================================
--- projects/ifq/Makefile.inc1	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/Makefile.inc1	Sat Nov  9 15:04:56 2013	(r257889)
@@ -263,6 +263,21 @@ XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		-DWITHOUT_GDB
 
+# kernel-tools stage
+KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		PATH=${BPATH}:${PATH} \
+		WORLDTMP=${WORLDTMP} \
+		VERSION="${VERSION}" \
+		COMPILER_TYPE=${COMPILER_TYPE}
+KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
+		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+		DESTDIR= \
+		BOOTSTRAPPING=${OSRELDATE} \
+		SSP_CFLAGS= \
+		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
+		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
@@ -540,6 +555,7 @@ _cross-tools:
 	@echo ">>> stage 3: cross tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
+	${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
 _includes:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1019,20 +1035,7 @@ buildkernel:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
-	cd ${KRNLOBJDIR}/${_kernel}; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \
-	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
-# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
-.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
-.for target in obj depend all
-	cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target}
-.endfor
-.endif
+	${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools
 .if !defined(NO_KERNELDEPEND)
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1319,10 +1322,6 @@ bootstrap-tools: .MAKE
 #
 # build-tools: Build special purpose build tools
 #
-.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules)
-_aicasm= sys/modules/aic7xxx/aicasm
-.endif
-
 .if !defined(NO_SHARE)
 _share=	share/syscons/scrnmaps
 .endif
@@ -1344,7 +1343,6 @@ build-tools: .MAKE
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
     ${_share} \
-    ${_aicasm} \
     usr.bin/awk \
     lib/libmagic \
     usr.bin/mkesdb_static \
@@ -1365,6 +1363,23 @@ build-tools: .MAKE
 .endfor
 
 #
+# kernel-tools: Build kernel-building tools
+#
+kernel-tools: .MAKE
+	mkdir -p ${MAKEOBJDIRPREFIX}/usr
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
+.for _tool in \
+    sys/dev/aic7xxx/aicasm
+	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
+		${MAKE} DIRPRFX=${_tool}/ depend && \
+		${MAKE} DIRPRFX=${_tool}/ all && \
+		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
+.endfor
+
+#
 # cross-tools: Build cross-building tools
 #
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
@@ -1478,7 +1493,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		${_kerberos5_lib_libwind} \
-		${_lib_atf_libatf_c} \
+		${_lib_atf} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
@@ -1492,8 +1507,8 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
 
-.if ${MK_ATF} != "no"
-_lib_atf_libatf_c=	lib/atf/libatf-c
+.if ${MK_TESTS} != "no"
+_lib_atf=	lib/atf
 .endif
 
 .if ${MK_LIBTHR} != "no"
@@ -1602,10 +1617,12 @@ ${_lib}__PL: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
-		${MAKE} DIRPRFX=${_lib}/ obj && \
-		${MAKE} DIRPRFX=${_lib}/ depend && \
-		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
-		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+		${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+		    DIRPRFX=${_lib}/ all && \
+		${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
@@ -1614,10 +1631,10 @@ ${_lib}__L: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
-		${MAKE} DIRPRFX=${_lib}/ obj && \
-		${MAKE} DIRPRFX=${_lib}/ depend && \
-		${MAKE} DIRPRFX=${_lib}/ all && \
-		${MAKE} DIRPRFX=${_lib}/ install
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
@@ -1627,10 +1644,12 @@ ${_lib}__L: .PHONY .MAKE
 lib/libpam__L: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
 		cd ${.CURDIR}/lib/libpam && \
-		${MAKE} DIRPRFX=lib/libpam/ obj && \
-		${MAKE} DIRPRFX=lib/libpam/ depend && \
-		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \
-		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+		    -D_NO_LIBPAM_SO_YET all && \
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+		    -D_NO_LIBPAM_SO_YET install
 
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}

Modified: projects/ifq/ObsoleteFiles.inc
==============================================================================
--- projects/ifq/ObsoleteFiles.inc	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/ObsoleteFiles.inc	Sat Nov  9 15:04:56 2013	(r257889)
@@ -38,6 +38,12 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131109: extattr(2) mlinks fixed
+OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
+OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
+# 20131107: example files removed
+OLD_FILES+=usr/share/examples/libusb20/aux.c
+OLD_FILES+=usr/share/examples/libusb20/aux.h
 # 20131103: WITH_LIBICONV_COMPAT removal
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/lib/libiconv.a

Modified: projects/ifq/UPDATING
==============================================================================
--- projects/ifq/UPDATING	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/UPDATING	Sat Nov  9 15:04:56 2013	(r257889)
@@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20131108:
+	The WITHOUT_ATF build knob has been removed and its functionality
+	has been subsumed into the more generic WITHOUT_TESTS.  If you were
+	using the former to disable the build of the ATF libraries, you
+	should change your settings to use the latter.
+
 20131025:
 	The default version of mtree is nmtree which is obtained from
 	NetBSD.  The output is generally the same, but may vary

Modified: projects/ifq/cddl/contrib/opensolaris/common/ctf/ctf_create.c
==============================================================================
--- projects/ifq/cddl/contrib/opensolaris/common/ctf/ctf_create.c	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/cddl/contrib/opensolaris/common/ctf/ctf_create.c	Sat Nov  9 15:04:56 2013	(r257889)
@@ -65,7 +65,7 @@ ctf_create(int *errp)
 	cts.cts_name = _CTF_SECTION;
 	cts.cts_type = SHT_PROGBITS;
 	cts.cts_flags = 0;
-	cts.cts_data = &hdr;
+	cts.cts_data = (void *)&hdr;
 	cts.cts_size = sizeof (hdr);
 	cts.cts_entsize = 1;
 	cts.cts_offset = 0;

Modified: projects/ifq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/ifq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Sat Nov  9 15:04:56 2013	(r257889)
@@ -1864,7 +1864,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		 * Arches which default to 64-bit need to explicitly use
 		 * the 32-bit library path.
 		 */
-		int use_32 = !(dtp->dt_oflags & DTRACE_O_LP64);
+		int use_32 = (dtp->dt_oflags & DTRACE_O_ILP32);
 #else
 		/*
 		 * Arches which are 32-bit only just use the normal
@@ -1879,9 +1879,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, d
 		len = snprintf(&tmp, 1, fmt, dtp->dt_ld_path, file, tfile,
 		    drti) + 1;
 
-#if !defined(sun)
 		len *= 2;
-#endif
 		cmd = alloca(len);
 
 		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file,

Modified: projects/ifq/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
==============================================================================
--- projects/ifq/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c	Sat Nov  9 15:04:56 2013	(r257889)
@@ -210,7 +210,7 @@ NVLIST_PRTFUNC(int32, int32_t, int32_t, 
 NVLIST_PRTFUNC(uint32, uint32_t, uint32_t, "0x%x")
 NVLIST_PRTFUNC(int64, int64_t, longlong_t, "%lld")
 NVLIST_PRTFUNC(uint64, uint64_t, u_longlong_t, "0x%llx")
-NVLIST_PRTFUNC(double, double, double, "0x%llf")
+NVLIST_PRTFUNC(double, double, double, "0x%f")
 NVLIST_PRTFUNC(string, char *, char *, "%s")
 NVLIST_PRTFUNC(hrtime, hrtime_t, hrtime_t, "0x%llx")
 

Modified: projects/ifq/cddl/lib/libnvpair/Makefile
==============================================================================
--- projects/ifq/cddl/lib/libnvpair/Makefile	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/cddl/lib/libnvpair/Makefile	Sat Nov  9 15:04:56 2013	(r257889)
@@ -21,9 +21,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 
-# This library uses macros to define fprintf behvavior for several object types
+# This library uses macros to define fprintf behavior for several object types
 # The compiler will see the non-string literal arguments to the fprintf calls and
-# omit warnings for them. Quiese these warnings in contrib code: 
+# omit warnings for them. Quiesce these warnings in contrib code: 
 #
 # cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format
 #   string is not a string literal (potentially insecure) [-Wformat-security]

Modified: projects/ifq/contrib/libreadline/search.c
==============================================================================
--- projects/ifq/contrib/libreadline/search.c	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/libreadline/search.c	Sat Nov  9 15:04:56 2013	(r257889)
@@ -211,7 +211,11 @@ _rl_nsearch_init (dir, pchar)
   rl_end = rl_point = 0;
 
   p = _rl_make_prompt_for_search (pchar ? pchar : ':');
+#if defined (PREFER_STDARG)
+  rl_message ("%s", p);
+#else
   rl_message ("%s", p, 0);
+#endif
   free (p);
 
   RL_SETSTATE(RL_STATE_NSEARCH);

Modified: projects/ifq/contrib/smbfs/lib/smb/nls.c
==============================================================================
--- projects/ifq/contrib/smbfs/lib/smb/nls.c	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/smbfs/lib/smb/nls.c	Sat Nov  9 15:04:56 2013	(r257889)
@@ -36,12 +36,9 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <sys/iconv.h>
+#include <iconv.h>
 #include <sys/sysctl.h>
 #include <ctype.h>
-#ifndef APPLE
-#include <dlfcn.h>
-#endif
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -50,21 +47,10 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <netsmb/smb_lib.h>
 
-/*
- * prototype iconv* functions
- */
-typedef void *iconv_t;
-
-static iconv_t (*my_iconv_open)(const char *, const char *);
-static size_t(*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *);
-static int(*my_iconv_close)(iconv_t);
-
 u_char nls_lower[256];
 u_char nls_upper[256];
 
 static iconv_t nls_toext, nls_toloc;
-static int iconv_loaded;
-static void *iconv_lib;
 
 int
 nls_setlocale(const char *name)
@@ -90,32 +76,18 @@ nls_setrecode(const char *local, const c
 #else
 	iconv_t icd;
 
-	if (iconv_loaded == 2)
-		return ENOENT;
-	else if (iconv_loaded == 0) {
-		iconv_loaded++;
-		iconv_lib = dlopen("libiconv.so", RTLD_LAZY | RTLD_GLOBAL);
-		if (iconv_lib == NULL) {
-			warn("Unable to load iconv library: %s\n", dlerror());
-			iconv_loaded++;
-			return ENOENT;
-		}
-		my_iconv_open = dlsym(iconv_lib, "iconv_open");
-		my_iconv = dlsym(iconv_lib, "iconv");
-		my_iconv_close = dlsym(iconv_lib, "iconv_close");
-	}
 	if (nls_toext)
-		my_iconv_close(nls_toext);
+		iconv_close(nls_toext);
 	if (nls_toloc)
-		my_iconv_close(nls_toloc);
+		iconv_close(nls_toloc);
 	nls_toext = nls_toloc = (iconv_t)0;
-	icd = my_iconv_open(external, local);
+	icd = iconv_open(external, local);
 	if (icd == (iconv_t)-1)
 		return errno;
 	nls_toext = icd;
-	icd = my_iconv_open(local, external);
+	icd = iconv_open(local, external);
 	if (icd == (iconv_t)-1) {
-		my_iconv_close(nls_toext);
+		iconv_close(nls_toext);
 		nls_toext = (iconv_t)0;
 		return errno;
 	}
@@ -130,14 +102,11 @@ nls_str_toloc(char *dst, const char *src
 	char *p = dst;
 	size_t inlen, outlen;
 
-	if (!iconv_loaded)
-		return strcpy(dst, src);
-
 	if (nls_toloc == (iconv_t)0)
 		return strcpy(dst, src);
 	inlen = outlen = strlen(src);
-	my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
-	while (my_iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
+	iconv(nls_toloc, NULL, NULL, &p, &outlen);
+	while (iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
 		*p++ = *src++;
 		inlen--;
 		outlen--;
@@ -152,14 +121,11 @@ nls_str_toext(char *dst, const char *src
 	char *p = dst;
 	size_t inlen, outlen;
 
-	if (!iconv_loaded)
-		return strcpy(dst, src);
-
 	if (nls_toext == (iconv_t)0)
 		return strcpy(dst, src);
 	inlen = outlen = strlen(src);
-	my_iconv(nls_toext, NULL, NULL, &p, &outlen);
-	while (my_iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
+	iconv(nls_toext, NULL, NULL, &p, &outlen);
+	while (iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
 		*p++ = *src++;
 		inlen--;
 		outlen--;
@@ -175,17 +141,14 @@ nls_mem_toloc(void *dst, const void *src
 	const char *s = src;
 	size_t inlen, outlen;
 
-	if (!iconv_loaded)
-		return memcpy(dst, src, size);
-
 	if (size == 0)
 		return NULL;
 
 	if (nls_toloc == (iconv_t)0)
 		return memcpy(dst, src, size);
 	inlen = outlen = size;
-	my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
-	while (my_iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
+	iconv(nls_toloc, NULL, NULL, &p, &outlen);
+	while (iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
 		*p++ = *s++;
 		inlen--;
 		outlen--;
@@ -203,12 +166,12 @@ nls_mem_toext(void *dst, const void *src
 	if (size == 0)
 		return NULL;
 
-	if (!iconv_loaded || nls_toext == (iconv_t)0)
+	if (nls_toext == (iconv_t)0)
 		return memcpy(dst, src, size);
 
 	inlen = outlen = size;
-	my_iconv(nls_toext, NULL, NULL, &p, &outlen);
-	while (my_iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) {
+	iconv(nls_toext, NULL, NULL, &p, &outlen);
+	while (iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) {
 		*p++ = *s++;
 		inlen--;
 		outlen--;

Modified: projects/ifq/contrib/telnet/telnetd/sys_term.c
==============================================================================
--- projects/ifq/contrib/telnet/telnetd/sys_term.c	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/telnet/telnetd/sys_term.c	Sat Nov  9 15:04:56 2013	(r257889)
@@ -1052,11 +1052,11 @@ start_login(char *host undef1, int autol
 	 */
 	if ((auth_level < 0) || (autologin != AUTH_VALID))
 # endif
+#endif /* AUTHENTICATION */
 	{
 		argv = addarg(argv, "-h");
 		argv = addarg(argv, host);
 	}
-#endif /* AUTHENTICATION */
 #endif
 #if	!defined(NO_LOGIN_P)
 	argv = addarg(argv, "-p");

Modified: projects/ifq/contrib/tzdata/africa
==============================================================================
--- projects/ifq/contrib/tzdata/africa	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/tzdata/africa	Sat Nov  9 15:04:56 2013	(r257889)
@@ -451,6 +451,14 @@ Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
 # (either two days before them or five days after them, so as to fall on
 # lastFri instead of lastSun).
 
+# From Even Scharning (2013-10-25):
+# The scheduled end of DST in Libya on Friday, October 25, 2013 was
+# cancelled yesterday....
+# 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.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
 Rule	Libya	1952	only	-	Jan	 1	0:00	0	-
@@ -467,8 +475,8 @@ Rule	Libya	1987	1989	-	Apr	 1	0:00	1:00	
 Rule	Libya	1987	1989	-	Oct	 1	0:00	0	-
 Rule	Libya	1997	only	-	Apr	 4	0:00	1:00	S
 Rule	Libya	1997	only	-	Oct	 4	0:00	0	-
-Rule	Libya	2013	max	-	Mar	lastFri	1:00	1:00	S
-Rule	Libya	2013	max	-	Oct	lastFri	2:00	0	-
+Rule	Libya	2013	only	-	Mar	lastFri	1:00	1:00	S
+Rule	Libya	2013	only	-	Oct	lastFri	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			1:00	Libya	CE%sT	1959
@@ -479,7 +487,8 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			2:00	-	EET	1996 Sep 30
 			1:00	Libya	CE%sT	1997 Oct  4
 			2:00	-	EET	2012 Nov 10 2:00
-			1:00	Libya	CE%sT
+			1:00	Libya	CE%sT	2013 Oct 25 2:00
+			2:00	-	EET
 
 # Madagascar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -684,15 +693,6 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
 # </a>
 
-# From Alex Krivenyshev (2008-05-09):
-# Is Western Sahara (part which administrated by Morocco) going to follow
-# Morocco DST changes?  Any information?  What about other part of
-# Western Sahara - under administration of POLISARIO Front (also named
-# SADR Saharawi Arab Democratic Republic)?
-
-# From Arthur David Olson (2008-05-09):
-# XXX--guess that it is only Morocco for now; guess only 2008 for now.
-
 # From Steffen Thorsen (2008-08-27):
 # Morocco will change the clocks back on the midnight between August 31
 # and September 1. They originally planned to observe DST to near the end
@@ -858,13 +858,23 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # transitions would be 2013-07-07 and 2013-08-10; see:
 # http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
 
-# From Paul Eggert (2013-07-03):
+# From Steffen Thorsen (2013-09-28):
+# Morocco extends DST by one month, on very short notice, just 1 day
+# before it was going to end.  There is a new decree (2.13.781) for
+# this, where DST from now on goes from last Sunday of March at 02:00
+# to last Sunday of October at 03:00, similar to EU rules.  Official
+# source (French):
+# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
+# Another source (specifying the time for start and end in the decree):
+# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
+
+# From Paul Eggert (2013-10-03):
 # To estimate what the Moroccan government will do in future years,
-# transition dates for 2014 through 2021 were determined by running
+# transition dates for 2014 through 2038 were determined by running
 # the following program under GNU Emacs 24.3:
 #
 # (let ((islamic-year 1435))
-#   (while (< islamic-year 1444)
+#   (while (< islamic-year 1461)
 #     (let ((a
 #	     (calendar-gregorian-from-absolute
 #	      (calendar-islamic-to-absolute (list 9 1 islamic-year))))
@@ -879,13 +889,18 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 #	  (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
 #     (setq islamic-year (+ 1 islamic-year))))
 #
-# with the results hand-edited for 2020-2022, when the normal spring-forward
-# date falls during the estimated Ramadan.
-#
-# From 2023 through 2038 Ramadan is not predicted to overlap with
-# daylight saving time.  Starting in 2039 there will be overlap again,
-# but 32-bit time_t values roll around in 2038 so for now do not worry
-# about dates after 2038.
+# with spring-forward transitions removed for 2023-2025, when the
+# normal spring-forward date falls during the estimated Ramadan; with
+# all transitions removed for 2026-2035, where the estimated Ramadan
+# falls entirely outside daylight-saving time; and with fall-back
+# transitions removed for 2036-2037, where the normal fall-back
+# date falls during the estimated Ramadan.  Normally, the table would
+# stop after 2037 because 32-bit time_t values roll around early in 2038,
+# but that would imply a prediction of perpetual DST after March 2038
+# due to the year-2037 glitches.  So, this table instead stops after
+# 2038, the first non-glitchy year after the 32-bit rollover.
+# An advantage of stopping after 2038 is that it lets zic guess
+# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
 
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
@@ -912,12 +927,14 @@ Rule	Morocco	2010	only	-	May	 2	 0:00	1:
 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	2012	2019	-	Apr	 lastSun 2:00	1:00	S
-Rule	Morocco	2012	max	-	Sep	 lastSun 3: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	2013	only	-	Jul	  7	 3:00	0	-
 Rule	Morocco	2013	only	-	Aug	 10	 2:00	1:00	S
+Rule	Morocco	2013	2035	-	Oct	 lastSun 3:00	0	-
+Rule	Morocco	2014	2022	-	Mar	 lastSun 2:00	1:00	S
 Rule	Morocco	2014	only	-	Jun	 29	 3:00	0	-
 Rule	Morocco	2014	only	-	Jul	 29	 2:00	1:00	S
 Rule	Morocco	2015	only	-	Jun	 18	 3:00	0	-
@@ -930,20 +947,42 @@ Rule	Morocco	2018	only	-	May	 16	 3:00	0
 Rule	Morocco	2018	only	-	Jun	 15	 2:00	1:00	S
 Rule	Morocco	2019	only	-	May	  6	 3:00	0	-
 Rule	Morocco	2019	only	-	Jun	  5	 2:00	1:00	S
+Rule	Morocco	2020	only	-	Apr	 24	 3:00	0	-
 Rule	Morocco	2020	only	-	May	 24	 2:00	1:00	S
+Rule	Morocco	2021	only	-	Apr	 13	 3:00	0	-
 Rule	Morocco	2021	only	-	May	 13	 2:00	1:00	S
+Rule	Morocco	2022	only	-	Apr	  3	 3:00	0	-
 Rule	Morocco	2022	only	-	May	  3	 2:00	1:00	S
-Rule	Morocco	2023	max	-	Apr	 lastSun 2:00	1:00	S
+Rule	Morocco	2023	only	-	Apr	 22	 2:00	1:00	S
+Rule	Morocco	2024	only	-	Apr	 10	 2:00	1:00	S
+Rule	Morocco	2025	only	-	Mar	 31	 2:00	1:00	S
+Rule	Morocco	2026	max	-	Mar	 lastSun 2:00	1:00	S
+Rule	Morocco	2036	only	-	Oct	 21	 3:00	0	-
+Rule	Morocco	2037	only	-	Oct	 11	 3:00	0	-
+Rule	Morocco	2038	only	-	Sep	 30	 3:00	0	-
+Rule	Morocco	2038	only	-	Oct	 30	 2:00	1:00	S
+Rule	Morocco	2038	max	-	Oct	 lastSun 3:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
 			 1:00	-	CET	1986
 			 0:00	Morocco	WE%sT
+
 # Western Sahara
+#
+# From Gwillim Law (2013-10-22):
+# A correspondent who is usually well informed about time zone matters
+# ... says that Western Sahara observes daylight saving time, just as
+# Morocco does.
+#
+# From Paul Eggert (2013-10-23):
+# Assume that this has been true since Western Sahara switched to GMT,
+# since most of it was then controlled by Morocco.
+
 Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
 			-1:00	-	WAT	1976 Apr 14
-			 0:00	-	WET
+			 0:00	Morocco	WE%sT
 
 # Mozambique
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1100,9 +1139,7 @@ Zone	Africa/Khartoum	2:10:08 -	LMT	1931
 			3:00	-	EAT
 
 # South Sudan
-Zone	Africa/Juba	2:06:24 -	LMT	1931
-			2:00	Sudan	CA%sT	2000 Jan 15 12:00
-			3:00	-	EAT
+Link Africa/Khartoum Africa/Juba
 
 # Swaziland
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

Modified: projects/ifq/contrib/tzdata/antarctica
==============================================================================
--- projects/ifq/contrib/tzdata/antarctica	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/tzdata/antarctica	Sat Nov  9 15:04:56 2013	(r257889)
@@ -16,9 +16,9 @@
 #
 # 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 'zzz' and GMTOFF is 0 for locations while uninhabited.
 
-# These rules are stolen from the `southamerica' file.
+# These rules are stolen from the 'southamerica' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	ArgAQ	1964	1966	-	Mar	 1	0:00	0	-
 Rule	ArgAQ	1964	1966	-	Oct	15	0:00	1:00	S
@@ -228,9 +228,10 @@ Zone Antarctica/Syowa	0	-	zzz	1957 Jan 2
 # Scott Island (never inhabited)
 #
 # year-round base
-# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo.
+# Scott Base, Ross Island, since 1957-01.
+# See Pacific/Auckland.
 #
-# These rules for New Zealand are stolen from the `australasia' file.
+# These rules for New Zealand are stolen from the 'australasia' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	NZAQ	1974	only	-	Nov	 3	2:00s	1:00	D
 Rule	NZAQ	1975	1988	-	Oct	lastSun	2:00s	1:00	D
@@ -268,11 +269,11 @@ Rule	NZAQ	2008	max	-	Apr	Sun>=1	2:00s	0	
 # From Lee Hotz (2001-03-08):
 # I queried the folks at Columbia who spent the summer at Vostok and this is
 # what they had to say about time there:
-# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo)
+# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
 # time, which is 12 hours ahead of GMT. The Russian Station Vostok was
 # 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
 # of GMT). This is a time zone I think two hours east of Moscow. The
-# natural time zone is in between the two: 8 hours ahead of GMT.''
+# natural time zone is in between the two: 8 hours ahead of GMT."
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
@@ -337,16 +338,8 @@ Zone Antarctica/Palmer	0	-	zzz	1965
 			-4:00	ChileAQ	CL%sT
 #
 #
-# McMurdo, Ross Island, since 1955-12
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/McMurdo	0	-	zzz	1956
-			12:00	NZAQ	NZ%sT
-#
-# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20
-#
-# From Paul Eggert (1996-09-03):
-# Normally it wouldn't have a separate entry, since it's like the
-# larger Antarctica/McMurdo since 1970, but it's too famous to omit.
+# McMurdo Station, Ross Island, since 1955-12
+# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
 #
 # From Chris Carrier (1996-06-27):
 # Siple, the first commander of the South Pole station,
@@ -368,4 +361,4 @@ Zone Antarctica/McMurdo	0	-	zzz	1956
 # we have to go around and set them back 5 minutes or so.
 # Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
 #
-Link	Antarctica/McMurdo	Antarctica/South_Pole
+# See 'australasia' for Antarctica/McMurdo.

Modified: projects/ifq/contrib/tzdata/asia
==============================================================================
--- projects/ifq/contrib/tzdata/asia	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/tzdata/asia	Sat Nov  9 15:04:56 2013	(r257889)
@@ -6,7 +6,7 @@
 # go ahead and edit the file (and please send any changes to
 # tz at iana.org for general use in the future).
 
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2013-08-11):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -44,11 +44,11 @@
 #	4:00 GST	Gulf*
 #	5:30 IST	India
 #	7:00 ICT	Indochina*
-#	7:00 WIT	west Indonesia
-#	8:00 CIT	central Indonesia
+#	7:00 WIB	west Indonesia (Waktu Indonesia Barat)
+#	8:00 WITA	central Indonesia (Waktu Indonesia Tengah)
 #	8:00 CST	China
 #	9:00 CJT	Central Japanese Time (1896/1937)*
-#	9:00 EIT	east Indonesia
+#	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
 #	9:00 JST  JDT	Japan
 #	9:00 KST  KDT	Korea
 #	9:30 CST	(Australian) Central Standard Time
@@ -756,7 +756,7 @@ Zone	Asia/Dili	8:22:20 -	LMT	1912
 			8:00	-	TLT	1942 Feb 21 23:00 # E Timor Time
 			9:00	-	JST	1945 Sep 23
 			9:00	-	TLT	1976 May  3
-			8:00	-	CIT	2000 Sep 17 00:00
+			8:00	-	WITA	2000 Sep 17 00:00
 			9:00	-	TLT
 
 # India
@@ -793,36 +793,53 @@ Zone	Asia/Kolkata	5:53:28 -	LMT	1880	# K
 # (Hollandia).  For now, assume all Indonesian locations other than Jayapura
 # switched on 1945-09-23.
 #
+# From Paul Eggert (2013-08-11):
+# Normally the tz database uses English-language abbreviations, but in
+# Indonesia it's typical to use Indonesian-language abbreviations even
+# when writing in English.  For example, see the English-language
+# summary published by the Time and Frequency Laboratory of the
+# Research Center for Calibration, Instrumentation and Metrology,
+# Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
+# The abbreviations 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)
+#
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+# Java, Sumatra
 Zone Asia/Jakarta	7:07:12 -	LMT	1867 Aug 10
 # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
 # but this must be a typo.
-			7:07:12	-	JMT	1923 Dec 31 23:47:12 # Jakarta
+			7:07:12	-	BMT	1923 Dec 31 23:47:12 # Batavia
 			7:20	-	JAVT	1932 Nov	 # Java Time
-			7:30	-	WIT	1942 Mar 23
+			7:30	-	WIB	1942 Mar 23
 			9:00	-	JST	1945 Sep 23
-			7:30	-	WIT	1948 May
-			8:00	-	WIT	1950 May
-			7:30	-	WIT	1964
-			7:00	-	WIT
+			7:30	-	WIB	1948 May
+			8:00	-	WIB	1950 May
+			7:30	-	WIB	1964
+			7:00	-	WIB
+# west and central Borneo
 Zone Asia/Pontianak	7:17:20	-	LMT	1908 May
 			7:17:20	-	PMT	1932 Nov    # Pontianak MT
-			7:30	-	WIT	1942 Jan 29
+			7:30	-	WIB	1942 Jan 29
 			9:00	-	JST	1945 Sep 23
-			7:30	-	WIT	1948 May
-			8:00	-	WIT	1950 May
-			7:30	-	WIT	1964
-			8:00	-	CIT	1988 Jan  1
-			7:00	-	WIT
+			7:30	-	WIB	1948 May
+			8:00	-	WIB	1950 May
+			7:30	-	WIB	1964
+			8:00	-	WITA	1988 Jan  1
+			7:00	-	WIB
+# Sulawesi, Lesser Sundas, east and south Borneo
 Zone Asia/Makassar	7:57:36 -	LMT	1920
 			7:57:36	-	MMT	1932 Nov    # Macassar MT
-			8:00	-	CIT	1942 Feb  9
+			8:00	-	WITA	1942 Feb  9
 			9:00	-	JST	1945 Sep 23
-			8:00	-	CIT
+			8:00	-	WITA
+# Maluku Islands, West Papua, Papua
 Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
-			9:00	-	EIT	1944 Sep  1
+			9:00	-	WIT	1944 Sep  1
 			9:30	-	CST	1964
-			9:00	-	EIT
+			9:00	-	WIT
 
 # Iran
 
@@ -1364,9 +1381,11 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 3
 # until about the same time next year (at least).
 # http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
 #
-# From Paul Eggert (2012-10-25):
-# For now, assume this is just a one-year measure.  If it becomes
-# permanent, we should move Jordan from EET to AST effective tomorrow.
+# From Paul Eggert (2013-09-21):
+# It's looking like this change will be permanent; see
+# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20)
+# <http://www.albawaba.com/business/jordan-winter-electricity--472005>.
+# So move Jordan to UTC+3 as of the abovementioned date.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
@@ -1392,15 +1411,15 @@ Rule	Jordan	1995	1998	-	Sep	Fri>=15	0:00
 Rule	Jordan	1999	only	-	Jul	 1	0:00s	1:00	S
 Rule	Jordan	1999	2002	-	Sep	lastFri	0:00s	0	-
 Rule	Jordan	2000	2001	-	Mar	lastThu	0:00s	1:00	S
-Rule	Jordan	2002	max	-	Mar	lastThu	24:00	1:00	S
+Rule	Jordan	2002	2012	-	Mar	lastThu	24:00	1:00	S
 Rule	Jordan	2003	only	-	Oct	24	0:00s	0	-
 Rule	Jordan	2004	only	-	Oct	15	0:00s	0	-
 Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
-Rule	Jordan	2006	2011	-	Oct	lastFri	0:00s	0	-
-Rule	Jordan	2013	max	-	Oct	lastFri	0:00s	0	-
+Rule	Jordan	2006	2012	-	Oct	lastFri	0:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Amman	2:23:44 -	LMT	1931
-			2:00	Jordan	EE%sT
+			2:00	Jordan	EE%sT	2012 Oct 26 0:00s
+			3:00	-	AST
 
 
 # Kazakhstan
@@ -2280,9 +2299,18 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # http://www.samanews.com/index.php?act=Show&id=154120
 # http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
 
-# From Paul Eggert (2013-04-15):
+# From Steffen Thorsen (2013-09-24):
+# The Gaza and West Bank are ending DST Thursday at midnight
+# (2013-09-27 00:00:00) (one hour earlier than last year...).
+# This source in English, says "that winter time will go into effect
+# at midnight on Thursday in the West Bank and Gaza Strip":
+# http://english.wafa.ps/index.php?action=detail&id=23246
+# official source...:
+# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
+
+# From Paul Eggert (2013-09-24):
 # For future dates, guess the last Thursday in March at 24:00 through
-# the first Friday on or after September 21 at 01:00.  This is consistent with
+# the first Friday on or after September 21 at 00:00.  This is consistent with
 # the predictions in today's editions of the following URLs,
 # which are for Gaza and Hebron respectively:
 # http://www.timeanddate.com/worldclock/timezone.html?n=702
@@ -2313,7 +2341,8 @@ Rule Palestine	2011	only	-	Aug	 1	0:00	0
 Rule Palestine	2011	only	-	Aug	30	0:00	1:00	S
 Rule Palestine	2011	only	-	Sep	30	0:00	0	-
 Rule Palestine	2012	max	-	Mar	lastThu	24:00	1:00	S
-Rule Palestine	2012	max	-	Sep	Fri>=21	1:00	0	-
+Rule Palestine	2012	only	-	Sep	21	1:00	0	-
+Rule Palestine	2013	max	-	Sep	Fri>=21	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct

Modified: projects/ifq/contrib/tzdata/australasia
==============================================================================
--- projects/ifq/contrib/tzdata/australasia	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/tzdata/australasia	Sat Nov  9 15:04:56 2013	(r257889)
@@ -352,16 +352,25 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
 # October 2012 and end at 3 am on Sunday 20th January 2013.
 # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
-#
-# From Paul Eggert (2012-08-31):
-# For now, guess a pattern of the penultimate Sundays in October and January.
+
+# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
+# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
+# on Sunday 19th January, 2014....  move clocks forward by one hour from 2am
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
+#
+# From Paul Eggert (2013-09-09):
+# For now, guess that Fiji springs forward the Sunday before the fourth
+# Monday in October.  This matches both recent practice and
+# timeanddate.com's current spring-forward prediction.
+# For the January 2014 transition we guessed right while timeanddate.com
+# guessed wrong, so leave the fall-back prediction alone.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	max	-	Oct	Sun>=18	2:00	1:00	S
+Rule	Fiji	2010	max	-	Oct	Sun>=21	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
 Rule	Fiji	2012	max	-	Jan	Sun>=18	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -487,6 +496,7 @@ Zone Pacific/Auckland	11:39:04 -	LMT	186
 Zone Pacific/Chatham	12:13:48 -	LMT	1957 Jan  1
 			12:45	Chatham	CHA%sT
 
+Link Pacific/Auckland Antarctica/McMurdo
 
 # Auckland Is
 # uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers,
@@ -736,7 +746,7 @@ Zone Pacific/Funafuti	11:56:52 -	LMT	190
 # 1886-1891; Baker was similar but exact dates are not known.
 # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
 # uninhabited thereafter.
-# Howland observed Hawaii Standard Time (UTC-10:30) in 1937;
+# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
 # see page 206 of Elgen M. Long and Marie K. Long,
 # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
 # So most likely Howland and Baker observed Hawaii Time from 1935
@@ -749,8 +759,17 @@ Zone Pacific/Funafuti	11:56:52 -	LMT	190
 # no information; was probably like Pacific/Kiritimati
 
 # Johnston
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Johnston	-10:00	-	HST
+#
+# From Paul Eggert (2013-09-03):
+# In his memoirs of June 6th to October 4, 1945
+# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
+# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
+# Johnston time, 1:30 AM Kwajalein time."  This was in June 1945, and
+# confirms that Johnston kept the same time as Honolulu in summer 1945.
+# We have no better information, so for now, assume this has been true
+# indefinitely into the past.
+#
+# See 'northamerica' for Pacific/Johnston.
 
 # Kingman
 # uninhabited

Modified: projects/ifq/contrib/tzdata/backward
==============================================================================
--- projects/ifq/contrib/tzdata/backward	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/tzdata/backward	Sat Nov  9 15:04:56 2013	(r257889)
@@ -22,15 +22,17 @@ Link	America/Kentucky/Louisville	America
 Link	America/Argentina/Mendoza	America/Mendoza
 Link	America/Rio_Branco	America/Porto_Acre
 Link	America/Argentina/Cordoba	America/Rosario
-Link	America/St_Thomas	America/Virgin
+Link	America/Denver		America/Shiprock
+Link	America/Port_of_Spain	America/Virgin
+Link	Pacific/Auckland	Antarctica/South_Pole
 Link	Asia/Ashgabat		Asia/Ashkhabad
+Link	Asia/Kolkata		Asia/Calcutta
 Link	Asia/Chongqing		Asia/Chungking
 Link	Asia/Dhaka		Asia/Dacca
 Link	Asia/Kathmandu		Asia/Katmandu
-Link	Asia/Kolkata		Asia/Calcutta
 Link	Asia/Macau		Asia/Macao
-Link	Asia/Jerusalem		Asia/Tel_Aviv
 Link	Asia/Ho_Chi_Minh	Asia/Saigon
+Link	Asia/Jerusalem		Asia/Tel_Aviv
 Link	Asia/Thimphu		Asia/Thimbu
 Link	Asia/Makassar		Asia/Ujung_Pandang
 Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
@@ -88,10 +90,10 @@ Link	Pacific/Auckland	NZ
 Link	Pacific/Chatham		NZ-CHAT
 Link	America/Denver		Navajo
 Link	Asia/Shanghai		PRC
+Link	Pacific/Pohnpei		Pacific/Ponape
 Link	Pacific/Pago_Pago	Pacific/Samoa
-Link	Pacific/Chuuk		Pacific/Yap
 Link	Pacific/Chuuk		Pacific/Truk
-Link	Pacific/Pohnpei		Pacific/Ponape
+Link	Pacific/Chuuk		Pacific/Yap
 Link	Europe/Warsaw		Poland
 Link	Europe/Lisbon		Portugal
 Link	Asia/Taipei		ROC

Modified: projects/ifq/contrib/tzdata/etcetera
==============================================================================
--- projects/ifq/contrib/tzdata/etcetera	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/tzdata/etcetera	Sat Nov  9 15:04:56 2013	(r257889)
@@ -31,9 +31,9 @@ Link	Etc/GMT				Etc/GMT0
 # even though this is the opposite of what many people expect.
 # POSIX has positive signs west of Greenwich, but many people expect
 # positive signs east of Greenwich.  For example, TZ='Etc/GMT+4' uses
-# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC
+# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
 # (i.e. west of Greenwich) even though many people would expect it to
-# mean 4 hours ahead of UTC (i.e. east of Greenwich).
+# mean 4 hours ahead of UT (i.e. east of Greenwich).
 #
 # In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
 # TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to

Modified: projects/ifq/contrib/tzdata/europe
==============================================================================
--- projects/ifq/contrib/tzdata/europe	Sat Nov  9 14:48:50 2013	(r257888)
+++ projects/ifq/contrib/tzdata/europe	Sat Nov  9 15:04:56 2013	(r257889)
@@ -42,7 +42,7 @@
 #	</a> (1998-09-21, in Portuguese)
 
 #
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
 # Corrections are welcome!
 #                   std dst  2dst
@@ -96,7 +96,7 @@
 # and a sketch map showing some of the sightlines involved. One paragraph
 # of the text said:
 #
-# `An old stone obelisk marking a forgotten terrestrial meridian stands
+# 'An old stone obelisk marking a forgotten terrestrial meridian stands
 # beside the river at Kew. In the 18th century, before time and longitude
 # was standardised by the Royal Observatory in Greenwich, scholars observed
 # this stone and the movement of stars from Kew Observatory nearby. They
@@ -140,7 +140,7 @@
 # From Paul Eggert (2003-09-27):
 # Summer Time was first seriously proposed by William Willett (1857-1915),
 # a London builder and member of the Royal Astronomical Society
-# who circulated a pamphlet ``The Waste of Daylight'' (1907)
+# who circulated a pamphlet "The Waste of Daylight" (1907)
 # that proposed advancing clocks 20 minutes on each of four Sundays in April,
 # and retarding them by the same amount on four Sundays in September.
 # A bill was drafted in 1909 and introduced in Parliament several times,
@@ -165,10 +165,10 @@
 #	</a>
 
 # From Paul Eggert (1996-09-03):
-# The OED Supplement says that the English originally said ``Daylight Saving''
+# The OED Supplement says that the English originally said "Daylight Saving"
 # when they were debating the adoption of DST in 1908; but by 1916 this

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

More information about the svn-src-projects mailing list