Update ejabberd to 14.07.

* SIP
  - SIP Outbound (RFC 5626) support
  - New option always_record_route
  - New options record_route and routes

* Carbon Copy (XEP-0280)
  - Don't log MUC messages with hint
  - Don't carbon copy messages with hint
  - Let is_carbon_copy/1 recognize carbons
  - Don't send XEP-0280 v1 copies back to sender

* Stream Management (XEP-0198)
  - XEP-0198: Terminate session if stanza queue becomes too large
  - XEP-0198: Don't exit on socket send failure
  - XEP-0198: Don't drop session on failed resume
  - XEP-0198: Check whether routed packets are stanzas

* Riak
  - Riak support

* Install and config
  - New options log_rotate_count, log_rotate_size and log_rate_limit
  - html guide is now generated when building source tarball
  - Use p1_utils, and move treap.erl to p1_utils
  - Get rid of p1_mnesia file
  - old release notes are not installed anymore
  - Don't "forget" listener options
  - Always enable STUN at compile time
  - Do not check for Erlang apps at configure time
  - Add --enable-riak configure flag

* Tests
  - Add tests for stream management
  - Add tests for mod_carboncopy
  - Add tests for mod_caps
  - Improve MUC test cases
  - Travis CI: Enable Riak tests
  - Add Riak backend to the testing suit
  - The test suite no longer fails without --enable-transient_supervisors.

* MUC
  - MUC messages with ~ were not logged (EJAB-1696).

4 files changed, 79 insertions, 103 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 025ada526ba..21cddb64e01 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2014/05/14 08:32:02 fhajny Exp $
+# $NetBSD: Makefile,v 1.42 2014/07/30 09:45:38 fhajny Exp $
 
-DISTNAME=	ejabberd-14.05
+DISTNAME=	ejabberd-14.07
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index f56585b8d03..31ec194cc3c 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,50 +1,56 @@
-@comment $NetBSD: PLIST,v 1.25 2014/05/14 08:32:02 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.26 2014/07/30 09:45:38 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/beam_util.beam
+lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam
 lib/erlang/lib/${PKGNAME}/ebin/cache_tab_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/cache_tab_treap.beam
-lib/erlang/lib/${PKGNAME}/ebin/cache_tab.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_plain.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
-lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.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.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.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_commands.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_poll.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.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_odbc_sup.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_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_s2s.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_service.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_socket.beam
@@ -53,19 +59,18 @@ 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_admin.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web_admin.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_xmlrpc.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejd2odbc.beam
-lib/erlang/lib/${PKGNAME}/ebin/eldap_filter_yecc.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/eldap.beam
-lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/error_logger_lager_h.beam
+lib/erlang/lib/${PKGNAME}/ebin/esip.app
+lib/erlang/lib/${PKGNAME}/ebin/esip.beam
 lib/erlang/lib/${PKGNAME}/ebin/esip_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/esip_client_transaction.beam
 lib/erlang/lib/${PKGNAME}/ebin/esip_codec.beam
@@ -78,59 +83,58 @@ lib/erlang/lib/${PKGNAME}/ebin/esip_tmp_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/esip_transaction.beam
 lib/erlang/lib/${PKGNAME}/ebin/esip_transport.beam
 lib/erlang/lib/${PKGNAME}/ebin/esip_udp_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/esip.app
-lib/erlang/lib/${PKGNAME}/ebin/esip.beam
 lib/erlang/lib/${PKGNAME}/ebin/example_serv.beam
 lib/erlang/lib/${PKGNAME}/ebin/extauth.beam
+lib/erlang/lib/${PKGNAME}/ebin/ezlib.beam
 lib/erlang/lib/${PKGNAME}/ebin/ezlib_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/ezlib_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/ezlib.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/glc.beam
 lib/erlang/lib/${PKGNAME}/ebin/glc_code.beam
 lib/erlang/lib/${PKGNAME}/ebin/glc_lib.beam
 lib/erlang/lib/${PKGNAME}/ebin/glc_ops.beam
-lib/erlang/lib/${PKGNAME}/ebin/glc.beam
 lib/erlang/lib/${PKGNAME}/ebin/goldrush.app
 lib/erlang/lib/${PKGNAME}/ebin/gr_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/gr_context.beam
-lib/erlang/lib/${PKGNAME}/ebin/gr_counter_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/gr_counter.beam
-lib/erlang/lib/${PKGNAME}/ebin/gr_manager_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_counter_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/gr_manager.beam
-lib/erlang/lib/${PKGNAME}/ebin/gr_param_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_manager_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/gr_param.beam
+lib/erlang/lib/${PKGNAME}/ebin/gr_param_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/gr_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/gre.beam
+lib/erlang/lib/${PKGNAME}/ebin/iconv.beam
 lib/erlang/lib/${PKGNAME}/ebin/iconv_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/iconv_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/iconv.beam
 lib/erlang/lib/${PKGNAME}/ebin/idna.beam
 lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam
-lib/erlang/lib/${PKGNAME}/ebin/jiffy_utf8.beam
 lib/erlang/lib/${PKGNAME}/ebin/jiffy.app
 lib/erlang/lib/${PKGNAME}/ebin/jiffy.beam
+lib/erlang/lib/${PKGNAME}/ebin/jiffy_utf8.beam
 lib/erlang/lib/${PKGNAME}/ebin/jlib.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager.app
+lib/erlang/lib/${PKGNAME}/ebin/lager.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_backend_throttle.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_common_test_backend.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_config.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_console_backend.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_crash_log.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_default_formatter.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_file_backend.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_format.beam
-lib/erlang/lib/${PKGNAME}/ebin/lager_handler_watcher_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_handler_watcher.beam
+lib/erlang/lib/${PKGNAME}/ebin/lager_handler_watcher_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_msg.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_stdlib.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_transform.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_trunc_io.beam
 lib/erlang/lib/${PKGNAME}/ebin/lager_util.beam
-lib/erlang/lib/${PKGNAME}/ebin/lager.app
-lib/erlang/lib/${PKGNAME}/ebin/lager.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
@@ -143,87 +147,89 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_echo.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_ip_blacklist.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_irc_connection.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_muc.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_muc.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_proxy65.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_register_web.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub_odbc.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_ldap.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_sip.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_vcard.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_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_flat.beam
-lib/erlang/lib/${PKGNAME}/ebin/node_hometree_odbc.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_pep_odbc.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_odbc.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/p1_cache_tab.app
 lib/erlang/lib/${PKGNAME}/ebin/p1_fsm.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_iconv.app
-lib/erlang/lib/${PKGNAME}/ebin/p1_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_prof.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_server.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_sha.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_stringprep.app
 lib/erlang/lib/${PKGNAME}/ebin/p1_stun.app
-lib/erlang/lib/${PKGNAME}/ebin/p1_tls_app.beam
-lib/erlang/lib/${PKGNAME}/ebin/p1_tls_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_tls.app
 lib/erlang/lib/${PKGNAME}/ebin/p1_tls.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_tls_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_tls_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_utils.app
 lib/erlang/lib/${PKGNAME}/ebin/p1_xml.app
-lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_app.beam
-lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.app
 lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_app.beam
+lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_zlib.app
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam
-lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_odbc.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/stringprep.beam
 lib/erlang/lib/${PKGNAME}/ebin/stringprep_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/stringprep_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/stringprep.beam
+lib/erlang/lib/${PKGNAME}/ebin/stun.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_codec.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_listener.beam
@@ -231,39 +237,37 @@ lib/erlang/lib/${PKGNAME}/ebin/stun_shaper.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_test.beam
 lib/erlang/lib/${PKGNAME}/ebin/stun_tmp_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/stun_treap.beam
-lib/erlang/lib/${PKGNAME}/ebin/stun.beam
 lib/erlang/lib/${PKGNAME}/ebin/tcp_serv.beam
 lib/erlang/lib/${PKGNAME}/ebin/translate.beam
 lib/erlang/lib/${PKGNAME}/ebin/treap.beam
+lib/erlang/lib/${PKGNAME}/ebin/turn.beam
 lib/erlang/lib/${PKGNAME}/ebin/turn_sm.beam
 lib/erlang/lib/${PKGNAME}/ebin/turn_tmp_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/turn.beam
 lib/erlang/lib/${PKGNAME}/ebin/url_util.beam
 lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam
+lib/erlang/lib/${PKGNAME}/ebin/xml.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_app.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_gen.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_stream.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/xml.beam
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.app
+lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.beam
 lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_decode.beam
 lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_encode.beam
 lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_http.beam
 lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_util.beam
-lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.app
-lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.beam
-lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.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_web_admin.hrl
-lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl
 lib/erlang/lib/${PKGNAME}/include/eldap.hrl
-lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl
-lib/erlang/lib/${PKGNAME}/include/esip_lib.hrl
 lib/erlang/lib/${PKGNAME}/include/esip.hrl
+lib/erlang/lib/${PKGNAME}/include/esip_lib.hrl
 lib/erlang/lib/${PKGNAME}/include/http_bind.hrl
 lib/erlang/lib/${PKGNAME}/include/jlib.hrl
 lib/erlang/lib/${PKGNAME}/include/lager.hrl
@@ -275,10 +279,9 @@ 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}/include/stun.hrl
-lib/erlang/lib/${PKGNAME}/include/xml_gen.hrl
 lib/erlang/lib/${PKGNAME}/include/xml.hrl
+lib/erlang/lib/${PKGNAME}/include/xml_gen.hrl
 lib/erlang/lib/${PKGNAME}/include/xmlrpc.hrl
-lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
 lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
 lib/erlang/lib/${PKGNAME}/priv/lib/esip_drv.so
 lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so
@@ -322,39 +325,12 @@ share/doc/ejabberd/dev.html
 share/doc/ejabberd/discorus.png
 share/doc/ejabberd/features.html
 share/doc/ejabberd/guide.html
+share/doc/ejabberd/guide.pdf
 share/doc/ejabberd/logo.png
 share/doc/ejabberd/msrl-dit-deep.png
 share/doc/ejabberd/msrl-dit-flat.png
 share/doc/ejabberd/msrl-roster-deep.png
 share/doc/ejabberd/msrl-roster-flat.png
-share/doc/ejabberd/release_notes_0.9.1.txt
-share/doc/ejabberd/release_notes_0.9.8.txt
-share/doc/ejabberd/release_notes_0.9.txt
-share/doc/ejabberd/release_notes_1.0.0.txt
-share/doc/ejabberd/release_notes_1.1.0.txt
-share/doc/ejabberd/release_notes_1.1.1.txt
-share/doc/ejabberd/release_notes_1.1.2.txt
-share/doc/ejabberd/release_notes_1.1.3.txt
-share/doc/ejabberd/release_notes_1.1.4.txt
-share/doc/ejabberd/release_notes_2.0.0.txt
-share/doc/ejabberd/release_notes_2.0.1.txt
-share/doc/ejabberd/release_notes_2.0.2.txt
-share/doc/ejabberd/release_notes_2.0.3.txt
-share/doc/ejabberd/release_notes_2.0.4.txt
-share/doc/ejabberd/release_notes_2.0.5.txt
-share/doc/ejabberd/release_notes_2.1.0.txt
-share/doc/ejabberd/release_notes_2.1.1.txt
-share/doc/ejabberd/release_notes_2.1.10.txt
-share/doc/ejabberd/release_notes_2.1.11.txt
-share/doc/ejabberd/release_notes_2.1.12.txt
-share/doc/ejabberd/release_notes_2.1.2.txt
-share/doc/ejabberd/release_notes_2.1.3.txt
-share/doc/ejabberd/release_notes_2.1.4.txt
-share/doc/ejabberd/release_notes_2.1.5.txt
-share/doc/ejabberd/release_notes_2.1.6.txt
-share/doc/ejabberd/release_notes_2.1.7.txt
-share/doc/ejabberd/release_notes_2.1.8.txt
-share/doc/ejabberd/release_notes_2.1.9.txt
 share/doc/ejabberd/webadmmain.png
 share/doc/ejabberd/webadmmainru.png
 share/doc/ejabberd/yozhikheader.png
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 9973b02e179..73b9e28e43e 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2014/05/14 08:32:02 fhajny Exp $
+$NetBSD: distinfo,v 1.25 2014/07/30 09:45:38 fhajny Exp $
 
-SHA1 (ejabberd-14.05.tgz) = bad6b91ca6b9ac30ffe8b2eb0c5bb759d7742fab
-RMD160 (ejabberd-14.05.tgz) = b302e99842ca3ee9a44b839932508455cc74fa05
-Size (ejabberd-14.05.tgz) = 2143652 bytes
+SHA1 (ejabberd-14.07.tgz) = 321b28faedbc28f80664d4b301424b118dd0bad0
+RMD160 (ejabberd-14.07.tgz) = 6df710abe3a73746939930790623d65009c2b83f
+Size (ejabberd-14.07.tgz) = 3200975 bytes
 SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787
 SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
-SHA1 (patch-ae) = cfd7a7337410a70d38e4ef10a74db91ca512874c
+SHA1 (patch-ae) = fbdefae69e864b0ae34384226d6da7e2b810a704
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index 25577eea7b7..b1e28e69407 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.7 2013/10/11 13:32:25 fhajny Exp $
+$NetBSD: patch-ae,v 1.8 2014/07/30 09:45:38 fhajny Exp $
 
 Default locations.
---- ejabberdctl.template.orig	2013-09-27 09:19:22.000000000 +0000
+--- ejabberdctl.template.orig	2014-07-22 15:42:49.000000000 +0000
 +++ ejabberdctl.template
-@@ -23,7 +23,7 @@ if [ "$INSTALLUSER" != "" ] ; then
+@@ -22,7 +22,7 @@ if [ "$INSTALLUSER" != "" ] ; then
      EXEC_CMD="false"
      for GID in `id -G`; do
          if [ $GID -eq 0 ] ; then
@@ -12,20 +12,20 @@ Default locations.
          fi
      done
      if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
-@@ -68,10 +68,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
-     EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.yml
+@@ -67,10 +67,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
+     EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
  fi
  if [ "$LOGS_DIR" = "" ] ; then
 -    LOGS_DIR={{localstatedir}}/log/ejabberd
 +    LOGS_DIR=@EJABBERD_LOGDIR@
  fi
- if [ "$SPOOLDIR" = "" ] ; then
--    SPOOLDIR={{localstatedir}}/lib/ejabberd
-+    SPOOLDIR=@EJABBERD_DB@
+ if [ "$SPOOL_DIR" = "" ] ; then
+-    SPOOL_DIR={{localstatedir}}/lib/ejabberd
++    SPOOL_DIR=@EJABBERD_DB@
  fi
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH={{docdir}}
-@@ -82,7 +82,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
+@@ -81,7 +81,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
  fi
  if [ "{{release}}" != "true" ] ; then
      if [ "$EJABBERDDIR" = "" ] ; then
@@ -34,7 +34,7 @@ Default locations.
      fi
      if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
          EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-@@ -261,7 +261,7 @@ ctl()
+@@ -281,7 +281,7 @@ ctl()
      # using flock if available. Expects a linux-style
      # flock that can lock a file descriptor.
      MAXCONNID=100