summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2015-11-05 12:23:50 +0000
committerfhajny <fhajny@pkgsrc.org>2015-11-05 12:23:50 +0000
commit8afce1b1b63aaeb50473cb82374eff2d038ad952 (patch)
treea23d97ce818eb1f08d53f3bc6a3081b577481934 /chat
parentd73ed3e0d2b297d3b5ed7a7f7f480971f2fc39ef (diff)
downloadpkgsrc-8afce1b1b63aaeb50473cb82374eff2d038ad952.tar.gz
Update ejabberd to 15.10.
Switch dependencies to use standalone packages for Erlang modules. Core - c2s: Let stop/1 close XEP-0198 sessions - c2s: Close socket when waiting for resume - s2s: Don't crash on certificates without extensions - xml: Optimizations in memory allocator - OAuth: Fix cyrsasl_oauth:mech_new call Modules - mod_http_upload: New HTTP File Upload module (XEP-0363) - mod_http_upload_quota: New module to support user quotas - mod_metrics: New simple metrics module for use with grapherl - mod_mam: Advertise XEP-0313 v0.4 support in room disco - mod_mam: Avoid MAM dups when routing to multiple resources Compilation - Make: Pass {C,CPP,LD}FLAGS used in main ./configure to deps - Use OTP directory structure for `make install` - mix.lock should be commited to ensure consistent builds - Code cosmetic cleanup Commands - Let modules_update_specs report failures - Fix problem with -auth - Fix unauthenticated calls to commands with policy=user - Improve access_commands option backward compatibility Configuration - ejabberdctl.cfg: New CONTRIB_MODULES_CONF_DIR - Be able to merge old style configs with {listen,...} - Fix support for macros - mod_ping: New option ping_ack_timeout
Diffstat (limited to 'chat')
-rw-r--r--chat/ejabberd/DESCR22
-rw-r--r--chat/ejabberd/Makefile54
-rw-r--r--chat/ejabberd/PLIST587
-rw-r--r--chat/ejabberd/PLIST.sqlite6
-rw-r--r--chat/ejabberd/distinfo23
-rw-r--r--chat/ejabberd/options.mk16
-rw-r--r--chat/ejabberd/patches/patch-aa17
-rw-r--r--chat/ejabberd/patches/patch-ad4
-rw-r--r--chat/ejabberd/patches/patch-ae18
-rw-r--r--chat/ejabberd/patches/patch-rebar.config.script67
-rw-r--r--chat/ejabberd/patches/patch-tools_ejabberdctl.bc6
11 files changed, 362 insertions, 458 deletions
diff --git a/chat/ejabberd/DESCR b/chat/ejabberd/DESCR
index d7f10024358..be0dfbde171 100644
--- a/chat/ejabberd/DESCR
+++ b/chat/ejabberd/DESCR
@@ -1,20 +1,2 @@
-ejabberd is a Free and Open Source distributed fault-tolerant Jabber server.
-It is writen mostly in Erlang.
-
-The main features of ejabberd are:
- - Works on most of popular platforms: *nix
- (tested on Linux, FreeBSD and NetBSD)
- - Distributed
- - Fault-tolerance:
- - Built-in Multi-User Chat service
- - Built-in IRC transport
- - Built-in Publish-Subscribe service
- - Built-in Jabber Users Directory service based on users vCards
- - SSL support
- - Ability to interface with external components
- (JIT, MSN-t, Yahoo-t, etc)
- - Migration from jabberd14 is possible
- - Mostly XMPP-compliant
- - Support for JEP-0030 (Service Discovery).
- - Support for JEP-0039 (Statistics Gathering).
- - Support for xml:lang attribute in many XML elements
+Ejabberd is a Rock Solid, Massively Scalable, Infinitely Extensible
+XMPP Server.
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 29ee6ca8e1d..0c9397be14d 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,21 +1,35 @@
-# $NetBSD: Makefile,v 1.59 2015/10/10 01:58:00 ryoon Exp $
+# $NetBSD: Makefile,v 1.60 2015/11/05 12:23:50 fhajny Exp $
-DISTNAME= ejabberd-15.09
-PKGREVISION= 1
+DISTNAME= ejabberd-15.10
CATEGORIES= chat
MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tgz
-DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz
-SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
-
MAINTAINER= filip@joyent.com
HOMEPAGE= http://www.ejabberd.im/
COMMENT= Free and Open Source distributed fault-tolerant Jabber server
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= git-base>=1.5:../../devel/git-base
-CONFLICTS+= jabberd-[0-9]*
+#BUILD_DEPENDS+= git-base>=1.5:../../devel/git-base
+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
+CONFLICTS+= jabberd-[0-9]*
GNU_CONFIGURE= yes
USE_GCC_RUNTIME= yes
@@ -28,18 +42,12 @@ CONFIGURE_ARGS+= --enable-lager
CONFIGURE_ARGS+= --enable-mysql
CONFIGURE_ARGS+= --enable-nif
CONFIGURE_ARGS+= --enable-odbc
+CONFIGURE_ARGS+= --enable-pam
CONFIGURE_ARGS+= --enable-pgsql
CONFIGURE_ARGS+= --enable-zlib
-CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat}
-
CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
-# Configure normally happens as part of getting the deps, which we avoid
-# by using a separate deps distfile.
-CONFIGURE_DIRS= . deps/esip deps/p1_stringprep deps/p1_tls deps/p1_xml deps/p1_yaml
-BUILD_DIRS= .
-
RCD_SCRIPTS= ejabberd
BUILD_DEFS+= EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR
@@ -73,6 +81,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
CONF_FILES_PERMS= ${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \
${ROOT_USER} ${EJABBERD_GROUP} 0640
@@ -92,21 +101,14 @@ SUBST_FILES.paths+= tools/ejabberdctl.bc
SUBST_VARS.paths= DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR
SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX
-# Helper target to refresh remote deps for tarring up
-fetch-deps:
- cd ${WRKSRC} && ${RM} -rf deps && ${BUILD_MAKE_CMD} deps
-
post-extract:
- ${LN} -s ${WRKDIR}/deps ${WRKSRC}/
+ cd ${WRKSRC} && ${MKDIR} deps && ${TOUCH} deps/.got deps/.built
post-install:
- ${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc \
+ ${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
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/erlang/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../textproc/libyaml/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index b811eba2c5e..9910e1b8eb0 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,369 +1,224 @@
-@comment $NetBSD: PLIST,v 1.35 2015/10/01 14:48:14 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/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_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_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/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
-lib/erlang/lib/${PKGNAME}/ebin/esip_dialog.beam
-lib/erlang/lib/${PKGNAME}/ebin/esip_listener.beam
-lib/erlang/lib/${PKGNAME}/ebin/esip_server_transaction.beam
-lib/erlang/lib/${PKGNAME}/ebin/esip_socket.beam
-lib/erlang/lib/${PKGNAME}/ebin/esip_sup.beam
-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/ext_mod.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/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/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.beam
-lib/erlang/lib/${PKGNAME}/ebin/gr_counter_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/gr_manager.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/jd2ejd.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.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/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_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_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_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/oauth2.app
-lib/erlang/lib/${PKGNAME}/ebin/oauth2.beam
-lib/erlang/lib/${PKGNAME}/ebin/oauth2_backend.beam
-lib/erlang/lib/${PKGNAME}/ebin/oauth2_config.beam
-lib/erlang/lib/${PKGNAME}/ebin/oauth2_priv_set.beam
-lib/erlang/lib/${PKGNAME}/ebin/oauth2_response.beam
-lib/erlang/lib/${PKGNAME}/ebin/oauth2_token.beam
-lib/erlang/lib/${PKGNAME}/ebin/oauth2_token_generation.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_mysql.app
-lib/erlang/lib/${PKGNAME}/ebin/p1_mysql.beam
-lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_app.beam
-lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_auth.beam
-lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_conn.beam
-lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_recv.beam
-lib/erlang/lib/${PKGNAME}/ebin/p1_mysql_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/p1_pgsql.app
-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
-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_xmlrpc.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/pgsql.beam
-lib/erlang/lib/${PKGNAME}/ebin/pgsql_app.beam
-lib/erlang/lib/${PKGNAME}/ebin/pgsql_proto.beam
-lib/erlang/lib/${PKGNAME}/ebin/pgsql_sup.beam
-lib/erlang/lib/${PKGNAME}/ebin/pgsql_tcp.beam
-lib/erlang/lib/${PKGNAME}/ebin/pgsql_util.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/stringprep.beam
-lib/erlang/lib/${PKGNAME}/ebin/stringprep_app.beam
-lib/erlang/lib/${PKGNAME}/ebin/stringprep_sup.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
-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/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/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/xmlrpc.app
-lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.beam
-lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_codec.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_tests.beam
-lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_util.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/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
-lib/erlang/lib/${PKGNAME}/include/logger.hrl
-lib/erlang/lib/${PKGNAME}/include/mod_muc_room.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/p1_mysql.hrl
-lib/erlang/lib/${PKGNAME}/include/pubsub.hrl
-lib/erlang/lib/${PKGNAME}/include/sqlite3.hrl
-lib/erlang/lib/${PKGNAME}/include/stun.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}/priv/bin/captcha.sh
-lib/erlang/lib/${PKGNAME}/priv/bin/joincluster
-lib/erlang/lib/${PKGNAME}/priv/bin/leavecluster
-lib/erlang/lib/${PKGNAME}/priv/jiffy.so
-lib/erlang/lib/${PKGNAME}/priv/lib/esip_drv.so
-lib/erlang/lib/${PKGNAME}/priv/lib/ezlib_drv.so
-lib/erlang/lib/${PKGNAME}/priv/lib/iconv.so
-lib/erlang/lib/${PKGNAME}/priv/lib/jiffy.so
-lib/erlang/lib/${PKGNAME}/priv/lib/p1_sha.so
-lib/erlang/lib/${PKGNAME}/priv/lib/p1_tls_drv.so
-lib/erlang/lib/${PKGNAME}/priv/lib/p1_yaml.so
-lib/erlang/lib/${PKGNAME}/priv/lib/stringprep.so
-lib/erlang/lib/${PKGNAME}/priv/lib/xml.so
-lib/erlang/lib/${PKGNAME}/priv/lib/xml_stream.so
-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
+@comment $NetBSD: PLIST,v 1.36 2015/11/05 12:23:50 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/bin/joincluster
+lib/erlang/lib/ejabberd/priv/bin/leavecluster
+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
sbin/ejabberdctl
share/bash-completion.d/ejabberd
share/doc/ejabberd/COPYING
diff --git a/chat/ejabberd/PLIST.sqlite b/chat/ejabberd/PLIST.sqlite
deleted file mode 100644
index 1a5d0aa5132..00000000000
--- a/chat/ejabberd/PLIST.sqlite
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.sqlite,v 1.1 2015/05/04 14:40:38 fhajny Exp $
-lib/erlang/lib/${PKGNAME}/ebin/sqlite3.app
-lib/erlang/lib/${PKGNAME}/ebin/sqlite3.beam
-lib/erlang/lib/${PKGNAME}/ebin/sqlite3_lib.beam
-lib/erlang/lib/${PKGNAME}/priv/lib/sqlite3_drv.so
-lib/erlang/lib/${PKGNAME}/priv/sqlite3_drv.so
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 021d0e15043..b248ba22004 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.38 2015/11/03 01:20:18 agc Exp $
+$NetBSD: distinfo,v 1.39 2015/11/05 12:23:50 fhajny Exp $
-SHA1 (ejabberd-15.09-deps.tar.gz) = 84635a6e5fdb221fb0464ea49afee1e61e86f44c
-RMD160 (ejabberd-15.09-deps.tar.gz) = 1bdd900e3e064c4cd0b0f6b9c53cb73ccfc7b992
-SHA512 (ejabberd-15.09-deps.tar.gz) = f30d38f3746f3643e3053621ccbeade2c14d24d0dcb76dbba9d9428f0fd33b7f35c71e82d030544e7cde420f19b9346b66ce66dea0327d4fe7cc9a8835b71841
-Size (ejabberd-15.09-deps.tar.gz) = 16715917 bytes
-SHA1 (ejabberd-15.09.tgz) = 6df162377c5955e14d39e36be23e121e07d49b97
-RMD160 (ejabberd-15.09.tgz) = 126641534848e0fe16815dfa298a08a4fb25dc04
-SHA512 (ejabberd-15.09.tgz) = 96e53b4da859a8125bc5973ee425bd40c2c956cb11bd6da044e4362e308dbf0a004196bfa555edf0379ecc3a12f74fc93ab2cb95c36ec52615bfe295799a253d
-Size (ejabberd-15.09.tgz) = 1590675 bytes
-SHA1 (patch-aa) = 5025927e6be5792fa8e59541938950d901b91ee5
-SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
-SHA1 (patch-ae) = a9340add286fe4b70ce0ac6b75a2f9162b8c4e7d
+SHA1 (ejabberd-15.10.tgz) = b26b30c85c4a28ffa749e7ef3e7c5a14b3f9937f
+RMD160 (ejabberd-15.10.tgz) = f02902824f89bd6b187be0e5356fef215b2e7688
+SHA512 (ejabberd-15.10.tgz) = 2c665422568b67ef608256797b3db17ce7b48bbf1dad57090b9ea29ea531732c9be6a03d08f6a4ab9cc947483b2c962481a445975b3aac5c78012defdd345ee4
+Size (ejabberd-15.10.tgz) = 1599835 bytes
+SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
+SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
+SHA1 (patch-ae) = 1a6008ba365a172ba85c0efb98057f68de7b78f4
SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
-SHA1 (patch-tools_ejabberdctl.bc) = 678d9a0be30bc4b1612c97a62def652ea6ca3e8a
+SHA1 (patch-rebar.config.script) = cc22e34f8c597c4259d3f224b9076203072b573e
+SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
diff --git a/chat/ejabberd/options.mk b/chat/ejabberd/options.mk
index 18bd7b7bb74..ddd2ac379d0 100644
--- a/chat/ejabberd/options.mk
+++ b/chat/ejabberd/options.mk
@@ -1,19 +1,21 @@
-# $NetBSD: options.mk,v 1.1 2015/04/29 10:03:58 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2015/11/05 12:23:50 fhajny Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ejabberd
-PKG_SUPPORTED_OPTIONS= sqlite
+PKG_SUPPORTED_OPTIONS= redis sqlite
PKG_SUGGESTED_OPTIONS= #
.include "../../mk/bsd.options.mk"
-PLIST_SRC= ${PLIST_SRC_DFLT:Q}
+#
+# Add Redis support
+#
+.if !empty(PKG_OPTIONS:Mredis)
+DEPENDS+= erlang-eredis-[0-9]*:../../databases/erlang-eredis
+.endif
#
# Add SQLite 3 support
#
.if !empty(PKG_OPTIONS:Msqlite)
-CONFIGURE_ARGS+= --enable-sqlite
-CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
-PLIST_SRC+= PLIST.sqlite
-. include "../../databases/sqlite3/buildlink3.mk"
+DEPENDS+= erlang-sqlite3-[0-9]*:../../databases/erlang-sqlite3
.endif
diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa
index 8db0812a304..d537adff84d 100644
--- a/chat/ejabberd/patches/patch-aa
+++ b/chat/ejabberd/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2015/04/29 10:03:58 fhajny Exp $
+$NetBSD: patch-aa,v 1.13 2015/11/05 12:23:50 fhajny Exp $
Fix locations; don't mess with ownership.
---- Makefile.in.orig 2015-04-23 08:14:08.000000000 +0000
+
+--- Makefile.in.orig 2015-10-28 14:53:12.000000000 +0000
+++ Makefile.in
@@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@
DESTDIR =
@@ -12,16 +13,20 @@ Fix locations; don't mess with ownership.
# /bin/
BINDIR = $(DESTDIR)@bindir@
-@@ -18,7 +18,7 @@ BINDIR = $(DESTDIR)@bindir@
+@@ -18,10 +18,10 @@ BINDIR = $(DESTDIR)@bindir@
SBINDIR = $(DESTDIR)@sbindir@
+ # /lib/
+-LIBDIR = $(DESTDIR)@libdir@
++LIBDIR = $(DESTDIR)@prefix@/lib/erlang/lib
+
# /lib/ejabberd/
-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
-+EJABBERDDIR = $(DESTDIR)@prefix@/lib/erlang/lib/@DISTNAME@
++EJABBERDDIR = $(LIBDIR)/ejabberd
# /share/doc/ejabberd
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -47,16 +47,16 @@ MSGSDIR = $(PRIVDIR)/msgs
+@@ -50,16 +50,16 @@ MSGSDIR = $(PRIVDIR)/msgs
SQLDIR = $(PRIVDIR)/sql
# /var/lib/ejabberd/
@@ -41,7 +46,7 @@ Fix locations; don't mess with ownership.
INSTALLUSER=@INSTALLUSER@
# if no user was enabled, don't set privileges or ownership
-@@ -67,10 +67,10 @@ ifeq ($(INSTALLUSER),)
+@@ -70,10 +70,10 @@ ifeq ($(INSTALLUSER),)
CHOWN_OUTPUT=/dev/null
INIT_USER=root
else
diff --git a/chat/ejabberd/patches/patch-ad b/chat/ejabberd/patches/patch-ad
index b593796536a..e4713208c1b 100644
--- a/chat/ejabberd/patches/patch-ad
+++ b/chat/ejabberd/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.7 2013/10/11 13:32:25 fhajny Exp $
+$NetBSD: patch-ad,v 1.8 2015/11/05 12:23:50 fhajny Exp $
Proper path to captcha script.
--- ejabberd.yml.example.orig 2013-09-27 09:19:22.000000000 +0000
@@ -8,7 +8,7 @@ Proper path to captcha script.
## Full path to a script that generates the image.
##
-## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh"
-+## captcha_cmd: "@PREFIX@/lib/erlang/lib/@DISTNAME@/priv/bin/captcha.sh"
++## captcha_cmd: "@PREFIX@/lib/erlang/lib/ejabberd/priv/bin/captcha.sh"
##
## Host for the URL and port where ejabberd listens for CAPTCHA requests.
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index b388b1b2d4d..9eea8eaca58 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
+$NetBSD: patch-ae,v 1.12 2015/11/05 12:23:50 fhajny Exp $
- Default locations.
- Make it work with NetBSD's flock(1).
---- ejabberdctl.template.orig 2015-06-24 09:58:37.000000000 +0000
+--- ejabberdctl.template.orig 2015-10-28 14:53:12.000000000 +0000
+++ ejabberdctl.template
-@@ -71,10 +71,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
+@@ -72,10 +72,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
fi
if [ "$LOGS_DIR" = "" ] ; then
@@ -18,16 +18,16 @@ $NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
fi
if [ "$EJABBERD_DOC_PATH" = "" ] ; then
EJABBERD_DOC_PATH={{docdir}}
-@@ -85,7 +85,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
+@@ -86,7 +86,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
fi
if [ "{{release}}" != "true" ] ; then
if [ "$EJABBERDDIR" = "" ] ; then
- EJABBERDDIR={{libdir}}/ejabberd
-+ EJABBERDDIR={{libdir}}/erlang/lib/@DISTNAME@
++ EJABBERDDIR={{libdir}}/erlang/lib/ejabberd
fi
- if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
- EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-@@ -335,7 +335,7 @@ ctl()
+ if [ "$EJABBERD_PRIV_PATH" = "" ] ; then
+ EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
+@@ -325,7 +325,7 @@ ctl()
# using flock if available. Expects a linux-style
# flock that can lock a file descriptor.
MAXCONNID=100
@@ -36,7 +36,7 @@ $NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
FLOCK=/usr/bin/flock
if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
JOT=/usr/bin/jot
-@@ -362,7 +362,7 @@ ctl()
+@@ -352,7 +352,7 @@ ctl()
CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
(
exec 8>"$CTL_LOCKFILE"
diff --git a/chat/ejabberd/patches/patch-rebar.config.script b/chat/ejabberd/patches/patch-rebar.config.script
new file mode 100644
index 00000000000..b4479c2c503
--- /dev/null
+++ b/chat/ejabberd/patches/patch-rebar.config.script
@@ -0,0 +1,67 @@
+$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.
diff --git a/chat/ejabberd/patches/patch-tools_ejabberdctl.bc b/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
index 6777364da65..2b7a82b2cc8 100644
--- a/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
+++ b/chat/ejabberd/patches/patch-tools_ejabberdctl.bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-tools_ejabberdctl.bc,v 1.1 2015/10/01 14:48:14 fhajny Exp $
+$NetBSD: patch-tools_ejabberdctl.bc,v 1.2 2015/11/05 12:23:50 fhajny Exp $
-Subst real log dir.
+Proper log file location.
---- tools/ejabberdctl.bc.orig 2015-09-29 20:37:15.000000000 +0000
+--- tools/ejabberdctl.bc.orig 2015-10-28 14:53:12.000000000 +0000
+++ tools/ejabberdctl.bc
@@ -3,7 +3,7 @@
#
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-29 21:20:32 +0000