3 files changed, 46 insertions, 44 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 0e62ff8356c9..13646f545a3c 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -1,14 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	ejabberd
-PORTVERSION=	20.12
+PORTVERSION=	21.01
 CATEGORIES=	net-im
 
-# To be removed in the next update
-# See https://github.com/processone/ejabberd/pull/3452
-PATCH_SITES=	https://github.com/processone/ejabberd/commit/
-PATCHFILES=	2f3063def69c1d120262f6dd7a26ce59b6e6569c.patch:-p1
-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 
@@ -104,34 +99,35 @@ SUB_LIST=	${SUBS} \
 SHEBANG_FILES=	${WRKSRC}/ejabberdctl.template
 
 BASE64URL_VER=	1.0.1
-CACHE_TAB_VER=	1.0.26
-EIMP_VER=	1.0.18
+CACHE_TAB_VER=	1.0.27
+EIMP_VER=	1.0.19
+EJABBERD_PO_VER=	0.0.0
 EPAM_VER=	1.0.10
 EREDIS_VER=	1.0.8
-ESIP_VER=	1.0.39
+ESIP_VER=	1.0.41
 EZLIB_VER=	1.0.9
-FAST_TLS_VER=	1.1.10
+FAST_TLS_VER=	1.1.11
 FAST_XML_VER=	1.1.45
-FAST_YAML_VER=	1.0.29
+FAST_YAML_VER=	1.0.30
 GOLDRUSH_VER=	0.1.9
 IDNA_VER=	6.0.0
 JIFFY_VER=	1.0.5
 JOSE_VER=	1.9.0
 LAGER_VER=	3.6.10
 LUERL_VER=	0.3
-MQTREE_VER=	1.0.11
-P1_ACME_VER=	1.0.10
+MQTREE_VER=	1.0.12
+P1_ACME_VER=	1.0.11
 P1_MYSQL_VER=	1.0.17
 P1_OAUTH2_VER=	0.6.8
 P1_PGSQL_VER=	1.1.10
 P1_UTILS_VER=	1.0.21
 PKIX_VER=	1.0.7
-SQLITE3_VER=	1.1.9
+SQLITE3_VER=	1.1.11
 STRINGPREP_VER=	1.0.24
-STUN_VER=	1.0.40
+STUN_VER=	1.0.42
 UNICODE_UTIL_COMPAT_VER=	0.4.1
-XMPP_VER=	1.5.1
-YCONF_VER=	1.0.9
+XMPP_VER=	1.5.2
+YCONF_VER=	1.0.10
 
 OPTIONS_SUB=		yes
 SIP_DESC=	SIP support
@@ -156,6 +152,7 @@ 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
+TOOLS_GH_TUPLE+=processone:ejabberd-po:9d6085d:ejabberdpo/deps/ejabberd_po
 FULLXML_CONFIGURE_ENABLE=	full-xml
 SQLITE_USES=		sqlite
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=yes
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index bcd3e1ca3d12..46c32b52d815 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,30 +1,30 @@
-TIMESTAMP = 1608359819
-SHA256 (processone-ejabberd-20.12_GH0.tar.gz) = 1fc9a9e02fcb04de8ddc05940d51f79221edbb05b2721adfecc9cff34ae46924
-SIZE (processone-ejabberd-20.12_GH0.tar.gz) = 1992192
+TIMESTAMP = 1612027091
+SHA256 (processone-ejabberd-21.01_GH0.tar.gz) = d9ebcc0593d4647110a0d05df4064dfd6a2b3f495ba875485cdd217917eb6c1e
+SIZE (processone-ejabberd-21.01_GH0.tar.gz) = 1531769
 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.21_GH0.tar.gz) = 92dbadb135bd9561fa33a01b2872f73fd9cc559bb68f67e21e97ecebc239ab74
 SIZE (processone-p1_utils-1.0.21_GH0.tar.gz) = 63913
-SHA256 (processone-cache_tab-1.0.26_GH0.tar.gz) = 0364b0fb7bf8d40ef2ad79be5f5246951f8c714f5b63cc2460f4c170826682e9
-SIZE (processone-cache_tab-1.0.26_GH0.tar.gz) = 23511
-SHA256 (processone-fast_tls-1.1.10_GH0.tar.gz) = 49c77fc7e2b82ece140fa6e3999086af43b3ba885fb2411dc16ef6e487e07a4f
-SIZE (processone-fast_tls-1.1.10_GH0.tar.gz) = 80575
+SHA256 (processone-cache_tab-1.0.27_GH0.tar.gz) = 3916aca7d75ae30235b566b956a9706d35cb3c57531f13ce47b51d34505c3b5a
+SIZE (processone-cache_tab-1.0.27_GH0.tar.gz) = 23633
+SHA256 (processone-fast_tls-1.1.11_GH0.tar.gz) = d26f96d279aaafc2c417dbba5819ed531afc6fe6a02b341deaed17f6acd16fe7
+SIZE (processone-fast_tls-1.1.11_GH0.tar.gz) = 80604
 SHA256 (processone-stringprep-1.0.24_GH0.tar.gz) = dc0445fbab2f47cbf75edb5f58d3bd697f9b3ede192390eab706f0df9b0dcf19
 SIZE (processone-stringprep-1.0.24_GH0.tar.gz) = 99131
 SHA256 (processone-fast_xml-1.1.45_GH0.tar.gz) = d967049ab1ebec145657bd15e461dcd5f2b8c932a71af944c57474e92a2e53c5
 SIZE (processone-fast_xml-1.1.45_GH0.tar.gz) = 107006
-SHA256 (processone-xmpp-1.5.1_GH0.tar.gz) = 1a8c98bfc5a3acbced363e22430d0484e28de24384543a53cd246d2e206eba56
-SIZE (processone-xmpp-1.5.1_GH0.tar.gz) = 507197
-SHA256 (processone-fast_yaml-1.0.29_GH0.tar.gz) = fe54b76203f1e8a5c4965c8c3afcf07d6afaf6601fcc451d198901ed99f79343
-SIZE (processone-fast_yaml-1.0.29_GH0.tar.gz) = 59122
+SHA256 (processone-xmpp-1.5.2_GH0.tar.gz) = 894d8e99771599916c8c7d9f7528d9787edc61dd72fbb376fd9cf21d85903ead
+SIZE (processone-xmpp-1.5.2_GH0.tar.gz) = 510215
+SHA256 (processone-fast_yaml-1.0.30_GH0.tar.gz) = 22fe7f0204ed9b885a55e11c0949a365d40db0eb98001cdacc8cd3af5aa263d4
+SIZE (processone-fast_yaml-1.0.30_GH0.tar.gz) = 59159
 SHA256 (davisp-jiffy-1.0.5_GH0.tar.gz) = e5acdee0beacc7b0fcd099d360f83d8d7d77c3029bd4d5ff5270494af36e5929
 SIZE (davisp-jiffy-1.0.5_GH0.tar.gz) = 1896318
 SHA256 (processone-p1_oauth2-0.6.8_GH0.tar.gz) = 04757cd1b56e69e2db8a898c002773a57d9aea4fc2825e33974902d6331f9cd8
 SIZE (processone-p1_oauth2-0.6.8_GH0.tar.gz) = 214027
 SHA256 (potatosalad-erlang-jose-1.9.0_GH0.tar.gz) = d55a9d3a1697833fed555a21f1aeb2727af88193995cb6ffa945d4b6749d0e8d
 SIZE (potatosalad-erlang-jose-1.9.0_GH0.tar.gz) = 258407
-SHA256 (processone-eimp-1.0.18_GH0.tar.gz) = 354cacd2289f3fca5603eadfb474e58a2d2174ef990016063cd7d9598eef4342
-SIZE (processone-eimp-1.0.18_GH0.tar.gz) = 3477198
+SHA256 (processone-eimp-1.0.19_GH0.tar.gz) = e8627ea2031a3e5496db7b96fa557ad732bb70f36fc624f357239ae73e60cf2a
+SIZE (processone-eimp-1.0.19_GH0.tar.gz) = 3477287
 SHA256 (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612
 SIZE (DeadZen-goldrush-0.1.9_GH0.tar.gz) = 24548
 SHA256 (dvv-base64url-1.0.1_GH0.tar.gz) = 7ef7210effd25ac1f82f190fcfaef53e49d7bc40bb94112c4aa07266c32a851b
@@ -33,12 +33,12 @@ SHA256 (processone-ezlib-1.0.9_GH0.tar.gz) = f0ac60336b2ddf55ac4f58934580cb8f02d
 SIZE (processone-ezlib-1.0.9_GH0.tar.gz) = 49395
 SHA256 (processone-pkix-1.0.7_GH0.tar.gz) = ef1a0f1cf0bd66696fa1c0336efe784864b8337564c0415bff83867010a1b950
 SIZE (processone-pkix-1.0.7_GH0.tar.gz) = 412022
-SHA256 (processone-mqtree-1.0.11_GH0.tar.gz) = 298cf6e207e1e76423ea733b3f507b21f9b14a0fdfdc00b695f0a3d1b400327f
-SIZE (processone-mqtree-1.0.11_GH0.tar.gz) = 228876
-SHA256 (processone-yconf-1.0.9_GH0.tar.gz) = bc992fa01714250f060b70c0b6c126430373b3c171d16ead21efa17209afb0c9
-SIZE (processone-yconf-1.0.9_GH0.tar.gz) = 222572
-SHA256 (processone-p1_acme-1.0.10_GH0.tar.gz) = 9eca9dbf57354bce476b995dccef92eff062d07a66069f358240ab8d566c0c6b
-SIZE (processone-p1_acme-1.0.10_GH0.tar.gz) = 221088
+SHA256 (processone-mqtree-1.0.12_GH0.tar.gz) = 43cb7b4715723ad174b425dcc55cb5c15f2fc1f71673231b93d50d638685a41b
+SIZE (processone-mqtree-1.0.12_GH0.tar.gz) = 228886
+SHA256 (processone-yconf-1.0.10_GH0.tar.gz) = b0631969a5449ec63896187ac3057d3c0f97dbd33ed7be5426b6338c8c9d8f31
+SIZE (processone-yconf-1.0.10_GH0.tar.gz) = 222567
+SHA256 (processone-p1_acme-1.0.11_GH0.tar.gz) = 4fbd9e2bfb0247afc859020b4985fbe43f0a483bf81f3571a5baf0c712e7ee52
+SIZE (processone-p1_acme-1.0.11_GH0.tar.gz) = 221108
 SHA256 (benoitc-erlang-idna-6.0.0_GH0.tar.gz) = d57e20ee88018ff0431e0275e91ada5915782870c9981fc798bcd05589031d6f
 SIZE (benoitc-erlang-idna-6.0.0_GH0.tar.gz) = 740802
 SHA256 (benoitc-unicode_util_compat-0.4.1_GH0.tar.gz) = daca2a0d9469b6d8b766f72168ff5576b1e902d1b026a659d6ef0073adb996fa
@@ -51,13 +51,13 @@ SHA256 (processone-p1_pgsql-1.1.10_GH0.tar.gz) = 18d7435d7b5366bab44d5711ea21338
 SIZE (processone-p1_pgsql-1.1.10_GH0.tar.gz) = 24073
 SHA256 (wooga-eredis-v1.0.8_GH0.tar.gz) = cd75c5b19dca8b23ec998fecf83ea5f0e29f3cb75618a61d3080168c66509b56
 SIZE (wooga-eredis-v1.0.8_GH0.tar.gz) = 124993
-SHA256 (processone-esip-1.0.39_GH0.tar.gz) = 4688d3c0930d2916a10a5c16a45a6cab18b81659fb73c124710eff9aab62afbf
-SIZE (processone-esip-1.0.39_GH0.tar.gz) = 89844
-SHA256 (processone-erlang-sqlite3-1.1.9_GH0.tar.gz) = ca69f1f6de890bf20b821c8bd78410740a80c8c4524ae756f3e11d07d9a50fed
-SIZE (processone-erlang-sqlite3-1.1.9_GH0.tar.gz) = 1881273
-SHA256 (processone-stun-1.0.40_GH0.tar.gz) = 6296b81dead66575c6b65863b2a728323e9fed39f6e961832a6d2b11fd3c3103
-SIZE (processone-stun-1.0.40_GH0.tar.gz) = 39372
+SHA256 (processone-esip-1.0.41_GH0.tar.gz) = df3ab5f0f4a34d5d998a1b2cea86d55914fc6fdd461864bc6628d2a079ad4322
+SIZE (processone-esip-1.0.41_GH0.tar.gz) = 89878
+SHA256 (processone-erlang-sqlite3-1.1.11_GH0.tar.gz) = a2ca0a9955e4cc8b2b6bee41dc78d7013a7d70094324ded7f6424200ff7fc25f
+SIZE (processone-erlang-sqlite3-1.1.11_GH0.tar.gz) = 1881302
+SHA256 (processone-stun-1.0.42_GH0.tar.gz) = 5d5c0b291a14482b37ebaea3308f3fd431c946fee9446c3bcfc96d2a61b67ad3
+SIZE (processone-stun-1.0.42_GH0.tar.gz) = 39518
 SHA256 (rvirding-luerl-v0.3_GH0.tar.gz) = 37c6d2be8ecc624a8bf469b80609c4e3f2f079c30886575c31c46391dfedfec6
 SIZE (rvirding-luerl-v0.3_GH0.tar.gz) = 95182
-SHA256 (2f3063def69c1d120262f6dd7a26ce59b6e6569c.patch) = 3a2a3aa7d451e953524a0562d58a31e1888e200d8074a6a38c7c4b37df744530
-SIZE (2f3063def69c1d120262f6dd7a26ce59b6e6569c.patch) = 3229
+SHA256 (processone-ejabberd-po-9d6085d_GH0.tar.gz) = d030058f08f2c6e0297c50f7aa761dc442f626cd960440c41b72a98c5b584cd9
+SIZE (processone-ejabberd-po-9d6085d_GH0.tar.gz) = 626016
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index d80e231aaa7a..be780c892c56 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -75,6 +75,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sql_pt.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_stun.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sup.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_systemd.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_system_monitor.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_tmp_sup.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_update.beam
@@ -570,6 +571,8 @@
 %%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/%%PORTNAME%%_po-0.0.0/LICENSE
+%%TOOLS%%%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/%%PORTNAME%%_po-0.0.0/ebin/%%PORTNAME%%_po.app
 %%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
@@ -745,6 +748,7 @@
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0297.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0313.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0328.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0333.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0334.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0352.beam
 %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0355.beam
@@ -756,6 +760,7 @@
 %%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/xep0417.beam
+%%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/lib/xmpp-%%XMPP_VER%%/ebin/xep0430.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