Changes 3.0.1:

* Bug fixes.
* Check for job_canceled() in fd_plugin code.
* Update Win32 table creation to have new DB version 11 format
* Remove illegal Options in Exclude of default Win32/64 bacula-dir.conf
* Remove "Reposition" message when restoring
* Update projects file
* Modify insertion of read Volumes in SD to be done before the
  drive reservation. This ensures that a Volume to be read will not
  be reserved for writing. Significant enhancement.

Changes 3.0.0:
* Fix Win32 make clean to clean correctly
* Separate object/binaries in Win32 and Win64 builds. More to be done.
* Add bconsole to Win64 installer.
* Enhance Job messages from SD when the FD->SD protocol is incorrect
  and the SD hangs up. Previously this looked like a comm error.
* Fixed problem in xattr and acl code trying to send empty acl or xattr
  streams.
* Fix for bug #1261 where we send out a null stream when a file only an
  acl and xattr support is also turned on.
* Added some warnings to configure when using libtool and static in
  one configure.
* Fix small memory leak in fileregexp bsr code
* Correct bacula32.def entry point as specified by James.
* Add code to FD plugin driver to make a copy of the plugin
  filename to be saved to avoid save_file from zaping it.
* Directly mark all files saved by plugin as being seen for Accurate.
* more...

5 files changed, 641 insertions, 191 deletions

diff --git a/sysutils/bacula-doc/Makefile b/sysutils/bacula-doc/Makefile
index 5985fa072aa..ca4fdb83888 100644
--- a/sysutils/bacula-doc/Makefile
+++ b/sysutils/bacula-doc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2009/01/06 11:29:26 adam Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/15 10:29:06 adam Exp $
 
-DISTNAME=		bacula-docs-2.4.4
+DISTNAME=		bacula-docs-3.0.1
 PKGNAME=		${DISTNAME:S/docs/doc/}
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -17,12 +17,22 @@ NO_BUILD=		yes
 
 DOCDIR=			share/doc/bacula
 
-INSTALLATION_DIRS=	${DOCDIR} ${DOCDIR}/manual
+INSTALLATION_DIRS=	${DOCDIR}
+INSTALLATION_DIRS+=	${DOCDIR}/catalog
+INSTALLATION_DIRS+=	${DOCDIR}/concepts
+INSTALLATION_DIRS+=	${DOCDIR}/console
+INSTALLATION_DIRS+=	${DOCDIR}/developers
+INSTALLATION_DIRS+=	${DOCDIR}/install
+INSTALLATION_DIRS+=	${DOCDIR}/problems
+INSTALLATION_DIRS+=	${DOCDIR}/utility
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/manual/
-	${INSTALL_DATA} ${WRKSRC}/manual/bacula/bacula.css  ${DESTDIR}${PREFIX}/${DOCDIR}/manual/
-	${INSTALL_DATA} ${WRKSRC}/manual/bacula/*.png  ${DESTDIR}${PREFIX}/${DOCDIR}/manual/
-	${INSTALL_DATA} ${WRKSRC}/manual/bacula.pdf  ${DESTDIR}${PREFIX}/${DOCDIR}/manual.pdf
+	${INSTALL_DATA} ${WRKSRC}/manuals/en/catalog/catalog/* ${DESTDIR}${PREFIX}/${DOCDIR}/catalog/
+	${INSTALL_DATA} ${WRKSRC}/manuals/en/concepts/concepts/* ${DESTDIR}${PREFIX}/${DOCDIR}/concepts/
+	${INSTALL_DATA} ${WRKSRC}/manuals/en/console/console/* ${DESTDIR}${PREFIX}/${DOCDIR}/console/
+	${INSTALL_DATA} ${WRKSRC}/manuals/en/developers/developers/* ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
+	${INSTALL_DATA} ${WRKSRC}/manuals/en/install/install/* ${DESTDIR}${PREFIX}/${DOCDIR}/install/
+	${INSTALL_DATA} ${WRKSRC}/manuals/en/problems/problems/* ${DESTDIR}${PREFIX}/${DOCDIR}/problems/
+	${INSTALL_DATA} ${WRKSRC}/manuals/en/utility/utility/* ${DESTDIR}${PREFIX}/${DOCDIR}/utility/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula-doc/PLIST b/sysutils/bacula-doc/PLIST
index a5c0591613f..e53087e69f2 100644
--- a/sysutils/bacula-doc/PLIST
+++ b/sysutils/bacula-doc/PLIST
@@ -1,125 +1,621 @@
-@comment $NetBSD: PLIST,v 1.4 2009/01/06 11:29:26 adam Exp $
-share/doc/bacula/manual.pdf
-share/doc/bacula/manual/ANSI_IBM_Tape_Labels.html
-share/doc/bacula/manual/About_this_document.html
-share/doc/bacula/manual/Autochanger_Resource.html
-share/doc/bacula/manual/Autochanger_Resource1.html
-share/doc/bacula/manual/Autochanger_Support.html
-share/doc/bacula/manual/Automated_Disk_Backup.html
-share/doc/bacula/manual/Automatic_Volume_Recycling.html
-share/doc/bacula/manual/Backup_Strategies.html
-share/doc/bacula/manual/Bacula-tray-monitor.png
-share/doc/bacula/manual/Bacula_Console.html
-share/doc/bacula/manual/Bacula_Copyri_Tradem_Licens.html
-share/doc/bacula/manual/Bacula_Freque_Asked_Questi.html
-share/doc/bacula/manual/Bacula_Projects.html
-share/doc/bacula/manual/Bacula_RPM_Packaging_FAQ.html
-share/doc/bacula/manual/Bacula_Security_Issues.html
-share/doc/bacula/manual/Bacula_TLS_Communication.html
-share/doc/bacula/manual/Bacula_Users_Guide.html
-share/doc/bacula/manual/Basic_Volume_Management.html
-share/doc/bacula/manual/Bootstrap_File.html
-share/doc/bacula/manual/Brief_Tutorial.html
-share/doc/bacula/manual/Catalog_Maintenance.html
-share/doc/bacula/manual/Client_Fi_daemon_Configura.html
-share/doc/bacula/manual/Conf-Diagram.png
-share/doc/bacula/manual/Configuring_Director.html
-share/doc/bacula/manual/Console_Configuration.html
-share/doc/bacula/manual/Console_Index.html
-share/doc/bacula/manual/Contents.html
-share/doc/bacula/manual/Critic_Items_Implem_Before.html
-share/doc/bacula/manual/Current_State_Bacula.html
-share/doc/bacula/manual/Customizin_Configurat_Files.html
-share/doc/bacula/manual/DVD_Volumes.html
-share/doc/bacula/manual/Data_Encryption.html
-share/doc/bacula/manual/Data_Spooling.html
-share/doc/bacula/manual/Dealing_with_Firewalls.html
-share/doc/bacula/manual/Director_Index.html
-share/doc/bacula/manual/Disast_Recove_Using_Bacula.html
-share/doc/bacula/manual/File_Daemon_Index.html
-share/doc/bacula/manual/GNU_Free_Documentat_License.html
-share/doc/bacula/manual/GUI_Programs.html
-share/doc/bacula/manual/General_Index.html
-share/doc/bacula/manual/Getting_Started_with_Bacula.html
-share/doc/bacula/manual/Installi_Configur_PostgreS.html
-share/doc/bacula/manual/Installin_Configuri_SQLite.html
-share/doc/bacula/manual/Installing_Bacula.html
-share/doc/bacula/manual/Installing_Configurin_MySQL.html
-share/doc/bacula/manual/List_Figures.html
-share/doc/bacula/manual/List_Tables.html
-share/doc/bacula/manual/Messages_Resource.html
-share/doc/bacula/manual/Migration.html
-share/doc/bacula/manual/Monitor_Configuration.html
-share/doc/bacula/manual/Python_Scripting.html
-share/doc/bacula/manual/Restore_Command.html
-share/doc/bacula/manual/Storage_Daemon_Configuratio.html
-share/doc/bacula/manual/Storage_Daemon_Index.html
-share/doc/bacula/manual/Supported_Autochangers.html
-share/doc/bacula/manual/Supported_Operating_Systems.html
-share/doc/bacula/manual/Supported_Tape_Drives.html
-share/doc/bacula/manual/System_Requirements.html
-share/doc/bacula/manual/Testing_Your_Tape_Drive.html
-share/doc/bacula/manual/Thanks.html
-share/doc/bacula/manual/Tips_Suggestions.html
-share/doc/bacula/manual/Using_Bacula_Improv_Comput.html
-share/doc/bacula/manual/Using_Stunne_Encryp_Commun.html
-share/doc/bacula/manual/Variable_Expansion.html
-share/doc/bacula/manual/Volume_Utility_Tools.html
-share/doc/bacula/manual/What_Do_When_Bacula.html
-share/doc/bacula/manual/What_is_Bacula.html
-share/doc/bacula/manual/Windows_Version_Bacula.html
-share/doc/bacula/manual/access-is-denied.png
-share/doc/bacula/manual/back.png
-share/doc/bacula/manual/bacula-applications.png
-share/doc/bacula/manual/bacula-logo.png
-share/doc/bacula/manual/bacula-objects.png
-share/doc/bacula/manual/bacula.css
-share/doc/bacula/manual/bat_icon.png
-share/doc/bacula/manual/bclogo.png
-share/doc/bacula/manual/bimagemgr1.png
-share/doc/bacula/manual/bimagemgr2.png
-share/doc/bacula/manual/bimagemgr3.png
-share/doc/bacula/manual/bweb-index.png
-share/doc/bacula/manual/bweb-report.png
-share/doc/bacula/manual/confirm.png
-share/doc/bacula/manual/contents.png
-share/doc/bacula/manual/error.png
-share/doc/bacula/manual/faq.html
-share/doc/bacula/manual/file.png
-share/doc/bacula/manual/flow.png
-share/doc/bacula/manual/home.png
-share/doc/bacula/manual/idle.png
-share/doc/bacula/manual/index.html
-share/doc/bacula/manual/index.png
-share/doc/bacula/manual/md5.png
-share/doc/bacula/manual/menu.png
-share/doc/bacula/manual/next.png
-share/doc/bacula/manual/next_g.png
-share/doc/bacula/manual/philosophical-gnu-sm.png
-share/doc/bacula/manual/prev.png
-share/doc/bacula/manual/prev_g.png
-share/doc/bacula/manual/properties-security-advanced-owner.png
-share/doc/bacula/manual/properties-security.png
-share/doc/bacula/manual/running.png
-share/doc/bacula/manual/smartall.png
-share/doc/bacula/manual/thanks.png
-share/doc/bacula/manual/tray-icon.png
-share/doc/bacula/manual/up.png
-share/doc/bacula/manual/up_g.png
-share/doc/bacula/manual/view-only.png
-share/doc/bacula/manual/win32-config.png
-share/doc/bacula/manual/win32-finish.png
-share/doc/bacula/manual/win32-installation-type.png
-share/doc/bacula/manual/win32-installing.png
-share/doc/bacula/manual/win32-location.png
-share/doc/bacula/manual/win32-menu.png
-share/doc/bacula/manual/win32-nsis.png
-share/doc/bacula/manual/win32-pkg.png
-share/doc/bacula/manual/win32-service-ok.png
-share/doc/bacula/manual/win32-service.png
-share/doc/bacula/manual/win32-start.png
-share/doc/bacula/manual/win32-welcome.png
-share/doc/bacula/manual/wx-console-restore1.png
-share/doc/bacula/manual/wx-console-restore2.png
-@dirrm share/doc/bacula/manual
+@comment $NetBSD: PLIST,v 1.5 2009/05/15 10:29:06 adam Exp $
+share/doc/bacula/catalog/About_this_document.html
+share/doc/bacula/catalog/Bacula-tray-monitor.png
+share/doc/bacula/catalog/Bacula_Catalo_Databa_Guide.html
+share/doc/bacula/catalog/Catalog_Maintenance.html
+share/doc/bacula/catalog/Conf-Diagram.png
+share/doc/bacula/catalog/Contents.html
+share/doc/bacula/catalog/GNU_Free_Documentat_License.html
+share/doc/bacula/catalog/General_Index.html
+share/doc/bacula/catalog/Installi_Configur_PostgreS.html
+share/doc/bacula/catalog/Installin_Configuri_SQLite.html
+share/doc/bacula/catalog/Installing_Configurin_MySQL.html
+share/doc/bacula/catalog/List_Figures.html
+share/doc/bacula/catalog/List_Tables.html
+share/doc/bacula/catalog/access-is-denied.png
+share/doc/bacula/catalog/back.png
+share/doc/bacula/catalog/bacula-applications.png
+share/doc/bacula/catalog/bacula-logo.png
+share/doc/bacula/catalog/bacula-objects.png
+share/doc/bacula/catalog/bat_icon.png
+share/doc/bacula/catalog/bclogo.png
+share/doc/bacula/catalog/bimagemgr1.png
+share/doc/bacula/catalog/bimagemgr2.png
+share/doc/bacula/catalog/bimagemgr3.png
+share/doc/bacula/catalog/bweb-index.png
+share/doc/bacula/catalog/bweb-report.png
+share/doc/bacula/catalog/catalog.css
+share/doc/bacula/catalog/confirm.png
+share/doc/bacula/catalog/contents.png
+share/doc/bacula/catalog/different_time.png
+share/doc/bacula/catalog/error.png
+share/doc/bacula/catalog/file.png
+share/doc/bacula/catalog/flow.png
+share/doc/bacula/catalog/home.png
+share/doc/bacula/catalog/idle.png
+share/doc/bacula/catalog/imagename_translations
+share/doc/bacula/catalog/images.idx
+share/doc/bacula/catalog/images.pl
+share/doc/bacula/catalog/images.tex
+share/doc/bacula/catalog/index.html
+share/doc/bacula/catalog/index.png
+share/doc/bacula/catalog/internal_database_is_not.html
+share/doc/bacula/catalog/internals.pl
+share/doc/bacula/catalog/labels.pl
+share/doc/bacula/catalog/md5.png
+share/doc/bacula/catalog/menu.png
+share/doc/bacula/catalog/next.png
+share/doc/bacula/catalog/next_g.png
+share/doc/bacula/catalog/philosophical-gnu-sm.png
+share/doc/bacula/catalog/prev.png
+share/doc/bacula/catalog/prev_g.png
+share/doc/bacula/catalog/properties-security-advanced-owner.png
+share/doc/bacula/catalog/properties-security.png
+share/doc/bacula/catalog/running.png
+share/doc/bacula/catalog/smartall.png
+share/doc/bacula/catalog/thanks.png
+share/doc/bacula/catalog/tray-icon.png
+share/doc/bacula/catalog/up.png
+share/doc/bacula/catalog/up_g.png
+share/doc/bacula/catalog/view-only.png
+share/doc/bacula/catalog/win32-config.png
+share/doc/bacula/catalog/win32-finish.png
+share/doc/bacula/catalog/win32-installation-type.png
+share/doc/bacula/catalog/win32-installing.png
+share/doc/bacula/catalog/win32-location.png
+share/doc/bacula/catalog/win32-menu.png
+share/doc/bacula/catalog/win32-nsis.png
+share/doc/bacula/catalog/win32-pkg.png
+share/doc/bacula/catalog/win32-service-ok.png
+share/doc/bacula/catalog/win32-service.png
+share/doc/bacula/catalog/win32-start.png
+share/doc/bacula/catalog/win32-welcome.png
+share/doc/bacula/catalog/wx-console-restore1.png
+share/doc/bacula/catalog/wx-console-restore2.png
+share/doc/bacula/concepts/ANSI_IBM_Tape_Labels.html
+share/doc/bacula/concepts/About_this_document.html
+share/doc/bacula/concepts/Autochanger_Resource.html
+share/doc/bacula/concepts/Autochanger_Support.html
+share/doc/bacula/concepts/Automated_Disk_Backup.html
+share/doc/bacula/concepts/Automatic_Volume_Recycling.html
+share/doc/bacula/concepts/Backup_Strategies.html
+share/doc/bacula/concepts/Bacula-tray-monitor.png
+share/doc/bacula/concepts/Bacula_Concep_Overvi_Guide.html
+share/doc/bacula/concepts/Bacula_Copyri_Tradem_Licens.html
+share/doc/bacula/concepts/Bacula_FD_Plugin_API.html
+share/doc/bacula/concepts/Bacula_Projects.html
+share/doc/bacula/concepts/Bacula_TLS_Communication.html
+share/doc/bacula/concepts/Basic_Volume_Management.html
+share/doc/bacula/concepts/Bootstrap_File.html
+share/doc/bacula/concepts/Brief_Tutorial.html
+share/doc/bacula/concepts/Conf-Diagram.png
+share/doc/bacula/concepts/Console_Index.html
+share/doc/bacula/concepts/Contents.html
+share/doc/bacula/concepts/Current_State_Bacula.html
+share/doc/bacula/concepts/DVD_Volumes.html
+share/doc/bacula/concepts/Data_Encryption.html
+share/doc/bacula/concepts/Data_Spooling.html
+share/doc/bacula/concepts/Director_Index.html
+share/doc/bacula/concepts/Disast_Recove_Using_Bacula.html
+share/doc/bacula/concepts/File_Daemon_Index.html
+share/doc/bacula/concepts/GNU_Free_Documentat_License.html
+share/doc/bacula/concepts/General_Index.html
+share/doc/bacula/concepts/List_Figures.html
+share/doc/bacula/concepts/List_Tables.html
+share/doc/bacula/concepts/Migration_Copy.html
+share/doc/bacula/concepts/New_Features.html
+share/doc/bacula/concepts/Python_Scripting.html
+share/doc/bacula/concepts/Restore_Command.html
+share/doc/bacula/concepts/Storage_Daemon_Index.html
+share/doc/bacula/concepts/Supported_Autochangers.html
+share/doc/bacula/concepts/Supported_Operating_Systems.html
+share/doc/bacula/concepts/Supported_Tape_Drives.html
+share/doc/bacula/concepts/System_Requirements.html
+share/doc/bacula/concepts/Thanks.html
+share/doc/bacula/concepts/Using_Bacula_Improv_Comput.html
+share/doc/bacula/concepts/Using_Bacula_catalog_grab.html
+share/doc/bacula/concepts/Using_Stunne_Encryp_Commun.html
+share/doc/bacula/concepts/Variable_Expansion.html
+share/doc/bacula/concepts/What_is_Bacula.html
+share/doc/bacula/concepts/Windows_Version_Bacula.html
+share/doc/bacula/concepts/access-is-denied.png
+share/doc/bacula/concepts/back.png
+share/doc/bacula/concepts/bacula-applications.png
+share/doc/bacula/concepts/bacula-logo.png
+share/doc/bacula/concepts/bacula-objects.png
+share/doc/bacula/concepts/bat_icon.png
+share/doc/bacula/concepts/bclogo.png
+share/doc/bacula/concepts/bimagemgr1.png
+share/doc/bacula/concepts/bimagemgr2.png
+share/doc/bacula/concepts/bimagemgr3.png
+share/doc/bacula/concepts/bweb-index.png
+share/doc/bacula/concepts/bweb-report.png
+share/doc/bacula/concepts/concepts.css
+share/doc/bacula/concepts/confirm.png
+share/doc/bacula/concepts/contents.png
+share/doc/bacula/concepts/different_time.png
+share/doc/bacula/concepts/error.png
+share/doc/bacula/concepts/file.png
+share/doc/bacula/concepts/flow.png
+share/doc/bacula/concepts/home.png
+share/doc/bacula/concepts/idle.png
+share/doc/bacula/concepts/imagename_translations
+share/doc/bacula/concepts/images.idx
+share/doc/bacula/concepts/images.pl
+share/doc/bacula/concepts/images.tex
+share/doc/bacula/concepts/img1.png
+share/doc/bacula/concepts/index.html
+share/doc/bacula/concepts/index.png
+share/doc/bacula/concepts/internals.pl
+share/doc/bacula/concepts/labels.pl
+share/doc/bacula/concepts/md5.png
+share/doc/bacula/concepts/menu.png
+share/doc/bacula/concepts/next.png
+share/doc/bacula/concepts/next_g.png
+share/doc/bacula/concepts/philosophical-gnu-sm.png
+share/doc/bacula/concepts/prev.png
+share/doc/bacula/concepts/prev_g.png
+share/doc/bacula/concepts/properties-security-advanced-owner.png
+share/doc/bacula/concepts/properties-security.png
+share/doc/bacula/concepts/running.png
+share/doc/bacula/concepts/smartall.png
+share/doc/bacula/concepts/thanks.png
+share/doc/bacula/concepts/tray-icon.png
+share/doc/bacula/concepts/up.png
+share/doc/bacula/concepts/up_g.png
+share/doc/bacula/concepts/view-only.png
+share/doc/bacula/concepts/win32-config.png
+share/doc/bacula/concepts/win32-finish.png
+share/doc/bacula/concepts/win32-installation-type.png
+share/doc/bacula/concepts/win32-installing.png
+share/doc/bacula/concepts/win32-location.png
+share/doc/bacula/concepts/win32-menu.png
+share/doc/bacula/concepts/win32-nsis.png
+share/doc/bacula/concepts/win32-pkg.png
+share/doc/bacula/concepts/win32-service-ok.png
+share/doc/bacula/concepts/win32-service.png
+share/doc/bacula/concepts/win32-start.png
+share/doc/bacula/concepts/win32-welcome.png
+share/doc/bacula/concepts/wx-console-restore1.png
+share/doc/bacula/concepts/wx-console-restore2.png
+share/doc/bacula/console/About_this_document.html
+share/doc/bacula/console/Bacula-tray-monitor.png
+share/doc/bacula/console/Bacula_Consol_Operat_Guide.html
+share/doc/bacula/console/Bacula_Console.html
+share/doc/bacula/console/Conf-Diagram.png
+share/doc/bacula/console/Contents.html
+share/doc/bacula/console/GNU_Free_Documentat_License.html
+share/doc/bacula/console/GUI_Programs.html
+share/doc/bacula/console/General_Index.html
+share/doc/bacula/console/List_Figures.html
+share/doc/bacula/console/List_Tables.html
+share/doc/bacula/console/access-is-denied.png
+share/doc/bacula/console/back.png
+share/doc/bacula/console/bacula-applications.png
+share/doc/bacula/console/bacula-logo.png
+share/doc/bacula/console/bacula-objects.png
+share/doc/bacula/console/bat_icon.png
+share/doc/bacula/console/bclogo.png
+share/doc/bacula/console/bimagemgr1.png
+share/doc/bacula/console/bimagemgr2.png
+share/doc/bacula/console/bimagemgr3.png
+share/doc/bacula/console/bweb-index.png
+share/doc/bacula/console/bweb-report.png
+share/doc/bacula/console/confirm.png
+share/doc/bacula/console/console.css
+share/doc/bacula/console/contents.png
+share/doc/bacula/console/different_time.png
+share/doc/bacula/console/error.png
+share/doc/bacula/console/file.png
+share/doc/bacula/console/flow.png
+share/doc/bacula/console/home.png
+share/doc/bacula/console/idle.png
+share/doc/bacula/console/imagename_translations
+share/doc/bacula/console/images.idx
+share/doc/bacula/console/images.pl
+share/doc/bacula/console/images.tex
+share/doc/bacula/console/index.html
+share/doc/bacula/console/index.png
+share/doc/bacula/console/internals.pl
+share/doc/bacula/console/labels.pl
+share/doc/bacula/console/md5.png
+share/doc/bacula/console/menu.png
+share/doc/bacula/console/next.png
+share/doc/bacula/console/next_g.png
+share/doc/bacula/console/philosophical-gnu-sm.png
+share/doc/bacula/console/prev.png
+share/doc/bacula/console/prev_g.png
+share/doc/bacula/console/properties-security-advanced-owner.png
+share/doc/bacula/console/properties-security.png
+share/doc/bacula/console/running.png
+share/doc/bacula/console/smartall.png
+share/doc/bacula/console/thanks.png
+share/doc/bacula/console/tray-icon.png
+share/doc/bacula/console/up.png
+share/doc/bacula/console/up_g.png
+share/doc/bacula/console/view-only.png
+share/doc/bacula/console/win32-config.png
+share/doc/bacula/console/win32-finish.png
+share/doc/bacula/console/win32-installation-type.png
+share/doc/bacula/console/win32-installing.png
+share/doc/bacula/console/win32-location.png
+share/doc/bacula/console/win32-menu.png
+share/doc/bacula/console/win32-nsis.png
+share/doc/bacula/console/win32-pkg.png
+share/doc/bacula/console/win32-service-ok.png
+share/doc/bacula/console/win32-service.png
+share/doc/bacula/console/win32-start.png
+share/doc/bacula/console/win32-welcome.png
+share/doc/bacula/console/wx-console-restore1.png
+share/doc/bacula/console/wx-console-restore2.png
+share/doc/bacula/developers/About_this_document.html
+share/doc/bacula/developers/Additional_Error_informatio.html
+share/doc/bacula/developers/Authentication_Negotiation.html
+share/doc/bacula/developers/Bacula-tray-monitor.png
+share/doc/bacula/developers/Bacula_Code_Submiss_Project.html
+share/doc/bacula/developers/Bacula_Developer_Notes.html
+share/doc/bacula/developers/Bacula_MD5_Algorithm.html
+share/doc/bacula/developers/Bacula_Memory_Management.html
+share/doc/bacula/developers/Bacula_Porting_Notes.html
+share/doc/bacula/developers/Bacula_Regression_Testing.html
+share/doc/bacula/developers/Becoming_Server.html
+share/doc/bacula/developers/Block_Header.html
+share/doc/bacula/developers/Bnet_API_Changes.html
+share/doc/bacula/developers/Catalog_Services.html
+share/doc/bacula/developers/Comman_Receiv_from_Direct.html
+share/doc/bacula/developers/Comman_Receiv_from_Direct1.html
+share/doc/bacula/developers/Command_Line_Message_Digest.html
+share/doc/bacula/developers/Conf-Diagram.png
+share/doc/bacula/developers/Contents.html
+share/doc/bacula/developers/Daemon_Protocol.html
+share/doc/bacula/developers/Database_Tables.html
+share/doc/bacula/developers/Definitions.html
+share/doc/bacula/developers/Developers_Guide.html
+share/doc/bacula/developers/Developing_Bacula.html
+share/doc/bacula/developers/Development_Cycle.html
+share/doc/bacula/developers/Director_Services_Daemon.html
+share/doc/bacula/developers/Downlo_md5_zi_Zippe_archiv.html
+share/doc/bacula/developers/Downlo_smarta_Zippe_archiv.html
+share/doc/bacula/developers/File_Services_Daemon.html
+share/doc/bacula/developers/GNU_Free_Documentat_License.html
+share/doc/bacula/developers/General.html
+share/doc/bacula/developers/General1.html
+share/doc/bacula/developers/General2.html
+share/doc/bacula/developers/General3.html
+share/doc/bacula/developers/General4.html
+share/doc/bacula/developers/General5.html
+share/doc/bacula/developers/General6.html
+share/doc/bacula/developers/General7.html
+share/doc/bacula/developers/General_Daemon_Protocol.html
+share/doc/bacula/developers/General_Index.html
+share/doc/bacula/developers/Higher_Level_Conventions.html
+share/doc/bacula/developers/Implementing_GUI_Interface.html
+share/doc/bacula/developers/Introduction_TLS.html
+share/doc/bacula/developers/List_Figures.html
+share/doc/bacula/developers/List_Tables.html
+share/doc/bacula/developers/Low_Level_Network_Protocol.html
+share/doc/bacula/developers/New_Configuratio_Directives.html
+share/doc/bacula/developers/Old_Depreciated_Tape_Format.html
+share/doc/bacula/developers/Overall_Format.html
+share/doc/bacula/developers/Overall_Storage_Format.html
+share/doc/bacula/developers/Patches_Released_Versions.html
+share/doc/bacula/developers/Platform_Support.html
+share/doc/bacula/developers/Porting_Requirements.html
+share/doc/bacula/developers/Protoc_Used_Betwee_Direct.html
+share/doc/bacula/developers/Protoc_Used_Betwee_Direct1.html
+share/doc/bacula/developers/Record_Header.html
+share/doc/bacula/developers/Requir_become_Suppor_Platfo.html
+share/doc/bacula/developers/Running_Regression_Script.html
+share/doc/bacula/developers/Running_Single_Test.html
+share/doc/bacula/developers/SD_Connections_Sessions.html
+share/doc/bacula/developers/SD_Data_Structures.html
+share/doc/bacula/developers/SD_Design_Introduction.html
+share/doc/bacula/developers/SD_Development_Outline.html
+share/doc/bacula/developers/SVN_Usage.html
+share/doc/bacula/developers/Save_Protocol_Between_File.html
+share/doc/bacula/developers/Sequen_Creati_Record_Save.html
+share/doc/bacula/developers/Serialization.html
+share/doc/bacula/developers/Session_Label.html
+share/doc/bacula/developers/Smart_Memory_Allocation.html
+share/doc/bacula/developers/Steps_Take_Porting.html
+share/doc/bacula/developers/Storage_Daemon_Design.html
+share/doc/bacula/developers/Storage_Daemon_File_Output.html
+share/doc/bacula/developers/Storage_Media_Output_Format.html
+share/doc/bacula/developers/Subversion_Resources.html
+share/doc/bacula/developers/TCP_IP_Network_Protocol.html
+share/doc/bacula/developers/TLS.html
+share/doc/bacula/developers/TLS_API_Implementation.html
+share/doc/bacula/developers/Testing_your_distro.html
+share/doc/bacula/developers/Unix_File_Attributes.html
+share/doc/bacula/developers/Version_2_Record_Header.html
+share/doc/bacula/developers/Version_BB02_Block_Header.html
+share/doc/bacula/developers/Volume_Label_Format.html
+share/doc/bacula/developers/Writing_Regression_Test.html
+share/doc/bacula/developers/access-is-denied.png
+share/doc/bacula/developers/back.png
+share/doc/bacula/developers/bacula-applications.png
+share/doc/bacula/developers/bacula-logo.png
+share/doc/bacula/developers/bacula-objects.png
+share/doc/bacula/developers/bat_icon.png
+share/doc/bacula/developers/bclogo.png
+share/doc/bacula/developers/bimagemgr1.png
+share/doc/bacula/developers/bimagemgr2.png
+share/doc/bacula/developers/bimagemgr3.png
+share/doc/bacula/developers/bnet_Threads.html
+share/doc/bacula/developers/bnet_close.html
+share/doc/bacula/developers/bnet_fsend.html
+share/doc/bacula/developers/bnet_open.html
+share/doc/bacula/developers/bnet_recv.html
+share/doc/bacula/developers/bnet_send.html
+share/doc/bacula/developers/bnet_sig.html
+share/doc/bacula/developers/bnet_strerror.html
+share/doc/bacula/developers/bweb-index.png
+share/doc/bacula/developers/bweb-report.png
+share/doc/bacula/developers/confirm.png
+share/doc/bacula/developers/contents.png
+share/doc/bacula/developers/developers.css
+share/doc/bacula/developers/different_time.png
+share/doc/bacula/developers/error.png
+share/doc/bacula/developers/file.png
+share/doc/bacula/developers/flow.png
+share/doc/bacula/developers/home.png
+share/doc/bacula/developers/imagename_translations
+share/doc/bacula/developers/images.tex
+share/doc/bacula/developers/index.html
+share/doc/bacula/developers/index.png
+share/doc/bacula/developers/md5.png
+share/doc/bacula/developers/menu.png
+share/doc/bacula/developers/next.png
+share/doc/bacula/developers/next_g.png
+share/doc/bacula/developers/philosophical-gnu-sm.png
+share/doc/bacula/developers/prev.png
+share/doc/bacula/developers/prev_g.png
+share/doc/bacula/developers/properties-security-advanced-owner.png
+share/doc/bacula/developers/properties-security.png
+share/doc/bacula/developers/running.png
+share/doc/bacula/developers/smartall.png
+share/doc/bacula/developers/thanks.png
+share/doc/bacula/developers/tray-icon.png
+share/doc/bacula/developers/up.png
+share/doc/bacula/developers/up_g.png
+share/doc/bacula/developers/view-only.png
+share/doc/bacula/install/About_this_document.html
+share/doc/bacula/install/Autochanger_Resource.html
+share/doc/bacula/install/Bacula-tray-monitor.png
+share/doc/bacula/install/Bacula_Instal_Config_Guide.html
+share/doc/bacula/install/Bacula_Security_Issues.html
+share/doc/bacula/install/Client_Fi_daemon_Configura.html
+share/doc/bacula/install/Conf-Diagram.png
+share/doc/bacula/install/Configuring_Director.html
+share/doc/bacula/install/Console_Configuration.html
+share/doc/bacula/install/Console_Index.html
+share/doc/bacula/install/Contents.html
+share/doc/bacula/install/Critic_Items_Implem_Before.html
+share/doc/bacula/install/Customizin_Configurat_Files.html
+share/doc/bacula/install/Director_Index.html
+share/doc/bacula/install/File_Daemon_Index.html
+share/doc/bacula/install/General_Index.html
+share/doc/bacula/install/Getting_Started_with_Bacula.html
+share/doc/bacula/install/Installing_Bacula.html
+share/doc/bacula/install/List_Figures.html
+share/doc/bacula/install/List_Tables.html
+share/doc/bacula/install/Messages_Resource.html
+share/doc/bacula/install/Monitor_Configuration.html
+share/doc/bacula/install/Storage_Daemon_Configuratio.html
+share/doc/bacula/install/Storage_Daemon_Index.html
+share/doc/bacula/install/access-is-denied.png
+share/doc/bacula/install/back.png
+share/doc/bacula/install/bacula-applications.png
+share/doc/bacula/install/bacula-logo.png
+share/doc/bacula/install/bacula-objects.png
+share/doc/bacula/install/bat_icon.png
+share/doc/bacula/install/bclogo.png
+share/doc/bacula/install/bimagemgr1.png
+share/doc/bacula/install/bimagemgr2.png
+share/doc/bacula/install/bimagemgr3.png
+share/doc/bacula/install/bweb-index.png
+share/doc/bacula/install/bweb-report.png
+share/doc/bacula/install/confirm.png
+share/doc/bacula/install/contents.png
+share/doc/bacula/install/different_time.png
+share/doc/bacula/install/error.png
+share/doc/bacula/install/file.png
+share/doc/bacula/install/flow.png
+share/doc/bacula/install/home.png
+share/doc/bacula/install/idle.png
+share/doc/bacula/install/imagename_translations
+share/doc/bacula/install/images.idx
+share/doc/bacula/install/images.pl
+share/doc/bacula/install/images.tex
+share/doc/bacula/install/img5.png
+share/doc/bacula/install/img7.png
+share/doc/bacula/install/index.html
+share/doc/bacula/install/index.png
+share/doc/bacula/install/install.css
+share/doc/bacula/install/internals.pl
+share/doc/bacula/install/labels.pl
+share/doc/bacula/install/md5.png
+share/doc/bacula/install/menu.png
+share/doc/bacula/install/next.png
+share/doc/bacula/install/next_g.png
+share/doc/bacula/install/philosophical-gnu-sm.png
+share/doc/bacula/install/prev.png
+share/doc/bacula/install/prev_g.png
+share/doc/bacula/install/properties-security-advanced-owner.png
+share/doc/bacula/install/properties-security.png
+share/doc/bacula/install/running.png
+share/doc/bacula/install/smartall.png
+share/doc/bacula/install/thanks.png
+share/doc/bacula/install/tray-icon.png
+share/doc/bacula/install/up.png
+share/doc/bacula/install/up_g.png
+share/doc/bacula/install/view-only.png
+share/doc/bacula/install/win32-config.png
+share/doc/bacula/install/win32-finish.png
+share/doc/bacula/install/win32-installation-type.png
+share/doc/bacula/install/win32-installing.png
+share/doc/bacula/install/win32-location.png
+share/doc/bacula/install/win32-menu.png
+share/doc/bacula/install/win32-nsis.png
+share/doc/bacula/install/win32-pkg.png
+share/doc/bacula/install/win32-service-ok.png
+share/doc/bacula/install/win32-service.png
+share/doc/bacula/install/win32-start.png
+share/doc/bacula/install/win32-welcome.png
+share/doc/bacula/install/wx-console-restore1.png
+share/doc/bacula/install/wx-console-restore2.png
+share/doc/bacula/problems/About_this_document.html
+share/doc/bacula/problems/Bacula-tray-monitor.png
+share/doc/bacula/problems/Bacula_Freque_Asked_Questi.html
+share/doc/bacula/problems/Bacula_Proble_Resolu_Guide.html
+share/doc/bacula/problems/Conf-Diagram.png
+share/doc/bacula/problems/Contents.html
+share/doc/bacula/problems/Dealing_with_Firewalls.html
+share/doc/bacula/problems/GNU_Free_Documentat_License.html
+share/doc/bacula/problems/General_Index.html
+share/doc/bacula/problems/List_Figures.html
+share/doc/bacula/problems/List_Tables.html
+share/doc/bacula/problems/Testing_Your_Tape_Drive.html
+share/doc/bacula/problems/Tips_Suggestions.html
+share/doc/bacula/problems/What_Do_When_Bacula.html
+share/doc/bacula/problems/access-is-denied.png
+share/doc/bacula/problems/back.png
+share/doc/bacula/problems/bacula-applications.png
+share/doc/bacula/problems/bacula-logo.png
+share/doc/bacula/problems/bacula-objects.png
+share/doc/bacula/problems/bat_icon.png
+share/doc/bacula/problems/bclogo.png
+share/doc/bacula/problems/bimagemgr1.png
+share/doc/bacula/problems/bimagemgr2.png
+share/doc/bacula/problems/bimagemgr3.png
+share/doc/bacula/problems/bweb-index.png
+share/doc/bacula/problems/bweb-report.png
+share/doc/bacula/problems/confirm.png
+share/doc/bacula/problems/contents.png
+share/doc/bacula/problems/different_time.png
+share/doc/bacula/problems/error.png
+share/doc/bacula/problems/file.png
+share/doc/bacula/problems/flow.png
+share/doc/bacula/problems/home.png
+share/doc/bacula/problems/idle.png
+share/doc/bacula/problems/imagename_translations
+share/doc/bacula/problems/images.idx
+share/doc/bacula/problems/images.pl
+share/doc/bacula/problems/images.tex
+share/doc/bacula/problems/index.html
+share/doc/bacula/problems/index.png
+share/doc/bacula/problems/internals.pl
+share/doc/bacula/problems/labels.pl
+share/doc/bacula/problems/md5.png
+share/doc/bacula/problems/menu.png
+share/doc/bacula/problems/next.png
+share/doc/bacula/problems/next_g.png
+share/doc/bacula/problems/philosophical-gnu-sm.png
+share/doc/bacula/problems/prev.png
+share/doc/bacula/problems/prev_g.png
+share/doc/bacula/problems/problems.css
+share/doc/bacula/problems/properties-security-advanced-owner.png
+share/doc/bacula/problems/properties-security.png
+share/doc/bacula/problems/running.png
+share/doc/bacula/problems/smartall.png
+share/doc/bacula/problems/thanks.png
+share/doc/bacula/problems/tray-icon.png
+share/doc/bacula/problems/up.png
+share/doc/bacula/problems/up_g.png
+share/doc/bacula/problems/view-only.png
+share/doc/bacula/problems/win32-config.png
+share/doc/bacula/problems/win32-finish.png
+share/doc/bacula/problems/win32-installation-type.png
+share/doc/bacula/problems/win32-installing.png
+share/doc/bacula/problems/win32-location.png
+share/doc/bacula/problems/win32-menu.png
+share/doc/bacula/problems/win32-nsis.png
+share/doc/bacula/problems/win32-pkg.png
+share/doc/bacula/problems/win32-service-ok.png
+share/doc/bacula/problems/win32-service.png
+share/doc/bacula/problems/win32-start.png
+share/doc/bacula/problems/win32-welcome.png
+share/doc/bacula/problems/wx-console-restore1.png
+share/doc/bacula/problems/wx-console-restore2.png
+share/doc/bacula/utility/About_this_document.html
+share/doc/bacula/utility/Bacula-tray-monitor.png
+share/doc/bacula/utility/Bacula_RPM_Packaging_FAQ.html
+share/doc/bacula/utility/Bacula_Utility_Programs.html
+share/doc/bacula/utility/Conf-Diagram.png
+share/doc/bacula/utility/Contents.html
+share/doc/bacula/utility/GNU_Free_Documentat_License.html
+share/doc/bacula/utility/General_Index.html
+share/doc/bacula/utility/List_Figures.html
+share/doc/bacula/utility/List_Tables.html
+share/doc/bacula/utility/Volume_Utility_Tools.html
+share/doc/bacula/utility/access-is-denied.png
+share/doc/bacula/utility/back.png
+share/doc/bacula/utility/bacula-applications.png
+share/doc/bacula/utility/bacula-logo.png
+share/doc/bacula/utility/bacula-objects.png
+share/doc/bacula/utility/bat_icon.png
+share/doc/bacula/utility/bclogo.png
+share/doc/bacula/utility/bimagemgr1.png
+share/doc/bacula/utility/bimagemgr2.png
+share/doc/bacula/utility/bimagemgr3.png
+share/doc/bacula/utility/bweb-index.png
+share/doc/bacula/utility/bweb-report.png
+share/doc/bacula/utility/confirm.png
+share/doc/bacula/utility/contents.png
+share/doc/bacula/utility/different_time.png
+share/doc/bacula/utility/error.png
+share/doc/bacula/utility/file.png
+share/doc/bacula/utility/flow.png
+share/doc/bacula/utility/home.png
+share/doc/bacula/utility/idle.png
+share/doc/bacula/utility/imagename_translations
+share/doc/bacula/utility/images.idx
+share/doc/bacula/utility/images.pl
+share/doc/bacula/utility/images.tex
+share/doc/bacula/utility/img1.png
+share/doc/bacula/utility/img2.png
+share/doc/bacula/utility/img3.png
+share/doc/bacula/utility/img4.png
+share/doc/bacula/utility/index.html
+share/doc/bacula/utility/index.png
+share/doc/bacula/utility/internals.pl
+share/doc/bacula/utility/labels.pl
+share/doc/bacula/utility/md5.png
+share/doc/bacula/utility/menu.png
+share/doc/bacula/utility/next.png
+share/doc/bacula/utility/next_g.png
+share/doc/bacula/utility/philosophical-gnu-sm.png
+share/doc/bacula/utility/prev.png
+share/doc/bacula/utility/prev_g.png
+share/doc/bacula/utility/properties-security-advanced-owner.png
+share/doc/bacula/utility/properties-security.png
+share/doc/bacula/utility/running.png
+share/doc/bacula/utility/smartall.png
+share/doc/bacula/utility/thanks.png
+share/doc/bacula/utility/tray-icon.png
+share/doc/bacula/utility/up.png
+share/doc/bacula/utility/up_g.png
+share/doc/bacula/utility/utility.css
+share/doc/bacula/utility/view-only.png
+share/doc/bacula/utility/win32-config.png
+share/doc/bacula/utility/win32-finish.png
+share/doc/bacula/utility/win32-installation-type.png
+share/doc/bacula/utility/win32-installing.png
+share/doc/bacula/utility/win32-location.png
+share/doc/bacula/utility/win32-menu.png
+share/doc/bacula/utility/win32-nsis.png
+share/doc/bacula/utility/win32-pkg.png
+share/doc/bacula/utility/win32-service-ok.png
+share/doc/bacula/utility/win32-service.png
+share/doc/bacula/utility/win32-start.png
+share/doc/bacula/utility/win32-welcome.png
+share/doc/bacula/utility/wx-console-restore1.png
+share/doc/bacula/utility/wx-console-restore2.png
+@dirrm share/doc/bacula/utility
+@dirrm share/doc/bacula/problems
+@dirrm share/doc/bacula/install
+@dirrm share/doc/bacula/developers
+@dirrm share/doc/bacula/console
+@dirrm share/doc/bacula/concepts
+@dirrm share/doc/bacula/catalog
 @dirrm share/doc/bacula
diff --git a/sysutils/bacula-doc/distinfo b/sysutils/bacula-doc/distinfo
index b0a0e3f42e4..b3dd82a95a8 100644
--- a/sysutils/bacula-doc/distinfo
+++ b/sysutils/bacula-doc/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.16 2009/01/06 11:29:26 adam Exp $
+$NetBSD: distinfo,v 1.17 2009/05/15 10:29:06 adam Exp $
 
-SHA1 (bacula-docs-2.4.4.tar.bz2) = ef261cd2deadf79173029b6fccab806ff2095b4e
-RMD160 (bacula-docs-2.4.4.tar.bz2) = 3ff1dcc4596c1d33bf599363a88d48bde308507e
-Size (bacula-docs-2.4.4.tar.bz2) = 23009484 bytes
-SHA1 (patch-aa) = 52783e5e70ce0f444044474fae6ccee29711f445
-SHA1 (patch-ab) = ee8ed9aa3dbd1f689abbeee2ff8980b1c0ee9130
+SHA1 (bacula-docs-3.0.1.tar.bz2) = d6fb61cdf74147a5b948b501472a7bda2f4af2e3
+RMD160 (bacula-docs-3.0.1.tar.bz2) = bd3b01cc12486d610264de80b7d6d983b248a95e
+Size (bacula-docs-3.0.1.tar.bz2) = 40756082 bytes
diff --git a/sysutils/bacula-doc/patches/patch-aa b/sysutils/bacula-doc/patches/patch-aa
deleted file mode 100644
index d7610dd6a65..00000000000
--- a/sysutils/bacula-doc/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/11/21 14:09:31 adam Exp $
-
---- manual/tips.tex.orig	2008-01-30 11:26:18.000000000 +0100
-+++ manual/tips.tex
-@@ -608,6 +608,11 @@ you should take care when supplying pass
- Database - Security Considerations }{BackingUpBaculaSecurityConsiderations}
- section for more information.
- 
-+If you use the make_catalog_backup script provided by Bacula, remember that
-+you should take care when supplying passwords on the command line.  Read the
-+\ilink{BackingUpBaculaSecurityConsiderations}{Backing Up Your Bacula
-+Database - Security Considerations } for more information.
-+
- \section{Creating Holiday Schedules}
- \label{holiday}
- \index[general]{Schedules!Creating Holiday }
diff --git a/sysutils/bacula-doc/patches/patch-ab b/sysutils/bacula-doc/patches/patch-ab
deleted file mode 100644
index 5c5149fb5da..00000000000
--- a/sysutils/bacula-doc/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2008/11/21 14:09:31 adam Exp $
-
---- manual/catmaintenance.tex.orig	2008-11-21 12:54:44.000000000 +0100
-+++ manual/catmaintenance.tex
-@@ -641,6 +641,33 @@ Only you can decide what is appropriate 
- you with a starting point.  We hope it helps.
- 
- 
-+
-+\label{BackingUpBaculaSecurityConsiderations}
-+\section{Security considerations}
-+\index[general]{Backing Up Your Bacula Database - Security Considerations }
-+\index[general]{Database!Backing Up Your Bacula Database - Security Considerations }
-+
-+We provide make_catalog_backup as an example of what can be used to backup
-+your Bacula database.  We expect you to take security precautions relevant
-+to your situation.  make_catalog_backup is designed to take a password on
-+the command line.  This is fine on machines with only trusted users.  It is
-+not acceptable on machines without trusted users.  Most database systems
-+provide a alternative method, which does not place the password on the
-+command line.
-+
-+The make_catalog_backup contains some warnings about how to use it. Please
-+read those tips.
-+
-+To help you get started, we know PostgreSQL has a password file,
-+\elink{
-+.pgpass}{http://www.postgresql.org/docs/8.2/static/libpq-pgpass.html}, and
-+we know MySQL has
-+\elink{ .my.cnf}{http://dev.mysql.com/doc/refman/4.1/en/password-security.html}.
-+
-+Only you can decide what is appropriate for your situation. We have provided
-+you with a starting point.  We hope it helps.
-+
-+
- \label{BackingUPOtherDBs}
- \section{Backing Up Third Party Databases}
- \index[general]{Backing Up Third Party Databases }