Index: Makefile
===================================================================
--- Makefile	(revision 425999)
+++ Makefile	(working copy)
@@ -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,10 @@
 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
 	#the following are installed by the -CLIENT port, and I (ler@lerctr.org)
 	#don't know how to remove them from being built for the -SERVER port.
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/bpipe-fd.so
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 425999)
+++ pkg-plist	(working copy)
@@ -49,7 +49,6 @@
 %%DATADIR%%/make_%%DBTYPE%%_tables
 %%DATADIR%%/mtx-changer
 %%DATADIR%%/mtx-changer.conf
-@sample(,bacula,640) %%DATADIR%%/query.sql.sample
 %%DATADIR%%/update_bacula_tables
 %%DATADIR%%/update_%%DBTYPE%%_tables
 @owner
Index: pkg-plist.client
===================================================================
--- pkg-plist.client	(revision 425999)
+++ pkg-plist.client	(working copy)
@@ -15,3 +15,4 @@
 @dir(bacula,bacula,)  %%BACULA_DIR%%
 @dir share/bacula
 @dir(,bacula,) %%ETCDIR%%
+@sample(,bacula,644) share/bacula/query.sql.sample