Index: bareos-client/Makefile
===================================================================
--- bareos-client/Makefile	(revision 416615)
+++ bareos-client/Makefile	(working copy)
@@ -13,8 +13,9 @@
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
 
-OPTIONS_DEFINE=	NLS PYTHON LMDB
+OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
 OPTIONS_DEFAULT=#
 LMDB_DESC=	Enable build of LMDB support
+SCSICRYPTO_DESC= Build LTO AME crypto plugin
 
 .include "${MASTERDIR}/Makefile"
Index: bareos-server/Makefile
===================================================================
--- bareos-server/Makefile	(revision 416615)
+++ bareos-server/Makefile	(working copy)
@@ -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' \
Index: bareos-server/files/patch-src-plugins-stored-Makefile.in
===================================================================
--- bareos-server/files/patch-src-plugins-stored-Makefile.in	(revision 416615)
+++ bareos-server/files/patch-src-plugins-stored-Makefile.in	(nonexistent)
@@ -1,11 +0,0 @@
---- src/plugins/stored/Makefile.in	2015-07-23 18:04:28.275396000 -0500
-+++ src/plugins/stored/Makefile.in	2015-07-23 18:05:09.508399000 -0500
-@@ -39,7 +39,7 @@
- 
- autoxflate-sd.la: Makefile \
- 		  autoxflate-sd$(DEFAULT_OBJECT_TYPE) \
--		  ../../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
-+		  $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared autoxflate-sd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version -L../../lib -lbareos
- 
- example-plugin-sd.la: Makefile example-plugin-sd$(DEFAULT_OBJECT_TYPE)

Property changes on: bareos-server/files/patch-src-plugins-stored-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: bareos-server/pkg-plist
===================================================================
--- bareos-server/pkg-plist	(revision 416615)
+++ bareos-server/pkg-plist	(working copy)
@@ -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