diff options
| author | olgeni <olgeni@FreeBSD.org> | 2010-10-01 00:22:15 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2010-10-01 00:22:15 +0800 |
| commit | 0c795ecb6a0a8bc379e5683e71900e259cce7380 (patch) | |
| tree | 4b6f19cc976458dd8df9bc04c59116825bcc28a6 /net-im/ejabberd | |
| parent | 2925307d6a9290849ecd875a48a6830761623078 (diff) | |
| download | freebsd-ports-gnome-0c795ecb6a0a8bc379e5683e71900e259cce7380.tar.gz freebsd-ports-gnome-0c795ecb6a0a8bc379e5683e71900e259cce7380.tar.zst freebsd-ports-gnome-0c795ecb6a0a8bc379e5683e71900e259cce7380.zip | |
Unbreak by upgrading to 2.1.5 (including 6.x support).
PR: ports/151073
Approved by: maintainer (see PR)
Diffstat (limited to 'net-im/ejabberd')
| -rw-r--r-- | net-im/ejabberd/Makefile | 12 | ||||
| -rw-r--r-- | net-im/ejabberd/distinfo | 6 | ||||
| -rw-r--r-- | net-im/ejabberd/files/ejabberd.in | 2 | ||||
| -rw-r--r-- | net-im/ejabberd/pkg-plist | 5 |
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 |