Index: sysutils/bacula-server/Makefile
===================================================================
--- sysutils/bacula-server/Makefile
+++ sysutils/bacula-server/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=	bacula
 DISTVERSION=	7.0.5
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
 
-MAINTAINER=	dan@langille.org
+MAINTAINER=	dvl@FreeBSD.org
 COMMENT?=	Network backup solution (server)
 
 USES+=		libtool
@@ -174,9 +174,6 @@
 .endif
 
 
-pre-install:
-	${MKDIR} ${STAGEDIR}${BACULA_DIR}
-
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
Index: sysutils/bacula-server/files/pkg-deinstall.client.in
===================================================================
--- sysutils/bacula-server/files/pkg-deinstall.client.in
+++ sysutils/bacula-server/files/pkg-deinstall.client.in
@@ -20,9 +20,6 @@
         mv -f $TMPFILE /etc/services
 
 	if [ -d ${BACULA_DIR} ]; then
-	    rmdir ${BACULA_DIR};
-	fi
-	if [ -d ${BACULA_DIR} ]; then
 	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
 	fi
 
Index: sysutils/bacula-server/pkg-plist.client
===================================================================
--- sysutils/bacula-server/pkg-plist.client
+++ sysutils/bacula-server/pkg-plist.client
@@ -12,7 +12,6 @@
 man/man8/bconsole.8.gz
 sbin/bacula-fd
 @(,bacula,750) sbin/bconsole
-@exec mkdir -p %%BACULA_DIR%%
-@dirrmtry %%BACULA_DIR%%
-@dirrmtry share/bacula
-@dirrmtry %%ETCDIR%%
+@dir(bacula,bacula,)  %%BACULA_DIR%%
+@dir share/bacula
+@dir(,bacula,) %%ETCDIR%%
Index: sysutils/bacula5-server/Makefile
===================================================================
--- sysutils/bacula5-server/Makefile
+++ sysutils/bacula5-server/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=	bacula
 DISTVERSION=	5.2.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	5-server
 
-MAINTAINER=	dan@langille.org
+MAINTAINER=	dvl@FreeBSD.org
 COMMENT?=	Network backup solution (server)
 
 USES+=		libtool:keepla
@@ -169,9 +169,6 @@
 		${WRKSRC}/src/tools/bpluginfo.c
 .endif
 
-pre-install:
-	${MKDIR} ${STAGEDIR}${BACULA_DIR}
-
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
Index: sysutils/bacula5-server/files/pkg-deinstall.client.in
===================================================================
--- sysutils/bacula5-server/files/pkg-deinstall.client.in
+++ sysutils/bacula5-server/files/pkg-deinstall.client.in
@@ -20,9 +20,6 @@
         mv -f $TMPFILE /etc/services
 
 	if [ -d ${BACULA_DIR} ]; then
-	    rmdir ${BACULA_DIR};
-	fi
-	if [ -d ${BACULA_DIR} ]; then
 	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
 	fi
 
Index: sysutils/bacula5-server/pkg-plist.client
===================================================================
--- sysutils/bacula5-server/pkg-plist.client
+++ sysutils/bacula5-server/pkg-plist.client
@@ -25,7 +25,6 @@
 @group bacula
 sbin/bconsole
 @group wheel
-@exec mkdir -p %%BACULA_DIR%%
-@dirrmtry %%BACULA_DIR%%
-@dirrmtry share/bacula
-@dirrmtry %%ETCDIR%%
+@dir(bacula,bacula,)  %%BACULA_DIR%%
+@dir share/bacula
+@dir(,bacula,) %%ETCDIR%%