fix dependencies

Reported by:	Ken Thomson <thomsonk@yandex.com>

3 files changed, 17 insertions, 46 deletions

diff --git a/databases/leofs/Makefile b/databases/leofs/Makefile
index 1f56c5fab31a..8be6b80df8ab 100644
--- a/databases/leofs/Makefile
+++ b/databases/leofs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	leofs
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	databases
 DIST_SUBDIR=	${PORTNAME}
 
@@ -67,9 +68,7 @@ MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang20/bin:${PATH}
 
 LEOFS_DEPS=	\
 	DeadZen/goldrush=0.1.9:goldrush \
-	basho/eleveldb=2.0.33:eleveldb \
 	basho/getopt=v0.8.2:getopt \
-	basho/leveldb=2.0.33:leveldb \
 	basho/neotoma=1.7.4:neotoma \
 	davisp/jiffy=0.14.8:jiffy \
 	eproxus/meck=0.8.6:meck \
@@ -81,6 +80,7 @@ LEOFS_DEPS=	\
 	leo-project/bitcask=2.0.8.3-for-leofs:bitcask \
 	leo-project/cowboy=for-leofs-1.4:cowboy \
 	leo-project/cuttlefish=04a8442:cuttlefish \
+	leo-project/eleveldb=2.0.37:eleveldb \
 	leo-project/erlpass=612f487:erlpass \
 	leo-project/erpcgen=0.2.6:erpcgen \
 	leo-project/folsom=0.8.2-p1:folsom \
@@ -90,7 +90,7 @@ LEOFS_DEPS=	\
 	leo-project/leo_commons=1.2.0:leo_commons \
 	leo-project/leo_dcerl=0.4.9:leo_dcerl \
 	leo-project/leo_logger=1.3.7:leo_logger \
-	leo-project/leo_mcerl=0.6.6:leo_mcerl \
+	leo-project/leo_mcerl=0.6.7:leo_mcerl \
 	leo-project/leo_mq=1.5.17:leo_mq \
 	leo-project/leo_object_storage=1.3.34:leo_object_storage \
 	leo-project/leo_ordning_reda=1.2.10:leo_ordning_reda \
@@ -101,10 +101,11 @@ LEOFS_DEPS=	\
 	leo-project/leo_statistics=1.1.22:leo_statistics \
 	leo-project/leo_tran=0.2.13:leo_tran \
 	leo-project/leo_watchdog=1.0.6:leo_watchdog \
+	leo-project/leveldb=a9327e8:leveldb \
 	leo-project/libcutil=0.4.5:libcutil \
 	leo-project/nfs_rpc_server=0.2.6:nfs_rpc_server \
-	leo-project/savanna_agent=0.4.23:savanna_agent \
-	leo-project/savanna_commons=0.10.9:savanna_commons \
+	leo-project/savanna_agent=0.4.25:savanna_agent \
+	leo-project/savanna_commons=0.10.11:savanna_commons \
 	manopapad/proper=f558989:proper \
 	ninenines/cowlib=1.0.0:cowlib \
 	systemd/erlang-sd_notify=v1.0:sd_notify \
diff --git a/databases/leofs/distinfo b/databases/leofs/distinfo
index a0382086195e..ee58b467833c 100644
--- a/databases/leofs/distinfo
+++ b/databases/leofs/distinfo
@@ -1,14 +1,10 @@
-TIMESTAMP = 1528719011
+TIMESTAMP = 1531336923
 SHA256 (leofs/leo-project-leofs-1.4.1_GH0.tar.gz) = 83497395f0618fb03f8710075b122d7ed8c52d1ba208d4328dca8494fe9228bc
 SIZE (leofs/leo-project-leofs-1.4.1_GH0.tar.gz) = 6733828
 SHA256 (leofs/DeadZen-goldrush-0.1.9_GH0.tar.gz) = 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612
 SIZE (leofs/DeadZen-goldrush-0.1.9_GH0.tar.gz) = 24548
-SHA256 (leofs/basho-eleveldb-2.0.33_GH0.tar.gz) = 9a12167068f20bd61e23f29708a5ee73d5a33e14ee30ad1cb8390ecf4ab9a22c
-SIZE (leofs/basho-eleveldb-2.0.33_GH0.tar.gz) = 1750242
 SHA256 (leofs/basho-getopt-v0.8.2_GH0.tar.gz) = bfeab0aeb3e515b1c2912874d6e644849561971d8d947ec4adc7c9ff4c394ea8
 SIZE (leofs/basho-getopt-v0.8.2_GH0.tar.gz) = 151272
-SHA256 (leofs/basho-leveldb-2.0.33_GH0.tar.gz) = bf129f00e8de67f008ae8cdd1cd20b805cd008e6f554fccfb3a9522e5e5b3a3d
-SIZE (leofs/basho-leveldb-2.0.33_GH0.tar.gz) = 353214
 SHA256 (leofs/basho-neotoma-1.7.4_GH0.tar.gz) = 97e01d4577d9882b9cb10e079bd33114f1293abae5180dc272be17e419daa0df
 SIZE (leofs/basho-neotoma-1.7.4_GH0.tar.gz) = 182456
 SHA256 (leofs/davisp-jiffy-0.14.8_GH0.tar.gz) = 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d
@@ -31,6 +27,8 @@ SHA256 (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = 3ba3860c574a6f2703f
 SIZE (leofs/leo-project-cowboy-for-leofs-1.4_GH0.tar.gz) = 4829758
 SHA256 (leofs/leo-project-cuttlefish-04a8442_GH0.tar.gz) = d13944b6fbddb370046e0c33e78c15ea2ac765db305d03168f8ddc510323d998
 SIZE (leofs/leo-project-cuttlefish-04a8442_GH0.tar.gz) = 232859
+SHA256 (leofs/leo-project-eleveldb-2.0.37_GH0.tar.gz) = ebd839525b36616eccd39decf7abbb981e2d10b43bbe46723bf9bda6e5d9934b
+SIZE (leofs/leo-project-eleveldb-2.0.37_GH0.tar.gz) = 1760742
 SHA256 (leofs/leo-project-erlpass-612f487_GH0.tar.gz) = 0eb108db05427fb819c6ca1aa63f5cb81596c7971ad1d3f58766ad503f9bc8a4
 SIZE (leofs/leo-project-erlpass-612f487_GH0.tar.gz) = 772785
 SHA256 (leofs/leo-project-erpcgen-0.2.6_GH0.tar.gz) = ed2783a28206917dd0a9f05088aa97c21df4957e395ee38495c3942115624c30
@@ -49,8 +47,8 @@ SHA256 (leofs/leo-project-leo_dcerl-0.4.9_GH0.tar.gz) = 52c70223a2493c9daa9aaa04
 SIZE (leofs/leo-project-leo_dcerl-0.4.9_GH0.tar.gz) = 192890
 SHA256 (leofs/leo-project-leo_logger-1.3.7_GH0.tar.gz) = 30649b16853ac79af45c0ab5a5544f471a7510d2ea639c6e168cdc08970aea71
 SIZE (leofs/leo-project-leo_logger-1.3.7_GH0.tar.gz) = 199985
-SHA256 (leofs/leo-project-leo_mcerl-0.6.6_GH0.tar.gz) = fe939b754a6523e9291952162991410bae7c5783cb865a16d9b7a27304482b0e
-SIZE (leofs/leo-project-leo_mcerl-0.6.6_GH0.tar.gz) = 185314
+SHA256 (leofs/leo-project-leo_mcerl-0.6.7_GH0.tar.gz) = f0076fc7755bff559d91836952b6015dc01f59371ca0b6dcab2c7a35a5a8d670
+SIZE (leofs/leo-project-leo_mcerl-0.6.7_GH0.tar.gz) = 185315
 SHA256 (leofs/leo-project-leo_mq-1.5.17_GH0.tar.gz) = b1d679f5976a3edb133c1e96f68547216ff159d270d6c501bade6082934b77a7
 SIZE (leofs/leo-project-leo_mq-1.5.17_GH0.tar.gz) = 195147
 SHA256 (leofs/leo-project-leo_object_storage-1.3.34_GH0.tar.gz) = 8f3d4a677364920187c83d923ac1ad7d12504a86cdfd45ca2915da6ce247d9e0
@@ -71,14 +69,16 @@ SHA256 (leofs/leo-project-leo_tran-0.2.13_GH0.tar.gz) = 01d7eb2714c323457710a59d
 SIZE (leofs/leo-project-leo_tran-0.2.13_GH0.tar.gz) = 188391
 SHA256 (leofs/leo-project-leo_watchdog-1.0.6_GH0.tar.gz) = 8a5aef0d65cf92af381e75d990b062838b8cd1d2d38d1428544c3f060bddab72
 SIZE (leofs/leo-project-leo_watchdog-1.0.6_GH0.tar.gz) = 201409
+SHA256 (leofs/leo-project-leveldb-a9327e8_GH0.tar.gz) = 428c4fd9dd1a1154873162fa5ba33db968df5ba5563d5d9be7ab745f1c118b26
+SIZE (leofs/leo-project-leveldb-a9327e8_GH0.tar.gz) = 357818
 SHA256 (leofs/leo-project-libcutil-0.4.5_GH0.tar.gz) = 48bcbe7492eaf47785e7628cb6e0793187c21e427720cf73b8800f735e4df5d4
 SIZE (leofs/leo-project-libcutil-0.4.5_GH0.tar.gz) = 23873
 SHA256 (leofs/leo-project-nfs_rpc_server-0.2.6_GH0.tar.gz) = 5cc3785df660774d5bd11175be0da804663913b3c585ed5f7ea57120b7842a13
 SIZE (leofs/leo-project-nfs_rpc_server-0.2.6_GH0.tar.gz) = 197606
-SHA256 (leofs/leo-project-savanna_agent-0.4.23_GH0.tar.gz) = 02d4ad5bf97ec74c2ba9df72623fb8a7cec4aa0873f2c66f77a10b0f8981a0b3
-SIZE (leofs/leo-project-savanna_agent-0.4.23_GH0.tar.gz) = 187114
-SHA256 (leofs/leo-project-savanna_commons-0.10.9_GH0.tar.gz) = e3bb47efff3f0d7af6e45aaf48ee0ffba6d4875d98e25149d0727c65abc7f515
-SIZE (leofs/leo-project-savanna_commons-0.10.9_GH0.tar.gz) = 198358
+SHA256 (leofs/leo-project-savanna_agent-0.4.25_GH0.tar.gz) = a5bc117d1248f64f1f2056c3085f1896440770b4449809ad3208dc018d40e837
+SIZE (leofs/leo-project-savanna_agent-0.4.25_GH0.tar.gz) = 187116
+SHA256 (leofs/leo-project-savanna_commons-0.10.11_GH0.tar.gz) = b7823db80df3514a74bec0bd88d8b6f83dd159e64f101e2da2b1b7304e4b2c0e
+SIZE (leofs/leo-project-savanna_commons-0.10.11_GH0.tar.gz) = 198345
 SHA256 (leofs/manopapad-proper-f558989_GH0.tar.gz) = 67db9f6ee77a5f54967b99d70974d9dda1a07f5cd8839ef8ad80625fde639c1b
 SIZE (leofs/manopapad-proper-f558989_GH0.tar.gz) = 292555
 SHA256 (leofs/ninenines-cowlib-1.0.0_GH0.tar.gz) = 48a8784ae7d266724276f9842b3a06cfbbfe69469f58c27237c602232f7ebe5a
diff --git a/databases/leofs/files/patch-deps-eleveldb-c_src-leveldb-util-perf_count.cc b/databases/leofs/files/patch-deps-eleveldb-c_src-leveldb-util-perf_count.cc
deleted file mode 100644
index edbd0e9a17a6..000000000000
--- a/databases/leofs/files/patch-deps-eleveldb-c_src-leveldb-util-perf_count.cc
+++ /dev/null
@@ -1,30 +0,0 @@
---- deps/eleveldb/c_src/leveldb/util/perf_count.cc.orig	2017-01-08 11:38:09.374810000 +0200
-+++ deps/eleveldb/c_src/leveldb/util/perf_count.cc	2017-01-21 00:09:02.610066000 +0200
-@@ -360,11 +360,11 @@
-             uint32_t ret_32, * ptr_32;
- 
-             ptr_32=(uint32_t *)&val_ptr;
--            ret_32=inc_and_fetch(ptr_32, 1);
-+            ret_32=inc_and_fetch(ptr_32);
-             if (0==ret_32)
-             {
-                 ++ptr_32;
--                inc_and_fetch(ptr_32, 1);
-+                inc_and_fetch(ptr_32);
-             }   // if
- #endif
-             ret_val=*val_ptr;
-@@ -432,11 +432,11 @@
- 
-             ptr_32=(uint32_t *)&val_ptr;
-             old_32=*ptr_32;
--            ret_32=add_and_fetch(ptr_32, Amount);
-+            ret_32=add_and_fetch(ptr_32, (uint32_t)Amount);
-             if (ret_32<old_32)
-             {
-                 ++ptr_32;
--                add_and_fetch(ptr_32, 1);
-+                add_and_fetch(ptr_32, (uint32_t)1);
-             }   // if
- 
-             ret_val=*val_ptr;