- Update to 19.02

- Remove patch for the fix for ejabberd bug# 2744
- Remove option: ICONV

4 files changed, 77 insertions, 124 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index c10388f093ff..9c18edca1a28 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ejabberd
-PORTVERSION=	18.12.1
-PORTREVISION=	1
+PORTVERSION=	19.02
 CATEGORIES=	net-im
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -46,11 +45,11 @@ GH_TUPLE=	erlang-lager:lager:${LAGER_VER}:lager/deps/lager \
 		DeadZen:goldrush:${GOLDRUSH_VER}:goldrush/deps/goldrush \
 		dvv:base64url:f2c64ed8:base64url/deps/base64url \
 		processone:ezlib:${EZLIB_VER}:ezlib/deps/ezlib \
-		processone:pkix:${PKIX_VER}:pkix/deps/pkix
+		processone:pkix:${PKIX_VER}:pkix/deps/pkix \
+		processone:mqtree:${MQTREE_VER}:mqtree/deps/mqtree
 
-OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL ICONV RIAK REDIS SIP SQLITE \
+OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL RIAK REDIS SIP SQLITE \
 		STUN TOOLS FULLXML
-OPTIONS_DEFAULT=	ICONV
 
 EJABBERD_LIBDIR=lib/erlang/lib
 MAKE_ENV=	PORTVERSION=${PORTVERSION}
@@ -69,10 +68,10 @@ 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} ICONV_VER=${ICONV_VER}	\
+		HAMCREST_VER=${HAMCREST_VER}				\
 		JIFFY_VER=${JIFFY_VER} JOSE_VER=${JOSE_VER}		\
 		LAGER_VER=${LAGER_VER} LUERL_VER=${LUERL_VER}		\
-		MECK_VER=${MECK_VER}					\
+		MQTREE_VER=${MQTREE_VER}				\
 		P1_MYSQL_VER=${P1_MYSQL_VER}				\
 		P1_OAUTH2_VER=${P1_OAUTH2_VER}				\
 		P1_PGSQL_VER=${P1_PGSQL_VER}				\
@@ -91,34 +90,33 @@ SUB_LIST=	${SUBS} \
 SHEBANG_FILES=	${WRKSRC}/ejabberdctl.template
 
 BASE64URL_VER=	0.0.1
-CACHE_TAB_VER=	1.0.17
-EIMP_VER=	1.0.9
-EPAM_VER=	1.0.4
+CACHE_TAB_VER=	1.0.18
+EIMP_VER=	1.0.10
+EPAM_VER=	1.0.5
 EREDIS_VER=	1.0.8
-ESIP_VER=	1.0.27
-EZLIB_VER=	1.0.4
-FAST_TLS_VER=	1.0.26
-FAST_XML_VER=	1.1.34
-FAST_YAML_VER=	1.0.17
+ESIP_VER=	1.0.28
+EZLIB_VER=	1.0.5
+FAST_TLS_VER=	1.1.0
+FAST_XML_VER=	1.1.35
+FAST_YAML_VER=	1.0.18
 GOLDRUSH_VER=	0.1.9
 HAMCREST_VER=	0.4.1
-ICONV_VER=	1.0.10
 JIFFY_VER=	0.14.8
 JOSE_VER=	1.8.4
 LAGER_VER=	3.6.7
 LUERL_VER=	0.3
-MECK_VER=	0.8.12
-P1_MYSQL_VER=	1.0.8
-P1_OAUTH2_VER=	0.6.3
-P1_PGSQL_VER=	1.1.6
-P1_UTILS_VER=	1.0.13
-PKIX_VER=	1.0.0
+MQTREE_VER=	1.0.2
+P1_MYSQL_VER=	1.0.9
+P1_OAUTH2_VER=	0.6.4
+P1_PGSQL_VER=	1.1.7
+P1_UTILS_VER=	1.0.14
+PKIX_VER=	1.0.1
 RIAK_PB_VER=	2.3.2
 RIAKC_VER=	2.5.3
 SQLITE3_VER=	1.1.6
-STRINGPREP_VER=	1.0.14
-STUN_VER=	1.0.26
-XMPP_VER=	1.2.8
+STRINGPREP_VER=	1.0.15
+STUN_VER=	1.0.27
+XMPP_VER=	1.3.2
 
 OPTIONS_SUB=		yes
 RIAK_DESC=	Riak database support
@@ -137,8 +135,6 @@ 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
-ICONV_CONFIGURE_ENABLE=	iconv
-ICONV_GH_TUPLE=	processone:iconv:${ICONV_VER}:iconv/deps/iconv
 REDIS_CONFIGURE_ENABLE=	redis
 REDIS_GH_TUPLE=	wooga:eredis:v${EREDIS_VER}:eredis/deps/eredis
 SIP_CONFIGURE_ENABLE=	sip
@@ -149,12 +145,9 @@ STUN_GH_TUPLE=	processone:stun:${STUN_VER}:stun/deps/stun
 SQLITE_CONFIGURE_ENABLE=sqlite
 SQLITE_GH_TUPLE=	processone:erlang-sqlite3:${SQLITE3_VER}:sqlite3/deps/sqlite3
 TOOLS_CONFIGURE_ENABLE=	tools
-TOOLS_GH_TUPLE=	rvirding:luerl:v${LUERL_VER}:luerl/deps/luerl \
-		eproxus:meck:${MECK_VER}:meck/deps/meck
+TOOLS_GH_TUPLE=	rvirding:luerl:v${LUERL_VER}:luerl/deps/luerl
 FULLXML_CONFIGURE_ENABLE=	full-xml
 SQLITE_USES=		sqlite
-ICONV_USES=		iconv:wchar_t
-ICONV_LDFLAGS=		${ICONV_LIB}
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=yes
 
 pre-everything::
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index c038ed776331..ee4c703fac40 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,46 +1,46 @@
-TIMESTAMP = 1545907645
-SHA256 (processone-ejabberd-18.12.1_GH0.tar.gz) = 7646d6acd3c0b94e4ed5e1d1c61a32bb4026b90a752942b7f80157d1fa014a97
-SIZE (processone-ejabberd-18.12.1_GH0.tar.gz) = 1781813
+TIMESTAMP = 1551680919
+SHA256 (processone-ejabberd-19.02_GH0.tar.gz) = cce54840c6555d78426d0e75f7e2b4b5b85ea560f1076d59432f7e145ba9af55
+SIZE (processone-ejabberd-19.02_GH0.tar.gz) = 1833558
 SHA256 (erlang-lager-lager-3.6.7_GH0.tar.gz) = 74af1b94f87882128e584c25162a497ccffc1f255840db2c69fc4f9c20c523cb
 SIZE (erlang-lager-lager-3.6.7_GH0.tar.gz) = 266527
-SHA256 (processone-p1_utils-1.0.13_GH0.tar.gz) = 8f21fc0472c314572ebb066d624cb5463cf5b016e18b7fd7dca9dca2a4589382
-SIZE (processone-p1_utils-1.0.13_GH0.tar.gz) = 56548
-SHA256 (processone-cache_tab-1.0.17_GH0.tar.gz) = 938025b3766bb0e2b249e51427a386846cdc072040ec8018f305a1390f06406b
-SIZE (processone-cache_tab-1.0.17_GH0.tar.gz) = 18819
-SHA256 (processone-fast_tls-1.0.26_GH0.tar.gz) = a559c9b61aaa9954178a1a5e56c63694e6431f193b8fdd1489382118f97a799b
-SIZE (processone-fast_tls-1.0.26_GH0.tar.gz) = 76348
-SHA256 (processone-stringprep-1.0.14_GH0.tar.gz) = 32245561f84b03b9024c8768ad2ac8d67f285a032a7f36ff35a74c77fc701f96
-SIZE (processone-stringprep-1.0.14_GH0.tar.gz) = 95662
-SHA256 (processone-fast_xml-1.1.34_GH0.tar.gz) = 8615f77a1448e297af25f85261b6e4a84952af797da2e317c8ec71fe2fe779ac
-SIZE (processone-fast_xml-1.1.34_GH0.tar.gz) = 93530
-SHA256 (processone-xmpp-1.2.8_GH0.tar.gz) = 75c12a71153905ca53d7b732fb5d0589cf0dc3d045d1f8d343023db42f94c688
-SIZE (processone-xmpp-1.2.8_GH0.tar.gz) = 460500
-SHA256 (processone-fast_yaml-1.0.17_GH0.tar.gz) = d2675ec9b2f64eba6c3437597e3abe3bfaae2172560784456a2763d1d1a50b08
-SIZE (processone-fast_yaml-1.0.17_GH0.tar.gz) = 49925
+SHA256 (processone-p1_utils-1.0.14_GH0.tar.gz) = ca38f68d2547b7615dfe4d17ba262b5983ff293a0ccf7fa3ab21c4bdc7b0f13b
+SIZE (processone-p1_utils-1.0.14_GH0.tar.gz) = 60573
+SHA256 (processone-cache_tab-1.0.18_GH0.tar.gz) = 167ab8bcf99a448657afe4deac4683a30d5a0965f3b8a432da47bc57dbf5b6e7
+SIZE (processone-cache_tab-1.0.18_GH0.tar.gz) = 22440
+SHA256 (processone-fast_tls-1.1.0_GH0.tar.gz) = f3ca2a5b95b72108fb34e600f0b1a8e9ae61aa7f4d9476a458bf6b54af170f94
+SIZE (processone-fast_tls-1.1.0_GH0.tar.gz) = 80577
+SHA256 (processone-stringprep-1.0.15_GH0.tar.gz) = d9652ca1f3bc079c3c442e2347bad86365bd2debfa93a53d1dc21089a65dea1b
+SIZE (processone-stringprep-1.0.15_GH0.tar.gz) = 98809
+SHA256 (processone-fast_xml-1.1.35_GH0.tar.gz) = 2c3f09d763d58ffaf06a76fbaadff9deb0d5ef5c1c4b5d7a49f5ba8e03603588
+SIZE (processone-fast_xml-1.1.35_GH0.tar.gz) = 97094
+SHA256 (processone-xmpp-1.3.2_GH0.tar.gz) = ce136d895514ce2cea36ae9f69752a8f42822a91e6f1438366c012ec24cb50c3
+SIZE (processone-xmpp-1.3.2_GH0.tar.gz) = 466555
+SHA256 (processone-fast_yaml-1.0.18_GH0.tar.gz) = 52e3c2598bacd11f52ebf846bf37627678bef10153dc90adabb876c8d123dae2
+SIZE (processone-fast_yaml-1.0.18_GH0.tar.gz) = 53546
 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.3_GH0.tar.gz) = d7d954376ae7c131a0884c7c80b0b9e8270b6f574182df59ce4f2fbbae322854
-SIZE (processone-p1_oauth2-0.6.3_GH0.tar.gz) = 213860
+SHA256 (processone-p1_oauth2-0.6.4_GH0.tar.gz) = cdea693b9c60c0af6ca5c383337b69e344dd4adfa090ce90622f09dbdc442202
+SIZE (processone-p1_oauth2-0.6.4_GH0.tar.gz) = 213869
 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.9_GH0.tar.gz) = c5057ce430fafc1559fbf37e70c3bd08dcb8b9d792d8827679faefd756c82ce5
-SIZE (processone-eimp-1.0.9_GH0.tar.gz) = 3471343
+SHA256 (processone-eimp-1.0.10_GH0.tar.gz) = 67b0a2f9fc9829207704b41948fffc9c4df7ec630c8215e8dae473a8a4b00dfc
+SIZE (processone-eimp-1.0.10_GH0.tar.gz) = 3476089
 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.4_GH0.tar.gz) = 3328661c512c28e68db69b82202b8d6c4127f31f2aefc5b0040ba9bce6abe9b3
-SIZE (processone-ezlib-1.0.4_GH0.tar.gz) = 45510
-SHA256 (processone-pkix-1.0.0_GH0.tar.gz) = 07cd3e9a88b17e7f848a955ddcb420e6b7594be0120eff043ce289dfb12e1dc1
-SIZE (processone-pkix-1.0.0_GH0.tar.gz) = 373631
-SHA256 (processone-iconv-1.0.10_GH0.tar.gz) = 8a9ff8a3dd983284caa964f118b5782ef1c0c662995608b2ca4f4a5f285605a9
-SIZE (processone-iconv-1.0.10_GH0.tar.gz) = 121594
-SHA256 (processone-p1_mysql-1.0.8_GH0.tar.gz) = 94e50b45bf7da78aebaaf3925aa7b9092b22e851276ee379fa11f0b0a2236b56
-SIZE (processone-p1_mysql-1.0.8_GH0.tar.gz) = 21914
-SHA256 (processone-epam-1.0.4_GH0.tar.gz) = 50faf47b1a130525beaf3fcbf8f0412e9626b9e3fde2c082dcada50aaf3330a4
-SIZE (processone-epam-1.0.4_GH0.tar.gz) = 43816
-SHA256 (processone-p1_pgsql-1.1.6_GH0.tar.gz) = f309ac90499b56f7b4c572880b1daa6e24dae95d0bdf52383fa0a773f6a4476b
-SIZE (processone-p1_pgsql-1.1.6_GH0.tar.gz) = 20545
+SHA256 (processone-ezlib-1.0.5_GH0.tar.gz) = a5aabbc07edbd6e496fdfd192b174699d714f8184287ee93e2adfe0ea78fff31
+SIZE (processone-ezlib-1.0.5_GH0.tar.gz) = 49137
+SHA256 (processone-pkix-1.0.1_GH0.tar.gz) = 236af02c6eb01ad667cbb7f9927b1679fdeb8b694c7b9c4389cb9d3ee540b8ea
+SIZE (processone-pkix-1.0.1_GH0.tar.gz) = 378043
+SHA256 (processone-mqtree-1.0.2_GH0.tar.gz) = 3391ec500213e4762888cd53925f3259014498bba99a2b4ae2b9b6c7107e1dc9
+SIZE (processone-mqtree-1.0.2_GH0.tar.gz) = 227871
+SHA256 (processone-p1_mysql-1.0.9_GH0.tar.gz) = d2c53f66a53aa4d8f071ef970b7f5606f1bf0e809f5e9052841a6157c4f07955
+SIZE (processone-p1_mysql-1.0.9_GH0.tar.gz) = 25633
+SHA256 (processone-epam-1.0.5_GH0.tar.gz) = 1727d03a2b312aa21c1cda2bf945fcb6b8bdab72e7674bbee4d0e4be70caf4f4
+SIZE (processone-epam-1.0.5_GH0.tar.gz) = 47497
+SHA256 (processone-p1_pgsql-1.1.7_GH0.tar.gz) = b7e445f0004643acc06adead9c5be1997101b65f43344ca854ebcd86b6bdc2f3
+SIZE (processone-p1_pgsql-1.1.7_GH0.tar.gz) = 24169
 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-2.5.3_GH0.tar.gz) = 745ef053d98935115279518e45bb0d9583dfe4bca084f812bb8b8658c33f0ace
@@ -49,13 +49,11 @@ SHA256 (basho-riak_pb-2.3.2_GH0.tar.gz) = c42a96ab46a9ac81e4278fac45010e18014f0e
 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.27_GH0.tar.gz) = b4e250087f777b9c0fb65af9558337bfff5696b95a1f386238f2d2047263417b
-SIZE (processone-esip-1.0.27_GH0.tar.gz) = 85844
+SHA256 (processone-esip-1.0.28_GH0.tar.gz) = f9cc4a7a499eac46e48e4990e07df83c16cdb7f7ec2f70f23fe4719c14d716ef
+SIZE (processone-esip-1.0.28_GH0.tar.gz) = 89407
 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.26_GH0.tar.gz) = 6bf8d36def614e2070e4655adc94561089668c93c56ec5dea357eaaf481eabb2
-SIZE (processone-stun-1.0.26_GH0.tar.gz) = 29333
+SHA256 (processone-stun-1.0.27_GH0.tar.gz) = 70e05db32d11fcc63876f3ead4816095614e32ca2482493c8a816462ab2639c3
+SIZE (processone-stun-1.0.27_GH0.tar.gz) = 32989
 SHA256 (rvirding-luerl-v0.3_GH0.tar.gz) = 37c6d2be8ecc624a8bf469b80609c4e3f2f079c30886575c31c46391dfedfec6
 SIZE (rvirding-luerl-v0.3_GH0.tar.gz) = 95182
-SHA256 (eproxus-meck-0.8.12_GH0.tar.gz) = abe94d8897aa354c6714c6c6d25eb1de81b91b2661b9d80c0b273b4b61300d5b
-SIZE (eproxus-meck-0.8.12_GH0.tar.gz) = 50998
diff --git a/net-im/ejabberd/files/patch-ejabberd-bug2744.diff b/net-im/ejabberd/files/patch-ejabberd-bug2744.diff
deleted file mode 100644
index 5c512d67fc77..000000000000
--- a/net-im/ejabberd/files/patch-ejabberd-bug2744.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-From 06d69c5277f08d9a57f74836c247d3927ca390e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
-Date: Mon, 7 Jan 2019 16:08:58 +0100
-Subject: [PATCH] Fix decompressing of custom elements with custom namespace
-
---- src/xml_compress.erl.orig	2018-12-21 09:44:15 UTC
-+++ src/xml_compress.erl
-@@ -506,8 +506,8 @@ decode_child(<<2:8, Rest/binary>>, PNs, J1, J2) ->
-   {Children, Rest4} = decode_children(Rest3, PNs, J1, J2),
-   {{xmlel, Name, Attrs, Children}, Rest4};
- decode_child(<<3:8, Rest/binary>>, PNs, J1, J2) ->
--  {Name, Rest2} = decode_string(Rest),
--  {Ns, Rest3} = decode_string(Rest2),
-+  {Ns, Rest2} = decode_string(Rest),
-+  {Name, Rest3} = decode_string(Rest2),
-   {Attrs, Rest4} = decode_attrs(Rest3),
-   {Children, Rest5} = decode_children(Rest4, Ns, J1, J2),
-   {{xmlel, Name, add_ns(PNs, Ns, Attrs), Children}, Rest5};
- src/xml_compress.erl       | 4 ++--
- tools/xml_compress_gen.erl | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- tools/xml_compress_gen.erl.orig	2018-12-21 09:44:15 UTC
-+++ tools/xml_compress_gen.erl
-@@ -117,8 +117,8 @@ gen_decode(Dev, Data, VerId) ->
- 		   "  {Children, Rest4} = decode_children(Rest3, PNs, J1, J2),~n"
- 		   "  {{xmlel, Name, Attrs, Children}, Rest4};~n", []),
-     io:format(Dev, "decode_child(<<3:8, Rest/binary>>, PNs, J1, J2) ->~n"
--		   "  {Name, Rest2} = decode_string(Rest),~n"
--		   "  {Ns, Rest3} = decode_string(Rest2),~n"
-+		   "  {Ns, Rest2} = decode_string(Rest),~n"
-+		   "  {Name, Rest3} = decode_string(Rest2),~n"
- 		   "  {Attrs, Rest4} = decode_attrs(Rest3),~n"
- 		   "  {Children, Rest5} = decode_children(Rest4, Ns, J1, J2),~n"
- 		   "  {{xmlel, Name, add_ns(PNs, Ns, Attrs), Children}, Rest5};~n", []),
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index 4930307a37d0..c03f497893ad 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -137,6 +137,15 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mam_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_metrics.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_pam.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_session.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_mqtt_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_admin.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_log.beam
@@ -200,6 +209,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_sql.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_xupdate.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_version.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
@@ -267,6 +277,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_shared_roster.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_vcard.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_vcard_xupdate.hrl
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mqtt.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/pubsub.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/translate.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/base64url-%%BASE64URL_VER%%/LICENSE.txt
@@ -526,25 +537,10 @@
 %%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_scan.beam
 %%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/luerl_sup.beam
 %%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/luerl-%%LUERL_VER%%/ebin/ttdict.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/LICENSE
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck.app
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_args_matcher.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_code.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_code_gen.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_cover.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_expect.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_history.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_matcher.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_proc.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_ret_spec.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/meck-%%MECK_VER%%/ebin/meck_util.beam
-%%ICONV%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/iconv-%%ICONV_VER%%/LICENSE.txt
-%%ICONV%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/iconv-%%ICONV_VER%%/ebin/iconv.app
-%%ICONV%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/iconv-%%ICONV_VER%%/ebin/iconv.beam
-%%ICONV%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/iconv-%%ICONV_VER%%/ebin/iconv_app.beam
-%%ICONV%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/iconv-%%ICONV_VER%%/ebin/iconv_sup.beam
-%%ICONV%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/iconv-%%ICONV_VER%%/priv/lib/iconv.so
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/mqtree-%%MQTREE_VER%%/LICENSE
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/mqtree-%%MQTREE_VER%%/ebin/mqtree.app
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/mqtree-%%MQTREE_VER%%/ebin/mqtree.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/mqtree-%%MQTREE_VER%%/priv/lib/mqtree.so
 %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/COPYING
 %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql.app
 %%MYSQL%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_mysql-%%P1_MYSQL_VER%%/ebin/p1_mysql.beam
@@ -754,6 +750,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0363.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0369.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0377.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0405.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp.app
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_codec.beam