4 files changed, 15 insertions, 59 deletions

diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 525f755d0eda..97971611d957 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jabber
 PORTVERSION=	1.6.1.1
-PORTREVISION=	17
+PORTREVISION=	18
 PORTEPOCH=	1
 CATEGORIES=	net-im ipv6
 MASTER_SITES=	http://download.jabberd.org/jabberd14/%SUBDIR%/
@@ -40,23 +40,28 @@ CPPFLAGS+=	$$(pth-config --cflags) \
 LDFLAGS+=	$$(pth-config --ldflags) \
 		-L${LOCALBASE}/lib
 
-SUB_FILES=	pkg-install pkg-deinstall pkg-message
+SUB_FILES=	pkg-message
 SUB_LIST=	JABBER_USER=${JABBER_USER} \
 		JABBER_GROUP=${JABBER_GROUP} \
 		JABBER_ETCDIR="${JABBER_ETCDIR}" \
 		JABBER_LOGDIR="${JABBER_LOGDIR}" \
 		JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \
 		JABBER_RUNDIR="${JABBER_RUNDIR}"
+PLIST_SUB=	JABBER_USER=${JABBER_USER} \
+		JABBER_GROUP=${JABBER_GROUP} \
+		JABBER_LOGDIR="${JABBER_LOGDIR}" \
+		JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \
+		JABBER_RUNDIR="${JABBER_RUNDIR}"
 
 USERS=		${JABBER_USER}
 GROUPS=		${JABBER_GROUP}
 
 JABBER_USER=	jabber
 JABBER_GROUP=	jabber
-JABBER_ETCDIR=	"${PREFIX}/etc"
-JABBER_RUNDIR=	"/var/run/jabberd"
-JABBER_SPOOLDIR="/var/spool/jabberd"
-JABBER_LOGDIR=	"/var/log/jabberd"
+JABBER_ETCDIR=	${PREFIX}/etc
+JABBER_RUNDIR=	/var/run/jabberd
+JABBER_SPOOLDIR=/var/spool/jabberd
+JABBER_LOGDIR=	/var/log/jabberd
 
 .include <bsd.port.options.mk>
 
diff --git a/net-im/jabber/files/pkg-deinstall.in b/net-im/jabber/files/pkg-deinstall.in
deleted file mode 100644
index 5d557eaeae97..000000000000
--- a/net-im/jabber/files/pkg-deinstall.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
-fi
-
-RUNDIR="%%JABBER_RUNDIR%%"
-SPOOLDIR="%%JABBER_SPOOLDIR%%"
-LOGDIR="%%LOGDIR%%"
-
-echo "You may want to delete the following directories:"
-echo "${RUNDIR}"
-echo "${SPOOLDIR}" 
-echo "${LOGDIR}" 
-
-exit 0
diff --git a/net-im/jabber/files/pkg-install.in b/net-im/jabber/files/pkg-install.in
deleted file mode 100644
index 8208cf7d5cc5..000000000000
--- a/net-im/jabber/files/pkg-install.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
-    exit 0
-fi
-
-USER=%%JABBER_USER%%
-GROUP=%%JABBER_GROUP%%
-RUNDIR=%%JABBER_RUNDIR%%
-SPOOLDIR=%%JABBER_SPOOLDIR%%
-LOGDIR=%%JABBER_LOGDIR%%
-
-if [ ! -d ${RUNDIR} ]; then
-	echo "Creating \"${RUNDIR}\"."
-	mkdir -p ${RUNDIR}
-fi
-
-echo "Fixing ownerships and modes in \"${RUNDIR}\"."
-chown -R ${USER}:${GROUP} ${RUNDIR}
-chmod -R go= ${RUNDIR}
-
-if [ ! -d ${SPOOLDIR} ]; then
-	echo "Creating \"${SPOOLDIR}\"."
-	mkdir -p ${SPOOLDIR}
-fi
-
-if [ ! -d ${LOGDIR} ]; then
-	echo "Creating \"${LOGDIR}\"."
-	mkdir -p ${LOGDIR}
-fi
-
-echo "Fixing ownerships and modes in \"${SPOOLDIR}\"."
-chown -R ${USER}:${GROUP} ${SPOOLDIR}
-chmod -R go= ${SPOOLDIR}
diff --git a/net-im/jabber/pkg-plist b/net-im/jabber/pkg-plist
index 95b547b89134..878a773a0fb2 100644
--- a/net-im/jabber/pkg-plist
+++ b/net-im/jabber/pkg-plist
@@ -8,6 +8,7 @@ lib/jabber/libjabberd.so
 lib/jabber/libjabberd.so.2
 lib/jabber/libjabberd.so.2.0.0
 lib/jabber/libjabberddialback.so
+lib/jabber/libjabberddialback.so.2
 lib/jabber/libjabberddialback.so.2.0.0
 lib/jabber/libjabberddnsrv.so
 lib/jabber/libjabberddnsrv.so.2
@@ -44,6 +45,6 @@ share/locale/nl/LC_MESSAGES/jabberd14.mo
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/mysql.sql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry lib/jabber
-@dirrmtry include/jabber
+@dir %%JABBER_LOGDIR%%
+@dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%%
+@dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_SPOOLDIR%%