Index: head/multimedia/libcec/Makefile
===================================================================
--- head/multimedia/libcec/Makefile	(revision 505519)
+++ head/multimedia/libcec/Makefile	(revision 505520)
@@ -1,66 +1,68 @@
 # Created by: Manuel Creach <manuel.creach@icloud.com>
 # $FreeBSD$
 
 PORTNAME=	libcec
-PORTVERSION=	4.0.2
-PORTREVISION=	7
+PORTVERSION=	4.0.4
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to control Pulse-Eight's HDMI-CEC adapter
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libp8-platform.so:devel/p8-platform
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Pulse-Eight
 
 USES=		alias cmake compiler:c++11-lib pkgconfig shebangfix
 SHEBANG_FILES=	src/pyCecClient/pyCecClient.py
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DCMAKE_REQUIRED_INCLUDES:PATH="${LOCALBASE}/include" \
 		-DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib"
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}" \
 		PORTVERSION_MAJOR="${PORTVERSION:C/([0-9]).*/\1/1}"
 
 OPTIONS_DEFINE=	PYTHON X11
 OPTIONS_DEFAULT=	PYTHON X11
 OPTIONS_DEFINE_armv6=	RPI
 OPTIONS_DEFAULT_armv6=	RPI
 OPTIONS_EXCLUDE_armv6=	X11
+OPTIONS_DEFINE_armv7=	RPI
+OPTIONS_DEFAULT_armv7=	RPI
+OPTIONS_EXCLUDE_armv7=	X11
 OPTIONS_SUB=	yes
 
 PYTHON_DESC=	build python wrapper
 PYTHON_BUILD_DEPENDS+=	swig3.0:devel/swig30
 RPI_DESC=	build libcec support for raspberrypi
 RPI_CMAKE_ON=	-DRPI_INCLUDE_DIR=${LOCALBASE}/include -DRPI_LIB_DIR=${LOCALBASE}/lib
 RPI_LIB_DEPENDS=	libbcm_host.so:misc/raspberrypi-userland
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python:build
 .else
 CMAKE_ARGS+=	-DSKIP_PYTHON_WRAPPER:BOOL=true
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 xorgproto xrandr
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|$${GIT_REVISION}|${PORTVERSION}|g' \
 		${WRKSRC}/src/libcec/cmake/SetBuildInfo.cmake
 	@${REINPLACE_CMD} -e '/SOVERSION/ s|\.0||' \
 		-e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \
 		${WRKSRC}/src/libcec/CMakeLists.txt
 .if ! ${PORT_OPTIONS:MPYTHON}
 	@${REINPLACE_CMD} '/pyCecClient/d' \
 		${WRKSRC}/CMakeLists.txt
 .endif
 
 .include <bsd.port.mk>
Index: head/multimedia/libcec/distinfo
===================================================================
--- head/multimedia/libcec/distinfo	(revision 505519)
+++ head/multimedia/libcec/distinfo	(revision 505520)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485708686
-SHA256 (Pulse-Eight-libcec-libcec-4.0.2_GH0.tar.gz) = b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27
-SIZE (Pulse-Eight-libcec-libcec-4.0.2_GH0.tar.gz) = 334995
+TIMESTAMP = 1561426370
+SHA256 (Pulse-Eight-libcec-libcec-4.0.4_GH0.tar.gz) = 4382a964bf8c511c22c03cdab5ba2d81c241536e6479072a61516966804f400a
+SIZE (Pulse-Eight-libcec-libcec-4.0.4_GH0.tar.gz) = 344976
Index: head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake
===================================================================
--- head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake	(revision 505519)
+++ head/multimedia/libcec/files/patch-src_libcec_cmake_SetBuildInfo.cmake	(revision 505520)
@@ -1,18 +1,18 @@
 --- src/libcec/cmake/SetBuildInfo.cmake.orig	2017-01-28 22:51:30 UTC
 +++ src/libcec/cmake/SetBuildInfo.cmake
 @@ -14,14 +14,7 @@ else()
    set(LIB_INFO "")
  
    # add git revision to compile info
 -  find_program(HAVE_GIT_BIN git /bin /usr/bin /usr/local/bin)
 -  if(HAVE_GIT_BIN)
 -    exec_program(${CMAKE_CURRENT_SOURCE_DIR}/cmake/git-rev.sh HEAD OUTPUT_VARIABLE GIT_REVISION)
 -    message(STATUS "git found: ${GIT_REVISION}")
 -  endif()
 -  if (GIT_REVISION)
 -    set(LIB_INFO "git revision: ${GIT_REVISION},")
 -  endif()
-+  set(LIB_INFO "git revision: 4.0.2,")
++  set(LIB_INFO "git revision: 4.0.4,")
  
    # add compilation date to compile info
    find_program(HAVE_DATE_BIN date /bin /usr/bin /usr/local/bin)
Index: head/multimedia/libcec/pkg-plist
===================================================================
--- head/multimedia/libcec/pkg-plist	(revision 505519)
+++ head/multimedia/libcec/pkg-plist	(revision 505520)
@@ -1,16 +1,17 @@
 bin/cec-client
 bin/cec-client-%%PORTVERSION%%
 bin/cecc-client
 bin/cecc-client-%%PORTVERSION%%
 %%PYTHON%%bin/pyCecClient
 include/libcec/cec.h
 include/libcec/cecc.h
 include/libcec/cecloader.h
+include/libcec/ceccloader.h
 include/libcec/cectypes.h
 include/libcec/version.h
 lib/libcec.so
 lib/libcec.so.%%PORTVERSION_MAJOR%%
 lib/libcec.so.%%PORTVERSION%%
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/cec/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/cec/_cec.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/cec.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_cec.so
 libdata/pkgconfig/libcec.pc