Update chat/ejabberd to 16.01

Security
- Improve Dialback Key Generation and Validation support (XEP-0185)
- More generally, improve random number generator to avoid timing /
  guessing attacks on any random value.

Database
- Use BLOB instead of TEXT on mysql in stanza storage
- Use UTF8MB4 character set in MySQL tables
- Make Riak working on Erlang R18

MAM
- Use stanza-id tags for deduplication
- Advertise MAM in disco info for account/room JID
- Improve MUC support
- Don't store resent messages
- Do not forget to include xmlns in mam prefs response (#859)
- Honor Message Processing Hints (XEP-0334)

MUC
- Add support for muc#roomconfig_presencebroadcast option
- Only filter rooms in Service Disco when more than 100 (EJAB-343)
- List in Service Disco non-empty rooms and provide Node for empty (EJAB-343)
- When user joins logged room, he must be warned (EJAB-726)

Pubsub
- Fix pubsub virtual nodetree plugin
- Use correct notification_type for last items (#827)
- PubSub plugin for online users only
- Disable use of multi-subscribe and subscription-option on standard
  plugins
- Limit number of subscriptions per node and allow custom default node
  configuration
- Don't force max_items_node to MAXITEMS if not defined
- Don't read pubsub options when plugin does not use them

Elixir
- Upgrade Elixir to v1.1.0

Admin
- Add plugin for passing extra erl_opts flags to deps, and use it
  for hipe
- Add --enable-latest-deps to configure
- Remove "--enable-nif" flag
- New send_stanza command
- ejabberdctl: new --no-timout flag
- ejabberdctl: Don't let "reopen_log" rotate files (EJAB-1243)
- ejabberdctl: Improve escaping of arguments passed to ejabberdctl
- OpenSSL minimum required version: raised from 0.9.8 to 1.0.0

Config
- New option accept_interval in ejabberd_listener
- Webadmin console visual refresh (EJAB-1142)
- If mod_register access_from is 'none', then don't advertise IBR (#857)
- Fix handling of some options in old style configs
- Fix parsing option trusted_proxies
- Fix ipv6 configuration processing (#803)
- ejabberd_service: simplify configuration: no need for 'hosts', just
  provide 'password'

Cleanup and optimisations
- Faster string_to_jid/1 implementation
- Move JID related functions from jlib.erl to jid.erl (#847)
- Remove usage of erlang's now()
- Update dependency name from p1_cache_tab to cache_tab
- Use crypto:rand_uniform instead of random:uniform
- Fix randoms.erl on R17 that don't have random:seed(integer())
- Faster and more memory efficient XML parsing.
- Faster stringprep library.

Other changes
- ejabberd_http: Cope with large POST/PUT requests
- ejabberd_http: Log debug message on receive errors
- mod_offline: Discard chat states notifications
- mod_offline: Honor store hint
- mod_http_upload: various fixes
- XEP-0198: Fix stanza counting corner case issue
- Adding WEBIRC, custom realname & ident, ISO-8859-15
- Update hebrew translation

7 files changed, 300 insertions, 326 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 9cf0797f230..3bb177a060b 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2015/11/23 15:30:26 fhajny Exp $
+# $NetBSD: Makefile,v 1.62 2016/01/16 19:28:01 fhajny Exp $
 
-DISTNAME=	ejabberd-15.11
+DISTNAME=	ejabberd-16.01
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -10,24 +10,24 @@ HOMEPAGE=	http://www.ejabberd.im/
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	erlang-goldrush-[0-9]*:../../sysutils/erlang-goldrush
-DEPENDS+=	erlang-jiffy-[0-9]*:../../textproc/erlang-jiffy
-DEPENDS+=	erlang-lager-[0-9]*:../../sysutils/erlang-lager
-DEPENDS+=	erlang-oauth2-[0-9]*:../../security/erlang-oauth2
-DEPENDS+=	erlang-p1_cache_tab-[0-9]*:../../devel/erlang-p1_cache_tab
-DEPENDS+=	erlang-p1_iconv-[0-9]*:../../converters/erlang-p1_iconv
-DEPENDS+=	erlang-p1_mysql-[0-9]*:../../databases/erlang-p1_mysql
-DEPENDS+=	erlang-p1_pam-[0-9]*:../../security/erlang-p1_pam
-DEPENDS+=	erlang-p1_pgsql-[0-9]*:../../databases/erlang-p1_pgsql
-DEPENDS+=	erlang-p1_sip-[0-9]*:../../net/erlang-p1_sip
-DEPENDS+=	erlang-p1_stringprep-[0-9]*:../../textproc/erlang-p1_stringprep
-DEPENDS+=	erlang-p1_stun-[0-9]*:../../net/erlang-p1_stun
-DEPENDS+=	erlang-p1_tls-[0-9]*:../../security/erlang-p1_tls
-DEPENDS+=	erlang-p1_utils-[0-9]*:../../misc/erlang-p1_utils
-DEPENDS+=	erlang-p1_xml-[0-9]*:../../textproc/erlang-p1_xml
-DEPENDS+=	erlang-p1_yaml-[0-9]*:../../textproc/erlang-p1_yaml
-DEPENDS+=	erlang-p1_zlib-[0-9]*:../../devel/erlang-p1_zlib
-DEPENDS+=	erlang-xmlrpc-[0-9]*:../../textproc/erlang-xmlrpc
+DEPENDS+=	erlang-cache_tab>=1.0.1:../../devel/erlang-p1_cache_tab
+DEPENDS+=	erlang-goldrush-0.1.*:../../sysutils/erlang-goldrush
+DEPENDS+=	erlang-jiffy>=0.14.5:../../textproc/erlang-jiffy
+DEPENDS+=	erlang-lager>=3.0.2:../../sysutils/erlang-lager
+DEPENDS+=	erlang-oauth2>=0.6.0.20150911:../../security/erlang-oauth2
+DEPENDS+=	erlang-p1_iconv-0.9.*:../../converters/erlang-p1_iconv
+DEPENDS+=	erlang-p1_mysql>=1.0.0:../../databases/erlang-p1_mysql
+DEPENDS+=	erlang-p1_pam>=1.0.0:../../security/erlang-p1_pam
+DEPENDS+=	erlang-p1_pgsql>=1.0.0:../../databases/erlang-p1_pgsql
+DEPENDS+=	erlang-p1_sip>=1.0.0:../../net/erlang-p1_sip
+DEPENDS+=	erlang-p1_stringprep>=1.0.0:../../textproc/erlang-p1_stringprep
+DEPENDS+=	erlang-p1_stun-0.9.*:../../net/erlang-p1_stun
+DEPENDS+=	erlang-p1_tls>=1.0.0:../../security/erlang-p1_tls
+DEPENDS+=	erlang-p1_utils>=1.0.2:../../misc/erlang-p1_utils
+DEPENDS+=	erlang-p1_xml>=1.1.1:../../textproc/erlang-p1_xml
+DEPENDS+=	erlang-p1_yaml>=1.0.0:../../textproc/erlang-p1_yaml
+DEPENDS+=	erlang-p1_zlib>=1.0.0:../../devel/erlang-p1_zlib
+DEPENDS+=	erlang-xmlrpc>=1.15.20150506:../../textproc/erlang-xmlrpc
 CONFLICTS+=	jabberd-[0-9]*
 
 GNU_CONFIGURE=		yes
@@ -39,7 +39,6 @@ CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-iconv
 CONFIGURE_ARGS+=	--enable-lager
 CONFIGURE_ARGS+=	--enable-mysql
-CONFIGURE_ARGS+=	--enable-nif
 CONFIGURE_ARGS+=	--enable-odbc
 CONFIGURE_ARGS+=	--enable-pam
 CONFIGURE_ARGS+=	--enable-pgsql
@@ -80,7 +79,7 @@ PKG_SHELL.${EJABBERD_USER}=	${SH}
 EGDIR=			share/examples/ejabberd
 
 INSTALLATION_DIRS+=	share/doc/${PKGBASE} ${EGDIR} share/bash-completion.d
-INSTALLATION_DIRS+=	lib/erlang/lib/ejabberd/priv/sql
+INSTALLATION_DIRS+=	lib/erlang/lib/${DISTNAME}/priv/sql
 
 CONF_FILES_PERMS=	${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \
 			${ROOT_USER} ${EJABBERD_GROUP} 0640
@@ -107,7 +106,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc			\
 		${DESTDIR}${PREFIX}/share/bash-completion.d/ejabberd
 	cd ${WRKSRC}/sql && ${INSTALL_DATA} *.sql			\
-		${DESTDIR}${PREFIX}/lib/erlang/lib/ejabberd/priv/sql
+		${DESTDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/sql
 
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index b8d77fc2fe6..d67b7947390 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,222 +1,225 @@
-@comment $NetBSD: PLIST,v 1.37 2015/11/23 15:30:26 fhajny Exp $
-lib/erlang/lib/ejabberd/ebin/ELDAPv3.beam
-lib/erlang/lib/ejabberd/ebin/XmppAddr.beam
-lib/erlang/lib/ejabberd/ebin/acl.beam
-lib/erlang/lib/ejabberd/ebin/adhoc.beam
-lib/erlang/lib/ejabberd/ebin/cyrsasl.beam
-lib/erlang/lib/ejabberd/ebin/cyrsasl_anonymous.beam
-lib/erlang/lib/ejabberd/ebin/cyrsasl_digest.beam
-lib/erlang/lib/ejabberd/ebin/cyrsasl_oauth.beam
-lib/erlang/lib/ejabberd/ebin/cyrsasl_plain.beam
-lib/erlang/lib/ejabberd/ebin/cyrsasl_scram.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd.app
-lib/erlang/lib/ejabberd/ebin/ejabberd.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_admin.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_app.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_auth.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_auth_anonymous.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_auth_external.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_auth_internal.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_auth_ldap.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_auth_odbc.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_auth_pam.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_auth_riak.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_c2s.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_c2s_config.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_captcha.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_cluster.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_commands.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_config.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_ctl.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_frontend_socket.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_hooks.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_http.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_http_bind.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_http_ws.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_idna.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_listener.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_local.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_logger.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_node_groups.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_oauth.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_odbc.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_odbc_sup.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_piefxis.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_rdbms.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_receiver.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_regexp.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_riak.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_riak_sup.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_router.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_router_multicast.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_s2s.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_s2s_in.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_s2s_out.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_service.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_sm.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_sm_mnesia.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_sm_odbc.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_sm_redis.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_socket.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_stun.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_sup.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_system_monitor.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_tmp_sup.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_update.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_web.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_web_admin.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_websocket.beam
-lib/erlang/lib/ejabberd/ebin/ejabberd_xmlrpc.beam
-lib/erlang/lib/ejabberd/ebin/ejd2odbc.beam
-lib/erlang/lib/ejabberd/ebin/eldap.beam
-lib/erlang/lib/ejabberd/ebin/eldap_filter.beam
-lib/erlang/lib/ejabberd/ebin/eldap_filter_yecc.beam
-lib/erlang/lib/ejabberd/ebin/eldap_pool.beam
-lib/erlang/lib/ejabberd/ebin/eldap_utils.beam
-lib/erlang/lib/ejabberd/ebin/ext_mod.beam
-lib/erlang/lib/ejabberd/ebin/extauth.beam
-lib/erlang/lib/ejabberd/ebin/gen_iq_handler.beam
-lib/erlang/lib/ejabberd/ebin/gen_mod.beam
-lib/erlang/lib/ejabberd/ebin/gen_pubsub_node.beam
-lib/erlang/lib/ejabberd/ebin/gen_pubsub_nodetree.beam
-lib/erlang/lib/ejabberd/ebin/jd2ejd.beam
-lib/erlang/lib/ejabberd/ebin/jlib.beam
-lib/erlang/lib/ejabberd/ebin/mod_adhoc.beam
-lib/erlang/lib/ejabberd/ebin/mod_admin_extra.beam
-lib/erlang/lib/ejabberd/ebin/mod_announce.beam
-lib/erlang/lib/ejabberd/ebin/mod_blocking.beam
-lib/erlang/lib/ejabberd/ebin/mod_caps.beam
-lib/erlang/lib/ejabberd/ebin/mod_carboncopy.beam
-lib/erlang/lib/ejabberd/ebin/mod_client_state.beam
-lib/erlang/lib/ejabberd/ebin/mod_configure.beam
-lib/erlang/lib/ejabberd/ebin/mod_configure2.beam
-lib/erlang/lib/ejabberd/ebin/mod_disco.beam
-lib/erlang/lib/ejabberd/ebin/mod_echo.beam
-lib/erlang/lib/ejabberd/ebin/mod_fail2ban.beam
-lib/erlang/lib/ejabberd/ebin/mod_http_api.beam
-lib/erlang/lib/ejabberd/ebin/mod_http_bind.beam
-lib/erlang/lib/ejabberd/ebin/mod_http_fileserver.beam
-lib/erlang/lib/ejabberd/ebin/mod_http_upload.beam
-lib/erlang/lib/ejabberd/ebin/mod_http_upload_quota.beam
-lib/erlang/lib/ejabberd/ebin/mod_ip_blacklist.beam
-lib/erlang/lib/ejabberd/ebin/mod_irc.beam
-lib/erlang/lib/ejabberd/ebin/mod_irc_connection.beam
-lib/erlang/lib/ejabberd/ebin/mod_last.beam
-lib/erlang/lib/ejabberd/ebin/mod_mam.beam
-lib/erlang/lib/ejabberd/ebin/mod_metrics.beam
-lib/erlang/lib/ejabberd/ebin/mod_muc.beam
-lib/erlang/lib/ejabberd/ebin/mod_muc_admin.beam
-lib/erlang/lib/ejabberd/ebin/mod_muc_log.beam
-lib/erlang/lib/ejabberd/ebin/mod_muc_room.beam
-lib/erlang/lib/ejabberd/ebin/mod_multicast.beam
-lib/erlang/lib/ejabberd/ebin/mod_offline.beam
-lib/erlang/lib/ejabberd/ebin/mod_ping.beam
-lib/erlang/lib/ejabberd/ebin/mod_pres_counter.beam
-lib/erlang/lib/ejabberd/ebin/mod_privacy.beam
-lib/erlang/lib/ejabberd/ebin/mod_private.beam
-lib/erlang/lib/ejabberd/ebin/mod_proxy65.beam
-lib/erlang/lib/ejabberd/ebin/mod_proxy65_lib.beam
-lib/erlang/lib/ejabberd/ebin/mod_proxy65_service.beam
-lib/erlang/lib/ejabberd/ebin/mod_proxy65_sm.beam
-lib/erlang/lib/ejabberd/ebin/mod_proxy65_stream.beam
-lib/erlang/lib/ejabberd/ebin/mod_pubsub.beam
-lib/erlang/lib/ejabberd/ebin/mod_register.beam
-lib/erlang/lib/ejabberd/ebin/mod_register_web.beam
-lib/erlang/lib/ejabberd/ebin/mod_roster.beam
-lib/erlang/lib/ejabberd/ebin/mod_service_log.beam
-lib/erlang/lib/ejabberd/ebin/mod_shared_roster.beam
-lib/erlang/lib/ejabberd/ebin/mod_shared_roster_ldap.beam
-lib/erlang/lib/ejabberd/ebin/mod_sic.beam
-lib/erlang/lib/ejabberd/ebin/mod_sip.beam
-lib/erlang/lib/ejabberd/ebin/mod_sip_proxy.beam
-lib/erlang/lib/ejabberd/ebin/mod_sip_registrar.beam
-lib/erlang/lib/ejabberd/ebin/mod_stats.beam
-lib/erlang/lib/ejabberd/ebin/mod_time.beam
-lib/erlang/lib/ejabberd/ebin/mod_vcard.beam
-lib/erlang/lib/ejabberd/ebin/mod_vcard_ldap.beam
-lib/erlang/lib/ejabberd/ebin/mod_vcard_xupdate.beam
-lib/erlang/lib/ejabberd/ebin/mod_version.beam
-lib/erlang/lib/ejabberd/ebin/node_buddy.beam
-lib/erlang/lib/ejabberd/ebin/node_club.beam
-lib/erlang/lib/ejabberd/ebin/node_dag.beam
-lib/erlang/lib/ejabberd/ebin/node_dispatch.beam
-lib/erlang/lib/ejabberd/ebin/node_flat.beam
-lib/erlang/lib/ejabberd/ebin/node_flat_odbc.beam
-lib/erlang/lib/ejabberd/ebin/node_hometree.beam
-lib/erlang/lib/ejabberd/ebin/node_hometree_odbc.beam
-lib/erlang/lib/ejabberd/ebin/node_mb.beam
-lib/erlang/lib/ejabberd/ebin/node_pep.beam
-lib/erlang/lib/ejabberd/ebin/node_pep_odbc.beam
-lib/erlang/lib/ejabberd/ebin/node_private.beam
-lib/erlang/lib/ejabberd/ebin/node_public.beam
-lib/erlang/lib/ejabberd/ebin/nodetree_dag.beam
-lib/erlang/lib/ejabberd/ebin/nodetree_tree.beam
-lib/erlang/lib/ejabberd/ebin/nodetree_tree_odbc.beam
-lib/erlang/lib/ejabberd/ebin/nodetree_virtual.beam
-lib/erlang/lib/ejabberd/ebin/odbc_queries.beam
-lib/erlang/lib/ejabberd/ebin/pubsub_db_odbc.beam
-lib/erlang/lib/ejabberd/ebin/pubsub_index.beam
-lib/erlang/lib/ejabberd/ebin/pubsub_migrate.beam
-lib/erlang/lib/ejabberd/ebin/pubsub_subscription.beam
-lib/erlang/lib/ejabberd/ebin/pubsub_subscription_odbc.beam
-lib/erlang/lib/ejabberd/ebin/randoms.beam
-lib/erlang/lib/ejabberd/ebin/scram.beam
-lib/erlang/lib/ejabberd/ebin/shaper.beam
-lib/erlang/lib/ejabberd/ebin/str.beam
-lib/erlang/lib/ejabberd/ebin/translate.beam
-lib/erlang/lib/ejabberd/ebin/win32_dns.beam
-lib/erlang/lib/ejabberd/include/ELDAPv3.hrl
-lib/erlang/lib/ejabberd/include/XmppAddr.hrl
-lib/erlang/lib/ejabberd/include/adhoc.hrl
-lib/erlang/lib/ejabberd/include/ejabberd.hrl
-lib/erlang/lib/ejabberd/include/ejabberd_commands.hrl
-lib/erlang/lib/ejabberd/include/ejabberd_config.hrl
-lib/erlang/lib/ejabberd/include/ejabberd_ctl.hrl
-lib/erlang/lib/ejabberd/include/ejabberd_http.hrl
-lib/erlang/lib/ejabberd/include/ejabberd_sm.hrl
-lib/erlang/lib/ejabberd/include/ejabberd_web_admin.hrl
-lib/erlang/lib/ejabberd/include/eldap.hrl
-lib/erlang/lib/ejabberd/include/http_bind.hrl
-lib/erlang/lib/ejabberd/include/jlib.hrl
-lib/erlang/lib/ejabberd/include/logger.hrl
-lib/erlang/lib/ejabberd/include/mod_muc_room.hrl
-lib/erlang/lib/ejabberd/include/mod_offline.hrl
-lib/erlang/lib/ejabberd/include/mod_privacy.hrl
-lib/erlang/lib/ejabberd/include/mod_proxy65.hrl
-lib/erlang/lib/ejabberd/include/mod_roster.hrl
-lib/erlang/lib/ejabberd/include/ns.hrl
-lib/erlang/lib/ejabberd/include/pubsub.hrl
-lib/erlang/lib/ejabberd/priv/bin/captcha.sh
-lib/erlang/lib/ejabberd/priv/msgs/ca.msg
-lib/erlang/lib/ejabberd/priv/msgs/cs.msg
-lib/erlang/lib/ejabberd/priv/msgs/de.msg
-lib/erlang/lib/ejabberd/priv/msgs/el.msg
-lib/erlang/lib/ejabberd/priv/msgs/eo.msg
-lib/erlang/lib/ejabberd/priv/msgs/es.msg
-lib/erlang/lib/ejabberd/priv/msgs/fr.msg
-lib/erlang/lib/ejabberd/priv/msgs/gl.msg
-lib/erlang/lib/ejabberd/priv/msgs/he.msg
-lib/erlang/lib/ejabberd/priv/msgs/id.msg
-lib/erlang/lib/ejabberd/priv/msgs/it.msg
-lib/erlang/lib/ejabberd/priv/msgs/ja.msg
-lib/erlang/lib/ejabberd/priv/msgs/nl.msg
-lib/erlang/lib/ejabberd/priv/msgs/no.msg
-lib/erlang/lib/ejabberd/priv/msgs/pl.msg
-lib/erlang/lib/ejabberd/priv/msgs/pt-br.msg
-lib/erlang/lib/ejabberd/priv/msgs/pt.msg
-lib/erlang/lib/ejabberd/priv/msgs/ru.msg
-lib/erlang/lib/ejabberd/priv/msgs/sk.msg
-lib/erlang/lib/ejabberd/priv/msgs/sv.msg
-lib/erlang/lib/ejabberd/priv/msgs/th.msg
-lib/erlang/lib/ejabberd/priv/msgs/tr.msg
-lib/erlang/lib/ejabberd/priv/msgs/uk.msg
-lib/erlang/lib/ejabberd/priv/msgs/vi.msg
-lib/erlang/lib/ejabberd/priv/msgs/wa.msg
-lib/erlang/lib/ejabberd/priv/msgs/zh.msg
-lib/erlang/lib/ejabberd/priv/sql/lite.sql
-lib/erlang/lib/ejabberd/priv/sql/mssql.sql
-lib/erlang/lib/ejabberd/priv/sql/mysql.sql
-lib/erlang/lib/ejabberd/priv/sql/pg.sql
+@comment $NetBSD: PLIST,v 1.38 2016/01/16 19:28:01 fhajny Exp $
+lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
+lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
+lib/erlang/lib/${PKGNAME}/ebin/acl.beam
+lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam
+lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
+lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
+lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
+lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_oauth.beam
+lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam
+lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_external.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_internal.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_cluster.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_frontend_socket.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_bind.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_idna.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_regexp.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_in.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_service.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_socket.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_stun.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_system_monitor.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_tmp_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_update.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web_admin.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_websocket.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_xmlrpc.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejd2odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/eldap.beam
+lib/erlang/lib/${PKGNAME}/ebin/eldap_filter.beam
+lib/erlang/lib/${PKGNAME}/ebin/eldap_filter_yecc.beam
+lib/erlang/lib/${PKGNAME}/ebin/eldap_pool.beam
+lib/erlang/lib/${PKGNAME}/ebin/eldap_utils.beam
+lib/erlang/lib/${PKGNAME}/ebin/ext_mod.beam
+lib/erlang/lib/${PKGNAME}/ebin/extauth.beam
+lib/erlang/lib/${PKGNAME}/ebin/gen_iq_handler.beam
+lib/erlang/lib/${PKGNAME}/ebin/gen_mod.beam
+lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_node.beam
+lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_nodetree.beam
+lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam
+lib/erlang/lib/${PKGNAME}/ebin/jid.beam
+lib/erlang/lib/${PKGNAME}/ebin/jlib.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_admin_extra.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_echo.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_fail2ban.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_http_api.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_http_bind.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload_quota.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_irc.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_irc_connection.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_last.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_mam.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_metrics.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_muc.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_muc_admin.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_muc_log.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_muc_room.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_multicast.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_offline.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_ping.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_pres_counter.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_privacy.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_private.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sm.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_register_web.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_roster.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_service_log.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_ldap.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_sic.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_sip.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_sip_proxy.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_sip_registrar.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_stats.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_time.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_vcard.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_ldap.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_version.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_buddy.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_club.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_dag.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_dispatch.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_flat.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_flat_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_hometree.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_hometree_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_mb.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_online.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_pep.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_pep_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_private.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_public.beam
+lib/erlang/lib/${PKGNAME}/ebin/nodetree_dag.beam
+lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam
+lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam
+lib/erlang/lib/${PKGNAME}/ebin/odbc_queries.beam
+lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam
+lib/erlang/lib/${PKGNAME}/ebin/pubsub_migrate.beam
+lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam
+lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/randoms.beam
+lib/erlang/lib/${PKGNAME}/ebin/scram.beam
+lib/erlang/lib/${PKGNAME}/ebin/shaper.beam
+lib/erlang/lib/${PKGNAME}/ebin/str.beam
+lib/erlang/lib/${PKGNAME}/ebin/translate.beam
+lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam
+lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl
+lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
+lib/erlang/lib/${PKGNAME}/include/adhoc.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_http.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_sm.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_web_admin.hrl
+lib/erlang/lib/${PKGNAME}/include/eldap.hrl
+lib/erlang/lib/${PKGNAME}/include/http_bind.hrl
+lib/erlang/lib/${PKGNAME}/include/jlib.hrl
+lib/erlang/lib/${PKGNAME}/include/logger.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_muc_room.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_offline.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_proxy65.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
+lib/erlang/lib/${PKGNAME}/include/ns.hrl
+lib/erlang/lib/${PKGNAME}/include/pubsub.hrl
+lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
+lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/el.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/eo.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/es.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/fr.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/gl.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/he.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/id.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/it.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/ja.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/nl.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/no.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/pl.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/pt-br.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/pt.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/ru.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/sk.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/sv.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/th.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/tr.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/uk.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/vi.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/wa.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg
+lib/erlang/lib/${PKGNAME}/priv/sql/lite.sql
+lib/erlang/lib/${PKGNAME}/priv/sql/mssql.sql
+lib/erlang/lib/${PKGNAME}/priv/sql/mysql.sql
+lib/erlang/lib/${PKGNAME}/priv/sql/pg.sql
 sbin/ejabberdctl
 share/bash-completion.d/ejabberd
 share/doc/ejabberd/COPYING
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 9cf4d57d989..970c04a03d8 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.40 2015/11/23 15:30:26 fhajny Exp $
+$NetBSD: distinfo,v 1.41 2016/01/16 19:28:01 fhajny Exp $
 
-SHA1 (ejabberd-15.11.tgz) = 3dfff97fa927dc89e89b6f9a3aab4fe9f36e5876
-RMD160 (ejabberd-15.11.tgz) = 0b1d084b368cae9a5b13cd75a184b91027581d38
-SHA512 (ejabberd-15.11.tgz) = 33e038619e80b257a261072418a66125d6d37651efdc713b4230c7f7bae3ed2187f786c3d1574d5003c9e57e1843280b1bc5ef61676ad9044d487f17d44152bf
-Size (ejabberd-15.11.tgz) = 1598332 bytes
+SHA1 (ejabberd-16.01.tgz) = a1b5d0783c7ece19ac60affafb08792fa860bfd2
+RMD160 (ejabberd-16.01.tgz) = 01bd16b4518a7934c8146a2770c2e4e45a89a891
+SHA512 (ejabberd-16.01.tgz) = f0614db0d0eaf6d4f25b75b8eefbcf93260549876535fd5d82498c75779d182b19ec249ffb9b1b168cb5a887e8e6933eb868892b4aa5cd2933b739d263adca8a
+Size (ejabberd-16.01.tgz) = 1651587 bytes
 SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
-SHA1 (patch-ae) = 1a6008ba365a172ba85c0efb98057f68de7b78f4
+SHA1 (patch-ae) = 976b3e72807dc4912cc09b8e6f408ee88bda8d5a
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
-SHA1 (patch-rebar.config.script) = cc22e34f8c597c4259d3f224b9076203072b573e
+SHA1 (patch-rebar.config) = d763fc7e2ea2b5df6f587a15f59d756a6f846768
 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
diff --git a/chat/ejabberd/options.mk b/chat/ejabberd/options.mk
index ddd2ac379d0..11de570de2c 100644
--- a/chat/ejabberd/options.mk
+++ b/chat/ejabberd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/11/05 12:23:50 fhajny Exp $
+# $NetBSD: options.mk,v 1.3 2016/01/16 19:28:01 fhajny Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ejabberd
 PKG_SUPPORTED_OPTIONS=	redis sqlite
@@ -10,12 +10,12 @@ PKG_SUGGESTED_OPTIONS=	#
 # Add Redis support
 #
 .if !empty(PKG_OPTIONS:Mredis)
-DEPENDS+=		erlang-eredis-[0-9]*:../../databases/erlang-eredis
+DEPENDS+=		erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
 .endif
 
 #
 # Add SQLite 3 support
 #
 .if !empty(PKG_OPTIONS:Msqlite)
-DEPENDS+=		erlang-sqlite3-[0-9]*:../../databases/erlang-sqlite3
+DEPENDS+=		erlang-sqlite3>=1.1.5.20151221:../../databases/erlang-sqlite3
 .endif
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index 9eea8eaca58..53f357d484d 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $
+$NetBSD: patch-ae,v 1.13 2016/01/16 19:28:02 fhajny Exp $
 
 - Default locations.
 - Make it work with NetBSD's flock(1).
 
---- ejabberdctl.template.orig	2015-10-28 14:53:12.000000000 +0000
+--- ejabberdctl.template.orig	2016-01-12 11:07:58.000000000 +0000
 +++ ejabberdctl.template
-@@ -72,10 +72,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
+@@ -73,10 +73,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
      EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
  fi
  if [ "$LOGS_DIR" = "" ] ; then
@@ -18,7 +18,7 @@ $NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $
  fi
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH={{docdir}}
-@@ -86,7 +86,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
+@@ -87,7 +87,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
  fi
  if [ "{{release}}" != "true" ] ; then
      if [ "$EJABBERDDIR" = "" ] ; then
@@ -27,7 +27,7 @@ $NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $
      fi
      if [ "$EJABBERD_PRIV_PATH" = "" ] ; then
          EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
-@@ -325,7 +325,7 @@ ctl()
+@@ -351,7 +351,7 @@ ctl()
      # using flock if available. Expects a linux-style
      # flock that can lock a file descriptor.
      MAXCONNID=100
@@ -36,12 +36,12 @@ $NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $
      FLOCK=/usr/bin/flock
      if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
          JOT=/usr/bin/jot
-@@ -352,7 +352,7 @@ ctl()
+@@ -378,7 +378,7 @@ ctl()
              CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
              (
                  exec 8>"$CTL_LOCKFILE"
 -                if flock --nb 8; then
 +                if flock -x -n 8; then
-                     ctlexec $CTL_CONN $COMMAND
+                     ctlexec $CTL_CONN "$@"
                      ssresult=$?
                      # segregate from possible flock exit(1)
diff --git a/chat/ejabberd/patches/patch-rebar.config b/chat/ejabberd/patches/patch-rebar.config
new file mode 100644
index 00000000000..b306361f124
--- /dev/null
+++ b/chat/ejabberd/patches/patch-rebar.config
@@ -0,0 +1,39 @@
+$NetBSD: patch-rebar.config,v 1.1 2016/01/16 19:28:02 fhajny Exp $
+
+Deps are handled by pkgsrc.
+
+--- rebar.config.orig	2016-01-12 11:07:58.000000000 +0000
++++ rebar.config
+@@ -7,32 +7,6 @@
+ %%% Created :  1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
+ %%%-------------------------------------------------------------------
+ 
+-{deps, [{if_var_true, lager, {lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}}},
+-        {if_var_false, lager, {p1_logger, ".*", {git, "https://github.com/processone/p1_logger", {tag, "1.0.0"}}}},
+-        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.2"}}},
+-        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.1"}}},
+-        {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}},
+-        {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.0"}}},
+-        {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.1"}}},
+-        {p1_stun, ".*", {git, "https://github.com/processone/stun", "0.9.0"}},
+-        {esip, ".*", {git, "https://github.com/processone/p1_sip", "1.0.0"}},
+-        {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", {tag, "1.0.0"}}},
+-        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.5"}}},
+-        {oauth2, ".*", {git, "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"}},
+-        {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc", {tag, "1.15"}}},
+-        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/mysql", {tag, "1.0.0"}}}},
+-        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", {tag, "1.0.0"}}}},
+-        {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"}}},
+-        {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.0"}}}},
+-        {if_var_true, zlib, {p1_zlib, ".*", {git, "https://github.com/processone/zlib", {tag, "1.0.0"}}}},
+-        {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", "908a24fda4a46776a5135db60ca071e3d783f9f6"}}},  % for riak_pb-2.1.0.7
+-        {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", "527722d12d0433b837cdb92a60900c2cb5df8942"}}},
+-        {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.1.0"}}}},
+-        {if_var_true, elixir, {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}},
+-        {if_var_true, iconv, {p1_iconv, ".*", {git, "https://github.com/processone/eiconv", {tag, "0.9.0"}}}},
+-        {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck", {tag, "0.8.2"}}}},
+-        {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}}]}.
+-
+ {if_var_true, latest_deps,
+  {floating_deps, [p1_logger,
+                   cache_tab,
diff --git a/chat/ejabberd/patches/patch-rebar.config.script b/chat/ejabberd/patches/patch-rebar.config.script
deleted file mode 100644
index b4479c2c503..00000000000
--- a/chat/ejabberd/patches/patch-rebar.config.script
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-rebar.config.script,v 1.1 2015/11/05 12:23:50 fhajny Exp $
-
-Skip dependencies, handled by pkgsrc now.
-
---- rebar.config.script.orig	2015-10-28 14:53:12.000000000 +0000
-+++ rebar.config.script
-@@ -54,17 +54,7 @@ SrcDirs = lists:foldl(
-                     Acc
-             end, [], Cfg),
- 
--Deps = [{p1_cache_tab, ".*", {git, "https://github.com/processone/cache_tab", "f7ea12b0ba962a3d2f9a406d2954cf7de4e27230"}},
--        {p1_tls, ".*", {git, "https://github.com/processone/tls", "e56321afd974e9da33da913cd31beebc8e73e75f"}},
--        {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", "3c640237a3a7831dc39de6a6d329d3a9af25c579"}},
--        {p1_xml, ".*", {git, "https://github.com/processone/xml", "1c8b016b0ac7986efb823baf1682a43565449e65"}},
--        {esip, ".*", {git, "https://github.com/processone/p1_sip", "d662d3fe7f6288b444ea321d854de0bd6d40e022"}},
--        {p1_stun, ".*", {git, "https://github.com/processone/stun", "061bdae484268cbf0457ad4797e74b8516df3ad1"}},
--        {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", "79f756ba73a235c4d3836ec07b5f7f2b55f49638"}},
--        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", "d7800881e6702723ce58b7646b60c9e4cd25d563"}},
--        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", "cfc61a2e952dc3182e0f9b1473467563699992e2"}},
--        {oauth2, ".*", {git, "https://github.com/prefiks/oauth2.git", "e6da9912e5d8f658e7e868f41a102d085bdbef59"}},
--        {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc.git", "42e6e96a0fe7106830274feed915125feb1056f3"}}],
-+Deps = [],
- 
- CFLags = proplists:get_value(cflags, Cfg, ""),
- CPPFLags = proplists:get_value(cppflags, Cfg, ""),
-@@ -93,32 +83,7 @@ PostHooks = [ConfigureCmd("p1_tls", ""),
-              ConfigureCmd("p1_xml", XMLFlags)],
- 
- CfgDeps = lists:flatmap(
--            fun({mysql, true}) ->
--                    [{p1_mysql, ".*", {git, "https://github.com/processone/mysql", "dfa87da95f8fdb92e270741c2a53f796b682f918"}}];
--               ({pgsql, true}) ->
--                    [{p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", "e72c03c60bfcb56bbb5d259342021d9cb3581dac"}}];
--               ({sqlite, true}) ->
--                    [{sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "8350dc603804c503f99c92bfd2eab1dd6885758e"}}];
--               ({pam, true}) ->
--                    [{p1_pam, ".*", {git, "https://github.com/processone/epam", "d3ce290b7da75d780a03e86e7a8198a80e9826a6"}}];
--               ({zlib, true}) ->
--                    [{p1_zlib, ".*", {git, "https://github.com/processone/zlib", "e3d4222b7aae616d7ef2e7e2fa0bbf451516c602"}}];
--               ({riak, true}) ->
--                    [{riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", {tag, "1.4.2"}}}];
--               ({elixir, true}) ->
--                    [{rebar_elixir_plugin, ".*", {git, "https://github.com/yrashk/rebar_elixir_plugin", "7058379b7c7e017555647f6b9cecfd87cd50f884"}},
--                     {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", "1d9548fd285d243721b7eba71912bde2ffd1f6c3"}}];
--               ({iconv, true}) ->
--                    [{p1_iconv, ".*", {git, "https://github.com/processone/eiconv", "8b7542b1aaf0a851f335e464956956985af6d9a2"}}];
--               ({lager, true}) ->
--                    [{lager, ".*", {git, "https://github.com/basho/lager", "4d2ec8c701e1fa2d386f92f2b83b23faf8608ac3"}}];
--               ({lager, false}) ->
--                    [{p1_logger, ".*", {git, "https://github.com/processone/p1_logger", "3e19507fd5606a73694917158767ecb3f5704e3f"}}];
--               ({tools, true}) ->
--                    [{meck, "0.*", {git, "https://github.com/eproxus/meck", "0845277398b8326f9dddddd9fc3cf73467ba6877"}}];
--               ({redis, true}) ->
--                    [{eredis, ".*", {git, "https://github.com/wooga/eredis", "bf12ecb30253c84a2331f4f0d93fd68856fcb9f4"}}];
--               (_) ->
-+            fun(_) ->
-                     []
-             end, Cfg),
- 
-@@ -193,7 +158,6 @@ Config = [{erl_opts, Macros ++ HiPE ++ D
- 	  {xref_queries,
- 	   [{"(XC - UC) || (XU - X - B - "
- 	     ++ string:join(CfgXrefs, " - ") ++ ")", []}]},
--          {post_hooks, PostHooks ++ CfgPostHooks},
-           {deps, AllDeps}] ++ ElixirConfig,
- %%io:format("ejabberd configuration:~n  ~p~n", [Config]),
- Config.