From owner-svn-ports-all@FreeBSD.ORG Wed Jun 11 18:44:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDDED23B; Wed, 11 Jun 2014 18:44:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CEE4E274A; Wed, 11 Jun 2014 18:44:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5BIiWnO031890; Wed, 11 Jun 2014 18:44:32 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5BIiWo3031886; Wed, 11 Jun 2014 18:44:32 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201406111844.s5BIiWo3031886@svn.freebsd.org> From: Mikolaj Golub Date: Wed, 11 Jun 2014 18:44:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357522 - in head/databases/riak: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2014 18:44:33 -0000 Author: trociny Date: Wed Jun 11 18:44:31 2014 New Revision: 357522 URL: http://svnweb.freebsd.org/changeset/ports/357522 QAT: https://qat.redports.org/buildarchive/r357522/ Log: - honor PREFIX; - properly set RIAK_LIBDIR in plist (while here, sort PLIST_SUB). Modified: head/databases/riak/Makefile head/databases/riak/files/patch-rel-vars.config head/databases/riak/files/riak.in Modified: head/databases/riak/Makefile ============================================================================== --- head/databases/riak/Makefile Wed Jun 11 18:37:28 2014 (r357521) +++ head/databases/riak/Makefile Wed Jun 11 18:44:31 2014 (r357522) @@ -17,10 +17,11 @@ USES= gmake USE_RC_SUBR= riak PLIST= ${WRKDIR}/pkg-plist -PLIST_SUB+= RIAK_LOGDIR=${RIAK_LOGDIR} \ +PLIST_SUB+= RIAK_CONFDIR=${RIAK_CONFDIR} \ RIAK_DBDIR=${RIAK_DBDIR} \ - RIAK_CONFDIR=${RIAK_CONFDIR} \ - RIAK_HOMEDIR=${RIAK_HOMEDIR} + RIAK_HOMEDIR=${RIAK_HOMEDIR} \ + RIAK_LIBDIR=${RIAK_LIBDIR} \ + RIAK_LOGDIR=${RIAK_LOGDIR} USERS= riak GROUPS= riak @@ -40,6 +41,9 @@ MAKE_ENV= PATH=${LOCALBASE}/lib/erlang15 .include +post-patch: + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config + pre-install: ${RM} -f ${PLIST} ${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} Modified: head/databases/riak/files/patch-rel-vars.config ============================================================================== --- head/databases/riak/files/patch-rel-vars.config Wed Jun 11 18:37:28 2014 (r357521) +++ head/databases/riak/files/patch-rel-vars.config Wed Jun 11 18:44:31 2014 (r357522) @@ -9,11 +9,11 @@ -{platform_etc_dir, "./etc"}. -{platform_lib_dir, "./lib"}. -{platform_log_dir, "./log"}. -+{platform_bin_dir, "/usr/local/sbin"}. ++{platform_bin_dir, "%%PREFIX%%/sbin"}. +{platform_data_dir, "/var/db/riak"}. -+{platform_etc_dir, "/usr/local/etc/riak"}. -+{platform_base_dir, "/usr/local/lib/riak"}. -+{platform_lib_dir, "/usr/local/lib/riak/lib"}. ++{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"}. %% Modified: head/databases/riak/files/riak.in ============================================================================== --- head/databases/riak/files/riak.in Wed Jun 11 18:37:28 2014 (r357521) +++ head/databases/riak/files/riak.in Wed Jun 11 18:44:31 2014 (r357522) @@ -22,7 +22,7 @@ start_cmd="riak_start" stop_cmd="riak_stop" restart_cdm="riak_restart" status_cmd="riak_status" -command="/usr/local/sbin/riak" +command="%%PREFIX%%/sbin/riak" load_rc_config $name @@ -33,14 +33,14 @@ load_rc_config "$name" riak_start() { echo "Starting Riak." - /usr/local/sbin/riak start + %%PREFIX%%/sbin/riak start return 0 } riak_stop() { echo "Stopping Riak processes" - /usr/local/sbin/riak stop + %%PREFIX%%/sbin/riak stop killall -9 epmd return 0 } @@ -66,7 +66,7 @@ riak_status() riak_running() { local pid result ps - pid=`/usr/local/sbin/riak getpid` + pid=`%%PREFIX%%/sbin/riak getpid` result=`echo $?` if [ "$result" == 0 ]; then ps=`ps -waux | grep ${pid} | grep riak`