Index: head/net-im/tox/Makefile
===================================================================
--- head/net-im/tox/Makefile	(revision 422826)
+++ head/net-im/tox/Makefile	(revision 422827)
@@ -1,77 +1,78 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
 PORTNAME=	toxcore
 PORTVERSION=	0.160924
+PORTREVISION=	1
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	ProjectTox-Core library, a decentralized and secure messenger
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	checkmk:devel/libcheck
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
 		libopus.so:audio/opus
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	irungentoo
 GH_TAGNAME=	161ab46
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-tests
 USES=		autoreconf compiler:c11 libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
 INSTALL_TARGET=		install-strip
 
 OPTIONS_DEFINE=		DAEMON
 OPTIONS_RADIO=		CRYPTO
 OPTIONS_RADIO_CRYPTO=	SODIUM NACL
 OPTIONS_DEFAULT=	SODIUM
 OPTIONS_SUB=		yes
 
 SODIUM_DESC=		Prefer libsodium
 SODIUM_LIB_DEPENDS=	libsodium.so:security/libsodium
 
 NACL_DESC=		Prefer NaCl
 NACL_CONFIGURE_ENABLE=	nacl
 NACL_CONFIGURE_ON=	--with-nacl-libs=${LOCALBASE}/lib
 NACL_BUILD_DEPENDS=	${LOCALBASE}/lib/libnacl.a:security/nacl
 NACL_RUN_DEPENDS=	${LOCALBASE}/lib/libnacl.a:security/nacl
 
 DAEMON_DESC=		Bootstrap daemon
 DAEMON_CONFIGURE_ENABLE=daemon
 DAEMON_LIB_DEPENDS=	libconfig.so:devel/libconfig
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDAEMON}
 USERS=	toxdht
 USE_RC_SUBR=	tox-bootstrapd
 SUB_LIST=	TOXDHT=${USERS}
 PLIST_SUB+=	TOXDHT=${USERS}
 KEYS_DIR=	/var/lib/tox-bootstrapd
 PID_DIR=	/var/run/tox-bootstrapd
 PKGMESSAGE=	${PKGDIR}/pkg-message.daemon
 .endif
 
 pre-everything::
 .if ${PORT_OPTIONS:MNACL}
 	@${ECHO_CMD}
 	@${ECHO_CMD} "Warning: building toxcore against NaCl is not supported by some clients (e.g. qTox)!"
 	@${ECHO_CMD}
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 
 post-install:
 .if ${PORT_OPTIONS:MDAEMON}
 	${INSTALL_DATA} ${WRKSRC}/other/bootstrap_daemon/tox-bootstrapd.conf	\
 		${STAGEDIR}${PREFIX}/etc/tox-bootstrapd.conf.sample
 	${MKDIR} ${STAGEDIR}${KEYS_DIR}
 	${MKDIR} ${STAGEDIR}${PID_DIR}
 .endif
 
 .include <bsd.port.mk>
Index: head/net-im/tox/files/tox-bootstrapd.in
===================================================================
--- head/net-im/tox/files/tox-bootstrapd.in	(revision 422826)
+++ head/net-im/tox/files/tox-bootstrapd.in	(revision 422827)
@@ -1,42 +1,42 @@
 #! /bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: tox_bootstrapd
 # REQUIRE: NETWORKING DAEMON
 # KEYWORD: shutdown
 
 # Add the following line to /etc/rc.conf to enable `tox-bootstrapd':
 #
 #tox_bootstrapd_enable="YES"
 #
 
 . /etc/rc.subr
 
 name="tox_bootstrapd"
 rcvar=tox_bootstrapd_enable
 
 # read settings, set default values
 load_rc_config "${name}"
 : ${tox_bootstrapd_enable="NO"}
 
 required_files=${tox_bootstrapd_config:="%%PREFIX%%/etc/tox-bootstrapd.conf"}
 _pidprefix="/var/run/tox-bootstrapd"
 pidfile=${tox_bootstrapd_pidfile:="$_pidprefix/tox-bootstrapd.pid"}
 long_name="Tox DHT bootstrap daemon."
 tox_bootstrapd_user="%%TOXDHT%%"
 command="%%PREFIX%%/bin/tox-bootstrapd"
-command_args="${tox_bootstrapd_config}"
+command_args="--config ${tox_bootstrapd_config}"
 
 stop_cmd=${name}_stop
 
 # Cannot use the regular stop() because the daemon forks
 tox_bootstrapd_stop() {
 	[ -f $pidfile ] || (echo "$name not running?"; exit 1)
 	echo "Stopping $long_name"
 	kill `ps ax | grep $command | grep -v grep | awk '{print $1}'`
 	rm -f $pidfile
 }
 
 run_rc_command "$1"