Index: Makefile
===================================================================
--- Makefile	(revision 415193)
+++ Makefile	(working copy)
@@ -15,11 +15,9 @@
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo \
-		libhwloc.so:devel/hwloc \
-		libmunge.so:security/munge \
-		librrd.so:databases/rrdtool \
-		libhdf5.so:science/hdf5
+LIB_DEPENDS=	libjson-c.so:devel/json-c \
+		libsysinfo.so:devel/libsysinfo \
+		libmunge.so:security/munge
 
 USERS=		slurm
 GROUPS=		${USERS}
@@ -29,17 +27,42 @@
 USE_RC_SUBR=	slurmctld slurmd
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool perl5 pkgconfig python tar:bz2
-GTK2_USE=	GNOME=glib20,gtk20
-MYSQL_USE=	MYSQL=yes
-CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm
+USES=		gmake libtool pkgconfig python:build tar:bz2
+USE_perl5=	configure
 
-OPTIONS_DEFINE=	DOCS MYSQL GTK2
+OPTIONS_DEFINE=	CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD
+OPTIONS_DEFAULT=HDF5 HWLOC
 OPTIONS_SUB=	yes
 
-GTK2_DESC=	Build GUI config tool sview
+CURL_DESC=	Require cURL for elasticsearch plugins
+GTK2_DESC=	Build sview GUI config tool
+HDF5_DESC=	Job profiling using HDF5
+HWLOC_DESC=	Portable hardware locality
+IPMI_DESC=	IPMI engergy consumption accounting
+RRD_DESC=	RRD external sensor data collection
 
+GTK2_USE=		GNOME=glib20,gtk20
+
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_CONFIGURE_with=	libcurl
+
+HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
+HDF5_CONFIGURE_WITH=	hdf5
+
+HWLOC_LIB_DEPENDS=	libhwloc.so:devel/hwloc
+HWLOC_CONFIGURE_WITH=	hwloc
+
+IPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
+IPMI_CONFIGURE_WITH=	freeipmi
+
+RRD_LIB_DEPENDS=	librrd.so:databases/rrdtool
+RRD_CONFIGURE_WITH=	rrdtool
+
+MYSQL_USE=		MYSQL=yes
+
+CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm
+
 # SLURM's configure enables interactive jobs if pty.h exists.  Replacing
 # #include <pty.h> with appropriate headers will therefore not work, so instead
 # add a pty.h for the build.
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 415193)
+++ pkg-plist	(working copy)
@@ -7,7 +7,7 @@
 bin/scancel
 bin/scontrol
 bin/sdiag
-bin/sh5util
+%%HDF5%%bin/sh5util
 bin/sinfo
 bin/smap
 bin/sprio
@@ -59,8 +59,10 @@
 lib/slurm/acct_gather_filesystem_none.so
 lib/slurm/acct_gather_infiniband_none.a
 lib/slurm/acct_gather_infiniband_none.so
-lib/slurm/acct_gather_profile_hdf5.a
-lib/slurm/acct_gather_profile_hdf5.so
+%%IPMI%%lib/slurm/acct_gather_energy_ipmi.a
+%%IPMI%%lib/slurm/acct_gather_energy_ipmi.so
+%%HDF5%%lib/slurm/acct_gather_profile_hdf5.a
+%%HDF5%%lib/slurm/acct_gather_profile_hdf5.so
 lib/slurm/acct_gather_profile_none.a
 lib/slurm/acct_gather_profile_none.so
 lib/slurm/auth_munge.a
@@ -67,6 +69,10 @@
 lib/slurm/auth_munge.so
 lib/slurm/auth_none.a
 lib/slurm/auth_none.so
+lib/slurm/burst_buffer_cray.a
+lib/slurm/burst_buffer_cray.so
+lib/slurm/power_cray.a
+lib/slurm/power_cray.so
 lib/slurm/burst_buffer_generic.a
 lib/slurm/burst_buffer_generic.so
 lib/slurm/checkpoint_none.a
@@ -83,8 +89,8 @@
 lib/slurm/crypto_openssl.so
 lib/slurm/ext_sensors_none.a
 lib/slurm/ext_sensors_none.so
-lib/slurm/ext_sensors_rrd.a
-lib/slurm/ext_sensors_rrd.so
+%%RRD%%lib/slurm/ext_sensors_rrd.a
+%%RRD%%lib/slurm/ext_sensors_rrd.so
 lib/slurm/gres_gpu.a
 lib/slurm/gres_gpu.so
 lib/slurm/gres_mic.a
@@ -121,6 +127,8 @@
 lib/slurm/jobacct_gather_linux.so
 lib/slurm/jobacct_gather_none.a
 lib/slurm/jobacct_gather_none.so
+%%CURL%%lib/slurm/jobcomp_elasticsearch.a
+%%CURL%%lib/slurm/jobcomp_elasticsearch.so
 lib/slurm/jobcomp_filetxt.a
 lib/slurm/jobcomp_filetxt.so
 %%MYSQL%%lib/slurm/jobcomp_mysql.a