Date: Fri, 1 Apr 2016 02:17:29 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> 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 Message-ID: <201604010217.u312HTgp039509@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604010217.u312HTgp039509>