3 files changed, 4 insertions, 38 deletions

diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 632f20c35e4d..2628637f0308 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bacula
-DISTVERSION=	2.2.0
-PORTREVISION=	1
+DISTVERSION=	2.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo
index 110cb4f7de9c..616fc87de0c4 100644
--- a/sysutils/bacula-server/distinfo
+++ b/sysutils/bacula-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (bacula-2.2.0.tar.gz) = bdd2320f1adc03c552598b14443a4d3d
-SHA256 (bacula-2.2.0.tar.gz) = c5cf4df05100b8ac4a8048285fe93f3569561434732f2f5ca72f8ac21f492fe2
-SIZE (bacula-2.2.0.tar.gz) = 3022702
+MD5 (bacula-2.2.2.tar.gz) = 7d21d14d8411949383b2cfd58dbb9f26
+SHA256 (bacula-2.2.2.tar.gz) = acd98377a3091a22b0cdd9c5579d503d1001855c216e83ed3e58bca1ab1376ad
+SIZE (bacula-2.2.2.tar.gz) = 3011811
diff --git a/sysutils/bacula-server/files/patch-src-dird-dird.c b/sysutils/bacula-server/files/patch-src-dird-dird.c
deleted file mode 100644
index 076ce53e39e9..000000000000
--- a/sysutils/bacula-server/files/patch-src-dird-dird.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/dird/dird.c	2007-06-07 10:46:43.000000000 -0400
-+++ src/dird/dird.c	2007-08-16 08:58:20.000000000 -0400
-@@ -228,6 +228,15 @@
-       Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
-    }
- 
-+   if (background) {
-+      daemon_start();
-+      init_stack_dump();              /* grab new pid */
-+   }
-+
-+   /* Create pid must come after we are a daemon -- so we have our final pid */
-+   create_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
-+   read_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
-+
-    drop(uid, gid);                    /* reduce privileges if requested */
- 
-    if (!check_catalog()) {
-@@ -247,14 +256,6 @@
-    FDConnectTimeout = (int)director->FDConnectTimeout;
-    SDConnectTimeout = (int)director->SDConnectTimeout;
- 
--   if (background) {
--      daemon_start();
--      init_stack_dump();              /* grab new pid */
--   }
--
--   /* Create pid must come after we are a daemon -- so we have our final pid */
--   create_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
--   read_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
- 
- 
- #if !defined(HAVE_WIN32)