- Update to 2.1.3

Reviewed by:	itetcu
Approved by:	philip and ed (mentors)

4 files changed, 23 insertions, 45 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 4365368e4665..58136f025549 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ejabberd
-PORTVERSION=	2.1.2
-PORTREVISION=	1
+PORTVERSION=	2.1.3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/
 
@@ -28,6 +27,7 @@ NOPRECIOUSMAKEVARS=	yes
 OPTIONS=	ODBC	"Enable ODBC support"		off
 
 MAKE_ENV=	PORTVERSION=${PORTVERSION}
+CONFIGURE_ARGS+=--localstatedir=/var
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PLIST_SUB=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index a39770b24bcd..5086109eba66 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,3 +1,3 @@
-MD5 (ejabberd-2.1.2.tar.gz) = 9102802ae19312c26f85ceb977b519aa
-SHA256 (ejabberd-2.1.2.tar.gz) = 354d6d1ecc1233b085d049963d5a90843f089b7d3d834809c410dbeb00974335
-SIZE (ejabberd-2.1.2.tar.gz) = 2232307
+MD5 (ejabberd-2.1.3.tar.gz) = e5c87eda5312a6e8a53df0f9b4844b69
+SHA256 (ejabberd-2.1.3.tar.gz) = 602c6e4e742c4cab8594e9f049f08d0bf2125fa84af491e0ceb6d6f2f3854ef6
+SIZE (ejabberd-2.1.3.tar.gz) = 2243874
diff --git a/net-im/ejabberd/files/patch-src-Makefile.in b/net-im/ejabberd/files/patch-src-Makefile.in
index 18c1c40f1e6d..2fa179d27052 100644
--- a/net-im/ejabberd/files/patch-src-Makefile.in
+++ b/net-im/ejabberd/files/patch-src-Makefile.in
@@ -1,56 +1,31 @@
---- Makefile.in.orig	2010-01-18 14:03:20.000000000 +0100
-+++ Makefile.in	2010-01-30 12:35:21.933075399 +0100
-@@ -73,21 +73,21 @@
- ERLBEHAVBEAMS = $(ERLBEHAVS:.erl=.beam)
- BEAMS = $(SOURCES:.erl=.beam)
- 
--DESTDIR =
-+DESTDIR = @prefix@
- 
- # /etc/ejabberd/
--ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
-+ETCDIR = $(DESTDIR)/etc/ejabberd
- 
- # /sbin/
--SBINDIR = $(DESTDIR)@sbindir@
-+SBINDIR = @sbindir@
+--- Makefile.in.orig	2010-03-12 11:40:41.000000000 +0100
++++ Makefile.in	2010-04-08 17:23:18.000000000 +0200
+@@ -82,7 +82,7 @@
+ SBINDIR = $(DESTDIR)@sbindir@
  
  # /lib/ejabberd/
 -EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
-+EJABBERDDIR = $(DESTDIR)/lib/erlang/lib/ejabberd-$(PORTVERSION)
++EJABBERDDIR = @libdir@/erlang/lib/ejabberd-$(PORTVERSION)
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
- datarootdir = @datarootdir@
--DOCDIR = $(DESTDIR)@docdir@
-+DOCDIR = @docdir@
- 
- # /usr/lib/ejabberd/ebin/
- BEAMDIR = $(EJABBERDDIR)/ebin
-@@ -108,13 +108,13 @@
+@@ -108,7 +108,7 @@
  MSGSDIR = $(PRIVDIR)/msgs
  
  # /var/lib/ejabberd/
 -SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
-+SPOOLDIR = /var/spool/ejabberd
- 
- # /var/lib/ejabberd/.erlang.cookie
- COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
- 
- # /var/log/ejabberd/
--LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
-+LOGDIR = /var/log/ejabberd
++SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd
  
- # Assume Linux-style dynamic library flags
- DYNAMIC_LIB_CFLAGS = -fpic -shared
-@@ -168,25 +168,22 @@
+ # /var/lock/ejabberdctl
+ CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
+@@ -171,25 +171,22 @@
  	#
  	# Configuration files
  	install -d -m 750 $(G_USER) $(ETCDIR)
 -	[ -f $(ETCDIR)/ejabberd.cfg ] \
 -		&& install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
 -		|| install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
-+	install -m 640 ejabberd.cfg.example $(ETCDIR)
++	install -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)
  	sed -e "s*@rootdir@*@prefix@*" \
  		-e "s*@installuser@*@INSTALLUSER@*" \
  		-e "s*@LIBDIR@*@libdir@*" \
@@ -64,10 +39,10 @@
 -		|| install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
 -	install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
 +		-e "s*@erl@*@ERL@*" \
-+	       	-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
-+	       	ejabberdctl.template > ejabberdctl.example
-+	install -m 640 ejabberdctl.cfg.example $(ETCDIR)
-+	install -m 640 inetrc $(ETCDIR)/inetrc.example
++		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
++		ejabberdctl.template > ejabberdctl.example
++	install -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
++	install -m 640 $(G_USER) inetrc $(ETCDIR)/inetrc.example
  	#
  	# Administration script
  	[ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR)
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index 6f4c1d02a569..d922124736bb 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -114,6 +114,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster_odbc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_service_log.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_sic.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_stats.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_time.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard.beam
@@ -171,6 +172,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_pubsub/pubsub.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_roster.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/ejabberd_http.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/ejabberd_web_admin.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/http_bind.hrl
 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
@@ -223,6 +225,7 @@ sbin/%%PORTNAME%%ctl
 %%DOCSDIR%%/release_notes_2.1.0.txt
 %%DOCSDIR%%/release_notes_2.1.1.txt
 %%DOCSDIR%%/release_notes_2.1.2.txt
+%%DOCSDIR%%/release_notes_2.1.3.txt
 %%DOCSDIR%%/webadmmain.png
 %%DOCSDIR%%/webadmmainru.png
 %%DOCSDIR%%/yozhikheader.png