Index: projects/bsd_rdma_4_9/contrib/ofed/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/Makefile	(revision 325762)
@@ -1,55 +1,47 @@
 # $FreeBSD$
 
 SUBDIR_A_DEPEND=
 SUBDIR_A= \
 include
 
 SUBDIR_B_DEPEND= ${SUBDIR_A}
 SUBDIR_B= \
 libibverbs
 
 SUBDIR_C_DEPEND= ${SUBDIR_B}
 SUBDIR_C= \
 libibcm \
 libibumad
 
 SUBDIR_D_DEPEND= ${SUBDIR_C}
 SUBDIR_D= \
 librdmacm \
 libibmad \
 opensm/complib \
 opensm/libvendor \
 libcxgb4 \
 libmlx4 \
 libmlx5
 
 SUBDIR_E_DEPEND= ${SUBDIR_D}
 SUBDIR_E= \
 libibverbs/examples/build \
 librdmacm/examples/build \
 libibnetdisc \
 opensm/libopensm
 
 SUBDIR_F_DEPEND= ${SUBDIR_E}
 SUBDIR_F= \
 opensm/opensm \
 infiniband-diags/build
 
 .for L in A B C D E F
 .for S in ${SUBDIR_${L}}
 SUBDIR_DEPEND_${S}+= ${SUBDIR_${L}_DEPEND}
 .endfor
 SUBDIR+= ${SUBDIR_${L}}
 .endfor
 
 SUBDIR_PARALLEL=
 
-.if defined(TESTBUILD)
-all-install:
-.for D in ${SUBDIR}
-	cd ${.CURDIR}/${D} ; ${MAKE} clean cleandepend
-	cd ${.CURDIR}/${D} ; ${MAKE} depend all install
-.endfor
-.else
 .include <bsd.subdir.mk>
-.endif
Index: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/Makefile.inc
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/Makefile.inc	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/Makefile.inc	(revision 325762)
@@ -1,16 +1,12 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../src ${.CURDIR}/../../man
 
 BINDIR?= /usr/bin
 SRCS+= ibdiag_common.c ibdiag_sa.c
 CFLAGS+= -I${INCLUDEDIR}/infiniband
 CFLAGS+= -DHAVE_CONFIG_H=1
 CFLAGS+= -I${.CURDIR}/../../
 CFLAGS+= -I${.CURDIR}/../../src
-.if defined(TESTBUILD)
-LDFLAGS+= -losmcomp -libmad -libumad
-.else
 LIBADD+= osmcomp ibmad ibumad
-.endif
 
Index: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/dump_fts/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/dump_fts/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/dump_fts/Makefile	(revision 325762)
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
 PROG=	dump_fts
 SRCS=	dump_fts.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD= ibnetdisc
-.endif
 MAN=	dump_fts.8
 
 .include <bsd.prog.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibcacheedit/Makefile	(revision 325762)
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
 PROG=	ibcacheedit
 SRCS=	ibcacheedit.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD=	ibnetdisc
-.endif
 MAN=	ibcacheedit.8
 
 .include <bsd.prog.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/iblinkinfo/Makefile	(revision 325762)
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
 PROG=	iblinkinfo
 SRCS=	iblinkinfo.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD= ibnetdisc
-.endif
 MAN=	iblinkinfo.8
 
 .include <bsd.prog.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibnetdiscover/Makefile	(revision 325762)
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
 PROG=	ibnetdiscover
 SRCS=	ibnetdiscover.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD=	ibnetdisc
-.endif
 MAN=	ibnetdiscover.8
 
 .include <bsd.prog.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/infiniband-diags/build/ibqueryerrors/Makefile	(revision 325762)
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
 PROG=	ibqueryerrors
 SRCS=	ibqueryerrors.c
-.if defined(TESTBUILD)
-LDFLAGS= -libnetdisc
-.else
 LIBADD=	ibnetdisc
-.endif
 MAN=	ibqueryerrors.8
 
 .include <bsd.prog.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/libcxgb4/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libcxgb4/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/libcxgb4/Makefile	(revision 325762)
@@ -1,23 +1,19 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}
 
 SHLIBDIR?=	/usr/lib
 LIB=		cxgb4
 SHLIB_MAJOR=	1
 MK_PROFILE=	no
 
 SRCS= \
 cq.c \
 dev.c \
 qp.c \
 verbs.c
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs -lpthread
-.else
 LIBADD=		ibverbs pthread
-.endif
 CFLAGS+=	-I${.CURDIR}
 
 .include <bsd.lib.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/libibcm/Makefile	(revision 325762)
@@ -1,19 +1,15 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}
 
 SHLIBDIR?=	/usr/lib
 LIB=		ibcm
 SHLIB_MAJOR=	1
 MK_PROFILE=	no
 SRCS=		cm.c
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs
-.else
 LDADD=		ibverbs
-.endif
 CFLAGS+=	-I${.CURDIR}
 MAN=
 VERSION_MAP=	${.CURDIR}/libibcm.map
 
 .include <bsd.lib.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/libibmad/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libibmad/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/libibmad/Makefile	(revision 325762)
@@ -1,36 +1,32 @@
 # $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
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libumad
-.else
 LIBADD=		ibumad
-.endif
 CFLAGS+=	-DHAVE_CONFIG_H=1
 CFLAGS+=	-I${.CURDIR}
 VERSION_MAP=	${.CURDIR}/libibmad.map
 
 .include <bsd.lib.mk>
 
Index: projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/libibnetdisc/Makefile	(revision 325762)
@@ -1,37 +1,33 @@
 # $FreeBSD$
 
 .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
 
-.if defined(TESTBUILD)
-LDFLAGS=	-losmcomp -libmad -libumad
-.else
 LIBADD=		osmcomp ibmad ibumad
-.endif
 CFLAGS+=	-DHAVE_CONFIG_H=1
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/libibnetdisc.map
 
 .include <bsd.lib.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/libmlx4/Makefile	(revision 325762)
@@ -1,26 +1,22 @@
 # $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
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs -lpthread
-.else
 LDADD=		ibverbs pthread
-.endif
 CFLAGS+=	-I${.CURDIR}
 
 .include <bsd.lib.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/libmlx5/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/libmlx5/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/libmlx5/Makefile	(revision 325762)
@@ -1,28 +1,24 @@
 # $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
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs -lpthread
-.else
 LDADD=		ibverbs pthread
-.endif
 CFLAGS+=	-I${.CURDIR}
 VERSION_MAP=	${.CURDIR}/libmlx5.map
 
 .include <bsd.lib.mk>
 
Index: projects/bsd_rdma_4_9/contrib/ofed/librdmacm/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/librdmacm/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/librdmacm/Makefile	(revision 325762)
@@ -1,75 +1,71 @@
 # $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
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libverbs
-.else
 LDADD=		ibverbs
-.endif
 VERSION_MAP=	${.CURDIR}/librdmacm.map
 
 .include <bsd.lib.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/opensm/complib/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/opensm/complib/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/opensm/complib/Makefile	(revision 325762)
@@ -1,38 +1,34 @@
 # $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${INCLUDEDIR}/infiniband
-.if defined(TESTBUILD)
-LDFLAGS=	-lpthread
-.else
 LDADD=		pthread
-.endif
 VERSION_MAP=	${.CURDIR}/libosmcomp.map
 
 .include <bsd.lib.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/opensm/libopensm/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/opensm/libopensm/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/opensm/libopensm/Makefile	(revision 325762)
@@ -1,24 +1,20 @@
 # $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
 
-.if defined(TESTBUILD)
-LDFLAGS=	-lpthread
-.else
 LIBADD=		pthread
-.endif
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/../opensm/libopensm.map
 
 .include <bsd.lib.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/opensm/libvendor/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/opensm/libvendor/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/opensm/libvendor/Makefile	(revision 325762)
@@ -1,23 +1,19 @@
 # $FreeBSD$
 
 .PATH:	${.CURDIR}
 
 SHLIBDIR?=	/usr/lib
 LIB=		osmvendor
 SHLIB_MAJOR=	4
 MK_PROFILE=	no
 
 SRCS= \
 osm_vendor_ibumad.c \
 osm_vendor_ibumad_sa.c
 
-.if defined(TESTBUILD)
-LDFLAGS=	-libumad -lpthread
-.else
 LIBADD=		ibumad pthread
-.endif
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/libosmvendor.map
 
 .include <bsd.lib.mk>
Index: projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile
===================================================================
--- projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile	(revision 325761)
+++ projects/bsd_rdma_4_9/contrib/ofed/opensm/opensm/Makefile	(revision 325762)
@@ -1,105 +1,101 @@
 # $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${INCLUDEDIR}/infiniband
-.if defined(TESTBUILD)
-LDFLAGS=	-lopensm -losmvendor -losmcomp -lwrap -lpthread
-.else
 LDADD=		opensm osmvendor osmcomp wrap pthread
-.endif
 
 .include <bsd.prog.mk>