Date: Mon, 7 Oct 2013 15:28:10 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256111 - in projects/camlock: . bin/dd bin/pkill cddl/contrib/opensolaris/cmd/zfs cddl/lib/libdtrace contrib/bind9 contrib/binutils/bfd contrib/binutils/binutils contrib/binutils/inclu... Message-ID: <201310071528.r97FSACB083179@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Oct 7 15:28:08 2013 New Revision: 256111 URL: http://svnweb.freebsd.org/changeset/base/256111 Log: MFC @ r256110 Added: projects/camlock/contrib/dialog/package/freebsd/ - copied from r256110, head/contrib/dialog/package/freebsd/ projects/camlock/contrib/dialog/po/fa.po - copied unchanged from r256110, head/contrib/dialog/po/fa.po projects/camlock/libexec/freebsd-version/ - copied from r256110, head/libexec/freebsd-version/ projects/camlock/sys/modules/ibcore/ - copied from r256110, head/sys/modules/ibcore/ projects/camlock/sys/modules/ipoib/ - copied from r256110, head/sys/modules/ipoib/ projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c - copied unchanged from r256110, head/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/cm.c - copied unchanged from r256110, head/sys/ofed/drivers/infiniband/hw/mlx4/cm.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c - copied unchanged from r256110, head/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c - copied unchanged from r256110, head/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c projects/camlock/sys/ofed/drivers/net/mlx4/resource_tracker.c - copied unchanged from r256110, head/sys/ofed/drivers/net/mlx4/resource_tracker.c projects/camlock/sys/ofed/drivers/net/mlx4/sys_tune.c - copied unchanged from r256110, head/sys/ofed/drivers/net/mlx4/sys_tune.c projects/camlock/sys/ofed/include/linux/atomic.h - copied unchanged from r256110, head/sys/ofed/include/linux/atomic.h projects/camlock/sys/ofed/include/linux/clocksource.h - copied unchanged from r256110, head/sys/ofed/include/linux/clocksource.h projects/camlock/sys/ofed/include/rdma/ib_pma.h - copied unchanged from r256110, head/sys/ofed/include/rdma/ib_pma.h projects/camlock/sys/powerpc/pseries/phyp_vscsi.c - copied unchanged from r256110, head/sys/powerpc/pseries/phyp_vscsi.c projects/camlock/tools/build/options/WITHOUT_LDNS_UTILS - copied unchanged from r256110, head/tools/build/options/WITHOUT_LDNS_UTILS projects/camlock/usr.sbin/bhyve/ahci.h - copied unchanged from r256110, head/usr.sbin/bhyve/ahci.h projects/camlock/usr.sbin/bhyve/block_if.c - copied unchanged from r256110, head/usr.sbin/bhyve/block_if.c projects/camlock/usr.sbin/bhyve/block_if.h - copied unchanged from r256110, head/usr.sbin/bhyve/block_if.h projects/camlock/usr.sbin/bhyve/pci_ahci.c - copied unchanged from r256110, head/usr.sbin/bhyve/pci_ahci.c Deleted: projects/camlock/contrib/bind9/ projects/camlock/contrib/dialog/samples/copifuncs/ projects/camlock/contrib/dialog/samples/install/ projects/camlock/etc/mtree/BIND.chroot.dist projects/camlock/etc/mtree/BIND.include.dist projects/camlock/gnu/usr.bin/binutils/ar/Makefile projects/camlock/gnu/usr.bin/binutils/ar/ar.1 projects/camlock/gnu/usr.bin/binutils/ranlib/Makefile projects/camlock/gnu/usr.bin/binutils/ranlib/ranlib.1 projects/camlock/gnu/usr.bin/rcs/ projects/camlock/lib/bind/ projects/camlock/share/doc/bind9/ projects/camlock/share/doc/psd/13.rcs/ projects/camlock/sys/kern/uipc_cow.c projects/camlock/tools/build/options/WITHOUT_BIND projects/camlock/tools/build/options/WITHOUT_BIND_DNSSEC projects/camlock/tools/build/options/WITHOUT_BIND_ETC projects/camlock/tools/build/options/WITHOUT_BIND_LIBS_LWRES projects/camlock/tools/build/options/WITHOUT_BIND_MTREE projects/camlock/tools/build/options/WITHOUT_BIND_NAMED projects/camlock/tools/build/options/WITHOUT_BIND_UTILS projects/camlock/tools/build/options/WITHOUT_RCS projects/camlock/tools/build/options/WITH_BIND_IDN projects/camlock/tools/build/options/WITH_BIND_LARGE_FILE projects/camlock/tools/build/options/WITH_BIND_LIBS projects/camlock/tools/build/options/WITH_BIND_SIGCHASE projects/camlock/tools/build/options/WITH_BIND_XML projects/camlock/tools/build/options/WITH_LDNS_UTILS projects/camlock/usr.bin/dig/ projects/camlock/usr.bin/nslookup/ projects/camlock/usr.bin/nsupdate/ projects/camlock/usr.sbin/arpaname/ projects/camlock/usr.sbin/ddns-confgen/ projects/camlock/usr.sbin/dnssec-dsfromkey/ projects/camlock/usr.sbin/dnssec-keyfromlabel/ projects/camlock/usr.sbin/dnssec-keygen/ projects/camlock/usr.sbin/dnssec-revoke/ projects/camlock/usr.sbin/dnssec-settime/ projects/camlock/usr.sbin/dnssec-signzone/ projects/camlock/usr.sbin/dnssec-verify/ projects/camlock/usr.sbin/genrandom/ projects/camlock/usr.sbin/isc-hmac-fixup/ projects/camlock/usr.sbin/named/ projects/camlock/usr.sbin/named-checkconf/ projects/camlock/usr.sbin/named-checkzone/ projects/camlock/usr.sbin/named-journalprint/ projects/camlock/usr.sbin/nsec3hash/ projects/camlock/usr.sbin/rndc/ projects/camlock/usr.sbin/rndc-confgen/ Modified: projects/camlock/Makefile.inc1 projects/camlock/ObsoleteFiles.inc projects/camlock/UPDATING projects/camlock/bin/dd/dd.1 projects/camlock/bin/pkill/pkill.c projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/camlock/cddl/lib/libdtrace/tcp.d projects/camlock/contrib/binutils/bfd/elflink.c projects/camlock/contrib/binutils/bfd/elfxx-mips.c projects/camlock/contrib/binutils/binutils/readelf.c projects/camlock/contrib/binutils/include/elf/common.h projects/camlock/contrib/bmake/make.1 projects/camlock/contrib/dialog/CHANGES projects/camlock/contrib/dialog/VERSION projects/camlock/contrib/dialog/aclocal.m4 projects/camlock/contrib/dialog/arrows.c projects/camlock/contrib/dialog/buildlist.c projects/camlock/contrib/dialog/checklist.c projects/camlock/contrib/dialog/config.guess projects/camlock/contrib/dialog/config.sub projects/camlock/contrib/dialog/configure projects/camlock/contrib/dialog/configure.in projects/camlock/contrib/dialog/dialog.1 projects/camlock/contrib/dialog/dialog.3 projects/camlock/contrib/dialog/dialog.c projects/camlock/contrib/dialog/dialog.h projects/camlock/contrib/dialog/formbox.c projects/camlock/contrib/dialog/guage.c projects/camlock/contrib/dialog/inputstr.c projects/camlock/contrib/dialog/makefile.in projects/camlock/contrib/dialog/menubox.c projects/camlock/contrib/dialog/mixedform.c projects/camlock/contrib/dialog/package/debian/changelog projects/camlock/contrib/dialog/package/debian/copyright projects/camlock/contrib/dialog/package/dialog.spec projects/camlock/contrib/dialog/po/lt.po projects/camlock/contrib/dialog/samples/inputbox6-utf8 projects/camlock/contrib/dialog/samples/report-tempfile projects/camlock/contrib/dialog/treeview.c projects/camlock/contrib/dialog/util.c projects/camlock/contrib/libc++/include/memory projects/camlock/contrib/llvm/include/llvm/IR/CallingConv.h projects/camlock/contrib/llvm/lib/AsmParser/LLLexer.cpp projects/camlock/contrib/llvm/lib/AsmParser/LLParser.cpp projects/camlock/contrib/llvm/lib/AsmParser/LLToken.h projects/camlock/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp projects/camlock/contrib/llvm/lib/IR/AsmWriter.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/camlock/contrib/llvm/lib/Target/X86/X86FastISel.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86FixupLEAs.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp projects/camlock/contrib/llvm/lib/Target/X86/X86Subtarget.h projects/camlock/contrib/llvm/tools/clang/include/clang-c/Index.h projects/camlock/contrib/llvm/tools/clang/include/clang/AST/Type.h projects/camlock/contrib/llvm/tools/clang/include/clang/Basic/Attr.td projects/camlock/contrib/llvm/tools/clang/include/clang/Basic/Specifiers.h projects/camlock/contrib/llvm/tools/clang/lib/AST/DumpXML.cpp projects/camlock/contrib/llvm/tools/clang/lib/AST/MicrosoftMangle.cpp projects/camlock/contrib/llvm/tools/clang/lib/AST/Type.cpp projects/camlock/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp projects/camlock/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/camlock/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp projects/camlock/contrib/llvm/tools/clang/lib/Sema/SemaDeclAttr.cpp projects/camlock/contrib/llvm/tools/clang/lib/Sema/SemaType.cpp projects/camlock/contrib/unbound/config.h projects/camlock/contrib/unbound/config.h.in projects/camlock/contrib/unbound/configure projects/camlock/contrib/unbound/configure.ac projects/camlock/contrib/unbound/daemon/unbound.c projects/camlock/contrib/unbound/doc/unbound-checkconf.8 projects/camlock/contrib/unbound/doc/unbound-control.8 projects/camlock/contrib/unbound/doc/unbound.8 projects/camlock/contrib/unbound/doc/unbound.conf.5 projects/camlock/contrib/unbound/freebsd-configure.sh projects/camlock/etc/Makefile projects/camlock/etc/ftpusers projects/camlock/etc/mtree/BSD.include.dist projects/camlock/etc/mtree/BSD.root.dist projects/camlock/etc/mtree/BSD.var.dist projects/camlock/etc/mtree/Makefile projects/camlock/etc/network.subr projects/camlock/etc/periodic/daily/Makefile projects/camlock/etc/portsnap.conf projects/camlock/etc/rc.d/Makefile projects/camlock/etc/rc.d/NETWORKING projects/camlock/etc/rc.d/netif projects/camlock/games/fortune/datfiles/freebsd-tips projects/camlock/gnu/lib/libdialog/dlg_config.h projects/camlock/gnu/usr.bin/Makefile projects/camlock/gnu/usr.bin/binutils/Makefile projects/camlock/include/Makefile projects/camlock/include/mk-osreldate.sh projects/camlock/lib/Makefile projects/camlock/lib/csu/arm/crt1.c projects/camlock/lib/csu/common/notes.h projects/camlock/lib/libarchive/Makefile projects/camlock/lib/libc/sys/accept.2 projects/camlock/lib/libedit/readline.c projects/camlock/lib/libvmmapi/vmmapi.c projects/camlock/lib/libvmmapi/vmmapi.h projects/camlock/libexec/Makefile projects/camlock/libexec/rtld-elf/rtld.c projects/camlock/libexec/rtld-elf/rtld.h projects/camlock/release/Makefile projects/camlock/sbin/bsdlabel/bsdlabel.8 projects/camlock/sbin/ccdconfig/ccdconfig.8 projects/camlock/sbin/fdisk/fdisk.8 projects/camlock/sbin/gbde/gbde.8 projects/camlock/sbin/geom/class/eli/geli.8 projects/camlock/sbin/geom/class/shsec/gshsec.8 projects/camlock/sbin/geom/class/virstor/gvirstor.8 projects/camlock/sbin/gvinum/gvinum.8 projects/camlock/sbin/mount_msdosfs/mount_msdosfs.8 projects/camlock/sbin/newfs/newfs.8 projects/camlock/sbin/newfs_msdos/newfs_msdos.8 projects/camlock/sbin/newfs_nandfs/newfs_nandfs.8 projects/camlock/sbin/recoverdisk/recoverdisk.1 projects/camlock/share/doc/Makefile projects/camlock/share/doc/psd/Makefile projects/camlock/share/man/man4/bxe.4 projects/camlock/share/man/man4/ddb.4 projects/camlock/share/man/man4/geom_linux_lvm.4 projects/camlock/share/man/man4/urtwn.4 projects/camlock/share/man/man5/ext2fs.5 projects/camlock/share/man/man5/msdosfs.5 projects/camlock/share/man/man5/reiserfs.5 projects/camlock/share/man/man5/src.conf.5 projects/camlock/share/man/man8/picobsd.8 projects/camlock/share/man/man9/lock.9 projects/camlock/share/misc/bsd-family-tree projects/camlock/share/mk/bsd.libnames.mk projects/camlock/share/mk/bsd.own.mk projects/camlock/sys/amd64/amd64/machdep.c projects/camlock/sys/amd64/amd64/pmap.c projects/camlock/sys/amd64/amd64/trap.c projects/camlock/sys/amd64/amd64/vm_machdep.c projects/camlock/sys/amd64/conf/NOTES projects/camlock/sys/amd64/include/pcpu.h projects/camlock/sys/amd64/include/pmap.h projects/camlock/sys/amd64/include/vmm.h (contents, props changed) projects/camlock/sys/amd64/include/vmm_dev.h (contents, props changed) projects/camlock/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/camlock/sys/amd64/vmm/amd/amdv.c projects/camlock/sys/amd64/vmm/intel/ept.c projects/camlock/sys/amd64/vmm/intel/ept.h projects/camlock/sys/amd64/vmm/intel/vmcs.c projects/camlock/sys/amd64/vmm/intel/vmcs.h projects/camlock/sys/amd64/vmm/intel/vmx.c projects/camlock/sys/amd64/vmm/intel/vmx.h projects/camlock/sys/amd64/vmm/intel/vmx_genassym.c projects/camlock/sys/amd64/vmm/intel/vmx_support.S projects/camlock/sys/amd64/vmm/io/ppt.c projects/camlock/sys/amd64/vmm/io/ppt.h projects/camlock/sys/amd64/vmm/vmm.c projects/camlock/sys/amd64/vmm/vmm_dev.c projects/camlock/sys/amd64/vmm/vmm_instruction_emul.c projects/camlock/sys/amd64/vmm/vmm_mem.c projects/camlock/sys/amd64/vmm/vmm_mem.h projects/camlock/sys/amd64/vmm/vmm_msr.c projects/camlock/sys/arm/samsung/exynos/exynos5_machdep.c projects/camlock/sys/boot/arm/ixp425/boot2/Makefile projects/camlock/sys/boot/common/loader.8 projects/camlock/sys/boot/i386/efi/Makefile projects/camlock/sys/boot/powerpc/boot1.chrp/Makefile projects/camlock/sys/boot/userboot/libstand/Makefile projects/camlock/sys/boot/userboot/test/Makefile projects/camlock/sys/boot/userboot/userboot/Makefile projects/camlock/sys/cam/cam.h projects/camlock/sys/cam/cam_ccb.h projects/camlock/sys/cam/cam_compat.c projects/camlock/sys/cam/cam_compat.h projects/camlock/sys/cam/cam_xpt.c projects/camlock/sys/cam/ctl/ctl_frontend_iscsi.c projects/camlock/sys/cam/scsi/scsi_pass.c projects/camlock/sys/compat/freebsd32/freebsd32.h projects/camlock/sys/compat/linux/linux_futex.c projects/camlock/sys/compat/linux/linux_uid16.c projects/camlock/sys/conf/files projects/camlock/sys/conf/files.powerpc projects/camlock/sys/conf/newvers.sh projects/camlock/sys/contrib/rdma/ib_umem.h projects/camlock/sys/dev/adb/adb_mouse.c projects/camlock/sys/dev/asr/asr.c projects/camlock/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c projects/camlock/sys/dev/e1000/if_igb.c projects/camlock/sys/dev/firewire/sbp.c projects/camlock/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/camlock/sys/dev/hpt27xx/os_bsd.h projects/camlock/sys/dev/hptiop/hptiop.c projects/camlock/sys/dev/hptiop/hptiop.h projects/camlock/sys/dev/hptmv/entry.c projects/camlock/sys/dev/hptmv/osbsd.h projects/camlock/sys/dev/hptnr/hptnr_osm_bsd.c projects/camlock/sys/dev/hptnr/os_bsd.h projects/camlock/sys/dev/hptrr/hptrr_osm_bsd.c projects/camlock/sys/dev/hptrr/os_bsd.h projects/camlock/sys/dev/hyperv/vmbus/hv_hv.c projects/camlock/sys/dev/iir/iir.c projects/camlock/sys/dev/iir/iir.h projects/camlock/sys/dev/iscsi/icl.c projects/camlock/sys/dev/iscsi/iscsi.c projects/camlock/sys/dev/iscsi_initiator/iscsi.c projects/camlock/sys/dev/ixgbe/ixgbe.c projects/camlock/sys/dev/mfi/mfi_pci.c projects/camlock/sys/dev/nfe/if_nfe.c projects/camlock/sys/dev/tws/tws.c projects/camlock/sys/dev/tws/tws_cam.c projects/camlock/sys/dev/virtio/network/if_vtnet.c projects/camlock/sys/dev/xen/timer/timer.c projects/camlock/sys/fs/cd9660/cd9660_vfsops.c projects/camlock/sys/geom/geom_int.h projects/camlock/sys/geom/geom_kern.c projects/camlock/sys/geom/geom_subr.c projects/camlock/sys/i386/conf/NOTES projects/camlock/sys/i386/include/pcpu.h projects/camlock/sys/i386/xen/mp_machdep.c projects/camlock/sys/i386/xen/mptable.c projects/camlock/sys/kern/kern_descrip.c projects/camlock/sys/kern/kern_event.c projects/camlock/sys/kern/kern_lock.c projects/camlock/sys/kern/kern_malloc.c projects/camlock/sys/kern/kern_timeout.c projects/camlock/sys/kern/vfs_bio.c projects/camlock/sys/kern/vfs_mount.c projects/camlock/sys/kern/vfs_subr.c projects/camlock/sys/libkern/arm/aeabi_unwind.c projects/camlock/sys/libkern/ashldi3.c projects/camlock/sys/mips/conf/MALTA projects/camlock/sys/mips/mips/tlb.c projects/camlock/sys/mips/nlm/dev/sec/nlmrsa.c projects/camlock/sys/mips/nlm/dev/sec/nlmrsalib.h projects/camlock/sys/modules/Makefile projects/camlock/sys/modules/hyperv/netvsc/Makefile projects/camlock/sys/modules/hyperv/stordisengage/Makefile projects/camlock/sys/modules/hyperv/storvsc/Makefile projects/camlock/sys/modules/hyperv/utilities/Makefile projects/camlock/sys/modules/hyperv/vmbus/Makefile projects/camlock/sys/modules/mlx4/Makefile projects/camlock/sys/modules/mlx4ib/Makefile projects/camlock/sys/modules/sfxge/Makefile projects/camlock/sys/net/if_enc.c projects/camlock/sys/net/if_tap.c projects/camlock/sys/net/if_tun.c projects/camlock/sys/netinet/in_kdtrace.c projects/camlock/sys/netinet6/ip6_mroute.c projects/camlock/sys/netpfil/ipfw/ip_fw_log.c projects/camlock/sys/ofed/drivers/infiniband/core/addr.c projects/camlock/sys/ofed/drivers/infiniband/core/cma.c projects/camlock/sys/ofed/drivers/infiniband/core/core_priv.h projects/camlock/sys/ofed/drivers/infiniband/core/device.c projects/camlock/sys/ofed/drivers/infiniband/core/sa_query.c projects/camlock/sys/ofed/drivers/infiniband/core/sysfs.c projects/camlock/sys/ofed/drivers/infiniband/core/umem.c projects/camlock/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/camlock/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/camlock/sys/ofed/drivers/infiniband/core/verbs.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/Kconfig projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/Makefile projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/ah.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/cq.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/mad.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/mr.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/qp.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/srq.c projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/user.h projects/camlock/sys/ofed/drivers/infiniband/hw/mlx4/wc.c projects/camlock/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c projects/camlock/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/camlock/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c projects/camlock/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c projects/camlock/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/camlock/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/camlock/sys/ofed/drivers/net/mlx4/Makefile projects/camlock/sys/ofed/drivers/net/mlx4/alloc.c projects/camlock/sys/ofed/drivers/net/mlx4/catas.c projects/camlock/sys/ofed/drivers/net/mlx4/cmd.c projects/camlock/sys/ofed/drivers/net/mlx4/cq.c projects/camlock/sys/ofed/drivers/net/mlx4/en_cq.c projects/camlock/sys/ofed/drivers/net/mlx4/en_main.c projects/camlock/sys/ofed/drivers/net/mlx4/en_netdev.c projects/camlock/sys/ofed/drivers/net/mlx4/en_port.c projects/camlock/sys/ofed/drivers/net/mlx4/en_port.h projects/camlock/sys/ofed/drivers/net/mlx4/en_rx.c projects/camlock/sys/ofed/drivers/net/mlx4/en_tx.c projects/camlock/sys/ofed/drivers/net/mlx4/eq.c projects/camlock/sys/ofed/drivers/net/mlx4/fw.c projects/camlock/sys/ofed/drivers/net/mlx4/fw.h projects/camlock/sys/ofed/drivers/net/mlx4/icm.c projects/camlock/sys/ofed/drivers/net/mlx4/icm.h projects/camlock/sys/ofed/drivers/net/mlx4/intf.c projects/camlock/sys/ofed/drivers/net/mlx4/main.c projects/camlock/sys/ofed/drivers/net/mlx4/mcg.c projects/camlock/sys/ofed/drivers/net/mlx4/mlx4.h projects/camlock/sys/ofed/drivers/net/mlx4/mlx4_en.h projects/camlock/sys/ofed/drivers/net/mlx4/mr.c projects/camlock/sys/ofed/drivers/net/mlx4/pd.c projects/camlock/sys/ofed/drivers/net/mlx4/port.c projects/camlock/sys/ofed/drivers/net/mlx4/profile.c projects/camlock/sys/ofed/drivers/net/mlx4/qp.c projects/camlock/sys/ofed/drivers/net/mlx4/reset.c projects/camlock/sys/ofed/drivers/net/mlx4/sense.c projects/camlock/sys/ofed/drivers/net/mlx4/srq.c projects/camlock/sys/ofed/include/asm/atomic.h projects/camlock/sys/ofed/include/asm/byteorder.h projects/camlock/sys/ofed/include/linux/bitops.h projects/camlock/sys/ofed/include/linux/compat.h projects/camlock/sys/ofed/include/linux/device.h projects/camlock/sys/ofed/include/linux/dma-mapping.h projects/camlock/sys/ofed/include/linux/gfp.h projects/camlock/sys/ofed/include/linux/idr.h projects/camlock/sys/ofed/include/linux/if_ether.h projects/camlock/sys/ofed/include/linux/in6.h projects/camlock/sys/ofed/include/linux/kernel.h projects/camlock/sys/ofed/include/linux/linux_compat.c projects/camlock/sys/ofed/include/linux/list.h projects/camlock/sys/ofed/include/linux/log2.h projects/camlock/sys/ofed/include/linux/mlx4/cmd.h projects/camlock/sys/ofed/include/linux/mlx4/cq.h projects/camlock/sys/ofed/include/linux/mlx4/device.h projects/camlock/sys/ofed/include/linux/mlx4/driver.h projects/camlock/sys/ofed/include/linux/mlx4/qp.h projects/camlock/sys/ofed/include/linux/mlx4/srq.h projects/camlock/sys/ofed/include/linux/moduleparam.h projects/camlock/sys/ofed/include/linux/pci.h projects/camlock/sys/ofed/include/linux/sysfs.h projects/camlock/sys/ofed/include/linux/types.h projects/camlock/sys/ofed/include/linux/workqueue.h projects/camlock/sys/ofed/include/rdma/ib_cm.h projects/camlock/sys/ofed/include/rdma/ib_mad.h projects/camlock/sys/ofed/include/rdma/ib_sa.h projects/camlock/sys/ofed/include/rdma/ib_umem.h projects/camlock/sys/ofed/include/rdma/ib_user_verbs.h projects/camlock/sys/ofed/include/rdma/ib_verbs.h projects/camlock/sys/powerpc/include/ofw_machdep.h projects/camlock/sys/powerpc/include/proc.h projects/camlock/sys/powerpc/ofw/ofw_machdep.c projects/camlock/sys/powerpc/ofw/ofw_syscons.c projects/camlock/sys/powerpc/ofw/ofw_syscons.h projects/camlock/sys/powerpc/powermac/platform_powermac.c projects/camlock/sys/powerpc/powerpc/mmu_if.m projects/camlock/sys/powerpc/ps3/ps3cdrom.c projects/camlock/sys/powerpc/pseries/mmu_phyp.c projects/camlock/sys/powerpc/pseries/phyp_console.c projects/camlock/sys/powerpc/pseries/platform_chrp.c projects/camlock/sys/powerpc/pseries/vdevice.c projects/camlock/sys/security/mac/mac_framework.c projects/camlock/sys/security/mac/mac_internal.h projects/camlock/sys/security/mac/mac_posix_shm.c projects/camlock/sys/security/mac/mac_vfs.c projects/camlock/sys/sparc64/include/proc.h projects/camlock/sys/sys/elf_common.h projects/camlock/sys/sys/lockmgr.h projects/camlock/sys/x86/acpica/madt.c projects/camlock/sys/x86/include/stdarg.h projects/camlock/sys/x86/xen/hvm.c projects/camlock/sys/x86/xen/xen_intr.c projects/camlock/tools/build/mk/OptionalObsoleteFiles.inc projects/camlock/tools/build/options/WITHOUT_BINUTILS projects/camlock/tools/build/options/makeman projects/camlock/usr.bin/Makefile projects/camlock/usr.bin/calendar/calendar.1 projects/camlock/usr.bin/calendar/calendars/calendar.dutch projects/camlock/usr.bin/host/Makefile projects/camlock/usr.bin/kdump/kdump.c projects/camlock/usr.bin/patch/patch.c projects/camlock/usr.bin/patch/util.c projects/camlock/usr.bin/svn/lib/libapr/apr_private.h projects/camlock/usr.bin/svn/svn_private_config.h projects/camlock/usr.sbin/Makefile projects/camlock/usr.sbin/bhyve/Makefile projects/camlock/usr.sbin/bhyve/bhyverun.c projects/camlock/usr.sbin/bhyve/bhyverun.h projects/camlock/usr.sbin/bhyve/pci_emul.c projects/camlock/usr.sbin/bhyve/pci_virtio_block.c projects/camlock/usr.sbin/bhyve/pit_8254.c projects/camlock/usr.sbin/bhyve/rtc.c projects/camlock/usr.sbin/bhyvectl/bhyvectl.c projects/camlock/usr.sbin/bhyveload/bhyveload.c projects/camlock/usr.sbin/boot0cfg/boot0cfg.8 projects/camlock/usr.sbin/bsdconfig/share/media/ftp.subr projects/camlock/usr.sbin/bsdinstall/scripts/mirrorselect projects/camlock/usr.sbin/kldxref/kldxref.c projects/camlock/usr.sbin/ntp/config.h projects/camlock/usr.sbin/ntp/libparse/Makefile Directory Properties: projects/camlock/ (props changed) projects/camlock/cddl/ (props changed) projects/camlock/cddl/contrib/opensolaris/ (props changed) projects/camlock/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/camlock/contrib/binutils/ (props changed) projects/camlock/contrib/bmake/ (props changed) projects/camlock/contrib/dialog/ (props changed) projects/camlock/contrib/libc++/ (props changed) projects/camlock/contrib/llvm/ (props changed) projects/camlock/contrib/llvm/tools/clang/ (props changed) projects/camlock/contrib/unbound/ (props changed) projects/camlock/gnu/lib/ (props changed) projects/camlock/gnu/usr.bin/binutils/ (props changed) projects/camlock/lib/libc/ (props changed) projects/camlock/lib/libvmmapi/ (props changed) projects/camlock/sbin/ (props changed) projects/camlock/share/man/man4/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/amd64/vmm/ (props changed) projects/camlock/sys/boot/ (props changed) projects/camlock/sys/boot/i386/efi/ (props changed) projects/camlock/sys/boot/powerpc/boot1.chrp/ (props changed) projects/camlock/sys/conf/ (props changed) projects/camlock/sys/dev/hyperv/ (props changed) projects/camlock/sys/modules/hyperv/ (props changed) projects/camlock/usr.bin/calendar/ (props changed) projects/camlock/usr.sbin/bhyve/ (props changed) projects/camlock/usr.sbin/bhyvectl/ (props changed) projects/camlock/usr.sbin/bhyveload/ (props changed) Modified: projects/camlock/Makefile.inc1 ============================================================================== --- projects/camlock/Makefile.inc1 Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/Makefile.inc1 Mon Oct 7 15:28:08 2013 (r256111) @@ -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: @@ -1740,7 +1738,7 @@ check-old-libs: delete-old-dirs: @echo ">>> Removing old directories" @${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ - -V OLD_DIRS | xargs -n1 | \ + -V OLD_DIRS | xargs -n1 | sort -r | \ while read dir; do \ if [ -d "${DESTDIR}/$${dir}" ]; then \ rmdir -v "${DESTDIR}/$${dir}" || true; \ Modified: projects/camlock/ObsoleteFiles.inc ============================================================================== --- projects/camlock/ObsoleteFiles.inc Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/ObsoleteFiles.inc Mon Oct 7 15:28:08 2013 (r256111) @@ -38,6 +38,263 @@ # xargs -n1 | sort | uniq -d; # done +# 20131015: removal of RCS from base +OLD_FILES+=usr/bin/ci +OLD_FILES+=usr/bin/co +OLD_FILES+=usr/bin/ident +OLD_FILES+=usr/bin/merge +OLD_FILES+=usr/bin/rcs +OLD_FILES+=usr/bin/rcsclean +OLD_FILES+=usr/bin/rcsdiff +OLD_FILES+=usr/bin/rcsfreeze +OLD_FILES+=usr/bin/rcsmerge +OLD_FILES+=usr/bin/rlog +OLD_FILES+=usr/share/man/man1/ci.1.gz +OLD_FILES+=usr/share/man/man1/co.1.gz +OLD_FILES+=usr/share/man/man1/ident.1.gz +OLD_FILES+=usr/share/man/man1/merge.1.gz +OLD_FILES+=usr/share/man/man1/rcs.1.gz +OLD_FILES+=usr/share/man/man1/rcsclean.1.gz +OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz +OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz +OLD_FILES+=usr/share/man/man1/rcsintro.1.gz +OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz +OLD_FILES+=usr/share/man/man1/rlog.1.gz +OLD_FILES+=usr/share/man/man5/rcsfile.5.gz +# 20131001: ar and ranlib from binutils not used +OLD_FILES+=usr/bin/gnu-ar +OLD_FILES+=usr/bin/gnu-ranlib +OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz +OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz +# 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/camlock/UPDATING ============================================================================== --- projects/camlock/UPDATING Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/UPDATING Mon Oct 7 15:28:08 2013 (r256111) @@ -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/camlock/bin/dd/dd.1 ============================================================================== --- projects/camlock/bin/dd/dd.1 Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/bin/dd/dd.1 Mon Oct 7 15:28:08 2013 (r256111) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd October 1, 2013 .Dt DD 1 .Os .Sh NAME @@ -378,12 +378,12 @@ will exit. .Sh EXAMPLES Check that a disk drive contains no bad blocks: .Pp -.Dl "dd if=/dev/ad0 of=/dev/null bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/null bs=1m" .Pp Do a refresh of a disk drive, in order to prevent presently recoverable read errors from progressing into unrecoverable read errors: .Pp -.Dl "dd if=/dev/ad0 of=/dev/ad0 bs=1m" +.Dl "dd if=/dev/ada0 of=/dev/ada0 bs=1m" .Pp Remove parity bit from a file: .Pp Modified: projects/camlock/bin/pkill/pkill.c ============================================================================== --- projects/camlock/bin/pkill/pkill.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/bin/pkill/pkill.c Mon Oct 7 15:28:08 2013 (r256111) @@ -481,7 +481,6 @@ main(int argc, char **argv) * We skip P_SYSTEM processes to match ps(1) output. */ if ((kp->ki_flag & P_SYSTEM) == 0 && - kp->ki_loginclass != NULL && strcmp(kp->ki_loginclass, li->li_name) == 0) break; } Modified: projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Oct 7 15:28:08 2013 (r256111) @@ -58,6 +58,7 @@ #include <sys/types.h> #include <time.h> #include <err.h> +#include <jail.h> #include <libzfs.h> #include <libzfs_core.h> Modified: projects/camlock/cddl/lib/libdtrace/tcp.d ============================================================================== --- projects/camlock/cddl/lib/libdtrace/tcp.d Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/cddl/lib/libdtrace/tcp.d Mon Oct 7 15:28:08 2013 (r256111) @@ -141,6 +141,25 @@ typedef struct tcpinfo { struct tcphdr *tcp_hdr; /* raw TCP header */ } tcpinfo_t; +/* + * A clone of tcpinfo_t used to handle the fact that the TCP input path + * overwrites some fields of the TCP header with their host-order equivalents. + * Unfortunately, DTrace doesn't let us simply typedef a new name for struct + * tcpinfo and define a separate translator for it. + */ +typedef struct tcpinfoh { + uint16_t tcp_sport; /* source port */ + uint16_t tcp_dport; /* destination port */ + uint32_t tcp_seq; /* sequence number */ + uint32_t tcp_ack; /* acknowledgment number */ + uint8_t tcp_offset; /* data offset, in bytes */ + uint8_t tcp_flags; /* flags */ + uint16_t tcp_window; /* window size */ + uint16_t tcp_checksum; /* checksum */ + uint16_t tcp_urgent; /* urgent data pointer */ + struct tcphdr *tcp_hdr; /* raw TCP header */ +} tcpinfoh_t; + #pragma D binding "1.0" translator translator csinfo_t < struct tcpcb *p > { cs_addr = NULL; @@ -180,7 +199,7 @@ translator tcpsinfo_t < struct tcpcb *p tcps_sack_snxt = p == NULL ? 0 : p->sack_newdata; tcps_rto = p == NULL ? -1 : p->t_rxtcur / 1000; /* XXX */ tcps_mss = p == NULL ? -1 : p->t_maxseg; - tcps_retransmit = -1; /* XXX */ + tcps_retransmit = p == NULL ? -1 : p->t_rxtshift > 0 ? 1 : 0; }; #pragma D binding "1.0" translator @@ -197,6 +216,25 @@ translator tcpinfo_t < struct tcphdr *p tcp_hdr = (struct tcphdr *)p; }; +/* + * This translator differs from the one for tcpinfo_t in that the sequence + * number, acknowledgement number, window size and urgent pointer are already + * in host order and thus don't need to be converted. + */ +#pragma D binding "1.0" translator +translator tcpinfoh_t < struct tcphdr *p > { + tcp_sport = p == NULL ? 0 : ntohs(p->th_sport); + tcp_dport = p == NULL ? 0 : ntohs(p->th_dport); + tcp_seq = p == NULL ? -1 : p->th_seq; + tcp_ack = p == NULL ? -1 : p->th_ack; + tcp_offset = p == NULL ? -1 : (p->th_off >> 2); + tcp_flags = p == NULL ? 0 : p->th_flags; + tcp_window = p == NULL ? 0 : (p->th_win); + tcp_checksum = p == NULL ? 0 : ntohs(p->th_sum); + tcp_urgent = p == NULL ? 0 : p->th_urp; + tcp_hdr = (struct tcphdr *)p; +}; + #pragma D binding "1.0" translator translator tcplsinfo_t < int s > { tcps_state = s; Modified: projects/camlock/contrib/binutils/bfd/elflink.c ============================================================================== --- projects/camlock/contrib/binutils/bfd/elflink.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/binutils/bfd/elflink.c Mon Oct 7 15:28:08 2013 (r256111) @@ -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/camlock/contrib/binutils/bfd/elfxx-mips.c ============================================================================== --- projects/camlock/contrib/binutils/bfd/elfxx-mips.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/binutils/bfd/elfxx-mips.c Mon Oct 7 15:28:08 2013 (r256111) @@ -557,6 +557,10 @@ static bfd *reldyn_sorting_bfd; #define MIPS_ELF_DYN_SIZE(abfd) \ (get_elf_backend_data (abfd)->s->sizeof_dyn) +/* The size of the rld_map pointer. */ +#define MIPS_ELF_RLD_MAP_SIZE(abfd) \ + (get_elf_backend_data (abfd)->s->arch_size / 8) + /* The size of a GOT entry. */ #define MIPS_ELF_GOT_SIZE(abfd) \ (get_elf_backend_data (abfd)->s->arch_size / 8) @@ -7492,7 +7496,7 @@ _bfd_mips_elf_size_dynamic_sections (bfd { /* We add a room for __rld_map. It will be filled in by the rtld to contain a pointer to the _r_debug structure. */ - s->size += 4; + s->size += MIPS_ELF_RLD_MAP_SIZE (output_bfd); } else if (SGI_COMPAT (output_bfd) && CONST_STRNEQ (name, ".compact_rel")) Modified: projects/camlock/contrib/binutils/binutils/readelf.c ============================================================================== --- projects/camlock/contrib/binutils/binutils/readelf.c Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/binutils/binutils/readelf.c Mon Oct 7 15:28:08 2013 (r256111) @@ -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/camlock/contrib/binutils/include/elf/common.h ============================================================================== --- projects/camlock/contrib/binutils/include/elf/common.h Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/binutils/include/elf/common.h Mon Oct 7 15:28:08 2013 (r256111) @@ -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/camlock/contrib/bmake/make.1 ============================================================================== --- projects/camlock/contrib/bmake/make.1 Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/bmake/make.1 Mon Oct 7 15:28:08 2013 (r256111) @@ -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/camlock/contrib/dialog/CHANGES ============================================================================== --- projects/camlock/contrib/dialog/CHANGES Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/dialog/CHANGES Mon Oct 7 15:28:08 2013 (r256111) @@ -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@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/camlock/contrib/dialog/VERSION ============================================================================== --- projects/camlock/contrib/dialog/VERSION Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/dialog/VERSION Mon Oct 7 15:28:08 2013 (r256111) @@ -1 +1 @@ -11:1:0 1.2 20130523 +11:1:0 1.2 20130923 Modified: projects/camlock/contrib/dialog/aclocal.m4 ============================================================================== --- projects/camlock/contrib/dialog/aclocal.m4 Mon Oct 7 14:22:19 2013 (r256110) +++ projects/camlock/contrib/dialog/aclocal.m4 Mon Oct 7 15:28:08 2013 (r256111) @@ -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 + ;; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310071528.r97FSACB083179>