View | Details | Raw Unified | Return to bug 198355 | Differences between
and this patch

Collapse All | Expand All

(-)riak/Makefile (-21 / +43 lines)
Lines 1-47 Link Here
1
# $FreeBSD: head/databases/riak/Makefile 379548 2015-02-21 20:39:33Z robak $
1
# $FreeBSD: head/databases/riak/Makefile 371981 2014-11-01 00:09:15Z bapt $
2
2
3
PORTNAME=	riak
3
PORTNAME=	riak
4
PORTVERSION=	1.4.12
4
PORTVERSION=	2.0.5
5
CATEGORIES=	databases
5
CATEGORIES=	databases
6
MASTER_SITES=	http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
6
MASTER_SITES=	http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
7
		http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/
7
	http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \
8
	http://s3.amazonaws.com/files.basho.com/solr/:solr \
9
	http://s3.amazonaws.com/files.basho.com/yokozuna/:yokozuna
10
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
11
			solr-4.7.0-yz-1.tgz:solr \
12
			yokozuna-1.jar:yokozuna \
13
			yz_monitor-1.jar:yokozuna
14
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} solr-4.7.0-yz-1.tgz
8
15
9
MAINTAINER=	robak@FreeBSD.org
16
MAINTAINER=	robak@FreeBSD.org
10
COMMENT=	Riak is an open source, distributed, noSQL database
17
COMMENT=	Riak is an open source, distributed, noSQL database
11
18
12
LICENSE=	APACHE20
19
LICENSE=	APACHE20
13
20
14
BUILD_DEPENDS=	${LOCALBASE}/lib/erlang15/bin/erlc:${PORTSDIR}/lang/erlang-runtime15
21
BUILD_DEPENDS=	${LOCALBASE}/lib/erlang16/bin/erlc:${PORTSDIR}/lang/erlang-runtime16
15
22
16
USES=		gmake readline
23
USES=		gmake readline
17
USE_RC_SUBR=	riak
24
USE_RC_SUBR=	riak
18
25
USE_GCC=    yes
19
PLIST=		${WRKDIR}/pkg-plist
20
PLIST_SUB+=	GROUPS=${GROUPS} \
21
		RIAK_CONFDIR=${RIAK_CONFDIR} \
22
		RIAK_DBDIR=${RIAK_DBDIR} \
23
		RIAK_HOMEDIR=${RIAK_HOMEDIR} \
24
		RIAK_LIBDIR=${RIAK_LIBDIR} \
25
		RIAK_LOGDIR=${RIAK_LOGDIR} \
26
		USERS=${USERS}
27
26
28
USERS=		riak
27
USERS=		riak
29
GROUPS=		riak
28
GROUPS=		riak
30
29
31
RIAK_CONFDIR?=	${PREFIX}/etc/${PORTNAME}
32
RIAK_LOGDIR?=	/var/log/${PORTNAME}
30
RIAK_LOGDIR?=	/var/log/${PORTNAME}
33
RIAK_DBDIR?=	/var/db/${PORTNAME}
31
RIAK_DBDIR?=	/var/db/${PORTNAME}
34
RIAK_LIBDIR?=	${PREFIX}/lib/${PORTNAME}/lib
35
RIAK_HOMEDIR?=	${PREFIX}/lib/${PORTNAME}
32
RIAK_HOMEDIR?=	${PREFIX}/lib/${PORTNAME}
33
RIAK_LIBDIR?=	${PREFIX}/lib/${PORTNAME}/lib
34
35
PLIST=		${WRKDIR}/pkg-plist
36
PLIST_SUB+=	RIAK_DBDIR=${RIAK_DBDIR} \
37
		RIAK_HOMEDIR=${RIAK_HOMEDIR} \
38
		RIAK_LIBDIR=${RIAK_LIBDIR} \
39
		RIAK_LOGDIR=${RIAK_LOGDIR} \
40
		USERS=${USERS} \
41
		GROUPS=${GROUPS}
36
42
37
ALL_TARGET=	rel
43
ALL_TARGET=	rel
38
MAKE_JOBS_UNSAFE=yes
44
MAKE_JOBS_UNSAFE=yes
39
MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang15/bin:${PATH}
45
MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang16/bin:${PATH}
40
46
41
.include <bsd.port.pre.mk>
47
.include <bsd.port.pre.mk>
42
48
43
post-patch:
49
post-patch:
44
	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config
50
	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config
51
	@${REINPLACE_CMD} -e 's|%%BUILD_DIR%%|${WRKDIR}|g' \
52
		-e 's|%%DISTDIR%%|${DISTDIR}|g' \
53
		-e 's|%%YOKOZUNA%%|${WRKSRC}/deps/yokozuna|g' \
54
		${WRKSRC}/deps/yokozuna/tools/grab-solr.sh
45
55
46
pre-install:
56
pre-install:
47
	${RM} -f ${PLIST}
57
	${RM} -f ${PLIST}
Lines 55-71 Link Here
55
	(cd ${WRKSRC}/rel; ${FIND} ${PORTNAME}/lib -type f \
65
	(cd ${WRKSRC}/rel; ${FIND} ${PORTNAME}/lib -type f \
56
		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
66
		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
57
		| ${AWK} '{print "lib/"$$2 }' >> ${PLIST})
67
		| ${AWK} '{print "lib/"$$2 }' >> ${PLIST})
68
	(cd ${WRKSRC}/rel; ${FIND} ${PORTNAME}/lib -type d -empty \
69
		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
70
		| ${AWK} '{print "@dir lib/"$$2 }' >> ${PLIST})
58
	${ECHO} "@owner" >> ${PLIST}
71
	${ECHO} "@owner" >> ${PLIST}
59
	${ECHO} "@group" >> ${PLIST}
72
	${ECHO} "@group" >> ${PLIST}
60
73
61
do-install:
74
do-install:
62
.for d in ${RIAK_CONFDIR} ${RIAK_LOGDIR} ${RIAK_DBDIR} ${RIAK_LIBDIR} ${RIAK_HOMEDIR}
75
.for d in ${ETCDIR} ${RIAK_LOGDIR} ${RIAK_DBDIR} ${RIAK_LIBDIR} ${RIAK_HOMEDIR}
63
	${MKDIR} ${STAGEDIR}${d}
76
	${MKDIR} ${STAGEDIR}${d}
64
.endfor
77
.endfor
65
	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/vm.args ${STAGEDIR}${RIAK_CONFDIR}/vm.args.sample
78
	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${ETCDIR}/riak.conf.sample
66
	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/app.config ${STAGEDIR}${RIAK_CONFDIR}/app.config.sample
79
	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/riak.conf ${STAGEDIR}${ETCDIR}/riak.conf
67
	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/cert.pem ${STAGEDIR}${RIAK_CONFDIR}/cert.pem.sample
80
	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${ETCDIR}/solr-log4j.properties.sample
68
	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/key.pem ${STAGEDIR}${RIAK_CONFDIR}/key.pem.sample
81
	${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/solr-log4j.properties ${STAGEDIR}${ETCDIR}/solr-log4j.properties
69
	(cd ${WRKSRC}/rel/riak/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAK_LIBDIR})
82
	(cd ${WRKSRC}/rel/riak/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAK_LIBDIR})
70
	(cd ${WRKSRC}/rel/riak/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/)
83
	(cd ${WRKSRC}/rel/riak/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/)
71
	(cd ${WRKSRC}/rel/riak/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_LIBDIR}/basho-patches)
84
	(cd ${WRKSRC}/rel/riak/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_LIBDIR}/basho-patches)
Lines 76-79 Link Here
76
	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-debug.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
89
	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-debug.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
77
	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/search-cmd.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
90
	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/search-cmd.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
78
91
92
post-install:
93
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/bitcask-1.7.0/priv/bitcask.so
94
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/erlang_js-1.3.0-0-g07467d8/priv/erlang_js_drv.so
95
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/syslog-1.0.2/priv/syslog_drv.so
96
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/canola-2.0.0-0-g9bdfee8/priv/canola-port
97
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/riak_ensemble-2.0.0-1-gd66a102/priv/riak_ensemble.so
98
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/sext-1.1p3-0-g846b9cc/priv/sext.so
99
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/riak/lib/eleveldb-2.0.0-3-g10fcb78/priv/eleveldb.so
100
79
.include <bsd.port.post.mk>
101
.include <bsd.port.post.mk>
(-)riak/distinfo (-2 / +8 lines)
Lines 1-2 Link Here
1
SHA256 (riak-1.4.12.tar.gz) = 2ae63ba183ce457399a21542c75aa6149481c972ebac739a1599e93e81982c91
1
SHA256 (riak-2.0.5.tar.gz) = 390cd596762a7465712b472eb7058314a400068fa1ad567b93530eecdaed8047
2
SIZE (riak-1.4.12.tar.gz) = 13821609
2
SIZE (riak-2.0.5.tar.gz) = 17805547
3
SHA256 (solr-4.7.0-yz-1.tgz) = 172380c6c334797b4639f7c497a2a34a249efbfd3917106b3662f6b1e8a0352f
4
SIZE (solr-4.7.0-yz-1.tgz) = 166999678
5
SHA256 (yokozuna-1.jar) = 91a208e1fde1ef2a931f8d14ba150f730c92bc3a7a8e8bce30c6a6b027e18f82
6
SIZE (yokozuna-1.jar) = 10645
7
SHA256 (yz_monitor-1.jar) = 35c41c103c83452c6377fac42b6c8bb714d2e1e2b8c02053397c0fa2423b694d
8
SIZE (yz_monitor-1.jar) = 2661
(-)riak/files/patch-deps-eleveldb-c_src-leveldb-build_detect_platform (-29 lines)
Lines 1-29 Link Here
1
--- deps/eleveldb/c_src/leveldb/build_detect_platform.orig	2014-04-02 12:41:11.174611987 +0000
2
+++ deps/eleveldb/c_src/leveldb/build_detect_platform	2014-04-02 12:42:31.766605994 +0000
3
@@ -134,7 +134,7 @@
4
     true
5
 else
6
     # If -std=c++0x works, use <cstdatomic>.  Otherwise use port_posix.h.
7
-    $CXX $CFLAGS -std=c++0x -x c++ - -o /dev/null 2>/dev/null  <<EOF
8
+    $CXX $CFLAGS -std=c++0x -x c++ - 2>/dev/null  <<EOF
9
       #include <cstdatomic>
10
       int main() {}
11
 EOF
12
@@ -147,7 +147,7 @@
13
 
14
     # Test whether Snappy library is installed
15
     # http://code.google.com/p/snappy/
16
-    $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null  <<EOF
17
+    $CXX $CFLAGS -x c++ - 2>/dev/null  <<EOF
18
       #include <snappy.h>
19
       int main() {}
20
 EOF
21
@@ -157,7 +157,7 @@
22
     fi
23
 
24
     # Test whether tcmalloc is available
25
-    $CXX $CFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null  <<EOF
26
+    $CXX $CFLAGS -x c++ - -ltcmalloc 2>/dev/null  <<EOF
27
       int main() {}
28
 EOF
29
     if [ "$?" = 0 ]; then
(-)riak/files/patch-deps-eleveldb-c_src-leveldb-db-version_set.cc (-36 lines)
Lines 1-36 Link Here
1
--- deps/eleveldb/c_src/leveldb/db/version_set.cc.orig	2014-04-02 12:26:08.746672588 +0000
2
+++ deps/eleveldb/c_src/leveldb/db/version_set.cc	2014-04-02 12:37:06.719627543 +0000
3
@@ -2,10 +2,12 @@
4
 // Use of this source code is governed by a BSD-style license that can be
5
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
6
 
7
+#define __STDC_CONSTANT_MACROS
8
 #include "db/version_set.h"
9
 
10
 #include <algorithm>
11
 #include <stdio.h>
12
+#include <stdint.h>
13
 #include "db/filename.h"
14
 #include "db/log_reader.h"
15
 #include "db/log_writer.h"
16
@@ -53,13 +55,13 @@
17
 
18
 // WARNING: m_OverlappedFiles flags need to match config::kNumOverlapFiles ... until unified
19
 {
20
-    {10485760,  262144000,  57671680,      209715200,                0,     300000000, true},
21
-    {10485760,   82914560,  57671680,      419430400,                0,     209715200, true},
22
-    {10485760,  314572800,  57671680,     1006632960,        200000000,     314572800, false},
23
-    {10485760,  419430400,  57671680,     4094304000ULL,    3355443200ULL,  419430400, false},
24
-    {10485760,  524288000,  57671680,    41943040000ULL,   33554432000ULL,  524288000, false},
25
-    {10485760,  629145600,  57671680,   419430400000ULL,  335544320000ULL,  629145600, false},
26
-    {10485760,  734003200,  57671680,  4194304000000ULL, 3355443200000ULL,  734003200, false}
27
+    {UINT64_C(10485760), UINT64_C(262144000), INT64_C(57671680), UINT64_C(    209715200), UINT64_C(            0), UINT64_C(300000000), true},
28
+    {UINT64_C(10485760), UINT64_C( 82914560), INT64_C(57671680), UINT64_C(    419430400), UINT64_C(            0), UINT64_C(209715200), true},
29
+    {UINT64_C(10485760), UINT64_C(314572800), INT64_C(57671680), UINT64_C(   1006632960), UINT64_C(    200000000), UINT64_C(314572800), false},
30
+    {UINT64_C(10485760), UINT64_C(419430400), INT64_C(57671680), UINT64_C(   4094304000), UINT64_C(   3355443200), UINT64_C(419430400), false},
31
+    {UINT64_C(10485760), UINT64_C(524288000), INT64_C(57671680), UINT64_C(  41943040000), UINT64_C(  33554432000), UINT64_C(524288000), false},
32
+    {UINT64_C(10485760), UINT64_C(629145600), INT64_C(57671680), UINT64_C( 419430400000), UINT64_C( 335544320000), UINT64_C(629145600), false},
33
+    {UINT64_C(10485760), UINT64_C(734003200), INT64_C(57671680), UINT64_C(4194304000000), UINT64_C(3355443200000), UINT64_C(734003200), false}
34
 };
35
 
36
 /// 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 (-18 lines)
Lines 1-18 Link Here
1
--- deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch.orig    2013-01-29 21:13:01.000000000 +0100
2
+++ deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch 2013-09-12 14:59:29.000000000 +0200
3
@@ -1,6 +1,6 @@
4
 --- c_src.orig/js/src/config/FreeBSD.mk        1969-12-31 19:00:00.000000000 -0500
5
 +++ c_src/js/src/config/FreeBSD.mk     2011-03-30 20:12:51.000000000 -0400
6
-@@ -0,0 +1,99 @@
7
+@@ -0,0 +1,100 @@
8
 +# -*- Mode: makefile -*-
9
 +#
10
 +# ***** BEGIN LICENSE BLOCK *****
11
@@ -46,6 +46,7 @@
12
 +
13
 +CC ?= gcc
14
 +CCC ?= g++
15
++LD = $(CC)
16
 +CFLAGS +=  -Wall -Wno-format
17
 +OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
18
 +
(-)riak/files/patch-deps-node_package-priv-base-env.sh (-27 lines)
Lines 1-27 Link Here
1
--- deps/node_package/priv/base/env.sh.orig	2013-09-13 10:22:32.000000000 +0200
2
+++ deps/node_package/priv/base/env.sh	2013-09-13 10:27:16.000000000 +0200
3
@@ -100,7 +100,7 @@
4
 # read/write/delete .pid files during startup/shutdown
5
 create_pid_dir() {
6
     # Validate RUNNER_USER is set and they have permissions to write to /var/run
7
-    # Don't continue if we've already sudo'd to RUNNER_USER
8
+    # Don't continue if we've already su'd to RUNNER_USER
9
     if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
10
         if [ -w $RUN_DIR ]; then
11
             mkdir -p $PID_DIR
12
@@ -161,12 +161,12 @@
13
     # Validate that the user running the script is the owner of the
14
     # RUN_DIR.
15
     if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
16
-        type sudo > /dev/null 2>&1
17
+        type su > /dev/null 2>&1
18
         if [ "$?" -ne 0 ]; then
19
-            echoerr "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
20
+            echoerr "su doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
21
             exit 1
22
         fi
23
-        exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
24
+	exec su - $RUNNER_USER -c "$RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@"
25
     fi
26
 }
27
(-)riak/files/patch-deps_erlang__js_c__src_patches_js-src-config-FreeBSD.mk.patch (+27 lines)
Line 0 Link Here
1
--- deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch.orig    2015-02-26 16:11:58 UTC
2
+++ deps/erlang_js/c_src/patches/js-src-config-FreeBSD.mk.patch
3
@@ -1,6 +1,6 @@
4
 --- c_src.orig/js/src/config/FreeBSD.mk        1969-12-31 19:00:00.000000000 -0500
5
 +++ c_src/js/src/config/FreeBSD.mk     2011-03-30 20:12:51.000000000 -0400
6
-@@ -0,0 +1,99 @@
7
+@@ -0,0 +1,100 @@
8
 +# -*- Mode: makefile -*-
9
 +#
10
 +# ***** BEGIN LICENSE BLOCK *****
11
@@ -46,6 +46,7 @@
12
 +
13
 +CC ?= gcc
14
 +CCC ?= g++
15
++LD = $(CC)
16
 +CFLAGS +=  -Wall -Wno-format
17
 +OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R
18
 +
19
@@ -63,7 +64,7 @@
20
 +OS_CFLAGS+= -DX86_LINUX
21
 +
22
 +ifeq (gcc, $(CC))
23
-+# if using gcc on x86, check version for opt bug 
24
++# if using gcc on x86, check version for opt bug
25
 +# (http://bugzilla.mozilla.org/show_bug.cgi?id=24892)
26
 +GCC_VERSION := $(shell gcc -v 2>&1 | grep version | awk '{ print $$3 }')
27
 +GCC_LIST:=$(sort 2.91.66 $(GCC_VERSION) )
(-)riak/files/patch-deps_yokozuna_tools_grab-solr.sh (+111 lines)
Line 0 Link Here
1
--- deps/yokozuna/tools/grab-solr.sh.orig	2015-01-27 15:59:10 UTC
2
+++ deps/yokozuna/tools/grab-solr.sh
3
@@ -1,4 +1,4 @@
4
-#!/usr/bin/env bash
5
+#!/usr/bin/env sh
6
 #
7
 # Script to grab Solr and embed in priv dir. This script assumes it is
8
 # being called from root dir or tools dir.
9
@@ -14,10 +14,10 @@ then
10
     cd tools
11
 fi
12
 
13
-PRIV_DIR=../priv
14
+PRIV_DIR=%%YOKOZUNA%%/priv
15
 CONF_DIR=$PRIV_DIR/conf
16
 SOLR_DIR=$PRIV_DIR/solr
17
-BUILD_DIR=../build
18
+BUILD_DIR=%%BUILD_DIR%%
19
 VSN=solr-4.7.0-yz-1
20
 FILENAME=$VSN.tgz
21
 TMP_DIR=/var/tmp/yokozuna
22
@@ -32,56 +32,11 @@ check_for_solr()
23
     test -e $SOLR_DIR/start.jar
24
 }
25
 
26
-download()
27
-{
28
-    if which wget > /dev/null; then
29
-        wget --no-check-certificate --progress=dot:mega $1
30
-    elif which curl > /dev/null; then
31
-        curl --insecure --progress-bar -O $1
32
-    fi
33
-}
34
-
35
-get_solr()
36
-{
37
-        if [[ -z ${SOLR_PKG_DIR+x} ]]
38
-        then
39
-            if [ -e $TMP_FILE ]; then
40
-                echo "Using cached copy of Solr $TMP_FILE"
41
-                ln -s $TMP_FILE $FILENAME
42
-            else
43
-                echo "Pulling Solr from S3"
44
-                download "http://s3.amazonaws.com/files.basho.com/solr/$FILENAME"
45
-                if [ -d $TMP_DIR ]; then
46
-                    cp $FILENAME $TMP_DIR
47
-                else
48
-                    mkdir $TMP_DIR
49
-                    cp $FILENAME $TMP_DIR
50
-                fi
51
-            fi
52
-        else
53
-            # This is now obsolete thanks to implicit caching above
54
-            # but will leave in for now as to not break anyone.
55
-            echo "Using local copy of Solr $SOLR_PKG_DIR/$FILENAME"
56
-            cp $SOLR_PKG_DIR/$FILENAME ./
57
-        fi
58
-        tar zxf $FILENAME
59
-}
60
-
61
 if ! check_for_solr
62
 then
63
 
64
-    echo "Create dir $BUILD_DIR"
65
-    if [ ! -e $BUILD_DIR ]; then
66
-        mkdir $BUILD_DIR
67
-    fi
68
-
69
     cd $BUILD_DIR
70
 
71
-    if [ ! -e $SRC_DIR ]
72
-    then
73
-        get_solr
74
-    fi
75
-
76
     echo "Creating Solr dir $SOLR_DIR"
77
 
78
     # Explicitly copy files needed rather than copying everything and
79
@@ -106,7 +61,7 @@ then
80
     echo "Solr dir created successfully"
81
 fi
82
 
83
-JAVA_LIB=../priv/java_lib
84
+JAVA_LIB=%%YOKOZUNA%%/priv/java_lib
85
 YZ_JAR_VSN=1
86
 YZ_JAR_NAME=yokozuna-$YZ_JAR_VSN.jar
87
 
88
@@ -117,18 +72,16 @@ then
89
         mkdir $JAVA_LIB
90
     fi
91
 
92
-    echo "Downloading $YZ_JAR_NAME"
93
-    download "http://s3.amazonaws.com/files.basho.com/yokozuna/$YZ_JAR_NAME"
94
-    mv $YZ_JAR_NAME $JAVA_LIB/$YZ_JAR_NAME
95
+    echo "Copying $YZ_JAR_NAME"
96
+    cp %%DISTDIR%%/$YZ_JAR_NAME $JAVA_LIB/$YZ_JAR_NAME
97
 fi
98
 
99
-EXT_LIB=../priv/solr/lib/ext
100
+EXT_LIB=%%YOKOZUNA%%/priv/solr/lib/ext
101
 MON_JAR_VSN=1
102
 MON_JAR_NAME=yz_monitor-$MON_JAR_VSN.jar
103
 
104
 if [ ! -e $EXT_LIB/$MON_JAR_NAME ]
105
 then
106
-    echo "Downloading $MON_JAR_NAME"
107
-    download "http://s3.amazonaws.com/files.basho.com/yokozuna/$MON_JAR_NAME"
108
-    mv $MON_JAR_NAME $EXT_LIB/$MON_JAR_NAME
109
+    echo "Copying $MON_JAR_NAME"
110
+    cp %%DISTDIR%%/$MON_JAR_NAME $EXT_LIB/$MON_JAR_NAME
111
 fi
(-)riak/files/patch-rel-reltool.config (-16 lines)
Lines 1-16 Link Here
1
--- rel/reltool.config.orig	2013-09-17 20:53:23.000000000 +0200
2
+++ rel/reltool.config	2013-09-17 20:55:40.000000000 +0200
3
@@ -37,8 +37,12 @@
4
        {boot_rel, "riak"},
5
        {profile, embedded},
6
        {excl_sys_filters, ["^bin/.*",
7
-                           "^erts.*/bin/(dialyzer|typer)"]},
8
+                           "^erts.*/bin/(dialyzer|typer)",
9
+                           "^erts.*/bin/(dialyzer|typer)",
10
+                           "^erts.*/doc",
11
+                           "^erts.*/man"]},
12
        {excl_archive_filters, [".*"]},
13
+       {app, mnesia, [{incl_app_filters, ["ebin/*"]}]},
14
        {app, cluster_info, [{incl_cond, include}]},
15
        {app, erlang_js, [{incl_cond, include}]},
16
        {app, ebloom, []},
(-)riak/files/patch-rel-vars.config (-41 lines)
Lines 1-41 Link Here
1
--- rel/vars.config.orig	2013-08-29 20:13:02.000000000 +0200
2
+++ rel/vars.config	2013-09-11 23:04:34.000000000 +0200
3
@@ -2,11 +2,12 @@
4
 %% ex: ft=erlang ts=4 sw=4 et
5
 
6
 %% Platform-specific installation paths
7
-{platform_bin_dir,  "./bin"}.
8
-{platform_data_dir, "./data"}.
9
-{platform_etc_dir,  "./etc"}.
10
-{platform_lib_dir,  "./lib"}.
11
-{platform_log_dir,  "./log"}.
12
+{platform_bin_dir,  "%%PREFIX%%/sbin"}.
13
+{platform_data_dir, "/var/db/riak"}.
14
+{platform_etc_dir,  "%%PREFIX%%/etc/riak"}.
15
+{platform_base_dir,  "%%PREFIX%%/lib/riak"}.
16
+{platform_lib_dir,  "%%PREFIX%%/lib/riak/lib"}.
17
+{platform_log_dir,  "/var/log/riak"}.
18
 
19
 %%
20
 %% etc/app.config
21
@@ -47,12 +48,12 @@
22
 %%
23
 %% bin/riak
24
 %%
25
-{runner_script_dir,  "$(cd ${0%/*} && pwd)"}.
26
-{runner_base_dir,    "{{runner_script_dir}}/.."}.
27
-{runner_etc_dir,     "$RUNNER_BASE_DIR/etc"}.
28
-{runner_log_dir,     "$RUNNER_BASE_DIR/log"}.
29
-{runner_lib_dir,     "$RUNNER_BASE_DIR/lib"}.
30
-{runner_patch_dir,   "$RUNNER_BASE_DIR/lib/basho-patches"}.
31
-{pipe_dir,           "/tmp/$RUNNER_BASE_DIR/"}.
32
-{runner_user,        ""}.
33
+{runner_script_dir,  "{{platform_bin_dir}}"}.
34
+{runner_base_dir,    "{{platform_base_dir}}"}.
35
+{runner_etc_dir,     "{{platform_etc_dir}}"}.
36
+{runner_log_dir,     "{{platform_log_dir}}"}.
37
+{runner_lib_dir,     "{{platform_lib_dir}}"}.
38
+{runner_patch_dir,   "{{platform_lib_dir}}/basho-patches"}.
39
+{pipe_dir,           "/tmp/riak"}.
40
+{runner_user,        "riak"}.
41
 {runner_wait_process, "riak_core_node_watcher"}.
(-)riak/files/patch-rel_vars.config (+42 lines)
Line 0 Link Here
1
--- rel/vars.config.orig        2015-02-27 13:37:42 UTC
2
+++ rel/vars.config
3
@@ -2,11 +2,12 @@
4
 %% ex: ft=erlang ts=4 sw=4 et
5
 
6
 %% Platform-specific installation paths
7
-{platform_bin_dir,  "./bin"}.
8
-{platform_data_dir, "./data"}.
9
-{platform_etc_dir,  "./etc"}.
10
-{platform_lib_dir,  "./lib"}.
11
-{platform_log_dir,  "./log"}.
12
+{platform_base_dir, "%%PREFIX%%/lib/riak"}.
13
+{platform_bin_dir,  "%%PREFIX%%/sbin"}.
14
+{platform_etc_dir,  "%%PREFIX%%/etc/riak"}.
15
+{platform_lib_dir,  "%%PREFIX%%/lib/riak/lib"}.
16
+{platform_data_dir, "/var/db/riak"}.
17
+{platform_log_dir,  "/var/log/riak"}.
18
 
19
 %%
20
 %% etc/app.config
21
@@ -40,14 +41,14 @@
22
 %%
23
 %% bin/riak
24
 %%
25
-{runner_script_dir,  "\`cd \\`dirname $0\\` && /bin/pwd\`"}.
26
-{runner_base_dir,    "{{runner_script_dir}}/.."}.
27
-{runner_etc_dir,     "$RUNNER_BASE_DIR/etc"}.
28
-{runner_log_dir,     "$RUNNER_BASE_DIR/log"}.
29
-{runner_lib_dir,     "$RUNNER_BASE_DIR/lib"}.
30
-{runner_patch_dir,   "$RUNNER_BASE_DIR/lib/basho-patches"}.
31
-{pipe_dir,           "/tmp/$RUNNER_BASE_DIR/"}.
32
-{runner_user,        ""}.
33
+{runner_script_dir,  "{{platform_bin_dir}}"}.
34
+{runner_base_dir,    "{{platform_base_dir}}"}.
35
+{runner_etc_dir,     "{{platform_etc_dir}}"}.
36
+{runner_log_dir,     "{{platform_log_dir}}"}.
37
+{runner_lib_dir,     "{{platform_lib_dir}}"}.
38
+{runner_patch_dir,   "{{platform_lib_dir}}/basho-patches"}.
39
+{pipe_dir,           "/tmp/riak"}.
40
+{runner_user,        "riak"}.
41
 {runner_wait_process, "riak_core_node_watcher"}.
42
 {runner_ulimit_warn, 65536}.
(-)riak/files/riak.in (-70 / +13 lines)
Lines 1-84 Link Here
1
#!/bin/sh
1
#!/bin/sh                                                                                                               
2
# $FreeBSD: head/databases/riak/files/riak.in 357522 2014-06-11 18:44:31Z trociny $
3
2
3
# $FreeBSD$
4
#
4
# PROVIDE: riak
5
# PROVIDE: riak
5
# REQUIRE: LOGIN cleanvar
6
# REQUIRE: LOGIN
6
# KEYWORD: shutdown
7
# KEYWORD: shutdown
7
8
#
8
#
9
# Add the following lines to /etc/rc.conf to enable riak:
9
# Add these lines to /etc/rc.conf.local or /etc/rc.conf
10
# riak_enable (bool):		Set to "NO" by default.
10
# to enable this service:
11
#				Set it to "YES" to enable riak on boot.
12
#
11
#
12
# riak_enable (bool):   Set to NO by default.
13
#                       Set it to YES to enable riak
13
14
14
. /etc/rc.subr
15
. /etc/rc.subr
15
16
16
name="riak"
17
name=riak
17
rcvar=riak_enable
18
rcvar=riak_enable
18
19
19
pidfile=/var/run/riak/riak.pid
20
21
start_cmd="riak_start"
22
stop_cmd="riak_stop"
23
restart_cdm="riak_restart"
24
status_cmd="riak_status"
25
command="%%PREFIX%%/sbin/riak"
26
27
load_rc_config $name
20
load_rc_config $name
28
21
29
# Read rc.d config and set defaults
22
command=%%PREFIX%%/lib/riak/erts-5.10.4/bin/beam.smp
30
load_rc_config "$name"
23
pidfile="/var/run/${name}/${name}.pid"
31
: ${riak_enable="NO"}
24
start_cmd="%%PREFIX%%/sbin/${name} start"
32
25
stop_cmd="%%PREFIX%%/sbin/${name} stop"
33
riak_start()
34
{
35
	echo "Starting Riak."
36
	%%PREFIX%%/sbin/riak start
37
	return 0
38
}
39
40
riak_stop()
41
{
42
	echo "Stopping Riak processes"
43
	%%PREFIX%%/sbin/riak stop
44
	killall -9 epmd
45
	return 0
46
}
47
48
riak_restart()
49
{
50
	riak_stop
51
	riak_start
52
	return 0
53
}
54
55
riak_status()
56
{
57
	if riak_running; then
58
		echo "Riak is running."
59
		return 0
60
	else
61
		echo "Riak is not running"
62
		return 1
63
	fi
64
}
65
66
riak_running()
67
{
68
	local pid result ps
69
	pid=`%%PREFIX%%/sbin/riak getpid`
70
	result=`echo $?`
71
	if [ "$result" == 0 ]; then
72
		ps=`ps -waux | grep ${pid} | grep riak`
73
		result=`echo $?`
74
		if [ "$result" ]; then
75
			return 0
76
		else
77
			return 1
78
		fi
79
	else
80
		return 1
81
	fi
82
}
83
26
84
run_rc_command "$1"
27
run_rc_command "$1"
(-)riak/pkg-plist (-5 / +4 lines)
Lines 6-16 Link Here
6
man/man1/riak-debug.1.gz
6
man/man1/riak-debug.1.gz
7
man/man1/riak.1.gz
7
man/man1/riak.1.gz
8
man/man1/search-cmd.1.gz
8
man/man1/search-cmd.1.gz
9
@sample %%ETCDIR%%/vm.args.sample
9
%%ETCDIR%%/riak.conf
10
@sample %%ETCDIR%%/app.config.sample
10
%%ETCDIR%%/riak.conf.sample
11
@sample %%ETCDIR%%/cert.pem.sample
11
%%ETCDIR%%/solr-log4j.properties
12
@sample %%ETCDIR%%/key.pem.sample
12
%%ETCDIR%%/solr-log4j.properties.sample
13
@dir %%RIAK_CONFDIR%%
14
@owner %%USERS%%
13
@owner %%USERS%%
15
@group %%GROUPS%%
14
@group %%GROUPS%%
16
@dir %%RIAK_DBDIR%%
15
@dir %%RIAK_DBDIR%%

Return to bug 198355