svn commit: r426074 - head/sysutils/bacula-server

[Dan Langille]

Author: dvl
Date: Sun Nov 13 23:09:06 2016
New Revision: 426074
URL: https://svnweb.freebsd.org/changeset/ports/426074

Log:
  install correct query.sql{,.sample}
  
  Bump PORTREVISION
  
  Submitted by: Larry Rosenman
  PR:           214489

Modified:
  head/sysutils/bacula-server/Makefile
  head/sysutils/bacula-server/pkg-plist
  head/sysutils/bacula-server/pkg-plist.client

Modified: head/sysutils/bacula-server/Makefile
==============================================================================
--- head/sysutils/bacula-server/Makefile	Sun Nov 13 23:05:23 2016	(r426073)
+++ head/sysutils/bacula-server/Makefile	Sun Nov 13 23:09:06 2016	(r426074)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bacula
 DISTVERSION=	7.4.4
-PORTREVISION=   1
+PORTREVISION=   2
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -188,10 +188,13 @@ post-patch:
 post-install:
 .if defined(WITH_CLIENT_ONLY)
 	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/sample-query.sql ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql.sample
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample
-	${MV} ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql.sample
+	# bacula-dir attempts to install query.sql as bpart of bacula-server, but that should only installed by bacula-client.
+	${RM} ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql
+
 	#the following are installed by the -CLIENT port, and I (ler at lerctr.org)
 	#don't know how to remove them from being built for the -SERVER port.
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/bpipe-fd.so

Modified: head/sysutils/bacula-server/pkg-plist
==============================================================================
--- head/sysutils/bacula-server/pkg-plist	Sun Nov 13 23:05:23 2016	(r426073)
+++ head/sysutils/bacula-server/pkg-plist	Sun Nov 13 23:09:06 2016	(r426074)
@@ -49,7 +49,6 @@ sbin/dbcheck
 %%DATADIR%%/make_%%DBTYPE%%_tables
 %%DATADIR%%/mtx-changer
 %%DATADIR%%/mtx-changer.conf
- at sample(,bacula,640) %%DATADIR%%/query.sql.sample
 %%DATADIR%%/update_bacula_tables
 %%DATADIR%%/update_%%DBTYPE%%_tables
 @owner

Modified: head/sysutils/bacula-server/pkg-plist.client
==============================================================================
--- head/sysutils/bacula-server/pkg-plist.client	Sun Nov 13 23:05:23 2016	(r426073)
+++ head/sysutils/bacula-server/pkg-plist.client	Sun Nov 13 23:09:06 2016	(r426074)
@@ -15,3 +15,4 @@ sbin/bacula-fd
 @dir(bacula,bacula,)  %%BACULA_DIR%%
 @dir share/bacula
 @dir(,bacula,) %%ETCDIR%%
+ at sample(,bacula,644) share/bacula/query.sql.sample