* Upgrade to 7.0.5

* do not remove etc/bacula; let bacula-client do that
* use UID and GID provided by ports/UIDs & ports/GIDs
* minimize use of owner/group

PR:                 193532
Submitted by:       Kevin Thompson
Approved by:	    mat (mentor)

6 files changed, 19 insertions, 26 deletions

diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index 881da1ed84d8..592f375f0185 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	bacula
 PKGNAMESUFFIX=	-bat
-PORTREVISION=	5
 
 COMMENT=	Network backup solution (GUI)
 
diff --git a/sysutils/bacula-bat/pkg-plist b/sysutils/bacula-bat/pkg-plist
index 0b1e4857dd11..9cd89bca56cc 100644
--- a/sysutils/bacula-bat/pkg-plist
+++ b/sysutils/bacula-bat/pkg-plist
@@ -1,5 +1,4 @@
 @sample %%ETCDIR%%/bat.conf.sample
 man/man1/bat.1.gz
 sbin/bat
-@dirrmtry %%ETCDIR%%
 
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index b8937dd59f25..dcf4f22ed0bd 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-DISTVERSION=	7.0.4
-PORTREVISION?=	1
+DISTVERSION=	7.0.5
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -78,11 +77,11 @@ CONFIGURE_ARGS+=--with-dir-user=${BACULA_USER} \
 .endif
 
 # The user/group IDs below are registered, see
-# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#users-and-groups
 #
 BACULA_USER?=	bacula
 BACULA_GROUP?=	${BACULA_USER}
-BACULA_UID?=	910
+BACULA_UID?=	bacula
 BACULA_GID?=	${BACULA_UID}
 BACULA_DIR?=	/var/db/bacula
 
@@ -146,8 +145,14 @@ post-patch:
 	# This port does not install docs.  See bacula-docs for that
 	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
 	# Change $(ECHO) to echo in some Makefile.in files
-	@${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \
-		${WRKSRC}/src/console/Makefile.in
+	@${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g'  \
+		${WRKSRC}/src/filed/Makefile.in   \
+		${WRKSRC}/src/console/Makefile.in \
+		${WRKSRC}/src/cats/Makefile.in    \
+		${WRKSRC}/src/dird/Makefile.in    \
+		${WRKSRC}/src/stored/Makefile.in  \
+		${WRKSRC}/src/tools/Makefile.in
+
 	# Default bconsole.conf is in ${ETCDIR}
 	@${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c
 	@${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
@@ -175,7 +180,6 @@ post-install:
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample
-	${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp
 .endif
 	for na in ${CONFFILES}; do \
 		${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \
diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo
index 8e5e322e9ab1..2da3469aaea7 100644
--- a/sysutils/bacula-server/distinfo
+++ b/sysutils/bacula-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bacula-7.0.4.tar.gz) = ebf802b843a95f6526e82dd181dff7cd7dc7d1fdc55cec8636e0fe3af69acf7e 
-SIZE (bacula-7.0.4.tar.gz) = 3596569 
+SHA256 (bacula-7.0.5.tar.gz) = 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49
+SIZE (bacula-7.0.5.tar.gz) = 3216406
diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist
index 2b2b0ca5bae8..9ac17ca37e62 100644
--- a/sysutils/bacula-server/pkg-plist
+++ b/sysutils/bacula-server/pkg-plist
@@ -1,8 +1,6 @@
-@sample %%ETCDIR%%/bacula-barcodes.sample
-@group bacula
-@sample %%ETCDIR%%/bacula-dir.conf.sample
-@group wheel
-@sample %%ETCDIR%%/bacula-sd.conf.sample
+@sample(,bacula,640) %%ETCDIR%%/bacula-barcodes.sample
+@sample(,bacula,) %%ETCDIR%%/bacula-dir.conf.sample
+@sample(,bacula,) %%ETCDIR%%/bacula-sd.conf.sample
 lib/libbaccats-%%LIB_VERSION%%.so
 lib/libbaccats.la
 lib/libbaccats.so
@@ -21,9 +19,7 @@ sbin/bls
 sbin/bpluginfo
 sbin/bregex
 sbin/bscan
-@mode 755
 sbin/bsmtp
-@mode
 sbin/btape
 sbin/btraceback
 sbin/bwild
@@ -75,4 +71,3 @@ man/man8/btape.8.gz
 man/man8/btraceback.8.gz
 man/man8/bwild.8.gz
 man/man8/dbcheck.8.gz
-@dirrmtry %%ETCDIR%%
diff --git a/sysutils/bacula-server/pkg-plist.client b/sysutils/bacula-server/pkg-plist.client
index 642ee9c60e67..bc2cc0d7d28b 100644
--- a/sysutils/bacula-server/pkg-plist.client
+++ b/sysutils/bacula-server/pkg-plist.client
@@ -1,7 +1,5 @@
-@sample %%ETCDIR%%/bacula-fd.conf.sample
-@group bacula
-@sample %%ETCDIR%%/bconsole.conf.sample
-@group wheel
+@sample(,bacula,640) %%ETCDIR%%/bacula-fd.conf.sample
+@sample(,bacula,640) %%ETCDIR%%/bconsole.conf.sample
 lib/libbac-%%LIB_VERSION%%.so
 lib/libbac.la
 lib/libbac.so
@@ -16,9 +14,7 @@ man/man8/bacula.8.gz
 man/man8/bacula-fd.8.gz
 man/man8/bconsole.8.gz
 sbin/bacula-fd
-@group bacula
-sbin/bconsole
-@group wheel
+@(,bacula,750) sbin/bconsole
 @exec mkdir -p %%BACULA_DIR%%
 @dirrmtry %%BACULA_DIR%%
 @dirrmtry share/bacula