diff -Eur sysutils/bareos-server.orig/Makefile sysutils/bareos-server/Makefile
--- sysutils/bareos-server.orig/Makefile	2016-06-02 08:28:37.747742000 +0200
+++ sysutils/bareos-server/Makefile	2016-09-01 07:09:00.352869000 +0200
@@ -4,7 +4,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	15.2.2
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
@@ -32,11 +32,12 @@
 CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE?=	MTX PYTHON NDMP NLS OPENSSL
+OPTIONS_DEFINE?=	MTX PYTHON NDMP NLS OPENSSL SCSICRYPTO
 OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL
 OPTIONS_SUB=		yes
 MTX_DESC=		Install mtx for control of autochanger devices
 NDMP_DESC=		Enable build of NDMP support
+SCSICRYPTO_DESC=	Build LTO AME crypto plugin
 
 .if ${PKGNAMESUFFIX} == "-server"
 OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
@@ -47,6 +48,9 @@
 NDMP_CONFIGURE_OFF=     --enable-ndmp=no
 .endif
 
+SCSICRYPTO_CONFIGURE_ON=	--enable-scsi-crypto=yes
+SCSICRYPTO_CONFIGURE_OFF=	--enable-scsi-crypto=no
+
 OPENSSL_USE=	OPENSSL=yes
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 OPENSSL_CONFIGURE_OFF=	--with-openssl="no"
@@ -184,6 +188,10 @@
 #	In server port don't install filed
 	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
 		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|\.\./\.\./lib/libbareos|$$(LOCALBASE)/lib/libbareos|g' \
+		${WRKSRC}/src/plugins/dird/Makefile.in \
+		${WRKSRC}/src/plugins/filed/Makefile.in \
+		${WRKSRC}/src/plugins/stored/Makefile.in
 	@${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
 		${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
 	@${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
diff -Eur sysutils/bareos-server.orig/files/bareos-dir.in sysutils/bareos-server/files/bareos-dir.in
--- sysutils/bareos-server.orig/files/bareos-dir.in	2016-08-31 15:23:09.667272000 +0200
+++ sysutils/bareos-server/files/bareos-dir.in	2016-09-01 09:20:50.324060000 +0200
@@ -11,6 +11,8 @@
 #
 # bareos_dir_enable  (bool):   Set to NO by default.
 #                Set it to YES to enable bareos_dir.
+# bareos_dir_configfile (foo/bar/file.conf): absolute path to bareos-dir
+#		configuration file
 # bareos_dir_flags (params):   Set params used to start bareos_dir.
 #
 
@@ -19,13 +21,26 @@
 name="bareos_dir"
 rcvar=${name}_enable
 command=%%PREFIX%%/sbin/bareos-dir
+bareos_dir_user="bareos"
+bareos_dir_group="bareos"
+bareos_dir_configfile="%%PREFIX%%/etc/bareos/bareos-dir.conf"
+start_precmd=${name}_prestart
 
 load_rc_config $name
 
 : ${bareos_dir_enable="NO"}
-: ${bareos_dir_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-dir.conf"}
+: ${bareos_dir_flags=" -u ${bareos_dir_user} -g ${bareos_dir_group} -v -c ${bareos_dir_configfile}"}
 : ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
 
 pidfile="${bareos_dir_pidfile}"
 
+required_files=${bareos_dir_configfile}
+required_dirs=${pidfile%/*}
+
+bareos_dir_prestart()
+{
+	[ -d "${pidfile%/*}" ] || install -d -o ${bareos_dir_user} -g ${bareos_dir_group} ${pidfile%/*}
+}
+
+
 run_rc_command "$1"
diff -Eur sysutils/bareos-server.orig/files/bareos-fd.in sysutils/bareos-server/files/bareos-fd.in
--- sysutils/bareos-server.orig/files/bareos-fd.in	2015-08-10 05:47:15.774999000 +0200
+++ sysutils/bareos-server/files/bareos-fd.in	2016-09-01 09:24:02.332238000 +0200
@@ -11,6 +11,8 @@
 #
 # bareos_fd_enable  (bool):  Set to NO by default.
 #               Set it to YES to enable bareos_fd.
+# bareos_sd_configfile (foo/bar/file.conf): absolute path to bareos-fd 
+#               configuration file
 # bareos_fd_flags (params):  Set params used to start bareos_fd.
 #
 
@@ -19,13 +21,27 @@
 name="bareos_fd"
 rcvar=${name}_enable
 command=%%PREFIX%%/sbin/bareos-fd
+bareos_fd_user="root"
+bareos_fd_group="wheel"
+bareos_user="bareos"
+bareos_group="bareos"
+bareos_fd_configfile="%%PREFIX%%/etc/bareos/bareos-fd.conf"
+start_precmd=${name}_prestart
 
 load_rc_config $name
 
 : ${bareos_fd_enable="NO"}
-: ${bareos_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bareos/bareos-fd.conf"}
+: ${bareos_fd_flags=" -u ${bareos_fd_user} -g ${bareos_fd_group} -v -c ${bareos_fd_configfile}"}
 : ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
 
 pidfile="${bareos_fd_pidfile}"
 
+required_files=${bareos_fd_configfile}
+required_dirs=${pidfile%/*}
+
+bareos_fd_prestart()
+{
+        [ -d "${pidfile%/*}" ] || install -d -o ${bareos_user} -g {bareos_group} ${pidfile%/*}
+}
+
 run_rc_command "$1"
diff -Eur sysutils/bareos-server.orig/files/bareos-sd.in sysutils/bareos-server/files/bareos-sd.in
--- sysutils/bareos-server.orig/files/bareos-sd.in	2015-08-10 05:47:15.688250000 +0200
+++ sysutils/bareos-server/files/bareos-sd.in	2016-09-01 09:23:39.580905000 +0200
@@ -11,6 +11,8 @@
 #
 # bareos_sd_enable  (bool):  Set to NO by default.
 #               Set it to YES to enable bareos_sd.
+# bareos_sd_configfile (foo/bar/file.conf): absolute path to bareos-sd
+#               configuration file
 # bareos_sd_flags (params):  Set params used to start bareos_sd.
 #
 
@@ -19,13 +21,25 @@
 name="bareos_sd"
 rcvar=${name}_enable
 command=%%PREFIX%%/sbin/bareos-sd
+bareos_sd_user="bareos"
+bareos_sd_group="bareos"
+bareos_sd_configfile="%%PREFIX%%/etc/bareos/bareos-sd.conf"
+start_precmd=${name}_prestart
 
 load_rc_config $name
 
 : ${bareos_sd_enable="NO"}
-: ${bareos_sd_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-sd.conf"}
+: ${bareos_sd_flags=" -u ${bareos_sd_user} -g ${bareos_sd_group} -v -c ${bareos_sd_configfile}"}
 : ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
 
-pidfile="${bacula_sd_pidfile}"
+pidfile="${bareos_sd_pidfile}"
+
+required_files=${bareos_sd_configfile}
+required_dirs=${pidfile%/*}
+
+bareos_sd_prestart()
+{
+       	[ -d "${pidfile%/*}" ] || install -d -o ${bareos_sd_user} -g ${bareos_sd_group} ${pidfile%/*}
+}
 
 run_rc_command "$1"
Only in sysutils/bareos-server.orig/files: patch-src-plugins-stored-Makefile.in
diff -Eur sysutils/bareos-server.orig/pkg-plist sysutils/bareos-server/pkg-plist
--- sysutils/bareos-server.orig/pkg-plist	2016-05-09 06:50:16.603226000 +0200
+++ sysutils/bareos-server/pkg-plist	2016-09-01 07:09:00.353492000 +0200
@@ -18,6 +18,7 @@
 lib/bareos/plugins/bareos-sd.py.template
 lib/bareos/plugins/bareos_dir_consts.py
 lib/bareos/plugins/bareos_sd_consts.py
+lib/bareos/plugins/scsicrypto-sd.so
 lib/bareos/scripts/bareos
 lib/bareos/scripts/bareos-config
 lib/bareos/scripts/bareos-config-lib.sh