cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't hardcode gmake, use ${MAKE_PROGRAM}.

Browse Source 
Tighten LIB_DEPENDS.
Don't hardcode /usr/local and /etc.

ok jmatthew@ (maintainer)
This commit is contained in:
ajacoutot 2012-08-25 06:33:14 +00:00
parent 8ad9cfa9f8
commit d682cf0b3e
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
databases/riak/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/08/24 07:26:29 jmatthew Exp $
# $OpenBSD: Makefile,v 1.2 2012/08/25 06:33:14 ajacoutot Exp $
COMMENT= distributed data store
DISTNAME= riak-1.2.0
CATEGORIES= databases
HOMEPAGE= http://basho.com/
REVISION= 0
MAINTAINER= Jonathan Matthew <jmatthew@openbsd.org>
@ -79,15 +80,18 @@ SUBST_VARS+=${_n}
.endfor
USE_GMAKE = Yes
MAKE_ENV = MAKE=gmake
MAKE_ENV = MAKE=${MAKE_PROGRAM}
MAKE_FLAGS = rel
WANTLIB = c crypto m ncurses pthread ssl stdc++ util mozjs nspr4 leveldb
LIB_DEPENDS = devel/nspr \
databases/leveldb>=1.5.0 \
LIB_DEPENDS = databases/leveldb>=1.5.0 \
lang/erlang>=15b.01 \
lang/spidermonkey
pre-configure:
${SUBST_CMD} ${WRKSRC}/deps/eleveldb/rebar.config \
${WRKSRC}/deps/erlang_js/rebar.config \
${WRKSRC}/rel/vars.config
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/riak ${PREFIX}/share/riak
cp -r ${WRKSRC}/rel/riak/lib ${PREFIX}/lib/riak

6
databases/riak/patches/patch-deps_eleveldb_rebar_config
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-deps_eleveldb_rebar_config,v 1.1.1.1 2012/08/24 07:26:29 jmatthew Exp $
$OpenBSD: patch-deps_eleveldb_rebar_config,v 1.2 2012/08/25 06:33:14 ajacoutot Exp $
Use external leveldb rather than trying to patch the bundled
tarball to get it to build.
@ -11,8 +11,8 @@ tarball to get it to build.
{"CXXFLAGS", "$CXXFLAGS -fPIC"},
- {"DRV_CFLAGS", "$DRV_CFLAGS -Werror -I c_src/leveldb/include"},
- {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/leveldb/libleveldb.a c_src/system/lib/libsnappy.a -lstdc++"}
+ {"DRV_CFLAGS", "$DRV_CFLAGS -Werror -I /usr/local/include"},
+ {"DRV_LDFLAGS", "$DRV_LDFLAGS -L /usr/local/lib -lleveldb -lstdc++"}
+ {"DRV_CFLAGS", "$DRV_CFLAGS -Werror -I ${LOCALBASE}/include"},
+ {"DRV_LDFLAGS", "$DRV_LDFLAGS -L ${LOCALBASE}/lib -lleveldb -lstdc++"}
]}.
-{pre_hooks, [{'get-deps', "c_src/build_deps.sh get-deps"},

6
databases/riak/patches/patch-erlang-js-rebar_config
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-erlang-js-rebar_config,v 1.1.1.1 2012/08/24 07:26:29 jmatthew Exp $
$OpenBSD: patch-erlang-js-rebar_config,v 1.2 2012/08/25 06:33:14 ajacoutot Exp $
Use external nspr and spidermonkey. These need lots of patches.
@ -10,8 +10,8 @@ Use external nspr and spidermonkey. These need lots of patches.
{port_envs, [
- {"DRV_CFLAGS", "$DRV_CFLAGS -I c_src/system/include/js -DXP_UNIX -Wall"},
- {"DRV_LDFLAGS", "$DRV_LDFLAGS c_src/system/lib/libjs.a c_src/system/lib/libnspr4.a"},
+ {"DRV_CFLAGS", "$DRV_CFLAGS -I /usr/local/include/js -DXP_UNIX -Wall"},
+ {"DRV_LDFLAGS", "$DRV_LDFLAGS -L /usr/local/lib/ -lmozjs -lnspr4"},
+ {"DRV_CFLAGS", "$DRV_CFLAGS -I ${LOCALBASE}/include/js -DXP_UNIX -Wall"},
+ {"DRV_LDFLAGS", "$DRV_LDFLAGS -L ${LOCALBASE}/lib/ -lmozjs -lnspr4"},
%% Define flags for enabling/disable 64 bit build of NSPR
{"-32$", "NSPR_SIXTYFOUR", "--disable-64bit"},

10
databases/riak/patches/patch-vars_config
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-vars_config,v 1.1.1.1 2012/08/24 07:26:29 jmatthew Exp $
$OpenBSD: patch-vars_config,v 1.2 2012/08/25 06:33:14 ajacoutot Exp $
use system locations for riak files.
@ -13,10 +13,10 @@ use system locations for riak files.
-{platform_etc_dir, "./etc"}.
-{platform_lib_dir, "./lib"}.
-{platform_log_dir, "./log"}.
+{platform_bin_dir, "/usr/local/bin"}.
+{platform_bin_dir, "${PREFIX}/bin"}.
+{platform_data_dir, "/var/riak"}.
+{platform_etc_dir, "/etc/riak"}.
+{platform_lib_dir, "/usr/local/lib/riak"}.
+{platform_etc_dir, "${SYSCONFDIR}/riak"}.
+{platform_lib_dir, "${PREFIX}/lib/riak"}.
+{platform_log_dir, "/var/log/riak"}.
%%
@ -31,7 +31,7 @@ use system locations for riak files.
-{runner_log_dir, "$RUNNER_BASE_DIR/log"}.
-{pipe_dir, "/tmp/$RUNNER_BASE_DIR/"}.
-{runner_user, ""}.
+{runner_script_dir, "/usr/local/sbin"}.
+{runner_script_dir, "${PREFIX}/sbin"}.
+{runner_base_dir, "{{platform_lib_dir}}"}.
+{runner_etc_dir, "{{platform_etc_dir}}"}.
+{runner_log_dir, "{{platform_log_dir}}"}.

3
databases/riak/pkg/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.1.1.1 2012/08/24 07:26:30 jmatthew Exp $
$OpenBSD: README,v 1.2 2012/08/25 06:33:14 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -31,4 +31,3 @@ Rebuild the login.conf.db file if necessary:
And assign the _riak user to the riak login class:
# usermod -L riak _riak