12 files changed, 296 insertions, 290 deletions

diff --git a/net/ejabberd/Makefile b/net/ejabberd/Makefile
index a943f89709ec..1f2174c8af14 100644
--- a/net/ejabberd/Makefile
+++ b/net/ejabberd/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	ejabberd
-PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTVERSION=	0.9.8
 CATEGORIES=	net
 MASTER_SITES=	http://www.jabber.ru/files/ejabberd/ \
 		http://www.process-one.net/en/projects/ejabberd/download/${PORTVERSION}/
-PATCH_SITES=	http://www.jabber.ru/files/ejabberd/
-PATCHFILES=	ejabberd_ctl.erl.diff
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
@@ -21,35 +18,42 @@ BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
-PLIST_SUB=	VERSION="${PORTVERSION}"
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_OPENSSL=	yes
 USE_ICONV=	yes
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+USE_OPENSSL=	yes
+USE_RC_SUBR=	${PORTNAME}.sh
 NOPRECIOUSMAKEVARS=	yes
 
-.include <bsd.port.pre.mk>
+MAKE_ENV=	PORTVERSION=${PORTVERSION}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
+SUB_FILES=	${PORTNAME} pkg-message
+SUB_LIST=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/ejabberd ${WRKSRC}/ejabberd.sh
-	@${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' \
-		${WRKSRC}/Makefile.in
-	@${FIND} ${WRKSRC} -name \*.orig -or -name \*.bak | ${XARGS} ${RM}
+pre-install:
+	${FIND} ${WRKSRC} '(' -name \*.orig -or -name \*.bak ')' -delete
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/ejabberd ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/ejabberd.sh ${PREFIX}/etc/rc.d
-	@${INSTALL_DATA} ${FILESDIR}/ejabberd.defaults ${PREFIX}/etc
-	@${INSTALL_SCRIPT} ${WRKSRC}/../tools/ejabberdctl ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${WRKSRC}/../tools/${PORTNAME}ctl ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d
+
+	${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}
 .endif
+
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/ejabberd/distinfo b/net/ejabberd/distinfo
index aa6161fe0f1f..bc7a0de9d801 100644
--- a/net/ejabberd/distinfo
+++ b/net/ejabberd/distinfo
@@ -1,4 +1,2 @@
-MD5 (ejabberd-0.9.1.tar.gz) = 77b9d1a080b7ed2cf471e28d9cdcdf12
-SIZE (ejabberd-0.9.1.tar.gz) = 689516
-MD5 (ejabberd_ctl.erl.diff) = d094206cf3638987d47c3022779dcc90
-SIZE (ejabberd_ctl.erl.diff) = 8144
+MD5 (ejabberd-0.9.8.tar.gz) = 3270317c66d5df46e20f0ed65cc44f39
+SIZE (ejabberd-0.9.8.tar.gz) = 455815
diff --git a/net/ejabberd/files/ejabberd.in b/net/ejabberd/files/ejabberd.in
new file mode 100644
index 000000000000..f97ec26fb215
--- /dev/null
+++ b/net/ejabberd/files/ejabberd.in
@@ -0,0 +1,35 @@
+#!/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}\" \
+    $ERL_OPTIONS $ARGS "$@"
+
diff --git a/net/ejabberd/files/ejabberd.inetrc b/net/ejabberd/files/ejabberd.inetrc
new file mode 100644
index 000000000000..73fc40a010af
--- /dev/null
+++ b/net/ejabberd/files/ejabberd.inetrc
@@ -0,0 +1,3 @@
+{lookup,["file","native"]}.
+{host,{127,0,0,1}, ["localhost","hostalias"]}.
+{file, resolv, "/etc/resolv.conf"}.
diff --git a/net/ejabberd/files/ejabberd.sh.in b/net/ejabberd/files/ejabberd.sh.in
new file mode 100644
index 000000000000..d7e27e13b918
--- /dev/null
+++ b/net/ejabberd/files/ejabberd.sh.in
@@ -0,0 +1,87 @@
+#! /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="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"
+
+
+# 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: "
+    if ejabberd_status; then
+	echo " already running."
+	exit 1
+    else
+	su $EJABBERDUSER -c "$EJABBERD -noshell -detached"
+    fi
+    echo "$name."
+}
+
+ejabberd_stop()
+{
+    echo -n "Stopping $name: "
+    if su $EJABBERDUSER -c "$EJABBERDCTL ejabberd@`hostname -s` stop"; then
+	cnt=0
+        while ejabberd_status; do
+            cnt=`expr $cnt + 1`
+            if [ $cnt -gt 60 ]; then
+                echo -n " failed "
+                break
+            fi
+            sleep 1
+            echo -n "."
+        done
+    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/ejabberd/files/patch-src-Makefile.in b/net/ejabberd/files/patch-src-Makefile.in
index 48d0ed9073fa..94e96dd4298f 100644
--- a/net/ejabberd/files/patch-src-Makefile.in
+++ b/net/ejabberd/files/patch-src-Makefile.in
@@ -1,31 +1,29 @@
---- Makefile.in	Mon Sep 27 20:54:17 2004
-+++ Makefile.in	Fri Apr 22 17:01:48 2005
-@@ -17,15 +17,15 @@
- SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @eldap@ @web@ stringprep @tls@
+--- Makefile.in.orig	Tue May 24 01:52:43 2005
++++ Makefile.in	Wed Jul 13 11:09:49 2005
+@@ -17,14 +17,14 @@
+ SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @eldap@ @web@ stringprep @tls@ @odbc@
  ERLSHLIBS = expat_erl.so
  
 -DESTDIR =
 +DESTDIR = @prefix@
  
 -EJABBERDDIR = $(DESTDIR)/var/lib/ejabberd
-+EJABBERDDIR = $(DESTDIR)/lib/erlang/lib/ejabberd-%%PORTVERSION%%
++EJABBERDDIR = $(DESTDIR)/lib/erlang/lib/ejabberd-$(PORTVERSION)
  BEAMDIR = $(EJABBERDDIR)/ebin
  PRIVDIR = $(EJABBERDDIR)/priv
  SODIR = $(PRIVDIR)/lib
  MSGSDIR = $(PRIVDIR)/msgs
 -LOGDIR = $(DESTDIR)/var/log/ejabberd
--ETCDIR = $(DESTDIR)/etc/ejabberd
 +LOGDIR = /var/log/ejabberd
-+ETCDIR = $(DESTDIR)/etc
+ ETCDIR = $(DESTDIR)/etc/ejabberd
  
  all: $(ERLSHLIBS) compile-beam all-recursive
- 
 @@ -60,7 +60,7 @@
  	install -d $(MSGSDIR)
  	install -m 644 msgs/*.msg $(MSGSDIR)
  	install -d $(ETCDIR)
 -	install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
-+	install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg.sample
++	install -b -m 644 ejabberd.cfg.example $(ETCDIR)
  	install -d $(LOGDIR)
  
  clean: clean-recursive clean-local
diff --git a/net/ejabberd/files/patch-src::ejabberd b/net/ejabberd/files/patch-src::ejabberd
deleted file mode 100644
index a500e66dd17f..000000000000
--- a/net/ejabberd/files/patch-src::ejabberd
+++ /dev/null
@@ -1,36 +0,0 @@
---- ejabberd.orig	Wed Oct 20 21:59:31 2004
-+++ ejabberd	Wed Oct 20 21:59:15 2004
-@@ -0,0 +1,33 @@
-+#!/bin/sh
-+
-+[ -r /var/run/ejabberd/.erlang.cookie ] && HOME=/var/run/ejabberd
-+[ -f %%PREFIX%%/etc/ejabberd.defaults ] && .  %%PREFIX%%/etc/ejabberd.defaults
-+
-+CONFIG=%%PREFIX%%/etc/ejabberd.cfg
-+LOG=/var/log/ejabberd/ejabberd.log
-+SASL_LOG=/var/log/ejabberd/sasl.log
-+SPOOL=/var/spool/ejabberd
-+
-+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
-+
-+exec erl -sname ejabberd \
-+    -s ejabberd \
-+    -ejabberd config \"$CONFIG\" log_path \"$LOG\" \
-+    -sasl sasl_error_logger \{file,\"$SASL_LOG\"\} \
-+    -mnesia dir \"$SPOOL\" \
-+    $ERL_OPTIONS $ARGS "$@"
-+
diff --git a/net/ejabberd/files/patch-src::ejabberd.sh b/net/ejabberd/files/patch-src::ejabberd.sh
deleted file mode 100644
index 1add6e7587ff..000000000000
--- a/net/ejabberd/files/patch-src::ejabberd.sh
+++ /dev/null
@@ -1,93 +0,0 @@
---- ejabberd.sh.orig	Wed Oct 20 22:16:07 2004
-+++ ejabberd.sh	Wed Oct 20 22:14:04 2004
-@@ -0,0 +1,90 @@
-+#! /bin/sh
-+#
-+# ejabberd        Start/stop ejabberd server
-+#
-+#
-+
-+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
-+EJABBERD=/usr/local/bin/ejabberd
-+EJABBERDCTL=/usr/local/bin/ejabberdctl
-+EJABBERDUSER=ejabberd
-+NAME=ejabberd
-+DESC=ejabberd
-+
-+test -f $EJABBERD || exit 0
-+test -f $EJABBERDCTL || exit 0
-+
-+# Include ejabberd defaults if available
-+if [ -f %%PREFIX%%/etc/ejabberd.defaults ] ; then
-+    . %%PREFIX%%/etc/ejabberd.defaults
-+fi
-+
-+
-+set -e
-+
-+status()
-+{
-+    su $EJABBERDUSER -c "$EJABBERDCTL ejabberd@`hostname -s` status >/dev/null"
-+}
-+
-+start()
-+{
-+    su $EJABBERDUSER -c "$EJABBERD -noshell -detached"
-+}
-+
-+
-+case "$1" in
-+    start)
-+	    echo -n "Starting $DESC: "
-+
-+        if status
-+        then
-+            echo " already running."
-+        false
-+        else
-+            start
-+        fi
-+
-+	    echo "$NAME."
-+	;;
-+    stop)
-+	echo -n "Stopping $DESC: "
-+
-+       if su $EJABBERDUSER -c "$EJABBERDCTL ejabberd@`hostname -s` stop"
-+        then
-+            cnt=0
-+            while status
-+            do
-+                cnt=`expr $cnt + 1`
-+                if [ $cnt -gt 60 ]
-+                then
-+                    echo -n " failed "
-+                    break
-+                fi
-+                sleep 1
-+                echo -n .
-+            done
-+        else
-+            echo -n " failed "
-+        fi
-+
-+	    echo "$NAME."
-+	;;
-+    restart|force-reload)
-+	    echo -n "Restarting $DESC: "
-+        if status
-+        then
-+            su $EJABBERDUSER -c "$EJABBERDCTL ejabberd@`hostname -s` restart"
-+        else
-+            start
-+        fi
-+
-+	    echo "$NAME."
-+	;;
-+    *)
-+	echo "Usage: ejabberd.sh {start|stop|restart|force-reload}" >&2
-+	exit 1
-+	;;
-+esac
-+
-+exit 0
diff --git a/net/ejabberd/files/pkg-message.in b/net/ejabberd/files/pkg-message.in
new file mode 100644
index 000000000000..be842583c38f
--- /dev/null
+++ b/net/ejabberd/files/pkg-message.in
@@ -0,0 +1,16 @@
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING!!!
+
+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.
+
+WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING!!!
diff --git a/net/ejabberd/pkg-deinstall b/net/ejabberd/pkg-deinstall
index e5637444dc59..b00350d14ca8 100644
--- a/net/ejabberd/pkg-deinstall
+++ b/net/ejabberd/pkg-deinstall
@@ -1,22 +1,27 @@
 #!/bin/sh
 
-if [ "$2" != "POST-DEINSTALL" ]; then
+if [ x"$2" != x"POST-DEINSTALL" ]; then
     exit 0
 fi
 
 USER=ejabberd
 
+echo ""
+
 if pw usershow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete ejabberd user permanently, use 'pw userdel ${USER}'"
+	echo "To delete ejabberd user permanently, use 'pw userdel ${USER}'."
 fi
 
 if pw groupshow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete ejabberd group permanently, use 'pw groupdel ${USER}'"
+	echo "To delete ejabberd group permanently, use 'pw groupdel ${USER}'."
 fi
 
 rm -Rf /var/run/ejabberd
 
-echo "If you wish to delete ejabberd data and log files, remove"
-echo "'/var/spool/ejabberd' and '/var/log/ejabberd' directories."
+cat <<EOF
+If you wish to delete ejabberd data and log files, remove
+"/var/spool/ejabberd" and "/var/log/ejabberd" directories.
+
+EOF
 
 exit 0
diff --git a/net/ejabberd/pkg-install b/net/ejabberd/pkg-install
index 784fcb8ff7fd..419c889baff1 100644
--- a/net/ejabberd/pkg-install
+++ b/net/ejabberd/pkg-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ "$2" != "POST-INSTALL" ]; then
+if [ x"$2" != x"POST-INSTALL" ]; then
     exit 0
 fi
 
@@ -8,6 +8,7 @@ USER=ejabberd
 GROUP=${USER}
 UID=522
 GID=${UID}
+USERS_HOME="/var/spool/ejabberd"
 
 if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
 	if pw groupadd ${GROUP} -g ${GID}; then
@@ -20,8 +21,7 @@ fi
 
 if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
 	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-s "/bin/sh" -d "/var/run/ejabberd" \
-		-c "ejabberd pseudo user"; \
+		-s "/bin/sh" -d ${USERS_HOME} -c "ejabberd pseudo user"; \
 	then
 		echo "Added user \"${USER}\"."
 	else
@@ -30,14 +30,6 @@ if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
 	fi
 fi
 
-mkdir -m 750 /var/log/ejabberd /var/spool/ejabberd /var/run/ejabberd 2>/dev/null
-
-cat > /var/run/ejabberd/.inetrc << __EOF__
-{lookup,["file","native"]}.
-{host,{127,0,0,1}, ["localhost","hostalias"]}.
-__EOF__
-
-chown -R ejabberd:ejabberd /var/log/ejabberd /var/spool/ejabberd \
-    /var/run/ejabberd
+install -d -m 750 -o ${USER} -g ${GROUP} ${USERS_HOME} /var/log/ejabberd
 
 exit 0
diff --git a/net/ejabberd/pkg-plist b/net/ejabberd/pkg-plist
index 9e85908ed849..4f0743bcfb2d 100644
--- a/net/ejabberd/pkg-plist
+++ b/net/ejabberd/pkg-plist
@@ -1,121 +1,118 @@
-bin/ejabberd
-bin/ejabberdctl
-etc/ejabberd.cfg.sample
-etc/ejabberd.defaults
-etc/rc.d/ejabberd.sh
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ELDAPv3.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/acl.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/cyrsasl.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/cyrsasl_digest.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/cyrsasl_plain.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd.app
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_app.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_auth.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_auth_external.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_auth_internal.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_auth_ldap.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_auth_odbc.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_c2s.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_config.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_ctl.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_hooks.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_http.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_http_poll.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_listener.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_local.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_logger_h.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_receiver.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_router.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_s2s.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_s2s_in.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_s2s_out.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_service.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_sm.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_sup.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_tmp_sup.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_web.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/ejabberd_web_admin.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/eldap.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/extauth.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/gen_iq_handler.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/gen_mod.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/iconv.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/idna.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/jd2ejd.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/jlib.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_announce.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_configure.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_configure2.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_disco.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_echo.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_irc.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_irc_connection.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_last.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_last_odbc.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_muc.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_muc_room.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_offline.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_offline_odbc.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_privacy.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_private.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_pubsub.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_register.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_roster.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_roster_odbc.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_service_log.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_shared_roster.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_stats.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_time.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_vcard.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_vcard_ldap.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/mod_version.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/randoms.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/sha.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/shaper.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/stringprep.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/tls.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/translate.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/xml.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin/xml_stream.beam
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/lib/expat_erl.so
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/lib/iconv_erl.so
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/lib/stringprep_drv.so
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/lib/tls_drv.so
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/de.msg
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/es.msg
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/fr.msg
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/nl.msg
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/pl.msg
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/pt.msg
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/ru.msg
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/sv.msg
-lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs/uk.msg
-%%PORTDOCS%%%%DOCSDIR%%/dev.aux
+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
+@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/%%PORTNAME%%.app
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_app.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth.beam
+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%%_c2s.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%%_hooks.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_http.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%%_receiver.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_s2s.beam
+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%%_sup.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_tmp_sup.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web_admin.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.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/eldap.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/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_announce.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_irc.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_irc_connection.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_last_odbc.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_muc.beam
+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_private.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
+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_stats.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_time.beam
+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_version.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
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stringprep.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/tls.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/translate.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/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/de.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/nl.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/sv.msg
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/uk.msg
 %%PORTDOCS%%%%DOCSDIR%%/dev.html
-%%PORTDOCS%%%%DOCSDIR%%/dev.log
-%%PORTDOCS%%%%DOCSDIR%%/dev.pdf
 %%PORTDOCS%%%%DOCSDIR%%/dev.tex
-%%PORTDOCS%%%%DOCSDIR%%/dev.toc
 %%PORTDOCS%%%%DOCSDIR%%/disco.png
 %%PORTDOCS%%%%DOCSDIR%%/discorus.png
 %%PORTDOCS%%%%DOCSDIR%%/flow.dot
-%%PORTDOCS%%%%DOCSDIR%%/guide.aux
 %%PORTDOCS%%%%DOCSDIR%%/guide.html
-%%PORTDOCS%%%%DOCSDIR%%/guide.log
-%%PORTDOCS%%%%DOCSDIR%%/guide.out
-%%PORTDOCS%%%%DOCSDIR%%/guide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/guide.tex
-%%PORTDOCS%%%%DOCSDIR%%/guide.toc
-%%PORTDOCS%%%%DOCSDIR%%/hevea.sty
 %%PORTDOCS%%%%DOCSDIR%%/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_%%PORTVERSION%%.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.1.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.txt
 %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
 %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
-@dirrm %%PORTDOCS%%share/doc/ejabberd
-@dirrm lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/msgs
-@dirrm lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv/lib
-@dirrm lib/erlang/lib/ejabberd-%%PORTVERSION%%/priv
-@dirrm lib/erlang/lib/ejabberd-%%PORTVERSION%%/ebin
-@dirrm lib/erlang/lib/ejabberd-%%PORTVERSION%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm 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
+@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin
+@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%