svn commit: r474358 - in head: . databases databases/riak databases/riak/files
Ruslan Makhmatkhanov
rm at FreeBSD.org
Tue Jul 10 12:46:38 UTC 2018
Author: rm
Date: Tue Jul 10 12:46:35 2018
New Revision: 474358
URL: https://svnweb.freebsd.org/changeset/ports/474358
Log:
Bring back databases/riak port
Distfiles are actually still available and we still using it at work
While here:
- take up maintainership
- pacify portlint (make makepatch, knobs ordering, add license file)
- unbreak build on recent -current
- remove JOBS_UNSAFE - builds fine here in poudriere with -J 4
Added:
head/databases/riak/
- copied from r471891, head/databases/riak/
head/databases/riak/files/patch-deps-erlang_js-c_src-patches-nspr-src-ptsynch.c.patch (contents, props changed)
Modified:
head/MOVED
head/databases/Makefile
head/databases/riak/Makefile
head/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform
head/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc
head/databases/riak/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch
head/databases/riak/files/patch-rel-reltool.config
head/databases/riak/files/patch-rel-vars.config
head/databases/riak/pkg-descr
Modified: head/MOVED
==============================================================================
--- head/MOVED Tue Jul 10 12:37:47 2018 (r474357)
+++ head/MOVED Tue Jul 10 12:46:35 2018 (r474358)
@@ -10236,7 +10236,6 @@ converters/pdf2djvu||2018-06-07|Has expired: Broken fo
databases/rdb||2018-06-07|Has expired: Broken for more than 6 months
databases/animenfo-client||2018-06-07|Has expired: Broken for more than 6 months
databases/ruby-mysql||2018-06-07|Has expired: Broken for more than 6 months
-databases/riak||2018-06-07|Has expired: Broken for more than 6 months
databases/animenfo-client-gtk||2018-06-07|Has expired: Broken for more than 6 months
databases/rdfdb||2018-06-07|Has expired: Broken for more than 6 months
databases/riak2||2018-06-07|Has expired: Broken for more than 6 months
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Tue Jul 10 12:37:47 2018 (r474357)
+++ head/databases/Makefile Tue Jul 10 12:46:35 2018 (r474358)
@@ -901,6 +901,7 @@
SUBDIR += redis_exporter
SUBDIR += redisdesktopmanager
SUBDIR += retcl
+ SUBDIR += riak
SUBDIR += rocksdb
SUBDIR += rocksdb-lite
SUBDIR += rrdman
Modified: head/databases/riak/Makefile
==============================================================================
--- head/databases/riak/Makefile Thu Jun 7 00:32:27 2018 (r471891)
+++ head/databases/riak/Makefile Tue Jul 10 12:46:35 2018 (r474358)
@@ -7,14 +7,15 @@ CATEGORIES= databases
MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/
-MAINTAINER= robak at FreeBSD.org
+MAINTAINER= rm at FreeBSD.org
COMMENT= Open source, distributed, noSQL database
LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN= No public distfiles
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2018-06-06
+BROKEN_aarch64= Does not compile: error: Unknown CPU architecture
+BROKEN_powerpc64= Does not compile: error: Unknown CPU architecture
+BROKEN_sparc64= Does not compile: Please implement AtomicPointer for this platform
BUILD_DEPENDS= ${LOCALBASE}/lib/erlang15/bin/erlc:lang/erlang-runtime15
@@ -45,12 +46,7 @@ RIAK_LIBDIR?= ${PREFIX}/lib/${PORTNAME}/lib
RIAK_HOMEDIR?= ${PREFIX}/lib/${PORTNAME}
ALL_TARGET= rel
-MAKE_JOBS_UNSAFE=yes
MAKE_ENV= PATH=${LOCALBASE}/lib/erlang15/bin:${PATH}
-
-BROKEN_aarch64= Does not compile: error: Unknown CPU architecture
-BROKEN_powerpc64= Does not compile: error: Unknown CPU architecture
-BROKEN_sparc64= Does not compile: Please implement AtomicPointer for this platform
.include <bsd.port.pre.mk>
Modified: head/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform
==============================================================================
--- head/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform Thu Jun 7 00:32:27 2018 (r471891)
+++ head/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform Tue Jul 10 12:46:35 2018 (r474358)
@@ -1,6 +1,6 @@
---- deps/eleveldb/c_src/leveldb/build_detect_platform.orig 2014-04-02 12:41:11.174611987 +0000
-+++ deps/eleveldb/c_src/leveldb/build_detect_platform 2014-04-02 12:42:31.766605994 +0000
-@@ -134,7 +134,7 @@
+--- deps/eleveldb/c_src/leveldb/build_detect_platform.orig 2014-12-04 17:57:13 UTC
++++ deps/eleveldb/c_src/leveldb/build_detect_platform
+@@ -134,7 +134,7 @@ if [ "$CROSS_COMPILE" = "true" ]; then
true
else
# If -std=c++0x works, use <cstdatomic>. Otherwise use port_posix.h.
@@ -9,7 +9,7 @@
#include <cstdatomic>
int main() {}
EOF
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ EOF
# Test whether Snappy library is installed
# http://code.google.com/p/snappy/
@@ -18,7 +18,7 @@
#include <snappy.h>
int main() {}
EOF
-@@ -157,7 +157,7 @@
+@@ -157,7 +157,7 @@ EOF
fi
# Test whether tcmalloc is available
Modified: head/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc
==============================================================================
--- head/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc Thu Jun 7 00:32:27 2018 (r471891)
+++ head/databases/riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc Tue Jul 10 12:46:35 2018 (r474358)
@@ -1,5 +1,5 @@
---- deps/eleveldb/c_src/leveldb/db/version_set.cc.orig 2014-04-02 12:26:08.746672588 +0000
-+++ deps/eleveldb/c_src/leveldb/db/version_set.cc 2014-04-02 12:37:06.719627543 +0000
+--- deps/eleveldb/c_src/leveldb/db/version_set.cc.orig 2014-12-04 17:57:13 UTC
++++ deps/eleveldb/c_src/leveldb/db/version_set.cc
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. See the AUTHORS file for names of contributors.
@@ -13,7 +13,7 @@
#include "db/filename.h"
#include "db/log_reader.h"
#include "db/log_writer.h"
-@@ -53,13 +55,13 @@
+@@ -56,13 +58,13 @@ static struct
// WARNING: m_OverlappedFiles flags need to match config::kNumOverlapFiles ... until unified
{
Modified: head/databases/riak/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch
==============================================================================
--- head/databases/riak/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch Thu Jun 7 00:32:27 2018 (r471891)
+++ head/databases/riak/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch Tue Jul 10 12:46:35 2018 (r474358)
@@ -1,8 +1,8 @@
---- deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch.orig 2013-01-29 21:13:01.000000000 +0100
-+++ deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch 2013-09-12 14:59:29.000000000 +0200
+--- deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch.orig 2013-01-29 20:13:01 UTC
++++ deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch
@@ -1,6 +1,6 @@
- --- c_src.orig/js/src/config/FreeBSD.mk 1969-12-31 19:00:00.000000000 -0500
- +++ c_src/js/src/config/FreeBSD.mk 2011-03-30 20:12:51.000000000 -0400
+ --- c_src.orig/js/src/config/FreeBSD.mk 1969-12-31 19:00:00.000000000 -0500
+ +++ c_src/js/src/config/FreeBSD.mk 2011-03-30 20:12:51.000000000 -0400
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,100 @@
+# -*- Mode: makefile -*-
Added: head/databases/riak/files/patch-deps-erlang_js-c_src-patches-nspr-src-ptsynch.c.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/riak/files/patch-deps-erlang_js-c_src-patches-nspr-src-ptsynch.c.patch Tue Jul 10 12:46:35 2018 (r474358)
@@ -0,0 +1,15 @@
+--- deps/erlang_js/c_src/patches/nspr-src-ptsynch.c.patch 1970-01-01 03:00:00 UTC
++++ deps/erlang_js/c_src/patches/nspr-src-ptsynch.c.patch
+@@ -0,0 +1,12 @@
++--- c_src/nsprpub/pr/src/pthreads/ptsynch.c.orig 2009-03-19 00:29:32.000000000 +0300
+++++ c_src/nsprpub/pr/src/pthreads/ptsynch.c 2018-07-10 14:59:52.818165000 +0300
++@@ -828,7 +828,8 @@
++ * From the semctl(2) man page in glibc 2.0
++ */
++ #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \
++- || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \
+++ || (defined(FREEBSD) && __FreeBSD_version < 1200059) \
+++ || defined(OPENBSD) || defined(BSDI) \
++ || defined(DARWIN) || defined(SYMBIAN)
++ /* union semun is defined by including <sys/sem.h> */
++ #else
Modified: head/databases/riak/files/patch-rel-reltool.config
==============================================================================
--- head/databases/riak/files/patch-rel-reltool.config Thu Jun 7 00:32:27 2018 (r471891)
+++ head/databases/riak/files/patch-rel-reltool.config Tue Jul 10 12:46:35 2018 (r474358)
@@ -1,5 +1,5 @@
---- rel/reltool.config.orig 2013-09-17 20:53:23.000000000 +0200
-+++ rel/reltool.config 2013-09-17 20:55:40.000000000 +0200
+--- rel/reltool.config.orig 2014-12-04 17:55:03 UTC
++++ rel/reltool.config
@@ -37,8 +37,12 @@
{boot_rel, "riak"},
{profile, embedded},
Modified: head/databases/riak/files/patch-rel-vars.config
==============================================================================
--- head/databases/riak/files/patch-rel-vars.config Thu Jun 7 00:32:27 2018 (r471891)
+++ head/databases/riak/files/patch-rel-vars.config Tue Jul 10 12:46:35 2018 (r474358)
@@ -1,5 +1,5 @@
---- rel/vars.config.orig 2013-08-29 20:13:02.000000000 +0200
-+++ rel/vars.config 2013-09-11 23:04:34.000000000 +0200
+--- rel/vars.config.orig 2014-12-04 17:55:03 UTC
++++ rel/vars.config
@@ -2,11 +2,12 @@
%% ex: ft=erlang ts=4 sw=4 et
@@ -9,11 +9,11 @@
-{platform_etc_dir, "./etc"}.
-{platform_lib_dir, "./lib"}.
-{platform_log_dir, "./log"}.
-+{platform_bin_dir, "%%PREFIX%%/sbin"}.
++{platform_bin_dir, "/usr/local/sbin"}.
+{platform_data_dir, "/var/db/riak"}.
-+{platform_etc_dir, "%%PREFIX%%/etc/riak"}.
-+{platform_base_dir, "%%PREFIX%%/lib/riak"}.
-+{platform_lib_dir, "%%PREFIX%%/lib/riak/lib"}.
++{platform_etc_dir, "/usr/local/etc/riak"}.
++{platform_base_dir, "/usr/local/lib/riak"}.
++{platform_lib_dir, "/usr/local/lib/riak/lib"}.
+{platform_log_dir, "/var/log/riak"}.
%%
Modified: head/databases/riak/pkg-descr
==============================================================================
--- head/databases/riak/pkg-descr Thu Jun 7 00:32:27 2018 (r471891)
+++ head/databases/riak/pkg-descr Tue Jul 10 12:46:35 2018 (r474358)
@@ -3,4 +3,4 @@ so long as your client can reach one server, it should
write data. In most failure scenarios the data you want to read
should be available, albeit possibly stale.
-WWW: http://basho.com/riak
+WWW: http://basho.com/products/riak-kv/
More information about the svn-ports-all
mailing list