Changes 2.4.3:

* Apply 2.4.2-cancel-non-running-jobs.patch to be able to cancel
  a non created job faster.
* Fix typo in configure.in that breaks --with-db-password option
* Remove all double quotes from SQLite creating script and
  replace by single quotes as suggested by John Huttley.
* Fix SQL case problem that may cause the failure of DiskToCatalog.
* Copy missing storage name into edit buffer. As far as I can tell
  this never caused a bug.
* Remove catalog dependency for bcopy
* Modify catalog scripts to have an easier packaging integration,
  using default variables.
  Make difference between SQLite3 and SQLite in db_get_type()
  job when reading from one autochanger and writing to another.
* Add more information to SD acquire.c INFO messages.
* Fix NULL Volume name error when reading and the drive must
  be switched.
* Fix a Verify InitCatalog problem where in certain cases
  a garbage filename may be entered in the verification database.
* Add space after version before date in bat about dialog.
* Fix seg fault in Dir during estimate command with no level value given.
* Add message to migration job when the target job is already migrated.

22 files changed, 82 insertions, 264 deletions

diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile
index 9001e1f5eac..1a6063860c0 100644
--- a/sysutils/bacula-clientonly/Makefile
+++ b/sysutils/bacula-clientonly/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2008/09/30 15:20:30 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/11/21 14:09:31 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-clientonly/options.mk b/sysutils/bacula-clientonly/options.mk
index 974c6bbc145..6050025adf0 100644
--- a/sysutils/bacula-clientonly/options.mk
+++ b/sysutils/bacula-clientonly/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/09/30 15:20:30 joerg Exp $
+# $NetBSD: options.mk,v 1.4 2008/11/21 14:09:31 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bacula-clientonly
 PKG_SUPPORTED_OPTIONS=		bacula-static
@@ -15,4 +15,3 @@ PLIST_SUBST+=		STATIC=
 .else
 PLIST_SUBST+=		STATIC="@comment "
 .endif
-
diff --git a/sysutils/bacula-doc/Makefile b/sysutils/bacula-doc/Makefile
index 893c9d665a0..cc2bb082ffd 100644
--- a/sysutils/bacula-doc/Makefile
+++ b/sysutils/bacula-doc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2008/07/13 15:26:36 tonnerre Exp $
+# $NetBSD: Makefile,v 1.17 2008/11/21 14:09:31 adam Exp $
 
-DISTNAME=		bacula-docs-2.0.2
-PKGREVISION=		1
+DISTNAME=		bacula-docs-2.4.3
 PKGNAME=		${DISTNAME:S/docs/doc/}
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.bacula.org/
@@ -17,16 +17,12 @@ NO_BUILD=		yes
 
 DOCDIR=			share/doc/bacula
 
-INSTALLATION_DIRS=	${DOCDIR} ${DOCDIR}/manual ${DOCDIR}/developers
+INSTALLATION_DIRS=	${DOCDIR} ${DOCDIR}/manual
 
 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}/developers/developers/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
-	${INSTALL_DATA} ${WRKSRC}/developers/developers/developers.css  ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
-	${INSTALL_DATA} ${WRKSRC}/developers/developers/*.png  ${DESTDIR}${PREFIX}/${DOCDIR}/developers/
-	${INSTALL_DATA} ${WRKSRC}/developers/developers.pdf  ${DESTDIR}${PREFIX}/${DOCDIR}/developers.pdf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula-doc/PLIST b/sysutils/bacula-doc/PLIST
index 454b53a3e6a..a927615fa40 100644
--- a/sysutils/bacula-doc/PLIST
+++ b/sysutils/bacula-doc/PLIST
@@ -1,67 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/31 17:59:10 ghen Exp $
-share/doc/bacula/developers.pdf
-share/doc/bacula/developers/About_this_document.html
-share/doc/bacula/developers/Bacula-tray-monitor.png
-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/Catalog_Services.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/Developers_Guide.html
-share/doc/bacula/developers/Director_Services_Daemon.html
-share/doc/bacula/developers/File_Services_Daemon.html
-share/doc/bacula/developers/GNU_Free_Documentat_License.html
-share/doc/bacula/developers/General_Index.html
-share/doc/bacula/developers/Impleme_Bacula_GUI_Interfa.html
-share/doc/bacula/developers/List_Figures.html
-share/doc/bacula/developers/List_Tables.html
-share/doc/bacula/developers/Platform_Support.html
-share/doc/bacula/developers/Smart_Memory_Allocatio_With.html
-share/doc/bacula/developers/Storage_Daemon_Design.html
-share/doc/bacula/developers/Storage_Media_Output_Format.html
-share/doc/bacula/developers/TCP_IP_Network_Protocol.html
-share/doc/bacula/developers/TLS.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/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/error.png
-share/doc/bacula/developers/file.png
-share/doc/bacula/developers/flow.png
-share/doc/bacula/developers/home.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/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
+@comment $NetBSD: PLIST,v 1.3 2008/11/21 14:09:31 adam Exp $
 share/doc/bacula/manual.pdf
 share/doc/bacula/manual/ANSI_IBM_Tape_Labels.html
 share/doc/bacula/manual/About_this_document.html
@@ -99,7 +36,6 @@ 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/FileSet_Resource.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
@@ -115,6 +51,7 @@ 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
@@ -152,6 +89,7 @@ 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/img2.png
 share/doc/bacula/manual/index.html
 share/doc/bacula/manual/index.png
 share/doc/bacula/manual/md5.png
@@ -185,5 +123,4 @@ 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
-@dirrm share/doc/bacula/developers
 @dirrm share/doc/bacula
diff --git a/sysutils/bacula-doc/distinfo b/sysutils/bacula-doc/distinfo
index 28f3054df46..71fe02ce727 100644
--- a/sysutils/bacula-doc/distinfo
+++ b/sysutils/bacula-doc/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.14 2008/07/13 15:26:36 tonnerre Exp $
+$NetBSD: distinfo,v 1.15 2008/11/21 14:09:31 adam Exp $
 
-SHA1 (bacula-docs-2.0.2.tar.gz) = a07c74b0c98f7afe0896f3f4908004e3984819e6
-RMD160 (bacula-docs-2.0.2.tar.gz) = 14c6582e9dabc4448fb681be192f46835ba0cb30
-Size (bacula-docs-2.0.2.tar.gz) = 29776690 bytes
-SHA1 (patch-aa) = 04898ece4b4c13b50acf08dad16a76eea0fbfc7d
-SHA1 (patch-ab) = e8320baae18f53f5091a0d0b662ec7e613cc1713
-SHA1 (patch-ac) = 829d3cff40f095f3d2e0959f8dbb368031d7c51b
-SHA1 (patch-ad) = 16a4e438f0931d436d914440d98874dcf0b17467
-SHA1 (patch-ae) = ddcb2258ae20aec96904bf6b08672a413358ed13
+SHA1 (bacula-docs-2.4.3.tar.bz2) = a27da517785b5f4108940f05e87e9a6461a9f458
+RMD160 (bacula-docs-2.4.3.tar.bz2) = a79987a209c4deb0aa1684a288133dd546e42f12
+Size (bacula-docs-2.4.3.tar.bz2) = 23011287 bytes
+SHA1 (patch-aa) = 52783e5e70ce0f444044474fae6ccee29711f445
+SHA1 (patch-ab) = ee8ed9aa3dbd1f689abbeee2ff8980b1c0ee9130
diff --git a/sysutils/bacula-doc/patches/patch-aa b/sysutils/bacula-doc/patches/patch-aa
index 2bc02683d52..d7610dd6a65 100644
--- a/sysutils/bacula-doc/patches/patch-aa
+++ b/sysutils/bacula-doc/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
+$NetBSD: patch-aa,v 1.2 2008/11/21 14:09:31 adam Exp $
 
---- manual/tips.tex.orig	2007-01-15 10:37:15.000000000 +0100
+--- manual/tips.tex.orig	2008-01-30 11:26:18.000000000 +0100
 +++ manual/tips.tex
-@@ -598,6 +598,11 @@ setup procedure leaves the database open
- assign the user {\bf bacula} a userid and add it to your Director's
- configuration file in the appropriate Catalog resource. 
+@@ -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
diff --git a/sysutils/bacula-doc/patches/patch-ab b/sysutils/bacula-doc/patches/patch-ab
index 63dbe364b49..5c5149fb5da 100644
--- a/sysutils/bacula-doc/patches/patch-ab
+++ b/sysutils/bacula-doc/patches/patch-ab
@@ -1,19 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/21 14:09:31 adam Exp $
 
---- manual/catmaintenance.tex.orig	2007-01-05 18:20:40.000000000 +0100
+--- manual/catmaintenance.tex.orig	2008-11-21 12:54:44.000000000 +0100
 +++ manual/catmaintenance.tex
-@@ -545,6 +545,8 @@ Job {
-   Storage = DLTDrive
-   Messages = Standard
-   Pool = Default
-+  # WARNING!!! Passing the password via the command line is insecure.
-+  # see comments in make_catalog_backup for details.
-   RunBeforeJob = "/home/kern/bacula/bin/make_catalog_backup"
-   RunAfterJob  = "/home/kern/bacula/bin/delete_catalog_backup"
-   Write Bootstrap = "/home/kern/bacula/working/BackupCatalog.bsr"
-@@ -573,6 +575,33 @@ you to quickly recover the database back
- you do not have a bootstrap file, it is still possible to recover your
- database backup, but it will be more work and take longer. 
+@@ -641,6 +641,33 @@ Only you can decide what is appropriate 
+ you with a starting point.  We hope it helps.
+ 
  
 +
 +\label{BackingUpBaculaSecurityConsiderations}
diff --git a/sysutils/bacula-doc/patches/patch-ac b/sysutils/bacula-doc/patches/patch-ac
deleted file mode 100644
index a5cdd011709..00000000000
--- a/sysutils/bacula-doc/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
-
---- manual/pools.tex.orig	2007-01-05 18:20:41.000000000 +0100
-+++ manual/pools.tex
-@@ -235,6 +235,8 @@ Job {
-   Messages = Standard
-   Pool = Default
-   # This creates an ASCII copy of the catalog
-+  # WARNING!!! Passing the password via the command line is insecure.
-+  # see comments in make_catalog_backup for details.
-   RunBeforeJob = "/home/bacula/bin/make_catalog_backup bacula bacula"
-   # This deletes the copy of the catalog
-   RunAfterJob  = "/home/bacula/bin/delete_catalog_backup"
diff --git a/sysutils/bacula-doc/patches/patch-ad b/sysutils/bacula-doc/patches/patch-ad
deleted file mode 100644
index bc92e170885..00000000000
--- a/sysutils/bacula-doc/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
-
---- manual/postgresql.tex.orig	2007-01-05 18:20:41.000000000 +0100
-+++ manual/postgresql.tex
-@@ -200,6 +200,8 @@ password in place, these two lines shoul
- \begin{verbatim}
-   dbname = bacula; user = bacula; password = "secret"
-     ... and ...
-+ # WARNING!!! Passing the password via the command line is insecure.
-+ # see comments in make_catalog_backup for details.
-   RunBeforeJob = "/etc/make_catalog_backup bacula bacula secret"
- \end{verbatim}
- \normalsize
diff --git a/sysutils/bacula-doc/patches/patch-ae b/sysutils/bacula-doc/patches/patch-ae
deleted file mode 100644
index 199f44ba844..00000000000
--- a/sysutils/bacula-doc/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
-
---- manual/strategies.tex.orig	2007-01-15 10:37:15.000000000 +0100
-+++ manual/strategies.tex
-@@ -232,6 +232,8 @@ Job {
-   Messages = Standard
-   Pool = Default
-  # This creates an ASCII copy of the catalog
-+ # WARNING!!! Passing the password via the command line is insecure.
-+ # see comments in make_catalog_backup for details.
-   RunBeforeJob = "/usr/lib/bacula/make_catalog_backup -u bacula"
-  # This deletes the copy of the catalog, and ejects the tape
-   RunAfterJob  = "/etc/bacula/end_of_backup.sh"
diff --git a/sysutils/bacula-gnome-console/Makefile b/sysutils/bacula-gnome-console/Makefile
index 642439aa97f..857582a0726 100644
--- a/sysutils/bacula-gnome-console/Makefile
+++ b/sysutils/bacula-gnome-console/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/11/21 14:09:31 adam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-gnomeconsole-/}
-PKGREVISION=		4
 COMMENT=		Gnome console for Bacula - The Network Backup Solution
 CATEGORIES+=		gnome
 
diff --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile
index 223c494e581..135abae92ad 100644
--- a/sysutils/bacula-wx-console/Makefile
+++ b/sysutils/bacula-wx-console/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/09/22 20:21:04 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/11/21 14:09:31 adam Exp $
 
 PKGNAME=		${DISTNAME:S/-/-wxconsole-/}
 COMMENT=		wxWindows-based console for Bacula - The Network Backup Solution
@@ -17,5 +17,5 @@ BUILD_DIRS+=		src/wx-console
 INSTALLATION_DIRS=	sbin share/examples/bacula
 
 .include "../../sysutils/bacula/Makefile.common"
-.include "../../x11/wxGTK26/buildlink3.mk"
+.include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index dbf02d7b61b..291c6bd9561 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/07/13 15:26:36 tonnerre Exp $
-
-PKGREVISION=		4
+# $NetBSD: Makefile,v 1.28 2008/11/21 14:09:30 adam Exp $
 
 CONFLICTS+=		bacula-client-[0-9]* bacula-clientonly-[0-9]*
 
@@ -11,12 +9,14 @@ PKG_DESTDIR_SUPPORT=	destdir
 PLIST_SRC=		PLIST.common
 PLIST_SRC+=		PLIST.server
 
-PLIST_SUBST+=		BACULA_DB=${BACULA_DB:Q}
-MESSAGE_SUBST+=		PREFIX=${PREFIX:Q}
-MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV:Q}
+PLIST_SUBST+=		BACULA_DB=${BACULA_DB}
+MESSAGE_SUBST+=		PREFIX=${PREFIX}
+MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV}
 
-CONFIGURE_ARGS+=	--with-dir-user=${BACULA_DIR_USER:Q} --with-dir-group=${BACULA_GROUP:Q}
-CONFIGURE_ARGS+=	--with-sd-user=${BACULA_SD_USER:Q} --with-sd-group=${BACULA_GROUP:Q}
+CONFIGURE_ARGS+=	--with-dir-group=${BACULA_GROUP}
+CONFIGURE_ARGS+=	--with-dir-user=${BACULA_DIR_USER}
+CONFIGURE_ARGS+=	--with-sd-group=${BACULA_GROUP}
+CONFIGURE_ARGS+=	--with-sd-user=${BACULA_SD_USER}
 
 OWN_DIRS_PERMS+=	${BACULA_WORKINGDIR} ${ROOT_USER} ${BACULA_GROUP} 770
 
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index b3505c37763..04800992c45 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,18 +1,13 @@
-# $NetBSD: Makefile.common,v 1.45 2008/07/12 17:04:12 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.46 2008/11/21 14:09:30 adam Exp $
 
-DISTNAME=		bacula-2.2.4
+DISTNAME=		bacula-2.4.3
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 
 PATCH_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
-PATCHFILES=		2.2.4-lost-block.patch \
-			2.2.4-parse-command.patch \
-			2.2.4-poll-mount.patch \
-			2.2.4-replace.patch \
-			2.2.4-restore.patch \
-			2.2.4-sd-auth-fail.patch \
-			2.2.4-sql.patch \
-			2.2.4-verify.patch
+PATCHFILES=		2.4.3-orphaned-jobs.patch \
+			2.4.3-cancel-after-network-outage.patch \
+			2.4.3-update-slots.patch
 DIST_SUBDIR=		${DISTNAME}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -21,6 +16,7 @@ COMMENT?=		The Network Backup Solution
 
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
@@ -38,11 +34,11 @@ BACULA_WORKINGDIR?=	${VARBASE}/spool/bacula
 
 BUILD_DEFS+=		VARBASE BACULA_PIDDIR BACULA_WORKINGDIR
 
-FILES_SUBST+=		BACULA_ETCDIR=${PKG_SYSCONFDIR:Q}
-FILES_SUBST+=		BACULA_PIDDIR=${BACULA_PIDDIR:Q}
-FILES_SUBST+=		BACULA_GROUP=${BACULA_GROUP:Q}
-FILES_SUBST+=		BACULA_DIR_USER=${BACULA_DIR_USER:Q}
-FILES_SUBST+=		BACULA_SD_USER=${BACULA_SD_USER:Q}
+FILES_SUBST+=		BACULA_ETCDIR=${PKG_SYSCONFDIR}
+FILES_SUBST+=		BACULA_PIDDIR=${BACULA_PIDDIR}
+FILES_SUBST+=		BACULA_GROUP=${BACULA_GROUP}
+FILES_SUBST+=		BACULA_DIR_USER=${BACULA_DIR_USER}
+FILES_SUBST+=		BACULA_SD_USER=${BACULA_SD_USER}
 
 SUBST_CLASSES+=		egdir
 SUBST_STAGE.egdir=	post-patch
@@ -55,11 +51,11 @@ SUBST_FILES.egdir+=	src/wx-console/Makefile.in
 SUBST_FILES.egdir+=	src/tray-monitor/Makefile.in
 SUBST_SED.egdir=	-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g'
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-scriptdir=${PREFIX}/libexec/bacula
 CONFIGURE_ARGS+=	--with-sbin-perm=0755
-CONFIGURE_ARGS+=	--with-working-dir=${BACULA_WORKINGDIR:Q}
-CONFIGURE_ARGS+=	--with-pid-dir=${BACULA_PIDDIR:Q}
+CONFIGURE_ARGS+=	--with-working-dir=${BACULA_WORKINGDIR}
+CONFIGURE_ARGS+=	--with-pid-dir=${BACULA_PIDDIR}
 CONFIGURE_ARGS+=	--with-readline=${PREFIX}/include/readline
 
 .if ${OPSYS} == "Linux"
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index d1895deb934..8f49708c67e 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,40 +1,23 @@
-$NetBSD: distinfo,v 1.29 2008/07/13 15:26:36 tonnerre Exp $
+$NetBSD: distinfo,v 1.30 2008/11/21 14:09:30 adam Exp $
 
-SHA1 (bacula-2.2.4/2.2.4-lost-block.patch) = d3b9f927100d148e831248b381c5b2543d215502
-RMD160 (bacula-2.2.4/2.2.4-lost-block.patch) = ff24810e204324acc42dbaff0291a0fa02b56e21
-Size (bacula-2.2.4/2.2.4-lost-block.patch) = 1057 bytes
-SHA1 (bacula-2.2.4/2.2.4-parse-command.patch) = 71538cee6fcfa07a20cabdf0e48887294e56723a
-RMD160 (bacula-2.2.4/2.2.4-parse-command.patch) = 6fc6d9a3c3e2defa0bdee725cf3a0e701cdab8f1
-Size (bacula-2.2.4/2.2.4-parse-command.patch) = 849 bytes
-SHA1 (bacula-2.2.4/2.2.4-poll-mount.patch) = 0b8839c3ecd47f58bcff7b0192e9816b2f9034a6
-RMD160 (bacula-2.2.4/2.2.4-poll-mount.patch) = a1bf2692534facb16ccbe697c39a9a61f0a0df35
-Size (bacula-2.2.4/2.2.4-poll-mount.patch) = 823 bytes
-SHA1 (bacula-2.2.4/2.2.4-replace.patch) = ef188d27fc90527737be874c045f6abbe423321c
-RMD160 (bacula-2.2.4/2.2.4-replace.patch) = ffc8d4bd4c4f520d3c2365a13b83fe2921aeda9c
-Size (bacula-2.2.4/2.2.4-replace.patch) = 631 bytes
-SHA1 (bacula-2.2.4/2.2.4-restore.patch) = 27bfbeb43b3d69bd5f77904be608f96d66e560ce
-RMD160 (bacula-2.2.4/2.2.4-restore.patch) = 03fb3ecf838a9390eb645d50b727bdfd508ee321
-Size (bacula-2.2.4/2.2.4-restore.patch) = 1234 bytes
-SHA1 (bacula-2.2.4/2.2.4-sd-auth-fail.patch) = c73ee8b3865f36752004805f6a44a4fcdaa740b8
-RMD160 (bacula-2.2.4/2.2.4-sd-auth-fail.patch) = eb8db56209c5918677844d751f010281f4b50e41
-Size (bacula-2.2.4/2.2.4-sd-auth-fail.patch) = 5385 bytes
-SHA1 (bacula-2.2.4/2.2.4-sql.patch) = 2e8bf86ba64d5b4d16197fbfeba0ca504b9f3721
-RMD160 (bacula-2.2.4/2.2.4-sql.patch) = ad49cfd911e3d82763d9101f129b7be24e20ec7d
-Size (bacula-2.2.4/2.2.4-sql.patch) = 18382 bytes
-SHA1 (bacula-2.2.4/2.2.4-verify.patch) = 0fe11ff7e49420c13b1b6a79b64e9c511a9e4516
-RMD160 (bacula-2.2.4/2.2.4-verify.patch) = da82063dc69d4de08331e80531b2edd6c4ea40ea
-Size (bacula-2.2.4/2.2.4-verify.patch) = 2076 bytes
-SHA1 (bacula-2.2.4/bacula-2.2.4.tar.gz) = 1fd8e75f231fb3a811696c05ea3c0c719c75289a
-RMD160 (bacula-2.2.4/bacula-2.2.4.tar.gz) = 5005d5566f55a8feb8a7efa610cd60a3d92383af
-Size (bacula-2.2.4/bacula-2.2.4.tar.gz) = 3020298 bytes
+SHA1 (bacula-2.4.3/2.4.3-cancel-after-network-outage.patch) = c3bfc9805792525b95857640c3549443b54e33c4
+RMD160 (bacula-2.4.3/2.4.3-cancel-after-network-outage.patch) = 100e77272267824ee3275df7b190a6da31d78fe3
+Size (bacula-2.4.3/2.4.3-cancel-after-network-outage.patch) = 4766 bytes
+SHA1 (bacula-2.4.3/2.4.3-orphaned-jobs.patch) = 04b44be465f004393658065619e54db982892afa
+RMD160 (bacula-2.4.3/2.4.3-orphaned-jobs.patch) = d099958f74e66de6dd0a631d9fd12dccd215936b
+Size (bacula-2.4.3/2.4.3-orphaned-jobs.patch) = 565 bytes
+SHA1 (bacula-2.4.3/2.4.3-update-slots.patch) = b0ddfb9284125cca9ff05ffef256fdbc6ff854a9
+RMD160 (bacula-2.4.3/2.4.3-update-slots.patch) = 5b59468193c979a08045b983ecdf767b15aa40ec
+Size (bacula-2.4.3/2.4.3-update-slots.patch) = 2681 bytes
+SHA1 (bacula-2.4.3/bacula-2.4.3.tar.gz) = c24e7c2bd8706467d71c60b32cccdec416902cc3
+RMD160 (bacula-2.4.3/bacula-2.4.3.tar.gz) = 3fc216718746f8cdc1e4ca385e3d6f9c72c534c5
+Size (bacula-2.4.3/bacula-2.4.3.tar.gz) = 3125702 bytes
 SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599
-SHA1 (patch-ab) = 24104c731532c00d2901ccd72f43b7184b006496
-SHA1 (patch-ac) = 585f8a00fe7c0e6e8e4c0b91a0bd32bd2fb81c81
-SHA1 (patch-ae) = 69db6d396bd1654b3065d693c5ea2c0afbb8bc61
-SHA1 (patch-af) = 6ecbac39c156c81f30ba53b565f55ab5e876b3e0
+SHA1 (patch-ac) = ee3771bc026d7f6e714f5e77dec920d07d4c12cf
+SHA1 (patch-ae) = 80f2adb5e905f775fbfe6568654ba8495b4c456e
+SHA1 (patch-af) = e2e60b5ecba58ced41855f01719c6bc6e27e6a1d
 SHA1 (patch-ag) = a2734446ac79380692dd5a2647928919c9b2f2b8
 SHA1 (patch-ah) = 83b156ac18b64d19ea0022103c50c431f3b86b87
-SHA1 (patch-ai) = 499a164fcf9e4fc466b691f91203b4293dcee7eb
+SHA1 (patch-ai) = 7965e5f65b010174cdf6490455d3967b316a36ec
 SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0
-SHA1 (patch-ak) = d2b751888edf23a696f347c65ab0f11e6a3829f9
 SHA1 (patch-am) = 0b5b81543eb66ad191d94b59c986561e492a069d
diff --git a/sysutils/bacula/options.mk b/sysutils/bacula/options.mk
index f2920bbfd4a..6a1b950e3a3 100644
--- a/sysutils/bacula/options.mk
+++ b/sysutils/bacula/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2008/07/10 13:54:56 dmcmahill Exp $
+# $NetBSD: options.mk,v 1.12 2008/11/21 14:09:30 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bacula
 PKG_SUPPORTED_OPTIONS=		bacula-static python 
@@ -18,11 +18,11 @@ CONFIGURE_ARGS+=	--with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
 BACULA_DB=		sqlite3
 .elif !empty(PKG_OPTIONS:Mcatalog-pgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-postgresql=${PGSQL_PREFIX:Q}
+CONFIGURE_ARGS+=	--with-postgresql=${PGSQL_PREFIX}
 BACULA_DB=		postgresql
 .elif !empty(PKG_OPTIONS:Mcatalog-mysql)
 .  include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-mysql=${PREFIX:Q}
+CONFIGURE_ARGS+=	--with-mysql=${PREFIX}
 BACULA_DB=		mysql
 .endif
 
@@ -49,4 +49,3 @@ PLIST_SUBST+=		STATIC=
 .else
 PLIST_SUBST+=		STATIC="@comment "
 .endif
-
diff --git a/sysutils/bacula/patches/patch-ab b/sysutils/bacula/patches/patch-ab
deleted file mode 100644
index 6f645aabe7d..00000000000
--- a/sysutils/bacula/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/07/13 15:26:36 tonnerre Exp $
-
---- src/cats/make_catalog_backup.in.orig	2007-04-24 17:36:15.000000000 +0200
-+++ src/cats/make_catalog_backup.in
-@@ -8,7 +8,11 @@
- #  $2 is the user name with which to access the database
- #     (default = bacula).
- #  $3 is the password with which to access the database or "" if no password
--#     (default "")
-+#     (default ""). WARNING!!! Passing the password via the command line is 
-+#     insecure and should not be used since any user can display the command 
-+#     line arguments and the environment using ps.  Please consult your
-+#     MySQL or PostgreSQL manual for secure methods of specifying the
-+#     password.
- #  $4 is the host on which the database is located
- #     (default "")
- #
-@@ -31,7 +35,7 @@ else
-     else
-       MYSQLHOST=""
-     fi
--    ${BINDIR}/mysqldump -u $2$MYSQLPASSWORD$MYSQLHOST -f --opt $1 >$1.sql
-+    ${BINDIR}/mysqldump -u ${2}${MYSQLPASSWORD}${MYSQLHOST} -f --opt $1 >$1.sql
-   else			      
-     if test xpostgresql = x@DB_TYPE@ ; then
-       if test $# -gt 2; then
diff --git a/sysutils/bacula/patches/patch-ac b/sysutils/bacula/patches/patch-ac
index 0e45c6547bb..b44c7fed128 100644
--- a/sysutils/bacula/patches/patch-ac
+++ b/sysutils/bacula/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2005/12/08 01:04:45 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2008/11/21 14:09:31 adam Exp $
 
---- src/console/Makefile.in.orig	2004-06-20 15:43:02.000000000 +0400
+--- src/console/Makefile.in.orig	2007-05-27 11:34:40.000000000 +0200
 +++ src/console/Makefile.in
-@@ -82,19 +82,19 @@ install: all
+@@ -87,19 +87,19 @@ install: all
  	fi
  	$(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
  	@srcconf=bconsole.conf; \
diff --git a/sysutils/bacula/patches/patch-ae b/sysutils/bacula/patches/patch-ae
index 9cd6822ce5a..7e293a840f8 100644
--- a/sysutils/bacula/patches/patch-ae
+++ b/sysutils/bacula/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2005/12/08 01:04:45 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2008/11/21 14:09:31 adam Exp $
 
---- src/filed/Makefile.in.orig	2004-03-11 00:38:48.000000000 +0300
+--- src/filed/Makefile.in.orig	2007-05-27 11:34:40.000000000 +0200
 +++ src/filed/Makefile.in
-@@ -111,14 +111,14 @@ devclean: realclean
+@@ -120,14 +120,14 @@ devclean: realclean
  install: all
  	$(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 a6e1704c91d..6b532df943f 100644
--- a/sysutils/bacula/patches/patch-af
+++ b/sysutils/bacula/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2005/12/08 01:04:45 wiz Exp $
+$NetBSD: patch-af,v 1.3 2008/11/21 14:09:31 adam Exp $
 
---- src/stored/Makefile.in.orig	2004-06-20 15:43:04.000000000 +0400
+--- src/stored/Makefile.in.orig	2008-08-28 14:54:56.000000000 +0200
 +++ src/stored/Makefile.in
-@@ -132,14 +132,14 @@ install: all
+@@ -157,14 +157,14 @@ install: all
  	$(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan
  	$(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
  	@srcconf=bacula-sd.conf; \
diff --git a/sysutils/bacula/patches/patch-ai b/sysutils/bacula/patches/patch-ai
index f0685e179c1..ef63d1ee47f 100644
--- a/sysutils/bacula/patches/patch-ai
+++ b/sysutils/bacula/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2005/12/08 01:04:45 wiz Exp $
+$NetBSD: patch-ai,v 1.4 2008/11/21 14:09:31 adam Exp $
 
---- src/tray-monitor/Makefile.in.orig	2005-04-26 17:04:25.000000000 +0200
+--- src/tray-monitor/Makefile.in.orig	2007-08-16 10:44:39.000000000 +0200
 +++ src/tray-monitor/Makefile.in
-@@ -71,14 +71,14 @@ devclean: realclean
+@@ -69,14 +69,14 @@ devclean: realclean
  install: all
  	$(INSTALL_PROGRAM) bacula-tray-monitor $(DESTDIR)$(sbindir)/bacula-tray-monitor
  	@srcconf=tray-monitor.conf; \
diff --git a/sysutils/bacula/patches/patch-ak b/sysutils/bacula/patches/patch-ak
deleted file mode 100644
index 09b4e85387e..00000000000
--- a/sysutils/bacula/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2008/07/13 15:26:36 tonnerre Exp $
-
---- src/dird/bacula-dir.conf.in.orig	2007-05-27 21:30:39.000000000 +0200
-+++ src/dird/bacula-dir.conf.in
-@@ -61,6 +61,8 @@ Job {
-   FileSet="Catalog"
-   Schedule = "WeeklyCycleAfterBackup"
-   # This creates an ASCII copy of the catalog
-+  # WARNING!!! Passing the password via the command line is insecure.
-+  # see comments in make_catalog_backup for details.
-   RunBeforeJob = "@scriptdir@/make_catalog_backup bacula bacula"
-   # This deletes the copy of the catalog
-   RunAfterJob  = "@scriptdir@/delete_catalog_backup"