4 files changed, 18 insertions, 7 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 0c2b5fe1ad3f..7d4823fa5f80 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ejabberd
-PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTVERSION=	2.1.5
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/
 
@@ -21,7 +20,6 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_OPENSSL=	yes
 USE_RC_SUBR=	${PORTNAME}
 NOPRECIOUSMAKEVARS=	yes
 
@@ -41,6 +39,14 @@ LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
 
 .include <bsd.port.pre.mk>
 
+USE_OPENSSL=	yes
+
+.if ${OSVERSION} < 700000
+WITH_OPENSSL_PORT=      yes
+CONFIGURE_ARGS+=--with-openssl=${LOCALBASE}
+.endif
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+
 .if defined(WITH_ODBC)
 CONFIGURE_ARGS+=--enable-odbc
 PLIST_SUB+=	ODBC=""
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index bcc94ec64537..b657bf8a12e0 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,3 +1,3 @@
-MD5 (ejabberd-2.1.4.tar.gz) = a73f2ae7c5c9ceccc295e6cbc6a70132
-SHA256 (ejabberd-2.1.4.tar.gz) = 205ee09e38c57527cfa1a4be6ca664cec2e8c6b40eeffaac008735fcdc5e7527
-SIZE (ejabberd-2.1.4.tar.gz) = 2267300
+MD5 (ejabberd-2.1.5.tar.gz) = 2029ceca45584d704ca821a771d6d928
+SHA256 (ejabberd-2.1.5.tar.gz) = 31a46228c6933d7c24435753300a4d2ae2e84568a6097175dc5d4e553299dd9d
+SIZE (ejabberd-2.1.5.tar.gz) = 2278008
diff --git a/net-im/ejabberd/files/ejabberd.in b/net-im/ejabberd/files/ejabberd.in
index ab1e1e43ad90..4a242cf82751 100644
--- a/net-im/ejabberd/files/ejabberd.in
+++ b/net-im/ejabberd/files/ejabberd.in
@@ -49,7 +49,7 @@ ejabberd_checkstatus()
 
 ejabberd_start()
 {
-    check_startmsgs && echo "Starting $name."
+    echo "Starting $name."
     su $EJABBERDUSER -c "$EJABBERDCTL --node $ejabberd_node start"
 }
 
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index e61d00a3f123..bff32ba91ad2 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -178,6 +178,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/captcha.sh
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/expat_erl.so
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/iconv_erl.so
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/sha_drv.so
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/stringprep_drv.so
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/tls_drv.so
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ca.msg
@@ -205,8 +206,11 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/vi.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/wa.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/zh.msg
 sbin/%%PORTNAME%%ctl
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/dev.html
 %%PORTDOCS%%%%DOCSDIR%%/discorus.png
 %%PORTDOCS%%%%DOCSDIR%%/guide.html
+%%PORTDOCS%%%%DOCSDIR%%/guide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.1.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.8.txt
@@ -228,6 +232,7 @@ sbin/%%PORTNAME%%ctl
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.2.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.3.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.5.txt
 %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
 %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
 %%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png