Changes 3.0.1:

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

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

16 files changed, 331 insertions, 74 deletions

diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 7fce1857d8c..e60554d63b0 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.49 2009/01/12 17:37:11 shattered Exp $
+# $NetBSD: Makefile.common,v 1.50 2009/05/15 10:29:05 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-2.4.4
+DISTNAME=		bacula-3.0.1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 
@@ -18,6 +18,7 @@ HOMEPAGE=		http://www.bacula.org/
 COMMENT?=		The Network Backup Solution
 
 USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt
 GNU_CONFIGURE=		yes
diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common
index 8b3c3685374..3cce6ddf1b6 100644
--- a/sysutils/bacula/PLIST.common
+++ b/sysutils/bacula/PLIST.common
@@ -1,4 +1,11 @@
-@comment $NetBSD: PLIST.common,v 1.8 2009/01/15 13:32:18 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2009/05/15 10:29:05 adam Exp $
+lib/bpipe-fd.a
+lib/bpipe-fd.so
+lib/libbac.la
+lib/libbaccfg.la
+lib/libbacfind.la
+lib/libbacpy.la
+lib/libbacsql.la
 libexec/bacula/bacula
 libexec/bacula/bacula-ctl-dir
 libexec/bacula/bacula-ctl-fd
@@ -9,6 +16,7 @@ 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
@@ -28,11 +36,19 @@ man/man8/bscan.8
 man/man8/btape.8
 man/man8/btraceback.8
 man/man8/dbcheck.8
+sbin/bacula
 sbin/bacula-fd
 sbin/bconsole
 sbin/btraceback
 ${STATIC}sbin/static-bacula-fd
 ${STATIC}sbin/static-bconsole
+share/doc/ChangeLog
+share/doc/INSTALL
+share/doc/LICENSE
+share/doc/README
+share/doc/ReleaseNotes
+share/doc/VERIFYING
+share/doc/technotes
 share/examples/bacula/bacula-fd.conf
 share/examples/bacula/bconsole.conf
 share/examples/bacula/dvd-handler
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 47b756c7262..8ed060ec871 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,15 +1,20 @@
-$NetBSD: distinfo,v 1.32 2009/01/06 11:29:26 adam Exp $
+$NetBSD: distinfo,v 1.33 2009/05/15 10:29:05 adam Exp $
 
-SHA1 (bacula-2.4.4.tar.gz) = ccdcf82bf975d5d7c7b5d9101f6d0a12a1f94c09
-RMD160 (bacula-2.4.4.tar.gz) = a613b2d731f3d37aff38b3ae050bbd51c1b35670
-Size (bacula-2.4.4.tar.gz) = 3145564 bytes
-SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599
+SHA1 (bacula-3.0.1.tar.gz) = 073d3d9458b51b928c0b5f8cf830c94362366c9a
+RMD160 (bacula-3.0.1.tar.gz) = 8f23238a7475fb1d3371e583d43fbd6f49efc113
+Size (bacula-3.0.1.tar.gz) = 3842746 bytes
+SHA1 (patch-aa) = 9d2332130ac10930291d6dfe22070230aca8d8dd
 SHA1 (patch-ab) = 760c5214dc9a4e4c11e812842e790b973c502c1a
-SHA1 (patch-ac) = ee3771bc026d7f6e714f5e77dec920d07d4c12cf
-SHA1 (patch-ae) = 80f2adb5e905f775fbfe6568654ba8495b4c456e
-SHA1 (patch-af) = e2e60b5ecba58ced41855f01719c6bc6e27e6a1d
-SHA1 (patch-ag) = a2734446ac79380692dd5a2647928919c9b2f2b8
-SHA1 (patch-ah) = 83b156ac18b64d19ea0022103c50c431f3b86b87
-SHA1 (patch-ai) = 7965e5f65b010174cdf6490455d3967b316a36ec
+SHA1 (patch-ac) = d9dc44741297924355a3ac86d9fc204b28c73daf
+SHA1 (patch-ad) = 6a739f6960da444d30df8ffd49cb258446e06797
+SHA1 (patch-ae) = 8e40ed5552e2f0c29cbd6db57fcd29572f86c234
+SHA1 (patch-af) = 841b68034d591f8d859bd0a9260627f23a0f4b65
+SHA1 (patch-ag) = d7a0586819d2c9404ebac576ce23e48aae705130
+SHA1 (patch-ah) = c06e022df8fa7465b495294bed542af33f329d1e
+SHA1 (patch-ai) = 80058e5b7db5bdb5cd08f17a89ae72bed3a1a1ad
 SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0
-SHA1 (patch-am) = 0b5b81543eb66ad191d94b59c986561e492a069d
+SHA1 (patch-ak) = d4c41a8a52d5420e1a9228d725dfd21e52c2fb3a
+SHA1 (patch-al) = 1fc78c0de4461c9294325e835e5ed529228e32c4
+SHA1 (patch-am) = a2bfd8f345ce2c68b9387b02b08437cb9fc5772b
+SHA1 (patch-an) = 365e6ee90c178349b6ca127accb47b9c7de7ce94
+SHA1 (patch-ao) = e2e005d7fa2f769f650fb3f6f2e1c52d611352ad
diff --git a/sysutils/bacula/patches/patch-aa b/sysutils/bacula/patches/patch-aa
index 4dca4267995..03cf02cb9a8 100644
--- a/sysutils/bacula/patches/patch-aa
+++ b/sysutils/bacula/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.2 2005/12/08 01:04:45 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2009/05/15 10:29:05 adam Exp $
 
---- src/dird/Makefile.in.orig	2005-09-28 21:24:56.000000000 +0200
+--- src/dird/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
 +++ src/dird/Makefile.in
-@@ -110,14 +110,14 @@ devclean: realclean
+@@ -63,7 +63,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)
+ 
+ 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
  install: all
- 	$(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
  	@srcconf=bacula-dir.conf; \
 -	   if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	   if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$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 \
@@ -15,8 +24,8 @@ $NetBSD: patch-aa,v 1.2 2005/12/08 01:04:45 wiz Exp $
  	   fi; \
 -	   echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	   ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	   echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	   ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$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 ${DESTDIR}${scriptdir}/query.sql; then \
  	   echo "  ==> Saving existing query.sql to query.sql.old"; \
  	   $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
diff --git a/sysutils/bacula/patches/patch-ac b/sysutils/bacula/patches/patch-ac
index b44c7fed128..cca271eec7a 100644
--- a/sysutils/bacula/patches/patch-ac
+++ b/sysutils/bacula/patches/patch-ac
@@ -1,29 +1,38 @@
-$NetBSD: patch-ac,v 1.3 2008/11/21 14:09:31 adam Exp $
+$NetBSD: patch-ac,v 1.4 2009/05/15 10:29:05 adam Exp $
 
---- src/console/Makefile.in.orig	2007-05-27 11:34:40.000000000 +0200
+--- src/console/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
 +++ src/console/Makefile.in
-@@ -87,19 +87,19 @@ install: all
+@@ -48,7 +48,7 @@ all: Makefile bconsole @STATIC_CONS@
+ 
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+-	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
++	      $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) \
+ 	      $(OPENSSL_LIBS)
+ 
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+@@ -90,19 +90,19 @@ install: all
  	fi
- 	$(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
  	@srcconf=bconsole.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$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; \
 -	   if  test -f ${DESTDIR}${sysconfdir}/console.conf; then \
-+	   if  test -f ${DESTDIR}%%EXAMPLESDIR%%/console.conf; then \
++	   if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/console.conf; then \
  	      echo "Existing console.conf moved to bconsole.conf"; \
 -	      @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \
-+	      @$(MV) ${DESTDIR}%%EXAMPLESDIR%%/console.conf ${DESTDIR}%%EXAMPLESDIR%%/bconsole.conf; \
++	      @$(MV) ${DESTDIR}/usr/pkg/share/examples/bacula/console.conf ${DESTDIR}/usr/pkg/share/examples/bacula/bconsole.conf; \
  	      destconf=$$srcconf.new; \
  	   fi; \
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$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-bconsole; then \
- 	   $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
+ 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
  	fi
diff --git a/sysutils/bacula/patches/patch-ad b/sysutils/bacula/patches/patch-ad
new file mode 100644
index 00000000000..98ea067ee8c
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2009/05/15 10:29:05 adam Exp $
+
+--- src/lib/jcr.c.orig	2009-04-10 13:12:50.000000000 +0200
++++ src/lib/jcr.c
+@@ -1059,13 +1059,8 @@ void _dbg_print_jcr(FILE *fp)
+       
+       fprintf(fp, "JCR=%p JobId=%i name=%s JobStatus=%c\n", 
+               jcr, jcr->JobId, jcr->Job, jcr->JobStatus);
+-#ifdef HAVE_WIN32
+       fprintf(fp, "\tuse_count=%i\n",
+               jcr->use_count());
+-#else
+-      fprintf(fp, "\tuse_count=%i threadid=0x%x\n",
+-              jcr->use_count(), (int)jcr->my_thread_id);
+-#endif
+       fprintf(fp, "\tJobType=%c JobLevel=%c\n",
+               jcr->get_JobType(), jcr->get_JobLevel());
+       bstrftime(buf1, sizeof(buf1), jcr->sched_time);
diff --git a/sysutils/bacula/patches/patch-ae b/sysutils/bacula/patches/patch-ae
index 7e293a840f8..f7855858289 100644
--- a/sysutils/bacula/patches/patch-ae
+++ b/sysutils/bacula/patches/patch-ae
@@ -1,13 +1,22 @@
-$NetBSD: patch-ae,v 1.3 2008/11/21 14:09:31 adam Exp $
+$NetBSD: patch-ae,v 1.4 2009/05/15 10:29:05 adam Exp $
 
---- src/filed/Makefile.in.orig	2007-05-27 11:34:40.000000000 +0200
+--- src/filed/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
 +++ src/filed/Makefile.in
-@@ -120,14 +120,14 @@ devclean: realclean
+@@ -86,7 +86,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)
+ 
+ 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
  install: all
- 	$(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
  	@srcconf=bacula-fd.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$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 \
@@ -15,8 +24,8 @@ $NetBSD: patch-ae,v 1.3 2008/11/21 14:09:31 adam Exp $
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$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-bacula-fd; then \
- 	   $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
+ 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
  	fi
diff --git a/sysutils/bacula/patches/patch-af b/sysutils/bacula/patches/patch-af
index 6b532df943f..64589180168 100644
--- a/sysutils/bacula/patches/patch-af
+++ b/sysutils/bacula/patches/patch-af
@@ -1,13 +1,67 @@
-$NetBSD: patch-af,v 1.3 2008/11/21 14:09:31 adam Exp $
+$NetBSD: patch-af,v 1.4 2009/05/15 10:29:05 adam Exp $
 
---- src/stored/Makefile.in.orig	2008-08-28 14:54:56.000000000 +0200
+--- src/stored/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
 +++ src/stored/Makefile.in
-@@ -157,14 +157,14 @@ install: all
- 	$(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan
- 	$(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
+@@ -90,7 +90,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)
+ 
+ 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
+ 
+ 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) \
+-	   -lbacsql -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	   ../cats/libbacsql.la ../lib/libbaccfg.la ../lib/libbac.la $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bls.o:	bls.c
+ 	@echo "Compiling $<"
+@@ -116,7 +116,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) \
+-	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	   ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bextract.o: bextract.c
+ 	@echo "Compiling $<"
+@@ -126,7 +126,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) \
+-	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	   ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bscan.o: bscan.c
+ 	@echo "Compiling $<"
+@@ -135,7 +135,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) \
+-	   -lbacsql $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	   ../cats/libbacsql.la $(DB_LIBS) $(FDLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bcopy.o: bcopy.c
+ 	@echo "Compiling $<"
+@@ -144,7 +144,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) \
+-	   -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	   ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+ 	cd $(topdir) \
+@@ -158,14 +158,14 @@ install: all
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
  	@srcconf=bacula-sd.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$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 \
@@ -15,8 +69,8 @@ $NetBSD: patch-af,v 1.3 2008/11/21 14:09:31 adam Exp $
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$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-bacula-sd; then \
- 	   $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \
+ 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \
  	fi
diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag
index 89073bb7b6d..7190146c8cf 100644
--- a/sysutils/bacula/patches/patch-ag
+++ b/sysutils/bacula/patches/patch-ag
@@ -1,13 +1,22 @@
-$NetBSD: patch-ag,v 1.4 2007/09/07 15:15:35 ghen Exp $
+$NetBSD: patch-ag,v 1.5 2009/05/15 10:29:05 adam Exp $
 
---- src/gnome2-console/Makefile.in.orig	2007-06-14 18:54:30.000000000 +0200
+--- src/gnome2-console/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
 +++ src/gnome2-console/Makefile.in
-@@ -103,14 +103,14 @@ install: all
+@@ -64,7 +64,7 @@ support.o:   support.c
+ 
+ bgnome-console: Makefile $(CONSOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
+ 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \
+-	      $(LIBS) $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm
++	      $(LIBS) $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm
+ 
+ static-console: static-bgnome-console
+ 
+@@ -106,14 +106,14 @@ install: all
  	fi
- 	$(INSTALL_PROGRAM) bgnome-console $(DESTDIR)$(sbindir)/bgnome-console
+ 	$(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}%%EXAMPLESDIR%%/$$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 \
@@ -15,8 +24,8 @@ $NetBSD: patch-ag,v 1.4 2007/09/07 15:15:35 ghen Exp $
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$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 \
- 	   $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \
+ 	   $(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 f7b3d7f3567..7d6f0b210c1 100644
--- a/sysutils/bacula/patches/patch-ah
+++ b/sysutils/bacula/patches/patch-ah
@@ -1,13 +1,22 @@
-$NetBSD: patch-ah,v 1.4 2007/09/07 15:15:35 ghen Exp $
+$NetBSD: patch-ah,v 1.5 2009/05/15 10:29:05 adam Exp $
 
---- src/wx-console/Makefile.in.orig	2007-05-27 11:34:40.000000000 +0200
+--- src/wx-console/Makefile.in.orig	2009-03-09 16:34:05.000000000 +0100
 +++ src/wx-console/Makefile.in
-@@ -111,14 +111,14 @@ install: all
+@@ -83,7 +83,7 @@ bwx-console.app: bwx-console
+ 
+ bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) \
+-	  -lbaccfg -lbac $(OPENSSL_LIBS)
++	  ../lib/libbaccfg.la ../lib/libbac.la $(OPENSSL_LIBS)
+ 
+ win32: bwx-console_private.res
+ 	
+@@ -114,14 +114,14 @@ install: all
  	fi
- 	$(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console
  	@srcconf=bwx-console.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$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 \
@@ -15,8 +24,8 @@ $NetBSD: patch-ah,v 1.4 2007/09/07 15:15:35 ghen Exp $
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
++	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
++	${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
  
  uninstall:
  	(cd $(DESTDIR)$(sbindir); $(RMF) bwx-console)
diff --git a/sysutils/bacula/patches/patch-ai b/sysutils/bacula/patches/patch-ai
index ef63d1ee47f..4b95de91946 100644
--- a/sysutils/bacula/patches/patch-ai
+++ b/sysutils/bacula/patches/patch-ai
@@ -1,13 +1,22 @@
-$NetBSD: patch-ai,v 1.4 2008/11/21 14:09:31 adam Exp $
+$NetBSD: patch-ai,v 1.5 2009/05/15 10:29:05 adam Exp $
 
---- src/tray-monitor/Makefile.in.orig	2007-08-16 10:44:39.000000000 +0200
+--- src/tray-monitor/Makefile.in.orig	2008-10-19 12:34:03.000000000 +0200
 +++ src/tray-monitor/Makefile.in
-@@ -69,14 +69,14 @@ devclean: realclean
+@@ -45,7 +45,7 @@ all: Makefile bacula-tray-monitor
+ 
+ bacula-tray-monitor: Makefile $(MONITOROBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -o $@ \
+-	  $(MONITOROBJS) $(DLIB) -lbaccfg -lbac -lm $(LIBS) $(OPENSSL_LIBS)
++	  $(MONITOROBJS) $(DLIB) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(OPENSSL_LIBS)
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+ 	cd $(topdir) \
+@@ -71,14 +71,14 @@ devclean: realclean
  install: all
- 	$(INSTALL_PROGRAM) bacula-tray-monitor $(DESTDIR)$(sbindir)/bacula-tray-monitor
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-tray-monitor $(DESTDIR)$(sbindir)/bacula-tray-monitor
  	@srcconf=tray-monitor.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$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 \
@@ -15,8 +24,8 @@ $NetBSD: patch-ai,v 1.4 2008/11/21 14:09:31 adam Exp $
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
++	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
++	${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
  
  uninstall:
  	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-tray-monitor)
diff --git a/sysutils/bacula/patches/patch-ak b/sysutils/bacula/patches/patch-ak
new file mode 100644
index 00000000000..5bc30a36576
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ak
@@ -0,0 +1,13 @@
+$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-al b/sysutils/bacula/patches/patch-al
new file mode 100644
index 00000000000..af70805fb9f
--- /dev/null
+++ b/sysutils/bacula/patches/patch-al
@@ -0,0 +1,14 @@
+$NetBSD: patch-al,v 1.3 2009/05/15 10:29:05 adam Exp $
+
+--- src/cats/sql.c.orig	2009-04-10 13:40:54.000000000 +0200
++++ src/cats/sql.c
+@@ -758,9 +758,6 @@ void _dbg_print_db(JCR *jcr, FILE *fp)
+    fprintf(fp, "\tcmd=\"%s\" changes=%i\n", NPRTB(mdb->cmd), mdb->changes);
+    if (mdb->lock.valid == RWLOCK_VALID) { 
+       fprintf(fp, "\tRWLOCK=%p w_active=%i w_wait=%i\n", &mdb->lock, mdb->lock.w_active, mdb->lock.w_wait);
+-#ifndef HAVE_WIN32
+-      fprintf(fp, "\t\tthreadid=0x%x mutex=%p\n", (int)mdb->lock.writer_id, &mdb->lock.mutex);
+-#endif
+    }
+ }
+ 
diff --git a/sysutils/bacula/patches/patch-am b/sysutils/bacula/patches/patch-am
index 9fa21512a4f..dc63398cd87 100644
--- a/sysutils/bacula/patches/patch-am
+++ b/sysutils/bacula/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2008/01/08 16:52:20 ghen Exp $
+$NetBSD: patch-am,v 1.2 2009/05/15 10:29:05 adam Exp $
 
---- scripts/Makefile.in.orig	2007-04-18 19:06:43.000000000 +0200
+--- scripts/Makefile.in.orig	2009-03-12 19:05:33.000000000 +0100
 +++ scripts/Makefile.in
-@@ -51,11 +51,6 @@ install: installdirs
+@@ -58,11 +58,6 @@ install: installdirs
  	   $(MV) -f ${DESTDIR}${scriptdir}/disk-changer ${DESTDIR}${scriptdir}/disk-changer.old; \
  	fi
  	$(INSTALL_SCRIPT) disk-changer $(DESTDIR)$(scriptdir)/disk-changer
diff --git a/sysutils/bacula/patches/patch-an b/sysutils/bacula/patches/patch-an
new file mode 100644
index 00000000000..f71c173a687
--- /dev/null
+++ b/sysutils/bacula/patches/patch-an
@@ -0,0 +1,69 @@
+$NetBSD: patch-an,v 1.1 2009/05/15 10:29:05 adam Exp $
+
+--- src/tools/Makefile.in.orig	2009-04-14 23:04:07.000000000 +0200
++++ src/tools/Makefile.in
+@@ -57,21 +57,21 @@ all: Makefile $(TOOLS) gigaslam grow
+ 	@echo " "
+ 
+ bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)	    
+-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)	   
+-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
+ 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
+-	  -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	  ../cats/libbacsql.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
++	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o ../findlib/libbacfind.la ../lib/libbac.la -lm \
+ 	  $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \
++	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o ../findlib/libbacfind.la ../lib/libbac.la -lm \
+ 	  $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ dird_conf.o: ../dird/dird_conf.c
+@@ -85,23 +85,23 @@ inc_conf.o: ../dird/inc_conf.c
+ 
+ testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
+ 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \
+-	  $(DLIB) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	  $(DLIB) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ testls: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) testls.o
+ 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
+-	  $(DLIB) -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	  $(DLIB) ../findlib/libbacfind.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o
+ 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
+-	  $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	  $(DLIB) ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bwild:	Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
+ 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
+-	  $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++	  $(DLIB) ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bbatch.o
+ 	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
+-	  -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
+ 
+ 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)
++	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o ../lib/libbac.la -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+ 	cd $(topdir) \
diff --git a/sysutils/bacula/patches/patch-ao b/sysutils/bacula/patches/patch-ao
new file mode 100644
index 00000000000..377f740ce3e
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2009/05/15 10:29:05 adam Exp $
+
+--- configure.orig	2009-05-15 10:52:32.000000000 +0200
++++ configure
+@@ -45609,7 +45609,7 @@ if test "${support_bat}" = "yes" ; then
+       exit 1
+    fi
+ 
+-   QMAKEBIN="qmake"
++   QMAKEBIN=${QMAKE}
+ 
+    if test "x$QMAKEQT4" != "xnone"; then
+        QMAKEBIN=qmake-qt4