diff options
| -rw-r--r-- | databases/redis/Makefile | 16 | ||||
| -rw-r--r-- | databases/redis/files/redis.in | 7 |
2 files changed, 9 insertions, 14 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 0a6708f883b9..558bd767c508 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -3,13 +3,14 @@ PORTNAME= redis DISTVERSION= 2.8.7 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ MAINTAINER= osa@FreeBSD.org COMMENT= A persistent key-value database with built-in net interface -LICENSE= BSD +LICENSE= BSD3CLAUSE LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo @@ -20,8 +21,6 @@ LUA_DESC= Use lang/lua instead of builtin lua LUAJIT_DESC= Use lang/luajit instead of builtin lua TESTS_DESC= Install lang/tcl for redis unit tests -NO_STAGE= yes - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLUA} @@ -85,14 +84,9 @@ post-build: ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf do-install: - ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKDIR}/redis.conf ${PREFIX}/etc/redis.conf.sample - ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${PREFIX}/etc/sentinel.conf.sample - -post-install: -.for d in ${REDIS_LOGDIR} ${REDIS_RUNDIR} ${REDIS_DBDIR} - [ -d ${d} ] || ${MKDIR} ${d} && ${CHOWN} ${USERS}:${GROUPS} ${d} -.endfor + ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample + ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample regression-test: build @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl diff --git a/databases/redis/files/redis.in b/databases/redis/files/redis.in index 70bf3a691bc3..a7a8b540821a 100644 --- a/databases/redis/files/redis.in +++ b/databases/redis/files/redis.in @@ -21,14 +21,15 @@ rcvar=redis_enable extra_commands="reload" command="%%PREFIX%%/bin/redis-server" -config_file="%%PREFIX%%/etc/$name.conf" -command_args="${config_file}" pidfile="%%REDIS_RUNDIR%%/$name.pid" -required_files="${config_file}" # read configuration and set defaults load_rc_config "$name" : ${redis_enable="NO"} : ${redis_user="%%REDIS_USER%%"} +: ${redis_config="%%PREFIX%%/etc/$name.conf"} + +command_args="${redis_config}" +required_files="${redis_config}" run_rc_command "$1" |