svn commit: r357522 - in head/databases/riak: . files

[Mikolaj Golub]

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 <bsd.port.pre.mk>
 
+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`