--- riak/Makefile 2015-03-10 19:16:43.688889604 +0000 +++ riak/Makefile 2015-03-10 18:55:52.645975094 +0000 @@ -1,42 +1,41 @@ -# $FreeBSD: head/databases/riak/Makefile 379548 2015-02-21 20:39:33Z robak $ +# $FreeBSD: head/databases/riak/Makefile 371981 2014-11-01 00:09:15Z bapt $ PORTNAME= riak -PORTVERSION= 1.4.12 +PORTVERSION= 2.0.5 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}/ + http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \ MAINTAINER= robak@FreeBSD.org COMMENT= Riak is an open source, distributed, noSQL database LICENSE= APACHE20 -BUILD_DEPENDS= ${LOCALBASE}/lib/erlang15/bin/erlc:${PORTSDIR}/lang/erlang-runtime15 +BUILD_DEPENDS= ${LOCALBASE}/lib/erlang16/bin/erlc:${PORTSDIR}/lang/erlang-runtime16 USES= gmake readline USE_RC_SUBR= riak - -PLIST= ${WRKDIR}/pkg-plist -PLIST_SUB+= GROUPS=${GROUPS} \ - RIAK_CONFDIR=${RIAK_CONFDIR} \ - RIAK_DBDIR=${RIAK_DBDIR} \ - RIAK_HOMEDIR=${RIAK_HOMEDIR} \ - RIAK_LIBDIR=${RIAK_LIBDIR} \ - RIAK_LOGDIR=${RIAK_LOGDIR} \ - USERS=${USERS} +USE_GCC= yes USERS= riak GROUPS= riak -RIAK_CONFDIR?= ${PREFIX}/etc/${PORTNAME} RIAK_LOGDIR?= /var/log/${PORTNAME} RIAK_DBDIR?= /var/db/${PORTNAME} -RIAK_LIBDIR?= ${PREFIX}/lib/${PORTNAME}/lib RIAK_HOMEDIR?= ${PREFIX}/lib/${PORTNAME} +RIAK_LIBDIR?= ${PREFIX}/lib/${PORTNAME}/lib + +PLIST= ${WRKDIR}/pkg-plist +PLIST_SUB+= RIAK_DBDIR=${RIAK_DBDIR} \ + RIAK_HOMEDIR=${RIAK_HOMEDIR} \ + RIAK_LIBDIR=${RIAK_LIBDIR} \ + RIAK_LOGDIR=${RIAK_LOGDIR} \ + USERS=${USERS} \ + GROUPS=${GROUPS} ALL_TARGET= rel MAKE_JOBS_UNSAFE=yes -MAKE_ENV= PATH=${LOCALBASE}/lib/erlang15/bin:${PATH} +MAKE_ENV= PATH=${LOCALBASE}/lib/erlang16/bin:${PATH} .include @@ -55,17 +54,20 @@ (cd ${WRKSRC}/rel; ${FIND} ${PORTNAME}/lib -type f \ | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ | ${AWK} '{print "lib/"$$2 }' >> ${PLIST}) + (cd ${WRKSRC}/rel; ${FIND} ${PORTNAME}/lib -type d -empty \ + | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ + | ${AWK} '{print "@dir lib/"$$2 }' >> ${PLIST}) ${ECHO} "@owner" >> ${PLIST} ${ECHO} "@group" >> ${PLIST} do-install: -.for d in ${RIAK_CONFDIR} ${RIAK_LOGDIR} ${RIAK_DBDIR} ${RIAK_LIBDIR} ${RIAK_HOMEDIR} +.for d in ${ETCDIR} ${RIAK_LOGDIR} ${RIAK_DBDIR} ${RIAK_LIBDIR} ${RIAK_HOMEDIR} ${MKDIR} ${STAGEDIR}${d} .endfor - ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/vm.args ${STAGEDIR}${RIAK_CONFDIR}/vm.args.sample - ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/app.config ${STAGEDIR}${RIAK_CONFDIR}/app.config.sample - ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/cert.pem ${STAGEDIR}${RIAK_CONFDIR}/cert.pem.sample - ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/key.pem ${STAGEDIR}${RIAK_CONFDIR}/key.pem.sample + ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${ETCDIR}/riak.conf.sample + ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${ETCDIR}/riak.conf + ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${ETCDIR}/solr-log4j.properties.sample + ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${ETCDIR}/solr-log4j.properties (cd ${WRKSRC}/rel/riak/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAK_LIBDIR}) (cd ${WRKSRC}/rel/riak/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/) (cd ${WRKSRC}/rel/riak/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_LIBDIR}/basho-patches) @@ -75,5 +77,12 @@ ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-admin.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-debug.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/search-cmd.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/bitcask-1.7.0/priv/bitcask.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/erlang_js-1.3.0-0-g07467d8/priv/erlang_js_drv.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/syslog-1.0.2/priv/syslog_drv.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/canola-2.0.0-0-g9bdfee8/priv/canola-port + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/riak_ensemble-2.0.0-1-gd66a102/priv/riak_ensemble.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/sext-1.1p3-0-g846b9cc/priv/sext.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/eleveldb-2.0.0-3-g10fcb78/priv/eleveldb.so .include --- riak/distinfo 2015-03-10 19:16:43.688889604 +0000 +++ riak/distinfo 2015-03-10 18:55:55.922975020 +0000 @@ -1,2 +1,2 @@ -SHA256 (riak-1.4.12.tar.gz) = 2ae63ba183ce457399a21542c75aa6149481c972ebac739a1599e93e81982c91 -SIZE (riak-1.4.12.tar.gz) = 13821609 +SHA256 (riak-2.0.5.tar.gz) = 390cd596762a7465712b472eb7058314a400068fa1ad567b93530eecdaed8047 +SIZE (riak-2.0.5.tar.gz) = 17805547 --- riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform 2015-03-10 19:16:43.687891638 +0000 +++ riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ ---- 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 @@ - true - else - # If -std=c++0x works, use . Otherwise use port_posix.h. -- $CXX $CFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null </dev/null < - int main() {} - EOF -@@ -147,7 +147,7 @@ - - # Test whether Snappy library is installed - # http://code.google.com/p/snappy/ -- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null </dev/null < - int main() {} - EOF -@@ -157,7 +157,7 @@ - fi - - # Test whether tcmalloc is available -- $CXX $CFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null </dev/null < - #include -+#include - #include "db/filename.h" - #include "db/log_reader.h" - #include "db/log_writer.h" -@@ -53,13 +55,13 @@ - - // WARNING: m_OverlappedFiles flags need to match config::kNumOverlapFiles ... until unified - { -- {10485760, 262144000, 57671680, 209715200, 0, 300000000, true}, -- {10485760, 82914560, 57671680, 419430400, 0, 209715200, true}, -- {10485760, 314572800, 57671680, 1006632960, 200000000, 314572800, false}, -- {10485760, 419430400, 57671680, 4094304000ULL, 3355443200ULL, 419430400, false}, -- {10485760, 524288000, 57671680, 41943040000ULL, 33554432000ULL, 524288000, false}, -- {10485760, 629145600, 57671680, 419430400000ULL, 335544320000ULL, 629145600, false}, -- {10485760, 734003200, 57671680, 4194304000000ULL, 3355443200000ULL, 734003200, false} -+ {UINT64_C(10485760), UINT64_C(262144000), INT64_C(57671680), UINT64_C( 209715200), UINT64_C( 0), UINT64_C(300000000), true}, -+ {UINT64_C(10485760), UINT64_C( 82914560), INT64_C(57671680), UINT64_C( 419430400), UINT64_C( 0), UINT64_C(209715200), true}, -+ {UINT64_C(10485760), UINT64_C(314572800), INT64_C(57671680), UINT64_C( 1006632960), UINT64_C( 200000000), UINT64_C(314572800), false}, -+ {UINT64_C(10485760), UINT64_C(419430400), INT64_C(57671680), UINT64_C( 4094304000), UINT64_C( 3355443200), UINT64_C(419430400), false}, -+ {UINT64_C(10485760), UINT64_C(524288000), INT64_C(57671680), UINT64_C( 41943040000), UINT64_C( 33554432000), UINT64_C(524288000), false}, -+ {UINT64_C(10485760), UINT64_C(629145600), INT64_C(57671680), UINT64_C( 419430400000), UINT64_C( 335544320000), UINT64_C(629145600), false}, -+ {UINT64_C(10485760), UINT64_C(734003200), INT64_C(57671680), UINT64_C(4194304000000), UINT64_C(3355443200000), UINT64_C(734003200), false} - }; - - /// ULL above needed to compile on OSX 10.7.3 --- riak/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch 2015-03-10 19:16:43.687891638 +0000 +++ riak/files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ ---- 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 -@@ -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 --@@ -0,0 +1,99 @@ -+@@ -0,0 +1,100 @@ - +# -*- Mode: makefile -*- - +# - +# ***** BEGIN LICENSE BLOCK ***** -@@ -46,6 +46,7 @@ - + - +CC ?= gcc - +CCC ?= g++ -++LD = $(CC) - +CFLAGS += -Wall -Wno-format - +OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R - + --- riak/files/patch-deps-node_package-priv-base-env.sh 2015-03-10 19:16:43.687891638 +0000 +++ riak/files/patch-deps-node_package-priv-base-env.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ ---- deps/node_package/priv/base/env.sh.orig 2013-09-13 10:22:32.000000000 +0200 -+++ deps/node_package/priv/base/env.sh 2013-09-13 10:27:16.000000000 +0200 -@@ -100,7 +100,7 @@ - # read/write/delete .pid files during startup/shutdown - create_pid_dir() { - # Validate RUNNER_USER is set and they have permissions to write to /var/run -- # Don't continue if we've already sudo'd to RUNNER_USER -+ # Don't continue if we've already su'd to RUNNER_USER - if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then - if [ -w $RUN_DIR ]; then - mkdir -p $PID_DIR -@@ -161,12 +161,12 @@ - # Validate that the user running the script is the owner of the - # RUN_DIR. - if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then -- type sudo > /dev/null 2>&1 -+ type su > /dev/null 2>&1 - if [ "$?" -ne 0 ]; then -- echoerr "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2 -+ echoerr "su doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2 - exit 1 - fi -- exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@ -+ exec su - $RUNNER_USER -c "$RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@" - fi - } - --- riak/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch 1970-01-01 00:00:00.000000000 +0000 +++ riak/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch 2015-03-10 19:09:41.386917528 +0000 @@ -0,0 +1,27 @@ +--- deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch.orig 2015-02-26 16:11:58 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 +-@@ -0,0 +1,99 @@ ++@@ -0,0 +1,100 @@ + +# -*- Mode: makefile -*- + +# + +# ***** BEGIN LICENSE BLOCK ***** +@@ -46,6 +46,7 @@ + + + +CC ?= gcc + +CCC ?= g++ +++LD = $(CC) + +CFLAGS += -Wall -Wno-format + +OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R + + +@@ -63,7 +64,7 @@ + +OS_CFLAGS+= -DX86_LINUX + + + +ifeq (gcc, $(CC)) +-+# if using gcc on x86, check version for opt bug +++# if using gcc on x86, check version for opt bug + +# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892) + +GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }') + +GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) ) --- riak/files/patch-rebar.config 1970-01-01 00:00:00.000000000 +0000 +++ riak/files/patch-rebar.config 2015-03-10 19:09:41.386917528 +0000 @@ -0,0 +1,10 @@ +--- rebar.config.orig 2015-03-10 18:52:12 UTC ++++ rebar.config +@@ -21,7 +21,6 @@ + {riak_search, ".*", {git, "git://github.com/basho/riak_search.git", {branch, "2.0"}}}, + {riak_control, ".*", {git, "git://github.com/basho/riak_control.git", {branch, "2.0"}}}, + {riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {tag, "2.0.0"}}}, +- {yokozuna, ".*", {git, "git://github.com/basho/yokozuna.git", {branch, "2.0"}}}, + {riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {branch, "2.0"}}}, + {rebar_lock_deps_plugin, ".*", {git, "git://github.com/seth/rebar_lock_deps_plugin.git", {branch, "master"}}} + ]}. --- riak/files/patch-rel-reltool.config 2015-03-10 19:16:43.687891638 +0000 +++ riak/files/patch-rel-reltool.config 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ ---- rel/reltool.config.orig 2013-09-17 20:53:23.000000000 +0200 -+++ rel/reltool.config 2013-09-17 20:55:40.000000000 +0200 -@@ -37,8 +37,12 @@ - {boot_rel, "riak"}, - {profile, embedded}, - {excl_sys_filters, ["^bin/.*", -- "^erts.*/bin/(dialyzer|typer)"]}, -+ "^erts.*/bin/(dialyzer|typer)", -+ "^erts.*/bin/(dialyzer|typer)", -+ "^erts.*/doc", -+ "^erts.*/man"]}, - {excl_archive_filters, [".*"]}, -+ {app, mnesia, [{incl_app_filters, ["ebin/*"]}]}, - {app, cluster_info, [{incl_cond, include}]}, - {app, erlang_js, [{incl_cond, include}]}, - {app, ebloom, []}, --- riak/files/patch-rel-vars.config 2015-03-10 19:16:43.688889604 +0000 +++ riak/files/patch-rel-vars.config 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ ---- rel/vars.config.orig 2013-08-29 20:13:02.000000000 +0200 -+++ rel/vars.config 2013-09-11 23:04:34.000000000 +0200 -@@ -2,11 +2,12 @@ - %% ex: ft=erlang ts=4 sw=4 et - - %% Platform-specific installation paths --{platform_bin_dir, "./bin"}. --{platform_data_dir, "./data"}. --{platform_etc_dir, "./etc"}. --{platform_lib_dir, "./lib"}. --{platform_log_dir, "./log"}. -+{platform_bin_dir, "%%PREFIX%%/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_log_dir, "/var/log/riak"}. - - %% - %% etc/app.config -@@ -47,12 +48,12 @@ - %% - %% bin/riak - %% --{runner_script_dir, "$(cd ${0%/*} && pwd)"}. --{runner_base_dir, "{{runner_script_dir}}/.."}. --{runner_etc_dir, "$RUNNER_BASE_DIR/etc"}. --{runner_log_dir, "$RUNNER_BASE_DIR/log"}. --{runner_lib_dir, "$RUNNER_BASE_DIR/lib"}. --{runner_patch_dir, "$RUNNER_BASE_DIR/lib/basho-patches"}. --{pipe_dir, "/tmp/$RUNNER_BASE_DIR/"}. --{runner_user, ""}. -+{runner_script_dir, "{{platform_bin_dir}}"}. -+{runner_base_dir, "{{platform_base_dir}}"}. -+{runner_etc_dir, "{{platform_etc_dir}}"}. -+{runner_log_dir, "{{platform_log_dir}}"}. -+{runner_lib_dir, "{{platform_lib_dir}}"}. -+{runner_patch_dir, "{{platform_lib_dir}}/basho-patches"}. -+{pipe_dir, "/tmp/riak"}. -+{runner_user, "riak"}. - {runner_wait_process, "riak_core_node_watcher"}. --- riak/files/patch-rel_reltool.config 1970-01-01 00:00:00.000000000 +0000 +++ riak/files/patch-rel_reltool.config 2015-03-10 19:12:59.836904504 +0000 @@ -0,0 +1,18 @@ +--- rel/reltool.config.orig 2015-03-10 19:09:11 UTC ++++ rel/reltool.config +@@ -25,7 +25,6 @@ + riak_kv, + riak_search, + riak_api, +- yokozuna, + cluster_info, + riak_control, + exometer_core, +@@ -57,7 +56,6 @@ + {app, riak_pipe, [{incl_cond, include}]}, + {app, riak_kv, [{incl_cond, include}]}, + {app, riak_search, [{incl_cond, include}]}, +- {app, yokozuna, [{incl_cond, include}]}, + {app, eper, [{incl_cond, include}]}, + {app, sasl, [{incl_cond, include}]}, + {app, syslog, [{incl_cond, include}]}, --- riak/files/patch-rel_vars.config 1970-01-01 00:00:00.000000000 +0000 +++ riak/files/patch-rel_vars.config 2015-03-10 19:09:41.386917528 +0000 @@ -0,0 +1,43 @@ +--- rel/vars.config.orig 2015-02-23 19:56:05 UTC ++++ rel/vars.config +@@ -2,11 +2,12 @@ + %% ex: ft=erlang ts=4 sw=4 et + + %% Platform-specific installation paths +-{platform_bin_dir, "./bin"}. +-{platform_data_dir, "./data"}. +-{platform_etc_dir, "./etc"}. +-{platform_lib_dir, "./lib"}. +-{platform_log_dir, "./log"}. ++{platform_base_dir, "/usr/local/lib/riak"}. ++{platform_bin_dir, "/usr/local/sbin"}. ++{platform_etc_dir, "/usr/local/etc/riak"}. ++{platform_lib_dir, "/usr/local/lib/riak/lib"}. ++{platform_data_dir, "/var/db/riak"}. ++{platform_log_dir, "/var/log/riak"}. + + %% + %% etc/app.config +@@ -40,14 +41,14 @@ + %% + %% bin/riak + %% +-{runner_script_dir, "\`cd \\`dirname $0\\` && /bin/pwd\`"}. +-{runner_base_dir, "{{runner_script_dir}}/.."}. +-{runner_etc_dir, "$RUNNER_BASE_DIR/etc"}. +-{runner_log_dir, "$RUNNER_BASE_DIR/log"}. +-{runner_lib_dir, "$RUNNER_BASE_DIR/lib"}. +-{runner_patch_dir, "$RUNNER_BASE_DIR/lib/basho-patches"}. +-{pipe_dir, "/tmp/$RUNNER_BASE_DIR/"}. +-{runner_user, ""}. ++{runner_script_dir, "{{platform_bin_dir}}"}. ++{runner_base_dir, "{{platform_base_dir}}"}. ++{runner_etc_dir, "{{platform_etc_dir}}"}. ++{runner_log_dir, "{{platform_log_dir}}"}. ++{runner_lib_dir, "{{platform_lib_dir}}"}. ++{runner_patch_dir, "{{platform_lib_dir}}/basho-patches"}. ++{pipe_dir, "/tmp/riak"}. ++{runner_user, "riak"}. + {runner_wait_process, "riak_core_node_watcher"}. + {runner_ulimit_warn, 65536}. + --- riak/files/riak.in 2015-03-10 19:16:43.688889604 +0000 +++ riak/files/riak.in 2015-03-10 19:09:41.386917528 +0000 @@ -1,84 +1,27 @@ -#!/bin/sh -# $FreeBSD: head/databases/riak/files/riak.in 357522 2014-06-11 18:44:31Z trociny $ +#!/bin/sh +# $FreeBSD$ +# # PROVIDE: riak -# REQUIRE: LOGIN cleanvar +# REQUIRE: LOGIN # KEYWORD: shutdown - # -# Add the following lines to /etc/rc.conf to enable riak: -# riak_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable riak on boot. +# Add these lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: # +# riak_enable (bool): Set to NO by default. +# Set it to YES to enable riak . /etc/rc.subr -name="riak" +name=riak rcvar=riak_enable -pidfile=/var/run/riak/riak.pid - -start_cmd="riak_start" -stop_cmd="riak_stop" -restart_cdm="riak_restart" -status_cmd="riak_status" -command="%%PREFIX%%/sbin/riak" - load_rc_config $name -# Read rc.d config and set defaults -load_rc_config "$name" -: ${riak_enable="NO"} - -riak_start() -{ - echo "Starting Riak." - %%PREFIX%%/sbin/riak start - return 0 -} - -riak_stop() -{ - echo "Stopping Riak processes" - %%PREFIX%%/sbin/riak stop - killall -9 epmd - return 0 -} - -riak_restart() -{ - riak_stop - riak_start - return 0 -} - -riak_status() -{ - if riak_running; then - echo "Riak is running." - return 0 - else - echo "Riak is not running" - return 1 - fi -} - -riak_running() -{ - local pid result ps - pid=`%%PREFIX%%/sbin/riak getpid` - result=`echo $?` - if [ "$result" == 0 ]; then - ps=`ps -waux | grep ${pid} | grep riak` - result=`echo $?` - if [ "$result" ]; then - return 0 - else - return 1 - fi - else - return 1 - fi -} +command=%%PREFIX%%/lib/riak/erts-5.10.4/bin/beam.smp +pidfile="/var/run/${name}/${name}.pid" +start_cmd="%%PREFIX%%/sbin/${name} start" +stop_cmd="%%PREFIX%%/sbin/${name} stop" run_rc_command "$1" --- riak/pkg-plist 2015-03-10 19:16:43.688889604 +0000 +++ riak/pkg-plist 2015-03-09 22:22:55.164053894 +0000 @@ -6,11 +6,10 @@ man/man1/riak-debug.1.gz man/man1/riak.1.gz man/man1/search-cmd.1.gz -@sample %%ETCDIR%%/vm.args.sample -@sample %%ETCDIR%%/app.config.sample -@sample %%ETCDIR%%/cert.pem.sample -@sample %%ETCDIR%%/key.pem.sample -@dir %%RIAK_CONFDIR%% +%%ETCDIR%%/riak.conf +%%ETCDIR%%/riak.conf.sample +%%ETCDIR%%/solr-log4j.properties +%%ETCDIR%%/solr-log4j.properties.sample @owner %%USERS%% @group %%GROUPS%% @dir %%RIAK_DBDIR%%