Index: head/net-im/prosody/Makefile
===================================================================
--- head/net-im/prosody/Makefile	(revision 548449)
+++ head/net-im/prosody/Makefile	(revision 548450)
@@ -1,57 +1,59 @@
 # Created by: Andrew Lewis <freeghb@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	prosody
 PORTVERSION=	0.11.6
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://prosody.im/downloads/source/
 
 MAINTAINER=	thomas@beingboiled.info
 COMMENT=	Simple extensible XMPP server written in Lua
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/ssl.so:security/luasec@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/lxp.so:textproc/luaexpat@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR}
 LIB_DEPENDS=	libidn.so:dns/libidn
 
-USES=		compiler:c11 cpe gmake lua:52 ssl
+USES=		compiler:c11 cpe gmake lua:52 shebangfix ssl
+SHEBANG_FILES=	prosody prosodyctl tools/migration/prosody-migrator.lua
 LUA_PREMK=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--datadir="/var/db/prosody" \
 		--lua-version="${LUA_VER}" \
 		--lua-suffix="${LUA_VER_STR}" \
 		--with-lua-include="${LUA_INCDIR}" \
 		--with-lua-lib="${LUA_LIBDIR}" \
 		--with-random=arc4random \
 		--c-compiler="${CC}" \
 		--cflags="${CFLAGS}" \
 		--add-cflags="-fPIC -std=c99 -I${LOCALBASE}/include -I${OPENSSLINC}" \
 		--linker="${CC}" \
 		--ldflags="${LDFLAGS}" \
 		--add-ldflags="-shared -L${LOCALBASE}/lib -L${OPENSSLLIB}" \
 		--no-example-certs
 
 MAKEFILE=	GNUmakefile
 USERS=		prosody
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	prosody
 SUB_FILES=	pkg-deinstall
-SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
+SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS} LUA_PREFIX=${LUA_PREFIX} LUA_CMD=${LUA_CMD}
 PLIST_SUB=	PROSODY_USER=${USERS} \
 		PROSODY_USER_regex=\b${USERS}\b \
 		PROSODY_GROUP=${GROUPS} \
 		PROSODY_GROUP_regex=\b${GROUPS}\b
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/prosody/util/*.so
 	@${MKDIR} ${STAGEDIR}/var/run/prosody
 	@${RM} ${STAGEDIR}${ETCDIR}/certs/*
 
 .include <bsd.port.mk>
Index: head/net-im/prosody/files/prosody.in
===================================================================
--- head/net-im/prosody/files/prosody.in	(revision 548449)
+++ head/net-im/prosody/files/prosody.in	(revision 548450)
@@ -1,40 +1,31 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: prosody
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # prosody_enable (bool):   Set to NO by default.
 #                Set it to YES to enable Prosody
 
 . /etc/rc.subr
 
 name="prosody"
 rcvar="prosody_enable"
-command="%%PREFIX%%/bin/prosodyctl"
+command="%%PREFIX%%/bin/prosody"
+command_args="-D"
+command_interpreter="%%LUA_PREFIX%%/bin/%%LUA_CMD%%"
+extra_commands="reload"
+prosody_user="%%USERS%%"
+prosody_group="%%GROUPS%%"
 
 load_rc_config $name
 
 prosody_enable=${prosody_enable:-"NO"}
 pidfile=${prosody_pidfile:-"/var/run/prosody/prosody.pid"}
-
-extra_commands="reload"
-start_cmd="prosody_cmd start"
-stop_cmd="prosody_cmd stop"
-reload_cmd="prosody_cmd reload"
-restart_cmd="prosody_cmd restart"
-status_cmd="prosody_cmd status"
-
-export PATH="%%PREFIX%%/bin:$PATH"
-
-prosody_cmd()
-{
-	$command $1
-}
 
 run_rc_command "$1"
Index: head/net-im/prosody/pkg-message
===================================================================
--- head/net-im/prosody/pkg-message	(revision 548449)
+++ head/net-im/prosody/pkg-message	(revision 548450)
@@ -1,12 +1,20 @@
 [
 { type: install
   message: <<EOM
-    If you're running Prosody in a jail and experience problems, please add
-    the following to the global section of your prosody.cfg.lua:
+If you're running Prosody in a jail and experience problems, please add
+the following to the global section of your prosody.cfg.lua:
 
-    interfaces = { 'x.x.x.x' }
+interfaces = { 'x.x.x.x' }
 
-    where 'x.x.x.x' is the public IP you wish Prosody to bind to.
+where 'x.x.x.x' is the public IP you wish Prosody to bind to.
+EOM
+},
+{ type: install
+  message: <<EOM
+Make sure your prosody.cfg.lua contains the following line
+or else the init script won't work:
+
+pidfile = "/var/run/prosody/prosody.pid"
 EOM
 }
 ]