Date: Thu, 13 Mar 2014 21:13:40 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348126 - in head/databases/redis: . files Message-ID: <201403132113.s2DLDeUg094262@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Thu Mar 13 21:13:39 2014 New Revision: 348126 URL: http://svnweb.freebsd.org/changeset/ports/348126 QAT: https://qat.redports.org/buildarchive/r348126/ Log: Make configuration file path configurable in rc.conf. [1] Convert to stage support. State which BSD license is meant. [2] PR: ports/181201 [1] Submitted by: Daniel Ylitalo <daniel@blodan.se> [1] Approved by: maintainer timeout (osa, 6 months) [1] Approved by: portmgr (blanket) [2] Modified: head/databases/redis/Makefile head/databases/redis/files/redis.in Modified: head/databases/redis/Makefile ============================================================================== --- head/databases/redis/Makefile Thu Mar 13 21:12:41 2014 (r348125) +++ head/databases/redis/Makefile Thu Mar 13 21:13:39 2014 (r348126) @@ -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 builti 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 Modified: head/databases/redis/files/redis.in ============================================================================== --- head/databases/redis/files/redis.in Thu Mar 13 21:12:41 2014 (r348125) +++ head/databases/redis/files/redis.in Thu Mar 13 21:13:39 2014 (r348126) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403132113.s2DLDeUg094262>