svn commit: r255962 - in projects/bhyve_npt_pmap: . contrib/bind9 contrib/binutils/bfd contrib/binutils/binutils contrib/binutils/include/elf contrib/bmake contrib/dialog contrib/dialog/package con...

Neel Natu neel at FreeBSD.org
Tue Oct 1 05:27:51 UTC 2013 

Author: neel
Date: Tue Oct  1 05:27:48 2013
New Revision: 255962
URL: http://svnweb.freebsd.org/changeset/base/255962

Log:
  IFC @r255960

Added:
  projects/bhyve_npt_pmap/contrib/dialog/package/freebsd/
     - copied from r255960, head/contrib/dialog/package/freebsd/
  projects/bhyve_npt_pmap/contrib/dialog/po/fa.po
     - copied unchanged from r255960, head/contrib/dialog/po/fa.po
  projects/bhyve_npt_pmap/sys/modules/ibcore/
     - copied from r255960, head/sys/modules/ibcore/
  projects/bhyve_npt_pmap/sys/modules/ipoib/
     - copied from r255960, head/sys/modules/ipoib/
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c
     - copied unchanged from r255960, head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/cm.c
     - copied unchanged from r255960, head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c
     - copied unchanged from r255960, head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c
     - copied unchanged from r255960, head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/resource_tracker.c
     - copied unchanged from r255960, head/sys/ofed/drivers/net/mlx4/resource_tracker.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/sys_tune.c
     - copied unchanged from r255960, head/sys/ofed/drivers/net/mlx4/sys_tune.c
  projects/bhyve_npt_pmap/sys/ofed/include/linux/atomic.h
     - copied unchanged from r255960, head/sys/ofed/include/linux/atomic.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/clocksource.h
     - copied unchanged from r255960, head/sys/ofed/include/linux/clocksource.h
  projects/bhyve_npt_pmap/sys/ofed/include/rdma/ib_pma.h
     - copied unchanged from r255960, head/sys/ofed/include/rdma/ib_pma.h
  projects/bhyve_npt_pmap/sys/powerpc/pseries/phyp_vscsi.c
     - copied unchanged from r255960, head/sys/powerpc/pseries/phyp_vscsi.c
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_LDNS_UTILS
     - copied unchanged from r255960, head/tools/build/options/WITHOUT_LDNS_UTILS
Deleted:
  projects/bhyve_npt_pmap/contrib/bind9/
  projects/bhyve_npt_pmap/contrib/dialog/samples/copifuncs/
  projects/bhyve_npt_pmap/contrib/dialog/samples/install/
  projects/bhyve_npt_pmap/etc/mtree/BIND.chroot.dist
  projects/bhyve_npt_pmap/etc/mtree/BIND.include.dist
  projects/bhyve_npt_pmap/lib/bind/
  projects/bhyve_npt_pmap/share/doc/bind9/
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_BIND
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_BIND_DNSSEC
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_BIND_ETC
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_BIND_LIBS_LWRES
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_BIND_MTREE
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_BIND_NAMED
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_BIND_UTILS
  projects/bhyve_npt_pmap/tools/build/options/WITH_BIND_IDN
  projects/bhyve_npt_pmap/tools/build/options/WITH_BIND_LARGE_FILE
  projects/bhyve_npt_pmap/tools/build/options/WITH_BIND_LIBS
  projects/bhyve_npt_pmap/tools/build/options/WITH_BIND_SIGCHASE
  projects/bhyve_npt_pmap/tools/build/options/WITH_BIND_XML
  projects/bhyve_npt_pmap/tools/build/options/WITH_LDNS_UTILS
  projects/bhyve_npt_pmap/usr.bin/nslookup/
  projects/bhyve_npt_pmap/usr.bin/nsupdate/
  projects/bhyve_npt_pmap/usr.sbin/arpaname/
  projects/bhyve_npt_pmap/usr.sbin/ddns-confgen/
  projects/bhyve_npt_pmap/usr.sbin/dnssec-dsfromkey/
  projects/bhyve_npt_pmap/usr.sbin/dnssec-keyfromlabel/
  projects/bhyve_npt_pmap/usr.sbin/dnssec-keygen/
  projects/bhyve_npt_pmap/usr.sbin/dnssec-revoke/
  projects/bhyve_npt_pmap/usr.sbin/dnssec-settime/
  projects/bhyve_npt_pmap/usr.sbin/dnssec-signzone/
  projects/bhyve_npt_pmap/usr.sbin/dnssec-verify/
  projects/bhyve_npt_pmap/usr.sbin/genrandom/
  projects/bhyve_npt_pmap/usr.sbin/isc-hmac-fixup/
  projects/bhyve_npt_pmap/usr.sbin/named/
  projects/bhyve_npt_pmap/usr.sbin/named-checkconf/
  projects/bhyve_npt_pmap/usr.sbin/named-checkzone/
  projects/bhyve_npt_pmap/usr.sbin/named-journalprint/
  projects/bhyve_npt_pmap/usr.sbin/nsec3hash/
  projects/bhyve_npt_pmap/usr.sbin/rndc/
  projects/bhyve_npt_pmap/usr.sbin/rndc-confgen/
Modified:
  projects/bhyve_npt_pmap/Makefile.inc1
  projects/bhyve_npt_pmap/ObsoleteFiles.inc
  projects/bhyve_npt_pmap/UPDATING
  projects/bhyve_npt_pmap/contrib/binutils/bfd/elflink.c
  projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c
  projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h
  projects/bhyve_npt_pmap/contrib/bmake/make.1
  projects/bhyve_npt_pmap/contrib/dialog/CHANGES
  projects/bhyve_npt_pmap/contrib/dialog/VERSION
  projects/bhyve_npt_pmap/contrib/dialog/aclocal.m4
  projects/bhyve_npt_pmap/contrib/dialog/arrows.c
  projects/bhyve_npt_pmap/contrib/dialog/buildlist.c
  projects/bhyve_npt_pmap/contrib/dialog/checklist.c
  projects/bhyve_npt_pmap/contrib/dialog/config.guess
  projects/bhyve_npt_pmap/contrib/dialog/config.sub
  projects/bhyve_npt_pmap/contrib/dialog/configure
  projects/bhyve_npt_pmap/contrib/dialog/configure.in
  projects/bhyve_npt_pmap/contrib/dialog/dialog.1
  projects/bhyve_npt_pmap/contrib/dialog/dialog.3
  projects/bhyve_npt_pmap/contrib/dialog/dialog.c
  projects/bhyve_npt_pmap/contrib/dialog/dialog.h
  projects/bhyve_npt_pmap/contrib/dialog/formbox.c
  projects/bhyve_npt_pmap/contrib/dialog/guage.c
  projects/bhyve_npt_pmap/contrib/dialog/inputstr.c
  projects/bhyve_npt_pmap/contrib/dialog/makefile.in
  projects/bhyve_npt_pmap/contrib/dialog/menubox.c
  projects/bhyve_npt_pmap/contrib/dialog/mixedform.c
  projects/bhyve_npt_pmap/contrib/dialog/package/debian/changelog
  projects/bhyve_npt_pmap/contrib/dialog/package/debian/copyright
  projects/bhyve_npt_pmap/contrib/dialog/package/dialog.spec
  projects/bhyve_npt_pmap/contrib/dialog/po/lt.po
  projects/bhyve_npt_pmap/contrib/dialog/samples/inputbox6-utf8
  projects/bhyve_npt_pmap/contrib/dialog/samples/report-tempfile
  projects/bhyve_npt_pmap/contrib/dialog/treeview.c
  projects/bhyve_npt_pmap/contrib/dialog/util.c
  projects/bhyve_npt_pmap/etc/Makefile
  projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist
  projects/bhyve_npt_pmap/etc/mtree/BSD.var.dist
  projects/bhyve_npt_pmap/etc/portsnap.conf
  projects/bhyve_npt_pmap/gnu/lib/libdialog/dlg_config.h
  projects/bhyve_npt_pmap/include/Makefile
  projects/bhyve_npt_pmap/include/mk-osreldate.sh
  projects/bhyve_npt_pmap/lib/Makefile
  projects/bhyve_npt_pmap/lib/csu/arm/crt1.c
  projects/bhyve_npt_pmap/lib/csu/common/notes.h
  projects/bhyve_npt_pmap/lib/libarchive/Makefile
  projects/bhyve_npt_pmap/lib/libedit/readline.c
  projects/bhyve_npt_pmap/release/Makefile
  projects/bhyve_npt_pmap/share/doc/Makefile
  projects/bhyve_npt_pmap/share/man/man4/bxe.4
  projects/bhyve_npt_pmap/share/man/man4/ddb.4
  projects/bhyve_npt_pmap/share/man/man5/src.conf.5
  projects/bhyve_npt_pmap/share/misc/bsd-family-tree
  projects/bhyve_npt_pmap/share/mk/bsd.libnames.mk
  projects/bhyve_npt_pmap/share/mk/bsd.own.mk
  projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_msr.c
  projects/bhyve_npt_pmap/sys/boot/arm/ixp425/boot2/Makefile
  projects/bhyve_npt_pmap/sys/boot/i386/efi/Makefile
  projects/bhyve_npt_pmap/sys/boot/powerpc/boot1.chrp/Makefile
  projects/bhyve_npt_pmap/sys/boot/userboot/libstand/Makefile
  projects/bhyve_npt_pmap/sys/boot/userboot/test/Makefile
  projects/bhyve_npt_pmap/sys/boot/userboot/userboot/Makefile
  projects/bhyve_npt_pmap/sys/cam/cam.h
  projects/bhyve_npt_pmap/sys/cam/cam_ccb.h
  projects/bhyve_npt_pmap/sys/cam/cam_compat.c
  projects/bhyve_npt_pmap/sys/cam/cam_compat.h
  projects/bhyve_npt_pmap/sys/cam/cam_xpt.c
  projects/bhyve_npt_pmap/sys/cam/scsi/scsi_pass.c
  projects/bhyve_npt_pmap/sys/conf/files
  projects/bhyve_npt_pmap/sys/conf/files.powerpc
  projects/bhyve_npt_pmap/sys/conf/newvers.sh
  projects/bhyve_npt_pmap/sys/contrib/rdma/ib_umem.h
  projects/bhyve_npt_pmap/sys/dev/adb/adb_mouse.c
  projects/bhyve_npt_pmap/sys/dev/asr/asr.c
  projects/bhyve_npt_pmap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
  projects/bhyve_npt_pmap/sys/dev/firewire/sbp.c
  projects/bhyve_npt_pmap/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
  projects/bhyve_npt_pmap/sys/dev/hpt27xx/os_bsd.h
  projects/bhyve_npt_pmap/sys/dev/hptiop/hptiop.c
  projects/bhyve_npt_pmap/sys/dev/hptiop/hptiop.h
  projects/bhyve_npt_pmap/sys/dev/hptmv/entry.c
  projects/bhyve_npt_pmap/sys/dev/hptmv/osbsd.h
  projects/bhyve_npt_pmap/sys/dev/hptnr/hptnr_osm_bsd.c
  projects/bhyve_npt_pmap/sys/dev/hptnr/os_bsd.h
  projects/bhyve_npt_pmap/sys/dev/hptrr/hptrr_osm_bsd.c
  projects/bhyve_npt_pmap/sys/dev/hptrr/os_bsd.h
  projects/bhyve_npt_pmap/sys/dev/iir/iir.c
  projects/bhyve_npt_pmap/sys/dev/iir/iir.h
  projects/bhyve_npt_pmap/sys/dev/iscsi/iscsi.c
  projects/bhyve_npt_pmap/sys/dev/iscsi_initiator/iscsi.c
  projects/bhyve_npt_pmap/sys/dev/mfi/mfi_pci.c
  projects/bhyve_npt_pmap/sys/dev/tws/tws.c
  projects/bhyve_npt_pmap/sys/dev/tws/tws_cam.c
  projects/bhyve_npt_pmap/sys/fs/cd9660/cd9660_vfsops.c
  projects/bhyve_npt_pmap/sys/geom/geom_int.h
  projects/bhyve_npt_pmap/sys/geom/geom_kern.c
  projects/bhyve_npt_pmap/sys/geom/geom_subr.c
  projects/bhyve_npt_pmap/sys/kern/kern_descrip.c
  projects/bhyve_npt_pmap/sys/kern/kern_event.c
  projects/bhyve_npt_pmap/sys/kern/kern_lock.c
  projects/bhyve_npt_pmap/sys/kern/kern_timeout.c
  projects/bhyve_npt_pmap/sys/kern/vfs_bio.c
  projects/bhyve_npt_pmap/sys/kern/vfs_subr.c
  projects/bhyve_npt_pmap/sys/libkern/arm/aeabi_unwind.c
  projects/bhyve_npt_pmap/sys/libkern/ashldi3.c
  projects/bhyve_npt_pmap/sys/mips/mips/tlb.c
  projects/bhyve_npt_pmap/sys/modules/Makefile
  projects/bhyve_npt_pmap/sys/modules/hyperv/netvsc/Makefile
  projects/bhyve_npt_pmap/sys/modules/hyperv/stordisengage/Makefile
  projects/bhyve_npt_pmap/sys/modules/hyperv/storvsc/Makefile
  projects/bhyve_npt_pmap/sys/modules/hyperv/utilities/Makefile
  projects/bhyve_npt_pmap/sys/modules/hyperv/vmbus/Makefile
  projects/bhyve_npt_pmap/sys/modules/mlx4/Makefile
  projects/bhyve_npt_pmap/sys/modules/mlx4ib/Makefile
  projects/bhyve_npt_pmap/sys/modules/sfxge/Makefile
  projects/bhyve_npt_pmap/sys/net/if_enc.c
  projects/bhyve_npt_pmap/sys/netpfil/ipfw/ip_fw_log.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/core/addr.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/core/cma.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/core/core_priv.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/core/device.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/core/sa_query.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/core/sysfs.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/core/uverbs_cmd.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/core/uverbs_main.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/core/verbs.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/Makefile
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/ah.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/cq.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/mad.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/main.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/mr.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/srq.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/user.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mlx4/wc.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/Makefile
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/alloc.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/catas.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/cmd.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/cq.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/en_cq.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/en_main.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/en_port.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/en_port.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/en_rx.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/en_tx.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/eq.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/fw.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/fw.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/icm.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/icm.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/intf.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/main.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/mcg.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/mlx4.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/mlx4_en.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/mr.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/pd.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/port.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/profile.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/qp.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/reset.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/sense.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/srq.c
  projects/bhyve_npt_pmap/sys/ofed/include/asm/atomic.h
  projects/bhyve_npt_pmap/sys/ofed/include/asm/byteorder.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/bitops.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/compat.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/device.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/dma-mapping.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/gfp.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/idr.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/if_ether.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/in6.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/kernel.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/linux_compat.c
  projects/bhyve_npt_pmap/sys/ofed/include/linux/list.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/log2.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/mlx4/cmd.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/mlx4/cq.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/mlx4/device.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/mlx4/driver.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/mlx4/qp.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/mlx4/srq.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/moduleparam.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/pci.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/sysfs.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/types.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/workqueue.h
  projects/bhyve_npt_pmap/sys/ofed/include/rdma/ib_cm.h
  projects/bhyve_npt_pmap/sys/ofed/include/rdma/ib_mad.h
  projects/bhyve_npt_pmap/sys/ofed/include/rdma/ib_sa.h
  projects/bhyve_npt_pmap/sys/ofed/include/rdma/ib_user_verbs.h
  projects/bhyve_npt_pmap/sys/ofed/include/rdma/ib_verbs.h
  projects/bhyve_npt_pmap/sys/powerpc/include/ofw_machdep.h
  projects/bhyve_npt_pmap/sys/powerpc/ofw/ofw_machdep.c
  projects/bhyve_npt_pmap/sys/powerpc/ofw/ofw_syscons.c
  projects/bhyve_npt_pmap/sys/powerpc/ofw/ofw_syscons.h
  projects/bhyve_npt_pmap/sys/powerpc/powermac/platform_powermac.c
  projects/bhyve_npt_pmap/sys/powerpc/powerpc/mmu_if.m
  projects/bhyve_npt_pmap/sys/powerpc/ps3/ps3cdrom.c
  projects/bhyve_npt_pmap/sys/powerpc/pseries/mmu_phyp.c
  projects/bhyve_npt_pmap/sys/powerpc/pseries/phyp_console.c
  projects/bhyve_npt_pmap/sys/powerpc/pseries/platform_chrp.c
  projects/bhyve_npt_pmap/sys/powerpc/pseries/vdevice.c
  projects/bhyve_npt_pmap/sys/security/mac/mac_framework.c
  projects/bhyve_npt_pmap/sys/sparc64/include/proc.h
  projects/bhyve_npt_pmap/sys/sys/lockmgr.h
  projects/bhyve_npt_pmap/sys/x86/xen/hvm.c
  projects/bhyve_npt_pmap/tools/build/mk/OptionalObsoleteFiles.inc
  projects/bhyve_npt_pmap/usr.bin/Makefile
  projects/bhyve_npt_pmap/usr.bin/calendar/calendars/calendar.dutch
  projects/bhyve_npt_pmap/usr.bin/host/Makefile
  projects/bhyve_npt_pmap/usr.bin/patch/patch.c
  projects/bhyve_npt_pmap/usr.bin/patch/util.c
  projects/bhyve_npt_pmap/usr.sbin/Makefile
  projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_virtio_block.c
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/ftp.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdinstall/scripts/mirrorselect
Directory Properties:
  projects/bhyve_npt_pmap/   (props changed)
  projects/bhyve_npt_pmap/contrib/binutils/   (props changed)
  projects/bhyve_npt_pmap/contrib/bmake/   (props changed)
  projects/bhyve_npt_pmap/contrib/dialog/   (props changed)
  projects/bhyve_npt_pmap/gnu/lib/   (props changed)
  projects/bhyve_npt_pmap/share/man/man4/   (props changed)
  projects/bhyve_npt_pmap/sys/   (props changed)
  projects/bhyve_npt_pmap/sys/amd64/vmm/   (props changed)
  projects/bhyve_npt_pmap/sys/boot/   (props changed)
  projects/bhyve_npt_pmap/sys/boot/i386/efi/   (props changed)
  projects/bhyve_npt_pmap/sys/boot/powerpc/boot1.chrp/   (props changed)
  projects/bhyve_npt_pmap/sys/conf/   (props changed)
  projects/bhyve_npt_pmap/sys/modules/hyperv/   (props changed)
  projects/bhyve_npt_pmap/usr.bin/calendar/   (props changed)
  projects/bhyve_npt_pmap/usr.sbin/bhyve/   (props changed)

Modified: projects/bhyve_npt_pmap/Makefile.inc1
==============================================================================
--- projects/bhyve_npt_pmap/Makefile.inc1	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/Makefile.inc1	Tue Oct  1 05:27:48 2013	(r255962)
@@ -395,7 +395,7 @@ LIB32WMAKEFLAGS+=	\
 		-DNO_LINT
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
-		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
+		-DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
 LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
 		${IMAKE_INSTALL}
 .endif
@@ -485,10 +485,6 @@ _worldtmp:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/usr/lib >/dev/null
 .endif
-.if ${MK_BIND_LIBS} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
-	    -p ${WORLDTMP}/usr/include >/dev/null
-.endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
 .endfor
@@ -1089,9 +1085,11 @@ distributekernel distributekernel.debug:
 	    KERNEL=${INSTKERNNAME}.${_kernel} \
 	    DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \
 	    ${.TARGET:S/distributekernel/install/}
+.if defined(NO_ROOT)
 	sed -e 's|^./kernel|.|' \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
+.endif
 .endfor
 
 packagekernel:
@@ -1675,7 +1673,7 @@ delete-old-files:
 # the Makefile parser segfault.
 	@exec 3<&0; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
-	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
+	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | sort -r | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \

Modified: projects/bhyve_npt_pmap/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve_npt_pmap/ObsoleteFiles.inc	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/ObsoleteFiles.inc	Tue Oct  1 05:27:48 2013	(r255962)
@@ -38,6 +38,235 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130930: BIND removed from base
+OLD_FILES+=etc/namedb
+OLD_FILES+=etc/periodic/daily/470.status-named
+OLD_FILES+=usr/bin/dig
+OLD_FILES+=usr/bin/nslookup
+OLD_FILES+=usr/bin/nsupdate
+OLD_DIRS+=usr/include/lwres
+OLD_FILES+=usr/include/lwres/context.h
+OLD_FILES+=usr/include/lwres/int.h
+OLD_FILES+=usr/include/lwres/ipv6.h
+OLD_FILES+=usr/include/lwres/lang.h
+OLD_FILES+=usr/include/lwres/list.h
+OLD_FILES+=usr/include/lwres/lwbuffer.h
+OLD_FILES+=usr/include/lwres/lwpacket.h
+OLD_FILES+=usr/include/lwres/lwres.h
+OLD_FILES+=usr/include/lwres/net.h
+OLD_FILES+=usr/include/lwres/netdb.h
+OLD_FILES+=usr/include/lwres/platform.h
+OLD_FILES+=usr/include/lwres/result.h
+OLD_FILES+=usr/include/lwres/version.h
+OLD_FILES+=usr/lib/liblwres.a
+OLD_FILES+=usr/lib/liblwres.so
+OLD_LIBS+=usr/lib/liblwres.so.50
+OLD_FILES+=usr/lib/liblwres_p.a
+OLD_FILES+=usr/sbin/arpaname
+OLD_FILES+=usr/sbin/ddns-confgen
+OLD_FILES+=usr/sbin/dnssec-dsfromkey
+OLD_FILES+=usr/sbin/dnssec-keyfromlabel
+OLD_FILES+=usr/sbin/dnssec-keygen
+OLD_FILES+=usr/sbin/dnssec-revoke
+OLD_FILES+=usr/sbin/dnssec-settime
+OLD_FILES+=usr/sbin/dnssec-signzone
+OLD_FILES+=usr/sbin/genrandom
+OLD_FILES+=usr/sbin/isc-hmac-fixup
+OLD_FILES+=usr/sbin/lwresd
+OLD_FILES+=usr/sbin/named
+OLD_FILES+=usr/sbin/named-checkconf
+OLD_FILES+=usr/sbin/named-checkzone
+OLD_FILES+=usr/sbin/named-compilezone
+OLD_FILES+=usr/sbin/named-journalprint
+OLD_FILES+=usr/sbin/named.reconfig
+OLD_FILES+=usr/sbin/named.reload
+OLD_FILES+=usr/sbin/nsec3hash
+OLD_FILES+=usr/sbin/rndc
+OLD_FILES+=usr/sbin/rndc-confgen
+OLD_DIRS+=usr/share/doc/bind9
+OLD_FILES+=usr/share/doc/bind9/CHANGES
+OLD_FILES+=usr/share/doc/bind9/COPYRIGHT
+OLD_FILES+=usr/share/doc/bind9/FAQ
+OLD_FILES+=usr/share/doc/bind9/HISTORY
+OLD_FILES+=usr/share/doc/bind9/README
+OLD_DIRS+=usr/share/doc/bind9/arm
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html
+OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf
+OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.host.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.named.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html
+OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html
+OLD_DIRS+=usr/share/doc/bind9/misc
+OLD_FILES+=usr/share/doc/bind9/misc/dnssec
+OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl
+OLD_FILES+=usr/share/doc/bind9/misc/ipv6
+OLD_FILES+=usr/share/doc/bind9/misc/migration
+OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9
+OLD_FILES+=usr/share/doc/bind9/misc/options
+OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance
+OLD_FILES+=usr/share/doc/bind9/misc/roadmap
+OLD_FILES+=usr/share/doc/bind9/misc/sdb
+OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl
+OLD_FILES+=usr/share/man/man1/arpaname.1.gz
+OLD_FILES+=usr/share/man/man1/dig.1.gz
+OLD_FILES+=usr/share/man/man1/nslookup.1.gz
+OLD_FILES+=usr/share/man/man1/nsupdate.1.gz
+OLD_FILES+=usr/share/man/man3/lwres.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_config.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz
+OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz
+OLD_FILES+=usr/share/man/man5/named.conf.5.gz
+OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz
+OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
+OLD_FILES+=usr/share/man/man8/genrandom.8.gz
+OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
+OLD_FILES+=usr/share/man/man8/lwresd.8.gz
+OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz
+OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz
+OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz
+OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz
+OLD_FILES+=usr/share/man/man8/named.8.gz
+OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
+OLD_FILES+=usr/share/man/man8/named.reload.8.gz
+OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz
+OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz
+OLD_FILES+=usr/share/man/man8/rndc.8.gz
+OLD_DIRS+=var/named/dev
+OLD_DIRS+=var/named/etc
+OLD_DIRS+=var/named/etc/namedb
+OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev
+OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev
+OLD_DIRS+=var/named/etc/namedb/dynamic
+OLD_FILES+=var/named/etc/namedb/make-localhost
+OLD_DIRS+=var/named/etc/namedb/master
+OLD_FILES+=var/named/etc/namedb/master/empty.db
+OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db
+OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db
+#OLD_FILES+=var/named/etc/namedb/named.conf	# intentionally left out
+OLD_FILES+=var/named/etc/namedb/named.root
+OLD_DIRS+=var/named/etc/namedb/slave
+OLD_DIRS+=var/named/var
+OLD_DIRS+=var/named/var/dump
+OLD_DIRS+=var/named/var/log
+OLD_DIRS+=var/named/var/run
+OLD_DIRS+=var/named/var/run/named
+OLD_DIRS+=var/named/var/stats
+OLD_DIRS+=var/run/named
 # 20130908: libssh becomes private
 OLD_FILES+=usr/lib/libssh.a
 OLD_FILES+=usr/lib/libssh.so

Modified: projects/bhyve_npt_pmap/UPDATING
==============================================================================
--- projects/bhyve_npt_pmap/UPDATING	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/UPDATING	Tue Oct  1 05:27:48 2013	(r255962)
@@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130930:
+	BIND has been removed from the base system.  If all you need
+	is a local resolver, simply enable and start the local_unbound
+	service instead.  Otherwise, several versions of BIND are
+	available in the ports tree.
+
 20130916:
 	With the addition of unbound(8), a new unbound user is now
 	required during installworld.  "mergemaster -p" can be used to

Modified: projects/bhyve_npt_pmap/contrib/binutils/bfd/elflink.c
==============================================================================
--- projects/bhyve_npt_pmap/contrib/binutils/bfd/elflink.c	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/contrib/binutils/bfd/elflink.c	Tue Oct  1 05:27:48 2013	(r255962)
@@ -488,12 +488,28 @@ bfd_elf_record_link_assignment (bfd *out
       if (h->root.u.undef.next != NULL || htab->root.undefs_tail == &h->root)
 	bfd_link_repair_undef_list (&htab->root);
     }
-
-  if (h->root.type == bfd_link_hash_new)
+  else if (h->root.type == bfd_link_hash_new)
     {
       bfd_elf_link_mark_dynamic_symbol (info, h, NULL);
       h->non_elf = 0;
     }
+  else if (h->root.type == bfd_link_hash_indirect)
+    {
+      const struct elf_backend_data *bed = get_elf_backend_data (output_bfd);
+      struct elf_link_hash_entry *hv = h;
+      do
+	hv = (struct elf_link_hash_entry *) hv->root.u.i.link;
+      while (hv->root.type == bfd_link_hash_indirect
+	     || hv->root.type == bfd_link_hash_warning);
+      h->root.type = bfd_link_hash_undefined;
+      hv->root.type = bfd_link_hash_indirect;
+      hv->root.u.i.link = (struct bfd_link_hash_entry *) h;
+      (*bed->elf_backend_copy_indirect_symbol) (info, h, hv);
+    }
+  else if (h->root.type == bfd_link_hash_warning)
+    {
+      abort ();
+    }
 
   /* If this symbol is being provided by the linker script, and it is
      currently defined by a dynamic object, but not by a regular
@@ -1417,10 +1433,10 @@ _bfd_elf_merge_symbol (bfd *abfd,
 	 case, we make the versioned symbol point to the normal one.  */
       const struct elf_backend_data *bed = get_elf_backend_data (abfd);
       flip->root.type = h->root.type;
+      flip->root.u.undef.abfd = h->root.u.undef.abfd;
       h->root.type = bfd_link_hash_indirect;
       h->root.u.i.link = (struct bfd_link_hash_entry *) flip;
       (*bed->elf_backend_copy_indirect_symbol) (info, flip, h);
-      flip->root.u.undef.abfd = h->root.u.undef.abfd;
       if (h->def_dynamic)
 	{
 	  h->def_dynamic = 0;

Modified: projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c
==============================================================================
--- projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c	Tue Oct  1 05:27:48 2013	(r255962)
@@ -9169,6 +9169,8 @@ get_freebsd_note_type (unsigned e_type)
 	return _("NT_FREEBSD_ABI_TAG");
       case NT_FREEBSD_NOINIT_TAG:
 	return _("NT_FREEBSD_NOINIT_TAG");
+      case NT_FREEBSD_ARCH_TAG:
+	return _("NT_FREEBSD_ARCH_TAG");
       default:
 	break;
       }

Modified: projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h
==============================================================================
--- projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h	Tue Oct  1 05:27:48 2013	(r255962)
@@ -456,6 +456,7 @@
 
 #define NT_FREEBSD_TAG		1
 #define NT_FREEBSD_NOINIT_TAG	2
+#define NT_FREEBSD_ARCH_TAG	3
 
 /* These three macros disassemble and assemble a symbol table st_info field,
    which contains the symbol binding and symbol type.  The STB_ and STT_

Modified: projects/bhyve_npt_pmap/contrib/bmake/make.1
==============================================================================
--- projects/bhyve_npt_pmap/contrib/bmake/make.1	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/contrib/bmake/make.1	Tue Oct  1 05:27:48 2013	(r255962)
@@ -730,7 +730,7 @@ even if the target is not tagged with
 The default is 
 .Ql Pa yes
 for backwards compatability with
-.Fx 9
+.Fx 9.0
 and earlier.
 .It Va .MAKE.DEPENDFILE
 Names the makefile (default

Modified: projects/bhyve_npt_pmap/contrib/dialog/CHANGES
==============================================================================
--- projects/bhyve_npt_pmap/contrib/dialog/CHANGES	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/contrib/dialog/CHANGES	Tue Oct  1 05:27:48 2013	(r255962)
@@ -1,9 +1,38 @@
--- $Id: CHANGES,v 1.458 2013/05/24 00:23:22 tom Exp $
+-- $Id: CHANGES,v 1.476 2013/09/24 00:06:47 tom Exp $
 -- Thomas E. Dickey <dickey at invisible-island.net>
 
 This version of dialog was originally from a Debian snapshot.  I've done this
 to it:
 
+2013/09/23
+	+ fix samples/inputbox6-utf8, which had depended unnecessarily on bash.
+	+ improve memory caching for wide-character manipulation in gauge
+	  widget (report by Devin Teske).
+	+ add dlg_reallocate_gauge (discussion with Devin Teske).
+	+ updated configure macros to use msys changes from ncurses.
+	+ update config.guess, config.sub
+
+2013/09/02
+	+ modify makefile rule to make the ".png" filenames created by groff
+	  predictable.
+	+ add option --help-tags to allow scripts to get the item's tag field
+	  consistently from help- and help-item button results rather than
+	  getting the item's text for the latter (discussion with Florent
+	  Rougon).
+	+ correct manpage discussion of DIALOG_ITEM_HELP versus --item-help,
+	  as well as --help-button return status (report by Florent Rougon).
+	+ correct limit used for --hline option (report by Devin Teske,
+	  cf: 2011/06/30).
+	+ do not print empty "[]" if a --hline option was given with an empty
+	  value (report by Devin Teske).
+	+ miscellaneous configure script fixes/updates.  In particular, add
+	  option --with-shared which builds shared libraries without a libtool
+	  dependency.
+	+ add FreeBSD port-files for test-builds.
+	+ update lt.po, add fa.po from
+		http://translationproject.org/latest/dialog/
+	+ update config.guess, config.sub
+
 2013/05/23
 	+ modify ifdef in arrows.c to work around packages which use the
 	  wide-character ncursesw headers with the ncurses library (report
@@ -298,7 +327,7 @@ to it:
 	    separate ncurses' header files.
 	  + CF_DISABLE_RPATH_HACK, fix garbled message
 	  + CF_LD_RPATH_OPT, add mirbsd
-	  + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages. 
+	  + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages.
 	    This only appeared when using the macro in a dpkg script, though it
 	    should have in other cases.
 	  + CF_RPATH_HACK, add a check for libraries not found, e.g., from

Modified: projects/bhyve_npt_pmap/contrib/dialog/VERSION
==============================================================================
--- projects/bhyve_npt_pmap/contrib/dialog/VERSION	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/contrib/dialog/VERSION	Tue Oct  1 05:27:48 2013	(r255962)
@@ -1 +1 @@
-11:1:0	1.2	20130523
+11:1:0	1.2	20130923

Modified: projects/bhyve_npt_pmap/contrib/dialog/aclocal.m4
==============================================================================
--- projects/bhyve_npt_pmap/contrib/dialog/aclocal.m4	Tue Oct  1 03:49:38 2013	(r255961)
+++ projects/bhyve_npt_pmap/contrib/dialog/aclocal.m4	Tue Oct  1 05:27:48 2013	(r255962)
@@ -1,7 +1,7 @@
 dnl macros used for DIALOG configure script
-dnl $Id: aclocal.m4,v 1.90 2012/12/02 20:07:30 tom Exp $
+dnl $Id: aclocal.m4,v 1.94 2013/09/22 14:26:24 tom Exp $
 dnl ---------------------------------------------------------------------------
-dnl Copyright 1999-2011,2012 -- Thomas E. Dickey
+dnl Copyright 1999-2012,2013 -- Thomas E. Dickey
 dnl
 dnl Permission is hereby granted, free of charge, to any person obtaining a
 dnl copy of this software and associated documentation files (the
@@ -590,7 +590,7 @@ changequote([,])dnl
   AC_SUBST(GENCAT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53
+dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
 dnl ------------------
 dnl Conditionally generate script according to whether we're using a given autoconf.
 dnl
@@ -599,6 +599,7 @@ dnl $2 = code to use if AC_ACVERSION is 
 dnl $3 = code to use if AC_ACVERSION is older than $1.
 define([CF_ACVERSION_CHECK],
 [
+ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
 ifdef([m4_version_compare],
 [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
 [CF_ACVERSION_COMPARE(
@@ -1125,6 +1126,27 @@ if test ".$system_name" != ".$cf_cv_syst
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
+dnl ------------------------
+dnl Show the version of libtool
+dnl
+dnl Save the version in a cache variable - this is not entirely a good thing,
+dnl but the version string from libtool is very ugly, and for bug reports it
+dnl might be useful to have the original string.
+AC_DEFUN([CF_CHECK_LIBTOOL_VERSION],[
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+	AC_MSG_CHECKING(version of $LIBTOOL)
+	CF_LIBTOOL_VERSION
+	AC_MSG_RESULT($cf_cv_libtool_version)
+	if test -z "$cf_cv_libtool_version" ; then
+		AC_MSG_ERROR(This is not GNU libtool)
+	fi
+else
+	AC_MSG_ERROR(GNU libtool has not been found)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
@@ -1293,7 +1315,7 @@ fi
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 36 updated: 2012/07/07 21:02:48
+dnl CF_CURSES_LIBS version: 37 updated: 2013/02/09 17:33:50
 dnl --------------
 dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
@@ -1330,7 +1352,7 @@ hpux10.*) #(vi
 			ac_cv_func_initscr=yes
 			])])
 	fi
-    ;;
+	;;
 linux*)
 	case `arch 2>/dev/null` in
 	x86_64)
@@ -1345,7 +1367,7 @@ linux*)
 		CF_ADD_LIBDIR(/lib)
 		;;
 	esac
-    ;;
+	;;
 sunos3*|sunos4*)
 	if test "x$cf_cv_screen" = "xcurses_5lib"
 	then
@@ -1359,59 +1381,63 @@ sunos3*|sunos4*)
 esac
 
 if test ".$ac_cv_func_initscr" != .yes ; then
-    cf_save_LIBS="$LIBS"
-    cf_term_lib=""
-    cf_curs_lib=""
+	cf_save_LIBS="$LIBS"
 
-    if test ".${cf_cv_ncurses_version:-no}" != .no
-    then
-        cf_check_list="ncurses curses cursesX"
-    else
-        cf_check_list="cursesX curses ncurses"
-    fi
+	if test ".${cf_cv_ncurses_version:-no}" != .no
+	then
+		cf_check_list="ncurses curses cursesX"
+	else
+		cf_check_list="cursesX curses ncurses"
+	fi
 
-    # Check for library containing tgoto.  Do this before curses library
-    # because it may be needed to link the test-case for initscr.
-    AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
-        for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
-        do
-            AC_CHECK_LIB($cf_term_lib,tgoto,[break])
-        done
-    ])
+	# Check for library containing tgoto.  Do this before curses library
+	# because it may be needed to link the test-case for initscr.
+	if test "x$cf_term_lib" = x
+	then
+		AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
+			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
+			do
+				AC_CHECK_LIB($cf_term_lib,tgoto,[break])
+			done
+		])
+	fi
 
-    # Check for library containing initscr
-    test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
- 	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
-    do
-        AC_CHECK_LIB($cf_curs_lib,initscr,[break])
-    done
-    test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found)
+	# Check for library containing initscr
+	test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
+	if test "x$cf_curs_lib" = x
+	then
+		for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
+		do
+			AC_CHECK_LIB($cf_curs_lib,initscr,[break])
+		done
+	fi
+	test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found)
 
-    LIBS="-l$cf_curs_lib $cf_save_LIBS"
-    if test "$cf_term_lib" = unknown ; then
-        AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
-        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-            [initscr()],
-            [cf_result=yes],
-            [cf_result=no])
-        AC_MSG_RESULT($cf_result)
-        test $cf_result = no && AC_MSG_ERROR(Cannot link curses library)
-    elif test "$cf_curs_lib" = "$cf_term_lib" ; then
-        :
-    elif test "$cf_term_lib" != predefined ; then
-        AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
-        AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-            [initscr(); tgoto((char *)0, 0, 0);],
-            [cf_result=no],
-            [
-            LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
-            AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
-                [initscr()],
-                [cf_result=yes],
-                [cf_result=error])
-            ])
-        AC_MSG_RESULT($cf_result)
-    fi
+	LIBS="-l$cf_curs_lib $cf_save_LIBS"
+	if test "$cf_term_lib" = unknown ; then
+		AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
+		AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+			[initscr()],
+			[cf_result=yes],
+			[cf_result=no])
+		AC_MSG_RESULT($cf_result)
+		test $cf_result = no && AC_MSG_ERROR(Cannot link curses library)
+	elif test "$cf_curs_lib" = "$cf_term_lib" ; then
+		:
+	elif test "$cf_term_lib" != predefined ; then
+		AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
+		AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+			[initscr(); tgoto((char *)0, 0, 0);],
+			[cf_result=no],
+			[
+			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
+			AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
+				[initscr()],
+				[cf_result=yes],
+				[cf_result=error])
+			])
+		AC_MSG_RESULT($cf_result)
+	fi
 fi
 fi
 
@@ -1708,6 +1734,20 @@ if test "$cf_disable_rpath_hack" = no ; 
 fi
 ])
 dnl ---------------------------------------------------------------------------
+dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42
+dnl ---------------
+dnl Check if the rpath option should be used, setting cache variable
+dnl cf_cv_enable_rpath if so.
+AC_DEFUN([CF_ENABLE_RPATH],
+[
+AC_MSG_CHECKING(if rpath option should be used)
+AC_ARG_ENABLE(rpath,
+[  --enable-rpath          use rpath option when generating shared libraries],
+[cf_cv_enable_rpath=$enableval],
+[cf_cv_enable_rpath=no])
+AC_MSG_RESULT($cf_cv_enable_rpath)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
 dnl ---------------
 dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
@@ -1888,6 +1928,15 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_FORGET_TOOL version: 1 updated: 2013/04/06 18:03:09
+dnl --------------
+dnl Forget that we saw the given tool.
+AC_DEFUN([CF_FORGET_TOOL],[
+unset ac_cv_prog_ac_ct_$1
+unset ac_ct_$1
+unset $1
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_FUNC_WAIT version: 3 updated: 2012/10/06 08:57:51
 dnl ------------
 dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wait()'
@@ -2256,7 +2305,7 @@ test -d "$oldincludedir" && {
 $1="[$]$1 $cf_header_path_list"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42
+dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -2270,6 +2319,7 @@ dnl $1 = GCC (default) or GXX
 dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
 dnl $3 = CFLAGS (default) or CXXFLAGS
 AC_DEFUN([CF_INTEL_COMPILER],[
+AC_REQUIRE([AC_CANONICAL_HOST])
 ifelse([$2],,INTEL_COMPILER,[$2])=no
 
 if test "$ifelse([$1],,[$1],GCC)" = yes ; then
@@ -2415,6 +2465,18 @@ CF_SUBDIR_PATH($1,$2,lib)
 $1="$cf_library_path_list [$]$1"
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
+dnl ------------------
+AC_DEFUN([CF_LIBTOOL_VERSION],[
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
+else
+	cf_cv_libtool_version=
+fi
+test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10
 dnl -------------
 dnl Compute the library-prefix for the given host system
@@ -2432,6 +2494,69 @@ ifelse($1,,,[$1=$LIB_PREFIX])
 	AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_LIB_SUFFIX version: 22 updated: 2013/09/07 13:54:05
+dnl -------------
+dnl Compute the library file-suffix from the given model name
+dnl $1 = model name
+dnl $2 = variable to set (the nominal library suffix)
+dnl $3 = dependency variable to set (actual filename)
+dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
+AC_DEFUN([CF_LIB_SUFFIX],
+[
+	case X$1 in #(vi
+	Xlibtool) #(vi
+		$2='.la'
+		$3=[$]$2
+		;;
+	Xdebug) #(vi
+		$2='_g.a'
+		$3=[$]$2
+		;;
+	Xprofile) #(vi
+		$2='_p.a'
+		$3=[$]$2
+		;;
+	Xshared) #(vi
+		case $cf_cv_system_name in
+		aix[[5-7]]*) #(vi
+			$2='.a'
+			$3=[$]$2
+			;;
+		cygwin*|msys*|mingw*) #(vi
+			$2='.dll'
+			$3='.dll.a'
+			;;
+		darwin*) #(vi
+			$2='.dylib'
+			$3=[$]$2
+			;;
+		hpux*) #(vi
+			case $target in
+			ia64*) #(vi
+				$2='.so'
+				$3=[$]$2
+				;;
+			*) #(vi
+				$2='.sl'
+				$3=[$]$2
+				;;
+			esac
+			;;
+		*) #(vi
+			$2='.so'
+			$3=[$]$2
+			;;
+		esac
+		;;
+	*)
+		$2='.a'
+		$3=[$]$2
+		;;
+	esac
+	test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
+	test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}"
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
@@ -2569,7 +2694,7 @@ if test "$cf_cv_mbstate_t" != unknown ; 
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03
+dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
@@ -2578,7 +2703,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
 	case $target_alias in #(vi
-	*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
+	*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
 		cf_cv_mixedcase=no
 		;;
 	*)
@@ -2959,6 +3084,25 @@ case .$with_cflags in #(vi
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_NUMBER_SYNTAX version: 1 updated: 2003/09/20 18:12:49
+dnl ----------------
+dnl Check if the given variable is a number.  If not, report an error.
+dnl $1 is the variable
+dnl $2 is the message
+AC_DEFUN([CF_NUMBER_SYNTAX],[
+if test -n "$1" ; then
+  case $1 in #(vi
+  [[0-9]]*) #(vi
+ 	;;
+  *)
+	AC_MSG_ERROR($2 is not a number: $1)
+ 	;;
+  esac
+else
+  AC_MSG_ERROR($2 value is empty)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_OUR_MESSAGES version: 7 updated: 2004/09/12 19:45:55
 dnl ---------------
 dnl Check if we use the messages included with this program
@@ -3049,6 +3193,40 @@ case ".[$]$1" in #(vi
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22
+dnl -------------
+dnl Check for the package-config program, unless disabled by command-line.
+AC_DEFUN([CF_PKG_CONFIG],
+[
+AC_MSG_CHECKING(if you want to use pkg-config)
+AC_ARG_WITH(pkg-config,
+	[  --with-pkg-config{=path} enable/disable use of pkg-config],
+	[cf_pkg_config=$withval],
+	[cf_pkg_config=yes])
+AC_MSG_RESULT($cf_pkg_config)
+
+case $cf_pkg_config in #(vi
+no) #(vi
+	PKG_CONFIG=none
+	;;
+yes) #(vi
+	CF_ACVERSION_CHECK(2.52,
+		[AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)],
+		[AC_PATH_PROG(PKG_CONFIG, pkg-config, none)])
+	;;
+*)
+	PKG_CONFIG=$withval
+	;;
+esac
+
+test -z "$PKG_CONFIG" && PKG_CONFIG=none
+if test "$PKG_CONFIG" != none ; then
+	CF_PATH_SYNTAX(PKG_CONFIG)
+fi
+
+AC_SUBST(PKG_CONFIG)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_POSIX_C_SOURCE version: 8 updated: 2010/05/26 05:38:42
 dnl -----------------
 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
@@ -3168,6 +3346,28 @@ AC_CHECK_PROGS(LINT, tdlint lint alint s
 AC_SUBST(LINT_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PROG_LN_S version: 2 updated: 2010/08/14 18:25:37
+dnl ------------
+dnl Combine checks for "ln -s" and "ln -sf", updating $LN_S to include "-f"
+dnl option if it is supported.
+AC_DEFUN([CF_PROG_LN_S],[
+AC_PROG_LN_S
+AC_MSG_CHECKING(if $LN_S -f options work)
+
+rm -f conf$$.src conf$$dst
+echo >conf$$.dst
+echo first >conf$$.src
+if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then
+	cf_prog_ln_sf=yes
+else
+	cf_prog_ln_sf=no
+fi
+rm -f conf$$.dst conf$$src
+AC_MSG_RESULT($cf_prog_ln_sf)
+
+test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50
 dnl ----------------
 dnl Remove all -U and -D options that refer to the given symbol from a list
@@ -3185,7 +3385,7 @@ $1=`echo "$2" | \
 		-e 's/-[[UD]]'"$3"'\(=[[^ 	]]*\)\?[$]//g'`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33
+dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],
 [
@@ -3202,8 +3402,8 @@ if test -n "$LD_RPATH_OPT" ; then
 
 AC_TRY_LINK([#include <stdio.h>],
 		[printf("Hello");],
-		[cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
-		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ 	]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
+		[cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ 	]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`])
 
 		# If we passed the link-test, but get a "not found" on a given library,
 		# this could be due to inept reconfiguration of gcc to make it only
@@ -3236,6 +3436,8 @@ AC_TRY_LINK([#include <stdio.h>],
 	CF_RPATH_HACK_2(LIBS)
 
 	CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+else
+	AC_MSG_RESULT(no)
 fi
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
@@ -3300,6 +3502,440 @@ CF_VERBOSE(...checked $1 [$]$1)
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_SHARED_OPTS version: 83 updated: 2013/09/21 17:34:53
+dnl --------------
+dnl --------------
+dnl Attempt to determine the appropriate CC/LD options for creating a shared
+dnl library.
+dnl
+dnl Notes:
+dnl a) ${LOCAL_LDFLAGS} is used to link executables that will run within
+dnl the build-tree, i.e., by making use of the libraries that are compiled in
+dnl $rel_builddir/lib We avoid compiling-in a $rel_builddir/lib path for the
+dnl shared library since that can lead to unexpected results at runtime.
+dnl b) ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared
+dnl libraries are compiled in ../../lib
+dnl
+dnl The variable 'cf_cv_do_symlinks' is used to control whether we configure
+dnl to install symbolic links to the rel/abi versions of shared libraries.
+dnl
+dnl The variable 'cf_cv_shlib_version' controls whether we use the rel or abi
+dnl version when making symbolic links.
+dnl
+dnl The variable 'cf_cv_shlib_version_infix' controls whether shared library
+dnl version numbers are infix (ex: libncurses.<ver>.dylib) or postfix
+dnl (ex: libncurses.so.<ver>).
+dnl
+dnl Some loaders leave 'so_locations' lying around.  It's nice to clean up.
+AC_DEFUN([CF_SHARED_OPTS],
+[
+	AC_REQUIRE([CF_LD_RPATH_OPT])
+	RM_SHARED_OPTS=
+	LOCAL_LDFLAGS=
+	LOCAL_LDFLAGS2=
+	LD_SHARED_OPTS=
+	INSTALL_LIB="-m 644"
+	: ${rel_builddir:=.}
+
+	cf_cv_do_symlinks=no
+	cf_ld_rpath_opt=
+	test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
+
+	AC_MSG_CHECKING(if release/abi version should be used for shared libs)
+	AC_ARG_WITH(shlib-version,
+	[  --with-shlib-version=X  Specify rel or abi version for shared libs],
+	[test -z "$withval" && withval=auto
+	case $withval in #(vi
+	yes) #(vi
+		cf_cv_shlib_version=auto
+		;;
+	rel|abi|auto|no) #(vi
+		cf_cv_shlib_version=$withval
+		;;
+	*)
+		AC_MSG_ERROR([option value must be one of: rel, abi, auto or no])
+		;;
+	esac
+	],[cf_cv_shlib_version=auto])
+	AC_MSG_RESULT($cf_cv_shlib_version)
+
+	cf_cv_rm_so_locs=no
+	cf_try_cflags=
+
+	# Some less-capable ports of gcc support only -fpic
+	CC_SHARED_OPTS=
+	if test "$GCC" = yes
+	then
+		AC_MSG_CHECKING(which $CC option to use)
+		cf_save_CFLAGS="$CFLAGS"
+		for CC_SHARED_OPTS in -fPIC -fpic ''
+		do
+			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
+			AC_TRY_COMPILE([#include <stdio.h>],[int x = 1],[break],[])
+		done
+		AC_MSG_RESULT($CC_SHARED_OPTS)
+		CFLAGS="$cf_save_CFLAGS"
+	fi
+
+	cf_cv_shlib_version_infix=no
+
+	case $cf_cv_system_name in #(vi
+	aix4.[3-9]*|aix[[5-7]]*) #(vi
+		if test "$GCC" = yes; then
+			CC_SHARED_OPTS=
+			MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+		else
+			# CC_SHARED_OPTS='-qpic=large -G'

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

More information about the svn-src-projects mailing list