Index: head/net-im/ejabberd/Makefile
===================================================================
--- head/net-im/ejabberd/Makefile	(revision 412305)
+++ head/net-im/ejabberd/Makefile	(revision 412306)
@@ -1,100 +1,100 @@
 # Created by: Alexander Timoshenko <gonzo@univ.kiev.ua>
 # $FreeBSD$
 
 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 \
 		LOCAL/ashish:deps
 DISTFILES+=	${DISTNAME}.tgz:p1 ejabberd-deps-5.tar.xz:deps
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
 		git:${PORTSDIR}/devel/git
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
 		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libyaml.so:${PORTSDIR}/textproc/libyaml
 
 USERS=		ejabberd
 GROUPS=		${USERS}
 
 GNU_CONFIGURE=	yes
 USES=		cpe gmake pkgconfig shebangfix
 USE_RC_SUBR=	${PORTNAME}
 NOPRECIOUSMAKEVARS=	yes
 CPE_VENDOR=	process-one
 
 OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL ICONV RIAK REDIS SQLITE TOOLS FULLXML
 OPTIONS_DEFAULT=	ICONV
 
 EJABBERD_LIBDIR=lib/erlang/lib
 MAKE_ENV=	PORTVERSION=${PORTVERSION}
 CONFIGURE_ARGS+=--localstatedir=/var --libdir=${PREFIX}/${EJABBERD_LIBDIR}
 MAKE_ARGS=	"CPPFLAGS=${CPPFLAGS}" "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PLIST_SUB=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
 		EJABBERD_LIBDIR=${EJABBERD_LIBDIR}
 SUB_FILES=	pkg-message pkg-install
 SUB_LIST=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
 		USERS=${USERS} GROUPS=${GROUPS} SHAREMODE=${SHAREMODE} \
 		SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP} \
 		EJABBERD_LIBDIR=${EJABBERD_LIBDIR}
 SHEBANG_FILES=	${WRKSRC}/ejabberdctl.template
 
 OPTIONS_SUB=		yes
 RIAK_DESC=	Riak database support
 TOOLS_DESC=	Build development tools
 FULLXML_DESC=	Full XML support
 PAM_CONFIGURE_ENABLE=	pam
 ODBC_CONFIGURE_ENABLE=	odbc
 MYSQL_CONFIGURE_ENABLE=	mysql
 PGSQL_CONFIGURE_ENABLE=	pgsql
 RIAK_CONFIGURE_ENABLE=	riak
 ICONV_CONFIGURE_ENABLE=	iconv
 REDIS_CONFIGURE_ENABLE=	redis
 SQLITE_CONFIGURE_ENABLE=sqlite
 TOOLS_CONFIGURE_ENABLE=	tools
 FULLXML_CONFIGURE_ENABLE=	full-xml
 SQLITE_USE=		SQLITE=yes
 ICONV_USES=		iconv:wchar_t
 ICONV_LDFLAGS=		${ICONV_LIB}
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=yes
 
 USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@${LN} -s ${WRKDIR}/deps ${WRKSRC}/
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 	 	${WRKSRC}/ejabberdctl.template
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}
 
 post-install:
 .if ${PORT_OPTIONS:MPAM}
 	@${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd \
 		${STAGEDIR}${PREFIX}/etc/pam.d/ejabberd
 	@${INSTALL} -m 0750 ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/lib/p1_pam-1.0.0/priv/bin/epam \
 		${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/priv/bin/epam
 .endif
 	@${FIND} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR} -type f \
 		-name '*.so' -exec ${STRIP_CMD} '{}' \;
 
 .include <bsd.port.post.mk>
Index: head/net-im/ejabberd/files/patch-ejabberdctl.template
===================================================================
--- head/net-im/ejabberd/files/patch-ejabberdctl.template	(revision 412305)
+++ head/net-im/ejabberd/files/patch-ejabberdctl.template	(revision 412306)
@@ -1,49 +1,51 @@
---- 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
          exit 4
      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
 -    LOGS_DIR={{localstatedir}}/log/ejabberd
 +    LOGS_DIR=/var/log/ejabberd
  fi
  if [ "$SPOOL_DIR" = "" ] ; then
 -    SPOOL_DIR={{localstatedir}}/lib/ejabberd
 +    SPOOL_DIR=/var/spool/ejabberd
  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
 -    CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
 +    CONNLOCKDIR={{localstatedir}}/run/ejabberdctl
      FLOCK=/usr/bin/flock
      if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
          JOT=/usr/bin/jot