Update chat/ejabberd to 15.06.

Message archiving
- Add support for message archiving in Mnesia or relational databases.

Protocol
- Document protocol support and version inside each module and use that
  info in documentation
- Remove deprecated XEP-0090 Entity Time and XEP-0091 Delayed Delivery
- Don't add body element to MUC subject messages
- Do not bounce normal messages sent to unavailable resource

Admin command-line tool
- Fixed several ejabberd commands
- Allow password with ';' passed in ejabberdctl
- Improve ejabberdctl external module install code, allows better
  error checking
- New ping ejabberdctl command to check if the node is up and running
- New commands for Multi-User chat management: get_room_options and
  get_user_rooms

Configuration
- Add config validation at startup
- Fix include of non yaml config files
- New option hide_sensitive_log_data to hide client IP address in log
- New option net_ticktime, to fine tune Erlang cluster networking
- New option max_users_presence in mod_muc, to avoid broadcasting
  presence packet from users after a chat room has reached a given size

Elixir
- Add correct package version for mix

Security
- New options to configure your own custom Diffie-Helman parameters:
  dhfile and s2s_dhfile

PubSub
- Enforce definition of pubsub node max_items
- Fix pubsub/odbc crash on remote user unsubscribe
- Fix use of publish_only affiliation with odbc backend

Multicast
- Pick first local multicast service, otherwise remote

Databases
- Fix anonymous user login, it wasn't stored in anonymous mnesia table
- Fixed some string/binary issues in ejabberd_odbc
- PostgreSQL storage: added missing sm (session manager) table

Packaging
- Microsoft Windows 64 bits installer
- Provide RPM and DEB binary packages for linux 64 bits.

Clean up
- Remove obsolete doc and win32 files

5 files changed, 21 insertions, 54 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index e12db89c86f..e8441fd43d6 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2015/05/04 14:40:38 fhajny Exp $
+# $NetBSD: Makefile,v 1.55 2015/06/29 21:44:10 fhajny Exp $
 
-DISTNAME=	ejabberd-15.04
-PKGREVISION=	1
+DISTNAME=	ejabberd-15.06
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
@@ -101,11 +100,6 @@ fetch-deps:
 post-extract:
 	${LN} -s ${WRKDIR}/deps ${WRKSRC}/
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/dev.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/erlang/buildlink3.mk"
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index ff7528d41f7..d6329b02c37 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2015/05/04 14:40:38 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.33 2015/06/29 21:44:10 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -160,6 +160,7 @@ 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
@@ -347,19 +348,6 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg
 lib/erlang/lib/${PKGNAME}/priv/sql/lite.sql
 sbin/ejabberdctl
 share/doc/ejabberd/COPYING
-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/webadmmain.png
-share/doc/ejabberd/webadmmainru.png
-share/doc/ejabberd/yozhikheader.png
 share/examples/ejabberd/ejabberd.yml
 share/examples/ejabberd/ejabberdctl.cfg
 share/examples/ejabberd/inetrc
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index b998b9a4313..5c97b1324ba 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.33 2015/05/04 14:40:38 fhajny Exp $
+$NetBSD: distinfo,v 1.34 2015/06/29 21:44:10 fhajny Exp $
 
-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 (ejabberd-15.06-deps.tar.gz) = b3704208c5756c7c717477b9c66e7f5853b6d91e
+RMD160 (ejabberd-15.06-deps.tar.gz) = 3ae7d5d31befe7717322253d7692bc3b33172042
+Size (ejabberd-15.06-deps.tar.gz) = 14294458 bytes
+SHA1 (ejabberd-15.06.tgz) = 7e3f050f1c27cfe9941440572374c8fa80fca0d7
+RMD160 (ejabberd-15.06.tgz) = ab352af31f929852428a137c49b662e6bff07733
+Size (ejabberd-15.06.tgz) = 1560640 bytes
 SHA1 (patch-aa) = 5025927e6be5792fa8e59541938950d901b91ee5
 SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
-SHA1 (patch-ae) = 90787d77dda8317d89908ca9520710ea4e8d43f4
+SHA1 (patch-ae) = a9340add286fe4b70ce0ac6b75a2f9162b8c4e7d
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
-SHA1 (patch-deps_p1__iconv_rebar.config) = cd1200342aea2d4731207b3b5c33653682a8988f
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index b3e58478bda..b388b1b2d4d 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.10 2015/01/02 09:14:16 fhajny Exp $
+$NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
 
 - Default locations.
 - Make it work with NetBSD's flock(1).
 
---- ejabberdctl.template.orig	2014-07-22 16:42:49.000000000 +0100
-+++ ejabberdctl.template	2014-08-21 20:17:35.000000000 +0100
-@@ -67,10 +67,10 @@
+--- ejabberdctl.template.orig	2015-06-24 09:58:37.000000000 +0000
++++ ejabberdctl.template
+@@ -71,10 +71,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.10 2015/01/02 09:14:16 fhajny Exp $
  fi
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH={{docdir}}
-@@ -81,7 +81,7 @@
+@@ -85,7 +85,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
  fi
  if [ "{{release}}" != "true" ] ; then
      if [ "$EJABBERDDIR" = "" ] ; then
@@ -27,16 +27,16 @@ $NetBSD: patch-ae,v 1.10 2015/01/02 09:14:16 fhajny Exp $
      fi
      if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
          EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-@@ -281,7 +281,7 @@
+@@ -335,7 +335,7 @@ ctl()
      # using flock if available. Expects a linux-style
      # flock that can lock a file descriptor.
      MAXCONNID=100
 -    CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
 +    CONNLOCKDIR=@EJABBERD_PIDDIR@
-     FLOCK='/usr/bin/flock'
+     FLOCK=/usr/bin/flock
      if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
-         JOT='/usr/bin/jot'
-@@ -308,7 +308,7 @@
+         JOT=/usr/bin/jot
+@@ -362,7 +362,7 @@ ctl()
              CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
              (
                  exec 8>"$CTL_LOCKFILE"
diff --git a/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config b/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config
deleted file mode 100644
index 565fea95c4a..00000000000
--- a/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-deps_p1__iconv_rebar.config,v 1.3 2015/05/04 14:40:38 fhajny Exp $
-
-Make sure LDFLAGS are included as well.
---- deps/p1_iconv/rebar.config.orig	2015-04-29 09:27:02.000000000 +0000
-+++ deps/p1_iconv/rebar.config
-@@ -1,7 +1,7 @@
- {erl_opts, [debug_info]}.
- 
- {port_env, [{"CFLAGS", "-g -O2 -Wall -O2 -Wall"},
--	    {"LDFLAGS", "$ERL_LDFLAGS -liconv"}]}.
-+	    {"LDFLAGS", "$LDFLAGS $ERL_LDFLAGS -liconv"}]}.
- 
- {port_specs, [{"priv/lib/iconv.so", ["c_src/iconv.c"]}]}.
-