Thu Apr 25 20:41:33 2013 UTC ()
- 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.


(shattered)
diff -r1.46 -r1.47 pkgsrc/sysutils/bacula/Makefile
diff -r1.15 -r1.16 pkgsrc/sysutils/bacula/PLIST.common
diff -r1.10 -r1.11 pkgsrc/sysutils/bacula/PLIST.server
diff -r1.21 -r1.22 pkgsrc/sysutils/bacula-clientonly/Makefile
cvs diff -r1.46 -r1.47 pkgsrc/sysutils/bacula/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/bacula/Makefile 2013/03/02 20:33:33 1.46
+++ pkgsrc/sysutils/bacula/Makefile 2013/04/25 20:41:33 1.47
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.46 2013/03/02 20:33:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.47 2013/04/25 20:41:33 shattered Exp $
2 2
3PKGREVISION= 4 3PKGREVISION= 5
4 4
5CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]* 5CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]*
6 6
7PKG_DESTDIR_SUPPORT= destdir 7PKG_DESTDIR_SUPPORT= destdir
8 8
9.include "options.mk" 9.include "options.mk"
10 10
11PLIST_SRC= PLIST.common 11PLIST_SRC= PLIST.common
12PLIST_SRC+= PLIST.server 12PLIST_SRC+= PLIST.server
13 13
14PLIST_SUBST+= BACULA_DB=${BACULA_DB} 14PLIST_SUBST+= BACULA_DB=${BACULA_DB}
15MESSAGE_SUBST+= PREFIX=${PREFIX} 15MESSAGE_SUBST+= PREFIX=${PREFIX}
16MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} 16MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV}
@@ -18,32 +18,30 @@ MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME @@ -18,32 +18,30 @@ MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME
18# For make_catalog_backup.pl.in. 18# For make_catalog_backup.pl.in.
19USE_TOOLS+= perl:run 19USE_TOOLS+= perl:run
20 20
21CONFIGURE_ARGS+= --with-dir-group=${BACULA_GROUP} 21CONFIGURE_ARGS+= --with-dir-group=${BACULA_GROUP}
22CONFIGURE_ARGS+= --with-dir-user=${BACULA_DIR_USER} 22CONFIGURE_ARGS+= --with-dir-user=${BACULA_DIR_USER}
23CONFIGURE_ARGS+= --with-sd-group=${BACULA_GROUP} 23CONFIGURE_ARGS+= --with-sd-group=${BACULA_GROUP}
24CONFIGURE_ARGS+= --with-sd-user=${BACULA_SD_USER} 24CONFIGURE_ARGS+= --with-sd-user=${BACULA_SD_USER}
25 25
26OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} ${ROOT_USER} ${BACULA_GROUP} 770 26OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} ${ROOT_USER} ${BACULA_GROUP} 770
27 27
28PKG_USERS= ${BACULA_DIR_USER}:${BACULA_GROUP} 28PKG_USERS= ${BACULA_DIR_USER}:${BACULA_GROUP}
29PKG_USERS+= ${BACULA_SD_USER}:${BACULA_GROUP} 29PKG_USERS+= ${BACULA_SD_USER}:${BACULA_GROUP}
30PKG_GROUPS= ${BACULA_GROUP} 30PKG_GROUPS= ${BACULA_GROUP}
31USERGROUP_PHASE= pre-install 
32 31
33CONF_FILES+= ${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf 32CONF_FILES+= ${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf
34CONF_FILES+= ${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf 33CONF_FILES+= ${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf
35CONF_FILES+= ${EXAMPLESDIR}/bacula-dir.conf ${PKG_SYSCONFDIR}/bacula-dir.conf 34CONF_FILES+= ${EXAMPLESDIR}/bacula-dir.conf ${PKG_SYSCONFDIR}/bacula-dir.conf
36CONF_FILES+= ${EXAMPLESDIR}/bacula-sd.conf ${PKG_SYSCONFDIR}/bacula-sd.conf 35CONF_FILES+= ${EXAMPLESDIR}/bacula-sd.conf ${PKG_SYSCONFDIR}/bacula-sd.conf
37 36
38RCD_SCRIPTS= bacula bacula-dir bacula-sd bacula-fd 37RCD_SCRIPTS= bacula bacula-dir bacula-sd bacula-fd
39 38
40REPLACE_PERL+= src/cats/make_catalog_backup.pl.in 39REPLACE_PERL+= src/cats/make_catalog_backup.pl.in
41 40
42.include "Makefile.common" 41.include "Makefile.common"
43 42
44post-install: 43post-install:
45 ${INSTALL_DATA} ${WRKSRC}/scripts/dvd-handler ${DESTDIR}${EXAMPLESDIR} 
46 ${INSTALL_SCRIPT} ${FILESDIR}/chio-changer \ 44 ${INSTALL_SCRIPT} ${FILESDIR}/chio-changer \
47 ${DESTDIR}${PREFIX}/libexec/bacula/ 45 ${DESTDIR}${PREFIX}/libexec/bacula/
48 46
49.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/bacula/PLIST.common (expand / switch to unified diff)

--- pkgsrc/sysutils/bacula/PLIST.common 2012/10/25 21:45:27 1.15
+++ pkgsrc/sysutils/bacula/PLIST.common 2013/04/25 20:41:33 1.16
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1@comment $NetBSD: PLIST.common,v 1.15 2012/10/25 21:45:27 christos Exp $ 1@comment $NetBSD: PLIST.common,v 1.16 2013/04/25 20:41:33 shattered Exp $
2lib/bpipe-fd.la 2lib/bpipe-fd.la
3lib/libbac.la 3lib/libbac.la
4lib/libbaccfg.la 4lib/libbaccfg.la
5lib/libbacfind.la 5lib/libbacfind.la
6lib/libbacpy.la 6lib/libbacpy.la
7libexec/bacula/bacula 7libexec/bacula/bacula
8libexec/bacula/bacula-ctl-dir 8libexec/bacula/bacula-ctl-dir
9libexec/bacula/bacula-ctl-fd 9libexec/bacula/bacula-ctl-fd
10libexec/bacula/bacula-ctl-sd 10libexec/bacula/bacula-ctl-sd
11libexec/bacula/bacula_config 11libexec/bacula/bacula_config
12libexec/bacula/bconsole 12libexec/bacula/bconsole
13libexec/bacula/btraceback.dbx 13libexec/bacula/btraceback.dbx
14libexec/bacula/btraceback.gdb 14libexec/bacula/btraceback.gdb
15libexec/bacula/btraceback.mdb 15libexec/bacula/btraceback.mdb
16libexec/bacula/disk-changer 16libexec/bacula/disk-changer
17libexec/bacula/mtx-changer 17libexec/bacula/mtx-changer
18libexec/bacula/mtx-changer.conf 18libexec/bacula/mtx-changer.conf
 19libexec/bacula/query.sql
19man/man1/bacula-bwxconsole.1 20man/man1/bacula-bwxconsole.1
20man/man1/bacula-tray-monitor.1 21man/man1/bacula-tray-monitor.1
21man/man1/bat.1 22man/man1/bat.1
22man/man1/bsmtp.1 23man/man1/bsmtp.1
23man/man8/bacula-dir.8 24man/man8/bacula-dir.8
24man/man8/bacula-fd.8 25man/man8/bacula-fd.8
25man/man8/bacula-sd.8 26man/man8/bacula-sd.8
26man/man8/bacula.8 27man/man8/bacula.8
27man/man8/bconsole.8 28man/man8/bconsole.8
28man/man8/bcopy.8 29man/man8/bcopy.8
29man/man8/bextract.8 30man/man8/bextract.8
30man/man8/bls.8 31man/man8/bls.8
31man/man8/bregex.8 32man/man8/bregex.8
@@ -39,15 +40,14 @@ sbin/bacula-fd @@ -39,15 +40,14 @@ sbin/bacula-fd
39sbin/bconsole 40sbin/bconsole
40sbin/btraceback 41sbin/btraceback
41${STATIC}sbin/static-bacula-fd 42${STATIC}sbin/static-bacula-fd
42${STATIC}sbin/static-bconsole 43${STATIC}sbin/static-bconsole
43share/doc/bacula/ChangeLog 44share/doc/bacula/ChangeLog
44share/doc/bacula/INSTALL 45share/doc/bacula/INSTALL
45share/doc/bacula/LICENSE 46share/doc/bacula/LICENSE
46share/doc/bacula/README 47share/doc/bacula/README
47share/doc/bacula/ReleaseNotes 48share/doc/bacula/ReleaseNotes
48share/doc/bacula/VERIFYING 49share/doc/bacula/VERIFYING
49share/doc/bacula/technotes 50share/doc/bacula/technotes
50share/examples/bacula/bacula-fd.conf 51share/examples/bacula/bacula-fd.conf
51share/examples/bacula/bconsole.conf 52share/examples/bacula/bconsole.conf
52share/examples/bacula/dvd-handler 
53share/examples/rc.d/bacula-fd 53share/examples/rc.d/bacula-fd
cvs diff -r1.10 -r1.11 pkgsrc/sysutils/bacula/PLIST.server (expand / switch to unified diff)

--- pkgsrc/sysutils/bacula/PLIST.server 2013/01/04 23:25:49 1.10
+++ pkgsrc/sysutils/bacula/PLIST.server 2013/04/25 20:41:33 1.11
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1@comment $NetBSD: PLIST.server,v 1.10 2013/01/04 23:25:49 dholland Exp $ 1@comment $NetBSD: PLIST.server,v 1.11 2013/04/25 20:41:33 shattered Exp $
2lib/libbaccats.la 2lib/libbaccats.la
3lib/libbaccats-${BACULA_DB}.la 3lib/libbaccats-${BACULA_DB}.la
4lib/libbacsql.la 4lib/libbacsql.la
5libexec/bacula/chio-changer 5libexec/bacula/chio-changer
6libexec/bacula/create_${BACULA_DB}_database 6libexec/bacula/create_${BACULA_DB}_database
7libexec/bacula/create_bacula_database 7libexec/bacula/create_bacula_database
8libexec/bacula/delete_catalog_backup 8libexec/bacula/delete_catalog_backup
9libexec/bacula/drop_${BACULA_DB}_database 9libexec/bacula/drop_${BACULA_DB}_database
10libexec/bacula/drop_${BACULA_DB}_tables 10libexec/bacula/drop_${BACULA_DB}_tables
11libexec/bacula/drop_bacula_database 11libexec/bacula/drop_bacula_database
12libexec/bacula/drop_bacula_tables 12libexec/bacula/drop_bacula_tables
13libexec/bacula/grant_${BACULA_DB}_privileges 13libexec/bacula/grant_${BACULA_DB}_privileges
14libexec/bacula/grant_bacula_privileges 14libexec/bacula/grant_bacula_privileges
15libexec/bacula/make_${BACULA_DB}_tables 15libexec/bacula/make_${BACULA_DB}_tables
16libexec/bacula/make_bacula_tables 16libexec/bacula/make_bacula_tables
17libexec/bacula/make_catalog_backup 17libexec/bacula/make_catalog_backup
18libexec/bacula/make_catalog_backup.pl 18libexec/bacula/make_catalog_backup.pl
19libexec/bacula/query.sql 
20libexec/bacula/update_${BACULA_DB}_tables 19libexec/bacula/update_${BACULA_DB}_tables
21libexec/bacula/update_bacula_tables 20libexec/bacula/update_bacula_tables
22sbin/bacula-dir 21sbin/bacula-dir
23sbin/bacula-sd 22sbin/bacula-sd
24sbin/bcopy 23sbin/bcopy
25sbin/bextract 24sbin/bextract
26sbin/bls 25sbin/bls
27sbin/bregex 26sbin/bregex
28sbin/bscan 27sbin/bscan
29sbin/bsmtp 28sbin/bsmtp
30sbin/btape 29sbin/btape
31sbin/bwild 30sbin/bwild
32sbin/dbcheck 31sbin/dbcheck
cvs diff -r1.21 -r1.22 pkgsrc/sysutils/bacula-clientonly/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/bacula-clientonly/Makefile 2013/02/06 23:23:47 1.21
+++ pkgsrc/sysutils/bacula-clientonly/Makefile 2013/04/25 20:41:33 1.22
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.21 2013/02/06 23:23:47 jperkin Exp $ 1# $NetBSD: Makefile,v 1.22 2013/04/25 20:41:33 shattered Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-clientonly-/} 3PKGNAME= ${DISTNAME:S/-/-clientonly-/}
4COMMENT= The Network Backup Solution (client only) 4COMMENT= The Network Backup Solution (client only)
5 5
6PKGREVISION= 1 6PKGREVISION= 2
7 7
8CONFLICTS= bacula-[0-9]* bacula-client-[0-9]* 8CONFLICTS= bacula-[0-9]* bacula-client-[0-9]*
9 9
10DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo
11PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches 11PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches
12FILESDIR= ${.CURDIR}/../../sysutils/bacula/files 12FILESDIR= ${.CURDIR}/../../sysutils/bacula/files
13 13
14PLIST_SRC= ${.CURDIR}/../../sysutils/bacula/PLIST.common 14PLIST_SRC= ${.CURDIR}/../../sysutils/bacula/PLIST.common
15 15
16CONFIGURE_ARGS+= --enable-client-only 16CONFIGURE_ARGS+= --enable-client-only
17 17
18OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770 18OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770
19 19
20PKG_GROUPS= ${BACULA_GROUP} 20PKG_GROUPS= ${BACULA_GROUP}
21 21
22CONF_FILES+= ${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf 22CONF_FILES+= ${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf
23CONF_FILES+= ${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf 23CONF_FILES+= ${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf
24 24
25RCD_SCRIPTS= bacula-fd 25RCD_SCRIPTS= bacula-fd
26 26
27.include "../../sysutils/bacula/Makefile.common" 27.include "../../sysutils/bacula/Makefile.common"
28 28
29post-install: 29post-install:
30 ${INSTALL_DATA} ${WRKSRC}/scripts/dvd-handler ${DESTDIR}${EXAMPLESDIR} 30 ${INSTALL_DATA} ${WRKSRC}/src/dird/query.sql ${DESTDIR}${PREFIX}/libexec/bacula/query.sql
31 31
32.include "options.mk" 32.include "options.mk"
33 33
34.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"