Index: head/sysutils/bareos-client/Makefile
===================================================================
--- head/sysutils/bareos-client/Makefile	(revision 436157)
+++ head/sysutils/bareos-client/Makefile	(revision 436158)
@@ -1,22 +1,22 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTREVISION=	1
+#PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
 WITH_CLIENT_ONLY=yes
 USE_RC_SUBR=	bareos-fd
 
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
 
 OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
 OPTIONS_DEFAULT=#
 LMDB_DESC=	Enable build of LMDB support
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/bareos-client-static/Makefile
===================================================================
--- head/sysutils/bareos-client-static/Makefile	(revision 436157)
+++ head/sysutils/bareos-client-static/Makefile	(revision 436158)
@@ -1,30 +1,30 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTREVISION=	1
+#PORTREVISION=	1
 PKGNAMESUFFIX=	-client-static
 
 COMMENT=	Backup archiving recovery open sourced (static client)
 
 PLIST=		${.CURDIR}/pkg-plist
 MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
 
 PLIST_FILES=	sbin/bareos-fd-static \
 		sbin/bconsole-static
 
 OPTIONS_DEFINE=	NLS LMDB
 OPTIONS_DEFAULT=#
 LMDB_DESC=	Enable build of LMDB support
 
 CONFIGURE_ARGS+=	--enable-client-only \
 			--enable-static-fd \
 			--enable-static-cons \
 			--disable-libtool \
 			--disable-build-dird \
 			--disable-build-stored \
 			--with-jansson=${LOCALBASE}
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/bareos-docs/Makefile
===================================================================
--- head/sysutils/bareos-docs/Makefile	(revision 436157)
+++ head/sysutils/bareos-docs/Makefile	(revision 436158)
@@ -1,27 +1,27 @@
 # Created by: Alonso CArdenas <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTVERSION=	16.2.4
+PORTVERSION=	16.2.5
 PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://doc.bareos.org/master/
 PKGNAMESUFFIX=	-docs
 DISTFILES=	${PORTNAME}-manual-main-reference.pdf
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Bareos document set (PDF)
 
 NO_BUILD=	yes
 
 PORTDOCS=	*.pdf
 
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/${PORTNAME}-manual-main-reference.pdf ${WRKSRC}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-manual-main-reference.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/bareos-docs/distinfo
===================================================================
--- head/sysutils/bareos-docs/distinfo	(revision 436157)
+++ head/sysutils/bareos-docs/distinfo	(revision 436158)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479744631
-SHA256 (bareos-manual-main-reference.pdf) = f226b7aaa4f1be6feadda1a7edfefa0c186ada382ceb61f9c630787b9fbc5b0e
-SIZE (bareos-manual-main-reference.pdf) = 3980129
+TIMESTAMP = 1489344586
+SHA256 (bareos-manual-main-reference.pdf) = b9753856b7fe9b1910025079caa368a1183580e662087d711ea99f9115fe3b0a
+SIZE (bareos-manual-main-reference.pdf) = 4003802
Index: head/sysutils/bareos-server/Makefile
===================================================================
--- head/sysutils/bareos-server/Makefile	(revision 436157)
+++ head/sysutils/bareos-server/Makefile	(revision 436158)
@@ -1,226 +1,226 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	16.2.4
-PORTREVISION?=	1
+DISTVERSION=	16.2.5
+PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Backup archiving recovery open sourced (server)
 
 LICENSE=	AGPLv3 LGPL3
 LICENSE_COMB=	multi
 
 USE_GITHUB=	yes
 
 USES+=		libtool:keepla pkgconfig
 
 CONFLICTS?=	bacula*-server-*
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libjansson.so:devel/jansson
 
 USERS=		bareos
 GROUPS=		${USERS}
 
 PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE?=	MTX PYTHON NDMP NLS OPENSSL SCSICRYPTO
 OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL SCSICRYPTO
 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
 OPTIONS_SINGLE=		DATABASE
 DATABASE_DESC=		Database support
 
 NDMP_CONFIGURE_ON=	--enable-ndmp=yes
 NDMP_CONFIGURE_OFF=	--enable-ndmp=no
 .endif
 
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 OPENSSL_CONFIGURE_OFF=	--with-openssl="no"
 
 SCSICRYPTO_CONFIGURE_ON=	--enable-scsi-crypto=yes
 SCSICRYPTO_CONFIGURE_OFF=	--enable-scsi-crypto=no
 
 .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
 PYTHON_USES=		  python
 PYTHON_CONFIGURE_ON=	--with-python=yes
 PYTHON_CONFIGURE_OFF=	--with-python=no
 PYTHON_PLUGIN=		yes
 
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbareos.so:sysutils/bareos-client
 USE_RC_SUBR?=	bareos-dir bareos-sd
 .endif
 
 .if defined(WITH_CLIENT_ONLY)
 SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
 .else
 SUB_FILES+=	pkg-message.server
 .endif
 
 CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
 		--enable-libtool \
 		--enable-smartalloc \
 		--sysconfdir=${PREFIX}/etc \
 		--with-working-dir=${BAREOS_DIR} \
 		--with-scriptdir=${PREFIX}/share/${PORTNAME} \
 		--with-logdir=/var/log/bareos \
 		--with-readline=yes \
 		--disable-conio \
 		--enable-batch-insert \
 		--with-plugindir=${PREFIX}/lib/bareos/plugins \
 		--with-scriptdir=${PREFIX}/lib/bareos/scripts \
 		--with-dump-email=root@localhost \
 		--with-job-email=root@localhost \
 		--with-db-name=bareos \
 		--with-sbin-perm=755 \
 		--with-db-user=bareos \
 		--with-baseport=9101 \
 		--with-pid-dir=/var/run/bareos \
 		--with-jansson=${LOCALBASE}
 
 .if defined(WITH_CLIENT_ONLY)
 LMDB_CONFIGURE_ON=	--enable-lmdb=yes
 LMDB_CONFIGURE_OFF=	--enable-lmdb=no
 LMDB_CFLAGS=		-DMDB_DSYNC=O_SYNC
 
 CONFIGURE_ARGS+=--with-fd-user=root \
 		--with-fd-group=wheel
 .else
 CONFIGURE_ARGS+=--with-dir-user=${BAREOS_USER} \
 		--with-dir-group=${BAREOS_GROUP} \
 		--with-sd-user=${BAREOS_USER} \
 		--with-sd-group=operator
 .endif
 
 # The user/group IDs below are registered, see
 # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
 #
 BAREOS_USER?=	bareos
 BAREOS_GROUP?=	${BAREOS_USER}
 BAREOS_UID?=	997
 BAREOS_GID?=	${BAREOS_UID}
 BAREOS_DIR?=	/var/db/bareos
 
 PLIST_SUB+=	BAREOS_DIR=${BAREOS_DIR}
 
 SUB_LIST=	BAREOS_USER=${BAREOS_USER} \
 		BAREOS_GROUP=${BAREOS_GROUP} \
 		BAREOS_UID=${BAREOS_UID} \
 		BAREOS_GID=${BAREOS_GID} \
 		BAREOS_DIR=${BAREOS_DIR}
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 # Client only or full server version
 .if defined(WITH_CLIENT_ONLY)
 CONFFILES=	fd
 CONFIGURE_ARGS+=	--enable-client-only
 
 PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
 PKGINSTALL=	${FILESDIR}/pkg-install.client
 .else
 # Server only Options
 CONFFILES=		sd dir
 # Server default database
 
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
 MYSQL_USE=	MYSQL=yes
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
 SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 PGSQL_CONFIGURE_ON=	--with-postgresql=yes
 PGSQL_USES=	pgsql
 
 MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 DBTYPE=			mysql
 SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
 .elif ${PORT_OPTIONS:MSQLITE3}
 DBTYPE=			sqlite3
 .else
 DBTYPE=			postgresql
 SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
 .endif
 PLIST_SUB+=		DBTYPE=${DBTYPE}
 
 .endif
 
 .if defined(WITH_CLIENT_ONLY)
 MP1+=	bconsole.1
 MP8+=	bareos-fd.8
 .else
 MP8+=	bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
 	btape.8 btraceback.8 bareos-dbcheck.8
 MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
 .endif
 
 MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
 
 post-patch:
 #	This port does not install docs.  See bareos-docs for that
 	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
 #	Default bconsole.conf is in ${ETCDIR}
 	@${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
 	@${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in
 .if defined(WITH_CLIENT_ONLY)
 	@${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
 .else
 #	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/|$$(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|../../lib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/plugins/dird/Makefile.in ${WRKSRC}/src/plugins/stored/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' \
 		${WRKSRC}/src/tools/bpluginfo.c
 .endif
 
 post-extract:
 .if defined(WITH_CLIENT_ONLY)
 .	if defined(PYTHON_PLUGIN)
 		@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/fileset
 		@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/job
 .	endif
 .endif
 	@${MV} ${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
 		${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf'
 
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
 	${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
 	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample
 	${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp
 	${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample
 .endif
 	@${MKDIR} ${STAGEDIR}/var/run/bareos
 .endif
 .else
 .include "${MASTERDIR}/Makefile.common"
 .endif # -client and -server are defined
 .include <bsd.port.mk>
Index: head/sysutils/bareos-server/distinfo
===================================================================
--- head/sysutils/bareos-server/distinfo	(revision 436157)
+++ head/sysutils/bareos-server/distinfo	(revision 436158)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478549080
-SHA256 (bareos-bareos-Release-16.2.4_GH0.tar.gz) = 9a96d9220150f1db643c932ac529b1e3ad179978ef6b06a2504c06db43b4ff3c
-SIZE (bareos-bareos-Release-16.2.4_GH0.tar.gz) = 4275141
+TIMESTAMP = 1489344452
+SHA256 (bareos-bareos-Release-16.2.5_GH0.tar.gz) = d4ec1d4397dda7fa67548e5ecaea3ff1be678e8f468f825ceb58fdd6f1b18376
+SIZE (bareos-bareos-Release-16.2.5_GH0.tar.gz) = 4280956
Index: head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
===================================================================
--- head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in	(revision 436157)
+++ head/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in	(revision 436158)
@@ -1,28 +1,21 @@
---- src/plugins/filed/Makefile.in	2016-10-16 10:14:36.000000000 -0500
-+++ src/plugins/filed/Makefile.in	2016-11-09 16:45:34.113690000 -0500
+--- src/plugins/filed/Makefile.in	2017-03-12 19:49:48.441405000 -0500
++++ src/plugins/filed/Makefile.in	2017-03-12 19:51:04.400881000 -0500
 @@ -93,7 +93,8 @@
  
  install: all
  	$(MKDIR) $(DESTDIR)$(plugindir)
 -	$(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/
 +	$(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/fileset
 +	$(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/job
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir)
  	$(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
  	for plugin in $(BUILD_PLUGINS); do \
-@@ -102,13 +103,13 @@
- 	   CONF=`echo $$plugin | sed 's/\(.*\)-fd.la$$/\1-conf.d/'`; \
- 	   if [ -d "$$CONF" ]; then \
- 	      for i in `find "$$CONF/" \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \
--	         $(INSTALL_CONFIG) -D $$CONF/$$i ${DESTDIR}${confdir}/$$i; \
-+	         $(INSTALL_CONFIG) $$CONF/$$i ${DESTDIR}${confdir}/$$i; \
- 	      done; \
- 	   fi; \
- 		if [ "$$plugin" = "python-fd.la" ]; then \
+@@ -110,7 +111,7 @@
  			$(CP) *.py *.py.template $(DESTDIR)$(plugindir); \
  			for i in `find python-ldap-conf.d/ \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \
--				$(INSTALL_CONFIG) -D python-ldap-conf.d/$$i ${DESTDIR}${confdir}/$$i; \
+ 				$(MKDIR) `dirname ${DESTDIR}${confdir}/$$i`; \
+-				$(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/$$i; \
 +				$(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/`echo $$i | sed -e 's|example|sample|g'`; \
  			done; \
  		fi; \
  	done
Index: head/sysutils/bareos-server/pkg-plist.client
===================================================================
--- head/sysutils/bareos-server/pkg-plist.client	(revision 436157)
+++ head/sysutils/bareos-server/pkg-plist.client	(revision 436158)
@@ -1,54 +1,54 @@
 @sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
 @group bareos
 @sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
 @group bareos
 @sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
 @group bareos
 @sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
 @group bareos
 %%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
 %%PYTHON%%@group bareos
 %%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
 %%PYTHON%%@group bareos
 %%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
 %%PYTHON%%@group bareos
 @sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample
 @group wheel
 %%LMDB%%@sample %%ETCDIR%%/plugin-python-ldap.conf.sample
 lib/libbareos.la
 lib/libbareos.so
-lib/libbareos-16.2.4.so
+lib/libbareos-%%LIB_VERSION%%.so
 lib/libbareoscfg.la
 lib/libbareoscfg.so
-lib/libbareoscfg-16.2.4.so
+lib/libbareoscfg-%%LIB_VERSION%%.so
 lib/libbareosfind.la
 lib/libbareosfind.so
-lib/libbareosfind-16.2.4.so
+lib/libbareosfind-%%LIB_VERSION%%.so
 %%LMDB%%lib/libbareoslmdb.la
 %%LMDB%%lib/libbareoslmdb.so
-%%LMDB%%lib/libbareoslmdb-16.2.4.so
+%%LMDB%%lib/libbareoslmdb-%%LIB_VERSION%%.so
 %%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
 %%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
 %%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
 %%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py
 %%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd.py.template
 lib/bareos/plugins/bpipe-fd.so
 %%PYTHON%%lib/bareos/plugins/python-fd.so
 man/man8/bareos-fd.8.gz
 man/man1/bconsole.1.gz
 sbin/bareos-fd
 @group bareos
 sbin/bconsole
 bin/bconsole
 @group wheel
 @dir(bareos,bareos,)  %%BAREOS_DIR%%
 %%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset
 %%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job
 @dir lib/bareos/plugins
 @dir lib/bareos/scripts
 @dir(bareos,bareos,) /var/log/bareos
 @dir(bareos,bareos,) /var/run/bareos