Changes 5.0.1:

* We believe that we have resolved most of the problems
  concerning canceled or failed jobs being "stuck" in the
  Director.  There is one outstanding problem in the SD when
  canceling jobs that we will fix in the next major release.
  If you see jobs that seem to be stuck, in general issuing
  a cancel command in bconsole should now make them go away.

Directives:
* The default for "Allow Duplicate Jobs" has been changed from
  no to yes.  If you use this directive, please check your
  conf file, and note the next two items!
* AllowHigherDuplicates disabled. It did not work as documented
    and was confusing.
* New directive "CancelLowerLevelDuplicates" See New Features
  section in the manual.
* Truncate on Purge rewritten.  See New Features section in the manual.

* Bug fixes

* Ensure SD asks for help when looping even if poll set.
* Fix three-pool regress bug
* This version fixes an issue where the console window would start out
  docked. It is fixed by initiating the variables in the Pages class wi
  constructor.
* Fix make_catalog_backup.pl fails when catalog db is on other host

26 files changed, 257 insertions, 655 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index c861c192803..8507d967457 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.487 2010/02/23 13:52:33 sno Exp $
+# $NetBSD: Makefile,v 1.488 2010/03/09 07:06:00 adam Exp $
 #
 
 COMMENT=	System utilities
@@ -23,7 +23,6 @@ SUBDIR+=	atitvout
 SUBDIR+=	bacula
 SUBDIR+=	bacula-clientonly
 SUBDIR+=	bacula-doc
-SUBDIR+=	bacula-gnome-console
 SUBDIR+=	bacula-qt-console
 SUBDIR+=	bacula-tray-monitor
 SUBDIR+=	bacula-wx-console
diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile
index 31d42c6b085..9c5db9bf34b 100644
--- a/sysutils/bacula-clientonly/Makefile
+++ b/sysutils/bacula-clientonly/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2009/11/09 12:26:08 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2010/03/09 07:06:00 adam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-clientonly-/}
-PKGREVISION=		1
 COMMENT=		The Network Backup Solution (client only)
 
 CONFLICTS=		bacula-[0-9]* bacula-client-[0-9]*
diff --git a/sysutils/bacula-doc/Makefile b/sysutils/bacula-doc/Makefile
index 5bfa54cc90c..d233331f117 100644
--- a/sysutils/bacula-doc/Makefile
+++ b/sysutils/bacula-doc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2009/10/28 09:30:22 adam Exp $
+# $NetBSD: Makefile,v 1.23 2010/03/09 07:06:00 adam Exp $
 
-DISTNAME=	bacula-docs-3.0.3
+DISTNAME=	bacula-docs-5.0.1
 PKGNAME=	${DISTNAME:S/docs/doc/}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -18,20 +18,18 @@ NO_BUILD=		yes
 DOCDIR=			share/doc/bacula
 
 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}/main
+INSTALLATION_DIRS+=	${DOCDIR}/misc
 INSTALLATION_DIRS+=	${DOCDIR}/problems
 INSTALLATION_DIRS+=	${DOCDIR}/utility
 
 do-install:
-	${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/main/main/* ${DESTDIR}${PREFIX}/${DOCDIR}/main/
+	${INSTALL_DATA} ${WRKSRC}/manuals/en/misc/misc/* ${DESTDIR}${PREFIX}/${DOCDIR}/misc/
 	${INSTALL_DATA} ${WRKSRC}/manuals/en/problems/problems/* ${DESTDIR}${PREFIX}/${DOCDIR}/problems/
 	${INSTALL_DATA} ${WRKSRC}/manuals/en/utility/utility/* ${DESTDIR}${PREFIX}/${DOCDIR}/utility/
 
diff --git a/sysutils/bacula-doc/PLIST b/sysutils/bacula-doc/PLIST
index 6a16e0c9df5..25330e570e0 100644
--- a/sysutils/bacula-doc/PLIST
+++ b/sysutils/bacula-doc/PLIST
@@ -1,309 +1,48 @@
-@comment $NetBSD: PLIST,v 1.8 2009/10/28 09:30:22 adam Exp $
-share/doc/bacula/catalog/About_this_document.html
-share/doc/bacula/catalog/Bacula-tray-monitor.png
-share/doc/bacula/catalog/Bacula_Catalog_Database_Gui.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_Documentation_Lice.html
-share/doc/bacula/catalog/General_Index.html
-share/doc/bacula/catalog/Installing_Configuring_MySQ.html
-share/doc/bacula/catalog/Installing_Configuring_Post.html
-share/doc/bacula/catalog/Installing_Configuring_SQLi.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/bat11.png
-share/doc/bacula/catalog/bat12.png
-share/doc/bacula/catalog/bat13.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/git-edit-commit.png
-share/doc/bacula/catalog/home.png
-share/doc/bacula/catalog/idle.png
-share/doc/bacula/catalog/images.idx
-share/doc/bacula/catalog/images.pl
-share/doc/bacula/catalog/images.tex
-share/doc/bacula/catalog/img1.png
-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_Concepts_Overview_Gu.html
-share/doc/bacula/concepts/Bacula_Copyright_Trademark_.html
-share/doc/bacula/concepts/Bacula_FD_Plugin_API.html
-share/doc/bacula/concepts/Bacula_Projects.html
-share/doc/bacula/concepts/Bacula_TLS_Communications.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/Disaster_Recovery_Using_Bac.html
-share/doc/bacula/concepts/File_Daemon_Index.html
-share/doc/bacula/concepts/GNU_Free_Documentation_Lice.html
-share/doc/bacula/concepts/General_Index.html
-share/doc/bacula/concepts/Migration_Copy.html
-share/doc/bacula/concepts/New_Features_in_3_0_0.html
-share/doc/bacula/concepts/New_Features_in_3_1_4.html
-share/doc/bacula/concepts/New_Features_in_Released.html
-share/doc/bacula/concepts/Python_Scripting.html
-share/doc/bacula/concepts/Released_Version_3_0_3.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_Improve_Comput.html
-share/doc/bacula/concepts/Using_Bacula_catalog_grab.html
-share/doc/bacula/concepts/Using_Stunnel_Encrypt_Commu.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/bat11.png
-share/doc/bacula/concepts/bat12.png
-share/doc/bacula/concepts/bat13.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/git-edit-commit.png
-share/doc/bacula/concepts/home.png
-share/doc/bacula/concepts/idle.png
-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/img10.png
-share/doc/bacula/concepts/img11.png
-share/doc/bacula/concepts/img12.png
-share/doc/bacula/concepts/img13.png
-share/doc/bacula/concepts/img14.png
-share/doc/bacula/concepts/img15.png
-share/doc/bacula/concepts/img16.png
-share/doc/bacula/concepts/img17.png
-share/doc/bacula/concepts/img18.png
-share/doc/bacula/concepts/img19.png
-share/doc/bacula/concepts/img2.png
-share/doc/bacula/concepts/img20.png
-share/doc/bacula/concepts/img21.png
-share/doc/bacula/concepts/img22.png
-share/doc/bacula/concepts/img23.png
-share/doc/bacula/concepts/img24.png
-share/doc/bacula/concepts/img25.png
-share/doc/bacula/concepts/img26.png
-share/doc/bacula/concepts/img27.png
-share/doc/bacula/concepts/img28.png
-share/doc/bacula/concepts/img29.png
-share/doc/bacula/concepts/img3.png
-share/doc/bacula/concepts/img30.png
-share/doc/bacula/concepts/img31.png
-share/doc/bacula/concepts/img32.png
-share/doc/bacula/concepts/img33.png
-share/doc/bacula/concepts/img34.png
-share/doc/bacula/concepts/img4.png
-share/doc/bacula/concepts/img5.png
-share/doc/bacula/concepts/img6.png
-share/doc/bacula/concepts/img7.png
-share/doc/bacula/concepts/img8.png
-share/doc/bacula/concepts/img9.png
-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
+@comment $NetBSD: PLIST,v 1.9 2010/03/09 07:06:00 adam Exp $
 share/doc/bacula/console/About_this_document.html
-share/doc/bacula/console/Bacula-tray-monitor.png
 share/doc/bacula/console/Bacula_Console.html
 share/doc/bacula/console/Bacula_Console_Operators_Gu.html
-share/doc/bacula/console/Conf-Diagram.png
 share/doc/bacula/console/Contents.html
 share/doc/bacula/console/GNU_Free_Documentation_Lice.html
 share/doc/bacula/console/General_Index.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/bat11.png
-share/doc/bacula/console/bat12.png
-share/doc/bacula/console/bat13.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/git-edit-commit.png
-share/doc/bacula/console/home.png
-share/doc/bacula/console/idle.png
 share/doc/bacula/console/images.idx
 share/doc/bacula/console/images.pl
 share/doc/bacula/console/images.tex
 share/doc/bacula/console/img1.png
 share/doc/bacula/console/img2.png
+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_Submissions_Pro.html
 share/doc/bacula/developers/Bacula_Developer_Notes.html
+share/doc/bacula/developers/Bacula_FD_Plugin_API.html
+share/doc/bacula/developers/Bacula_Git_Usage.html
 share/doc/bacula/developers/Bacula_Git_repositories.html
 share/doc/bacula/developers/Bacula_MD5_Algorithm.html
 share/doc/bacula/developers/Bacula_Memory_Management.html
+share/doc/bacula/developers/Bacula_Plugin_Entrypoints.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/Building_Bacula_Plugins.html
+share/doc/bacula/developers/Bvfs_API.html
 share/doc/bacula/developers/Catalog_Services.html
 share/doc/bacula/developers/Command_Line_Message_Digest.html
 share/doc/bacula/developers/Commands_Received_from_Dire.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
@@ -315,6 +54,7 @@ share/doc/bacula/developers/Director_Index.html
 share/doc/bacula/developers/Director_Services_Daemon.html
 share/doc/bacula/developers/Download_md5_ziphttp_www_fo.html
 share/doc/bacula/developers/File_Services_Daemon.html
+share/doc/bacula/developers/Forcing_Changes.html
 share/doc/bacula/developers/GNU_Free_Documentation_Lice.html
 share/doc/bacula/developers/General.html
 share/doc/bacula/developers/General_Daemon_Protocol.html
@@ -322,13 +62,16 @@ share/doc/bacula/developers/Git_Usage.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/Loading_Plugins.html
 share/doc/bacula/developers/Low_Level_Network_Protocol.html
 share/doc/bacula/developers/New_Configuration_Directive.html
+share/doc/bacula/developers/Normal_vs_Command_Plugins.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/Plugin_Entry_Points.html
 share/doc/bacula/developers/Porting_Requirements.html
 share/doc/bacula/developers/Protocol_Used_Between_Direc.html
 share/doc/bacula/developers/Record_Header.html
@@ -344,6 +87,7 @@ share/doc/bacula/developers/Sequence_Creation_Records_S.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/Step_Step_Modifying_Bacula.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
@@ -357,19 +101,6 @@ 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/bat11.png
-share/doc/bacula/developers/bat12.png
-share/doc/bacula/developers/bat13.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
@@ -378,17 +109,8 @@ 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/git-edit-commit.png
-share/doc/bacula/developers/home.png
 share/doc/bacula/developers/http_www_fourmilab_ch_smart.html
 share/doc/bacula/developers/images.tex
 share/doc/bacula/developers/img1.png
@@ -398,116 +120,157 @@ share/doc/bacula/developers/img4.png
 share/doc/bacula/developers/img5.png
 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/loadPlugin.html
 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_Installation_Configu.html
-share/doc/bacula/install/Bacula_Security_Issues.html
-share/doc/bacula/install/Client_File_daemon_Configur.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/Critical_Items_Implement_Be.html
-share/doc/bacula/install/Customizing_Configuration_F.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/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/bat11.png
-share/doc/bacula/install/bat12.png
-share/doc/bacula/install/bat13.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/git-edit-commit.png
-share/doc/bacula/install/home.png
-share/doc/bacula/install/idle.png
-share/doc/bacula/install/images.idx
-share/doc/bacula/install/images.pl
-share/doc/bacula/install/images.tex
-share/doc/bacula/install/img1.png
-share/doc/bacula/install/img2.png
-share/doc/bacula/install/img3.png
-share/doc/bacula/install/img4.png
-share/doc/bacula/install/img5.png
-share/doc/bacula/install/img6.png
-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/main/ANSI_IBM_Tape_Labels.html
+share/doc/bacula/main/About_this_document.html
+share/doc/bacula/main/Autochanger_Resource.html
+share/doc/bacula/main/Autochanger_Support.html
+share/doc/bacula/main/Automated_Disk_Backup.html
+share/doc/bacula/main/Automatic_Volume_Recycling.html
+share/doc/bacula/main/Backup_Strategies.html
+share/doc/bacula/main/Bacula_Copyright_Trademark_.html
+share/doc/bacula/main/Bacula_Main_Reference.html
+share/doc/bacula/main/Bacula_Security_Issues.html
+share/doc/bacula/main/Bacula_TLS_Communications.html
+share/doc/bacula/main/Basic_Volume_Management.html
+share/doc/bacula/main/Bootstrap_File.html
+share/doc/bacula/main/Brief_Tutorial.html
+share/doc/bacula/main/Catalog_Maintenance.html
+share/doc/bacula/main/Client_File_daemon_Configur.html
+share/doc/bacula/main/Configuring_Director.html
+share/doc/bacula/main/Console_Configuration.html
+share/doc/bacula/main/Console_Index.html
+share/doc/bacula/main/Contents.html
+share/doc/bacula/main/Critical_Items_Implement_Be.html
+share/doc/bacula/main/Current_State_Bacula.html
+share/doc/bacula/main/Customizing_Configuration_F.html
+share/doc/bacula/main/Data_Encryption.html
+share/doc/bacula/main/Data_Spooling.html
+share/doc/bacula/main/Director_Index.html
+share/doc/bacula/main/Disaster_Recovery_Using_Bac.html
+share/doc/bacula/main/File_Daemon_Index.html
+share/doc/bacula/main/GNU_Free_Documentation_Lice.html
+share/doc/bacula/main/General_Index.html
+share/doc/bacula/main/Getting_Started_with_Bacula.html
+share/doc/bacula/main/Installing_Bacula.html
+share/doc/bacula/main/Installing_Configuring_MySQ.html
+share/doc/bacula/main/Installing_Configuring_Post.html
+share/doc/bacula/main/Installing_Configuring_SQLi.html
+share/doc/bacula/main/Messages_Resource.html
+share/doc/bacula/main/Migration_Copy.html
+share/doc/bacula/main/Monitor_Configuration.html
+share/doc/bacula/main/New_Features_in_3_0_0.html
+share/doc/bacula/main/New_Features_in_5_0_0.html
+share/doc/bacula/main/New_Features_in_5_0_1.html
+share/doc/bacula/main/New_Features_in_Released.html
+share/doc/bacula/main/Released_Version_3_0_3_3_0_.html
+share/doc/bacula/main/Restore_Command.html
+share/doc/bacula/main/Storage_Daemon_Configuratio.html
+share/doc/bacula/main/Storage_Daemon_Index.html
+share/doc/bacula/main/Supported_Autochangers.html
+share/doc/bacula/main/Supported_Operating_Systems.html
+share/doc/bacula/main/Supported_Tape_Drives.html
+share/doc/bacula/main/System_Requirements.html
+share/doc/bacula/main/Thanks.html
+share/doc/bacula/main/Using_Bacula_Improve_Comput.html
+share/doc/bacula/main/Using_Bacula_catalog_grab.html
+share/doc/bacula/main/What_is_Bacula.html
+share/doc/bacula/main/Windows_Version_Bacula.html
+share/doc/bacula/main/contents.png
+share/doc/bacula/main/images.idx
+share/doc/bacula/main/images.pl
+share/doc/bacula/main/images.tex
+share/doc/bacula/main/img1.png
+share/doc/bacula/main/img10.png
+share/doc/bacula/main/img11.png
+share/doc/bacula/main/img12.png
+share/doc/bacula/main/img13.png
+share/doc/bacula/main/img14.png
+share/doc/bacula/main/img15.png
+share/doc/bacula/main/img16.png
+share/doc/bacula/main/img17.png
+share/doc/bacula/main/img18.png
+share/doc/bacula/main/img19.png
+share/doc/bacula/main/img2.png
+share/doc/bacula/main/img20.png
+share/doc/bacula/main/img21.png
+share/doc/bacula/main/img22.png
+share/doc/bacula/main/img23.png
+share/doc/bacula/main/img24.png
+share/doc/bacula/main/img25.png
+share/doc/bacula/main/img26.png
+share/doc/bacula/main/img27.png
+share/doc/bacula/main/img28.png
+share/doc/bacula/main/img29.png
+share/doc/bacula/main/img3.png
+share/doc/bacula/main/img30.png
+share/doc/bacula/main/img31.png
+share/doc/bacula/main/img32.png
+share/doc/bacula/main/img33.png
+share/doc/bacula/main/img34.png
+share/doc/bacula/main/img35.png
+share/doc/bacula/main/img36.png
+share/doc/bacula/main/img37.png
+share/doc/bacula/main/img38.png
+share/doc/bacula/main/img39.png
+share/doc/bacula/main/img4.png
+share/doc/bacula/main/img40.png
+share/doc/bacula/main/img41.png
+share/doc/bacula/main/img5.png
+share/doc/bacula/main/img6.png
+share/doc/bacula/main/img7.png
+share/doc/bacula/main/img8.png
+share/doc/bacula/main/img9.png
+share/doc/bacula/main/index.html
+share/doc/bacula/main/index.png
+share/doc/bacula/main/internals.pl
+share/doc/bacula/main/labels.pl
+share/doc/bacula/main/main.css
+share/doc/bacula/main/next.png
+share/doc/bacula/main/next_g.png
+share/doc/bacula/main/prev.png
+share/doc/bacula/main/prev_g.png
+share/doc/bacula/main/up.png
+share/doc/bacula/main/up_g.png
+share/doc/bacula/misc/About_this_document.html
+share/doc/bacula/misc/Bacula_Copyright_Trademark_.html
+share/doc/bacula/misc/Bacula_Miscellaneous_Guide.html
+share/doc/bacula/misc/Bacula_Projects.html
+share/doc/bacula/misc/Contents.html
+share/doc/bacula/misc/DVD_Volumes.html
+share/doc/bacula/misc/GNU_Free_Documentation_Lice.html
+share/doc/bacula/misc/Index.html
+share/doc/bacula/misc/Python_Scripting.html
+share/doc/bacula/misc/Using_Stunnel_Encrypt_Commu.html
+share/doc/bacula/misc/Variable_Expansion.html
+share/doc/bacula/misc/contents.png
+share/doc/bacula/misc/images.idx
+share/doc/bacula/misc/images.pl
+share/doc/bacula/misc/images.tex
+share/doc/bacula/misc/img1.png
+share/doc/bacula/misc/img2.png
+share/doc/bacula/misc/img3.png
+share/doc/bacula/misc/index.html
+share/doc/bacula/misc/index.png
+share/doc/bacula/misc/internal_database_is_not.html
+share/doc/bacula/misc/internals.pl
+share/doc/bacula/misc/labels.pl
+share/doc/bacula/misc/misc.css
+share/doc/bacula/misc/next.png
+share/doc/bacula/misc/next_g.png
+share/doc/bacula/misc/prev.png
+share/doc/bacula/misc/prev_g.png
+share/doc/bacula/misc/up.png
+share/doc/bacula/misc/up_g.png
 share/doc/bacula/problems/About_this_document.html
-share/doc/bacula/problems/Bacula-tray-monitor.png
 share/doc/bacula/problems/Bacula_Frequently_Asked_Que.html
 share/doc/bacula/problems/Bacula_Problem_Resolution_G.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_Documentation_Lice.html
@@ -515,103 +278,33 @@ share/doc/bacula/problems/General_Index.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/bat11.png
-share/doc/bacula/problems/bat12.png
-share/doc/bacula/problems/bat13.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/git-edit-commit.png
-share/doc/bacula/problems/home.png
-share/doc/bacula/problems/idle.png
 share/doc/bacula/problems/images.idx
 share/doc/bacula/problems/images.pl
 share/doc/bacula/problems/images.tex
 share/doc/bacula/problems/img1.png
 share/doc/bacula/problems/img2.png
 share/doc/bacula/problems/img3.png
+share/doc/bacula/problems/img4.png
+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_Documentation_Lice.html
 share/doc/bacula/utility/General_Index.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/bat11.png
-share/doc/bacula/utility/bat12.png
-share/doc/bacula/utility/bat13.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/git-edit-commit.png
-share/doc/bacula/utility/home.png
-share/doc/bacula/utility/idle.png
 share/doc/bacula/utility/images.idx
 share/doc/bacula/utility/images.pl
 share/doc/bacula/utility/images.tex
@@ -620,37 +313,15 @@ share/doc/bacula/utility/img2.png
 share/doc/bacula/utility/img3.png
 share/doc/bacula/utility/img4.png
 share/doc/bacula/utility/img5.png
+share/doc/bacula/utility/img6.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
diff --git a/sysutils/bacula-doc/distinfo b/sysutils/bacula-doc/distinfo
index 45aa0b9d79f..77fd4d5edff 100644
--- a/sysutils/bacula-doc/distinfo
+++ b/sysutils/bacula-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2009/10/28 09:30:22 adam Exp $
+$NetBSD: distinfo,v 1.20 2010/03/09 07:06:00 adam Exp $
 
-SHA1 (bacula-docs-3.0.3.tar.bz2) = 3730926386374ba1fa2cc16b25ed173b1ee19024
-RMD160 (bacula-docs-3.0.3.tar.bz2) = bd6ae9f8160641048d7282308ef6fd1313d086dc
-Size (bacula-docs-3.0.3.tar.bz2) = 49935136 bytes
+SHA1 (bacula-docs-5.0.1.tar.bz2) = db69fa81810b3716aa9d05755e51f3375e423b66
+RMD160 (bacula-docs-5.0.1.tar.bz2) = af8378d90abcc70b6e26a2434daf25c3f7329c6d
+Size (bacula-docs-5.0.1.tar.bz2) = 34571061 bytes
diff --git a/sysutils/bacula-gnome-console/DESCR b/sysutils/bacula-gnome-console/DESCR
deleted file mode 100644
index be285445b61..00000000000
--- a/sysutils/bacula-gnome-console/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Gnome console for Bacula - The Network Backup Solution
diff --git a/sysutils/bacula-gnome-console/Makefile b/sysutils/bacula-gnome-console/Makefile
deleted file mode 100644
index 348b4c936ac..00000000000
--- a/sysutils/bacula-gnome-console/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:26 wiz Exp $
-
-PKGNAME=	${DISTNAME:S/-/-gnome-console-/}
-PKGREVISION=	1
-COMMENT=	Gnome console for Bacula - The Network Backup Solution
-CATEGORIES+=	gnome
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-DISTINFO_FILE=		${.CURDIR}/../../sysutils/bacula/distinfo
-PATCHDIR=		${.CURDIR}/../../sysutils/bacula/patches
-
-CONFIGURE_ARGS+=	--enable-client-only
-CONFIGURE_ARGS+=	--enable-gnome
-
-USE_TOOLS+=		pkg-config
-
-BUILD_DIRS=		src/gnome2-console
-
-INSTALLATION_DIRS=	sbin share/examples/bacula
-
-.include "../../sysutils/bacula/Makefile.common"
-.include "../../sysutils/bacula/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula-gnome-console/PLIST b/sysutils/bacula-gnome-console/PLIST
deleted file mode 100644
index cab74010fba..00000000000
--- a/sysutils/bacula-gnome-console/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:28:46 joerg Exp $
-sbin/bgnome-console
-share/examples/bacula/bgnome-console.conf
diff --git a/sysutils/bacula-qt-console/Makefile b/sysutils/bacula-qt-console/Makefile
index 37d733a1d92..a8b922cfbe2 100644
--- a/sysutils/bacula-qt-console/Makefile
+++ b/sysutils/bacula-qt-console/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/03/09 07:06:01 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-qt-console-/}
-PKGREVISION=	1
 COMMENT=	Qt-based console for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile
index 2c0f63557be..14138176c30 100644
--- a/sysutils/bacula-wx-console/Makefile
+++ b/sysutils/bacula-wx-console/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/03/09 07:06:01 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-wx-console-/}
-PKGREVISION=	1
 COMMENT=	wxWindows-based console for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 20b59bcb4c6..77fe85b0d56 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2009/11/09 12:26:08 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2010/03/09 07:06:00 adam Exp $
 
 CONFLICTS+=		bacula-client-[0-9]* bacula-clientonly-[0-9]*
-PKGREVISION=		1
 
 PKG_DESTDIR_SUPPORT=	destdir
 
@@ -36,6 +35,7 @@ RCD_SCRIPTS=		bacula bacula-dir bacula-sd bacula-fd
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/scripts/dvd-handler ${DESTDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/chio-changer ${DESTDIR}${PREFIX}/libexec/bacula/
+	${INSTALL_SCRIPT} ${FILESDIR}/chio-changer \
+		${DESTDIR}${PREFIX}/libexec/bacula/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 7fafa145ed5..4046b601e69 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile.common,v 1.52 2009/10/28 09:30:21 adam Exp $
+# $NetBSD: Makefile.common,v 1.53 2010/03/09 07:06:00 adam Exp $
 #
 # used by sysutils/bacula-clientonly/Makefile
-# used by sysutils/bacula-gnome-console/Makefile
 # used by sysutils/bacula-tray-monitor/Makefile
 # used by sysutils/bacula-wx-console/Makefile
 
-DISTNAME=		bacula-3.0.3
-CATEGORIES=		sysutils
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
+DISTNAME=	bacula-5.0.1
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bacula/}
 
-#PATCH_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
+#PATCH_SITES=	${MASTER_SITE_SOURCEFORGE:=bacula/}
 #PATCHFILES=
-#DIST_SUBDIR=		${DISTNAME}
+#DIST_SUBDIR=	${DISTNAME}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.bacula.org/
diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common
index 1f890c4b7dc..a3842f2f315 100644
--- a/sysutils/bacula/PLIST.common
+++ b/sysutils/bacula/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.11 2009/11/09 12:26:08 joerg Exp $
+@comment $NetBSD: PLIST.common,v 1.12 2010/03/09 07:06:00 adam Exp $
 lib/bpipe-fd.la
 lib/libbac.la
 lib/libbaccfg.la
@@ -8,16 +8,15 @@ libexec/bacula/bacula
 libexec/bacula/bacula-ctl-dir
 libexec/bacula/bacula-ctl-fd
 libexec/bacula/bacula-ctl-sd
+libexec/bacula/bacula_config
 libexec/bacula/bconsole
 libexec/bacula/btraceback.dbx
 libexec/bacula/btraceback.gdb
 libexec/bacula/disk-changer
-libexec/bacula/gconsole
 libexec/bacula/mtx-changer
 libexec/bacula/mtx-changer.conf
 libexec/bacula/startmysql
 libexec/bacula/stopmysql
-man/man1/bacula-bgnome-console.1
 man/man1/bacula-bwxconsole.1
 man/man1/bacula-tray-monitor.1
 man/man1/bat.1
diff --git a/sysutils/bacula/PLIST.server b/sysutils/bacula/PLIST.server
index 9e872c04e25..ba26624f79a 100644
--- a/sysutils/bacula/PLIST.server
+++ b/sysutils/bacula/PLIST.server
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.server,v 1.5 2009/07/01 10:39:05 adam Exp $
+@comment $NetBSD: PLIST.server,v 1.6 2010/03/09 07:06:00 adam Exp $
 lib/libbacsql.la
 libexec/bacula/chio-changer
 libexec/bacula/create_${BACULA_DB}_database
@@ -13,6 +13,7 @@ libexec/bacula/grant_bacula_privileges
 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
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 45b447b7b35..0f35132b8c2 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,21 +1,19 @@
-$NetBSD: distinfo,v 1.39 2009/11/09 12:26:08 joerg Exp $
+$NetBSD: distinfo,v 1.40 2010/03/09 07:06:00 adam Exp $
 
-SHA1 (bacula-3.0.3.tar.gz) = b4f7f7b2eb9afa805e1bae110be6bc6e9861c506
-RMD160 (bacula-3.0.3.tar.gz) = 843cca6290b2780ccc37a211f94106a4a74e953f
-Size (bacula-3.0.3.tar.gz) = 3903085 bytes
-SHA1 (patch-aa) = e59bccdc80b23b2a64bd7e4f2bbefe22e019fca8
+SHA1 (bacula-5.0.1.tar.gz) = b6fd0c62d26c113d3bdccf69cd630b16d7261b5b
+RMD160 (bacula-5.0.1.tar.gz) = 587f49794556fe2eeed55eb3aaedfc3a6861761c
+Size (bacula-5.0.1.tar.gz) = 4057506 bytes
+SHA1 (patch-aa) = 088623d447102579d2723f0ff0a1e802d83cfdd0
 SHA1 (patch-ab) = 07ff96289fe4fe9a1d666b3fa70c97f9ad45bc34
 SHA1 (patch-ac) = 4ba89bcf49ce82b527edc789e2b17a781cb8622e
 SHA1 (patch-ad) = dc0fcf90112e973e122370feb3b31a9495efa17a
-SHA1 (patch-ae) = 1b4d6fdeb8570be9f7e5f0355701d92d81f68b07
-SHA1 (patch-af) = 20429fa1f517348ee290d90dd1d420347fb1928e
-SHA1 (patch-ag) = ccb411db5fb65d5ef3ed5a56b70129d83a66da68
-SHA1 (patch-ah) = 72839df5640a649e2abcbaaa3dcc8ae32468e5ab
+SHA1 (patch-ae) = cfd66ce6ae33b993a9398b1d40aa6b6c7fc84552
+SHA1 (patch-af) = eb573f4b823c6c693634989883d2f94d2fa81f98
+SHA1 (patch-ah) = 8cfe18b486fdd49eb162e20509ddf59e4b0c7375
 SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee
-SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0
-SHA1 (patch-ak) = d4c41a8a52d5420e1a9228d725dfd21e52c2fb3a
+SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
 SHA1 (patch-am) = a2bfd8f345ce2c68b9387b02b08437cb9fc5772b
-SHA1 (patch-an) = 365e6ee90c178349b6ca127accb47b9c7de7ce94
-SHA1 (patch-ao) = d90d238b066be15a4b2d6c8c03fa769bcf87adff
+SHA1 (patch-an) = c6028add3598bec7f0cceaed6ecfbc6c67b0c4ab
+SHA1 (patch-ao) = 1fd6f196210abc0d9645404e24b953d9dbee93d3
 SHA1 (patch-ap) = 65ca9bcf58d1004e022c466bc40bb9f822e87f77
-SHA1 (patch-aq) = 71591dbd2b98b65c40f9d9616f79d76b124f99b5
+SHA1 (patch-aq) = a8cabf3b43e1a2a878105875d68d5b000fe6632a
diff --git a/sysutils/bacula/files/chio-changer b/sysutils/bacula/files/chio-changer
index d477daa0a4f..be4b75097b3 100755
--- a/sysutils/bacula/files/chio-changer
+++ b/sysutils/bacula/files/chio-changer
@@ -38,12 +38,15 @@ check_parm_count() {
 # Check for special cases where only 2 arguments are needed, 
 # all others are a minimum of 5
 case $2 in
-    list)
+    list|listall)
 	check_parm_count $# 2
 	;;
     slots)
 	check_parm_count $# 2
 	;;
+    transfer)
+	check_parm_count $# 4
+	;;
     *)
 	check_parm_count $# 5
 	;;
@@ -67,13 +70,17 @@ case $cmd in
       ;;
 
    list) 
-      ${CHIO} -f $ctl status slot voltags | awk "/</ { slot=\$2 }\
+      ${CHIO} -f $ctl status slot voltags | /usr/bin/awk "/</ { slot=\$2 }\
 		/Primary volume tag:/ { tag=\$4 }\
 		/From:/ { print slot tag }"
       ;;
 
+   listall)
+      echo "Not yet implemented"
+      ;;
+
    loaded)
-      ${CHIO} -f $ctl status drive $drive | awk "BEGIN { from=0 }\
+      ${CHIO} -f $ctl status drive $drive | /usr/bin/awk "BEGIN { from=0 }\
 		/From:/{ from=\$3 }\
 		END { print from }"
       ;;
@@ -81,4 +88,10 @@ case $cmd in
    slots)
       ${CHIO} -f $ctl params | awk "/slots/{print \$2}"
       ;;
+
+   transfer)
+      ${CHIO} -f $ctl move slot $slot slot $device
+      ;;
 esac
+
+sleep 1
diff --git a/sysutils/bacula/patches/patch-aa b/sysutils/bacula/patches/patch-aa
index 3280060b422..fdebb080e1d 100644
--- a/sysutils/bacula/patches/patch-aa
+++ b/sysutils/bacula/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2009/05/16 08:06:56 adam Exp $
+$NetBSD: patch-aa,v 1.5 2010/03/09 07:06:00 adam Exp $
 
---- src/dird/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
+--- src/dird/Makefile.in.orig	2010-02-24 15:33:48.000000000 +0000
 +++ src/dird/Makefile.in
-@@ -63,7 +63,7 @@ all: Makefile bacula-dir @STATIC_DIR@
+@@ -64,7 +64,7 @@ all: Makefile bacula-dir @STATIC_DIR@
  bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
  	@echo "Linking $@ ..."
  	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
 -	      -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
 +	      ../findlib/libbacfind.la ../cats/libbacsql.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
- 	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
  
  static-bacula-dir:  Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
-@@ -97,14 +97,14 @@ devclean: realclean
+@@ -98,14 +98,14 @@ devclean: realclean
  install: all
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
  	@srcconf=bacula-dir.conf; \
diff --git a/sysutils/bacula/patches/patch-ae b/sysutils/bacula/patches/patch-ae
index b92f41420cb..24d12b0e2b1 100644
--- a/sysutils/bacula/patches/patch-ae
+++ b/sysutils/bacula/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.5 2009/05/16 08:06:56 adam Exp $
+$NetBSD: patch-ae,v 1.6 2010/03/09 07:06:00 adam Exp $
 
---- src/filed/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
+--- src/filed/Makefile.in.orig	2010-02-24 15:33:48.000000000 +0000
 +++ src/filed/Makefile.in
-@@ -86,7 +86,7 @@ win32:	$(WIN32OBJS)
+@@ -87,7 +87,7 @@ win32:	$(WIN32OBJS)
  bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
  	@echo "Linking $@ ..."
  	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
 -	  $(WIN32LIBS) $(FDLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
 +	  $(WIN32LIBS) $(FDLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \
- 	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
  
  static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
-@@ -129,14 +129,14 @@ devclean: realclean
+@@ -130,14 +130,14 @@ devclean: realclean
  install: all
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
  	@srcconf=bacula-fd.conf; \
diff --git a/sysutils/bacula/patches/patch-af b/sysutils/bacula/patches/patch-af
index c1d2be1f428..8fe2a26eba9 100644
--- a/sysutils/bacula/patches/patch-af
+++ b/sysutils/bacula/patches/patch-af
@@ -1,17 +1,17 @@
-$NetBSD: patch-af,v 1.5 2009/05/16 08:06:57 adam Exp $
+$NetBSD: patch-af,v 1.6 2010/03/09 07:06:00 adam Exp $
 
---- src/stored/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
+--- src/stored/Makefile.in.orig	2010-02-24 15:33:48.000000000 +0000
 +++ src/stored/Makefile.in
-@@ -90,7 +90,7 @@ all: Makefile bacula-sd @STATIC_SD@ bls 
+@@ -91,7 +91,7 @@ all: Makefile bacula-sd @STATIC_SD@ bls 
  bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
  	@echo "Linking $@ ..."
  	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
 -	   -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
 +	   ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
- 	$(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
  
  static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-@@ -106,7 +106,7 @@ btape.o: btape.c
+@@ -107,7 +107,7 @@ btape.o: btape.c
  
  btape: Makefile  $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
  	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) \
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.5 2009/05/16 08:06:57 adam Exp $
  
  bls.o:	bls.c
  	@echo "Compiling $<"
-@@ -116,7 +116,7 @@ bls.o:	bls.c
+@@ -117,7 +117,7 @@ bls.o:	bls.c
  bls:	Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
  	@echo "Compiling $<"
  	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
@@ -29,7 +29,7 @@ $NetBSD: patch-af,v 1.5 2009/05/16 08:06:57 adam Exp $
  
  bextract.o: bextract.c
  	@echo "Compiling $<"
-@@ -126,7 +126,7 @@ bextract.o: bextract.c
+@@ -127,7 +127,7 @@ bextract.o: bextract.c
  bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
  	@echo "Compiling $<"
  	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \
@@ -38,7 +38,7 @@ $NetBSD: patch-af,v 1.5 2009/05/16 08:06:57 adam Exp $
  
  bscan.o: bscan.c
  	@echo "Compiling $<"
-@@ -135,7 +135,7 @@ bscan.o: bscan.c
+@@ -136,7 +136,7 @@ bscan.o: bscan.c
  
  bscan:	Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE)
  	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
@@ -47,7 +47,7 @@ $NetBSD: patch-af,v 1.5 2009/05/16 08:06:57 adam Exp $
  
  bcopy.o: bcopy.c
  	@echo "Compiling $<"
-@@ -144,7 +144,7 @@ bcopy.o: bcopy.c
+@@ -145,7 +145,7 @@ bcopy.o: bcopy.c
  
  bcopy:	Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
  	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
@@ -56,7 +56,7 @@ $NetBSD: patch-af,v 1.5 2009/05/16 08:06:57 adam Exp $
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
  	cd $(topdir) \
-@@ -158,14 +158,14 @@ install: all
+@@ -159,14 +159,14 @@ install: all
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
  	@srcconf=bacula-sd.conf; \
diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag
deleted file mode 100644
index 515f0c795f7..00000000000
--- a/sysutils/bacula/patches/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2009/08/18 15:23:59 joerg Exp $
-
---- src/gnome2-console/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
-+++ src/gnome2-console/Makefile.in
-@@ -62,7 +62,7 @@ support.o:   support.c
- 	sed "s%parent = g_object_get_data%parent = \(GtkWidget \*\)g_object_get_data%" support.c.orig >support.c
- 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
--bgnome-console: Makefile $(CONSOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
-+bgnome-console: Makefile $(CONSOBJS)
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \
- 	      $(LIBS) $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm
- 
-@@ -106,14 +106,14 @@ install: all
- 	fi
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bgnome-console $(DESTDIR)$(sbindir)/bgnome-console
- 	@srcconf=bgnome-console.conf; \
--	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
- 	   destconf=$$srcconf.new; \
- 	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
- 	else \
- 	   destconf=$$srcconf; \
- 	fi; \
--	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
--	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
- 	if test -f static-bgnome-console; then \
- 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \
- 	fi 
diff --git a/sysutils/bacula/patches/patch-ah b/sysutils/bacula/patches/patch-ah
index e426d20a3e8..0b471ee68d5 100644
--- a/sysutils/bacula/patches/patch-ah
+++ b/sysutils/bacula/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.7 2009/08/18 15:23:59 joerg Exp $
+$NetBSD: patch-ah,v 1.8 2010/03/09 07:06:00 adam Exp $
 
---- src/wx-console/Makefile.in.orig	2009-03-09 16:34:05.000000000 +0100
+--- src/wx-console/Makefile.in.orig	2010-02-24 15:33:48.000000000 +0000
 +++ src/wx-console/Makefile.in
 @@ -81,7 +81,7 @@ bwx-console.app: bwx-console
  	mv bwx-console bwx-console.app/Contents/MacOS/bwx-console
@@ -8,8 +8,8 @@ $NetBSD: patch-ah,v 1.7 2009/08/18 15:23:59 joerg Exp $
  
 -bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 +bwx-console: Makefile $(CONSOBJS) @WIN32@
- 	$(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) \
- 	  -lbaccfg -lbac $(OPENSSL_LIBS)
+ 	$(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ -L../lib $(CONS_LDFLAGS) \
+ 	  -lbaccfg -lbac $(LIBS) $(OPENSSL_LIBS)
  
 @@ -114,14 +114,14 @@ install: all
  	fi
diff --git a/sysutils/bacula/patches/patch-aj b/sysutils/bacula/patches/patch-aj
index 853ded85feb..35b1ab1a678 100644
--- a/sysutils/bacula/patches/patch-aj
+++ b/sysutils/bacula/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.5 2007/01/04 12:29:26 ghen Exp $
+$NetBSD: patch-aj,v 1.6 2010/03/09 07:06:00 adam Exp $
 
---- manpages/Makefile.in.orig	2006-08-27 20:30:56.000000000 +0200
+--- manpages/Makefile.in.orig	2010-02-24 15:33:48.000000000 +0000
 +++ manpages/Makefile.in
-@@ -20,15 +20,11 @@ depend:
+@@ -21,15 +21,11 @@ depend:
  install:
  	$(MKDIR) $(DESTDIR)/$(mandir)/man8
  	for I in ${MAN8}; \
diff --git a/sysutils/bacula/patches/patch-ak b/sysutils/bacula/patches/patch-ak
deleted file mode 100644
index 5bc30a36576..00000000000
--- a/sysutils/bacula/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2009/05/15 10:29:05 adam Exp $
-
---- src/findlib/Makefile.in.orig	2009-04-10 13:34:22.000000000 +0200
-+++ src/findlib/Makefile.in
-@@ -47,7 +47,7 @@ LIBBACFIND_LT_AGE = 0
- 	@echo "Compiling $<"
- 	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- #-------------------------------------------------------------------------
--all: Makefile libbacfind$(DEFAULT_ARCHIVE_TYPE) libbacfind.a ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-+all: Makefile libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "==== Make of findlib is good ===="
- 	@echo " "
- 
diff --git a/sysutils/bacula/patches/patch-an b/sysutils/bacula/patches/patch-an
index f71c173a687..a87d40bd200 100644
--- a/sysutils/bacula/patches/patch-an
+++ b/sysutils/bacula/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.1 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-an,v 1.2 2010/03/09 07:06:00 adam Exp $
 
---- src/tools/Makefile.in.orig	2009-04-14 23:04:07.000000000 +0200
+--- src/tools/Makefile.in.orig	2010-02-24 15:33:48.000000000 +0000
 +++ src/tools/Makefile.in
 @@ -57,21 +57,21 @@ all: Makefile $(TOOLS) gigaslam grow
  	@echo " "
@@ -56,10 +56,10 @@ $NetBSD: patch-an,v 1.1 2009/05/15 10:29:05 adam Exp $
 -	  -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 +	  ../cats/libbacsql.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
- gigaslam.o: gigaslam.c
- 	$(CC) -c $<  
-@@ -110,7 +110,7 @@ gigaslam: gigaslam.o
- 	$(CC) -o $@ gigaslam.o
+ bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
+ 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o  \
+@@ -118,7 +118,7 @@ gigaslam: gigaslam.o
+ 	$(CXX) -o $@ gigaslam.o
  
  grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 -	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
diff --git a/sysutils/bacula/patches/patch-ao b/sysutils/bacula/patches/patch-ao
index 82c3b8ab06d..1676a0dfad7 100644
--- a/sysutils/bacula/patches/patch-ao
+++ b/sysutils/bacula/patches/patch-ao
@@ -1,13 +1,13 @@
-$NetBSD: patch-ao,v 1.2 2009/08/24 08:23:41 adam Exp $
+$NetBSD: patch-ao,v 1.3 2010/03/09 07:06:00 adam Exp $
 
---- configure.orig	2009-07-10 16:12:39.000000000 +0200
+--- configure.orig	2010-02-24 15:33:48.000000000 +0000
 +++ configure
-@@ -45726,7 +45726,7 @@ echo "$as_me: error: Could not find qmak
-    { (exit 1); exit 1; }; }
+@@ -31880,7 +31880,7 @@ if test "${support_bat}" = "yes" ; then
+       as_fn_error "Could not find qmake $PATH. Check your Qt installation" "$LINENO" 5
     fi
  
 -   QMAKEBIN="qmake"
 +   QMAKEBIN=${QMAKE}
- 
-    if test "x$QMAKEQT4" != "xnone"; then
-        QMAKEBIN=qmake-qt4
+    cd src/qt-console
+    echo "Creating bat Makefile"
+    touch bat
diff --git a/sysutils/bacula/patches/patch-aq b/sysutils/bacula/patches/patch-aq
index dfb059cd93f..e63990619b0 100644
--- a/sysutils/bacula/patches/patch-aq
+++ b/sysutils/bacula/patches/patch-aq
@@ -1,11 +1,11 @@
-$NetBSD: patch-aq,v 1.1 2009/11/09 12:26:08 joerg Exp $
+$NetBSD: patch-aq,v 1.2 2010/03/09 07:06:00 adam Exp $
 
---- src/plugins/fd/Makefile.in.orig	2009-11-09 13:04:36.000000000 +0100
+--- src/plugins/fd/Makefile.in.orig	2010-02-24 15:33:48.000000000 +0000
 +++ src/plugins/fd/Makefile.in
-@@ -51,7 +51,6 @@ bpipe-fd.so: bpipe-fd.o
+@@ -28,7 +28,6 @@ bpipe-fd.la: Makefile bpipe-fd$(DEFAULT_
  install: all
  	$(MKDIR) $(DESTDIR)$(plugindir)
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd$(DEFAULT_SHARED_OBJECT_TYPE) $(DESTDIR)$(plugindir)
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir)
 -	$(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
  
  libtool-clean: