* ETCDIR should be chgrp bacula so the configuration files can be be read by

  scripts.

While here:

* fix creation and deletion of /var/db/bacula to avoid error message
  on pkg delete and on removal of just the bacula-dir port.
* Change MAINTAINER to @FreeBSD.org address

PR:           196017
Submitted by: timp87@gmail.com
Approved by:  mat (mentor)

8 files changed, 11 insertions, 23 deletions

diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 991e5b7777af..8cff1d1ea564 100644
--- a/sysutils/bacula-server/Makefile
+++ b/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 @@ post-patch:
 .endif
 
 
-pre-install:
-	${MKDIR} ${STAGEDIR}${BACULA_DIR}
-
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
diff --git a/sysutils/bacula-server/files/pkg-deinstall.client.in b/sysutils/bacula-server/files/pkg-deinstall.client.in
index e24e2a581cff..27590d301e06 100644
--- a/sysutils/bacula-server/files/pkg-deinstall.client.in
+++ b/sysutils/bacula-server/files/pkg-deinstall.client.in
@@ -20,9 +20,6 @@ case "$2" in
         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
 
diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist
index c5d435dc7f6a..37beb7889e97 100644
--- a/sysutils/bacula-server/pkg-plist
+++ b/sysutils/bacula-server/pkg-plist
@@ -68,3 +68,4 @@ man/man8/btape.8.gz
 man/man8/btraceback.8.gz
 man/man8/bwild.8.gz
 man/man8/dbcheck.8.gz
+@dir(bacula,bacula,)  %%BACULA_DIR%%
diff --git a/sysutils/bacula-server/pkg-plist.client b/sysutils/bacula-server/pkg-plist.client
index 07673651842c..395b9fc579c9 100644
--- a/sysutils/bacula-server/pkg-plist.client
+++ b/sysutils/bacula-server/pkg-plist.client
@@ -12,7 +12,6 @@ man/man8/bacula-fd.8.gz
 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%%
diff --git a/sysutils/bacula5-server/Makefile b/sysutils/bacula5-server/Makefile
index 4dca125bdb9a..9565d038b285 100644
--- a/sysutils/bacula5-server/Makefile
+++ b/sysutils/bacula5-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bacula
 DISTVERSION=	5.2.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -169,9 +169,6 @@ post-patch:
 		${WRKSRC}/src/tools/bpluginfo.c
 .endif
 
-pre-install:
-	${MKDIR} ${STAGEDIR}${BACULA_DIR}
-
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
diff --git a/sysutils/bacula5-server/files/pkg-deinstall.client.in b/sysutils/bacula5-server/files/pkg-deinstall.client.in
index 7c07237addd7..6df11070aea9 100644
--- a/sysutils/bacula5-server/files/pkg-deinstall.client.in
+++ b/sysutils/bacula5-server/files/pkg-deinstall.client.in
@@ -20,9 +20,6 @@ case "$2" in
         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
 
diff --git a/sysutils/bacula5-server/pkg-plist b/sysutils/bacula5-server/pkg-plist
index 387e55fdef66..ddb3cbb9a22c 100644
--- a/sysutils/bacula5-server/pkg-plist
+++ b/sysutils/bacula5-server/pkg-plist
@@ -75,5 +75,6 @@ sbin/dbcheck
 %%DATADIR%%/query.sql
 %%DATADIR%%/update_bacula_tables
 %%DATADIR%%/update_%%DBTYPE%%_tables
+@dir(bacula,bacula,)  %%BACULA_DIR%%
 @owner root
 @group wheel
diff --git a/sysutils/bacula5-server/pkg-plist.client b/sysutils/bacula5-server/pkg-plist.client
index 0257d088bf8f..ffe16ec3c91e 100644
--- a/sysutils/bacula5-server/pkg-plist.client
+++ b/sysutils/bacula5-server/pkg-plist.client
@@ -25,7 +25,6 @@ sbin/bacula-fd
 @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%%