Index: www/minio/Makefile
===================================================================
--- www/minio/Makefile	(revision 536720)
+++ www/minio/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	minio
 PORTVERSION=	${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g}
+PORTREVISION=	1
 CATEGORIES=	www
 DIST_SUBDIR=	minio
 
@@ -164,14 +165,19 @@
 		-X github.com/minio/minio/cmd.GOPATH=${WRKSRC} -s -w'
 
 PLIST_FILES=	bin/${PORTNAME}
-USE_RC_SUBR=	minio
+USE_RC_SUBR=	${PORTNAME}
 
-USERS=		minio
-GROUPS=		minio
+MINIO_USER?=	${PORTNAME}
+MINIO_GROUP?=	${PORTNAME}
+MINIO_DBDIR?=	/var/db/${PORTNAME}
 
-SUB_LIST=	GROUP="${GROUPS}" \
-		USER="${USERS}"
+USERS=		${MINIO_USER}
+GROUPS=		${MINIO_GROUP}
 
+SUB_LIST=	DBDIR=${MINIO_DBDIR} \
+		GROUP=${GROUPS} \
+		USER=${USERS}
+
 post-extract:
 	@${RM} -r ${WRKSRC}/vendor/github.com/hashicorp/vault/sdk
 	@${RLN} ${WRKSRC_hashicorp_vault_sdk}/sdk ${WRKSRC}/vendor/github.com/hashicorp/vault/sdk
Index: www/minio/files/minio.in
===================================================================
--- www/minio/files/minio.in	(revision 536720)
+++ www/minio/files/minio.in	(working copy)
@@ -9,8 +9,8 @@
 # minio_enable (bool):          Set to "NO" by default.
 #                               Set it to "YES" to enable minio
 # minio_config (path):          Set to "%%ETCDIR%%" by default
-#                               Set to directory to store minio config
-# minio_certs (path):           Set to "/var/tmp/minio" by default
+#                               Set to directory to store minio config (deprecated)
+# minio_certs (path):           Set to "%%ETCDIR%%/certs" by default
 #                               Set to directory to certs dir
 # minio_disks (path):           Set to "/var/db/minio" by default.
 #                               Set it to directory to store minio data
@@ -41,8 +41,8 @@
 
 : ${minio_enable:="NO"}
 : ${minio_config="%%ETCDIR%%"}
-: ${minio_certs="/var/tmp/minio"}
-: ${minio_disks="/var/db/minio"}
+: ${minio_certs="%%ETCDIR%%/certs"}
+: ${minio_disks="%%DBDIR%%"}
 : ${minio_address=":9000"}
 : ${minio_user:="%%USER%%"}
 : ${minio_group:="%%GROUP%%"}
@@ -49,47 +49,44 @@
 : ${minio_syslog_enable:="YES"}
 : ${minio_logfile:="/var/log/minio.log"}
 
-start_precmd="minio_startprecmd"
+start_precmd="minio_start_precmd"
 
 if checkyesno minio_syslog_enable; then
-    if [ -n "${minio_syslog_output_tag}" ]; then
-        minio_syslog_output_flags="-T ${minio_syslog_output_tag}"
-    else
-        minio_syslog_output_flags="-T ${name}"
-    fi
-    if [ -n "${minio_syslog_priority}" ]; then
-        minio_syslog_output_flags="${minio_syslog_output_flags} -s ${minio_syslog_priority}"
-    fi
-    if [ -n "${minio_syslog_facility}" ]; then
-        minio_syslog_output_flags="${minio_syslog_output_flags} -l ${minio_syslog_facility}"
-    fi
+	if [ -n "${minio_syslog_output_tag}" ]; then
+		minio_log_flags="-T ${minio_syslog_output_tag}"
+	else
+		minio_log_flags="-T ${name}"
+	fi
+	if [ -n "${minio_syslog_priority}" ]; then
+		minio_log_flags="${minio_log_flags} -s ${minio_syslog_priority}"
+	fi
+	if [ -n "${minio_syslog_facility}" ]; then
+		minio_log_flags="${minio_log_flags} -l ${minio_syslog_facility}"
+	fi
 else
-    minio_syslog_output_flags="-o ${minio_logfile}"
+	minio_log_flags="-o ${minio_logfile}"
 fi
 
 pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/bin/minio"
 command="/usr/sbin/daemon"
-command_args="-f -t ${name} ${minio_syslog_output_flags} -p ${pidfile} /usr/bin/env ${minio_env} ${procname} -C \"${minio_config}\" -S \"${minio_certs}\" --quiet server --address=\"${minio_address}\" ${minio_disks} ${minio_args}"
+command_args="-f ${minio_log_flags} -p ${pidfile} -t ${name} /usr/bin/env ${minio_env} ${procname} -C \"${minio_config}\" -S \"${minio_certs}\" --quiet server --address=\"${minio_address}\" ${minio_disks} ${minio_args}"
 
-minio_startprecmd()
+minio_start_precmd()
 {
-    if [ ! -e "${pidfile}" ]; then
-        install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${pidfile}"
-    fi
-
-    if [ ! -d "${minio_config}" ]; then
-        install -d -o "${minio_user}" -g "${minio_group}" "${minio_config}"
-    fi
-    if [ ! -e "${minio_logfile}" ]; then
-        install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${minio_logfile}"
-    fi
-
-    for disk in "${minio_disks}"; do
-        if [ ! -d "${disk}" ]; then
-            install -d -o "${minio_user}" -g "${minio_group}" "${disk}"
-        fi
-    done
+	if [ ! -e "${pidfile}" ]; then
+		install -m 0600 -o "${minio_user}" -g "${minio_group}" /dev/null "${pidfile}"
+	fi
+	if ! checkyesno minio_syslog_enable && [ ! -e "${minio_logfile}" ]; then
+		install -m 0640 -o "${minio_user}" -g "${minio_group}" /dev/null "${minio_logfile}"
+	fi
+	if echo "${minio_disks}" | egrep -q -v '^[^/]|\.{3}'; then
+		for disk in "${minio_disks}"; do
+			if [ ! -d "${disk}" ]; then
+				install -d -m 0750 -o "${minio_user}" -g "${minio_group}" "${disk}"
+			fi
+		done
+	fi
 }
 
 run_rc_command "$1"