Update chat/ejabberd to 15.04. Add sqlite option.

Upstream changes:
- R16B03-1 is now the minimal required Erlang/OTP version
- SQLite support
- Default db_type can be specified with global default_db option
- Included mod_muc_admin, mod_admin_extra and mod_multicast modules
- Removed ejabberd_http_poll
- Pubsub improvements
- Better RFC compliance
- Several other bugfixes

5 files changed, 43 insertions, 24 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index e18f95748bd..80e2298b568 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2015/04/26 11:52:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.53 2015/04/29 10:03:58 fhajny Exp $
 
-DISTNAME=	ejabberd-15.03
-PKGREVISION=	1
+DISTNAME=	ejabberd-15.04
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -43,6 +42,7 @@ BUILD_DEFS+=		VARBASE
 PKG_SYSCONFSUBDIR=	ejabberd
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 EJABBERD_USER?=		ejabberd
 EJABBERD_GROUP?=	ejabberd
@@ -54,14 +54,10 @@ OWN_DIRS_PERMS+=	${EJABBERD_PIDDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
 OWN_DIRS_PERMS+=	${EJABBERD_LOGDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
 OWN_DIRS_PERMS+=	${EJABBERD_DB} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
 
-FILES_SUBST+=		DISTNAME=${DISTNAME}
 FILES_SUBST+=		EJABBERD_USER=${EJABBERD_USER}
 FILES_SUBST+=		EJABBERD_GROUP=${EJABBERD_GROUP}
 FILES_SUBST+=		EJABBERD_DB=${EJABBERD_DB}
 
-PLIST_SUBST+=		DISTNAME=${DISTNAME}
-PLIST_SUBST+=		EJABBERD_EXDIR=${EJABBERD_EXDIR}
-
 PKG_GROUPS+=		${EJABBERD_GROUP}
 PKG_USERS+=		${EJABBERD_USER}:${EJABBERD_GROUP}
 PKG_GECOS.${EJABBERD_USER}=	ejabberd user
@@ -81,7 +77,8 @@ CONF_FILES_PERMS+=	${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \
 			${ROOT_USER} ${EJABBERD_GROUP} 0640
 SPECIAL_PERMS+=		sbin/ejabberdctl ${ROOT_USER} ${EJABBERD_GROUP} 0750
 
-REPLACE_SH=		ejabberdctl.template tools/captcha.sh
+REPLACE_SH=		ejabberdctl.template tools/captcha.sh \
+			tools/joincluster tools/leavecluster
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing paths
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index edfe0e9758d..47e2a117376 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2015/04/09 06:35:53 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.31 2015/04/29 10:03:58 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -36,7 +36,6 @@ 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_ws.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam
@@ -51,6 +50,7 @@ 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
@@ -143,6 +143,7 @@ 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
@@ -160,8 +161,10 @@ 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_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
@@ -173,7 +176,6 @@ 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_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
@@ -243,6 +245,7 @@ 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
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index d4ee6283cca..2118215bd07 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.31 2015/04/09 06:35:53 fhajny Exp $
+$NetBSD: distinfo,v 1.32 2015/04/29 10:03:58 fhajny Exp $
 
-SHA1 (ejabberd-15.03-deps.tar.gz) = cd291758183b40afa076da16168d08c42d6ab228
-RMD160 (ejabberd-15.03-deps.tar.gz) = 9ec4c1043c5ebfc83b29bda6f9ca6320d8ab1dcc
-Size (ejabberd-15.03-deps.tar.gz) = 9152689 bytes
-SHA1 (ejabberd-15.03.tgz) = 7fafdf5adf15c2c569028c51915bfcfeae744826
-RMD160 (ejabberd-15.03.tgz) = 22dde290f1d9fb2a41b2eb02f89eb9a1ea0a895c
-Size (ejabberd-15.03.tgz) = 3262151 bytes
-SHA1 (patch-aa) = 32968bf94c0859cc2c65710b038c8ff7162e1422
+SHA1 (ejabberd-15.04-deps.tar.gz) = c4a920fe2e60c0810af1588bd955066261f8dfc4
+RMD160 (ejabberd-15.04-deps.tar.gz) = 527e6f8c9965012281cac6da7feea0993a6d8378
+Size (ejabberd-15.04-deps.tar.gz) = 13647808 bytes
+SHA1 (ejabberd-15.04.tgz) = cbd2661e921fe324e694bd1f582a3cbd67c309f9
+RMD160 (ejabberd-15.04.tgz) = 2340080ff4cd4d0b5d8b7aec71ecd85b2938dae4
+Size (ejabberd-15.04.tgz) = 3261947 bytes
+SHA1 (patch-aa) = 5025927e6be5792fa8e59541938950d901b91ee5
 SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
 SHA1 (patch-ae) = 90787d77dda8317d89908ca9520710ea4e8d43f4
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
diff --git a/chat/ejabberd/options.mk b/chat/ejabberd/options.mk
new file mode 100644
index 00000000000..18bd7b7bb74
--- /dev/null
+++ b/chat/ejabberd/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2015/04/29 10:03:58 fhajny Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ejabberd
+PKG_SUPPORTED_OPTIONS=	sqlite
+PKG_SUGGESTED_OPTIONS=	#
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_SRC=		${PLIST_SRC_DFLT:Q}
+
+#
+# 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"
+.endif
diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa
index d8831fd2f9e..8db0812a304 100644
--- a/chat/ejabberd/patches/patch-aa
+++ b/chat/ejabberd/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2015/02/20 21:06:52 fhajny Exp $
+$NetBSD: patch-aa,v 1.12 2015/04/29 10:03:58 fhajny Exp $
 
 Fix locations; don't mess with ownership.
---- Makefile.in.orig	2015-02-11 23:14:57.000000000 +0000
+--- Makefile.in.orig	2015-04-23 08:14:08.000000000 +0000
 +++ Makefile.in
 @@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@
  DESTDIR =
@@ -21,8 +21,8 @@ Fix locations; don't mess with ownership.
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -44,16 +44,16 @@ SODIR = $(PRIVDIR)/lib
- MSGSDIR = $(PRIVDIR)/msgs
+@@ -47,16 +47,16 @@ MSGSDIR = $(PRIVDIR)/msgs
+ SQLDIR = $(PRIVDIR)/sql
  
  # /var/lib/ejabberd/
 -SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
@@ -41,7 +41,7 @@ Fix locations; don't mess with ownership.
  
  INSTALLUSER=@INSTALLUSER@
  # if no user was enabled, don't set privileges or ownership
-@@ -64,10 +64,10 @@ ifeq ($(INSTALLUSER),)
+@@ -67,10 +67,10 @@ ifeq ($(INSTALLUSER),)
    CHOWN_OUTPUT=/dev/null
    INIT_USER=root
  else