Index: head/sysutils/bareos-client/Makefile
===================================================================
--- head/sysutils/bareos-client/Makefile	(revision 407506)
+++ head/sysutils/bareos-client/Makefile	(revision 407507)
@@ -1,20 +1,20 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
 
 WITH_CLIENT_ONLY=yes
 USE_RC_SUBR=	bareos-fd
 
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
 
 OPTIONS_DEFINE=	NLS PYTHON LMDB
 OPTIONS_DEFAULT=#
 LMDB_DESC=	Enable build of LMDB support
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/bareos-docs/distinfo
===================================================================
--- head/sysutils/bareos-docs/distinfo	(revision 407506)
+++ head/sysutils/bareos-docs/distinfo	(revision 407507)
@@ -1,2 +1,2 @@
-SHA256 (bareos-manual-main-reference.pdf) = 3e91963872dd18198f4122a73b895a6e0a820cb0942c2a2e108b3434771bd87f
-SIZE (bareos-manual-main-reference.pdf) = 2869056
+SHA256 (bareos-manual-main-reference.pdf) = aa647370d0090b2f298f41d98ccc875c5ecdc2fa237b2bad9b35f1d2afa365ae
+SIZE (bareos-manual-main-reference.pdf) = 3082318
Index: head/sysutils/bareos-server/Makefile
===================================================================
--- head/sysutils/bareos-server/Makefile	(revision 407506)
+++ head/sysutils/bareos-server/Makefile	(revision 407507)
@@ -1,209 +1,211 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bareos
 DISTVERSION=	15.2.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
 
 USE_GITHUB=	yes
 GH_TAGNAME=	fb775025d54ef77abb4d67cc5aa9ecb90bca4839
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Backup archiving recovery open sourced (server)
 
-USES+=		libtool:keepla
+USES+=		libtool:keepla pkgconfig
 
 CONFLICTS?=	bacula*-server-*
 
-LIB_DEPENDS+=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS+=	liblzo2.so:${PORTSDIR}/archivers/lzo2 \
+		libjansson.so:${PORTSDIR}/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
 OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL
 OPTIONS_SUB=		yes
 MTX_DESC=		Install mtx for control of autochanger devices
 NDMP_DESC=		Enable build of NDMP support
 
 .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_USE=	OPENSSL=yes
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 OPENSSL_CONFIGURE_OFF=	--with-openssl="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
 
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbareos.so:${PORTSDIR}/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-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:${PORTSDIR}/databases/sqlite3
 PGSQL_CONFIGURE_ON=	--with-postgresql=yes
 PGSQL_USES=	pgsql
 
 MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/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|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c
 	@${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
 	@${REINPLACE_CMD} -e 's|bareos-dir.d/||g' ${WRKSRC}/src/plugins/filed/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|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
 
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
 	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/plugin-python-ldap.conf ${STAGEDIR}${ETCDIR}/plugin-python-ldap.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
 .endif
 	for na in ${CONFFILES}; do \
 		${MV} ${STAGEDIR}${ETCDIR}/bareos-$$na.conf ${STAGEDIR}${ETCDIR}/bareos-$$na.conf.sample; \
 	done
 	@${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/files/patch-src-dird-Makefile.in
===================================================================
--- head/sysutils/bareos-server/files/patch-src-dird-Makefile.in	(revision 407506)
+++ head/sysutils/bareos-server/files/patch-src-dird-Makefile.in	(revision 407507)
@@ -1,37 +1,45 @@
---- src/dird/Makefile.in	2015-06-25 05:37:04.000000000 -0500
-+++ src/dird/Makefile.in	2015-07-25 16:32:30.152534000 -0500
-@@ -77,7 +77,7 @@
+--- src/dird/Makefile.in	2015-12-03 03:22:54.000000000 -0500
++++ src/dird/Makefile.in	2016-01-29 23:53:16.549306000 -0500
+@@ -50,6 +50,7 @@
+ INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
+ 
+ JANSSON_CPPFLAGS = @JANSSON_INC@
++JANSSON_LDFLAGS = @JANSSON_LIBS@
+ 
+ .SUFFIXES:	.c .o
+ .PHONY:
+@@ -79,7 +80,7 @@
  	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
  	      $(NDMP_LIBS) -lbareosfind -lbareossql -lbareoscats -lbareoscfg -lbareos -lm $(DLIB) \
  	      $(DB_LIBS) $(LIBS) $(WRAPLIBS) $(GETTEXT_LIBS) $(CAP_LIBS) \
 -	      $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	      $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
++	      $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
  
  bareos-dbcheck: Makefile $(DBCHKOBJS) \
  	 ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
-@@ -88,7 +88,7 @@
+@@ -90,7 +91,7 @@
  	@echo "Linking $@ ..."
  	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(DBCHKOBJS) \
  	      -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \
 -	      $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	      $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
++	      $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
  
  testfind: Makefile $(TSTFNDOBJS) \
  	 ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
-@@ -99,7 +99,7 @@
+@@ -101,7 +102,7 @@
  	@echo "Linking $@ ..."
  	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(TSTFNDOBJS) \
  	      -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \
 -	      $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
 +	      $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
  
  static-bareos-dir:  Makefile $(SVROBJS) \
  	            ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
-@@ -140,7 +140,6 @@
+@@ -142,7 +143,6 @@
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bareos-dir $(DESTDIR)$(sbindir)/bareos-dir
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bareos-dbcheck $(DESTDIR)$(sbindir)/bareos-dbcheck
  	@srcconf=bareos-dir.conf; \
 -	   $(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/; \
  	   if  test -f ${DESTDIR}${confdir}/$$srcconf; then \
  	      destconf=$$srcconf.new; \
  	      echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \