Page MenuHomeFreeBSD
Files F134670378

D15648.id43895.diff
No OneTemporary
Actions

D15648.id43895.diff
View Options

Index: head/Makefile.inc1
===================================================================
--- head/Makefile.inc1
+++ head/Makefile.inc1
@@ -274,9 +274,6 @@
.if ${MK_TESTS} != "no"
SUBDIR+= tests
.endif
-.if ${MK_OFED} != "no"
-SUBDIR+=contrib/ofed
-.endif
# Local directories are built in parallel with the base system directories.
# Users may insert a .WAIT directive at the beginning or elsewhere within
@@ -2462,24 +2459,16 @@
.endif
.if ${MK_OFED} != "no"
-#
-# The OFED libraries are built in four steps
-# as reflected below, due to interdependencies.
-#
-# NOTE: Depending on contrib/ofed/include is only needed for
-# the lib32 compat build.
-#
-_ofed_lib= \
-contrib/ofed/include \
-contrib/ofed/usr.lib/0 \
-contrib/ofed/usr.lib/1 \
-contrib/ofed/usr.lib/2 \
-contrib/ofed/usr.lib/3
+_prebuild_libs+= \
+ lib/ofed/libibverbs \
+ lib/ofed/libibmad \
+ lib/ofed/libibumad \
+ lib/ofed/complib \
+ lib/ofed/libmlx5
-contrib/ofed/usr.lib/0__L: contrib/ofed/include__L lib/libthr__L
-contrib/ofed/usr.lib/1__L: contrib/ofed/usr.lib/0__L
-contrib/ofed/usr.lib/2__L: contrib/ofed/usr.lib/1__L
-contrib/ofed/usr.lib/3__L: contrib/ofed/usr.lib/2__L
+lib/ofed/libibmad__L: lib/ofed/libibumad__L
+lib/ofed/complib__L: lib/libthr__L
+lib/ofed/libmlx5__L: lib/ofed/libibverbs__L lib/libthr__L
.endif
.if ${MK_CASPER} != "no"
@@ -2490,7 +2479,7 @@
lib/libcasper__L: lib/libnv__L
lib/liblzma__L: lib/libthr__L
-_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
.if ${MK_IPFILTER} != "no"
_generic_libs+= sbin/ipf/libipf
.endif
Index: head/contrib/ofed/Makefile
===================================================================
--- head/contrib/ofed/Makefile
+++ head/contrib/ofed/Makefile
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-# NOTE: Make sure WITH_OFED=YES is set when building this top-level directory.
-
-SUBDIR= \
-include \
-usr.lib \
-usr.bin
-
-.include <bsd.subdir.mk>
Index: head/contrib/ofed/include/Makefile
===================================================================
--- head/contrib/ofed/include/Makefile
+++ head/contrib/ofed/include/Makefile
@@ -1,191 +0,0 @@
-# $FreeBSD$
-
-IBVERBS= ${.CURDIR}/../libibverbs
-IBMAD= ${.CURDIR}/../libibmad
-IBUMAD= ${.CURDIR}/../libibumad
-IBCM= ${.CURDIR}/../libibcm
-IBND= ${.CURDIR}/../libibnetdisc
-RDMACM= ${.CURDIR}/../librdmacm
-RDMA= ${.CURDIR}/../../../sys/ofed/include/uapi/rdma
-OSM= ${.CURDIR}/../opensm/include
-
-IBINCS= \
-byteorder.h \
-byteswap.h \
-endian.h \
-types.h \
-udma_barrier.h \
-${IBVERBS}/arch.h \
-${IBVERBS}/driver.h \
-${IBVERBS}/kern-abi.h \
-${IBVERBS}/marshall.h \
-${IBVERBS}/opcode.h \
-${IBVERBS}/sa-kern-abi.h \
-${IBVERBS}/sa.h \
-${IBVERBS}/verbs.h \
-${IBUMAD}/umad.h \
-${IBUMAD}/umad_cm.h \
-${IBUMAD}/umad_sa.h \
-${IBUMAD}/umad_sm.h \
-${IBUMAD}/umad_str.h \
-${IBUMAD}/umad_types.h \
-${IBMAD}/mad.h \
-${IBMAD}/mad_osd.h \
-${IBCM}/cm.h \
-${IBCM}/cm_abi.h \
-${IBND}/ibnetdisc.h \
-${IBND}/ibnetdisc_osd.h \
-${RDMACM}/ib.h
-IBINCSDIR= ${INCLUDEDIR}/infiniband
-
-RDMAINCS= \
-${RDMACM}/rdma_cma.h \
-${RDMACM}/rdma_cma_abi.h \
-${RDMACM}/rdma_verbs.h \
-${RDMACM}/rsocket.h \
-${RDMA}/ib_user_cm.h \
-${RDMA}/ib_user_sa.h \
-${RDMA}/ib_user_verbs.h \
-${RDMA}/rdma_user_cm.h \
-${RDMA}/mlx4-abi.h \
-${RDMA}/mlx5-abi.h
-RDMAINCSDIR= ${INCLUDEDIR}/rdma
-
-COMPINCS= \
-${OSM}/complib/cl_atomic.h \
-${OSM}/complib/cl_atomic_osd.h \
-${OSM}/complib/cl_byteswap.h \
-${OSM}/complib/cl_byteswap_osd.h \
-${OSM}/complib/cl_comppool.h \
-${OSM}/complib/cl_debug.h \
-${OSM}/complib/cl_debug_osd.h \
-${OSM}/complib/cl_dispatcher.h \
-${OSM}/complib/cl_event.h \
-${OSM}/complib/cl_event_osd.h \
-${OSM}/complib/cl_event_wheel.h \
-${OSM}/complib/cl_fleximap.h \
-${OSM}/complib/cl_list.h \
-${OSM}/complib/cl_log.h \
-${OSM}/complib/cl_map.h \
-${OSM}/complib/cl_math.h \
-${OSM}/complib/cl_nodenamemap.h \
-${OSM}/complib/cl_packoff.h \
-${OSM}/complib/cl_packon.h \
-${OSM}/complib/cl_passivelock.h \
-${OSM}/complib/cl_pool.h \
-${OSM}/complib/cl_ptr_vector.h \
-${OSM}/complib/cl_qcomppool.h \
-${OSM}/complib/cl_qlist.h \
-${OSM}/complib/cl_qmap.h \
-${OSM}/complib/cl_qpool.h \
-${OSM}/complib/cl_spinlock.h \
-${OSM}/complib/cl_spinlock_osd.h \
-${OSM}/complib/cl_thread.h \
-${OSM}/complib/cl_thread_osd.h \
-${OSM}/complib/cl_threadpool.h \
-${OSM}/complib/cl_timer.h \
-${OSM}/complib/cl_timer_osd.h \
-${OSM}/complib/cl_types.h \
-${OSM}/complib/cl_types_osd.h \
-${OSM}/complib/cl_vector.h
-COMPINCSDIR= ${INCLUDEDIR}/infiniband/complib
-
-OSMINCS= \
-${OSM}/opensm/osm_attrib_req.h \
-${OSM}/opensm/osm_base.h \
-${OSM}/opensm/osm_config.h \
-${OSM}/opensm/osm_congestion_control.h \
-${OSM}/opensm/osm_console.h \
-${OSM}/opensm/osm_console_io.h \
-${OSM}/opensm/osm_db.h \
-${OSM}/opensm/osm_db_pack.h \
-${OSM}/opensm/osm_errors.h \
-${OSM}/opensm/osm_event_plugin.h \
-${OSM}/opensm/osm_file_ids.h \
-${OSM}/opensm/osm_guid.h \
-${OSM}/opensm/osm_helper.h \
-${OSM}/opensm/osm_inform.h \
-${OSM}/opensm/osm_lid_mgr.h \
-${OSM}/opensm/osm_log.h \
-${OSM}/opensm/osm_mad_pool.h \
-${OSM}/opensm/osm_madw.h \
-${OSM}/opensm/osm_mcast_mgr.h \
-${OSM}/opensm/osm_mcast_tbl.h \
-${OSM}/opensm/osm_mcm_port.h \
-${OSM}/opensm/osm_mesh.h \
-${OSM}/opensm/osm_msgdef.h \
-${OSM}/opensm/osm_mtree.h \
-${OSM}/opensm/osm_multicast.h \
-${OSM}/opensm/osm_node.h \
-${OSM}/opensm/osm_opensm.h \
-${OSM}/opensm/osm_partition.h \
-${OSM}/opensm/osm_path.h \
-${OSM}/opensm/osm_perfmgr.h \
-${OSM}/opensm/osm_perfmgr_db.h \
-${OSM}/opensm/osm_pkey.h \
-${OSM}/opensm/osm_port.h \
-${OSM}/opensm/osm_port_profile.h \
-${OSM}/opensm/osm_prefix_route.h \
-${OSM}/opensm/osm_qos_policy.h \
-${OSM}/opensm/osm_remote_sm.h \
-${OSM}/opensm/osm_router.h \
-${OSM}/opensm/osm_sa.h \
-${OSM}/opensm/osm_sa_mad_ctrl.h \
-${OSM}/opensm/osm_service.h \
-${OSM}/opensm/osm_sm.h \
-${OSM}/opensm/osm_sm_mad_ctrl.h \
-${OSM}/opensm/osm_stats.h \
-${OSM}/opensm/osm_subnet.h \
-${OSM}/opensm/osm_switch.h \
-${OSM}/opensm/osm_ucast_cache.h \
-${OSM}/opensm/osm_ucast_lash.h \
-${OSM}/opensm/osm_ucast_mgr.h \
-${OSM}/opensm/osm_version.h \
-${OSM}/opensm/osm_vl15intf.h \
-${OSM}/opensm/st.h
-OSMINCSDIR= ${INCLUDEDIR}/infiniband/opensm
-
-IBAINCS= \
-${OSM}/iba/ib_cm_types.h \
-${OSM}/iba/ib_types.h
-IBAINCSDIR= ${INCLUDEDIR}/infiniband/iba
-
-VENDORINCS= \
-${OSM}/vendor/osm_mtl_bind.h \
-${OSM}/vendor/osm_pkt_randomizer.h \
-${OSM}/vendor/osm_ts_useraccess.h \
-${OSM}/vendor/osm_umadt.h \
-${OSM}/vendor/osm_vendor.h \
-${OSM}/vendor/osm_vendor_al.h \
-${OSM}/vendor/osm_vendor_api.h \
-${OSM}/vendor/osm_vendor_ibumad.h \
-${OSM}/vendor/osm_vendor_mlx.h \
-${OSM}/vendor/osm_vendor_mlx_defs.h \
-${OSM}/vendor/osm_vendor_mlx_dispatcher.h \
-${OSM}/vendor/osm_vendor_mlx_hca.h \
-${OSM}/vendor/osm_vendor_mlx_inout.h \
-${OSM}/vendor/osm_vendor_mlx_rmpp_ctx.h \
-${OSM}/vendor/osm_vendor_mlx_sar.h \
-${OSM}/vendor/osm_vendor_mlx_sender.h \
-${OSM}/vendor/osm_vendor_mlx_svc.h \
-${OSM}/vendor/osm_vendor_mlx_transport.h \
-${OSM}/vendor/osm_vendor_mlx_transport_anafa.h \
-${OSM}/vendor/osm_vendor_mlx_txn.h \
-${OSM}/vendor/osm_vendor_mtl.h \
-${OSM}/vendor/osm_vendor_mtl_hca_guid.h \
-${OSM}/vendor/osm_vendor_mtl_transaction_mgr.h \
-${OSM}/vendor/osm_vendor_sa_api.h \
-${OSM}/vendor/osm_vendor_test.h \
-${OSM}/vendor/osm_vendor_ts.h \
-${OSM}/vendor/osm_vendor_umadt.h
-VENDORINCSDIR= ${INCLUDEDIR}/infiniband/vendor
-
-INCSGROUPS= \
-IBINCS \
-RDMAINCS \
-COMPINCS \
-OSMINCS \
-IBAINCS \
-VENDORINCS
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/Makefile
+++ head/contrib/ofed/infiniband-diags/build/Makefile
@@ -1,29 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= \
-dump_fts \
-ibaddr \
-ibcacheedit \
-ibccconfig \
-ibccquery \
-iblinkinfo \
-ibmirror \
-ibnetdiscover \
-ibping \
-ibportstate \
-ibqueryerrors \
-ibroute \
-ibstat \
-ibsysstat \
-ibtracert \
-perfquery \
-saquery \
-sminfo \
-smpdump \
-smpquery \
-vendstat
-
-SUBDIR_PARALLEL=
-
-.include <bsd.subdir.mk>
-
Index: head/contrib/ofed/infiniband-diags/build/Makefile.inc
===================================================================
--- head/contrib/ofed/infiniband-diags/build/Makefile.inc
+++ head/contrib/ofed/infiniband-diags/build/Makefile.inc
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../src ${.CURDIR}/../../man
-
-BINDIR?= /usr/bin
-SRCS+= ibdiag_common.c ibdiag_sa.c
-CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
-CFLAGS+= -DHAVE_CONFIG_H=1
-CFLAGS+= -I${.CURDIR}/../../
-CFLAGS+= -I${.CURDIR}/../../src
-LIBADD+= osmcomp ibmad ibumad
-
Index: head/contrib/ofed/infiniband-diags/build/dump_fts/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/dump_fts/Makefile
+++ head/contrib/ofed/infiniband-diags/build/dump_fts/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG= dump_fts
-SRCS= dump_fts.c
-LIBADD= ibnetdisc
-MAN= dump_fts.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibaddr/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibaddr/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibaddr/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibaddr
-SRCS= ibaddr.c
-MAN= ibaddr.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG= ibcacheedit
-SRCS= ibcacheedit.c
-LIBADD= ibnetdisc
-MAN= ibcacheedit.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibccconfig/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibccconfig/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibccconfig/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibccconfig
-SRCS= ibccconfig.c
-MAN= ibccconfig.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibccquery/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibccquery/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibccquery/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibccquery
-SRCS= ibccquery.c
-MAN= ibccquery.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile
+++ head/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG= iblinkinfo
-SRCS= iblinkinfo.c
-LIBADD= ibnetdisc
-MAN= iblinkinfo.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibmirror/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibmirror/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibmirror/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibmirror
-SRCS= ibmirror.c
-MAN=
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG= ibnetdiscover
-SRCS= ibnetdiscover.c
-LIBADD= ibnetdisc
-MAN= ibnetdiscover.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibping/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibping/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibping/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibping
-SRCS= ibping.c
-MAN= ibping.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibportstate/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibportstate/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibportstate/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibportstate
-SRCS= ibportstate.c
-MAN= ibportstate.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-PROG= ibqueryerrors
-SRCS= ibqueryerrors.c
-LIBADD= ibnetdisc
-MAN= ibqueryerrors.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibroute/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibroute/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibroute/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibroute
-SRCS= ibroute.c
-MAN= ibroute.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibstat/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibstat/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibstat/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibstat
-SRCS= ibstat.c
-MAN= ibstat.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibsysstat/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibsysstat/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibsysstat/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibsysstat
-SRCS= ibsysstat.c
-MAN= ibsysstat.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/ibtracert/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/ibtracert/Makefile
+++ head/contrib/ofed/infiniband-diags/build/ibtracert/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= ibtracert
-SRCS= ibtracert.c
-MAN= ibtracert.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/perfquery/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/perfquery/Makefile
+++ head/contrib/ofed/infiniband-diags/build/perfquery/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= perfquery
-SRCS= perfquery.c
-MAN= perfquery.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/saquery/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/saquery/Makefile
+++ head/contrib/ofed/infiniband-diags/build/saquery/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= saquery
-SRCS= saquery.c
-MAN= saquery.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/sminfo/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/sminfo/Makefile
+++ head/contrib/ofed/infiniband-diags/build/sminfo/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= sminfo
-SRCS= sminfo.c
-MAN= sminfo.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/smpdump/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/smpdump/Makefile
+++ head/contrib/ofed/infiniband-diags/build/smpdump/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= smpdump
-SRCS= smpdump.c
-MAN= smpdump.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/smpquery/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/smpquery/Makefile
+++ head/contrib/ofed/infiniband-diags/build/smpquery/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= smpquery
-SRCS= smpquery.c
-MAN= smpquery.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/infiniband-diags/build/vendstat/Makefile
===================================================================
--- head/contrib/ofed/infiniband-diags/build/vendstat/Makefile
+++ head/contrib/ofed/infiniband-diags/build/vendstat/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG= vendstat
-SRCS= vendstat.c
-MAN= vendstat.8
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/libcxgb4/Makefile
===================================================================
--- head/contrib/ofed/libcxgb4/Makefile
+++ head/contrib/ofed/libcxgb4/Makefile
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}
-
-SHLIBDIR?= /usr/lib
-LIB= cxgb4
-SHLIB_MAJOR= 1
-MK_PROFILE= no
-
-SRCS= \
-cq.c \
-dev.c \
-qp.c \
-verbs.c
-
-LIBADD= ibverbs pthread
-CFLAGS+= -I${.CURDIR}
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/libibcm/Makefile
===================================================================
--- head/contrib/ofed/libibcm/Makefile
+++ head/contrib/ofed/libibcm/Makefile
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}
-
-SHLIBDIR?= /usr/lib
-LIB= ibcm
-SHLIB_MAJOR= 1
-MK_PROFILE= no
-SRCS= cm.c
-LIBADD= ibverbs
-CFLAGS+= -I${.CURDIR}
-MAN=
-VERSION_MAP= ${.CURDIR}/libibcm.map
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/libibmad/Makefile
===================================================================
--- head/contrib/ofed/libibmad/Makefile
+++ head/contrib/ofed/libibmad/Makefile
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}
-
-SHLIBDIR?= /usr/lib
-LIB= ibmad
-SHLIB_MAJOR= 5
-MK_PROFILE= no
-
-SRCS= \
-bm.c \
-cc.c \
-dump.c \
-fields.c \
-gs.c \
-mad.c \
-portid.c \
-register.c \
-resolve.c \
-rpc.c \
-sa.c \
-serv.c \
-smp.c \
-vendor.c
-
-LIBADD= ibumad
-CFLAGS+= -DHAVE_CONFIG_H=1
-CFLAGS+= -I${.CURDIR}
-VERSION_MAP= ${.CURDIR}/libibmad.map
-
-.include <bsd.lib.mk>
-
Index: head/contrib/ofed/libibnetdisc/Makefile
===================================================================
--- head/contrib/ofed/libibnetdisc/Makefile
+++ head/contrib/ofed/libibnetdisc/Makefile
@@ -1,38 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-.PATH: ${.CURDIR} ${.CURDIR}/man
-
-SHLIBDIR?= /usr/lib
-LIB_CXX= ibnetdisc
-SHLIB_MAJOR= 5
-MK_PROFILE= no
-
-SRCS= \
-chassis.c \
-g_hash_table.cpp \
-ibnetdisc.c \
-ibnetdisc_cache.c \
-query_smp.c
-
-MAN= \
-ibnd_debug.3 \
-ibnd_destroy_fabric.3 \
-ibnd_discover_fabric.3 \
-ibnd_find_node_dr.3 \
-ibnd_find_node_guid.3 \
-ibnd_iter_nodes.3 \
-ibnd_iter_nodes_type.3 \
-ibnd_show_progress.3
-
-LIBADD= osmcomp ibmad ibumad
-CFLAGS+= -DHAVE_CONFIG_H=1
-CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
-.if ${COMPILER_FEATURES:Mc++11}
-CXXFLAGS+= -std=c++11
-.endif
-VERSION_MAP= ${.CURDIR}/libibnetdisc.map
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/libibumad/Makefile
===================================================================
--- head/contrib/ofed/libibumad/Makefile
+++ head/contrib/ofed/libibumad/Makefile
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}
-
-SHLIBDIR?= /usr/lib
-LIB= ibumad
-SHLIB_MAJOR= 1
-MK_PROFILE= no
-SRCS= \
-umad.c \
-umad_str.c \
-sysfs.c
-CFLAGS+= -I${.CURDIR}
-VERSION_MAP= ${.CURDIR}/libibumad.map
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/libibverbs/Makefile
===================================================================
--- head/contrib/ofed/libibverbs/Makefile
+++ head/contrib/ofed/libibverbs/Makefile
@@ -1,75 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR} ${.CURDIR}/man
-
-LIB= ibverbs
-SHLIB_MAJOR= 1
-SHLIBDIR?= /usr/lib
-MK_PROFILE= no
-VERSION_MAP= ${.CURDIR}/libibverbs.map
-
-CFLAGS+= -I${.CURDIR}
-
-SRCS= \
-cmd.c \
-compat-1_0.c \
-device.c \
-enum_strs.c \
-init.c \
-marshall.c \
-memory.c \
-sysfs.c \
-verbs.c
-
-MAN= \
-ibv_alloc_mw.3 \
-ibv_alloc_pd.3 \
-ibv_attach_mcast.3 \
-ibv_bind_mw.3 \
-ibv_create_ah.3 \
-ibv_create_ah_from_wc.3 \
-ibv_create_comp_channel.3 \
-ibv_create_cq.3 \
-ibv_create_cq_ex.3 \
-ibv_create_flow.3 \
-ibv_create_qp.3 \
-ibv_create_qp_ex.3 \
-ibv_create_rwq_ind_table.3 \
-ibv_create_srq.3 \
-ibv_create_srq_ex.3 \
-ibv_create_wq.3 \
-ibv_event_type_str.3 \
-ibv_fork_init.3 \
-ibv_get_async_event.3 \
-ibv_get_cq_event.3 \
-ibv_get_device_guid.3 \
-ibv_get_device_list.3 \
-ibv_get_device_name.3 \
-ibv_get_srq_num.3 \
-ibv_inc_rkey.3 \
-ibv_modify_qp.3 \
-ibv_modify_srq.3 \
-ibv_modify_wq.3 \
-ibv_open_device.3 \
-ibv_open_qp.3 \
-ibv_open_xrcd.3 \
-ibv_poll_cq.3 \
-ibv_post_recv.3 \
-ibv_post_send.3 \
-ibv_post_srq_recv.3 \
-ibv_query_device.3 \
-ibv_query_device_ex.3 \
-ibv_query_gid.3 \
-ibv_query_pkey.3 \
-ibv_query_port.3 \
-ibv_query_qp.3 \
-ibv_query_rt_values_ex.3 \
-ibv_query_srq.3 \
-ibv_rate_to_mbps.3 \
-ibv_rate_to_mult.3 \
-ibv_reg_mr.3 \
-ibv_req_notify_cq.3 \
-ibv_rereg_mr.3 \
-ibv_resize_cq.3
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/libibverbs/examples/build/Makefile
===================================================================
--- head/contrib/ofed/libibverbs/examples/build/Makefile
+++ head/contrib/ofed/libibverbs/examples/build/Makefile
@@ -1,10 +0,0 @@
-SUBDIR= \
-asyncwatch \
-devinfo \
-devices \
-rc_pingpong \
-srq_pingpong \
-uc_pingpong \
-ud_pingpong
-
-.include <bsd.subdir.mk>
Index: head/contrib/ofed/libibverbs/examples/build/Makefile.inc
===================================================================
--- head/contrib/ofed/libibverbs/examples/build/Makefile.inc
+++ head/contrib/ofed/libibverbs/examples/build/Makefile.inc
@@ -1,4 +0,0 @@
-BINDIR?= /usr/bin
-CFLAGS+= -I${.CURDIR}/../../..
-LDFLAGS+= -libverbs -lmlx4 -lmlx5 -lcxgb4 -lpthread
-
Index: head/contrib/ofed/libibverbs/examples/build/asyncwatch/Makefile
===================================================================
--- head/contrib/ofed/libibverbs/examples/build/asyncwatch/Makefile
+++ head/contrib/ofed/libibverbs/examples/build/asyncwatch/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= ibv_asyncwatch
-MAN= ibv_asyncwatch.1
-SRCS= asyncwatch.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/libibverbs/examples/build/devices/Makefile
===================================================================
--- head/contrib/ofed/libibverbs/examples/build/devices/Makefile
+++ head/contrib/ofed/libibverbs/examples/build/devices/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= ibv_devices
-MAN= ibv_devices.1
-SRCS= device_list.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/libibverbs/examples/build/devinfo/Makefile
===================================================================
--- head/contrib/ofed/libibverbs/examples/build/devinfo/Makefile
+++ head/contrib/ofed/libibverbs/examples/build/devinfo/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= ibv_devinfo
-MAN= ibv_devinfo.1
-SRCS= devinfo.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/libibverbs/examples/build/rc_pingpong/Makefile
===================================================================
--- head/contrib/ofed/libibverbs/examples/build/rc_pingpong/Makefile
+++ head/contrib/ofed/libibverbs/examples/build/rc_pingpong/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= ibv_rc_pingpong
-MAN= ibv_rc_pingpong.1
-SRCS= rc_pingpong.c pingpong.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/libibverbs/examples/build/srq_pingpong/Makefile
===================================================================
--- head/contrib/ofed/libibverbs/examples/build/srq_pingpong/Makefile
+++ head/contrib/ofed/libibverbs/examples/build/srq_pingpong/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= ibv_srq_pingpong
-MAN= ibv_srq_pingpong.1
-SRCS= srq_pingpong.c pingpong.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/libibverbs/examples/build/uc_pingpong/Makefile
===================================================================
--- head/contrib/ofed/libibverbs/examples/build/uc_pingpong/Makefile
+++ head/contrib/ofed/libibverbs/examples/build/uc_pingpong/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= ibv_uc_pingpong
-MAN= ibv_uc_pingpong.1
-SRCS= uc_pingpong.c pingpong.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/libibverbs/examples/build/ud_pingpong/Makefile
===================================================================
--- head/contrib/ofed/libibverbs/examples/build/ud_pingpong/Makefile
+++ head/contrib/ofed/libibverbs/examples/build/ud_pingpong/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= ibv_ud_pingpong
-MAN= ibv_ud_pingpong.1
-SRCS= ud_pingpong.c pingpong.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/libmlx4/Makefile
===================================================================
--- head/contrib/ofed/libmlx4/Makefile
+++ head/contrib/ofed/libmlx4/Makefile
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}
-
-SHLIBDIR?= /usr/lib
-LIB= mlx4
-SHLIB_MAJOR= 1
-MK_PROFILE= no
-
-SRCS= \
-buf.c \
-cq.c \
-dbrec.c \
-mlx4.c \
-qp.c \
-srq.c \
-verbs.c
-
-LIBADD= ibverbs pthread
-CFLAGS+= -I${.CURDIR}
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/libmlx5/Makefile
===================================================================
--- head/contrib/ofed/libmlx5/Makefile
+++ head/contrib/ofed/libmlx5/Makefile
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}
-
-SHLIBDIR?= /usr/lib
-LIB= mlx5
-SHLIB_MAJOR= 1
-MK_PROFILE= no
-
-SRCS= \
-buf.c \
-cq.c \
-dbrec.c \
-mlx5.c \
-qp.c \
-srq.c \
-verbs.c
-
-LIBADD= ibverbs pthread
-CFLAGS+= -I${.CURDIR}
-VERSION_MAP= ${.CURDIR}/libmlx5.map
-
-.include <bsd.lib.mk>
-
Index: head/contrib/ofed/librdmacm/Makefile
===================================================================
--- head/contrib/ofed/librdmacm/Makefile
+++ head/contrib/ofed/librdmacm/Makefile
@@ -1,71 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR} ${.CURDIR}/man
-
-SHLIBDIR?= /usr/lib
-LIB= rdmacm
-SHLIB_MAJOR= 1
-MK_PROFILE= no
-CFLAGS+= -I${.CURDIR}
-
-SRCS= \
-acm.c \
-addrinfo.c \
-cma.c \
-indexer.c
-
-MAN= \
-rdma_accept.3 \
-rdma_ack_cm_event.3 \
-rdma_bind_addr.3 \
-rdma_connect.3 \
-rdma_create_ep.3 \
-rdma_create_event_channel.3 \
-rdma_create_id.3 \
-rdma_create_qp.3 \
-rdma_create_srq.3 \
-rdma_dereg_mr.3 \
-rdma_destroy_ep.3 \
-rdma_destroy_event_channel.3 \
-rdma_destroy_id.3 \
-rdma_destroy_qp.3 \
-rdma_destroy_srq.3 \
-rdma_disconnect.3 \
-rdma_event_str.3 \
-rdma_free_devices.3 \
-rdma_get_cm_event.3 \
-rdma_get_devices.3 \
-rdma_get_dst_port.3 \
-rdma_get_local_addr.3 \
-rdma_get_peer_addr.3 \
-rdma_get_recv_comp.3 \
-rdma_get_request.3 \
-rdma_get_send_comp.3 \
-rdma_get_src_port.3 \
-rdma_getaddrinfo.3 \
-rdma_join_multicast.3 \
-rdma_leave_multicast.3 \
-rdma_listen.3 \
-rdma_migrate_id.3 \
-rdma_notify.3 \
-rdma_post_read.3 \
-rdma_post_readv.3 \
-rdma_post_recv.3 \
-rdma_post_recvv.3 \
-rdma_post_send.3 \
-rdma_post_sendv.3 \
-rdma_post_ud_send.3 \
-rdma_post_write.3 \
-rdma_post_writev.3 \
-rdma_reg_msgs.3 \
-rdma_reg_read.3 \
-rdma_reg_write.3 \
-rdma_reject.3 \
-rdma_resolve_addr.3 \
-rdma_resolve_route.3 \
-rdma_set_option.3
-
-LIBADD= ibverbs
-VERSION_MAP= ${.CURDIR}/librdmacm.map
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/librdmacm/examples/build/Makefile
===================================================================
--- head/contrib/ofed/librdmacm/examples/build/Makefile
+++ head/contrib/ofed/librdmacm/examples/build/Makefile
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= ucmatose mckey rping udaddy
-
-SUBDIR_PARALLEL=
-
-.include <bsd.subdir.mk>
Index: head/contrib/ofed/librdmacm/examples/build/Makefile.inc
===================================================================
--- head/contrib/ofed/librdmacm/examples/build/Makefile.inc
+++ head/contrib/ofed/librdmacm/examples/build/Makefile.inc
@@ -1,3 +0,0 @@
-BINDIR?= /usr/bin
-CFLAGS+= -I${.CURDIR}/../../..
-LDFLAGS+= -libverbs -lrdmacm -lmlx4 -lmlx5 -lcxgb4 -lpthread
Index: head/contrib/ofed/librdmacm/examples/build/mckey/Makefile
===================================================================
--- head/contrib/ofed/librdmacm/examples/build/mckey/Makefile
+++ head/contrib/ofed/librdmacm/examples/build/mckey/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= mckey
-MAN= mckey.1
-SRCS= mckey.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/librdmacm/examples/build/rping/Makefile
===================================================================
--- head/contrib/ofed/librdmacm/examples/build/rping/Makefile
+++ head/contrib/ofed/librdmacm/examples/build/rping/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= rping
-MAN= rping.1
-SRCS= rping.c common.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/librdmacm/examples/build/ucmatose/Makefile
===================================================================
--- head/contrib/ofed/librdmacm/examples/build/ucmatose/Makefile
+++ head/contrib/ofed/librdmacm/examples/build/ucmatose/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= ucmatose
-MAN= ucmatose.1
-SRCS= cmatose.c common.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
===================================================================
--- head/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
+++ head/contrib/ofed/librdmacm/examples/build/udaddy/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../.. ${.CURDIR}/../../../man
-
-PROG= udaddy
-MAN= udaddy.1
-SRCS= udaddy.c common.c
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/opensm/complib/Makefile
===================================================================
--- head/contrib/ofed/opensm/complib/Makefile
+++ head/contrib/ofed/opensm/complib/Makefile
@@ -1,34 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}
-
-SHLIBDIR?= /usr/lib
-LIB= osmcomp
-SHLIB_MAJOR= 3
-MK_PROFILE= no
-
-SRCS= \
-cl_complib.c \
-cl_dispatcher.c \
-cl_event.c \
-cl_event_wheel.c \
-cl_list.c \
-cl_log.c \
-cl_map.c \
-cl_nodenamemap.c \
-cl_pool.c \
-cl_ptr_vector.c \
-cl_spinlock.c \
-cl_statustext.c \
-cl_thread.c \
-cl_threadpool.c \
-cl_timer.c \
-cl_vector.c \
-ib_statustext.c
-
-CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
-CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
-LIBADD= pthread
-VERSION_MAP= ${.CURDIR}/libosmcomp.map
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/opensm/libopensm/Makefile
===================================================================
--- head/contrib/ofed/opensm/libopensm/Makefile
+++ head/contrib/ofed/opensm/libopensm/Makefile
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../opensm
-
-SHLIBDIR?= /usr/lib
-LIB= opensm
-SHLIB_MAJOR= 5
-MK_PROFILE= no
-
-SRCS= \
-osm_log.c \
-osm_mad_pool.c \
-osm_helper.c
-
-LIBADD= pthread
-CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
-CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
-VERSION_MAP= ${.CURDIR}/../opensm/libopensm.map
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/opensm/libvendor/Makefile
===================================================================
--- head/contrib/ofed/opensm/libvendor/Makefile
+++ head/contrib/ofed/opensm/libvendor/Makefile
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}
-
-SHLIBDIR?= /usr/lib
-LIB= osmvendor
-SHLIB_MAJOR= 4
-MK_PROFILE= no
-
-SRCS= \
-osm_vendor_ibumad.c \
-osm_vendor_ibumad_sa.c
-
-LIBADD= ibumad pthread
-CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
-CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
-VERSION_MAP= ${.CURDIR}/libosmvendor.map
-
-.include <bsd.lib.mk>
Index: head/contrib/ofed/opensm/opensm/Makefile
===================================================================
--- head/contrib/ofed/opensm/opensm/Makefile
+++ head/contrib/ofed/opensm/opensm/Makefile
@@ -1,101 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR} ${.CURDIR}/../man
-
-BINDIR?= /usr/bin
-PROG= opensm
-
-SRCS= \
-main.c \
-osm_congestion_control.c \
-osm_console.c \
-osm_console_io.c \
-osm_db_files.c \
-osm_db_pack.c \
-osm_drop_mgr.c \
-osm_dump.c \
-osm_event_plugin.c \
-osm_guid_info_rcv.c \
-osm_guid_mgr.c \
-osm_inform.c \
-osm_lid_mgr.c \
-osm_lin_fwd_rcv.c \
-osm_link_mgr.c \
-osm_mcast_fwd_rcv.c \
-osm_mcast_mgr.c \
-osm_mcast_tbl.c \
-osm_mcm_port.c \
-osm_mesh.c \
-osm_mlnx_ext_port_info_rcv.c \
-osm_mtree.c \
-osm_multicast.c \
-osm_node.c \
-osm_node_desc_rcv.c \
-osm_node_info_rcv.c \
-osm_opensm.c \
-osm_perfmgr.c \
-osm_perfmgr_db.c \
-osm_pkey.c \
-osm_pkey_mgr.c \
-osm_pkey_rcv.c \
-osm_port.c \
-osm_port_info_rcv.c \
-osm_prtn.c \
-osm_prtn_config.c \
-osm_qos.c \
-osm_qos_parser_l.l \
-osm_qos_parser_y.y \
-osm_qos_policy.c \
-osm_remote_sm.c \
-osm_req.c \
-osm_resp.c \
-osm_router.c \
-osm_sa.c \
-osm_sa_class_port_info.c \
-osm_sa_guidinfo_record.c \
-osm_sa_informinfo.c \
-osm_sa_lft_record.c \
-osm_sa_link_record.c \
-osm_sa_mad_ctrl.c \
-osm_sa_mcmember_record.c \
-osm_sa_mft_record.c \
-osm_sa_multipath_record.c \
-osm_sa_node_record.c \
-osm_sa_path_record.c \
-osm_sa_pkey_record.c \
-osm_sa_portinfo_record.c \
-osm_sa_service_record.c \
-osm_sa_slvl_record.c \
-osm_sa_sminfo_record.c \
-osm_sa_sw_info_record.c \
-osm_sa_vlarb_record.c \
-osm_service.c \
-osm_slvl_map_rcv.c \
-osm_sm.c \
-osm_sm_mad_ctrl.c \
-osm_sm_state_mgr.c \
-osm_sminfo_rcv.c \
-osm_state_mgr.c \
-osm_subnet.c \
-osm_sw_info_rcv.c \
-osm_switch.c \
-osm_torus.c \
-osm_trap_rcv.c \
-osm_ucast_cache.c \
-osm_ucast_dfsssp.c \
-osm_ucast_dnup.c \
-osm_ucast_file.c \
-osm_ucast_ftree.c \
-osm_ucast_lash.c \
-osm_ucast_mgr.c \
-osm_ucast_updn.c \
-osm_vl15intf.c \
-osm_vl_arb_rcv.c \
-st.c
-
-MAN= opensm.8
-CFLAGS+= -I${.CURDIR}/.. -DHAVE_CONFIG_H=1
-CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
-LIBADD= opensm osmvendor osmcomp wrap pthread
-
-.include <bsd.prog.mk>
Index: head/contrib/ofed/usr.bin/Makefile
===================================================================
--- head/contrib/ofed/usr.bin/Makefile
+++ head/contrib/ofed/usr.bin/Makefile
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= \
-../libibverbs/examples/build \
-../librdmacm/examples/build \
-../opensm/opensm \
-../infiniband-diags/build
-
-SUBDIR_PARALLEL=
-
-.include <bsd.subdir.mk>
Index: head/contrib/ofed/usr.lib/0/Makefile
===================================================================
--- head/contrib/ofed/usr.lib/0/Makefile
+++ head/contrib/ofed/usr.lib/0/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= \
-../../libibverbs
-
-SUBDIR_PARALLEL=
-
-.include <bsd.subdir.mk>
Index: head/contrib/ofed/usr.lib/1/Makefile
===================================================================
--- head/contrib/ofed/usr.lib/1/Makefile
+++ head/contrib/ofed/usr.lib/1/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= \
-../../libibcm \
-../../libibumad
-
-SUBDIR_PARALLEL=
-
-.include <bsd.subdir.mk>
Index: head/contrib/ofed/usr.lib/2/Makefile
===================================================================
--- head/contrib/ofed/usr.lib/2/Makefile
+++ head/contrib/ofed/usr.lib/2/Makefile
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= \
-../../librdmacm \
-../../libibmad \
-../../opensm/complib \
-../../opensm/libvendor \
-../../libcxgb4 \
-../../libmlx4 \
-../../libmlx5
-
-SUBDIR_PARALLEL=
-
-.include <bsd.subdir.mk>
Index: head/contrib/ofed/usr.lib/3/Makefile
===================================================================
--- head/contrib/ofed/usr.lib/3/Makefile
+++ head/contrib/ofed/usr.lib/3/Makefile
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= \
-../../libibnetdisc \
-../../opensm/libopensm \
-../../../../lib/libpcap
-
-SUBDIR_PARALLEL=
-
-.include <bsd.subdir.mk>
Index: head/contrib/ofed/usr.lib/Makefile
===================================================================
--- head/contrib/ofed/usr.lib/Makefile
+++ head/contrib/ofed/usr.lib/Makefile
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-# NOTE: If building outside the buildworld target, install each subdirectory
-# before building the next one.
-
-SUBDIR=0 1 2 3
-
-.include <bsd.subdir.mk>
Index: head/lib/Makefile
===================================================================
--- head/lib/Makefile
+++ head/lib/Makefile
@@ -67,7 +67,7 @@
libopie \
libpam \
libpathconv \
- ${_libpcap} \
+ libpcap \
libpjdlog \
${_libproc} \
libprocstat \
@@ -124,6 +124,9 @@
SUBDIR_DEPEND_libulog= libmd
SUBDIR_DEPEND_libunbound= ${_libldns}
SUBDIR_DEPEND_liblzma= ${_libthr}
+.if ${MK_OFED} != "no"
+SUBDIR_DEPEND_libpcap= ofed
+.endif
# NB: keep these sorted by MK_* knobs
@@ -184,14 +187,6 @@
SUBDIR.${MK_BHYVE}+= libvmmapi
.endif
-.if ${MK_OFED} == "no"
-#
-# When OFED is enabled libpcap is built as part of
-# OFED due to library dependencies
-#
-_libpcap= libpcap
-.endif
-
.if ${MACHINE_CPUARCH} != "sparc64"
_libproc= libproc
_librtld_db= librtld_db
@@ -212,6 +207,7 @@
SUBDIR.${MK_TESTS}+= tests
SUBDIR.${MK_UNBOUND}+= libunbound
SUBDIR.${MK_USB}+= libusbhid libusb
+SUBDIR.${MK_OFED}+= ofed
.if !make(install)
SUBDIR_PARALLEL=
Index: head/lib/ofed/Makefile
===================================================================
--- head/lib/ofed/Makefile
+++ head/lib/ofed/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+SUBDIR= \
+ include \
+ libibverbs \
+ libibcm \
+ libibumad \
+ librdmacm \
+ libibmad \
+ complib \
+ libvendor \
+ libcxgb4 \
+ libmlx4 \
+ libmlx5 \
+ libibnetdisc \
+ libopensm
+
+SUBDIR_DEPEND_libibcm= libibverbs
+SUBDIR_DEPEND_librdmacm= libibverbs
+SUBDIR_DEPEND_libibmad= libibumad
+SUBDIR_DEPEND_libvendor= libibumad
+SUBDIR_DEPEND_libcxgb4= libibverbs
+SUBDIR_DEPEND_libmlx4= libibverbs
+SUBDIR_DEPEND_libmlx5= libibverbs
+SUBDIR_DEPEND_libibnetdisc= libibmad libibumad complib
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
+
Index: head/lib/ofed/Makefile.inc
===================================================================
--- head/lib/ofed/Makefile.inc
+++ head/lib/ofed/Makefile.inc
@@ -0,0 +1 @@
+# $FreeBSD$
Index: head/lib/ofed/complib/Makefile
===================================================================
--- head/lib/ofed/complib/Makefile
+++ head/lib/ofed/complib/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/opensm/complib
+.PATH: ${_spath}
+
+SHLIBDIR?= /usr/lib
+LIB= osmcomp
+SHLIB_MAJOR= 3
+MK_PROFILE= no
+
+SRCS= \
+cl_complib.c \
+cl_dispatcher.c \
+cl_event.c \
+cl_event_wheel.c \
+cl_list.c \
+cl_log.c \
+cl_map.c \
+cl_nodenamemap.c \
+cl_pool.c \
+cl_ptr_vector.c \
+cl_spinlock.c \
+cl_statustext.c \
+cl_thread.c \
+cl_threadpool.c \
+cl_timer.c \
+cl_vector.c \
+ib_statustext.c
+
+CFLAGS+= -I${_spath}/.. -DHAVE_CONFIG_H=1
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
+LIBADD= pthread
+VERSION_MAP= ${_spath}/libosmcomp.map
+
+.include <bsd.lib.mk>
Index: head/lib/ofed/include/Makefile
===================================================================
--- head/lib/ofed/include/Makefile
+++ head/lib/ofed/include/Makefile
@@ -0,0 +1,192 @@
+# $FreeBSD$
+
+OFEDINCS= ${SRCTOP}/contrib/ofed/include
+IBVERBS= ${SRCTOP}/contrib/ofed/libibverbs
+IBMAD= ${SRCTOP}/contrib/ofed/libibmad
+IBUMAD= ${SRCTOP}/contrib/ofed/libibumad
+IBCM= ${SRCTOP}/contrib/ofed/libibcm
+IBND= ${SRCTOP}/contrib/ofed/libibnetdisc
+RDMACM= ${SRCTOP}/contrib/ofed/librdmacm
+RDMA= ${SRCTOP}/sys/ofed/include/uapi/rdma
+OSM= ${SRCTOP}/contrib/ofed/opensm/include
+
+IBINCS= \
+${OFEDINCS}/byteorder.h \
+${OFEDINCS}/byteswap.h \
+${OFEDINCS}/endian.h \
+${OFEDINCS}/types.h \
+${OFEDINCS}/udma_barrier.h \
+${IBVERBS}/arch.h \
+${IBVERBS}/driver.h \
+${IBVERBS}/kern-abi.h \
+${IBVERBS}/marshall.h \
+${IBVERBS}/opcode.h \
+${IBVERBS}/sa-kern-abi.h \
+${IBVERBS}/sa.h \
+${IBVERBS}/verbs.h \
+${IBUMAD}/umad.h \
+${IBUMAD}/umad_cm.h \
+${IBUMAD}/umad_sa.h \
+${IBUMAD}/umad_sm.h \
+${IBUMAD}/umad_str.h \
+${IBUMAD}/umad_types.h \
+${IBMAD}/mad.h \
+${IBMAD}/mad_osd.h \
+${IBCM}/cm.h \
+${IBCM}/cm_abi.h \
+${IBND}/ibnetdisc.h \
+${IBND}/ibnetdisc_osd.h \
+${RDMACM}/ib.h
+IBINCSDIR= ${INCLUDEDIR}/infiniband
+
+RDMAINCS= \
+${RDMACM}/rdma_cma.h \
+${RDMACM}/rdma_cma_abi.h \
+${RDMACM}/rdma_verbs.h \
+${RDMACM}/rsocket.h \
+${RDMA}/ib_user_cm.h \
+${RDMA}/ib_user_sa.h \
+${RDMA}/ib_user_verbs.h \
+${RDMA}/rdma_user_cm.h \
+${RDMA}/mlx4-abi.h \
+${RDMA}/mlx5-abi.h
+RDMAINCSDIR= ${INCLUDEDIR}/rdma
+
+COMPINCS= \
+${OSM}/complib/cl_atomic.h \
+${OSM}/complib/cl_atomic_osd.h \
+${OSM}/complib/cl_byteswap.h \
+${OSM}/complib/cl_byteswap_osd.h \
+${OSM}/complib/cl_comppool.h \
+${OSM}/complib/cl_debug.h \
+${OSM}/complib/cl_debug_osd.h \
+${OSM}/complib/cl_dispatcher.h \
+${OSM}/complib/cl_event.h \
+${OSM}/complib/cl_event_osd.h \
+${OSM}/complib/cl_event_wheel.h \
+${OSM}/complib/cl_fleximap.h \
+${OSM}/complib/cl_list.h \
+${OSM}/complib/cl_log.h \
+${OSM}/complib/cl_map.h \
+${OSM}/complib/cl_math.h \
+${OSM}/complib/cl_nodenamemap.h \
+${OSM}/complib/cl_packoff.h \
+${OSM}/complib/cl_packon.h \
+${OSM}/complib/cl_passivelock.h \
+${OSM}/complib/cl_pool.h \
+${OSM}/complib/cl_ptr_vector.h \
+${OSM}/complib/cl_qcomppool.h \
+${OSM}/complib/cl_qlist.h \
+${OSM}/complib/cl_qmap.h \
+${OSM}/complib/cl_qpool.h \
+${OSM}/complib/cl_spinlock.h \
+${OSM}/complib/cl_spinlock_osd.h \
+${OSM}/complib/cl_thread.h \
+${OSM}/complib/cl_thread_osd.h \
+${OSM}/complib/cl_threadpool.h \
+${OSM}/complib/cl_timer.h \
+${OSM}/complib/cl_timer_osd.h \
+${OSM}/complib/cl_types.h \
+${OSM}/complib/cl_types_osd.h \
+${OSM}/complib/cl_vector.h
+COMPINCSDIR= ${INCLUDEDIR}/infiniband/complib
+
+OSMINCS= \
+${OSM}/opensm/osm_attrib_req.h \
+${OSM}/opensm/osm_base.h \
+${OSM}/opensm/osm_config.h \
+${OSM}/opensm/osm_congestion_control.h \
+${OSM}/opensm/osm_console.h \
+${OSM}/opensm/osm_console_io.h \
+${OSM}/opensm/osm_db.h \
+${OSM}/opensm/osm_db_pack.h \
+${OSM}/opensm/osm_errors.h \
+${OSM}/opensm/osm_event_plugin.h \
+${OSM}/opensm/osm_file_ids.h \
+${OSM}/opensm/osm_guid.h \
+${OSM}/opensm/osm_helper.h \
+${OSM}/opensm/osm_inform.h \
+${OSM}/opensm/osm_lid_mgr.h \
+${OSM}/opensm/osm_log.h \
+${OSM}/opensm/osm_mad_pool.h \
+${OSM}/opensm/osm_madw.h \
+${OSM}/opensm/osm_mcast_mgr.h \
+${OSM}/opensm/osm_mcast_tbl.h \
+${OSM}/opensm/osm_mcm_port.h \
+${OSM}/opensm/osm_mesh.h \
+${OSM}/opensm/osm_msgdef.h \
+${OSM}/opensm/osm_mtree.h \
+${OSM}/opensm/osm_multicast.h \
+${OSM}/opensm/osm_node.h \
+${OSM}/opensm/osm_opensm.h \
+${OSM}/opensm/osm_partition.h \
+${OSM}/opensm/osm_path.h \
+${OSM}/opensm/osm_perfmgr.h \
+${OSM}/opensm/osm_perfmgr_db.h \
+${OSM}/opensm/osm_pkey.h \
+${OSM}/opensm/osm_port.h \
+${OSM}/opensm/osm_port_profile.h \
+${OSM}/opensm/osm_prefix_route.h \
+${OSM}/opensm/osm_qos_policy.h \
+${OSM}/opensm/osm_remote_sm.h \
+${OSM}/opensm/osm_router.h \
+${OSM}/opensm/osm_sa.h \
+${OSM}/opensm/osm_sa_mad_ctrl.h \
+${OSM}/opensm/osm_service.h \
+${OSM}/opensm/osm_sm.h \
+${OSM}/opensm/osm_sm_mad_ctrl.h \
+${OSM}/opensm/osm_stats.h \
+${OSM}/opensm/osm_subnet.h \
+${OSM}/opensm/osm_switch.h \
+${OSM}/opensm/osm_ucast_cache.h \
+${OSM}/opensm/osm_ucast_lash.h \
+${OSM}/opensm/osm_ucast_mgr.h \
+${OSM}/opensm/osm_version.h \
+${OSM}/opensm/osm_vl15intf.h \
+${OSM}/opensm/st.h
+OSMINCSDIR= ${INCLUDEDIR}/infiniband/opensm
+
+IBAINCS= \
+${OSM}/iba/ib_cm_types.h \
+${OSM}/iba/ib_types.h
+IBAINCSDIR= ${INCLUDEDIR}/infiniband/iba
+
+VENDORINCS= \
+${OSM}/vendor/osm_mtl_bind.h \
+${OSM}/vendor/osm_pkt_randomizer.h \
+${OSM}/vendor/osm_ts_useraccess.h \
+${OSM}/vendor/osm_umadt.h \
+${OSM}/vendor/osm_vendor.h \
+${OSM}/vendor/osm_vendor_al.h \
+${OSM}/vendor/osm_vendor_api.h \
+${OSM}/vendor/osm_vendor_ibumad.h \
+${OSM}/vendor/osm_vendor_mlx.h \
+${OSM}/vendor/osm_vendor_mlx_defs.h \
+${OSM}/vendor/osm_vendor_mlx_dispatcher.h \
+${OSM}/vendor/osm_vendor_mlx_hca.h \
+${OSM}/vendor/osm_vendor_mlx_inout.h \
+${OSM}/vendor/osm_vendor_mlx_rmpp_ctx.h \
+${OSM}/vendor/osm_vendor_mlx_sar.h \
+${OSM}/vendor/osm_vendor_mlx_sender.h \
+${OSM}/vendor/osm_vendor_mlx_svc.h \
+${OSM}/vendor/osm_vendor_mlx_transport.h \
+${OSM}/vendor/osm_vendor_mlx_transport_anafa.h \
+${OSM}/vendor/osm_vendor_mlx_txn.h \
+${OSM}/vendor/osm_vendor_mtl.h \
+${OSM}/vendor/osm_vendor_mtl_hca_guid.h \
+${OSM}/vendor/osm_vendor_mtl_transaction_mgr.h \
+${OSM}/vendor/osm_vendor_sa_api.h \
+${OSM}/vendor/osm_vendor_test.h \
+${OSM}/vendor/osm_vendor_ts.h \
+${OSM}/vendor/osm_vendor_umadt.h
+VENDORINCSDIR= ${INCLUDEDIR}/infiniband/vendor
+
+INCSGROUPS= \
+IBINCS \
+RDMAINCS \
+COMPINCS \
+OSMINCS \
+IBAINCS \
+VENDORINCS
+
+.include <bsd.prog.mk>
Index: head/lib/ofed/libcxgb4/Makefile
===================================================================
--- head/lib/ofed/libcxgb4/Makefile
+++ head/lib/ofed/libcxgb4/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/libcxgb4
+.PATH: ${_spath}
+
+SHLIBDIR?= /usr/lib
+LIB= cxgb4
+SHLIB_MAJOR= 1
+MK_PROFILE= no
+
+SRCS= \
+cq.c \
+dev.c \
+qp.c \
+verbs.c
+
+LIBADD= ibverbs pthread
+CFLAGS+= -I${_spath}
+
+.include <bsd.lib.mk>
Index: head/lib/ofed/libibcm/Makefile
===================================================================
--- head/lib/ofed/libibcm/Makefile
+++ head/lib/ofed/libibcm/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/libibcm
+.PATH: ${_spath}
+
+SHLIBDIR?= /usr/lib
+LIB= ibcm
+SHLIB_MAJOR= 1
+MK_PROFILE= no
+SRCS= cm.c
+LIBADD= ibverbs
+CFLAGS+= -I${_spath}
+MAN=
+VERSION_MAP= ${_spath}/libibcm.map
+
+.include <bsd.lib.mk>
Index: head/lib/ofed/libibmad/Makefile
===================================================================
--- head/lib/ofed/libibmad/Makefile
+++ head/lib/ofed/libibmad/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/libibmad
+.PATH: ${_spath}
+
+SHLIBDIR?= /usr/lib
+LIB= ibmad
+SHLIB_MAJOR= 5
+MK_PROFILE= no
+
+SRCS= \
+bm.c \
+cc.c \
+dump.c \
+fields.c \
+gs.c \
+mad.c \
+portid.c \
+register.c \
+resolve.c \
+rpc.c \
+sa.c \
+serv.c \
+smp.c \
+vendor.c
+
+LIBADD= ibumad
+CFLAGS+= -DHAVE_CONFIG_H=1
+CFLAGS+= -I${_spath}
+VERSION_MAP= ${_spath}/libibmad.map
+
+.include <bsd.lib.mk>
+
Index: head/lib/ofed/libibnetdisc/Makefile
===================================================================
--- head/lib/ofed/libibnetdisc/Makefile
+++ head/lib/ofed/libibnetdisc/Makefile
@@ -0,0 +1,39 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+_spath= ${SRCTOP}/contrib/ofed/libibnetdisc
+.PATH: ${_spath} ${_spath}/man
+
+SHLIBDIR?= /usr/lib
+LIB_CXX= ibnetdisc
+SHLIB_MAJOR= 5
+MK_PROFILE= no
+
+SRCS= \
+chassis.c \
+g_hash_table.cpp \
+ibnetdisc.c \
+ibnetdisc_cache.c \
+query_smp.c
+
+MAN= \
+ibnd_debug.3 \
+ibnd_destroy_fabric.3 \
+ibnd_discover_fabric.3 \
+ibnd_find_node_dr.3 \
+ibnd_find_node_guid.3 \
+ibnd_iter_nodes.3 \
+ibnd_iter_nodes_type.3 \
+ibnd_show_progress.3
+
+LIBADD= osmcomp ibmad ibumad
+CFLAGS+= -DHAVE_CONFIG_H=1
+CFLAGS+= -I${_spath}
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
+.if ${COMPILER_FEATURES:Mc++11}
+CXXFLAGS+= -std=c++11
+.endif
+VERSION_MAP= ${_spath}/libibnetdisc.map
+
+.include <bsd.lib.mk>
Index: head/lib/ofed/libibumad/Makefile
===================================================================
--- head/lib/ofed/libibumad/Makefile
+++ head/lib/ofed/libibumad/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/libibumad
+.PATH: ${_spath}
+
+SHLIBDIR?= /usr/lib
+LIB= ibumad
+SHLIB_MAJOR= 1
+MK_PROFILE= no
+SRCS= \
+umad.c \
+umad_str.c \
+sysfs.c
+CFLAGS+= -I${_spath}
+VERSION_MAP= ${_spath}/libibumad.map
+
+.include <bsd.lib.mk>
Index: head/lib/ofed/libibverbs/Makefile
===================================================================
--- head/lib/ofed/libibverbs/Makefile
+++ head/lib/ofed/libibverbs/Makefile
@@ -0,0 +1,76 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/libibverbs
+.PATH: ${_spath} ${_spath}/man
+
+LIB= ibverbs
+SHLIB_MAJOR= 1
+SHLIBDIR?= /usr/lib
+MK_PROFILE= no
+VERSION_MAP= ${_spath}/libibverbs.map
+
+CFLAGS+= -I${_spath}
+
+SRCS= \
+cmd.c \
+compat-1_0.c \
+device.c \
+enum_strs.c \
+init.c \
+marshall.c \
+memory.c \
+sysfs.c \
+verbs.c
+
+MAN= \
+ibv_alloc_mw.3 \
+ibv_alloc_pd.3 \
+ibv_attach_mcast.3 \
+ibv_bind_mw.3 \
+ibv_create_ah.3 \
+ibv_create_ah_from_wc.3 \
+ibv_create_comp_channel.3 \
+ibv_create_cq.3 \
+ibv_create_cq_ex.3 \
+ibv_create_flow.3 \
+ibv_create_qp.3 \
+ibv_create_qp_ex.3 \
+ibv_create_rwq_ind_table.3 \
+ibv_create_srq.3 \
+ibv_create_srq_ex.3 \
+ibv_create_wq.3 \
+ibv_event_type_str.3 \
+ibv_fork_init.3 \
+ibv_get_async_event.3 \
+ibv_get_cq_event.3 \
+ibv_get_device_guid.3 \
+ibv_get_device_list.3 \
+ibv_get_device_name.3 \
+ibv_get_srq_num.3 \
+ibv_inc_rkey.3 \
+ibv_modify_qp.3 \
+ibv_modify_srq.3 \
+ibv_modify_wq.3 \
+ibv_open_device.3 \
+ibv_open_qp.3 \
+ibv_open_xrcd.3 \
+ibv_poll_cq.3 \
+ibv_post_recv.3 \
+ibv_post_send.3 \
+ibv_post_srq_recv.3 \
+ibv_query_device.3 \
+ibv_query_device_ex.3 \
+ibv_query_gid.3 \
+ibv_query_pkey.3 \
+ibv_query_port.3 \
+ibv_query_qp.3 \
+ibv_query_rt_values_ex.3 \
+ibv_query_srq.3 \
+ibv_rate_to_mbps.3 \
+ibv_rate_to_mult.3 \
+ibv_reg_mr.3 \
+ibv_req_notify_cq.3 \
+ibv_rereg_mr.3 \
+ibv_resize_cq.3
+
+.include <bsd.lib.mk>
Index: head/lib/ofed/libmlx4/Makefile
===================================================================
--- head/lib/ofed/libmlx4/Makefile
+++ head/lib/ofed/libmlx4/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/libmlx4
+.PATH: ${_spath}
+
+SHLIBDIR?= /usr/lib
+LIB= mlx4
+SHLIB_MAJOR= 1
+MK_PROFILE= no
+
+SRCS= \
+buf.c \
+cq.c \
+dbrec.c \
+mlx4.c \
+qp.c \
+srq.c \
+verbs.c
+
+LIBADD= ibverbs pthread
+CFLAGS+= -I${_spath}
+
+.include <bsd.lib.mk>
Index: head/lib/ofed/libmlx5/Makefile
===================================================================
--- head/lib/ofed/libmlx5/Makefile
+++ head/lib/ofed/libmlx5/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/libmlx5
+.PATH: ${_spath}
+
+SHLIBDIR?= /usr/lib
+LIB= mlx5
+SHLIB_MAJOR= 1
+MK_PROFILE= no
+
+SRCS= \
+buf.c \
+cq.c \
+dbrec.c \
+mlx5.c \
+qp.c \
+srq.c \
+verbs.c
+
+LIBADD= ibverbs pthread
+CFLAGS+= -I${_spath}
+VERSION_MAP= ${_spath}/libmlx5.map
+
+.include <bsd.lib.mk>
+
Index: head/lib/ofed/libopensm/Makefile
===================================================================
--- head/lib/ofed/libopensm/Makefile
+++ head/lib/ofed/libopensm/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/opensm/opensm
+.PATH: ${_spath}
+
+SHLIBDIR?= /usr/lib
+LIB= opensm
+SHLIB_MAJOR= 5
+MK_PROFILE= no
+
+SRCS= \
+osm_log.c \
+osm_mad_pool.c \
+osm_helper.c
+
+LIBADD= pthread
+CFLAGS+= -I${_spath} -I${_spath}/.. -DHAVE_CONFIG_H=1
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
+VERSION_MAP= ${_spath}/libopensm.map
+
+.include <bsd.lib.mk>
Index: head/lib/ofed/librdmacm/Makefile
===================================================================
--- head/lib/ofed/librdmacm/Makefile
+++ head/lib/ofed/librdmacm/Makefile
@@ -0,0 +1,72 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/librdmacm
+.PATH: ${_spath} ${_spath}/man
+
+SHLIBDIR?= /usr/lib
+LIB= rdmacm
+SHLIB_MAJOR= 1
+MK_PROFILE= no
+CFLAGS+= -I${_spath}
+
+SRCS= \
+acm.c \
+addrinfo.c \
+cma.c \
+indexer.c
+
+MAN= \
+rdma_accept.3 \
+rdma_ack_cm_event.3 \
+rdma_bind_addr.3 \
+rdma_connect.3 \
+rdma_create_ep.3 \
+rdma_create_event_channel.3 \
+rdma_create_id.3 \
+rdma_create_qp.3 \
+rdma_create_srq.3 \
+rdma_dereg_mr.3 \
+rdma_destroy_ep.3 \
+rdma_destroy_event_channel.3 \
+rdma_destroy_id.3 \
+rdma_destroy_qp.3 \
+rdma_destroy_srq.3 \
+rdma_disconnect.3 \
+rdma_event_str.3 \
+rdma_free_devices.3 \
+rdma_get_cm_event.3 \
+rdma_get_devices.3 \
+rdma_get_dst_port.3 \
+rdma_get_local_addr.3 \
+rdma_get_peer_addr.3 \
+rdma_get_recv_comp.3 \
+rdma_get_request.3 \
+rdma_get_send_comp.3 \
+rdma_get_src_port.3 \
+rdma_getaddrinfo.3 \
+rdma_join_multicast.3 \
+rdma_leave_multicast.3 \
+rdma_listen.3 \
+rdma_migrate_id.3 \
+rdma_notify.3 \
+rdma_post_read.3 \
+rdma_post_readv.3 \
+rdma_post_recv.3 \
+rdma_post_recvv.3 \
+rdma_post_send.3 \
+rdma_post_sendv.3 \
+rdma_post_ud_send.3 \
+rdma_post_write.3 \
+rdma_post_writev.3 \
+rdma_reg_msgs.3 \
+rdma_reg_read.3 \
+rdma_reg_write.3 \
+rdma_reject.3 \
+rdma_resolve_addr.3 \
+rdma_resolve_route.3 \
+rdma_set_option.3
+
+LIBADD= ibverbs
+VERSION_MAP= ${_spath}/librdmacm.map
+
+.include <bsd.lib.mk>
Index: head/lib/ofed/libvendor/Makefile
===================================================================
--- head/lib/ofed/libvendor/Makefile
+++ head/lib/ofed/libvendor/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/opensm/libvendor
+.PATH: ${_spath}
+
+SHLIBDIR?= /usr/lib
+LIB= osmvendor
+SHLIB_MAJOR= 4
+MK_PROFILE= no
+
+SRCS= \
+osm_vendor_ibumad.c \
+osm_vendor_ibumad_sa.c
+
+LIBADD= ibumad pthread
+CFLAGS+= -I${_spath}/.. -DHAVE_CONFIG_H=1
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
+VERSION_MAP= ${_spath}/libosmvendor.map
+
+.include <bsd.lib.mk>
Index: head/share/mk/src.libnames.mk
===================================================================
--- head/share/mk/src.libnames.mk
+++ head/share/mk/src.libnames.mk
@@ -492,18 +492,18 @@
LIBZPOOLDIR= ${OBJTOP}/cddl/lib/libzpool
# OFED support
-LIBCXGB4DIR= ${OBJTOP}/contrib/ofed/libcxgb4
-LIBIBCMDIR= ${OBJTOP}/contrib/ofed/libibcm
-LIBIBMADDIR= ${OBJTOP}/contrib/ofed/libibmad
-LIBIBNETDISCDIR=${OBJTOP}/contrib/ofed/libibnetdisc
-LIBIBUMADDIR= ${OBJTOP}/contrib/ofed/libibumad
-LIBIBVERBSDIR= ${OBJTOP}/contrib/ofed/libibverbs
-LIBMLX4DIR= ${OBJTOP}/contrib/ofed/libmlx4
-LIBMLX5DIR= ${OBJTOP}/contrib/ofed/libmlx5
-LIBRDMACMDIR= ${OBJTOP}/contrib/ofed/librdmacm
-LIBOSMCOMPDIR= ${OBJTOP}/contrib/ofed/opensm/complib
-LIBOPENSMDIR= ${OBJTOP}/contrib/ofed/opensm/libopensm
-LIBOSMVENDORDIR=${OBJTOP}/contrib/ofed/opensm/libvendor
+LIBCXGB4DIR= ${OBJTOP}/lib/ofed/libcxgb4
+LIBIBCMDIR= ${OBJTOP}/lib/ofed/libibcm
+LIBIBMADDIR= ${OBJTOP}/lib/ofed/libibmad
+LIBIBNETDISCDIR=${OBJTOP}/lib/ofed/libibnetdisc
+LIBIBUMADDIR= ${OBJTOP}/lib/ofed/libibumad
+LIBIBVERBSDIR= ${OBJTOP}/lib/ofed/libibverbs
+LIBMLX4DIR= ${OBJTOP}/lib/ofed/libmlx4
+LIBMLX5DIR= ${OBJTOP}/lib/ofed/libmlx5
+LIBRDMACMDIR= ${OBJTOP}/lib/ofed/librdmacm
+LIBOSMCOMPDIR= ${OBJTOP}/lib/ofed/complib
+LIBOPENSMDIR= ${OBJTOP}/lib/ofed/libopensm
+LIBOSMVENDORDIR=${OBJTOP}/lib/ofed/libvendor
LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog
LIBGCOVDIR= ${OBJTOP}/gnu/lib/libgcov
Index: head/usr.bin/Makefile
===================================================================
--- head/usr.bin/Makefile
+++ head/usr.bin/Makefile
@@ -292,6 +292,7 @@
SUBDIR.${MK_UTMPX}+= who
SUBDIR.${MK_SVN}+= svn
SUBDIR.${MK_SVNLITE}+= svn
+SUBDIR.${MK_OFED}+= ofed
# These are normally only handled for build-tools.
.if make(clean*)
Index: head/usr.bin/ofed/Makefile
===================================================================
--- head/usr.bin/ofed/Makefile
+++ head/usr.bin/ofed/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+SUBDIR= \
+ libibverbs \
+ librdmacm \
+ opensm \
+ infiniband-diags
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
Index: head/usr.bin/ofed/infiniband-diags/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/Makefile
+++ head/usr.bin/ofed/infiniband-diags/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+SUBDIR= \
+dump_fts \
+ibaddr \
+ibcacheedit \
+ibccconfig \
+ibccquery \
+iblinkinfo \
+ibmirror \
+ibnetdiscover \
+ibping \
+ibportstate \
+ibqueryerrors \
+ibroute \
+ibstat \
+ibsysstat \
+ibtracert \
+perfquery \
+saquery \
+sminfo \
+smpdump \
+smpquery \
+vendstat
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
+
Index: head/usr.bin/ofed/infiniband-diags/Makefile.inc
===================================================================
--- head/usr.bin/ofed/infiniband-diags/Makefile.inc
+++ head/usr.bin/ofed/infiniband-diags/Makefile.inc
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/infiniband-diags
+.PATH: ${_spath}/src ${_spath}/man
+
+BINDIR?= /usr/bin
+SRCS+= ibdiag_common.c ibdiag_sa.c
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
+CFLAGS+= -DHAVE_CONFIG_H=1
+CFLAGS+= -I${_spath} -I${_spath}/src
+LIBADD+= osmcomp ibmad ibumad
+
Index: head/usr.bin/ofed/infiniband-diags/dump_fts/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/dump_fts/Makefile
+++ head/usr.bin/ofed/infiniband-diags/dump_fts/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= dump_fts
+SRCS= dump_fts.c
+LIBADD= ibnetdisc
+MAN= dump_fts.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibaddr/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibaddr/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibaddr/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibaddr
+SRCS= ibaddr.c
+MAN= ibaddr.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= ibcacheedit
+SRCS= ibcacheedit.c
+LIBADD= ibnetdisc
+MAN= ibcacheedit.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibccconfig
+SRCS= ibccconfig.c
+MAN= ibccconfig.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibccquery/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibccquery/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibccquery/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibccquery
+SRCS= ibccquery.c
+MAN= ibccquery.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile
+++ head/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= iblinkinfo
+SRCS= iblinkinfo.c
+LIBADD= ibnetdisc
+MAN= iblinkinfo.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibmirror/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibmirror/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibmirror/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibmirror
+SRCS= ibmirror.c
+MAN=
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= ibnetdiscover
+SRCS= ibnetdiscover.c
+LIBADD= ibnetdisc
+MAN= ibnetdiscover.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibping/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibping/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibping/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibping
+SRCS= ibping.c
+MAN= ibping.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibportstate/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibportstate/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibportstate/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibportstate
+SRCS= ibportstate.c
+MAN= ibportstate.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PROG= ibqueryerrors
+SRCS= ibqueryerrors.c
+LIBADD= ibnetdisc
+MAN= ibqueryerrors.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibroute/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibroute/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibroute/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibroute
+SRCS= ibroute.c
+MAN= ibroute.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibstat/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibstat/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibstat/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibstat
+SRCS= ibstat.c
+MAN= ibstat.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibsysstat
+SRCS= ibsysstat.c
+MAN= ibsysstat.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/ibtracert/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/ibtracert/Makefile
+++ head/usr.bin/ofed/infiniband-diags/ibtracert/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibtracert
+SRCS= ibtracert.c
+MAN= ibtracert.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/perfquery/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/perfquery/Makefile
+++ head/usr.bin/ofed/infiniband-diags/perfquery/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= perfquery
+SRCS= perfquery.c
+MAN= perfquery.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/saquery/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/saquery/Makefile
+++ head/usr.bin/ofed/infiniband-diags/saquery/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= saquery
+SRCS= saquery.c
+MAN= saquery.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/sminfo/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/sminfo/Makefile
+++ head/usr.bin/ofed/infiniband-diags/sminfo/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= sminfo
+SRCS= sminfo.c
+MAN= sminfo.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/smpdump/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/smpdump/Makefile
+++ head/usr.bin/ofed/infiniband-diags/smpdump/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= smpdump
+SRCS= smpdump.c
+MAN= smpdump.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/smpquery/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/smpquery/Makefile
+++ head/usr.bin/ofed/infiniband-diags/smpquery/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= smpquery
+SRCS= smpquery.c
+MAN= smpquery.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/infiniband-diags/vendstat/Makefile
===================================================================
--- head/usr.bin/ofed/infiniband-diags/vendstat/Makefile
+++ head/usr.bin/ofed/infiniband-diags/vendstat/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= vendstat
+SRCS= vendstat.c
+MAN= vendstat.8
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/libibverbs/Makefile
===================================================================
--- head/usr.bin/ofed/libibverbs/Makefile
+++ head/usr.bin/ofed/libibverbs/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+SUBDIR= \
+asyncwatch \
+devinfo \
+devices \
+rc_pingpong \
+srq_pingpong \
+uc_pingpong \
+ud_pingpong
+
+.include <bsd.subdir.mk>
Index: head/usr.bin/ofed/libibverbs/Makefile.inc
===================================================================
--- head/usr.bin/ofed/libibverbs/Makefile.inc
+++ head/usr.bin/ofed/libibverbs/Makefile.inc
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+_spath=${SRCTOP}/contrib/ofed/libibverbs
+.PATH: ${_spath}/examples ${_spath}/man
+
+BINDIR?= /usr/bin
+CFLAGS+= -I${_spath}
+LIBADD+= ibverbs mlx4 mlx5 cxgb4 pthread
+
Index: head/usr.bin/ofed/libibverbs/asyncwatch/Makefile
===================================================================
--- head/usr.bin/ofed/libibverbs/asyncwatch/Makefile
+++ head/usr.bin/ofed/libibverbs/asyncwatch/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibv_asyncwatch
+MAN= ibv_asyncwatch.1
+SRCS= asyncwatch.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/libibverbs/devices/Makefile
===================================================================
--- head/usr.bin/ofed/libibverbs/devices/Makefile
+++ head/usr.bin/ofed/libibverbs/devices/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibv_devices
+MAN= ibv_devices.1
+SRCS= device_list.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/libibverbs/devinfo/Makefile
===================================================================
--- head/usr.bin/ofed/libibverbs/devinfo/Makefile
+++ head/usr.bin/ofed/libibverbs/devinfo/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibv_devinfo
+MAN= ibv_devinfo.1
+SRCS= devinfo.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/libibverbs/rc_pingpong/Makefile
===================================================================
--- head/usr.bin/ofed/libibverbs/rc_pingpong/Makefile
+++ head/usr.bin/ofed/libibverbs/rc_pingpong/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibv_rc_pingpong
+MAN= ibv_rc_pingpong.1
+SRCS= rc_pingpong.c pingpong.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/libibverbs/srq_pingpong/Makefile
===================================================================
--- head/usr.bin/ofed/libibverbs/srq_pingpong/Makefile
+++ head/usr.bin/ofed/libibverbs/srq_pingpong/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibv_srq_pingpong
+MAN= ibv_srq_pingpong.1
+SRCS= srq_pingpong.c pingpong.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/libibverbs/uc_pingpong/Makefile
===================================================================
--- head/usr.bin/ofed/libibverbs/uc_pingpong/Makefile
+++ head/usr.bin/ofed/libibverbs/uc_pingpong/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibv_uc_pingpong
+MAN= ibv_uc_pingpong.1
+SRCS= uc_pingpong.c pingpong.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/libibverbs/ud_pingpong/Makefile
===================================================================
--- head/usr.bin/ofed/libibverbs/ud_pingpong/Makefile
+++ head/usr.bin/ofed/libibverbs/ud_pingpong/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ibv_ud_pingpong
+MAN= ibv_ud_pingpong.1
+SRCS= ud_pingpong.c pingpong.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/librdmacm/Makefile
===================================================================
--- head/usr.bin/ofed/librdmacm/Makefile
+++ head/usr.bin/ofed/librdmacm/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+SUBDIR= ucmatose mckey rping udaddy
+
+SUBDIR_PARALLEL=
+
+.include <bsd.subdir.mk>
Index: head/usr.bin/ofed/librdmacm/Makefile.inc
===================================================================
--- head/usr.bin/ofed/librdmacm/Makefile.inc
+++ head/usr.bin/ofed/librdmacm/Makefile.inc
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+_spath=${SRCTOP}/contrib/ofed/librdmacm
+.PATH: ${_spath}/examples ${_spath}/man
+
+BINDIR?= /usr/bin
+CFLAGS+= -I${SRCTOP}/contrib/ofed
+LIBADD+= ibverbs rdmacm mlx4 mlx5 cxgb4 pthread
Index: head/usr.bin/ofed/librdmacm/mckey/Makefile
===================================================================
--- head/usr.bin/ofed/librdmacm/mckey/Makefile
+++ head/usr.bin/ofed/librdmacm/mckey/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= mckey
+MAN= mckey.1
+SRCS= mckey.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/librdmacm/rping/Makefile
===================================================================
--- head/usr.bin/ofed/librdmacm/rping/Makefile
+++ head/usr.bin/ofed/librdmacm/rping/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= rping
+MAN= rping.1
+SRCS= rping.c common.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/librdmacm/ucmatose/Makefile
===================================================================
--- head/usr.bin/ofed/librdmacm/ucmatose/Makefile
+++ head/usr.bin/ofed/librdmacm/ucmatose/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= ucmatose
+MAN= ucmatose.1
+SRCS= cmatose.c common.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/librdmacm/udaddy/Makefile
===================================================================
--- head/usr.bin/ofed/librdmacm/udaddy/Makefile
+++ head/usr.bin/ofed/librdmacm/udaddy/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG= udaddy
+MAN= udaddy.1
+SRCS= udaddy.c common.c
+
+.include <bsd.prog.mk>
Index: head/usr.bin/ofed/opensm/Makefile
===================================================================
--- head/usr.bin/ofed/opensm/Makefile
+++ head/usr.bin/ofed/opensm/Makefile
@@ -0,0 +1,102 @@
+# $FreeBSD$
+
+_spath= ${SRCTOP}/contrib/ofed/opensm/opensm
+.PATH: ${_spath} ${_spath:H}/man
+
+BINDIR?= /usr/bin
+PROG= opensm
+
+SRCS= \
+main.c \
+osm_congestion_control.c \
+osm_console.c \
+osm_console_io.c \
+osm_db_files.c \
+osm_db_pack.c \
+osm_drop_mgr.c \
+osm_dump.c \
+osm_event_plugin.c \
+osm_guid_info_rcv.c \
+osm_guid_mgr.c \
+osm_inform.c \
+osm_lid_mgr.c \
+osm_lin_fwd_rcv.c \
+osm_link_mgr.c \
+osm_mcast_fwd_rcv.c \
+osm_mcast_mgr.c \
+osm_mcast_tbl.c \
+osm_mcm_port.c \
+osm_mesh.c \
+osm_mlnx_ext_port_info_rcv.c \
+osm_mtree.c \
+osm_multicast.c \
+osm_node.c \
+osm_node_desc_rcv.c \
+osm_node_info_rcv.c \
+osm_opensm.c \
+osm_perfmgr.c \
+osm_perfmgr_db.c \
+osm_pkey.c \
+osm_pkey_mgr.c \
+osm_pkey_rcv.c \
+osm_port.c \
+osm_port_info_rcv.c \
+osm_prtn.c \
+osm_prtn_config.c \
+osm_qos.c \
+osm_qos_parser_l.l \
+osm_qos_parser_y.y \
+osm_qos_policy.c \
+osm_remote_sm.c \
+osm_req.c \
+osm_resp.c \
+osm_router.c \
+osm_sa.c \
+osm_sa_class_port_info.c \
+osm_sa_guidinfo_record.c \
+osm_sa_informinfo.c \
+osm_sa_lft_record.c \
+osm_sa_link_record.c \
+osm_sa_mad_ctrl.c \
+osm_sa_mcmember_record.c \
+osm_sa_mft_record.c \
+osm_sa_multipath_record.c \
+osm_sa_node_record.c \
+osm_sa_path_record.c \
+osm_sa_pkey_record.c \
+osm_sa_portinfo_record.c \
+osm_sa_service_record.c \
+osm_sa_slvl_record.c \
+osm_sa_sminfo_record.c \
+osm_sa_sw_info_record.c \
+osm_sa_vlarb_record.c \
+osm_service.c \
+osm_slvl_map_rcv.c \
+osm_sm.c \
+osm_sm_mad_ctrl.c \
+osm_sm_state_mgr.c \
+osm_sminfo_rcv.c \
+osm_state_mgr.c \
+osm_subnet.c \
+osm_sw_info_rcv.c \
+osm_switch.c \
+osm_torus.c \
+osm_trap_rcv.c \
+osm_ucast_cache.c \
+osm_ucast_dfsssp.c \
+osm_ucast_dnup.c \
+osm_ucast_file.c \
+osm_ucast_ftree.c \
+osm_ucast_lash.c \
+osm_ucast_mgr.c \
+osm_ucast_updn.c \
+osm_vl15intf.c \
+osm_vl_arb_rcv.c \
+st.c
+
+MAN= opensm.8
+CFLAGS+= -I${_spath:H} -DHAVE_CONFIG_H=1
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
+LIBADD= opensm osmvendor osmcomp wrap pthread
+
+.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 4, 11:15 PM (11 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24787084
Default Alt Text
D15648.id43895.diff (69 KB)

Event Timeline