Update to 2.0.3.

Submitted by:	"Mikle Davidkin" <skylord linkline ru>
PR:		128463
Approved by:	maintainer timeout

14 files changed, 259 insertions, 255 deletions

diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index f33818efc1ee..51b3eed7958a 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ejabberd
-PORTVERSION=	1.1.4
-PORTREVISION=	2
+PORTVERSION=	2.0.3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -15,8 +14,6 @@ MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/ \
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 
-OPTIONS=	ODBC	"Enable ODBC support"		off
-
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
@@ -25,13 +22,16 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_OPENSSL=	yes
-USE_RC_SUBR=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}
 NOPRECIOUSMAKEVARS=	yes
 
+OPTIONS=	ODBC	"Enable ODBC support"		off
+
 MAKE_ENV=	PORTVERSION=${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGINSTALL=	${WRKDIR}/pkg-install
 PLIST_SUB=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
-SUB_FILES=	${PORTNAME} pkg-message
+SUB_FILES=	pkg-message pkg-install
 SUB_LIST=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
@@ -44,28 +44,16 @@ PLIST_SUB+=	ODBC=""
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
-pre-install:
-	@${FIND} ${WRKSRC} '(' -name \*.orig -or -name \*.bak ')' -delete
-	@${RM} -f ${WRKSRC}/../doc/release_note_1.1.2.txt
-
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${WRKSRC}/../tools/${PORTNAME}ctl ${PREFIX}/bin
-
-	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.defaults ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.defaults.example
-	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.inetrc ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.inetrc.example
-.if !exists(${PREFIX}/etc/${PORTNAME}/${PORTNAME}.inetrc)
-	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.inetrc ${PREFIX}/etc/${PORTNAME}/${PORTNAME}.inetrc
-.endif
-
-	${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
-
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
+	@(cd ${WRKSRC}/../doc/ && ${INSTALL_DATA} COPYING *.html *.png *.txt ${DOCSDIR})
 .endif
 
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
+	${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net-im/ejabberd/distinfo b/net-im/ejabberd/distinfo
index 8a086e1cb77a..3d9dfe778296 100644
--- a/net-im/ejabberd/distinfo
+++ b/net-im/ejabberd/distinfo
@@ -1,3 +1,3 @@
-MD5 (ejabberd-1.1.4.tar.gz) = 65e9cd346f11a28afbacfe1d7be3a33b
-SHA256 (ejabberd-1.1.4.tar.gz) = dcd61b72c522eee77ab56227b16d75fd5741efe2b9b9a8a1d3ed7eefc2a7e4f6
-SIZE (ejabberd-1.1.4.tar.gz) = 846059
+MD5 (ejabberd-2.0.3.tar.gz) = b647e74b0f94f030bd8747c8a8a4d0f9
+SHA256 (ejabberd-2.0.3.tar.gz) = d34bcf6c73e8d3fd5bf3b2555b3db8f0bd8197a6303b6db17df8945a2cd339ff
+SIZE (ejabberd-2.0.3.tar.gz) = 1089870
diff --git a/net-im/ejabberd/files/ejabberd.defaults b/net-im/ejabberd/files/ejabberd.defaults
deleted file mode 100644
index f079642b3f43..000000000000
--- a/net-im/ejabberd/files/ejabberd.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Additionnal options passed to erlang while starting ejabberd.
-# See erl(3) for more info
-# default options already passed are:
-#   -noshell -detached
-#export ERL_OPTIONS="-heart"
-
-# To use more than 1024 connections, you will need to set environment variable ERL_MAX_PORTS:
-#export ERL_MAX_PORTS=1024
-
-# To reduce memory usage, you can set environment variable ERL_FULLSWEEP_AFTER:
-# But in this case ejabberd may work slower.
-#export ERL_FULLSWEEP_AFTER=0
-
diff --git a/net-im/ejabberd/files/ejabberd.in b/net-im/ejabberd/files/ejabberd.in
index 737cd534f9d7..5132de022550 100644
--- a/net-im/ejabberd/files/ejabberd.in
+++ b/net-im/ejabberd/files/ejabberd.in
@@ -1,36 +1,80 @@
-#!/bin/sh
-
-[ -f %%PREFIX%%/etc/%%PORTNAME%%/%%PORTNAME%%.defaults ] && . %%PREFIX%%/etc/%%PORTNAME%%/%%PORTNAME%%.defaults
-
-CONFIG=%%PREFIX%%/etc/%%PORTNAME%%/%%PORTNAME%%.cfg
-INETRC=%%PREFIX%%/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc
-LOG=/var/log/%%PORTNAME%%/%%PORTNAME%%.log
-SASL_LOG=/var/log/%%PORTNAME%%/sasl.log
-SPOOL=/var/spool/%%PORTNAME%%
-
-ARGS=
-
-while [ $# -ne 0 ]
-do
-    PARAM=$1
-    shift
-    case $PARAM in
-	--) break ;;
-	--config) CONFIG=$1 ; shift ;;
-	--log) LOG=$1 ; shift ;;
-	--sasl-log) SASL_LOG=$1 ; shift ;;
-	--spool) SPOOL=$1 ; shift ;;
-	*) ARGS="$ARGS $PARAM" ;;
-    esac
-done
-
-cd $SPOOL &&
-exec erl +K true -sname %%PORTNAME%% \
-    -s %%PORTNAME%% \
-    -%%PORTNAME%% config \"$CONFIG\" log_path \"$LOG\" \
-    -sasl sasl_error_logger \{file,\"$SASL_LOG\"\} \
-    -mnesia dir \"$SPOOL\" \
-    -kernel inetrc \"${INETRC}\" \
-    -pz "%%LOCALBASE%%/lib/erlang/" \
-    $ERL_OPTIONS $ARGS "$@"
+#! /bin/sh
+# $FreeBSD$
 
+# PROVIDE: ejabberd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Define these ejabberd_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#       /etc/rc.conf.d/ejabberd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+ejabberd_enable=${ejabberd_enable-"NO"}
+ejabberd_node=${ejabberd_node-"ejabberd@localhost"}
+
+. %%RC_SUBR%%
+
+name="ejabberd"
+rcvar=`set_rcvar`
+
+reload_cmd="ejabberd_reload"
+restart_cmd="ejabberd_reload"
+start_cmd="ejabberd_start"
+status_cmd="ejabberd_status"
+stop_cmd="ejabberd_stop"
+
+extra_commands="reload status"
+
+EJABBERDCTL=%%PREFIX%%/sbin/ejabberdctl
+EJABBERDUSER=ejabberd
+
+ejabberd_status()
+{
+    if ejabberd_checkstatus; then
+        echo "$name is running "
+    else
+        echo "$name is not running "
+    fi
+}
+
+ejabberd_checkstatus()
+{
+    su $EJABBERDUSER -c "$EJABBERDCTL --node $ejabberd_node status > /dev/null"
+}
+
+ejabberd_start()
+{
+    echo -n "Starting $name: "
+    su $EJABBERDUSER -c "$EJABBERDCTL --node $ejabberd_node start"
+    echo "$name."
+}
+
+ejabberd_stop()
+{
+    echo -n "Stopping $name: "
+    if su $EJABBERDUSER -c "$EJABBERDCTL --node $ejabberd_node stop"; then
+#        sleep 2
+#        killall -u ejabberd -kill
+    else
+        echo -n " failed "
+    fi
+    echo "$name."
+}
+
+ejabberd_reload()
+{
+    echo -n "Restarting $name: "
+    if ejabberd_checkstatus; then
+        su $EJABBERDUSER -c "$EJABBERDCTL --node $ejabberd_node restart"
+    else
+        ejabberd_start
+    fi
+    echo "$name."
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net-im/ejabberd/files/ejabberd.inetrc b/net-im/ejabberd/files/ejabberd.inetrc
deleted file mode 100644
index 73fc40a010af..000000000000
--- a/net-im/ejabberd/files/ejabberd.inetrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{lookup,["file","native"]}.
-{host,{127,0,0,1}, ["localhost","hostalias"]}.
-{file, resolv, "/etc/resolv.conf"}.
diff --git a/net-im/ejabberd/files/ejabberd.sh.in b/net-im/ejabberd/files/ejabberd.sh.in
deleted file mode 100644
index 54421cb29669..000000000000
--- a/net-im/ejabberd/files/ejabberd.sh.in
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-# $FreeBSD$
-
-# PROVIDE: ejabberd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Define these ejabberd_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/ejabberd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-ejabberd_enable="${ejabberd_enable-NO}"
-
-. %%RC_SUBR%%
-
-name=ejabberd
-rcvar=`set_rcvar`
-
-reload_cmd="ejabberd_reload"
-restart_cmd="ejabberd_reload"
-start_cmd="ejabberd_start"
-status_cmd="ejabberd_status"
-stop_cmd="ejabberd_stop"
-
-cd %%PREFIX%%		# Why is this needed!?
-
-# Include ejabberd defaults if available
-[ -f %%PREFIX%%/etc/ejabberd/ejabberd.defaults ] && . %%PREFIX%%/etc/ejabberd/ejabberd.defaults
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/bin:%%PREFIX%%/sbin
-EJABBERD=%%PREFIX%%/bin/ejabberd
-EJABBERDCTL=%%PREFIX%%/bin/ejabberdctl
-EJABBERDUSER=ejabberd
-
-ejabberd_status()
-{
-    su $EJABBERDUSER -c "$EJABBERDCTL ejabberd@`hostname -s` status >/dev/null"
-}
-
-ejabberd_start()
-{
-    echo -n "Starting $name: "
-    su $EJABBERDUSER -c "$EJABBERD -s -noshell -detached"
-    echo "$name."
-}
-
-ejabberd_stop()
-{
-    echo -n "Stopping $name: "
-    if su $EJABBERDUSER -c "$EJABBERDCTL ejabberd@`hostname -s` stop"; then
-        sleep 2
-        killall -u ejabberd -kill
-    else
-        echo -n " failed "
-    fi
-    echo "$name."
-}
-
-ejabberd_reload()
-{
-    echo -n "Restarting $name: "
-    if ejabberd_status; then
-        su $EJABBERDUSER -c "$EJABBERDCTL ejabberd@`hostname -s` restart"
-    else
-        ejabberd_start
-    fi
-    echo "$name."
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net-im/ejabberd/files/patch-ejab-446.diff b/net-im/ejabberd/files/patch-ejab-446.diff
deleted file mode 100644
index 14a996c96488..000000000000
--- a/net-im/ejabberd/files/patch-ejab-446.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: ejabberd_s2s_in.erl
-===================================================================
---- ejabberd_s2s_in.erl	(revision 1026)
-+++ ejabberd_s2s_in.erl	(working copy)
-@@ -30,8 +30,7 @@
- 
- -include("ejabberd.hrl").
- -include("jlib.hrl").
---include_lib("ssl/include/PKIX1Explicit88.hrl").
---include_lib("ssl/include/PKIX1Implicit88.hrl").
-+-include_lib("ssl/include/OTP-PKIX.hrl").
- -include("XmppAddr.hrl").
- 
- -define(DICT, dict).
diff --git a/net-im/ejabberd/files/patch-src-Makefile.in b/net-im/ejabberd/files/patch-src-Makefile.in
index 44a88ca445e8..70648598a4b0 100644
--- a/net-im/ejabberd/files/patch-src-Makefile.in
+++ b/net-im/ejabberd/files/patch-src-Makefile.in
@@ -1,32 +1,43 @@
---- Makefile.in.orig	2007-04-30 08:08:01.000000000 +0100
-+++ Makefile.in	2007-10-30 01:26:29.000000000 +0000
-@@ -32,15 +32,15 @@
- SOURCES = $(wildcard *.erl)
+--- Makefile.in.orig	2009-01-14 12:54:15.000000000 +0300
++++ Makefile.in	2009-01-24 18:45:50.000000000 +0300
+@@ -56,18 +56,18 @@
+ ERLBEHAVBEAMS = $(ERLBEHAVS:.erl=.beam)
  BEAMS = $(SOURCES:.erl=.beam)
  
--DESTDIR = 
+-DESTDIR =
 -
--EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd
+-EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
 +DESTDIR = @prefix@
 +  
 +EJABBERDDIR = $(DESTDIR)/lib/erlang/lib/ejabberd-$(PORTVERSION)
  BEAMDIR = $(EJABBERDDIR)/ebin
+-SPOOLDIR = $(EJABBERDDIR)/db
++SPOOLDIR = /var/spool/ejabberd
  PRIVDIR = $(EJABBERDDIR)/priv
  SODIR = $(PRIVDIR)/lib
+ PBINDIR = $(PRIVDIR)/bin
  MSGSDIR = $(PRIVDIR)/msgs
--LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd
--ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
+-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
+-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
+-SBINDIR = $(DESTDIR)@sbindir@
 +LOGDIR = /var/log/ejabberd
 +ETCDIR = $(DESTDIR)/etc/ejabberd
++SBINDIR = @sbindir@
  
- ASN_FLAGS = -bber_bin +der +compact_bit_string +optimize +noobj
- 
-@@ -89,7 +89,7 @@
+ ifeq ($(shell uname),Darwin)
+ DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress
+@@ -122,10 +122,10 @@
  	install -d $(MSGSDIR)
  	install -m 644 msgs/*.msg $(MSGSDIR)
- 	install -d $(ETCDIR)
+ 	install -d -m 750 $(ETCDIR)
 -	[ -f $(ETCDIR)/ejabberd.cfg ] && install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new || install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
-+	install -b -m 644 ejabberd.cfg.example $(ETCDIR)
- 	install -d $(LOGDIR)
- 
- clean: clean-recursive clean-local
+-	sed -e "s*@rootdir@*@prefix@*" -e "s*@erl@*@ERL@*" ejabberdctl.template > ejabberdctl.example
+-	[ -f $(ETCDIR)/ejabberdctl.cfg ] && install -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new || install -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
+-	install -b -m 644 inetrc $(ETCDIR)/inetrc
++	install -m 640 ejabberd.cfg.example $(ETCDIR)
++	sed -e "s*@rootdir@*@prefix@*" -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
+ 	install -d $(SBINDIR)
+ 	install -m 755 ejabberdctl.example $(SBINDIR)/ejabberdctl
+ 	install -d -m 750 $(LOGDIR)
diff --git a/net-im/ejabberd/files/patch-src::ejabberdctl.template b/net-im/ejabberd/files/patch-src::ejabberdctl.template
new file mode 100644
index 000000000000..fe04d5cf2539
--- /dev/null
+++ b/net-im/ejabberd/files/patch-src::ejabberdctl.template
@@ -0,0 +1,35 @@
+--- ejabberdctl.template.orig	2009-01-14 12:54:15.000000000 +0300
++++ ejabberdctl.template	2009-01-24 18:32:15.000000000 +0300
+@@ -14,8 +14,8 @@
+ ERL=@erl@
+ ROOTDIR=@rootdir@
+ EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg
+-LOGS_DIR=$ROOTDIR/var/log/ejabberd/
+-EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE
++LOGS_DIR=/var/log/ejabberd/
++EJABBERD_DB=/var/spool/ejabberd/$NODE
+ 
+ # read custom configuration
+ CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg
+@@ -43,16 +43,16 @@
+ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES"
+ 
+ # define additional environment variables
+-EJABBERD_EBIN=$ROOTDIR/var/lib/ejabberd/ebin
+-EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs
+-EJABBERD_SO_PATH=$ROOTDIR/var/lib/ejabberd/priv/lib
+-EJABBERD_BIN_PATH=$ROOTDIR/var/lib/ejabberd/priv/bin
++HOME=$ROOTDIR/lib/erlang/lib/ejabberd
++EJABBERD_EBIN=$HOME/ebin
++EJABBERD_MSGS_PATH=$HOME/priv/msgs
++EJABBERD_SO_PATH=$HOME/priv/lib
++EJABBERD_BIN_PATH=$HOME/priv/bin
+ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
+ SASL_LOG_PATH=$LOGS_DIR/sasl.log
+ DATETIME=`date "+%Y%m%d-%H%M%S"`
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ ERL_INETRC=$ROOTDIR/etc/ejabberd/inetrc
+-HOME=$ROOTDIR/var/lib/ejabberd
+ 
+ # export global variables
+ export EJABBERD_CONFIG_PATH
diff --git a/net-im/ejabberd/files/patch-src::mod_last.erl b/net-im/ejabberd/files/patch-src::mod_last.erl
deleted file mode 100644
index 81ebfe6e4a88..000000000000
--- a/net-im/ejabberd/files/patch-src::mod_last.erl
+++ /dev/null
@@ -1,20 +0,0 @@
---- mod_last.erl.orig
-+++ mod_last.erl
-@@ -102,7 +102,16 @@
- 		  sub_el = [{xmlelement, "query",
- 			     [{"xmlns", ?NS_LAST},
- 			      {"seconds", integer_to_list(Sec)}],
--			     [{xmlcdata, Status}]}]}
-+			     [{xmlcdata, Status}]}]};
-+	[{last_activity, _, TimeStamp}] ->
-+	    {MegaSecs, Secs, _MicroSecs} = now(),
-+	    TimeStamp2 = MegaSecs * 1000000 + Secs,
-+	    Sec = TimeStamp2 - TimeStamp,
-+	    IQ#iq{type = result,
-+		  sub_el = [{xmlelement, "query",
-+			     [{"xmlns", ?NS_LAST},
-+			      {"seconds", integer_to_list(Sec)}],
-+			     []}]}
-     end.
- 
- 
diff --git a/net-im/ejabberd/pkg-install b/net-im/ejabberd/files/pkg-install.in
index b1d7069443d4..ca83f6f813fc 100644
--- a/net-im/ejabberd/pkg-install
+++ b/net-im/ejabberd/files/pkg-install.in
@@ -6,7 +6,7 @@ fi
 
 USER=ejabberd
 GROUP=${USER}
-UID=544
+UID=543
 GID=${UID}
 USERS_HOME="/var/spool/ejabberd"
 
@@ -32,4 +32,7 @@ fi
 
 install -d -m 750 -o ${USER} -g ${GROUP} ${USERS_HOME} /var/log/ejabberd
 
+chown -R ${USER}:${GROUP}  %%PREFIX%%/etc/%%PORTNAME%%
+chown -R ${USER}:${GROUP}  %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
+
 exit 0
diff --git a/net-im/ejabberd/files/pkg-message.in b/net-im/ejabberd/files/pkg-message.in
index be842583c38f..c91c3f7babd1 100644
--- a/net-im/ejabberd/files/pkg-message.in
+++ b/net-im/ejabberd/files/pkg-message.in
@@ -1,16 +1,16 @@
-WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING!!!
+------------------------------------------------------------------------
+
+Congratulations, you have installed %%PORTNAME%%!
 
-This version of port has several signigicant changes:
   o To enable ejabberd you need to add following string to your /etc/rc.conf:
 
 	ejabberd_enable="YES"
 
-  o Configs are located in %%PREFIX%%/etc/ejabberd now.
-  o The home directory is /var/spool/ejabberd now instead of
-    /var/run/ejabberd. Please do:
-
-	pw usermod ejabberd -d /var/spool/ejabberd
-
-    if you need it.
+  o Config samples are located in %%PREFIX%%/etc/ejabberd - please, create
+    working ones before running %%PORTNAME%%.
+  o The home directory is /var/spool/ejabberd
+  o PLEASE NOTE! "ejabberd" user UID and GID have changed from version 2.0.3
+    of this port! Users are advised to check all configuration files and data
+    in /var/spool/ejabberd to ensure everything has the correct owner/group.
 
-WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING!!!
+------------------------------------------------------------------------
diff --git a/net-im/ejabberd/pkg-descr b/net-im/ejabberd/pkg-descr
index 58ae3e24bfed..c6555eac62cd 100644
--- a/net-im/ejabberd/pkg-descr
+++ b/net-im/ejabberd/pkg-descr
@@ -1,21 +1,23 @@
-ejabberd is a Free and Open Source distributed fault-tolerant Jabber server. 
-It writen mostly in Erlang. 
+ejabberd is a high performance Free and Open Source distributed 
+fault-tolerant instant messaging Jabber server.
 
-The main features of ejabberd is:
-	- Works on most of popular platforms: *nix 
-	  (tested on Linux, FreeBSD and NetBSD)
-	- Distributed
-	- Fault-tolerance: 
-	- Built-in Multi-User Chat service 
-	- Built-in IRC transport 
-	- Built-in Publish-Subscribe service 
-	- Built-in Jabber Users Directory service based on users vCards 
-	- SSL support 
-	- Ability to interface with external components (JIT, MSN-t, Yahoo-t, etc) 
-	- Migration from jabberd14 is possible 
-	- Mostly XMPP-compliant 
-	- Support for JEP-0030 (Service Discovery). 
-	- Support for JEP-0039 (Statistics Gathering). 
-	- Support for xml:lang attribute in many XML elements 
+Key features include:
+    - A web administration console and command line administration
+      tools that ensure easy set up
+    - Support for encrypted connections to ensure secure communications
+    - Many built-in services, including Jabber User Directory and Multi-User
+      Chat
+    - Standard Jabber transport compliance to enable communication with other
+      instant messaging networks
+    - Automatic collection of statistics for reporting and system analysis
+    - Virtual hosting, enabling ejabberd to run several virtual domains
+      from a single ejabberd instance
+    - Shared rosters, so that users can have predefined entries in their
+      contacts lists
+    - External storage support
+    - Large numbers of supported protocols (see the supported protocols list
+      for details)
+    - Multi-lingual web administration interface
+    - Full IPv6 support
 
-WWW: http://ejabberd.jabber.ru/
+WWW: http://www.ejabberd.im/
diff --git a/net-im/ejabberd/pkg-plist b/net-im/ejabberd/pkg-plist
index 96f3c59cc215..b68c492d73a8 100644
--- a/net-im/ejabberd/pkg-plist
+++ b/net-im/ejabberd/pkg-plist
@@ -1,12 +1,18 @@
-bin/%%PORTNAME%%
-bin/%%PORTNAME%%ctl
-@unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; fi
 etc/%%PORTNAME%%/%%PORTNAME%%.cfg.example
+etc/%%PORTNAME%%/%%PORTNAME%%ctl.cfg.example
+etc/%%PORTNAME%%/inetrc.example
+@unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; fi
 @unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults; fi
-etc/%%PORTNAME%%/%%PORTNAME%%.defaults.example
 @unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc; fi
-etc/%%PORTNAME%%/%%PORTNAME%%.inetrc.example
 @exec [ ! -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc ] && cp %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/adhoc.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_anonymous.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_plain.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_admin.beam
@@ -17,15 +23,23 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_external.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_internal.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_ldap.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_odbc.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_pam.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s_config.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_check.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_config.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_ctl.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_frontend_socket.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_hooks.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http_bind.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http_poll.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_listener.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_local.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_logger_h.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_loglevel.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_node_groups.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_rdbms.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_receiver.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_s2s.beam
@@ -33,7 +47,9 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_s2s_in.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_s2s_out.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_service.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_socket.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sup.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_system_monitor.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_tmp_sup.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_update.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web.beam
@@ -42,30 +58,30 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_zlib.beam
 %%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc.beam
 %%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc_sup.beam
 %%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/odbc_queries.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/adhoc.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_anonymous.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_plain.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejd2odbc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_filter.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_pool.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_utils.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/extauth.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/gen_iq_handler.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/gen_mod.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/gen_pubsub_node.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/gen_pubsub_nodetree.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/iconv.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/idna.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/jd2ejd.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/jlib.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_adhoc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_caps.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure2.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_disco.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_echo.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_bind.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_http_fileserver.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_ip_blacklist.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_irc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_irc_connection.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last.beam
@@ -76,7 +92,14 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc_room.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline_odbc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privacy.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privacy_odbc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_private.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_private_odbc.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_lib.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_service.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_sm.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_proxy65_stream.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster.beam
@@ -89,6 +112,18 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_ldap.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_vcard_odbc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_version.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_buddy.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_club.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_default.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_dispatch.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_pep.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_private.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/node_public.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_default.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_virtual.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_fsm.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mnesia.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ram_file_io_server.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/randoms.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/sha.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/shaper.beam
@@ -96,6 +131,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stringprep.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stringprep_sup.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/tls.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/translate.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/treap.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_stream.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so
@@ -103,40 +139,49 @@ 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/stringprep_drv.so
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/tls_drv.so
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ca.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/cs.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/de.msg
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/eo.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/es.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/fr.msg
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/gl.msg
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/it.msg
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ja.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/nl.msg
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/no.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/pl.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/pt-br.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/pt.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ru.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/sk.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/sv.msg
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/th.msg
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/tr.msg
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/uk.msg
-%%PORTDOCS%%%%DOCSDIR%%/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/dev.tex
+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%%/disco.png
 %%PORTDOCS%%%%DOCSDIR%%/discorus.png
-%%PORTDOCS%%%%DOCSDIR%%/features.tex
 %%PORTDOCS%%%%DOCSDIR%%/features.html
-%%PORTDOCS%%%%DOCSDIR%%/flow.dot
 %%PORTDOCS%%%%DOCSDIR%%/guide.html
-%%PORTDOCS%%%%DOCSDIR%%/guide.tex
-%%PORTDOCS%%%%DOCSDIR%%/introduction.tex
 %%PORTDOCS%%%%DOCSDIR%%/logo.png
-%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.4.txt
-%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.3.txt
-%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.2.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.1.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.8.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_1.0.0.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.0.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.1.txt
-%%PORTDOCS%%%%DOCSDIR%%/version.tex
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_1.1.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.0.3.txt
 %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
 %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
 %%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png
@@ -144,6 +189,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/uk.msg
 @dirrmtry etc/%%PORTNAME%%
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib
+@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%