Index: head/databases/neo4j/Makefile
===================================================================
--- head/databases/neo4j/Makefile	(revision 432629)
+++ head/databases/neo4j/Makefile	(revision 432630)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	neo4j
 DISTVERSION=	3.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases java
 MASTER_SITES=	http://dist.neo4j.org/
 DISTNAME=	${PORTNAME}-community-${DISTVERSION}-unix
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	High performance graph store and database
 
 RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S,-unix,,}
 NO_BUILD=	yes
 USES=		shebangfix
 SHEBANG_FILES=	bin/neo4j-shell bin/neo4j-import
 USE_JAVA=	yes
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	${PORTNAME}.sh
 
 post-patch:
 	${REINPLACE_CMD} 's,%%DATADIR%%,${DATADIR},g;s,%%PREFIX%%,${PREFIX},g' \
 		${WRKSRC}/bin/neo4j-shared.sh ${WRKSRC}/conf/neo4j.conf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tools/* \
 		${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/tools
 .for j in j j-admin j-import j-shell
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/neo4$j ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 	-cd ${STAGEDIR}${PREFIX}/bin && ${LN} ${PORTNAME} neo4$j 2>/dev/null
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugins
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}-shared.sh \
 		${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 .for f in ${PORTNAME}.conf ${PORTNAME}-wrapper.conf
 	${INSTALL_DATA} ${WRKSRC}/conf/$f \
 		${STAGEDIR}${PREFIX}/etc/$f.sample
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${PREFIX}/etc/neo4j-certificates
 .include <bsd.port.mk>
Index: head/databases/neo4j/files/neo4j.in
===================================================================
--- head/databases/neo4j/files/neo4j.in	(revision 432629)
+++ head/databases/neo4j/files/neo4j.in	(revision 432630)
@@ -1,39 +1,39 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: neo4j
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable neo4j:
 #
 # neo4j_enable=YES
 
 . /etc/rc.subr
 
 name=neo4j
 rcvar=neo4j_enable
 desc="Graphing database"
 
 load_rc_config $name
 
 : ${neo4j_enable:=NO}
 
-command=%%PREFIX%%/libexec/neo4j
+command=%%PREFIX%%/libexec/neo4j/neo4j
 start_cmd="$command start"
 start_precmd=neo4j_prestart
 stop_cmd="$command stop"
 status_cmd="$command status"
 
 neo4j_prestart()
 {
 	NEO4J_DATA=%%DATADIR%%
 	NEO4J_LIB=%%PREFIX%%/lib/neo4j
 	NEO4J_LOGS=/var/log/neo4j
 	NEO4J_PLUGINS=${NEO4J_LIB}/plugins
 	NEO4J_RUN=/var/run/neo4j
 	mkdir -p ${NEO4J_LOGS} ${NEO4J_RUN}
 }
 
 run_rc_command $1