From owner-svn-ports-head@freebsd.org  Fri Apr  1 02:17:30 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA1E8AE5539;
 Fri,  1 Apr 2016 02:17:30 +0000 (UTC)
 (envelope-from ashish@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8F3801B1F;
 Fri,  1 Apr 2016 02:17:30 +0000 (UTC)
 (envelope-from ashish@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u312HTlg039511;
 Fri, 1 Apr 2016 02:17:29 GMT (envelope-from ashish@FreeBSD.org)
Received: (from ashish@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u312HTgp039509;
 Fri, 1 Apr 2016 02:17:29 GMT (envelope-from ashish@FreeBSD.org)
Message-Id: <201604010217.u312HTgp039509@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ashish set sender to
 ashish@FreeBSD.org using -f
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Fri, 1 Apr 2016 02:17:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r412306 - in head/net-im/ejabberd: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Apr 2016 02:17:31 -0000

Author: ashish
Date: Fri Apr  1 02:17:29 2016
New Revision: 412306
URL: https://svnweb.freebsd.org/changeset/ports/412306

Log:
  - Fix LDAP support by re-ordering Erlang library path in ejabberdctl
    template diff
  - Replace /usr/local with %%LOCALBASE%%
  
  PR:		208258

Modified:
  head/net-im/ejabberd/Makefile
  head/net-im/ejabberd/files/patch-ejabberdctl.template

Modified: head/net-im/ejabberd/Makefile
==============================================================================
--- head/net-im/ejabberd/Makefile	Fri Apr  1 01:16:08 2016	(r412305)
+++ head/net-im/ejabberd/Makefile	Fri Apr  1 02:17:29 2016	(r412306)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ejabberd
 PORTVERSION=	16.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \
 		http://distfiles.pirateparty.in/ashish/:deps \

Modified: head/net-im/ejabberd/files/patch-ejabberdctl.template
==============================================================================
--- head/net-im/ejabberd/files/patch-ejabberdctl.template	Fri Apr  1 01:16:08 2016	(r412305)
+++ head/net-im/ejabberd/files/patch-ejabberdctl.template	Fri Apr  1 02:17:29 2016	(r412306)
@@ -1,19 +1,21 @@
---- ejabberdctl.template.orig	2016-03-09 03:31:00 UTC
+--- ejabberdctl.template.orig   2016-03-09 03:31:00 UTC
 +++ ejabberdctl.template
-@@ -16,6 +16,7 @@ IEX={{bindir}}/iex
+@@ -15,7 +15,8 @@
+ IEX={{bindir}}/iex
  EPMD={{bindir}}/epmd
  INSTALLUSER={{installuser}}
- ERL_LIBS={{libdir}}
+-ERL_LIBS={{libdir}}
++ERL_LIBS={{libdir}}/ejabberd
 +ERL_LIBS=$ERL_LIBS:{{libdir}}/ejabberd/lib
  
  # check the proper system user is used if defined
  if [ "$INSTALLUSER" != "" ] ; then
-@@ -31,14 +32,14 @@ if [ "$INSTALLUSER" != "" ] ; then
+@@ -31,14 +32,14 @@
          fi
      done
      if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
 -        EXEC_CMD="bash -c"
-+        EXEC_CMD="/usr/local/bin/bash -c"
++        EXEC_CMD="%%LOCALBASE%%/bin/bash -c"
      fi
      if [ "$EXEC_CMD" = "false" ] ; then
          echo "This command can only be run by root or the user $INSTALLUSER" >&2
@@ -21,11 +23,11 @@
      fi
  else
 -    EXEC_CMD="bash -c"
-+    EXEC_CMD="/usr/local/bin/bash -c"
++    EXEC_CMD="%%LOCALBASE%%/bin/bash -c"
  fi
  
  # parse command line parameters
-@@ -73,10 +74,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
+@@ -73,10 +74,10 @@
      EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
  fi
  if [ "$LOGS_DIR" = "" ] ; then
@@ -38,7 +40,7 @@
  fi
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH={{docdir}}
-@@ -354,7 +355,7 @@ ctl()
+@@ -354,7 +355,7 @@
      # using flock if available. Expects a linux-style
      # flock that can lock a file descriptor.
      MAXCONNID=100