diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 148fef46a4f..e12fb6e2665 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,18 +1,24 @@
-# $OpenBSD: Makefile,v 1.15 2009/08/10 06:34:29 kili Exp $
+# $OpenBSD: Makefile,v 1.16 2009/10/02 02:34:05 merdely Exp $
 
 COMMENT-main=		network backup solution (client)
 COMMENT-server=		network backup solution (server)
 COMMENT-bat=		network backup solution (gui-client)
 
-V=			2.4.4
+V=			3.0.2
 DISTNAME=		bacula-$V
 FULLPKGNAME-main=	bacula-client-$V
 FULLPKGPATH-main=	${PKGPATH},-main
 PKGNAME-server=		bacula-server-$V
-FULLPKGNAME-bat=	bacula-bat-$Vp1
+FULLPKGNAME-bat=	bacula-bat-$V
 FULLPKGPATH-bat=	${PKGPATH},-bat
 CATEGORIES=		sysutils
 
+SHARED_LIBS +=		bac		0.0 # .1.0
+SHARED_LIBS +=		baccfg		0.0 # .1.0
+SHARED_LIBS +=		bacpy		0.0 # .1.0
+SHARED_LIBS +=		bacfind		0.0 # .1.0
+SHARED_LIBS +=		bacsql		0.0 # .1.0
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 HOMEPAGE=		http://www.bacula.org/
 
@@ -22,7 +28,8 @@ WANTLIB=		c pthread crypto ssl z m stdc++
 
 MULTI_PACKAGES=		-main
 
-# GPL (majority), LGPL (some libraries) and PD
+# GPLv2 with exception for OpenSSL (majority),
+# FDL (docs), LGPL (some libraries), and PD
 # http://bacula.org/en/dev-manual/Bacula_Copyri_Tradem_Licens.html
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -36,6 +43,7 @@ SUBST_VARS=		SD_USER BACULACONF BACULASTATE TRUEPREFIX
 
 CONFIGURE_STYLE=	simple
 USE_GMAKE=		yes
+USE_LIBTOOL=		yes
 NO_REGRESS=		yes
 
 PSEUDO_FLAVORS=		no_bat no_server
@@ -46,6 +54,8 @@ CONFIGURE_ARGS=		--enable-smartalloc \
 			--prefix=${PREFIX} \
 			--mandir=${PREFIX}/man \
 			--infodir=${PREFIX}/info \
+			--docdir=${PREFIX}/share/doc/bacula \
+			--htmldir=${PREFIX}/share/doc/bacula/html \
 			--sysconfdir=${BACULACONF} \
 			--with-scriptdir=${PREFIX}/libexec/bacula \
 			--localstatedir=${BACULASTATE} \
@@ -66,8 +76,11 @@ CONFIGURE_ARGS=		--enable-smartalloc \
 			--disable-nls \
 			--disable-conio \
 			--enable-readline \
-			--with-openssl
+			--with-openssl \
+			--with-basename=bacula \
+			--with-hostname=bacula
 
+MAKE_FLAGS=		NO_ECHO=
 CONFIGURE_ENV+=		CPPFLAGS="-I/usr/include/readline \
 			-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
@@ -80,10 +93,13 @@ CONFIGURE_ENV+=		CPPFLAGS="-I/usr/include/readline \
 			PKG_CONFIG_LIBDIR="${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4"
 
 .if ${FLAVOR:L:Mno_server}
-CONFIGURE_ARGS+=	--enable-client-only
+CONFIGURE_ARGS+=	--enable-client-only \
+			--disable-build-dird \
+			--disable-build-stored
 .else
 MULTI_PACKAGES+=	-server
 WANTLIB-server=		${WANTLIB} readline termcap
+LIB_DEPENDS-server=	bac,baccfg,bacfind,bacpy::sysutils/bacula,-main
 CONFIGURE_ARGS+=	--with-dir-user=_bacula \
 			--with-dir-group=_bacula \
 			--with-sd-user=${SD_USER} \
@@ -94,11 +110,8 @@ BACKEND=
 .if !empty(BACKEND)
 ERRORS+=		"Fatal: choose either pgsql or mysql or sqlite or sqlite3"
 .endif
-CONFIGURE_ARGS+=	--with-postgresql \
-			--without-mysql \
-			--without-sqlite \
-			--without-sqlite3
-LIB_DEPENDS+=		pq.>=2:postgresql-client-*:databases/postgresql
+CONFIGURE_ARGS+=	--with-postgresql
+LIB_DEPENDS-server+=	pq.>=2:postgresql-client-*:databases/postgresql
 BACKEND=		postgresql
 .else
 CONFIGURE_ARGS+=	--without-postgresql
@@ -108,12 +121,9 @@ CONFIGURE_ARGS+=	--without-postgresql
 .if !empty(BACKEND)
 ERRORS+=		"Fatal: choose either pgsql or mysql or sqlite or sqlite3"
 .endif
-CONFIGURE_ARGS+=	--without-postgresql \
-			--with-mysql \
-			--without-sqlite \
-			--without-sqlite3 \
+CONFIGURE_ARGS+=	--with-mysql \
 			--enable-batch-insert
-LIB_DEPENDS+=		mysqlclient_r.>=18::databases/mysql
+LIB_DEPENDS-server+=	mysqlclient_r.>=18::databases/mysql
 BACKEND=		mysql
 .else
 CONFIGURE_ARGS+=	--without-mysql
@@ -123,11 +133,8 @@ CONFIGURE_ARGS+=	--without-mysql
 .if !empty(BACKEND)
 ERRORS+=		"Fatal: choose either pgsql or mysql or sqlite or sqlite3"
 .endif
-CONFIGURE_ARGS+=	--without-postgresql \
-			--without-mysql \
-			--without-sqlite \
-			--with-sqlite3
-LIB_DEPENDS+=		sqlite3.>=8::databases/sqlite3
+CONFIGURE_ARGS+=	--with-sqlite3
+LIB_DEPENDS-server+=	sqlite3.>=8::databases/sqlite3
 BACKEND=		sqlite3
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
@@ -137,11 +144,8 @@ CONFIGURE_ARGS+=	--without-sqlite3
 .if !empty(BACKEND)
 ERRORS+=		"Fatal: choose either pgsql or mysql or sqlite or sqlite3"
 .endif
-CONFIGURE_ARGS+=	--without-postgresql \
-			--without-mysql \
-			--with-sqlite \
-			--without-sqlite3
-LIB_DEPENDS+=		sqlite::databases/sqlite
+CONFIGURE_ARGS+=	--with-sqlite
+LIB_DEPENDS-server+=	sqlite::databases/sqlite
 BACKEND=		sqlite
 .else
 CONFIGURE_ARGS+=	--without-sqlite
@@ -159,12 +163,13 @@ LIB_DEPENDS-main=
 CONFIGURE_ARGS+=	--disable-bat
 .else
 CONFIGURE_ARGS+=	--enable-bat
-WANTLIB-bat=		${WANTLIB} ICE SM X11 Xext
-WANTLIB-bat+=		Xi Xinerama Xrender expat fontconfig freetype
-WANTLIB-bat+=		glib-2.0 gobject-2.0 gthread-2.0 iconv intl png
-WANTLIB-bat+=		pthread-stubs xcb
+WANTLIB-bat=		${WANTLIB} ICE SM X11 Xau Xdmcp Xext Xi Xinerama \
+			Xrender expat fontconfig freetype gobject-2.0 glib-2.0 \
+			gthread-2.0 iconv intl pcre png pthread-stubs xcb
 MULTI_PACKAGES+=	-bat
-LIB_DEPENDS-bat=	QtCore,QtGui::x11/qt4
+RUN_DEPENDS-bat=	::devel/desktop-file-utils
+LIB_DEPENDS-bat=	QtCore,QtGui::x11/qt4 \
+			bac,baccfg::sysutils/bacula,-main
 .endif
 
 post-extract:
@@ -173,6 +178,7 @@ post-extract:
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/manpages/bat.1 \
 		${WRKSRC}/src/qt-console/main.cpp \
+		${WRKSRC}/scripts/bat.desktop.in \
 		${WRKSRC}/README-client.OpenBSD ${WRKSRC}/README-server.OpenBSD
 
 post-install:
@@ -189,11 +195,19 @@ post-install:
 		${PREFIX}/share/examples/bacula/
 	${INSTALL_DATA} ${WRKSRC}/README-server.OpenBSD \
 			${PREFIX}/share/doc/bacula/
+	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/bacula
+	${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/bacula/updatedb
+	${INSTALL_SCRIPT} ${WRKSRC}/updatedb/* ${PREFIX}/libexec/bacula/updatedb
 .endif
 .if !${FLAVOR:L:Mno_bat}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin/
 	${INSTALL_DATA} ${WRKINST}/etc/bacula/bat.conf \
 		${PREFIX}/share/examples/bacula/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/src/qt-console/images/bat_icon.png \
+		${PREFIX}/share/pixmaps
+	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/scripts/bat.desktop ${PREFIX}/share/applications
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index d8e89b24971..514bcaeae0e 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,5 +1,5 @@
-MD5 (bacula-2.4.4.tar.gz) = TrYVW0VhEBivAwAtN6L/3g==
-RMD160 (bacula-2.4.4.tar.gz) = phOy1zHz03r/OLOuBQu9UcGzVnA=
-SHA1 (bacula-2.4.4.tar.gz) = zNz4K/l11dfHtdkQH20KEqH5TAk=
-SHA256 (bacula-2.4.4.tar.gz) = OmmL3w/T9VczpqSqvow9wrHtGtXKf6sAD24PgEqdPTg=
-SIZE (bacula-2.4.4.tar.gz) = 3145564
+MD5 (bacula-3.0.2.tar.gz) = UvS8JdiYjf/P9Cm7Xh7oGw==
+RMD160 (bacula-3.0.2.tar.gz) = 4hykKWpDmiuoBMs7L8Di4plvQbE=
+SHA1 (bacula-3.0.2.tar.gz) = o5fZU6UaiCBvdhNiYmXGC993GY4=
+SHA256 (bacula-3.0.2.tar.gz) = j14L9HNMIZSfgxKSCeAQms8FSjYrT858uHqH8YFZBKU=
+SIZE (bacula-3.0.2.tar.gz) = 3910414
diff --git a/sysutils/bacula/patches/patch-configure b/sysutils/bacula/patches/patch-configure
index 565c2fbd1b0..3fd4a18eb53 100644
--- a/sysutils/bacula/patches/patch-configure
+++ b/sysutils/bacula/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.4 2009/01/12 21:17:07 sthen Exp $
---- configure.orig	Sun Dec 28 10:41:33 2008
-+++ configure	Tue Jan  6 12:45:22 2009
-@@ -4008,7 +4008,7 @@ echo "${ECHO_T}no" >&6; }
+$OpenBSD: patch-configure,v 1.5 2009/10/02 02:34:05 merdely Exp $
+--- configure.orig	Fri Jul 10 15:12:39 2009
++++ configure	Mon Sep 21 20:59:33 2009
+@@ -4239,7 +4239,7 @@ echo "${ECHO_T}no" >&6; }
  fi
  
  
@@ -10,20 +10,46 @@ $OpenBSD: patch-configure,v 1.4 2009/01/12 21:17:07 sthen Exp $
     { { echo "$as_me:$LINENO: error: Unable to find C++ compiler" >&5
  echo "$as_me: error: Unable to find C++ compiler" >&2;}
     { (exit 1); exit 1; }; }
-@@ -29981,6 +29981,7 @@ openbsd)
- 	    platforms/openbsd/bacula-fd \
- 	    platforms/openbsd/bacula-sd \
- 	    platforms/openbsd/bacula-dir"
-+	largefile_support="yes"
+@@ -42224,13 +42224,13 @@ _ACEOF
+ fi
+ 
+ PTHREAD_LIB=""
+-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
++echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="-pthread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42286,7 +42286,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+-  PTHREAD_LIB="-lpthread"
++  PTHREAD_LIB="-pthread"
+ else
+ 
+        { echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
+@@ -42715,6 +42715,7 @@ openbsd)
+        platforms/openbsd/bacula-fd \
+        platforms/openbsd/bacula-sd \
+        platforms/openbsd/bacula-dir"
++   largefile_support="yes"
    ;;
  redhat)
- 	if test -f /etc/whitebox-release ; then
-@@ -31765,7 +31766,7 @@ if test "${support_bat}" = "yes" ; then
-   QMAKEBIN="qmake"
- 
-   if test "x$QMAKEQT4" != "xnone"; then
--    QMAKEBIN=qmake-qt4
-+    QMAKEBIN=${QMAKEQT4}
-   fi
+       ping -c 1 $hostname 2>&1 1>/dev/null
+@@ -45729,7 +45730,7 @@ echo "$as_me: error: Could not find qmake or qmake-qt4
+    QMAKEBIN="qmake"
  
+    if test "x$QMAKEQT4" != "xnone"; then
+-       QMAKEBIN=qmake-qt4
++       QMAKEBIN=${QMAKEQT4}
+    fi
  
+    cd src/qt-console
diff --git a/sysutils/bacula/patches/patch-scripts_bat_desktop_in b/sysutils/bacula/patches/patch-scripts_bat_desktop_in
new file mode 100644
index 00000000000..ea2bc47b534
--- /dev/null
+++ b/sysutils/bacula/patches/patch-scripts_bat_desktop_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-scripts_bat_desktop_in,v 1.1 2009/10/02 02:34:05 merdely Exp $
+--- scripts/bat.desktop.in.orig	Tue Jun  2 01:03:45 2009
++++ scripts/bat.desktop.in	Tue Jun  2 01:03:55 2009
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=Bacula Administration Tool
+ Comment=Bacula Director Console
+-Icon=/usr/share/pixmaps/bat_icon.png
++Icon=${LOCALBASE}/pixmaps/bat_icon.png
+ Exec=@sbindir@/bat -c @sysconfdir@/bat.conf
+ Terminal=false
+ Type=Application
diff --git a/sysutils/bacula/patches/patch-scripts_mtx-changer_in b/sysutils/bacula/patches/patch-scripts_mtx-changer_in
index 3e67952ac0a..75eebeb78da 100644
--- a/sysutils/bacula/patches/patch-scripts_mtx-changer_in
+++ b/sysutils/bacula/patches/patch-scripts_mtx-changer_in
@@ -1,7 +1,11 @@
-$OpenBSD: patch-scripts_mtx-changer_in,v 1.3 2008/10/19 03:44:42 merdely Exp $
---- scripts/mtx-changer.in.orig	Wed Jul  2 16:49:44 2008
-+++ scripts/mtx-changer.in	Tue Jul  1 19:28:12 2008
-@@ -2,3 +2,3 @@
+$OpenBSD: patch-scripts_mtx-changer_in,v 1.4 2009/10/02 02:34:05 merdely Exp $
+
+XXX first hunk hand-rolled for CVS keyword, Id
+
+--- scripts/mtx-changer.in.orig	Fri Jul 18 09:44:03 2008
++++ scripts/mtx-changer.in	Mon Sep 21 20:58:36 2009
+@@ -1,4 +1,4 @@
+ #!/bin/sh
  #
 -# Bacula interface to mtx autoloader
 +# Bacula interface to chio autoloader
@@ -19,16 +23,19 @@ $OpenBSD: patch-scripts_mtx-changer_in,v 1.3 2008/10/19 03:44:42 merdely Exp $
  #   exit code, Bacula will assume the request failed.
  #
  
-@@ -173,17 +173,17 @@ debug "Parms: $ctl $cmd $slot $device $drive"
+@@ -143,7 +143,7 @@ debug "Parms: $ctl $cmd $slot $device $drive"
  
  case $cmd in 
     unload)
 -      debug "Doing mtx -f $ctl unload $slot $drive"
 +      debug "Doing chio -f $ctl move drive $drive slot $slot"
- #
- # enable the following line if you need to eject the cartridge
- #     mt -f $device offline
- #     sleep 10
+ 
+       if test ${offline} -eq 1 ; then
+ 	mt -f $device offline
+@@ -151,12 +151,12 @@ case $cmd in 
+       if test ${offline_sleep} -ne 0 ; then
+ 	sleep ${offline_sleep}
+       fi
 -      ${MTX} -f $ctl unload $slot $drive
 +      ${MTX} -f $ctl move drive $drive slot $slot
        ;;
@@ -39,27 +46,27 @@ $OpenBSD: patch-scripts_mtx-changer_in,v 1.3 2008/10/19 03:44:42 merdely Exp $
 +      debug "Doing chio -f $ctl move slot $slot drive $drive"
 +      ${MTX} -f $ctl move slot $slot drive $drive
        rtn=$?
- #
- # Increase the sleep time if you have a slow device
-@@ -194,36 +194,37 @@ case $cmd in 
+       if test ${load_sleep} -ne 0 ; then
+ 	sleep ${load_sleep}
+@@ -166,36 +166,33 @@ case $cmd in 
        ;;
  
     list) 
 -      debug "Doing mtx -f $ctl -- to list volumes"
 +      debug "Doing chio -f $ctl status -- to list volumes"
        make_temp_file
- # Enable the following if you are using barcodes and need an inventory
- #     ${MTX} -f $ctl inventory
+       if test ${inventory} -ne 0 ; then
+ 	${MTX} -f $ctl inventory
+       fi
        ${MTX} -f $ctl status >${TMPFILE}
        rtn=$?
--      cat ${TMPFILE} | grep " Storage Element [0-9]*:.*Full" | awk "{print \$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//"
-+      cat ${TMPFILE} | grep " *slot [0-9]*: <ACCESS,.*FULL.*>" | awk "{print \$2 \$4 \$5 \$6 \$7 \$8}"
- #
- # If you have a VXA PacketLoader and the above does not work, try
- #  turning it off and enabling the following line.
- #     cat ${TMPFILE} | grep " *Storage Element [0-9]*:.*Full" | sed "s/ Storage Element //" | sed "s/Full :VolumeTag=//"
- #
+-      if test ${vxa_packetloader} -ne 0 ; then
+-	cat ${TMPFILE} | grep " *Storage Element [0-9]*:.*Full" | sed "s/ Storage Element //" | sed "s/Full :VolumeTag=//"
+-      else
+-	cat ${TMPFILE} | grep " Storage Element [0-9]*:.*Full" | awk "{print \$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//"
+-      fi
 -      cat ${TMPFILE} | grep "^Data Transfer Element [0-9]*:Full (Storage Element [0-9]" | awk '{printf "%s:%s\n",$7,$10}'
++      cat ${TMPFILE} | grep " *Storage Element [0-9]*:.*Full" | sed "s/ Storage Element //" | sed "s/Full :VolumeTag=//"
 +      cat ${TMPFILE} | grep " *drive [0-9]*: <.*FULL.*>" | awk "{print \$2 \$4 \$5 \$6 \$7 \$8}" | sed "s/^/D/"
        rm -f ${TMPFILE} >/dev/null 2>&1
        exit $rtn
diff --git a/sysutils/bacula/patches/patch-src_console_bconsole_conf_in b/sysutils/bacula/patches/patch-src_console_bconsole_conf_in
index a8988176ef6..ed679fd6656 100644
--- a/sysutils/bacula/patches/patch-src_console_bconsole_conf_in
+++ b/sysutils/bacula/patches/patch-src_console_bconsole_conf_in
@@ -1,12 +1,9 @@
-$OpenBSD: patch-src_console_bconsole_conf_in,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $
---- src/console/bconsole.conf.in.orig	Thu Jul 12 11:21:37 2007
-+++ src/console/bconsole.conf.in	Thu Jul 12 11:21:53 2007
-@@ -3,8 +3,8 @@
- #
- 
+$OpenBSD: patch-src_console_bconsole_conf_in,v 1.2 2009/10/02 02:34:05 merdely Exp $
+--- src/console/bconsole.conf.in.orig	Thu May 14 12:06:41 2009
++++ src/console/bconsole.conf.in	Tue Sep  1 22:31:52 2009
+@@ -5,6 +5,6 @@
  Director {
--  Name = @hostname@-dir
-+  Name = bacula-dir
+   Name = @basename@-dir
    DIRport = @dir_port@
 -  address = @hostname@
 +  address = 127.0.0.1
diff --git a/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in b/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in
index 618fefca3a6..7fc08fd1ffe 100644
--- a/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in
+++ b/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in
@@ -1,122 +1,69 @@
-$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.4 2008/10/19 03:44:42 merdely Exp $
---- src/dird/bacula-dir.conf.in.orig	Thu Jun 19 15:44:34 2008
-+++ src/dird/bacula-dir.conf.in	Tue Jul  1 19:28:12 2008
-@@ -13,7 +13,8 @@
- #
+$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.5 2009/10/02 02:34:05 merdely Exp $
+--- src/dird/bacula-dir.conf.in.orig	Wed Jul 15 18:05:40 2009
++++ src/dird/bacula-dir.conf.in	Tue Sep  1 22:38:31 2009
+@@ -14,6 +14,7 @@
  
  Director {                            # define myself
--  Name = @hostname@-dir
-+  Name = bacula-dir
+   Name = @basename@-dir
 +  DIRaddress = 127.0.0.1
    DIRport = @dir_port@                # where we listen for UA connections
    QueryFile = "@scriptdir@/query.sql"
    WorkingDirectory = "@working_dir@"
-@@ -27,7 +28,7 @@ JobDefs {
-   Name = "DefaultJob"
-   Type = Backup
-   Level = Incremental
--  Client = @hostname@-fd 
-+  Client = bacula-fd 
-   FileSet = "Full Set"
-   Schedule = "WeeklyCycle"
-   Storage = File
-@@ -48,7 +49,7 @@ Job {
- 
- #Job {
- #  Name = "Client2"
--#  Client = @hostname@2-fd
-+#  Client = client2-fd
- #  JobDefs = "DefaultJob"
- #  Write Bootstrap = "@working_dir@/Client2.bsr"
- #}
 @@ -79,8 +80,8 @@ Job {
  Job {
    Name = "RestoreFiles"
    Type = Restore
--  Client=@hostname@-fd                 
+-  Client=@basename@-fd                 
 -  FileSet="Full Set"                  
-+  Client = bacula-fd                 
++  Client = @basename@-fd                 
 +  FileSet = "Full Set"                  
    Storage = File                      
    Pool = Default
    Messages = Standard
-@@ -105,11 +106,7 @@ FileSet {
- #    if you have other partitons such as /usr or /home
- #    you will probably want to add them too.
- #
--#  By default this is defined to point to the Bacula build
--#    directory to give a reasonable FileSet to backup to
--#    disk storage during initial testing.
--#
--    File = @BUILD_DIR@
-+    File = /
-   }
- 
- #
-@@ -154,8 +151,8 @@ FileSet {
- 
+@@ -157,7 +158,7 @@ FileSet {
  # Client (File Services) to backup
  Client {
--  Name = @hostname@-fd
+   Name = @basename@-fd
 -  Address = @hostname@
-+  Name = bacula-fd
 +  Address = 127.0.0.1
    FDPort = @fd_port@
    Catalog = MyCatalog
    Password = "@fd_password@"          # password for FileDaemon
-@@ -169,8 +166,8 @@ Client {
+@@ -171,8 +172,8 @@ Client {
  #  You should change Name, Address, and Password before using
  #
  #Client {
--#  Name = @hostname@2-fd                
+-#  Name = @basename@2-fd                
 -#  Address = @hostname@2
 +#  Name = client2-fd                
 +#  Address = client2.my.domain
  #  FDPort = @fd_port@
  #  Catalog = MyCatalog
  #  Password = "@fd_password@2"         # password for FileDaemon 2
-@@ -184,7 +181,7 @@ Client {
- Storage {
-   Name = File
- # Do not use "localhost" here    
--  Address = @hostname@                # N.B. Use a fully qualified name here
-+  Address = 127.0.0.1                # N.B. Use a fully qualified name here
-   SDPort = @sd_port@
-   Password = "@sd_password@"
-   Device = FileStorage
-@@ -197,7 +194,7 @@ Storage {
+@@ -199,7 +200,7 @@ Storage {
  #Storage {
  #  Name = DDS-4    
  #  Do not use "localhost" here
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = 127.0.0.1                # N.B. Use a fully qualified name here
++#  Address = 127.0.0.1                 # N.B. Use a fully qualified name here
  #  SDPort = @sd_port@
  #  Password = "@sd_password@"          # password for Storage daemon
  #  Device = DDS-4                      # must be same as Device in Storage daemon
-@@ -209,7 +206,7 @@ Storage {
+@@ -211,7 +212,7 @@ Storage {
  #Storage {
  #  Name = "8mmDrive"
  #  Do not use "localhost" here
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = 127.0.0.1                # N.B. Use a fully qualified name here
++#  Address = 127.0.0.1                 # N.B. Use a fully qualified name here
  #  SDPort = @sd_port@
  #  Password = "@sd_password@"
  #  Device = "Exabyte 8mm"
-@@ -220,7 +217,7 @@ Storage {
+@@ -222,7 +223,7 @@ Storage {
  #Storage {
  #  Name = "DVD"
  #  Do not use "localhost" here
 -#  Address = @hostname@                # N.B. Use a fully qualified name here
-+#  Address = 127.0.0.1                # N.B. Use a fully qualified name here
++#  Address = 127.0.0.1                 # N.B. Use a fully qualified name here
  #  SDPort = @sd_port@
  #  Password = "@sd_password@"
  #  Device = "DVD Writer"
-@@ -296,7 +293,7 @@ Pool {
- # Restricted console used by tray-monitor to get the status of the director
- #
- Console {
--  Name = @hostname@-mon
-+  Name = bacula-mon
-   Password = "@mon_dir_password@"
-   CommandACL = status, .status
- }
diff --git a/sysutils/bacula/patches/patch-src_filed_bacula-fd_conf_in b/sysutils/bacula/patches/patch-src_filed_bacula-fd_conf_in
deleted file mode 100644
index c4c04707ba4..00000000000
--- a/sysutils/bacula/patches/patch-src_filed_bacula-fd_conf_in
+++ /dev/null
@@ -1,37 +0,0 @@
-$OpenBSD: patch-src_filed_bacula-fd_conf_in,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $
---- src/filed/bacula-fd.conf.in.orig	Thu Jul 12 11:25:22 2007
-+++ src/filed/bacula-fd.conf.in	Thu Jul 12 11:25:43 2007
-@@ -11,7 +11,7 @@
- # List Directors who are permitted to contact this File daemon
- #
- Director {
--  Name = @hostname@-dir
-+  Name = bacula-dir
-   Password = "@fd_password@"
- }
- 
-@@ -20,7 +20,7 @@ Director {
- #   status of the file daemon
- #
- Director {
--  Name = @hostname@-mon
-+  Name = bacula-mon
-   Password = "@mon_fd_password@"
-   Monitor = yes
- }
-@@ -29,7 +29,7 @@ Director {
- # "Global" File daemon configuration specifications
- #
- FileDaemon {                          # this is me
--  Name = @hostname@-fd
-+  Name = bacula-fd
-   FDport = @fd_port@                  # where we listen for the director
-   WorkingDirectory = @working_dir@
-   Pid Directory = @piddir@
-@@ -39,5 +39,5 @@ FileDaemon {                          # this is me
- # Send all messages except skipped files back to Director
- Messages {
-   Name = Standard
--  director = @hostname@-dir = all, !skipped, !restored
-+  director = bacula-dir = all, !skipped, !restored
- }
diff --git a/sysutils/bacula/patches/patch-src_plugins_dir_Makefile_in b/sysutils/bacula/patches/patch-src_plugins_dir_Makefile_in
new file mode 100644
index 00000000000..d15f5efb9cc
--- /dev/null
+++ b/sysutils/bacula/patches/patch-src_plugins_dir_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_plugins_dir_Makefile_in,v 1.1 2009/10/02 02:34:05 merdely Exp $
+--- src/plugins/dir/Makefile.in.orig	Mon Sep 21 21:00:47 2009
++++ src/plugins/dir/Makefile.in	Mon Sep 21 21:00:52 2009
+@@ -28,7 +28,7 @@ dir_plugins.o: ${DIRDIR}/dir_plugins.h ${DIRDIR}/dir_p
+ 	$(CXX) -I${SRCDIR} -I${DIRDIR} -DTEST_PROGRAM -c ${DIRDIR}/dir_plugins.c 
+ 
+ main: dir_plugins.o
+-	$(CXX) $(LDFLAGS) -L${LIBDIR} dir_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl
++	$(CXX) $(LDFLAGS) -L${LIBDIR} dir_plugins.o -o main -lbac -pthread -lssl -l crypto -ldl
+ 
+ example-plugin-dir.o: example-plugin-dir.c ${DIRDIR}/dir_plugins.h
+ 	$(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -fPIC -I../.. -I${DIRDIR} -c example-plugin-dir.c
diff --git a/sysutils/bacula/patches/patch-src_plugins_fd_Makefile_in b/sysutils/bacula/patches/patch-src_plugins_fd_Makefile_in
new file mode 100644
index 00000000000..27335ce140b
--- /dev/null
+++ b/sysutils/bacula/patches/patch-src_plugins_fd_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_plugins_fd_Makefile_in,v 1.1 2009/10/02 02:34:05 merdely Exp $
+--- src/plugins/fd/Makefile.in.orig	Mon Sep 21 21:00:25 2009
++++ src/plugins/fd/Makefile.in	Mon Sep 21 21:00:30 2009
+@@ -28,7 +28,7 @@ fd_plugins.o: ${FDDIR}/fd_plugins.h ${FDDIR}/fd_plugin
+ 	$(CXX) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c ${FDDIR}/fd_plugins.c 
+ 
+ main: fd_plugins.o
+-	$(CXX) $(LDFLAGS) -L${LIBDIR} fd_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl
++	$(CXX) $(LDFLAGS) -L${LIBDIR} fd_plugins.o -o main -lbac -pthread -lssl -l crypto -ldl
+ 
+ example-plugin-fd.o: example-plugin-fd.c ${FDDIR}/fd_plugins.h
+ 	$(CXX) -fPIC -I../.. -I${FDDIR} -c example-plugin-fd.c
diff --git a/sysutils/bacula/patches/patch-src_plugins_sd_Makefile_in b/sysutils/bacula/patches/patch-src_plugins_sd_Makefile_in
new file mode 100644
index 00000000000..e5f31a61d4b
--- /dev/null
+++ b/sysutils/bacula/patches/patch-src_plugins_sd_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_plugins_sd_Makefile_in,v 1.1 2009/10/02 02:34:05 merdely Exp $
+--- src/plugins/sd/Makefile.in.orig	Mon Sep 21 21:01:21 2009
++++ src/plugins/sd/Makefile.in	Mon Sep 21 21:01:25 2009
+@@ -28,7 +28,7 @@ dir_plugins.o: ${SDDIR}/dir_plugins.h ${SDDIR}/dir_plu
+ 	$(CXX) -I${SRCDIR} -I${SDDIR} -DTEST_PROGRAM -c ${SDDIR}/dir_plugins.c 
+ 
+ main: dir_plugins.o
+-	$(CXX) $(LDFLAGS) -L${LIBDIR} dir_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl
++	$(CXX) $(LDFLAGS) -L${LIBDIR} dir_plugins.o -o main -lbac -pthread -lssl -l crypto -ldl
+ 
+ example-plugin-sd.o: example-plugin-sd.c ${SDDIR}/dir_plugins.h
+ 	$(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -fPIC -I../.. -I${SDDIR} -c example-plugin-sd.c
diff --git a/sysutils/bacula/patches/patch-src_qt-console_bat_conf_in b/sysutils/bacula/patches/patch-src_qt-console_bat_conf_in
index 9f83b427013..71fe7111bf3 100644
--- a/sysutils/bacula/patches/patch-src_qt-console_bat_conf_in
+++ b/sysutils/bacula/patches/patch-src_qt-console_bat_conf_in
@@ -1,12 +1,9 @@
-$OpenBSD: patch-src_qt-console_bat_conf_in,v 1.1 2008/02/07 02:53:35 merdely Exp $
---- src/qt-console/bat.conf.in.orig	Sat Jul 28 06:36:28 2007
-+++ src/qt-console/bat.conf.in	Mon Oct 22 11:51:54 2007
-@@ -3,8 +3,8 @@
- #
- 
+$OpenBSD: patch-src_qt-console_bat_conf_in,v 1.2 2009/10/02 02:34:05 merdely Exp $
+--- src/qt-console/bat.conf.in.orig	Thu May 14 12:06:41 2009
++++ src/qt-console/bat.conf.in	Tue Sep  1 22:31:52 2009
+@@ -5,6 +5,6 @@
  Director {
--  Name = @hostname@-dir
-+  Name = bacula-dir
+   Name = @basename@-dir
    DIRport = @dir_port@
 -  address = @hostname@
 +  address = 127.0.0.1
diff --git a/sysutils/bacula/patches/patch-src_qt-console_main_cpp b/sysutils/bacula/patches/patch-src_qt-console_main_cpp
index f97d7cd1400..ce7491e5351 100644
--- a/sysutils/bacula/patches/patch-src_qt-console_main_cpp
+++ b/sysutils/bacula/patches/patch-src_qt-console_main_cpp
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_qt-console_main_cpp,v 1.2 2008/10/19 03:44:42 merdely Exp $
---- src/qt-console/main.cpp.orig	Mon Oct 22 15:29:07 2007
-+++ src/qt-console/main.cpp	Mon Oct 22 15:29:31 2007
-@@ -46,7 +46,7 @@ void terminate_console(int sig);                      
- static void usage();
- static int check_resources();
+$OpenBSD: patch-src_qt-console_main_cpp,v 1.3 2009/10/02 02:34:05 merdely Exp $
+--- src/qt-console/main.cpp.orig	Thu May 14 11:41:48 2009
++++ src/qt-console/main.cpp	Tue Sep  1 22:32:50 2009
+@@ -49,7 +49,7 @@ static int check_resources();
  
--#define CONFIG_FILE "./bat.conf"   /* default configuration file */
+ extern bool parse_bat_config(CONFIG *config, const char *configfile, int exit_code);
+ 
+-#define CONFIG_FILE "bat.conf"     /* default configuration file */
 +#define CONFIG_FILE "${BACULACONF}/bat.conf"   /* default configuration file */
  
  /* Static variables */
- static char *configfile = NULL;
+ static CONFIG *config;
diff --git a/sysutils/bacula/patches/patch-src_stored_bacula-sd_conf_in b/sysutils/bacula/patches/patch-src_stored_bacula-sd_conf_in
index 0719120a48e..acb6a73b13d 100644
--- a/sysutils/bacula/patches/patch-src_stored_bacula-sd_conf_in
+++ b/sysutils/bacula/patches/patch-src_stored_bacula-sd_conf_in
@@ -1,40 +1,11 @@
-$OpenBSD: patch-src_stored_bacula-sd_conf_in,v 1.2 2008/02/07 02:53:35 merdely Exp $
---- src/stored/bacula-sd.conf.in.orig	Mon Apr 23 12:31:14 2007
-+++ src/stored/bacula-sd.conf.in	Sat Aug 11 12:06:26 2007
-@@ -11,7 +11,7 @@
- #
- 
- Storage {                             # definition of myself
--  Name = @hostname@-sd
-+  Name = bacula-sd
-   SDPort = @sd_port@                  # Director's port      
-   WorkingDirectory = "@working_dir@"
-   Pid Directory = "@piddir@"
-@@ -22,7 +22,7 @@ Storage {                             # definition of 
- # List Directors who are permitted to contact Storage daemon
- #
- Director {
--  Name = @hostname@-dir
-+  Name = bacula-dir
-   Password = "@sd_password@"
- }
- 
-@@ -31,7 +31,7 @@ Director {
- #   status of the storage daemon
- #
- Director {
--  Name = @hostname@-mon
-+  Name = bacula-mon
-   Password = "@mon_sd_password@"
-   Monitor = yes
- }
-@@ -60,15 +60,15 @@ Device {
- #  Name = Autochanger
+$OpenBSD: patch-src_stored_bacula-sd_conf_in,v 1.3 2009/10/02 02:34:05 merdely Exp $
+--- src/stored/bacula-sd.conf.in.orig	Wed Jul 15 09:59:59 2009
++++ src/stored/bacula-sd.conf.in	Tue Sep  1 22:34:25 2009
+@@ -68,14 +68,14 @@ Device {
  #  Device = Drive-1
  #  Device = Drive-2
--#  Changer Command = "/home/kern/bacula/bin/mtx-changer %c %o %S %a %d"
+ #  Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
 -#  Changer Device = /dev/sg0
-+#  Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
 +#  Changer Device = /dev/ch0
  #}
  
@@ -47,7 +18,7 @@ $OpenBSD: patch-src_stored_bacula-sd_conf_in,v 1.2 2008/02/07 02:53:35 merdely E
  #  AutomaticMount = yes;               # when device opened, read it
  #  AlwaysOpen = yes;
  #  RemovableMedia = yes;
-@@ -90,7 +90,7 @@ Device {
+@@ -97,7 +97,7 @@ Device {
  #  Name = Drive-2                      #
  #  Drive Index = 1
  #  Media Type = DLT-8000
@@ -56,16 +27,16 @@ $OpenBSD: patch-src_stored_bacula-sd_conf_in,v 1.2 2008/02/07 02:53:35 merdely E
  #  AutomaticMount = yes;               # when device opened, read it
  #  AlwaysOpen = yes;
  #  RemovableMedia = yes;
-@@ -114,7 +114,7 @@ Device {
- #  RemovableMedia = yes;
+@@ -122,7 +122,7 @@ Device {
  #  RandomAccess = no;
+ #  Maximum File Size = 3GB
  ## Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
 -## Changer Device = /dev/sg0
 +## Changer Device = /dev/ch0
  ## AutoChanger = yes
  #  # Enable the Alert command only if you have the mtx package loaded
  ## Alert Command = "sh -c 'tapeinfo -f %c |grep TapeAlert|cat'"
-@@ -129,7 +129,7 @@ Device {
+@@ -182,7 +182,7 @@ Device {
  #  Name = DDS-4 
  #  Description = "DDS-4 for FreeBSD"
  #  Media Type = DDS-4
@@ -74,39 +45,3 @@ $OpenBSD: patch-src_stored_bacula-sd_conf_in,v 1.2 2008/02/07 02:53:35 merdely E
  #  AutomaticMount = yes;               # when device opened, read it
  #  AlwaysOpen = yes
  #  Offline On Unmount = no
-@@ -169,7 +169,7 @@ Device {
- #  Name = "DVD Writer"
- #  Media Type = DVD
- #  Device Type = DVD
--#  Archive Device = /dev/hdc
-+#  Archive Device = /dev/cd0
- #  LabelMedia = yes;                   # lets Bacula label unlabeled media
- #  Random Access = Yes;
- #  AutomaticMount = yes;               # when device opened, read it
-@@ -177,8 +177,8 @@ Device {
- #  AlwaysOpen = no;
- #  MaximumPartSize = 800M;
- #  RequiresMount = yes;
--#  MountPoint = /mnt/cdrom;
--#  MountCommand = "/bin/mount -t iso9660 -o ro %a %m";
-+#  MountPoint = /mnt;
-+#  MountCommand = "/bin/mount -t cd9660 -o ro %a %m";
- #  UnmountCommand = "/bin/umount %m";
- #  SpoolDirectory = /tmp/backup;
- #  WritePartCommand = "/etc/bacula/dvd-handler %a write %e %v"
-@@ -191,7 +191,7 @@ Device {
- #Device {
- #  Name = DDS-3
- #  Media Type = DDS-3
--#  Archive Device = /dev/nrst0
-+#  Archive Device = @TAPEDRIVE@
- #  Use MTIOCGET= no
- #  BSF at EOM = yes
- #  TWO EOF = no
-@@ -225,5 +225,5 @@ Device {
- #
- Messages {
-   Name = Standard
--  director = @hostname@-dir = all
-+  director = bacula-dir = all
- }
diff --git a/sysutils/bacula/pkg/DESCR-main b/sysutils/bacula/pkg/DESCR-main
index 20670a9dfba..ae651bc0ed1 100644
--- a/sysutils/bacula/pkg/DESCR-main
+++ b/sysutils/bacula/pkg/DESCR-main
@@ -10,5 +10,5 @@ or damaged files. Due to its modular design, Bacula is scalable from
 small single computer systems to systems consisting of hundreds of
 computers located over a large network.
 
-This packatge contains the bacula-fd "backup agent" that gets installed
+This package contains the bacula-fd "backup agent" that gets installed
 on the computers you want to back up.
diff --git a/sysutils/bacula/pkg/PFRAG.shared-main b/sysutils/bacula/pkg/PFRAG.shared-main
new file mode 100644
index 00000000000..5de30c74817
--- /dev/null
+++ b/sysutils/bacula/pkg/PFRAG.shared-main
@@ -0,0 +1,6 @@
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2009/10/02 02:34:05 merdely Exp $
+lib/bpipe-fd.so
+@lib lib/libbac.so.${LIBbac_VERSION}
+@lib lib/libbaccfg.so.${LIBbaccfg_VERSION}
+@lib lib/libbacfind.so.${LIBbacfind_VERSION}
+@lib lib/libbacpy.so.${LIBbacpy_VERSION}
diff --git a/sysutils/bacula/pkg/PFRAG.shared-server b/sysutils/bacula/pkg/PFRAG.shared-server
new file mode 100644
index 00000000000..6cf6305d175
--- /dev/null
+++ b/sysutils/bacula/pkg/PFRAG.shared-server
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared-server,v 1.1 2009/10/02 02:34:05 merdely Exp $
+@lib lib/libbacsql.so.${LIBbacsql_VERSION}
diff --git a/sysutils/bacula/pkg/PLIST-bat b/sysutils/bacula/pkg/PLIST-bat
index f5de8de5f32..fc951bf5a42 100644
--- a/sysutils/bacula/pkg/PLIST-bat
+++ b/sysutils/bacula/pkg/PLIST-bat
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-bat,v 1.4 2009/01/12 21:17:07 sthen Exp $
+@comment $OpenBSD: PLIST-bat,v 1.5 2009/10/02 02:34:05 merdely Exp $
 @newgroup _bacula:591
 @newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
 @newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
@@ -11,6 +11,20 @@
 @mode
 @owner
 @group
+share/applications/bat.desktop
+share/doc/bacula/html/
+share/doc/bacula/html/clients.html
+share/doc/bacula/html/console.html
+share/doc/bacula/html/filesets.html
+share/doc/bacula/html/index.html
+share/doc/bacula/html/joblist.html
+share/doc/bacula/html/jobplot.html
+share/doc/bacula/html/jobs.html
+share/doc/bacula/html/mail-message-new.png
+share/doc/bacula/html/media.html
+share/doc/bacula/html/restore.html
+share/doc/bacula/html/status.png
+share/doc/bacula/html/storage.html
 share/examples/bacula/
 @mode 644
 share/examples/bacula/bat.conf
@@ -18,3 +32,9 @@ share/examples/bacula/bat.conf
 @owner _bacula
 @group _bacula
 @sample ${BACULACONF}/bat.conf
+@mode
+@owner
+@group
+share/pixmaps/bat_icon.png
+@exec %D/bin/update-desktop-database
+@unexec %D/bin/update-desktop-database
diff --git a/sysutils/bacula/pkg/PLIST-main b/sysutils/bacula/pkg/PLIST-main
index c477e295779..8110def0b76 100644
--- a/sysutils/bacula/pkg/PLIST-main
+++ b/sysutils/bacula/pkg/PLIST-main
@@ -1,15 +1,35 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2008/10/19 03:44:42 merdely Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2009/10/02 02:34:05 merdely Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2009/10/02 02:34:05 merdely Exp $
 @conflict bacula-client-*
-@conflict bacula-server-<2.2.7
+@conflict bacula-server-<3.0.2
 @pkgpath sysutils/bacula,-client
 @newgroup _bacula:591
 @newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
+lib/bpipe-fd.a
+lib/libbac.a
+@comment lib/libbac.la
+lib/libbaccfg.a
+@comment lib/libbaccfg.la
+lib/libbacfind.a
+@comment lib/libbacfind.la
+lib/libbacpy.a
+@comment lib/libbacpy.la
 libexec/bacula/
 libexec/bacula/bacula-ctl-fd
+libexec/bacula/mtx-changer.conf
 @man man/man8/bacula-fd.8
+sbin/bacula
 @bin sbin/bacula-fd
+share/applications/
 share/doc/bacula/
+@comment share/doc/bacula/ChangeLog
+@comment share/doc/bacula/INSTALL
+share/doc/bacula/LICENSE
+@comment share/doc/bacula/README
 share/doc/bacula/README-client.OpenBSD
+share/doc/bacula/ReleaseNotes
+@comment share/doc/bacula/VERIFYING
+share/doc/bacula/technotes
 share/examples/bacula/
 @mode 750
 @owner _bacula
@@ -24,3 +44,8 @@ share/examples/bacula/bacula-fd.conf
 @owner _bacula
 @group _bacula
 @sample ${BACULACONF}/bacula-fd.conf
+%%SHARED%%
+@mode
+@owner
+@group
+share/pixmaps/
diff --git a/sysutils/bacula/pkg/PLIST-server b/sysutils/bacula/pkg/PLIST-server
index 6ed5d4c31a4..fe4104eed84 100644
--- a/sysutils/bacula/pkg/PLIST-server
+++ b/sysutils/bacula/pkg/PLIST-server
@@ -1,8 +1,11 @@
-@comment $OpenBSD: PLIST-server,v 1.5 2009/01/12 21:17:07 sthen Exp $
+@comment $OpenBSD: PLIST-server,v 1.6 2009/10/02 02:34:05 merdely Exp $
 @conflict bacula-<2.2.7
 @newgroup _bacula:591
 @newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
 @newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
+%%SHARED%%
+lib/libbacsql.a
+lib/libbacsql.la
 libexec/bacula/
 libexec/bacula/bacula
 libexec/bacula/bacula-ctl-dir
@@ -27,10 +30,43 @@ libexec/bacula/make_catalog_backup
 libexec/bacula/make_${BACKEND}_tables
 libexec/bacula/mtx-changer
 libexec/bacula/query.sql
-libexec/bacula/startmysql
-libexec/bacula/stopmysql
+@comment libexec/bacula/startmysql
+@comment libexec/bacula/stopmysql
 libexec/bacula/update_bacula_tables
 libexec/bacula/update_${BACKEND}_tables
+libexec/bacula/updatedb/
+libexec/bacula/updatedb/README
+libexec/bacula/updatedb/update_bacula_tables_8_to_9
+libexec/bacula/updatedb/update_bdb_tables_8_to_9
+libexec/bacula/updatedb/update_mysql_tables_10_to_11
+@comment libexec/bacula/updatedb/update_mysql_tables_10_to_11.in
+libexec/bacula/updatedb/update_mysql_tables_4_to_5
+libexec/bacula/updatedb/update_mysql_tables_5_to_6
+libexec/bacula/updatedb/update_mysql_tables_6_to_7
+libexec/bacula/updatedb/update_mysql_tables_7_to_8
+libexec/bacula/updatedb/update_mysql_tables_8_to_9
+libexec/bacula/updatedb/update_mysql_tables_9_to_10
+@comment libexec/bacula/updatedb/update_mysql_tables_9_to_10.in
+@comment libexec/bacula/updatedb/update_postgresql_tables_10_to_11.in
+libexec/bacula/updatedb/update_postgresql_tables_10_to_11
+libexec/bacula/updatedb/update_postgresql_tables_7_to_8
+libexec/bacula/updatedb/update_postgresql_tables_8_to_9
+@comment libexec/bacula/updatedb/update_postgresql_tables_9_to_10.in
+libexec/bacula/updatedb/update_postgresql_tables_9_to_10
+libexec/bacula/updatedb/update_sqlite3_tables_10_to_11
+@comment libexec/bacula/updatedb/update_sqlite3_tables_10_to_11.in
+libexec/bacula/updatedb/update_sqlite3_tables_8_to_9
+libexec/bacula/updatedb/update_sqlite3_tables_9_to_10
+@comment libexec/bacula/updatedb/update_sqlite3_tables_9_to_10.in
+libexec/bacula/updatedb/update_sqlite_tables_10_to_11
+@comment libexec/bacula/updatedb/update_sqlite_tables_10_to_11.in
+libexec/bacula/updatedb/update_sqlite_tables_4_to_5
+libexec/bacula/updatedb/update_sqlite_tables_5_to_6
+libexec/bacula/updatedb/update_sqlite_tables_6_to_7
+libexec/bacula/updatedb/update_sqlite_tables_7_to_8
+libexec/bacula/updatedb/update_sqlite_tables_8_to_9
+libexec/bacula/updatedb/update_sqlite_tables_9_to_10
+@comment libexec/bacula/updatedb/update_sqlite_tables_9_to_10.in
 @comment @man man/man1/bacula-bgnome-console.1
 @comment @man man/man1/bacula-bwxconsole.1
 @comment @man man/man1/bacula-tray-monitor.1
@@ -59,7 +95,6 @@ libexec/bacula/update_${BACKEND}_tables
 sbin/btraceback
 @bin sbin/bwild
 @bin sbin/dbcheck
-share/doc/bacula/
 share/doc/bacula/README-server.OpenBSD
 @mode 750
 @owner _bacula