- Update to 15.06

- Switch to new dependencies tarball
- Add OPTIONs for REDIS, SQLITE, and TOOLS
- Update diff for dict:dict() stuff in Erlang R17+
- Add diff for Erlang R18 support[1]

Submitted by:	olgeni[1] (via private mail)

1 files changed, 5 insertions, 5 deletions

diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template
index 27ebcccc5565..29575df21b39 100644
--- a/net-im/ejabberd/files/patch-ejabberdctl.template
+++ b/net-im/ejabberd/files/patch-ejabberdctl.template
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- ejabberdctl.template.orig
 +++ ejabberdctl.template
-@@ -72,10 +72,10 @@
+@@ -71,10 +71,10 @@
      EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
  fi
  if [ "$LOGS_DIR" = "" ] ; then
@@ -16,7 +16,7 @@ $FreeBSD$
  fi
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH={{docdir}}
-@@ -89,10 +89,10 @@
+@@ -88,10 +88,10 @@
          EJABBERDDIR={{libdir}}/ejabberd
      fi
      if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
@@ -29,12 +29,12 @@ $FreeBSD$
      fi
      if [ "$EJABBERD_BIN_PATH" = "" ] ; then
          EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
-@@ -279,7 +279,7 @@
+@@ -335,7 +335,7 @@
      # using flock if available. Expects a linux-style
      # flock that can lock a file descriptor.
      MAXCONNID=100
 -    CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
 +    CONNLOCKDIR={{localstatedir}}/run/ejabberdctl
-     FLOCK='/usr/bin/flock'
+     FLOCK=/usr/bin/flock
      if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
-         JOT='/usr/bin/jot'
+         JOT=/usr/bin/jot