From bb70b8b5215fb3b53e385cb4cc3a19deb9b03fcc Mon Sep 17 00:00:00 2001
From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
Date: Fri, 7 Jul 2017 02:19:21 +0000
Subject: [PATCH] - Update to 16.2.6 - Fix readline detection [1]

PR:             219201 [1]
Submitted by:   rand at iteris.com [1]
---
 sysutils/bareos-client-static/Makefile |  2 +-
 sysutils/bareos-client/Makefile        |  2 +-
 sysutils/bareos-docs/Makefile          |  3 +--
 sysutils/bareos-docs/distinfo          |  6 +++---
 sysutils/bareos-server/Makefile        | 10 +++++-----
 sysutils/bareos-server/distinfo        |  6 +++---
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/sysutils/bareos-client-static/Makefile b/sysutils/bareos-client-static/Makefile
index e51d335172b5..e9acaa67096e 100644
--- a/sysutils/bareos-client-static/Makefile
+++ b/sysutils/bareos-client-static/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-client-static
 
 COMMENT=	Backup archiving recovery open sourced (static client)
diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile
index cc2f1a19c8a6..f933f74db6c6 100644
--- a/sysutils/bareos-client/Makefile
+++ b/sysutils/bareos-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
diff --git a/sysutils/bareos-docs/Makefile b/sysutils/bareos-docs/Makefile
index e9146389b39d..5cbc910ff98a 100644
--- a/sysutils/bareos-docs/Makefile
+++ b/sysutils/bareos-docs/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTVERSION=	16.2.5
-PORTREVISION=	0
+PORTVERSION=	16.2.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://doc.bareos.org/master/
 PKGNAMESUFFIX=	-docs
diff --git a/sysutils/bareos-docs/distinfo b/sysutils/bareos-docs/distinfo
index 6e7fde752468..06a1081d5af5 100644
--- a/sysutils/bareos-docs/distinfo
+++ b/sysutils/bareos-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489344586
-SHA256 (bareos-manual-main-reference.pdf) = b9753856b7fe9b1910025079caa368a1183580e662087d711ea99f9115fe3b0a
-SIZE (bareos-manual-main-reference.pdf) = 4003802
+TIMESTAMP = 1499393584
+SHA256 (bareos-manual-main-reference.pdf) = 87a1075c3ece0f60f8969feba3171b27fd85e8dc91ac937f3843d35c9bafedb1
+SIZE (bareos-manual-main-reference.pdf) = 4012880
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index e6a8fa21bece..41b26d5a9cf5 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	16.2.5
-PORTREVISION?=	1
+DISTVERSION=	16.2.6
+PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
@@ -17,7 +17,7 @@ LICENSE_COMB=	multi
 
 USE_GITHUB=	yes
 
-USES+=		libtool:keepla pkgconfig shebangfix
+USES+=		libtool:keepla pkgconfig readline:port shebangfix
 
 CONFLICTS?=	bacula*-server-*
 
@@ -34,7 +34,7 @@ USE_LDCONFIG=	yes
 SHEBANG_LANG=	perl
 SHEBANG_FILES=	${WRKSRC}/src/cats/make_catalog_backup.pl.in
 
-CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE?=	MTX PYTHON NDMP NLS OPENSSL SCSICRYPTO
@@ -84,7 +84,7 @@ CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
 		--with-working-dir=${BAREOS_DIR} \
 		--with-scriptdir=${PREFIX}/share/${PORTNAME} \
 		--with-logdir=/var/log/bareos \
-		--with-readline=yes \
+		--with-readline=${LOCALBASE} \
 		--disable-conio \
 		--enable-batch-insert \
 		--with-plugindir=${PREFIX}/lib/bareos/plugins \
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index 4f1367aed73b..14ef1414c7c0 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489344452
-SHA256 (bareos-bareos-Release-16.2.5_GH0.tar.gz) = d4ec1d4397dda7fa67548e5ecaea3ff1be678e8f468f825ceb58fdd6f1b18376
-SIZE (bareos-bareos-Release-16.2.5_GH0.tar.gz) = 4280956
+TIMESTAMP = 1499314554
+SHA256 (bareos-bareos-Release-16.2.6_GH0.tar.gz) = 1ea552d6fdd72807b968382e46a8dccaf6da5f77d225334e55dbb4ad6345dcfa
+SIZE (bareos-bareos-Release-16.2.6_GH0.tar.gz) = 4282022