4 files changed, 116 insertions, 149 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index f6eb1ae80253..1829a6f6a386 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ejabberd
-PORTVERSION=	19.05
+PORTVERSION=	19.08
 CATEGORIES=	net-im
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -46,9 +46,10 @@ GH_TUPLE=	erlang-lager:lager:${LAGER_VER}:lager/deps/lager \
 		dvv:base64url:f2c64ed8:base64url/deps/base64url \
 		processone:ezlib:${EZLIB_VER}:ezlib/deps/ezlib \
 		processone:pkix:${PKIX_VER}:pkix/deps/pkix \
-		processone:mqtree:${MQTREE_VER}:mqtree/deps/mqtree
+		processone:mqtree:${MQTREE_VER}:mqtree/deps/mqtree \
+		processone:yconf:${YCONF_VER}:yconf/deps/yconf
 
-OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL RIAK REDIS SIP SQLITE \
+OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL REDIS SIP SQLITE \
 		STUN TOOLS FULLXML
 
 EJABBERD_LIBDIR=lib/erlang/lib
@@ -68,7 +69,6 @@ SUBS= 		PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}		\
 		FAST_XML_VER=${FAST_XML_VER}				\
 		FAST_YAML_VER=${FAST_YAML_VER}				\
 		GOLDRUSH_VER=${GOLDRUSH_VER}				\
-		HAMCREST_VER=${HAMCREST_VER}				\
 		JIFFY_VER=${JIFFY_VER} JOSE_VER=${JOSE_VER}		\
 		LAGER_VER=${LAGER_VER} LUERL_VER=${LUERL_VER}		\
 		MQTREE_VER=${MQTREE_VER}				\
@@ -76,10 +76,9 @@ SUBS= 		PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}		\
 		P1_OAUTH2_VER=${P1_OAUTH2_VER}				\
 		P1_PGSQL_VER=${P1_PGSQL_VER}				\
 		P1_UTILS_VER=${P1_UTILS_VER} PKIX_VER=${PKIX_VER}	\
-		RIAK_PB_VER=${RIAK_PB_VER} RIAKC_VER=${RIAKC_VER}	\
 		SQLITE3_VER=${SQLITE3_VER}				\
 		STRINGPREP_VER=${STRINGPREP_VER} STUN_VER=${STUN_VER}	\
-		XMPP_VER=${XMPP_VER}
+		XMPP_VER=${XMPP_VER} YCONF_VER=${YCONF_VER}
 
 SUB_FILES=	pkg-message pkg-install
 PLIST_SUB=	${SUBS}
@@ -90,36 +89,33 @@ SUB_LIST=	${SUBS} \
 SHEBANG_FILES=	${WRKSRC}/ejabberdctl.template
 
 BASE64URL_VER=	0.0.1
-CACHE_TAB_VER=	1.0.19
-EIMP_VER=	1.0.11
+CACHE_TAB_VER=	1.0.20
+EIMP_VER=	1.0.12
 EPAM_VER=	1.0.6
 EREDIS_VER=	1.0.8
-ESIP_VER=	1.0.29
+ESIP_VER=	1.0.30
 EZLIB_VER=	1.0.6
-FAST_TLS_VER=	1.1.1
-FAST_XML_VER=	1.1.36
-FAST_YAML_VER=	1.0.19
+FAST_TLS_VER=	1.1.2
+FAST_XML_VER=	1.1.37
+FAST_YAML_VER=	1.0.20
 GOLDRUSH_VER=	0.1.9
-HAMCREST_VER=	0.4.1
 JIFFY_VER=	0.14.8
 JOSE_VER=	1.8.4
 LAGER_VER=	3.6.10
 LUERL_VER=	0.3
-MQTREE_VER=	1.0.3
+MQTREE_VER=	1.0.4
 P1_MYSQL_VER=	1.0.11
 P1_OAUTH2_VER=	0.6.5
 P1_PGSQL_VER=	1.1.8
-P1_UTILS_VER=	1.0.15
-PKIX_VER=	1.0.2
-RIAK_PB_VER=	2.3.2
-RIAKC_VER=	develop
+P1_UTILS_VER=	1.0.16
+PKIX_VER=	1.0.3
 SQLITE3_VER=	1.1.6
-STRINGPREP_VER=	1.0.16
-STUN_VER=	1.0.28
-XMPP_VER=	1.3.4
+STRINGPREP_VER=	1.0.17
+STUN_VER=	1.0.29
+XMPP_VER=	1.4.0
+YCONF_VER=	1.0.0
 
 OPTIONS_SUB=		yes
-RIAK_DESC=	Riak database support
 SIP_DESC=	SIP support
 STUN_DESC=	STUN/TURN support
 TOOLS_DESC=	Build development tools
@@ -131,10 +127,6 @@ MYSQL_CONFIGURE_ENABLE=	mysql
 MYSQL_GH_TUPLE=	processone:p1_mysql:${P1_MYSQL_VER}:p1_mysql/deps/p1_mysql
 PGSQL_CONFIGURE_ENABLE=	pgsql
 PGSQL_GH_TUPLE=	processone:p1_pgsql:${P1_PGSQL_VER}:p1_pgsql/deps/p1_pgsql
-RIAK_CONFIGURE_ENABLE=	riak
-RIAK_GH_TUPLE=	processone:riak-erlang-client:${RIAKC_VER}:riakc/deps/riakc \
-		basho:riak_pb:${RIAK_PB_VER}:riak_pb/deps/riak_pb \
-		basho:hamcrest-erlang:${HAMCREST_VER}:hamcrest/deps/hamcrest
 REDIS_CONFIGURE_ENABLE=	redis
 REDIS_GH_TUPLE=	wooga:eredis:v${EREDIS_VER}:eredis/deps/eredis
 SIP_CONFIGURE_ENABLE=	sip
@@ -163,10 +155,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,%%PORTVERSION%%,${PORTVERSION},' ${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e '/vsn/s/git/"${JIFFY_VER}"/' ${WRKSRC}/deps/jiffy/src/jiffy.app.src
 
-post-patch-RIAK-on:
-	@${REINPLACE_CMD} -e '/vsn/s/git/"${RIAK_PB_VER}"/' ${WRKSRC}/deps/riak_pb/src/riak_pb.app.src
-	@${REINPLACE_CMD} -e '/vsn/s/git/"${RIAKC_VER}"/' ${WRKSRC}/deps/riakc/src/riakc.app.src
-
 pre-configure:
 	cd ${WRKSRC} && ${SH} autogen.sh
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/configure
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index 4708e42350b5..db3017279074 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,40 +1,42 @@
-TIMESTAMP = 1560260414
-SHA256 (processone-ejabberd-19.05_GH0.tar.gz) = 3898b28711d472cb0a9ed57c2be23c9b4251b86e5d114321e2fdd49bc4e7272e
-SIZE (processone-ejabberd-19.05_GH0.tar.gz) = 1865845
+TIMESTAMP = 1565947309
+SHA256 (processone-ejabberd-19.08_GH0.tar.gz) = 25f7264a2129b55eefa8dd188abf04757a4407d28f437c8a11c47db1c246f473
+SIZE (processone-ejabberd-19.08_GH0.tar.gz) = 1848914
 SHA256 (erlang-lager-lager-3.6.10_GH0.tar.gz) = c5bb4ba6f918e90d2e6671c3996d72c61f2a589b65c151b3df8011d046362981
 SIZE (erlang-lager-lager-3.6.10_GH0.tar.gz) = 268657
-SHA256 (processone-p1_utils-1.0.15_GH0.tar.gz) = 7c43ea1188efe646beaacd19ab36fd5102a7f46e69bc9d8071c7d66666740930
-SIZE (processone-p1_utils-1.0.15_GH0.tar.gz) = 63049
-SHA256 (processone-cache_tab-1.0.19_GH0.tar.gz) = 221f25898c132d5575926184aced866b8898136b67bcdf1c6098850faa6254c3
-SIZE (processone-cache_tab-1.0.19_GH0.tar.gz) = 22503
-SHA256 (processone-fast_tls-1.1.1_GH0.tar.gz) = d24531cc21e5492e1d292d7c552bda76ec44b36be520f5c182df445dc0daef50
-SIZE (processone-fast_tls-1.1.1_GH0.tar.gz) = 80589
-SHA256 (processone-stringprep-1.0.16_GH0.tar.gz) = 93cba9f26280b1c4c5dde6ebb4a114253dc79cfaa329ad12bd02f653e5ac8f95
-SIZE (processone-stringprep-1.0.16_GH0.tar.gz) = 98798
-SHA256 (processone-fast_xml-1.1.36_GH0.tar.gz) = 95507f497bb7ea78bf519bfc031cc043083320dde2d79552f9f1e43e458109d6
-SIZE (processone-fast_xml-1.1.36_GH0.tar.gz) = 97095
-SHA256 (processone-xmpp-1.3.4_GH0.tar.gz) = 34b0b4360cb3875895fe21866e17182c2f38b6706a5c1ab8cc780579ccdb84f5
-SIZE (processone-xmpp-1.3.4_GH0.tar.gz) = 470150
-SHA256 (processone-fast_yaml-1.0.19_GH0.tar.gz) = 5c69a218866bf1e4b767123ca8113029e79d26baf5d582d6b51be0051869b841
-SIZE (processone-fast_yaml-1.0.19_GH0.tar.gz) = 53730
+SHA256 (processone-p1_utils-1.0.16_GH0.tar.gz) = 2559967770558dc003bcc3c7efc216f6c57c4f23830d5de33c6bf61d8a3f880c
+SIZE (processone-p1_utils-1.0.16_GH0.tar.gz) = 63418
+SHA256 (processone-cache_tab-1.0.20_GH0.tar.gz) = 572b6532dca59c561d994bf2bf8eed3637118c64cdd3a9e51d81b506f5b09e2c
+SIZE (processone-cache_tab-1.0.20_GH0.tar.gz) = 22903
+SHA256 (processone-fast_tls-1.1.2_GH0.tar.gz) = 6444e174650054a53624490155a914b8bea31cdefbcd5f87fc1862102dc1db6e
+SIZE (processone-fast_tls-1.1.2_GH0.tar.gz) = 80657
+SHA256 (processone-stringprep-1.0.17_GH0.tar.gz) = 119b751f569baecc4d911ff3c2a6a33a042f8d0b2e64445072d1af14ed935fc0
+SIZE (processone-stringprep-1.0.17_GH0.tar.gz) = 98819
+SHA256 (processone-fast_xml-1.1.37_GH0.tar.gz) = f3226683ec9c8406147a025beebb5b9ed0adcb28099b7c4bb9435a369e9ac3f9
+SIZE (processone-fast_xml-1.1.37_GH0.tar.gz) = 99004
+SHA256 (processone-xmpp-1.4.0_GH0.tar.gz) = d829a6b05928a8adfdf7271df2be0a660333ecc4243e1cd2b18a1bfb8b9dc110
+SIZE (processone-xmpp-1.4.0_GH0.tar.gz) = 480387
+SHA256 (processone-fast_yaml-1.0.20_GH0.tar.gz) = 7fcf65b95f822a9b7510b3b543cdf3512ca48f0274ea14a7f75e5843d8f4d22f
+SIZE (processone-fast_yaml-1.0.20_GH0.tar.gz) = 54476
 SHA256 (davisp-jiffy-0.14.8_GH0.tar.gz) = 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d
 SIZE (davisp-jiffy-0.14.8_GH0.tar.gz) = 1856737
 SHA256 (processone-p1_oauth2-0.6.5_GH0.tar.gz) = 55bf54133ce0882fab59f813ddf9ed4dac1e051a53fb4bd1c0565136ebb4d6ac
 SIZE (processone-p1_oauth2-0.6.5_GH0.tar.gz) = 213847
 SHA256 (potatosalad-erlang-jose-1.8.4_GH0.tar.gz) = a21d514c8b079497f237359f718881d8d5b847cf07e696c2839d1e726e97009a
 SIZE (potatosalad-erlang-jose-1.8.4_GH0.tar.gz) = 230947
-SHA256 (processone-eimp-1.0.11_GH0.tar.gz) = dc83921a99d13204102783cf1cc706a2a8ad52f9b7247658e22acc3c1dbdbc60
-SIZE (processone-eimp-1.0.11_GH0.tar.gz) = 3476081
+SHA256 (processone-eimp-1.0.12_GH0.tar.gz) = dfcdc211480f974175af615616c7f8c1e8f9dff5d6be5faa3f20c3eb4c60240e
+SIZE (processone-eimp-1.0.12_GH0.tar.gz) = 3476420
 SHA256 (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612
 SIZE (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 24548
 SHA256 (dvv-base64url-f2c64ed8_GH0.tar.gz) = d300342e54059b5147b14b2680808354c26c17b1c785b3a0f658644524eda208
 SIZE (dvv-base64url-f2c64ed8_GH0.tar.gz) = 2769
 SHA256 (processone-ezlib-1.0.6_GH0.tar.gz) = 7d39a3cb92ed7781b6b6ba95704e2591c626d62eddb3c52dcaeac60c339084d7
 SIZE (processone-ezlib-1.0.6_GH0.tar.gz) = 49136
-SHA256 (processone-pkix-1.0.2_GH0.tar.gz) = f7dfec92de40d9f87cc9d4cd19a8883e04dc8eff40c0a2898fd4d0a8f0f31ffb
-SIZE (processone-pkix-1.0.2_GH0.tar.gz) = 378132
-SHA256 (processone-mqtree-1.0.3_GH0.tar.gz) = 1982310a2b36a2b4e4c1d8e74d0d8d7df1850ad409f09940e7d08edb6c16aec9
-SIZE (processone-mqtree-1.0.3_GH0.tar.gz) = 227876
+SHA256 (processone-pkix-1.0.3_GH0.tar.gz) = d4ebd7216eb9ee61f75560c9c69e6403e434d32d3f5bc88dfa5fa1c157a842c5
+SIZE (processone-pkix-1.0.3_GH0.tar.gz) = 391302
+SHA256 (processone-mqtree-1.0.4_GH0.tar.gz) = 55e08983c6a6a67097dce4a9b842e7e9133a3e51ee067603942f65143aed20b6
+SIZE (processone-mqtree-1.0.4_GH0.tar.gz) = 227872
+SHA256 (processone-yconf-1.0.0_GH0.tar.gz) = 1aea60d43cf67887e43a7e34ec96ea74cc49f70a80b0d1184a0f8673694d79a0
+SIZE (processone-yconf-1.0.0_GH0.tar.gz) = 220239
 SHA256 (processone-p1_mysql-1.0.11_GH0.tar.gz) = d444bc5b1803150e16cc8714ff22c625cd1f1e23d1ce9019458efa52def95650
 SIZE (processone-p1_mysql-1.0.11_GH0.tar.gz) = 25958
 SHA256 (processone-epam-1.0.6_GH0.tar.gz) = 3cd4f649ee8fe120e8e928373ae496b5e1dcbd9d4f653759e1c93bdff7f22524
@@ -43,17 +45,11 @@ SHA256 (processone-p1_pgsql-1.1.8_GH0.tar.gz) = 7ec4a35d69c33c8c190bef9a746b2147
 SIZE (processone-p1_pgsql-1.1.8_GH0.tar.gz) = 24162
 SHA256 (wooga-eredis-v1.0.8_GH0.tar.gz) = cd75c5b19dca8b23ec998fecf83ea5f0e29f3cb75618a61d3080168c66509b56
 SIZE (wooga-eredis-v1.0.8_GH0.tar.gz) = 124993
-SHA256 (processone-riak-erlang-client-develop_GH0.tar.gz) = ec799586309d7c4291a252311126c79b8d0696e1df674ba892f45bc35155ecf0
-SIZE (processone-riak-erlang-client-develop_GH0.tar.gz) = 276401
-SHA256 (basho-riak_pb-2.3.2_GH0.tar.gz) = c42a96ab46a9ac81e4278fac45010e18014f0e3c063ad90a4f763d828b97320d
-SIZE (basho-riak_pb-2.3.2_GH0.tar.gz) = 387073
-SHA256 (basho-hamcrest-erlang-0.4.1_GH0.tar.gz) = 4808f973e5df50761a093579124a52b661803dac74061b87c7642c5c14b0a2db
-SIZE (basho-hamcrest-erlang-0.4.1_GH0.tar.gz) = 162203
-SHA256 (processone-esip-1.0.29_GH0.tar.gz) = eb705ac2b37c97ba32940b14092dd7a6857e579c4d06b60073cde136696b8d6d
-SIZE (processone-esip-1.0.29_GH0.tar.gz) = 89409
+SHA256 (processone-esip-1.0.30_GH0.tar.gz) = 4c8dbba1dfcbb16a300fea5fd75f5ab2a145f011fa1ebff37e31e1672a9bc285
+SIZE (processone-esip-1.0.30_GH0.tar.gz) = 89481
 SHA256 (processone-erlang-sqlite3-1.1.6_GH0.tar.gz) = dec01d20fa8df7d7690514ccae413cfa56fac7373d0a569cd44b43fe0f11e79a
 SIZE (processone-erlang-sqlite3-1.1.6_GH0.tar.gz) = 1834834
-SHA256 (processone-stun-1.0.28_GH0.tar.gz) = 8d53c51f7db8c1d69162c95efe9f371005be881966a03dd167793f1b62bcd275
-SIZE (processone-stun-1.0.28_GH0.tar.gz) = 32993
+SHA256 (processone-stun-1.0.29_GH0.tar.gz) = 87cfd9d75c7b956b4c26c9e94492737a4528abf4b09f4f7d89a40abaa0dc088a
+SIZE (processone-stun-1.0.29_GH0.tar.gz) = 32991
 SHA256 (rvirding-luerl-v0.3_GH0.tar.gz) = 37c6d2be8ecc624a8bf469b80609c4e3f2f079c30886575c31c46391dfedfec6
 SIZE (rvirding-luerl-v0.3_GH0.tar.gz) = 95182
diff --git a/net-im/ejabberd/files/pkg-message.in b/net-im/ejabberd/files/pkg-message.in
index 2d06653ea291..6b000d3ebc91 100644
--- a/net-im/ejabberd/files/pkg-message.in
+++ b/net-im/ejabberd/files/pkg-message.in
@@ -1,6 +1,7 @@
-[
-{ type: install
-  message: <<EOM
+------------------------------------------------------------------------
+
+Congratulations, you have installed %%PORTNAME%%!
+
   o To enable ejabberd you need to add following string to your /etc/rc.conf:
 
 	ejabberd_enable="YES"
@@ -12,6 +13,5 @@
     of this port! Users are advised to check all configuration files and data
     in /var/spool/ejabberd to ensure everything has the correct owner/group.
   o To start using CAPTCHA functionality, please install ImageMagick port.
-EOM
-}
-]
+
+------------------------------------------------------------------------
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index 1c01cef45eef..806a2ab19c30 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -6,6 +6,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/acme_challenge.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/econf.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_access_permissions.beam
@@ -16,10 +17,10 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_anonymous.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_external.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_jwt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_ldap.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_mnesia.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_pam.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_backend_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_bosh.beam
@@ -31,7 +32,9 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_commands.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_commands_doc.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_config.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_config_transformer.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_ctl.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_db_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_hooks.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http_ws.beam
@@ -44,18 +47,18 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_oauth_mnesia.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_oauth_rest.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_oauth_sql.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_old_config.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_option.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_options.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_pkix.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_piefxis.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_rdbms.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_redis.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_redis_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_regexp.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_riak.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_riak_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router_mnesia.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router_redis.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router_multicast.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_s2s.beam
@@ -67,7 +70,6 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm_mnesia.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm_redis.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sql_sup.beam
@@ -98,137 +100,159 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/jd2ejd.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/misc.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_adhoc.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_adhoc_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_admin_extra.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_admin_update_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_avatar.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_avatar_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_block_strangers.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_block_strangers_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_blocking.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_bosh.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_bosh_mnesia.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_bosh_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_bosh_redis.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_bosh_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_bosh_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_caps.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_caps_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_caps_riak.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_caps_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_caps_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_carboncopy.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_client_state.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_client_state_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_disco.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_disco_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_delegation.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_echo.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_delegation_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_fail2ban.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_fail2ban_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_api.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_api_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_fileserver.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_fileserver_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_upload.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_upload_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_upload_quota.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_upload_quota_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_legacy_auth.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mam.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mam_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mam_mnesia.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mam_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_metrics.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_metrics_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix_mnesia.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix_pam.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix_pam_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix_pam_mnesia.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix_pam_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mix_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_mnesia.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_session.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_ws.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_admin.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_log.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_log_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_room.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_sql.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_multicast.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_multicast_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline_riak.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_ping.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_ping_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pres_counter.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pres_counter_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privacy.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privacy_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privacy_riak.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privacy_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privacy_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_private.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_private_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_private_riak.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_private_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_private_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privilege.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privilege_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_lib.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_mnesia.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_redis.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_service.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_stream.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub_mnesia.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub_opt.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_keepalive.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_keepalive_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_mnesia.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_push_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register_web.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster_riak.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_s2s_dialback.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_s2s_dialback_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_service_log.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_service_log_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster_ldap.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster_ldap_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster_riak.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_sic.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_sip.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_sip_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_sip_proxy.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_sip_registrar.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_stats.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_stream_mgmt.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_stream_mgmt_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_time.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_ldap.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_ldap_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_mnesia.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_riak.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_mnesia_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_xupdate.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_xupdate_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_version.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_version_opt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mqtt_codec.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_buddy.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_club.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_dag.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_dispatch.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_flat.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_flat_sql.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_hometree.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_hometree_sql.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_mb.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_mb_sql.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_mix.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_mix_sql.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_online.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_pep.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_pep_sql.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_private.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_public.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_dag.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_tree.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_tree_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_virtual.beam
@@ -257,6 +281,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_oauth.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_router.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_sm.hrl
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_sql.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_sql_pt.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_stacktrace.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_web_admin.hrl
@@ -349,6 +374,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-%%FAST_XML_VER%%/ebin/fxml_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-%%FAST_XML_VER%%/ebin/fxmlrpc.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-%%FAST_XML_VER%%/ebin/fxmlrpc_codec.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-%%FAST_XML_VER%%/ebin/fxmlrpc_codec_external.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-%%FAST_XML_VER%%/include/fxml.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-%%FAST_XML_VER%%/include/fxml_gen.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_xml-%%FAST_XML_VER%%/priv/lib/fxml.so
@@ -377,12 +403,6 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gr_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/ebin/gre.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/goldrush-%%GOLDRUSH_VER%%/priv/edoc.css
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/hamcrest-%%HAMCREST_VER%%/ebin/hamcrest.app
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/hamcrest-%%HAMCREST_VER%%/ebin/hamcrest.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/hamcrest-%%HAMCREST_VER%%/ebin/hamcrest_matchers.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/hamcrest-%%HAMCREST_VER%%/ebin/hamcrest_term.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/hamcrest-%%HAMCREST_VER%%/include/hamcrest.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/hamcrest-%%HAMCREST_VER%%/include/hamcrest_internal.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jiffy-%%JIFFY_VER%%/LICENSE
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jiffy-%%JIFFY_VER%%/ebin/jiffy.app
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/jiffy-%%JIFFY_VER%%/ebin/jiffy.beam
@@ -598,48 +618,6 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/pkix-%%PKIX_VER%%/ebin/pkix_app.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/pkix-%%PKIX_VER%%/ebin/pkix_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/pkix-%%PKIX_VER%%/priv/cacert.pem
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/LICENSE
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_dt_pb.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_kv_pb.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_pb.app
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_pb.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_pb_codec.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_pb_dt_codec.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_pb_kv_codec.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_pb_messages.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_pb_search_codec.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_pb_ts_codec.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_search_pb.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_ts_pb.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_ttb_codec.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/ebin/riak_yokozuna_pb.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/include/riak_dt_pb.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/include/riak_kv_pb.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/include/riak_pb.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/include/riak_pb_kv_codec.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/include/riak_search_pb.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/include/riak_ts_pb.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/include/riak_ts_ttb.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riak_pb-%%RIAK_PB_VER%%/include/riak_yokozuna_pb.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/LICENSE
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc.app
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_counter.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_datatype.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_flag.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_gset.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_hll.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_map.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_obj.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_pb_socket.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_register.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_set.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_ts.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_utils.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_ts_get_operator.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_ts_put_operator.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/ebin/riakc_ts_query_operator.beam
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/include/riakc.hrl
-%%RIAK%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/riakc-%%RIAKC_VER%%/priv/edoc.css
 %%SQLITE%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/sqlite3-%%SQLITE3_VER%%/LICENSE
 %%SQLITE%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/sqlite3-%%SQLITE3_VER%%/ebin/sqlite3.app
 %%SQLITE%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/sqlite3-%%SQLITE3_VER%%/ebin/sqlite3.beam
@@ -677,6 +655,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-%%EIMP_VER%%/priv/bin/eimp
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/eimp-%%EIMP_VER%%/LICENSE.txt
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/LICENSE.txt
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/captcha_form.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/flex_offline.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/http_upload.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/jid.beam
@@ -763,6 +742,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_tr.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_uri.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_util.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/include/captcha_form.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/include/flex_offline.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/include/http_upload.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/include/jid.hrl
@@ -808,6 +788,9 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_stream_pkix.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/include/XmppAddr.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/include/scram.hrl
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/yconf-%%YCONF_VER%%/LICENSE
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/yconf-%%YCONF_VER%%/ebin/yconf.app
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/yconf-%%YCONF_VER%%/ebin/yconf.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/captcha.sh
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/css/admin.css
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/css/bosh.css