- update bacula to version 5.2.2 [1]

- update bacula-docs to version 5.2.2 [2]

PR:		ports/163034 [1], ports/163044 [2]
Approved by:	maintainer [1]
Submitted by:	Valery Komaorv <komarov@valerka.net> [1], maintainer [2]
Feature safe:	yes

16 files changed, 126 insertions, 207 deletions

diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index 6bd353ba95c0..3c6d2f0c9227 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -18,7 +18,6 @@ WITH_BAT=	yes
 
 MAN1=		bat.1
 
-MAKE_ARGS=	-E MAN1
 MAKE_ENV+=	MAKEOBJDIRPREFIX=/
 
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
diff --git a/sysutils/bacula-docs/Makefile b/sysutils/bacula-docs/Makefile
index dd4bc5730e32..7eae5b50e349 100644
--- a/sysutils/bacula-docs/Makefile
+++ b/sysutils/bacula-docs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bacula
-PORTVERSION=	5.0.2
+PORTVERSION=	5.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-docs
diff --git a/sysutils/bacula-docs/distinfo b/sysutils/bacula-docs/distinfo
index 6a4629448b67..f4a9c26d569c 100644
--- a/sysutils/bacula-docs/distinfo
+++ b/sysutils/bacula-docs/distinfo
@@ -1,4 +1,4 @@
-SHA256 (bacula-docs-5.0.2.tar.bz2) = d401d01e44d524de3a595c04502c8c9109cb9a519f086f656c7f5896fa2cb4ea
-SIZE (bacula-docs-5.0.2.tar.bz2) = 34587039
-SHA256 (bacula-5.0.2.tar.gz) = c465d00dd968832d129ba68eea59714357605a461d745cef7e802978c453c3fb
-SIZE (bacula-5.0.2.tar.gz) = 4189272
+SHA256 (bacula-docs-5.2.2.tar.bz2) = bf8350088ec6c4c49b61c66ec4b9b9f73fc36f316d3470912c30ae1b254c7e64
+SIZE (bacula-docs-5.2.2.tar.bz2) = 41637771
+SHA256 (bacula-5.2.2.tar.gz) = d80f3532bd9c353dae00532b52efa60a01e8dce7ff045a717a7b42d820ca0959
+SIZE (bacula-5.2.2.tar.gz) = 4011125
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 80618e07badc..15905eb7c6c7 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bacula
-DISTVERSION=	5.0.3
+DISTVERSION=	5.2.2
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 
@@ -19,6 +19,7 @@ UNIQUENAME?=	${PORTNAME}${PKGNAMESUFFIX}
 
 PLIST_SUB+=	MAJOR=${PORTVERSION:R:R}
 
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -135,9 +136,9 @@ PLIST_SUB+=	NOSF="@comment "
 PLIST_SUB+=	SFDAEMON="@comment "
 PLIST_SUB+=	NOSF=""
 .endif
-#Build bwx-console is deprecated use bacula-bat instead 
+#Build bwx-console is deprecated use bacula-bat instead
 .if defined(WITH_WXCONSOLE)
-IGNORE=			Please use sysutils/bacula-bat instead of wxconsole 
+IGNORE=			Please use sysutils/bacula-bat instead of wxconsole
 USE_WX=			2.4
 CONFIGURE_ARGS+=	--enable-bwx-console
 CONFIGURE_ENV+=		WXCONFIG="${WX_CONFIG}"
@@ -181,15 +182,15 @@ CONFIGURE_ARGS+=	--with-openssl="no"
 .endif
 
 .if defined(WITH_CLIENT_ONLY)
-MAN8=bacula-fd.8 bconsole.8
+MAN8=			bacula-fd.8 bconsole.8
+EXTRA_PATCHES+=		${FILESDIR}/extra__manpages__Makefile.in
 .else
-MAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8
-MAN1=bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
+MAN1=			bat.1 bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
+MAN8=			bacula.8 bacula-dir.8 bacula-fd.8 bacula-sd.8 bconsole.8 \
+			bcopy.8 bextract.8 bls.8 bregex.8 bscan.8 btape.8 \
+			btraceback.8 bwild.8 dbcheck.8
 .endif
 
-MAKE_ARGS+=	-E MAN8 -E MAN1
-MAKE_ENV+=	MAN8="${MAN8}" MAN1="${MAN1}"
-
 pre-everything::
 .if !defined(WITH_CLIENT_ONLY)
 	@${ECHO_MSG} "You may use the following build options (or make config):"
@@ -305,6 +306,8 @@ post-install:
 		fi; \
 	done
 
+	${CHGRP} wheel ${PREFIX}/etc
+
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo
index 84f2405bfdfe..cfd6bceb8e45 100644
--- a/sysutils/bacula-server/distinfo
+++ b/sysutils/bacula-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bacula-5.0.3.tar.gz) = 9905598e18bbe94fa871ddcb3f13ef8b754dcb301331b67b5b92a65eb834fdb4
-SIZE (bacula-5.0.3.tar.gz) = 3800556
+SHA256 (bacula-5.2.2.tar.gz) = d80f3532bd9c353dae00532b52efa60a01e8dce7ff045a717a7b42d820ca0959
+SIZE (bacula-5.2.2.tar.gz) = 4011125
diff --git a/sysutils/bacula-server/files/extra__manpages__Makefile.in b/sysutils/bacula-server/files/extra__manpages__Makefile.in
new file mode 100644
index 000000000000..a9a3f7d7e939
--- /dev/null
+++ b/sysutils/bacula-server/files/extra__manpages__Makefile.in
@@ -0,0 +1,16 @@
+--- manpages/Makefile.in.orig	2011-11-26 18:08:12.000000000 +0400
++++ manpages/Makefile.in	2011-12-02 23:19:42.000000000 +0400
+@@ -4,12 +4,8 @@
+ 
+ .PHONY: dummy
+ 
+-MAN8 = bacula.8 bacula-dir.8 bacula-fd.8 bacula-sd.8 \
+-       bconsole.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 \
+-       btraceback.8 dbcheck.8 bwild.8 bregex.8 
++MAN8 = bacula-fd.8 bconsole.8
+ 
+-MAN1 = bacula-tray-monitor.1 bacula-bwxconsole.1 bsmtp.1 bat.1
+-      
+ # bacula-bgnome-console.1
+ 
+ all:
diff --git a/sysutils/bacula-server/files/patch-configure b/sysutils/bacula-server/files/patch-configure
deleted file mode 100644
index 3021c81f27a2..000000000000
--- a/sysutils/bacula-server/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2010-05-20 20:25:58.000000000 +0300
-+++ configure	2010-05-20 20:26:30.000000000 +0300
-@@ -47193,7 +47193,7 @@
-    { (exit 1); exit 1; }; }
-    fi
- 
--   QMAKEBIN="qmake"
-+   QMAKEBIN="$QMAKE"
-    cd src/qt-console
-    echo "Creating bat Makefile"
-    touch bat
diff --git a/sysutils/bacula-server/files/patch-manpages__Makefile.in b/sysutils/bacula-server/files/patch-manpages__Makefile.in
new file mode 100644
index 000000000000..0cfa9c9fdf08
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-manpages__Makefile.in
@@ -0,0 +1,18 @@
+--- ./manpages/Makefile.in.orig	2011-11-26 18:08:12.000000000 +0400
++++ ./manpages/Makefile.in	2011-12-03 13:08:11.000000000 +0400
+@@ -31,9 +31,12 @@
+ 
+ install: install-manpages
+ 	if [ x@COMPRESS_MANPAGES@ = "xyes" ]; then \
+-	 for I in $(DESTDIR)/$(mandir)/man8/* $(DESTDIR)/$(mandir)/man1/*; do \
+-	  gzip -f $$I; \
+-	 done; \
++	    for I in ${MAN8}; do \
++		gzip -f $(DESTDIR)/$(mandir)/man8/$$I; \
++	    done; \
++	    for I in ${MAN1}; do \
++		gzip -f $(DESTDIR)/$(mandir)/man1/$$I; \
++	    done; \
+ 	fi
+ 
+ uninstall:
diff --git a/sysutils/bacula-server/files/patch-src__cats__Makefile.in b/sysutils/bacula-server/files/patch-src__cats__Makefile.in
index 1eb8376699c1..f09a8a1e7c85 100644
--- a/sysutils/bacula-server/files/patch-src__cats__Makefile.in
+++ b/sysutils/bacula-server/files/patch-src__cats__Makefile.in
@@ -1,11 +1,31 @@
---- src/cats/Makefile.in.orig	2010-05-19 17:13:07.000000000 +0300
-+++ src/cats/Makefile.in	2010-05-19 17:15:47.000000000 +0300
-@@ -69,7 +69,7 @@
+--- ./src/cats/Makefile.in.orig	2011-11-26 18:08:12.000000000 +0400
++++ ./src/cats/Makefile.in	2011-12-03 13:08:11.000000000 +0400
+@@ -142,23 +142,23 @@
  
  libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
  	@echo "Making $@ ..."	  
 -	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_RELEASE:S/./:/g) $(DB_LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(DB_LIBS)
  
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
+ libbaccats.la: Makefile cats_dummy.lo
+ 	@echo "Making $@ ..."
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -version-info 5
+ 
+ libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
+ 	@echo "Making $@ ..."
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) $(MYSQL_LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(MYSQL_LIBS)
+ 
+ libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)
+ 	@echo "Making $@ ..."
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) $(POSTGRESQL_LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(POSTGRESQL_LIBS)
+ 
+ libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
+ 	@echo "Making $@ ..."
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) $(SQLITE_LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(SQLITE_LIBS)
+ 
+ #libbaccats-ingres.la: Makefile $(INGRES_LOBJS)
+ #	 @echo "Making $@ ..."
diff --git a/sysutils/bacula-server/files/patch-src__cats__install-default-backend.in b/sysutils/bacula-server/files/patch-src__cats__install-default-backend.in
new file mode 100644
index 000000000000..fa36a565626d
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-src__cats__install-default-backend.in
@@ -0,0 +1,26 @@
+--- ./src/cats/install-default-backend.in.orig	2011-11-26 18:08:12.000000000 +0400
++++ ./src/cats/install-default-backend.in	2011-12-03 13:27:09.000000000 +0400
+@@ -22,19 +22,19 @@
+    exit 1
+ fi
+ 
+-if [ -f ${install_dir}/libbaccats-${default_backend}-${library_version}${SHLIB_EXT} ]; then
++if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.5 ]; then
+    #
+    # Create a default catalog library pointing to one of the shared libs.
+    #
+-   rm -f ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
++   rm -f ${install_dir}/libbaccats${SHLIB_EXT}.5
+ 
+    #
+    # Create a relative symlink to the default backend
+    # As all backends are in the same directory anyhow this should
+    # always work.
+    #
+-   ln -s libbaccats-${default_backend}-${library_version}${SHLIB_EXT} \
+-         ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
++   ln -s libbaccats-${default_backend}${SHLIB_EXT}.5 \
++         ${install_dir}/libbaccats${SHLIB_EXT}.5
+ fi
+ 
+ exit 0
diff --git a/sysutils/bacula-server/files/patch-src__dird__Makefile.in b/sysutils/bacula-server/files/patch-src__dird__Makefile.in
deleted file mode 100644
index 3e2f19eb9f9f..000000000000
--- a/sysutils/bacula-server/files/patch-src__dird__Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/dird/Makefile.in.orig	2010-07-20 21:01:56.000000000 -0400
-+++ src/dird/Makefile.in	2010-07-20 21:04:19.000000000 -0400
-@@ -63,12 +63,12 @@
- 
- 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) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
- 	      -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
- 	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
- 
- static-bacula-dir:  Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
- 	      -lbacfind -lbacsql -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
- 	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
- 	strip $@
diff --git a/sysutils/bacula-server/files/patch-src__findlib__Makefile.in b/sysutils/bacula-server/files/patch-src__findlib__Makefile.in
index b7c89378da56..b6ab19c8d9db 100644
--- a/sysutils/bacula-server/files/patch-src__findlib__Makefile.in
+++ b/sysutils/bacula-server/files/patch-src__findlib__Makefile.in
@@ -1,11 +1,11 @@
---- src/findlib/Makefile.in.orig	2010-05-19 17:13:20.000000000 +0300
-+++ src/findlib/Makefile.in	2010-05-19 17:15:21.000000000 +0300
-@@ -59,7 +59,7 @@
+--- ./src/findlib/Makefile.in.orig	2011-11-26 18:08:12.000000000 +0400
++++ ./src/findlib/Makefile.in	2011-12-03 13:08:11.000000000 +0400
+@@ -57,7 +57,7 @@
  
  libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
  	@echo "Making $@ ..."
 -	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_RELEASE:S/./:/g)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
  	cd $(topdir) \
diff --git a/sysutils/bacula-server/files/patch-src__lib__Makefile.in b/sysutils/bacula-server/files/patch-src__lib__Makefile.in
index 503898b660ad..bf7d047b6dc2 100644
--- a/sysutils/bacula-server/files/patch-src__lib__Makefile.in
+++ b/sysutils/bacula-server/files/patch-src__lib__Makefile.in
@@ -1,29 +1,29 @@
---- src/lib/Makefile.in.orig	2010-05-19 14:26:03.000000000 +0300
-+++ src/lib/Makefile.in	2010-05-19 17:14:18.000000000 +0300
-@@ -126,7 +126,7 @@
+--- ./src/lib/Makefile.in.orig	2011-11-26 18:08:12.000000000 +0400
++++ ./src/lib/Makefile.in	2011-12-03 13:08:11.000000000 +0400
+@@ -120,7 +120,7 @@
  
  libbac.la: Makefile $(LIBBAC_LOBJS)
  	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_RELEASE:S/./:/g) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS)
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS)
  
  libbaccfg.a: $(LIBBACCFG_OBJS) 
  	@echo "Making $@ ..."
-@@ -135,7 +135,7 @@
+@@ -129,7 +129,7 @@
  
  libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
  	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_RELEASE:S/./:/g)
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(OPENSSL_LIBS) $(LIBS)
  
  libbacpy.a: $(LIBBACPY_OBJS) 
  	@echo "Making $@ ..."
-@@ -144,7 +144,7 @@
+@@ -138,7 +138,7 @@
  
  libbacpy.la: Makefile $(LIBBACPY_LOBJS) 
  	@echo "Making $@ ..."
--	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_RELEASE:S/./:/g) $(PYTHON_LIBS)
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
  	cd $(topdir) \
diff --git a/sysutils/bacula-server/files/patch-src__stored__Makefile.in b/sysutils/bacula-server/files/patch-src__stored__Makefile.in
deleted file mode 100644
index 72166b1c140a..000000000000
--- a/sysutils/bacula-server/files/patch-src__stored__Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/stored/Makefile.in.orig	2010-07-20 21:11:46.000000000 -0400
-+++ src/stored/Makefile.in	2010-07-20 21:13:47.000000000 -0400
-@@ -90,12 +90,12 @@
- 
- 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) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(FDLIBS) \
- 	   -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
- 	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
- 
- static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(FDLIBS) \
-+	$(LIBTOOL_LINK) $(CXX) -static -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(FDLIBS) \
- 	   -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
- 	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
- 	strip $@
-@@ -106,7 +106,7 @@
- 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- 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) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../cats $(LDFLAGS) -o $@ $(TAPEOBJS) \
- 	   -lbacsql -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bls.o:	bls.c
-@@ -116,7 +116,7 @@
- 
- 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) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BLSOBJS) $(DLIB) \
- 	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bextract.o: bextract.c
-@@ -126,7 +126,7 @@
- 
- 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) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \
- 	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bscan.o: bscan.c
-@@ -135,7 +135,7 @@
- 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- 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) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../cats -L../findlib $(LDFLAGS) -o $@ $(SCNOBJS) \
- 	   -lbacsql $(DB_LIBS) $(FDLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bcopy.o: bcopy.c
-@@ -144,7 +144,7 @@
- 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- 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) \
-+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib $(LDFLAGS) -o $@ $(COPYOBJS) \
- 	   -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/sysutils/bacula-server/files/patch-src__tools__Makefile.in b/sysutils/bacula-server/files/patch-src__tools__Makefile.in
deleted file mode 100644
index 0a4b811c7193..000000000000
--- a/sysutils/bacula-server/files/patch-src__tools__Makefile.in
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/tools/Makefile.in.orig	2010-07-20 21:14:13.000000000 -0400
-+++ src/tools/Makefile.in	2010-07-20 21:17:34.000000000 -0400
-@@ -57,21 +57,21 @@
- 	@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) -L../lib $(LDFLAGS) -o $@ bsmtp.o -lbac -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) -L../lib $(LDFLAGS) -o $@ bregtest.o -lbac -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) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) -o $@ dbcheck.o $(DIRCONFOBJS) \
- 	  -lbacsql -lbaccfg -lbac -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) -L../lib -L../findlib $(LDFLAGS) -o $@ fstype.o -lbacfind -lbac -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) -L../lib -L../findlib $(LDFLAGS) -o $@ drivetype.o -lbacfind -lbac -lm \
- 	  $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- dird_conf.o: ../dird/dird_conf.c
-@@ -84,31 +84,31 @@
- 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
- 
- 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 \
-+	$(LIBTOOL_LINK) $(CXX) -g -o $@ $(FINDOBJS) -L. -L../lib -L../findlib $(LDFLAGS) \
- 	  $(DLIB) -lbacfind -lbaccfg -lbac -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 \
-+	$(LIBTOOL_LINK) $(CXX) -g -L. -L../lib -L../findlib $(LDFLAGS) -o $@ testls.o \
- 	  $(DLIB) -lbacfind -lbac -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 \
-+	$(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bregex.o \
- 	  $(DLIB) -lbac -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 \
-+	$(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bwild.o \
- 	  $(DLIB) -lbac -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 \
-+	$(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib $(LDFLAGS) -o $@ bbatch.o \
- 	  -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
--	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o  \
-+	$(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ bvfs_test.o  \
- 	  -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ing_test.o
--	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o  \
-+	$(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ ing_test.o  \
- 	  -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- gigaslam.o: gigaslam.c
-@@ -118,7 +118,7 @@
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -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) -L../lib $(LDFLAGS) -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist
index 44b35bc9c637..bf5a2eda6f1b 100644
--- a/sysutils/bacula-server/pkg-plist
+++ b/sysutils/bacula-server/pkg-plist
@@ -1,6 +1,12 @@
 lib/libbac.la
 lib/libbac.so
 lib/libbac.so.%%MAJOR%%
+lib/libbaccats-%%DBTYPE%%.la
+lib/libbaccats-%%DBTYPE%%.so
+lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%%
+lib/libbaccats.la
+lib/libbaccats.so
+lib/libbaccats.so.%%MAJOR%%
 lib/libbaccfg.la
 lib/libbaccfg.so
 lib/libbaccfg.so.%%MAJOR%%
@@ -55,8 +61,6 @@ sbin/dbcheck
 %%DATADIR%%/mtx-changer
 %%DATADIR%%/mtx-changer.conf
 %%DATADIR%%/query.sql
-%%DATADIR%%/startmysql
-%%DATADIR%%/stopmysql
 %%DATADIR%%/update_bacula_tables
 %%DATADIR%%/update_%%DBTYPE%%_tables