diff options
| author | ashish <ashish@FreeBSD.org> | 2016-04-01 10:17:29 +0800 |
|---|---|---|
| committer | ashish <ashish@FreeBSD.org> | 2016-04-01 10:17:29 +0800 |
| commit | 6c590fdc4d0395a421e8a5a44f534bdee1849ec1 (patch) | |
| tree | 57f06f2a22dbeb90c779691b09fc7ade9d69c9ae /net-im | |
| parent | 484832ee098e7c1d23e11b30c5c9df69cc7f6891 (diff) | |
| download | freebsd-ports-graphics-6c590fdc4d0395a421e8a5a44f534bdee1849ec1.tar.gz freebsd-ports-graphics-6c590fdc4d0395a421e8a5a44f534bdee1849ec1.tar.zst freebsd-ports-graphics-6c590fdc4d0395a421e8a5a44f534bdee1849ec1.zip | |
- Fix LDAP support by re-ordering Erlang library path in ejabberdctl
template diff
- Replace /usr/local with %%LOCALBASE%%
PR: 208258
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/ejabberd/Makefile | 2 | ||||
| -rw-r--r-- | net-im/ejabberd/files/patch-ejabberdctl.template | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index 5376bd44798..6d5e8e815dc 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -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 \ diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template index d7b42a19461..eb62ccd5e6a 100644 --- a/net-im/ejabberd/files/patch-ejabberdctl.template +++ b/net-im/ejabberd/files/patch-ejabberdctl.template @@ -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 |