svn commit: r484440 - head/net/libfabric

[Yuri Victorovich]

Author: yuri
Date: Thu Nov  8 08:54:36 2018
New Revision: 484440
URL: https://svnweb.freebsd.org/changeset/ports/484440

Log:
  net/libfabric: Add port options for individual providers; Enclose the VERBS option in .if/.else
  
  Requested by:	mat (VERBS option .if/.else enclosure)

Modified:
  head/net/libfabric/Makefile
  head/net/libfabric/pkg-plist

Modified: head/net/libfabric/Makefile
==============================================================================
--- head/net/libfabric/Makefile	Thu Nov  8 08:38:09 2018	(r484439)
+++ head/net/libfabric/Makefile	Thu Nov  8 08:54:36 2018	(r484440)
@@ -3,6 +3,7 @@
 PORTNAME=	libfabric
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	yuri at FreeBSD.org
@@ -21,19 +22,23 @@ 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 '<asm/types\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<asm/types\.h>|<sys/types.h>|'

Modified: head/net/libfabric/pkg-plist
==============================================================================
--- head/net/libfabric/pkg-plist	Thu Nov  8 08:38:09 2018	(r484439)
+++ head/net/libfabric/pkg-plist	Thu Nov  8 08:54:36 2018	(r484440)
@@ -149,7 +149,6 @@ 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