svn commit: r375197 - in head/sysutils: bacula-server bacula-server/files bacula5-server bacula5-server/files

[Dan Langille]

Author: dvl
Date: Sun Dec 21 21:55:49 2014
New Revision: 375197
URL: https://svnweb.freebsd.org/changeset/ports/375197
QAT: https://qat.redports.org/buildarchive/r375197/

Log:
  * 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 at gmail.com
  Approved by:  mat (mentor)

Modified:
  head/sysutils/bacula-server/Makefile
  head/sysutils/bacula-server/files/pkg-deinstall.client.in
  head/sysutils/bacula-server/pkg-plist
  head/sysutils/bacula-server/pkg-plist.client
  head/sysutils/bacula5-server/Makefile
  head/sysutils/bacula5-server/files/pkg-deinstall.client.in
  head/sysutils/bacula5-server/pkg-plist
  head/sysutils/bacula5-server/pkg-plist.client

Modified: head/sysutils/bacula-server/Makefile
==============================================================================
--- head/sysutils/bacula-server/Makefile	Sun Dec 21 21:39:05 2014	(r375196)
+++ head/sysutils/bacula-server/Makefile	Sun Dec 21 21:55:49 2014	(r375197)
@@ -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 at langille.org
+MAINTAINER=	dvl at 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)

Modified: head/sysutils/bacula-server/files/pkg-deinstall.client.in
==============================================================================
--- head/sysutils/bacula-server/files/pkg-deinstall.client.in	Sun Dec 21 21:39:05 2014	(r375196)
+++ head/sysutils/bacula-server/files/pkg-deinstall.client.in	Sun Dec 21 21:55:49 2014	(r375197)
@@ -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
 

Modified: head/sysutils/bacula-server/pkg-plist
==============================================================================
--- head/sysutils/bacula-server/pkg-plist	Sun Dec 21 21:39:05 2014	(r375196)
+++ head/sysutils/bacula-server/pkg-plist	Sun Dec 21 21:55:49 2014	(r375197)
@@ -68,3 +68,4 @@ man/man8/btape.8.gz
 man/man8/btraceback.8.gz
 man/man8/bwild.8.gz
 man/man8/dbcheck.8.gz
+ at dir(bacula,bacula,)  %%BACULA_DIR%%

Modified: head/sysutils/bacula-server/pkg-plist.client
==============================================================================
--- head/sysutils/bacula-server/pkg-plist.client	Sun Dec 21 21:39:05 2014	(r375196)
+++ head/sysutils/bacula-server/pkg-plist.client	Sun Dec 21 21:55:49 2014	(r375197)
@@ -12,7 +12,6 @@ man/man8/bacula-fd.8.gz
 man/man8/bconsole.8.gz
 sbin/bacula-fd
 @(,bacula,750) sbin/bconsole
- at exec mkdir -p %%BACULA_DIR%%
- at dirrmtry %%BACULA_DIR%%
- at dirrmtry share/bacula
- at dirrmtry %%ETCDIR%%
+ at dir(bacula,bacula,)  %%BACULA_DIR%%
+ at dir share/bacula
+ at dir(,bacula,) %%ETCDIR%%

Modified: head/sysutils/bacula5-server/Makefile
==============================================================================
--- head/sysutils/bacula5-server/Makefile	Sun Dec 21 21:39:05 2014	(r375196)
+++ head/sysutils/bacula5-server/Makefile	Sun Dec 21 21:55:49 2014	(r375197)
@@ -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)

Modified: head/sysutils/bacula5-server/files/pkg-deinstall.client.in
==============================================================================
--- head/sysutils/bacula5-server/files/pkg-deinstall.client.in	Sun Dec 21 21:39:05 2014	(r375196)
+++ head/sysutils/bacula5-server/files/pkg-deinstall.client.in	Sun Dec 21 21:55:49 2014	(r375197)
@@ -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
 

Modified: head/sysutils/bacula5-server/pkg-plist
==============================================================================
--- head/sysutils/bacula5-server/pkg-plist	Sun Dec 21 21:39:05 2014	(r375196)
+++ head/sysutils/bacula5-server/pkg-plist	Sun Dec 21 21:55:49 2014	(r375197)
@@ -75,5 +75,6 @@ sbin/dbcheck
 %%DATADIR%%/query.sql
 %%DATADIR%%/update_bacula_tables
 %%DATADIR%%/update_%%DBTYPE%%_tables
+ at dir(bacula,bacula,)  %%BACULA_DIR%%
 @owner root
 @group wheel

Modified: head/sysutils/bacula5-server/pkg-plist.client
==============================================================================
--- head/sysutils/bacula5-server/pkg-plist.client	Sun Dec 21 21:39:05 2014	(r375196)
+++ head/sysutils/bacula5-server/pkg-plist.client	Sun Dec 21 21:55:49 2014	(r375197)
@@ -25,7 +25,6 @@ sbin/bacula-fd
 @group bacula
 sbin/bconsole
 @group wheel
- at exec mkdir -p %%BACULA_DIR%%
- at dirrmtry %%BACULA_DIR%%
- at dirrmtry share/bacula
- at dirrmtry %%ETCDIR%%
+ at dir(bacula,bacula,)  %%BACULA_DIR%%
+ at dir share/bacula
+ at dir(,bacula,) %%ETCDIR%%