diff -ruN ./tvheadend.4.2.3/Makefile ./tvheadend/Makefile
--- ./tvheadend.4.2.3/Makefile	2017-10-21 02:50:49.000000000 -0400
+++ ./tvheadend/Makefile	2018-01-02 23:03:49.713053000 -0500
@@ -2,9 +2,9 @@
 # $FreeBSD: head/multimedia/tvheadend/Makefile 452570 2017-10-21 06:50:49Z jbeich $
 
 PORTNAME=	tvheadend
-PORTVERSION=	4.2.3
+PORTVERSION=	4.2.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 MAINTAINER=	decke@FreeBSD.org
diff -ruN ./tvheadend.4.2.3/distinfo ./tvheadend/distinfo
--- ./tvheadend.4.2.3/distinfo	2017-09-11 05:27:04.000000000 -0400
+++ ./tvheadend/distinfo	2018-01-02 23:04:56.275649000 -0500
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501062908
-SHA256 (tvheadend-tvheadend-v4.2.3_GH0.tar.gz) = 2d289a1a8a0a960feba1da2da97c977a2b714d87adfdfaf00a53142e39d808e6
-SIZE (tvheadend-tvheadend-v4.2.3_GH0.tar.gz) = 21518785
+TIMESTAMP = 1514952296
+SHA256 (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 36816c8b506af6b0f5df442bd96aa301223dc7c44d8b88eec53262e92956d740
+SIZE (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 21528718
diff -ruN ./tvheadend.4.2.3/files/patch-src_spawn.c ./tvheadend/files/patch-src_spawn.c
--- ./tvheadend.4.2.3/files/patch-src_spawn.c	2018-01-02 23:49:18.005497000 -0500
+++ ./tvheadend/files/patch-src_spawn.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
---- src/spawn.c.orig	2018-01-02 23:39:37.160267000 -0500
-+++ src/spawn.c	2018-01-02 23:42:04.412973000 -0500
-@@ -23,6 +23,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <signal.h>
- #include <errno.h>
- #include <assert.h>
- #include <syslog.h>
diff -ruN ./tvheadend.4.2.3/files/patch-src_tcp.c ./tvheadend/files/patch-src_tcp.c
--- ./tvheadend.4.2.3/files/patch-src_tcp.c	2017-09-11 05:27:04.000000000 -0400
+++ ./tvheadend/files/patch-src_tcp.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,64 +0,0 @@
-- DSCP cannot be modified on FreeBSD yet
-src/tcp.c:61:14: error: use of undeclared identifier 'IPTOS_DSCP_MASK'
-  v = dscp & IPTOS_DSCP_MASK;
-
-- Change include order for FreeBSD
-In file included from src/tcp.c:33:
-/usr/include/netinet/ip.h:69:17: error: field has incomplete type 'struct in_addr'
-        struct  in_addr ip_src,ip_dst;  /* source and dest address */
-                        ^
-/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
-        struct  in_addr ip_src,ip_dst;  /* source and dest address */
-                ^
-/usr/include/netinet/ip.h:69:24: error: field has incomplete type 'struct in_addr'
-        struct  in_addr ip_src,ip_dst;  /* source and dest address */
-                               ^
-/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
-        struct  in_addr ip_src,ip_dst;  /* source and dest address */
-                ^
-/usr/include/netinet/ip.h:181:19: error: field has incomplete type 'struct in_addr'
-                        struct in_addr ipt_addr;
-                                       ^
-/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
-        struct  in_addr ip_src,ip_dst;  /* source and dest address */
-                ^
-/usr/include/netinet/ip.h:216:17: error: field has incomplete type 'struct in_addr'
-        struct  in_addr ippseudo_src;   /* source internet address */
-                        ^
-/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
-        struct  in_addr ip_src,ip_dst;  /* source and dest address */
-                ^
-/usr/include/netinet/ip.h:217:17: error: field has incomplete type 'struct in_addr'
-        struct  in_addr ippseudo_dst;   /* destination internet address */
-                        ^
-/usr/include/netinet/ip.h:69:9: note: forward declaration of 'struct in_addr'
-        struct  in_addr ip_src,ip_dst;  /* source and dest address */
-                ^
---- src/tcp.c.orig	2017-01-20 19:41:51.000000000 +0100
-+++ src/tcp.c	2017-02-08 11:15:26.836727000 +0100
-@@ -30,8 +30,8 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <signal.h>
--#include <netinet/ip.h>
- #include <netinet/in.h>
-+#include <netinet/ip.h>
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
- 
-@@ -56,6 +56,7 @@
- int
- socket_set_dscp(int sockfd, uint32_t dscp, char *errbuf, size_t errbufsize)
- {
-+#ifdef IPTOS_DSCP_MASK
-   int r, v;
- 
-   v = dscp & IPTOS_DSCP_MASK;
-@@ -65,6 +66,7 @@
-       snprintf(errbuf, errbufsize, "IP_TOS failed: %s", strerror(errno));
-     return -1;
-   }
-+#endif
-   return 0;
- }
-