Update ejabberd to 15.02.

Enable odbc, mysql and pgsql support unconditionally (no dependency cost).

Changes in 15.02:
- Add Elixir support, allows to write plugins in Elixir (not enabled in
  this pkgsrc package)
- New command to reload configuration without restart
- Support old style erlang expressions in YAML configuration
- Improved captcha listener parsing when protocol not specified
- Fix upgrade of old unbinarized pubsub table from 2.1
- Minor updates in the documentation
- Other bugfixes

4 files changed, 40 insertions, 30 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index f95ed46ff28..506e35c8111 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2015/01/02 09:14:16 fhajny Exp $
+# $NetBSD: Makefile,v 1.49 2015/02/20 21:06:52 fhajny Exp $
 
-DISTNAME=	ejabberd-14.12
+DISTNAME=	ejabberd-15.02
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -25,17 +25,14 @@ CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--enable-iconv
 CONFIGURE_ARGS+=	--enable-json
 CONFIGURE_ARGS+=	--enable-lager
+CONFIGURE_ARGS+=	--enable-mysql
 CONFIGURE_ARGS+=	--enable-nif
-CONFIGURE_ARGS+=	--enable-stun
-CONFIGURE_ARGS+=	--enable-user=${EJABBERD_USER}
+CONFIGURE_ARGS+=	--enable-odbc
+CONFIGURE_ARGS+=	--enable-pgsql
 CONFIGURE_ARGS+=	--enable-zlib
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 
-.include "../../lang/erlang/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.erlang:Miodbc) || \
-    !empty(PKG_BUILD_OPTIONS.erlang:Munixodbc)
-CONFIGURE_ARGS+=	--enable-odbc
-.endif
+CONFIGURE_ARGS+=	--enable-user=${EJABBERD_USER}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 
 RCD_SCRIPTS=		ejabberd
 
@@ -91,7 +88,6 @@ SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	Makefile.in
 SUBST_FILES.paths+=	ejabberd.yml.example
 SUBST_FILES.paths+=	ejabberdctl.template
-SUBST_FILES.paths+=	doc/guide.tex
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@EJABBERD_DB@,${EJABBERD_DB},g'
 SUBST_SED.paths+=	-e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
@@ -106,9 +102,6 @@ fetch-deps:
 post-extract:
 	${LN} -s ${WRKDIR}/deps ${WRKSRC}/
 
-post-patch:
-	${RM} -f ${WRKSRC}/doc/guide.tex.orig
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/dev.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index ce4b286863a..c43d63eee40 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2015/01/02 09:14:16 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.29 2015/02/20 21:06:52 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -205,7 +205,14 @@ 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_prof.beam
+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
@@ -222,6 +229,12 @@ 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_subscription.beam
@@ -252,6 +265,7 @@ 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_util.beam
 lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_codec.beam
 lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl
 lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
@@ -274,6 +288,7 @@ 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/stun.hrl
 lib/erlang/lib/${PKGNAME}/include/xml.hrl
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index c8fd3811373..ab0b1c3d913 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.29 2015/01/02 09:14:16 fhajny Exp $
+$NetBSD: distinfo,v 1.30 2015/02/20 21:06:52 fhajny Exp $
 
-SHA1 (ejabberd-14.12-deps.tar.gz) = 995cd087df008f7493bac2bd66de6b276cfd37b8
-RMD160 (ejabberd-14.12-deps.tar.gz) = 77f04cb42fbed07680bef05d384093753cc435c0
-Size (ejabberd-14.12-deps.tar.gz) = 8906098 bytes
-SHA1 (ejabberd-14.12.tgz) = baf944fb15a31ea19a3bc6da685bbc0e7c0daeff
-RMD160 (ejabberd-14.12.tgz) = 71ccb676695730bcb8b5ad0c683d8de4fd6ef569
-Size (ejabberd-14.12.tgz) = 3261685 bytes
-SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787
+SHA1 (ejabberd-15.02-deps.tar.gz) = 4963bf6526ccfea876ea99051c57fbc3710c1836
+RMD160 (ejabberd-15.02-deps.tar.gz) = 037c2c60ca228ba07df8b24877403357c09cbf34
+Size (ejabberd-15.02-deps.tar.gz) = 9099152 bytes
+SHA1 (ejabberd-15.02.tgz) = 2cb148fa5e7c4efb3a99fd8a603c12673f1257b9
+RMD160 (ejabberd-15.02.tgz) = 1224dea34bb01b4ae994a88e235c2ff9b102dd9d
+Size (ejabberd-15.02.tgz) = 3281316 bytes
+SHA1 (patch-aa) = 32968bf94c0859cc2c65710b038c8ff7162e1422
 SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
 SHA1 (patch-ae) = 90787d77dda8317d89908ca9520710ea4e8d43f4
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa
index d059540cbdd..d8831fd2f9e 100644
--- a/chat/ejabberd/patches/patch-aa
+++ b/chat/ejabberd/patches/patch-aa
@@ -1,16 +1,18 @@
-$NetBSD: patch-aa,v 1.10 2013/10/11 13:32:25 fhajny Exp $
+$NetBSD: patch-aa,v 1.11 2015/02/20 21:06:52 fhajny Exp $
 
 Fix locations; don't mess with ownership.
---- Makefile.in.orig	2013-09-27 09:19:22.000000000 +0000
+--- Makefile.in.orig	2015-02-11 23:14:57.000000000 +0000
 +++ Makefile.in
-@@ -9,13 +9,13 @@ exec_prefix = @exec_prefix@
+@@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@
  DESTDIR =
  
  # /etc/ejabberd/
 -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
 +ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
  
- # /sbin/
+ # /bin/
+ BINDIR = $(DESTDIR)@bindir@
+@@ -18,7 +18,7 @@ BINDIR = $(DESTDIR)@bindir@
  SBINDIR = $(DESTDIR)@sbindir@
  
  # /lib/ejabberd/
@@ -19,7 +21,7 @@ Fix locations; don't mess with ownership.
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -41,16 +41,16 @@ SODIR = $(PRIVDIR)/lib
+@@ -44,16 +44,16 @@ SODIR = $(PRIVDIR)/lib
  MSGSDIR = $(PRIVDIR)/msgs
  
  # /var/lib/ejabberd/
@@ -39,7 +41,7 @@ Fix locations; don't mess with ownership.
  
  INSTALLUSER=@INSTALLUSER@
  # if no user was enabled, don't set privileges or ownership
-@@ -61,10 +61,10 @@ ifeq ($(INSTALLUSER),)
+@@ -64,10 +64,10 @@ ifeq ($(INSTALLUSER),)
    CHOWN_OUTPUT=/dev/null
    INIT_USER=root
  else