- Update to 16.2.5

8 files changed, 20 insertions, 27 deletions

diff --git a/sysutils/bareos-client-static/Makefile b/sysutils/bareos-client-static/Makefile
index e51d335172b5..ff1a8f8570c2 100644
--- a/sysutils/bareos-client-static/Makefile
+++ b/sysutils/bareos-client-static/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTREVISION=	1
+#PORTREVISION=	1
 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..d7ce06451f26 100644
--- a/sysutils/bareos-client/Makefile
+++ b/sysutils/bareos-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTREVISION=	1
+#PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
diff --git a/sysutils/bareos-docs/Makefile b/sysutils/bareos-docs/Makefile
index 3b6870b195a2..e9146389b39d 100644
--- a/sysutils/bareos-docs/Makefile
+++ b/sysutils/bareos-docs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-PORTVERSION=	16.2.4
+PORTVERSION=	16.2.5
 PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://doc.bareos.org/master/
diff --git a/sysutils/bareos-docs/distinfo b/sysutils/bareos-docs/distinfo
index f000d8dfcad3..6e7fde752468 100644
--- a/sysutils/bareos-docs/distinfo
+++ b/sysutils/bareos-docs/distinfo
@@ -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
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index 7c081475e501..bfb06a885632 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	16.2.4
-PORTREVISION?=	1
+DISTVERSION=	16.2.5
+PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index 0cd035de4c21..4f1367aed73b 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -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
diff --git a/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in b/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
index 685d558b5405..4123527790de 100644
--- a/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
+++ b/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
@@ -1,5 +1,5 @@
---- 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
@@ -10,18 +10,11 @@
  	$(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; \
diff --git a/sysutils/bareos-server/pkg-plist.client b/sysutils/bareos-server/pkg-plist.client
index 6a3445f4aa6c..4731763d4bad 100644
--- a/sysutils/bareos-server/pkg-plist.client
+++ b/sysutils/bareos-server/pkg-plist.client
@@ -17,16 +17,16 @@
 %%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