Index: sysutils/bacula5-server/Makefile
===================================================================
--- sysutils/bacula5-server/Makefile
+++ sysutils/bacula5-server/Makefile
@@ -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
@@ -1,3 +1,4 @@
+@dir(,bacula,) %%ETCDIR%%
 @sample %%ETCDIR%%/bacula-fd.conf.sample
 @group bacula
 @sample %%ETCDIR%%/bconsole.conf.sample
@@ -25,7 +26,6 @@
 @group bacula
 sbin/bconsole
 @group wheel
-@exec mkdir -p %%BACULA_DIR%%
-@dirrmtry %%BACULA_DIR%%
+@dir(bacula,bacula,)  %%BACULA_DIR%%
 @dirrmtry share/bacula
 @dirrmtry %%ETCDIR%%