Attachment 153901 Details for Bug 198355 – diff

[patch] diff

riak-2.0.5.diff (text/plain), 19.91 KB, created by nbari on 2015-03-06 14:08:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nbari

Created: 2015-03-06 14:08:59 UTC

Size: 19.91 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 380601)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> 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}/
>@@ -11,11 +11,21 @@
> 
> 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
>+USE_GCC=	4.6+
> 
>+USERS=		riak
>+GROUPS=		riak
>+
>+RIAK_CONFDIR?=	${PREFIX}/etc/${PORTNAME}
>+RIAK_LOGDIR?=	/var/log/${PORTNAME}
>+RIAK_DBDIR?=	/var/db/${PORTNAME}
>+RIAK_HOMEDIR?=	${PREFIX}/lib/${PORTNAME}
>+RIAK_LIBDIR?=	${PREFIX}/lib/${PORTNAME}/lib
>+
> PLIST=		${WRKDIR}/pkg-plist
> PLIST_SUB+=	GROUPS=${GROUPS} \
> 		RIAK_CONFDIR=${RIAK_CONFDIR} \
>@@ -25,18 +35,9 @@
> 		RIAK_LOGDIR=${RIAK_LOGDIR} \
> 		USERS=${USERS}
> 
>-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}
>-
> ALL_TARGET=	rel
>+MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang16/bin:${PATH}
> MAKE_JOBS_UNSAFE=yes
>-MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang15/bin:${PATH}
> 
> .include <bsd.port.pre.mk>
> 
>@@ -55,6 +56,9 @@
> 	(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}
> 
>@@ -62,10 +66,10 @@
> .for d in ${RIAK_CONFDIR} ${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}${RIAK_CONFDIR}/riak.conf.sample
>+	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${RIAK_CONFDIR}/riak.conf
>+	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${RIAK_CONFDIR}/solr-log4j.properties.sample
>+	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${RIAK_CONFDIR}/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)
>@@ -76,4 +80,13 @@
> 	${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/
> 
>+post-install:
>+	@${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 <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 380601)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform
>===================================================================
>--- files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform	(revision 380601)
>+++ files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform	(working copy)
>@@ -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 <cstdatomic>.  Otherwise use port_posix.h.
>--    $CXX $CFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null  <<EOF
>-+    $CXX $CFLAGS -std=c++0x -x c++ - 2>/dev/null  <<EOF
>-       #include <cstdatomic>
>-       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  <<EOF
>-+    $CXX $CFLAGS -x c++ - 2>/dev/null  <<EOF
>-       #include <snappy.h>
>-       int main() {}
>- EOF
>-@@ -157,7 +157,7 @@
>-     fi
>- 
>-     # Test whether tcmalloc is available
>--    $CXX $CFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null  <<EOF
>-+    $CXX $CFLAGS -x c++ - -ltcmalloc 2>/dev/null  <<EOF
>-       int main() {}
>- EOF
>-     if [ "$?" = 0 ]; then
>Index: files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc
>===================================================================
>--- files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc	(revision 380601)
>+++ files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc	(working copy)
>@@ -1,36 +0,0 @@
>---- 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
>-@@ -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.
>- 
>-+#define __STDC_CONSTANT_MACROS
>- #include "db/version_set.h"
>- 
>- #include <algorithm>
>- #include <stdio.h>
>-+#include <stdint.h>
>- #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
>Index: files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch
>===================================================================
>--- files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch	(revision 380601)
>+++ files/patch-deps-erlang_js-c_src-patches-js-src-config-FreeBSD.mk.patch	(working copy)
>@@ -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
>- +
>Index: files/patch-deps-node_package-priv-base-env.sh
>===================================================================
>--- files/patch-deps-node_package-priv-base-env.sh	(revision 380601)
>+++ files/patch-deps-node_package-priv-base-env.sh	(working copy)
>@@ -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
>- }
>-
>Index: files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch
>===================================================================
>--- files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch	(revision 0)
>+++ files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch	(working copy)
>@@ -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) )
>
>Property changes on: files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-rel-reltool.config
>===================================================================
>--- files/patch-rel-reltool.config	(revision 380601)
>+++ files/patch-rel-reltool.config	(working copy)
>@@ -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, []},
>Index: files/patch-rel-vars.config
>===================================================================
>--- files/patch-rel-vars.config	(revision 380601)
>+++ files/patch-rel-vars.config	(working copy)
>@@ -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"}.
>Index: files/patch-rel_vars.config
>===================================================================
>--- files/patch-rel_vars.config	(revision 0)
>+++ files/patch-rel_vars.config	(working copy)
>@@ -0,0 +1,43 @@
>+--- rel/vars.config.orig	2015-02-27 13:37:42 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, "%%PREFIX%%/lib/riak"}.
>++{platform_bin_dir,  "%%PREFIX%%/sbin"}.
>++{platform_etc_dir,  "%%PREFIX%%/etc/riak"}.
>++{platform_lib_dir,  "%%PREFIX%%/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}.
>+ 
>
>Property changes on: files/patch-rel_vars.config
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/riak.in
>===================================================================
>--- files/riak.in	(revision 380601)
>+++ files/riak.in	(working copy)
>@@ -1,84 +1,27 @@
> #!/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"}
>+command=%%PREFIX%%/lib/riak/erts-5.10.4/bin/beam.smp
>+start_cmd="%%PREFIX%%/sbin/${name} start"
>+stop_cmd="%%PREFIX%%/sbin/${name} stop"
>+pidfile="/var/run/${name}/${name}.pid"
> 
>-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
>-}
>-
> run_rc_command "$1"
>
>Property changes on: files/riak.in
>___________________________________________________________________
>Added: svn:executable
>## -0,0 +1 ##
>+*
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 380601)
>+++ pkg-plist	(working copy)
>@@ -6,11 +6,11 @@
> 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%%
>+%%RIAK_CONFDIR%%/riak.conf
>+%%RIAK_CONFDIR%%/riak.conf.sample
>+%%RIAK_CONFDIR%%/solr-log4j.properties
>+%%RIAK_CONFDIR%%/solr-log4j.properties.sample
> @owner %%USERS%%
> @group %%GROUPS%%
> @dir %%RIAK_DBDIR%%

Actions: View | Diff

Attachments on bug 198355: 153901 | 153902 | 153907 | 153931 | 153981 | 154128 | 154161