- remove USERGROUP_PHASE=pre-install. Makes binary packages usable on

  systems other than the build host.
- don't install dvd-handler -- DVD support is disabled since version 5.
- install query.sql in client-only package too.

4 files changed, 8 insertions, 11 deletions

diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile
index e3fbe43eae9..2937fd7047a 100644
--- a/sysutils/bacula-clientonly/Makefile
+++ b/sysutils/bacula-clientonly/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2013/02/06 23:23:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2013/04/25 20:41:33 shattered Exp $
 
 PKGNAME=		${DISTNAME:S/-/-clientonly-/}
 COMMENT=		The Network Backup Solution (client only)
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 CONFLICTS=		bacula-[0-9]* bacula-client-[0-9]*
 
@@ -27,7 +27,7 @@ RCD_SCRIPTS=		bacula-fd
 .include "../../sysutils/bacula/Makefile.common"
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/scripts/dvd-handler ${DESTDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/dird/query.sql ${DESTDIR}${PREFIX}/libexec/bacula/query.sql
 
 .include "options.mk"
 
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 90ced933a2f..98d64ac2fa2 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2013/03/02 20:33:33 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2013/04/25 20:41:33 shattered Exp $
 
-PKGREVISION=		4
+PKGREVISION=		5
 
 CONFLICTS+=		bacula-client-[0-9]* bacula-clientonly-[0-9]*
 
@@ -28,7 +28,6 @@ OWN_DIRS_PERMS+=	${BACULA_WORKINGDIR} ${ROOT_USER} ${BACULA_GROUP} 770
 PKG_USERS=		${BACULA_DIR_USER}:${BACULA_GROUP}
 PKG_USERS+=		${BACULA_SD_USER}:${BACULA_GROUP}
 PKG_GROUPS=		${BACULA_GROUP}
-USERGROUP_PHASE=	pre-install
 
 CONF_FILES+=		${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf
 CONF_FILES+=		${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf
@@ -42,7 +41,6 @@ REPLACE_PERL+=		src/cats/make_catalog_backup.pl.in
 .include "Makefile.common"
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/scripts/dvd-handler ${DESTDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-changer \
 		${DESTDIR}${PREFIX}/libexec/bacula/
 
diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common
index b47b57a3636..523df2e1d7e 100644
--- a/sysutils/bacula/PLIST.common
+++ b/sysutils/bacula/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.15 2012/10/25 21:45:27 christos Exp $
+@comment $NetBSD: PLIST.common,v 1.16 2013/04/25 20:41:33 shattered Exp $
 lib/bpipe-fd.la
 lib/libbac.la
 lib/libbaccfg.la
@@ -16,6 +16,7 @@ libexec/bacula/btraceback.mdb
 libexec/bacula/disk-changer
 libexec/bacula/mtx-changer
 libexec/bacula/mtx-changer.conf
+libexec/bacula/query.sql
 man/man1/bacula-bwxconsole.1
 man/man1/bacula-tray-monitor.1
 man/man1/bat.1
@@ -49,5 +50,4 @@ share/doc/bacula/VERIFYING
 share/doc/bacula/technotes
 share/examples/bacula/bacula-fd.conf
 share/examples/bacula/bconsole.conf
-share/examples/bacula/dvd-handler
 share/examples/rc.d/bacula-fd
diff --git a/sysutils/bacula/PLIST.server b/sysutils/bacula/PLIST.server
index f32424dbd33..8f26350c96e 100644
--- a/sysutils/bacula/PLIST.server
+++ b/sysutils/bacula/PLIST.server
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.server,v 1.10 2013/01/04 23:25:49 dholland Exp $
+@comment $NetBSD: PLIST.server,v 1.11 2013/04/25 20:41:33 shattered Exp $
 lib/libbaccats.la
 lib/libbaccats-${BACULA_DB}.la
 lib/libbacsql.la
@@ -16,7 +16,6 @@ libexec/bacula/make_${BACULA_DB}_tables
 libexec/bacula/make_bacula_tables
 libexec/bacula/make_catalog_backup
 libexec/bacula/make_catalog_backup.pl
-libexec/bacula/query.sql
 libexec/bacula/update_${BACULA_DB}_tables
 libexec/bacula/update_bacula_tables
 sbin/bacula-dir