Upgrade the bacula and bacula-* packages to bacula 2.0.0. This is a major

update so the release notes are very long.  Please refer to the website or
the distfile for detailed release notes.
The most important upgrade remarks are included in the MESSAGE file.

As I'm not using bacula myself anymore, I won't be able to support PR's, so
drop maintainership (though I will continue keeping bacula up-to-date if no
one else takes over maintainership).

5 files changed, 53 insertions, 26 deletions

diff --git a/sysutils/bacula/MESSAGE b/sysutils/bacula/MESSAGE
index c57ed62e1f5..5923daf02c3 100644
--- a/sysutils/bacula/MESSAGE
+++ b/sysutils/bacula/MESSAGE
@@ -1,13 +1,18 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/11/22 18:35:25 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2007/01/04 12:29:26 ghen Exp $
 
 You can find some useful scripts to create, update and drop the necessary
 databases, privileges and tables in ${PREFIX}/libexec/bacula/.
 
-If you're upgrading to ${PKGNAME_NOREV} from 1.36.x or earlier, you MUST either
+If you're upgrading to ${PKGNAME_NOREV} from 1.38.x or earlier, you MUST
 recreate your catalog database or upgrade your old database using the
-${PREFIX}/libexec/bacula/upgrade_bacula_tables script.
+${PREFIX}/libexec/bacula/update_bacula_tables script.  Later updates will
+not require upgrading the database again.
 
-Also you can not use an older file daemon with the newer director daemon,
-so you must upgrade any bacula-clientonly installations as well.
+The director and storage daemon systems must be upgraded simultaneously,
+but you should be able to use a 1.38.x file daemon with a version 2.0.0
+director and storage daemon if you do not use any of the new features.
+
+Please read the full ${PKGNAME_NOREV} release notes for other important
+remarks.
 ===========================================================================
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 3af7f17e211..5c4ffeb0502 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.33 2006/10/09 14:20:28 ghen Exp $
+# $NetBSD: Makefile.common,v 1.34 2007/01/04 12:29:26 ghen Exp $
 
-DISTNAME=		bacula-1.38.11
+DISTNAME=		bacula-2.0.0
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 
-MAINTAINER=		ghen@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.bacula.org/
 COMMENT?=		The Network Backup Solution
 
diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common
index a5a07def843..bde87d66c94 100644
--- a/sysutils/bacula/PLIST.common
+++ b/sysutils/bacula/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2006/03/29 21:44:41 ghen Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2007/01/04 12:29:26 ghen Exp $
 libexec/bacula/bacula
 libexec/bacula/bacula-ctl-dir
 libexec/bacula/bacula-ctl-fd
@@ -12,7 +12,22 @@ libexec/bacula/gconsole
 libexec/bacula/mtx-changer
 libexec/bacula/startmysql
 libexec/bacula/stopmysql
+man/man1/bacula-console-gnome.1
+man/man1/bacula-tray-monitor.1
+man/man1/bacula-wxconsole.1
+man/man1/bsmtp.1
+man/man8/bacula-dir.8
+man/man8/bacula-fd.8
+man/man8/bacula-sd.8
 man/man8/bacula.8
+man/man8/bconsole.8
+man/man8/bcopy.8
+man/man8/bextract.8
+man/man8/bls.8
+man/man8/bscan.8
+man/man8/btape.8
+man/man8/btraceback.8
+man/man8/dbcheck.8
 sbin/bacula-fd
 sbin/bconsole
 sbin/btraceback
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 01e70423610..402a62373d2 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2006/10/09 14:20:28 ghen Exp $
+$NetBSD: distinfo,v 1.19 2007/01/04 12:29:26 ghen Exp $
 
-SHA1 (bacula-1.38.11.tar.gz) = 223fb5f41b4eae934f0d98c17115ad609c0f6f16
-RMD160 (bacula-1.38.11.tar.gz) = 52b2f25728ce33533402b2f17277723977497a93
-Size (bacula-1.38.11.tar.gz) = 2078095 bytes
+SHA1 (bacula-2.0.0.tar.gz) = 591093bda74d6d8e48d93926610f4f0fd64e61a1
+RMD160 (bacula-2.0.0.tar.gz) = 6f8ae1980455541ac7db2099f3be81a074b1c906
+Size (bacula-2.0.0.tar.gz) = 2488471 bytes
 SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599
 SHA1 (patch-ac) = 585f8a00fe7c0e6e8e4c0b91a0bd32bd2fb81c81
 SHA1 (patch-ae) = 69db6d396bd1654b3065d693c5ea2c0afbb8bc61
@@ -10,4 +10,4 @@ SHA1 (patch-af) = 6ecbac39c156c81f30ba53b565f55ab5e876b3e0
 SHA1 (patch-ag) = 9e54b2bb207e9ea82326e48b8548ad03bf71fb8d
 SHA1 (patch-ah) = f084238634be75e6122bb4ec8c14ed68e24bddb4
 SHA1 (patch-ai) = 499a164fcf9e4fc466b691f91203b4293dcee7eb
-SHA1 (patch-aj) = ff1cdc149bcc1d960ddd24d0fa044fff69db165c
+SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0
diff --git a/sysutils/bacula/patches/patch-aj b/sysutils/bacula/patches/patch-aj
index f60ba08740c..853ded85feb 100644
--- a/sysutils/bacula/patches/patch-aj
+++ b/sysutils/bacula/patches/patch-aj
@@ -1,15 +1,22 @@
-$NetBSD: patch-aj,v 1.4 2006/03/29 21:44:41 ghen Exp $
+$NetBSD: patch-aj,v 1.5 2007/01/04 12:29:26 ghen Exp $
 
---- scripts/Makefile.in.orig	2006-03-29 15:44:01.000000000 +0200
-+++ scripts/Makefile.in
-@@ -61,9 +61,7 @@ install: installdirs
- 	chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
- 		   $(DESTDIR)$(scriptdir)/btraceback.dbx
- 	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
--	gzip <bacula.man >bacula.8.gz
--	$(INSTALL_DATA)   bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
--	@rm -f bacula.8.gz
-+	$(INSTALL_DATA)   bacula.man $(DESTDIR)$(mandir)/bacula.8
- 
+--- manpages/Makefile.in.orig	2006-08-27 20:30:56.000000000 +0200
++++ manpages/Makefile.in
+@@ -20,15 +20,11 @@ depend:
+ install:
+ 	$(MKDIR) $(DESTDIR)/$(mandir)/man8
+ 	for I in ${MAN8}; \
+-	  do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
+-	     $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \
+-	     rm -f $$I.gz); \
++	  do $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \
+ 	done
+ 	$(MKDIR) $(DESTDIR)/$(mandir)/man1
+ 	for I in ${MAN1}; \
+-	  do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
+-	     $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \
+-	     rm -f $$I.gz); \
++	  do $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \
+ 	done
  
  uninstall: