Index: head/multimedia/tvheadend/Makefile
===================================================================
--- head/multimedia/tvheadend/Makefile	(revision 438929)
+++ head/multimedia/tvheadend/Makefile	(revision 438930)
@@ -1,98 +1,98 @@
 # Created by: Bernhard Froehlich <decke@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	tvheadend
 PORTVERSION=	4.0.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	TV streaming server supporting DVB, IPTV and V4L
 
 LICENSE=	GPLv3
 
 BROKEN_powerpc64=	Does not build
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		liburiparser.so:net/uriparser
 RUN_DEPENDS=	dtv-scan-tables>=0:multimedia/dtv-scan-tables
 
 USE_GITHUB=	yes
 
 USES=		execinfo gmake pkgconfig python shebangfix
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	${WRKSRC}/Autobuild.sh \
 		${WRKSRC}/configure \
 		${WRKSRC}/support/apt-update \
 		${WRKSRC}/support/configure.inc \
 		${WRKSRC}/support/getmuxlist \
 		${WRKSRC}/support/version
 
 TVHUSER?=	tvheadend
 TVHGROUP?=	tvheadend
 
 USERS=		${TVHUSER}
 GROUPS=		${TVHGROUP} webcamd
 SUB_LIST+=	TVHUSER="${TVHUSER}" \
 		TVHGROUP="${TVHGROUP}"
 
 CONFIGURE_ENV+=	PLATFORM=freebsd
 CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib
 CFLAGS+=	-I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz
 
 OPTIONS_DEFINE=	AVAHI DVBCSA HDHOMERUN INOTIFY TRANSCODING XMLTV
 OPTIONS_DEFAULT=DVBCSA HDHOMERUN INOTIFY
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
 DVBCSA_DESC=		Replace internal ffdecsa with dvbcsa
 DVBCSA_LIB_DEPENDS=	libdvbcsa.so:multimedia/libdvbcsa
 DVBCSA_CONFIGURE_ENABLE=	dvbcsa
 
 HDHOMERUN_DESC=		Native support for HDHomeRun network tuners
 HDHOMERUN_LIB_DEPENDS=	libhdhomerun.so:multimedia/libhdhomerun
 HDHOMERUN_CONFIGURE_ENABLE=	hdhomerun_client
 
 INOTIFY_DESC=		File system notifications support
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 INOTIFY_CONFIGURE_ENABLE=	inotify
 INOTIFY_LDFLAGS=	-linotify
 
 TRANSCODING_DESC=	Transcoding for mobile and web clients
 TRANSCODING_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 TRANSCODING_CONFIGURE_ENABLE=	libav
 
 XMLTV_RUN_DEPENDS=	p5-xmltv>=0:textproc/p5-xmltv
 
 # CLANG also needs -Wno-microsoft which GCC 4.2 does not know
 CFLAGS+=	-Wno-microsoft \
 		-Wno-tautological-constant-out-of-range-compare
 
 post-patch:
 	@${REINPLACE_CMD} 's|0.0.0~unknown|${PORTVERSION}-${GH_TAGNAME}|' \
 		${WRKSRC}/support/version
 	@${REINPLACE_CMD} 's|-g||' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's|-ldl||' \
 		${WRKSRC}/Makefile
 	# ignore gcc warnings on FreeBSD 9.X, and clang warnings on FreeBSD 10+
 	@${REINPLACE_CMD} 's|-Werror||' \
 		${WRKSRC}/Makefile
 	# Remove -Wunused-result because gcc 4.2 on FreeBSD 9.x does not know it
 	@${REINPLACE_CMD} 's|-Wunused-result||' \
 		${WRKSRC}/Makefile
 	# to suppress clang CC flags on FreeBSD 10+
 	# @${REINPLACE_CMD} 's|clang|clang-options-disabled|' \
 	# to enable clang CC flags, because clang is identified as 'cc' on FreeBSD 10+
 	@${REINPLACE_CMD} 's|clang|cc|' \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
Index: head/multimedia/tvheadend/files/tvheadend.in
===================================================================
--- head/multimedia/tvheadend/files/tvheadend.in	(revision 438929)
+++ head/multimedia/tvheadend/files/tvheadend.in	(revision 438930)
@@ -1,51 +1,51 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: tvheadend
 # REQUIRE: DAEMON webcamd
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf[.local] to enable tvheadend
 #
 # tvheadend_enable (bool):	Set to "NO" by default.
 #				Set it to "YES" to enable tvheadend.
 # tvheadend_user (str):		User account to run with.
 # tvheadend_group (str):	Group to run as.
 # tvheadend_flags (str):	Custom flags for tvheadend.
 
 . /etc/rc.subr
 
 name=tvheadend
 rcvar=tvheadend_enable
 load_rc_config $name
 
 : ${tvheadend_enable:=NO}
 : ${tvheadend_user="%%TVHUSER%%"}
 : ${tvheadend_group="%%TVHGROUP%%"}
 
 pidfile="/var/run/${name}.pid"
 confdir="%%PREFIX%%/etc/tvheadend"
 logdir="/var/log/tvheadend"
 command="%%PREFIX%%/bin/tvheadend"
 
 command_args="-f -p ${pidfile} -c ${confdir} -l ${logdir}/tvheadend.log -u ${tvheadend_user} -g ${tvheadend_group}"
 start_precmd="${name}_prestart"
 
 # TvHeadend looks for EPG Grabber executables 'tv_grab_*' on $PATH, so PATH must include %%PREFIX%%/bin
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:%%PREFIX%%/sbin:%%PREFIX%%/bin
 
 tvheadend_prestart()
 {
 	if [ ! -f "${pidfile}" ]; then
-		/usr/bin/install -o ${tvheadend_user} -g ${tvheadend_user} -m 644 /dev/null ${pidfile}
+		/usr/bin/install -o ${tvheadend_user} -g ${tvheadend_group} -m 644 /dev/null ${pidfile}
 	fi
 	if [ ! -d "${confdir}" ]; then
-		/usr/bin/install -o ${tvheadend_user} -g ${tvheadend_user} -m 755 -d ${confdir}
+		/usr/bin/install -o ${tvheadend_user} -g ${tvheadend_group} -m 755 -d ${confdir}
 	fi
 	if [ ! -d "${logdir}" ]; then
-		/usr/bin/install -o ${tvheadend_user} -g ${tvheadend_user} -m 755 -d ${logdir}
+		/usr/bin/install -o ${tvheadend_user} -g ${tvheadend_group} -m 755 -d ${logdir}
 	fi
 }
 
 run_rc_command "$1"