Index: head/security/i2pd/Makefile
===================================================================
--- head/security/i2pd/Makefile	(revision 561920)
+++ head/security/i2pd/Makefile	(revision 561921)
@@ -1,59 +1,59 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	i2pd
 PORTVERSION=	2.33.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++ implementation of I2P client
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PurpleI2P
 
 USES=		cmake:insource compiler:c++11-lib ssl
 CMAKE_ARGS=	-DWITH_GUI=OFF
 CMAKE_SOURCE_PATH=	${WRKSRC}/build
 USE_RC_SUBR=	${PORTNAME}
 
 PORTDOCS=	*
 
 USERS=		_i2pd
 GROUPS=		_i2pd
 
 PLIST_SUB=	USER="${USERS}" GROUP="${GROUPS}"
 SUB_LIST=	USER="${USERS}" GROUP="${GROUPS}"
 SUB_FILES=	i2pd.newsyslog.conf
 
 OPTIONS_DEFINE=	AESNI AVX UPNP DOCS HARDENING
 
 AESNI_DESC=		Use AES-NI instructions set
 AESNI_CMAKE_BOOL=	WITH_AESNI
 AVX_DESC=		Use AVX instructions
 AVX_CMAKE_BOOL=		WITH_AVX
 UPNP_DESC=		Include support for UPnP client
 UPNP_CMAKE_BOOL=	WITH_UPNP
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 HARDENING_CMAKE_BOOL=	WITH_HARDENING
 HARDENING_DESC=		Use hardening compiler flags
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${INSTALL_DATA} ${WRKDIR}/i2pd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/i2pd.conf
 	@${MKDIR} ${STAGEDIR}/var/run/i2pd
 	@${MKDIR} ${STAGEDIR}/var/log/i2pd
 	@${MKDIR} ${STAGEDIR}/var/db/i2pd
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/i2pd/files/i2pd.in
===================================================================
--- head/security/i2pd/files/i2pd.in	(revision 561920)
+++ head/security/i2pd/files/i2pd.in	(revision 561921)
@@ -1,46 +1,34 @@
 #!/bin/sh
 #
 # PROVIDE: i2pd
 # REQUIRE: DAEMON NETWORKING FILESYSTEMS
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable i2pd:
 #
 # i2pd_enable="YES"
 #
-# By default, it writes logs to /var/log/i2pd/i2pd.log not using syslogd.
-# You may change log file name with i2pd_logfile variable in /etc/rc.conf, or
-# if you prefer it send logs to syslogd then add the following to /etc/rc.conf:
-#
-# i2pd_logfile="syslog:warn"	# for flags: --log syslog --loglevel warn
-#
 
 . /etc/rc.subr
 
 name="i2pd"
 rcvar=i2pd_enable
 
 load_rc_config ${name}
 
 : ${i2pd_enable="NO"}
 : ${i2pd_user="%%USER%%"}
 : ${i2pd_group="%%GROUP%%"}
 : ${i2pd_pidfile="/var/run/${name}/${name}.pid"}
 : ${i2pd_datadir="/var/db/${name}"}
+: ${i2pd_logfile="/var/log/${name}/${name}.log"}
 
-case "$i2pd_logfile" in
-  syslog)	log="--log syslog" ;;
-  syslog:*)	log="--log syslog --loglevel ${i2pd_logfile#syslog:}" ;;
-  *)		: ${i2pd_logfile="/var/log/${name}/${name}.log"}
-		log="--log file --logfile ${i2pd_logfile}" ;;
-esac
-
 required_dirs=${i2pd_datadir}
 pidfile=${i2pd_pidfile}
 command="%%PREFIX%%/bin/${name}"
-command_args="--pidfile ${i2pd_pidfile} --service --datadir ${i2pd_datadir} --daemon $log"
+command_args="--pidfile ${i2pd_pidfile} --service --datadir ${i2pd_datadir} --log file --logfile ${i2pd_logfile} --daemon"
 extra_commands="reload"
 reload_cmd="pkill -1 -F ${i2pd_pidfile} -x i2pd"
 
 run_rc_command "$1"