Index: head/multimedia/tvheadend/Makefile
===================================================================
--- head/multimedia/tvheadend/Makefile	(revision 465679)
+++ head/multimedia/tvheadend/Makefile	(revision 465680)
@@ -1,89 +1,89 @@
 # Created by: Bernhard Froehlich <decke@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	tvheadend
-PORTVERSION=	4.2.5
+PORTVERSION=	4.2.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	multimedia
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	TV streaming server supporting DVB, IPTV, SAT>IP and more
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	bash:shells/bash \
 		cmake:devel/cmake \
 		${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
 
 BROKEN_mips=		fails to configure: No C compiler found
 BROKEN_mips64=		fails to configure: No C compiler found
 BROKEN_powerpc64=	fails to configure: No C compiler found
 
 USES=		gettext gmake pkgconfig python shebangfix ssl
 USE_GITHUB=	yes
 
 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 --disable-hdhomerun_static \
 		--disable-bintray_cache --disable-ffmpeg_static --disable-pie
 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
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} 's|-ldl||' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's|-Werror||' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/tvheadend
 
 .include <bsd.port.post.mk>
Index: head/multimedia/tvheadend/distinfo
===================================================================
--- head/multimedia/tvheadend/distinfo	(revision 465679)
+++ head/multimedia/tvheadend/distinfo	(revision 465680)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515264849
-SHA256 (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 36816c8b506af6b0f5df442bd96aa301223dc7c44d8b88eec53262e92956d740
-SIZE (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 21528718
+TIMESTAMP = 1522131748
+SHA256 (tvheadend-tvheadend-v4.2.6_GH0.tar.gz) = 09b4d4ff436a2006001ef3c3f38553dc4db3ea31bf9871b046a33180a0e8a8b9
+SIZE (tvheadend-tvheadend-v4.2.6_GH0.tar.gz) = 21528720
Index: head/multimedia/tvheadend/files/patch-Makefile
===================================================================
--- head/multimedia/tvheadend/files/patch-Makefile	(nonexistent)
+++ head/multimedia/tvheadend/files/patch-Makefile	(revision 465680)
@@ -0,0 +1,29 @@
+Prepend local include paths in CFLAGS to avoid conflict with system wide includes
+
+CFLAGS could contain system wide include paths which might conflict
+with our filenames. So make sure that our local directories are first
+in the search order.
+
+Example with conflicting profile.h from kerberos:
+
+tvheadend-4.2.5/src/dvr/dvr.h:27:
+/usr/local/include/profile.h:24:28: error: typedef redefinition with
+different types ('struct _profile_t *' vs 'struct profile')
+typedef struct _profile_t *profile_t;
+                           ^
+tvheadend-4.2.5/src/profile.h:147:3:
+note: previous definition is here
+} profile_t;
+
+Reported by:	Frank Razenberg <frank@zzattack.org>
+--- Makefile.bak	2018-02-22 16:07:14.367738000 +0000
++++ Makefile	2018-02-22 16:08:14.628857000 +0000
+@@ -52,7 +52,7 @@
+ CFLAGS  += -Wmissing-prototypes
+ CFLAGS  += -fms-extensions -funsigned-char -fno-strict-aliasing
+ CFLAGS  += -D_FILE_OFFSET_BITS=64
+-CFLAGS  += -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR}
++CFLAGS  := -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR} ${CFLAGS}
+ ifeq ($(CONFIG_ANDROID),yes)
+ LDFLAGS +=  -lm
+ else

Property changes on: head/multimedia/tvheadend/files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property