Index: head/net/libfabric/Makefile =================================================================== --- head/net/libfabric/Makefile (revision 484439) +++ head/net/libfabric/Makefile (revision 484440) @@ -1,43 +1,48 @@ # $FreeBSD$ PORTNAME= libfabric DISTVERSIONPREFIX= v DISTVERSION= 1.6.2 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org COMMENT= Open Fabric Interfaces LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim USES= autoreconf gmake libtool pkgconfig USE_GITHUB= yes GH_ACCOUNT= ofiwg GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include/libepoll-shim -LDFLAGS+= ${LOCALBASE}/lib/libepoll-shim.so -pthread +LDFLAGS+= ${LOCALBASE}/lib/libepoll-shim.so -OPTIONS_DEFINE= VERBS -OPTIONS_SUB= yes +OPTIONS_MULTI= PROVIDERS +OPTIONS_MULTI_PROVIDERS= RXD RXM SOCKETS TCP UDP +OPTIONS_DEFAULT= ${OPTIONS_MULTI_PROVIDERS} +OPTIONS_SUB= yes +PROVIDERS_DESC= Providers to build: -VERBS_DESC= Build 'verbs' provider -VERBS_CONFIGURE_ENABLE= verbs - .if exists(/usr/include/infiniband/verbs.h) # some earlier FreeBSD 11 systems don't have it -OPTIONS_DEFAULT+= VERBS -.else -VERBS_BROKEN= infiniband/verbs.h not available on your system +OPTIONS_MULTI_PROVIDERS+= VERBS +VERBS_PLIST_FILES= man/man7/fi_verbs.7.gz .endif + +.for p in ${OPTIONS_MULTI_PROVIDERS} +${p}_DESC= '${p:tl}' provider +${p}_CONFIGURE_ENABLE= ${p:tl} +.endfor post-patch: @${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|||' @${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|||' @${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|||' .include Index: head/net/libfabric/pkg-plist =================================================================== --- head/net/libfabric/pkg-plist (revision 484439) +++ head/net/libfabric/pkg-plist (revision 484440) @@ -1,155 +1,154 @@ bin/fi_info bin/fi_pingpong bin/fi_strerror include/rdma/fabric.h include/rdma/fi_atomic.h include/rdma/fi_cm.h include/rdma/fi_domain.h include/rdma/fi_endpoint.h include/rdma/fi_eq.h include/rdma/fi_errno.h include/rdma/fi_rma.h include/rdma/fi_tagged.h include/rdma/fi_trigger.h lib/libfabric.so lib/libfabric.so.1 lib/libfabric.so.1.9.15 libdata/pkgconfig/libfabric.pc man/man1/fi_info.1.gz man/man1/fi_pingpong.1.gz man/man1/fi_strerror.1.gz man/man3/fi_accept.3.gz man/man3/fi_alias.3.gz man/man3/fi_atomic.3.gz man/man3/fi_atomic_valid.3.gz man/man3/fi_atomicmsg.3.gz man/man3/fi_atomicv.3.gz man/man3/fi_av.3.gz man/man3/fi_av_bind.3.gz man/man3/fi_av_insert.3.gz man/man3/fi_av_insertsvc.3.gz man/man3/fi_av_lookup.3.gz man/man3/fi_av_open.3.gz man/man3/fi_av_remove.3.gz man/man3/fi_av_straddr.3.gz man/man3/fi_cancel.3.gz man/man3/fi_close.3.gz man/man3/fi_cm.3.gz man/man3/fi_cntr.3.gz man/man3/fi_cntr_add.3.gz man/man3/fi_cntr_open.3.gz man/man3/fi_cntr_read.3.gz man/man3/fi_cntr_set.3.gz man/man3/fi_cntr_wait.3.gz man/man3/fi_compare_atomic.3.gz man/man3/fi_compare_atomic_valid.3.gz man/man3/fi_compare_atomicmsg.3.gz man/man3/fi_compare_atomicv.3.gz man/man3/fi_connect.3.gz man/man3/fi_control.3.gz man/man3/fi_cq.3.gz man/man3/fi_cq_open.3.gz man/man3/fi_cq_read.3.gz man/man3/fi_cq_readerr.3.gz man/man3/fi_cq_readfrom.3.gz man/man3/fi_cq_signal.3.gz man/man3/fi_cq_sread.3.gz man/man3/fi_cq_sreadfrom.3.gz man/man3/fi_cq_strerror.3.gz man/man3/fi_domain.3.gz man/man3/fi_domain_bind.3.gz man/man3/fi_domain_query.3.gz man/man3/fi_dupinfo.3.gz man/man3/fi_enable.3.gz man/man3/fi_endpoint.3.gz man/man3/fi_ep.3.gz man/man3/fi_ep_bind.3.gz man/man3/fi_eq.3.gz man/man3/fi_eq_open.3.gz man/man3/fi_eq_read.3.gz man/man3/fi_eq_readerr.3.gz man/man3/fi_eq_sread.3.gz man/man3/fi_eq_strerror.3.gz man/man3/fi_eq_write.3.gz man/man3/fi_errno.3.gz man/man3/fi_fabric.3.gz man/man3/fi_fetch_atomic.3.gz man/man3/fi_fetch_atomic_valid.3.gz man/man3/fi_fetch_atomicmsg.3.gz man/man3/fi_fetch_atomicv.3.gz man/man3/fi_freeinfo.3.gz man/man3/fi_getinfo.3.gz man/man3/fi_getname.3.gz man/man3/fi_getopt.3.gz man/man3/fi_getpeer.3.gz man/man3/fi_inject.3.gz man/man3/fi_inject_atomic.3.gz man/man3/fi_inject_write.3.gz man/man3/fi_inject_writedata.3.gz man/man3/fi_injectdata.3.gz man/man3/fi_join.3.gz man/man3/fi_leave.3.gz man/man3/fi_listen.3.gz man/man3/fi_mr.3.gz man/man3/fi_mr_bind.3.gz man/man3/fi_mr_desc.3.gz man/man3/fi_mr_key.3.gz man/man3/fi_mr_reg.3.gz man/man3/fi_mr_regattr.3.gz man/man3/fi_mr_regv.3.gz man/man3/fi_msg.3.gz man/man3/fi_open.3.gz man/man3/fi_open_ops.3.gz man/man3/fi_passive_ep.3.gz man/man3/fi_pep_bind.3.gz man/man3/fi_poll.3.gz man/man3/fi_poll_add.3.gz man/man3/fi_poll_del.3.gz man/man3/fi_poll_open.3.gz man/man3/fi_read.3.gz man/man3/fi_readmsg.3.gz man/man3/fi_readv.3.gz man/man3/fi_recv.3.gz man/man3/fi_recvmsg.3.gz man/man3/fi_recvv.3.gz man/man3/fi_reject.3.gz man/man3/fi_rma.3.gz man/man3/fi_rx_addr.3.gz man/man3/fi_rx_size_left.3.gz man/man3/fi_scalable_ep_bind.3.gz man/man3/fi_send.3.gz man/man3/fi_senddata.3.gz man/man3/fi_sendmsg.3.gz man/man3/fi_sendv.3.gz man/man3/fi_setname.3.gz man/man3/fi_setopt.3.gz man/man3/fi_shutdown.3.gz man/man3/fi_strerror.3.gz man/man3/fi_tagged.3.gz man/man3/fi_tinject.3.gz man/man3/fi_tinjectdata.3.gz man/man3/fi_tostr.3.gz man/man3/fi_trecv.3.gz man/man3/fi_trecvmsg.3.gz man/man3/fi_trecvv.3.gz man/man3/fi_trigger.3.gz man/man3/fi_trywait.3.gz man/man3/fi_tsend.3.gz man/man3/fi_tsenddata.3.gz man/man3/fi_tsendmsg.3.gz man/man3/fi_tsendv.3.gz man/man3/fi_tx_size_left.3.gz man/man3/fi_version.3.gz man/man3/fi_wait.3.gz man/man3/fi_wait_open.3.gz man/man3/fi_write.3.gz man/man3/fi_writedata.3.gz man/man3/fi_writemsg.3.gz man/man3/fi_writev.3.gz man/man7/fabric.7.gz man/man7/fi_direct.7.gz man/man7/fi_provider.7.gz -man/man7/fi_rxm.7.gz -man/man7/fi_sockets.7.gz -man/man7/fi_udp.7.gz -%%VERBS%%man/man7/fi_verbs.7.gz +%%RXM%%man/man7/fi_rxm.7.gz +%%SOCKETS%%man/man7/fi_sockets.7.gz +%%UDP%%man/man7/fi_udp.7.gz