- Update to 18.09

- Remove ZLIB option, as ezlib component is mandatory now

PR:		231767

3 files changed, 83 insertions, 106 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 808b3c8f9d94..b011d3b79992 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ejabberd
-PORTVERSION=	18.06
+PORTVERSION=	18.09
 CATEGORIES=	net-im
 
 MAINTAINER=	ashish@FreeBSD.org
@@ -42,9 +42,10 @@ GH_TUPLE=	erlang-lager:lager:${LAGER_VER}:lager/deps/lager \
 		potatosalad:erlang-jose:${JOSE_VER}:jose/deps/jose \
 		processone:eimp:${EIMP_VER}:eimp/deps/eimp \
 		DeadZen:goldrush:${GOLDRUSH_VER}:goldrush/deps/goldrush \
-		dvv:base64url:f2c64ed8:base64url/deps/base64url
+		dvv:base64url:f2c64ed8:base64url/deps/base64url \
+		processone:ezlib:${EZLIB_VER}:ezlib/deps/ezlib
 
-OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL ICONV RIAK ZLIB REDIS SIP SQLITE \
+OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL ICONV RIAK REDIS SIP SQLITE \
 		STUN TOOLS FULLXML
 OPTIONS_DEFAULT=	ICONV
 
@@ -68,13 +69,12 @@ SUBS= 		PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}		\
 		HAMCREST_VER=${HAMCREST_VER} ICONV_VER=${ICONV_VER}	\
 		JIFFY_VER=${JIFFY_VER} JOSE_VER=${JOSE_VER}		\
 		LAGER_VER=${LAGER_VER} LUERL_VER=${LUERL_VER}		\
-		MECK_VER=${MECK_VER} MOKA_VER=${MOKA_VER}		\
+		MECK_VER=${MECK_VER}					\
 		P1_MYSQL_VER=${P1_MYSQL_VER}				\
 		P1_OAUTH2_VER=${P1_OAUTH2_VER}				\
 		P1_PGSQL_VER=${P1_PGSQL_VER}				\
 		P1_UTILS_VER=${P1_UTILS_VER}				\
 		RIAK_PB_VER=${RIAK_PB_VER} RIAKC_VER=${RIAKC_VER}	\
-		SAMERLIB_VER=${SAMERLIB_VER}				\
 		SQLITE3_VER=${SQLITE3_VER}				\
 		STRINGPREP_VER=${STRINGPREP_VER} STUN_VER=${STUN_VER}	\
 		XMPP_VER=${XMPP_VER}
@@ -88,35 +88,33 @@ SUB_LIST=	${SUBS} \
 SHEBANG_FILES=	${WRKSRC}/ejabberdctl.template
 
 BASE64URL_VER=	0.0.1
-CACHE_TAB_VER=	1.0.14
-EIMP_VER=	1.0.6
+CACHE_TAB_VER=	1.0.16
+EIMP_VER=	1.0.8
 EPAM_VER=	1.0.4
 EREDIS_VER=	1.0.8
-ESIP_VER=	1.0.24
+ESIP_VER=	1.0.26
 EZLIB_VER=	1.0.4
-FAST_TLS_VER=	1.0.23
-FAST_XML_VER=	1.1.31
-FAST_YAML_VER=	1.0.15
+FAST_TLS_VER=	1.0.25
+FAST_XML_VER=	1.1.34
+FAST_YAML_VER=	1.0.17
 GOLDRUSH_VER=	0.1.9
 HAMCREST_VER=	0.4.1
-ICONV_VER=	1.0.8
+ICONV_VER=	1.0.10
 JIFFY_VER=	0.14.8
 JOSE_VER=	1.8.4
-LAGER_VER=	3.4.2
+LAGER_VER=	3.6.5
 LUERL_VER=	0.3
 MECK_VER=	0.8.4
-MOKA_VER=	1.0.5d
-P1_MYSQL_VER=	1.0.6
+P1_MYSQL_VER=	1.0.7
 P1_OAUTH2_VER=	0.6.3
 P1_PGSQL_VER=	1.1.6
-P1_UTILS_VER=	1.0.12
+P1_UTILS_VER=	1.0.13
 RIAK_PB_VER=	2.3.2
 RIAKC_VER=	2.5.3
-SAMERLIB_VER=	0.8.0e
 SQLITE3_VER=	1.1.6
-STRINGPREP_VER=	1.0.12
-STUN_VER=	1.0.23
-XMPP_VER=	1.2.1
+STRINGPREP_VER=	1.0.14
+STUN_VER=	1.0.25
+XMPP_VER=	1.2.5
 
 OPTIONS_SUB=		yes
 RIAK_DESC=	Riak database support
@@ -148,12 +146,8 @@ 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 \
-		processone:moka:${MOKA_VER}:moka/deps/moka \
-		processone:samerlib:${SAMERLIB_VER}:samerlib/deps/samerlib
+		eproxus:meck:${MECK_VER}:meck/deps/meck
 FULLXML_CONFIGURE_ENABLE=	full-xml
-ZLIB_CONFIGURE_ENABLE=	zlib
-ZLIB_GH_TUPLE=	processone:ezlib:${EZLIB_VER}:ezlib/deps/ezlib
 SQLITE_USES=		sqlite
 ICONV_USES=		iconv:wchar_t
 ICONV_LDFLAGS=		${ICONV_LIB}
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index 8a84c8ab68f1..d35f131573a4 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,38 +1,38 @@
-TIMESTAMP = 1530276627
-SHA256 (processone-ejabberd-18.06_GH0.tar.gz) = aed37efa45387a4404bd9bcef3072d7490d9b7edf055c993444130b5ab24e529
-SIZE (processone-ejabberd-18.06_GH0.tar.gz) = 1809530
-SHA256 (erlang-lager-lager-3.4.2_GH0.tar.gz) = c5f532dd236e07dad27976abcf12b9c90fcf33ffd6fe1b1d34639c06171c36ea
-SIZE (erlang-lager-lager-3.4.2_GH0.tar.gz) = 252971
-SHA256 (processone-p1_utils-1.0.12_GH0.tar.gz) = ecb29acbbf61686eb91f63a9e37b0a5c9cdd9e55bd8eb42edb632815dbdbf0c0
-SIZE (processone-p1_utils-1.0.12_GH0.tar.gz) = 55067
-SHA256 (processone-cache_tab-1.0.14_GH0.tar.gz) = 2ec30e51e2ef334b53aef64152d3da14d0478d3bc997bd3317db88b756a26176
-SIZE (processone-cache_tab-1.0.14_GH0.tar.gz) = 18680
-SHA256 (processone-fast_tls-1.0.23_GH0.tar.gz) = 6b9b65fd524210c1df500b65a0e44a5b8cbd64a38ff5e85e84c539524190bcaa
-SIZE (processone-fast_tls-1.0.23_GH0.tar.gz) = 76199
-SHA256 (processone-stringprep-1.0.12_GH0.tar.gz) = 0f659b46a46113b97948182fe0ce6611952ddd8ff5a3eebd9afc7a298d7d5d33
-SIZE (processone-stringprep-1.0.12_GH0.tar.gz) = 95647
-SHA256 (processone-fast_xml-1.1.31_GH0.tar.gz) = eda59dccded0ab5c4454774162f9f50a1030c6b487cd7b4d42d1588e897f27d8
-SIZE (processone-fast_xml-1.1.31_GH0.tar.gz) = 93442
-SHA256 (processone-xmpp-1.2.1_GH0.tar.gz) = f1723c790324c992d9808c63a2af763dd955abd4a66dc1fa3689568c48245f06
-SIZE (processone-xmpp-1.2.1_GH0.tar.gz) = 409157
-SHA256 (processone-fast_yaml-1.0.15_GH0.tar.gz) = e110ace33e4266fbcf078a1e4a1a9e836b25bef9c2869acbc59c988a0019093c
-SIZE (processone-fast_yaml-1.0.15_GH0.tar.gz) = 49812
+TIMESTAMP = 1539100120
+SHA256 (processone-ejabberd-18.09_GH0.tar.gz) = 85c57ba9784f7346f94236c3d1b1dae676f5bb2ee65c6d2204fb4bbcd7582769
+SIZE (processone-ejabberd-18.09_GH0.tar.gz) = 1775451
+SHA256 (erlang-lager-lager-3.6.5_GH0.tar.gz) = 9d2c2b095ede293c7719f19a4f553892e3cf47d428a5ebac945a8f4ebfbf7009
+SIZE (erlang-lager-lager-3.6.5_GH0.tar.gz) = 265168
+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.16_GH0.tar.gz) = 169c3ca82b99c482e5914b616d594fed25cf34a4c995e37bfe1651d70bbaea55
+SIZE (processone-cache_tab-1.0.16_GH0.tar.gz) = 18736
+SHA256 (processone-fast_tls-1.0.25_GH0.tar.gz) = 5bb883b03514999876c750cdb08a5e4cf80a9eb89319037b612e1265c43f6f6d
+SIZE (processone-fast_tls-1.0.25_GH0.tar.gz) = 76303
+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.5_GH0.tar.gz) = 699f50d50850272e67160b022fd27f3ccc46570e48968d8ee30d491bf926794d
+SIZE (processone-xmpp-1.2.5_GH0.tar.gz) = 459997
+SHA256 (processone-fast_yaml-1.0.17_GH0.tar.gz) = d2675ec9b2f64eba6c3437597e3abe3bfaae2172560784456a2763d1d1a50b08
+SIZE (processone-fast_yaml-1.0.17_GH0.tar.gz) = 49925
 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 (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.6_GH0.tar.gz) = 58544077026f90938396a703e699ec3a055677f955c6b3542412a3a8621beaeb
-SIZE (processone-eimp-1.0.6_GH0.tar.gz) = 3471317
+SHA256 (processone-eimp-1.0.8_GH0.tar.gz) = b481dea930a961dc1b9817f172fee646028ae6e47ccd143a6de0d84713291984
+SIZE (processone-eimp-1.0.8_GH0.tar.gz) = 3471332
 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-iconv-1.0.8_GH0.tar.gz) = dc3039341fdc619afc7b0ba646bcf7d641e0c2d6d336d9a947e34ca3c3d35435
-SIZE (processone-iconv-1.0.8_GH0.tar.gz) = 121549
-SHA256 (processone-p1_mysql-1.0.6_GH0.tar.gz) = c21a0d7a7ccc3b22f28710f94b65d71b177c4425ee3c8568edd2174b26a4a10b
-SIZE (processone-p1_mysql-1.0.6_GH0.tar.gz) = 20459
+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.7_GH0.tar.gz) = ba0cf7be1dd9e5e3fbe7065f985658fce155f19f2423cf66694eb069dddbf2ae
+SIZE (processone-p1_mysql-1.0.7_GH0.tar.gz) = 20494
 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
@@ -45,19 +45,15 @@ 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.24_GH0.tar.gz) = 280c0f59fd48e422cfe602f503649d80dab030bfbec4e760d39c7551819be6db
-SIZE (processone-esip-1.0.24_GH0.tar.gz) = 85773
+SHA256 (processone-esip-1.0.26_GH0.tar.gz) = be38cceff8e2207da24805b8e1c926cdf6d63ab116be12cd829f5a3a4e5e58ab
+SIZE (processone-esip-1.0.26_GH0.tar.gz) = 85846
 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.23_GH0.tar.gz) = 0f86360b858961019368a746de162dc3f1e0476e570cafd40e8ff025aa61a130
-SIZE (processone-stun-1.0.23_GH0.tar.gz) = 29258
+SHA256 (processone-stun-1.0.25_GH0.tar.gz) = a5a59ae3c75290029aa062ef19ecd52b8377959a8eb7352bd2a62c4ff1dd0613
+SIZE (processone-stun-1.0.25_GH0.tar.gz) = 29332
 SHA256 (rvirding-luerl-v0.3_GH0.tar.gz) = 37c6d2be8ecc624a8bf469b80609c4e3f2f079c30886575c31c46391dfedfec6
 SIZE (rvirding-luerl-v0.3_GH0.tar.gz) = 95182
 SHA256 (eproxus-meck-0.8.4_GH0.tar.gz) = b4f951841c69a75a735ea4aea682899f19f254467c749df596f90757e51104b6
 SIZE (eproxus-meck-0.8.4_GH0.tar.gz) = 234157
-SHA256 (processone-moka-1.0.5d_GH0.tar.gz) = 821a11325e586f886c4ece6fbe051d32844c4ccc86676ae56d6f581c51faa7a9
-SIZE (processone-moka-1.0.5d_GH0.tar.gz) = 1605750
-SHA256 (processone-samerlib-0.8.0e_GH0.tar.gz) = 926d7d52250396724bbafc7bab747c020443c3a9822a732ab08e8c7d9b6f3988
-SIZE (processone-samerlib-0.8.0e_GH0.tar.gz) = 17934
 SHA256 (processone-ezlib-1.0.4_GH0.tar.gz) = 3328661c512c28e68db69b82202b8d6c4127f31f2aefc5b0040ba9bce6abe9b3
 SIZE (processone-ezlib-1.0.4_GH0.tar.gz) = 45510
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index 441d8774ee7d..6c5322089fcc 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -4,15 +4,8 @@
 %%PAM%%etc/pam.d/%%PORTNAME%%
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/COPYING
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/acme_challenge.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_anonymous.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_oauth.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_plain.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_scram.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_access_permissions.beam
@@ -42,7 +35,6 @@
 %%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
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_idna.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_iq.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_listener.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_local.beam
@@ -70,6 +62,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_s2s_in.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_s2s_out.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_service.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_shaper.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sip.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm_mnesia.beam
@@ -238,19 +231,11 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_index.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_migrate.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_subscription.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/randoms.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/rest.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/scram.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/shaper.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/str.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/translate.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/win32_dns.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/xmpp_socket.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/xmpp_stream_in.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/xmpp_stream_out.beam
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/xmpp_stream_pkix.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/ELDAPv3.hrl
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/XmppAddr.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/adhoc.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/bosh.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_acme.hrl
@@ -284,7 +269,6 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_vcard.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/mod_vcard_xupdate.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/pubsub.hrl
-%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/scram.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/include/translate.hrl
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/base64url-%%BASE64URL_VER%%/LICENSE.txt
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/base64url-%%BASE64URL_VER%%/ebin/base64url.app
@@ -330,12 +314,12 @@
 %%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/include/esip.hrl
 %%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/include/esip_lib.hrl
 %%SIP%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/esip-%%ESIP_VER%%/priv/lib/esip_drv.so
-%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/LICENSE.txt
-%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib.app
-%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib.beam
-%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib_app.beam
-%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib_sup.beam
-%%ZLIB%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/priv/lib/ezlib_drv.so
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/LICENSE.txt
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib.app
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib_app.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/ebin/ezlib_sup.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/ezlib-%%EZLIB_VER%%/priv/lib/ezlib_drv.so
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_tls-%%FAST_TLS_VER%%/LICENSE.txt
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_tls-%%FAST_TLS_VER%%/ebin/fast_tls.app
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/fast_tls-%%FAST_TLS_VER%%/ebin/fast_tls.beam
@@ -508,6 +492,8 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_handler_watcher_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_manager_killer.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_msg.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_rotator_behaviour.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_rotator_default.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_stdlib.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/lager-%%LAGER_VER%%/ebin/lager_transform.beam
@@ -554,16 +540,6 @@
 %%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
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka.app
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka_app.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka_call_handler.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka_history.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka_main_sup.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka_mod_utils.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka_server.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka_sup.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/moka-%%MOKA_VER%%/ebin/moka_utils.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
@@ -610,7 +586,9 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_nif_utils.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_options.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_queue.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_rand.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_server.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_shaper.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_time_compat.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_utils.app
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/p1_utils-%%P1_UTILS_VER%%/ebin/p1_utils.beam
@@ -659,21 +637,6 @@
 %%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
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/crash_file.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/crashfy.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/samerlib.app
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_application.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_dummy_server.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_dummy_supervisor.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_file.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_gen_server.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_int.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_lists.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_process.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_string.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/sel_test.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/ebin/yalog.beam
-%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/samerlib-%%SAMERLIB_VER%%/include/yalog.hrl
 %%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
@@ -816,6 +779,30 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/priv/lib/jid.so
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/priv/lib/xmpp_lang.so
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/priv/lib/xmpp_uri.so
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/XmppAddr.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/scram.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0047.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0166.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0234.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0260.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0261.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0300.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0319.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_config.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_idna.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_sasl.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_sasl_anonymous.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_sasl_digest.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_sasl_oauth.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_sasl_plain.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_sasl_scram.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_socket.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_stream.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_stream_in.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xmpp_stream_out.beam
+%%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%%/priv/bin/captcha.sh
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/css/admin.css
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/css/bosh.css