Index: head/sysutils/ipfs-go/Makefile
===================================================================
--- head/sysutils/ipfs-go/Makefile	(revision 489637)
+++ head/sysutils/ipfs-go/Makefile	(revision 489638)
@@ -1,52 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	ipfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.18
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/ipfs/go-ipfs/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	-go
 DISTNAME=	go-ipfs-source
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	IPFS implementation in Go
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 USES=		go
 
 GO_PKGNAME=	github.com/ipfs/go-ipfs
 GO_TARGET=	./cmd/ipfs
 
 NO_WRKSUBDIR=	yes
 
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_FILES=	${FULLNAME}
 SUB_LIST=	IPFS_USER=${IPFS_USER} \
 		IPFS_GROUP=${IPFS_GROUP} \
 		IPFS_LOGDIR=${IPFS_LOGDIR}
 PLIST_SUB=	IPFS_USER=${IPFS_USER} \
 		IPFS_GROUP=${IPFS_GROUP} \
 		IPFS_HOME=${IPFS_HOME} \
 		IPFS_LOGDIR=${IPFS_LOGDIR}
 
 IPFS_USER=	${FULLNAME}
 IPFS_GROUP=	${FULLNAME}
 IPFS_HOME=	/var/db/${PORTNAME}${PKGNAMESUFFIX}
 IPFS_LOGDIR=	/var/log/${PORTNAME}${PKGNAMESUFFIX}
 
 USERS=		${IPFS_USER}
 GROUPS=		${IPFS_GROUP}
 
 FULLNAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${IPFS_HOME}
 	@${MKDIR} ${STAGEDIR}${IPFS_LOGDIR}
 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 .include <bsd.port.mk>
Index: head/sysutils/ipfs-go/files/ipfs-go.in
===================================================================
--- head/sysutils/ipfs-go/files/ipfs-go.in	(revision 489637)
+++ head/sysutils/ipfs-go/files/ipfs-go.in	(revision 489638)
@@ -1,49 +1,54 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: ipfs_go
 # REQUIRE: DAEMON NETWORKING
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable ipfs_go:
 # ipfs_go_enable="YES"
 #
 # ipfs_go_enable (bool):    Set to YES to enable ipfs_go
 #                           Default: NO
 # ipfs_go_user (str):       ipfs_go daemon user
 #                           Default: %%IPFS_USER%%
 # ipfs_go_group (str):      ipfs_go daemon group
 #                           Default: %%IPFS_GROUP%%
+# ipfs_go_path (str): 	    ipfs_go ipfs repo path
+#                           Default: %%IPFS_HOME%%
 
+
 . /etc/rc.subr
 
 name=ipfs_go
 rcvar=ipfs_go_enable
 load_rc_config $name
 
 : ${ipfs_go_enable:="NO"}
 : ${ipfs_go_user:="%%IPFS_USER%%"}
 : ${ipfs_go_group:="%%IPFS_GROUP%%"}
+: ${ipfs_go_path:="%%IPFS_HOME%%"}
 
 logfile="%%IPFS_LOGDIR%%/${name}.log"
 pidfile="/var/run/${name}.pid"
 command="%%PREFIX%%/bin/ipfs-go"
 start_precmd="ipfs_go_prestart"
 start_cmd="ipfs_go_start"
 
 ipfs_go_prestart() {
   install -d -o ${ipfs_go_user} -g ${ipfs_go_group} -m750 %%IPFS_LOGDIR%%
-  [ -d ~%%IPFS_USER%%/.ipfs ] || /usr/bin/su - ${ipfs_go_user} -c "${command} init"
+  [ -d ${ipfs_go_path} ] || /usr/bin/su - ${ipfs_go_user} -c "env IPFS_PATH=${ipfs_go_path} ${command} init"
 }
 
 ipfs_go_start() {
   echo running ${command} daemon
   export USER=${ipfs_go_user}
   export HOME=$(echo ~%%IPFS_USER%%)
+  export IPFS_PATH=${ipfs_go_path}
   /usr/sbin/daemon -p ${pidfile} -u ${ipfs_go_user} ${command} daemon >> ${logfile} 2>&1
 }
 
 run_rc_command "$1"