diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile
index f6acdfb90541..5c261d7ad34f 100644
--- a/multimedia/libv4l/Makefile
+++ b/multimedia/libv4l/Makefile
@@ -1,135 +1,137 @@
 # Check v4l_compat and v4l-utils slave ports
 
 PORTNAME?=	libv4l
 PORTVERSION=	1.23.0
-PORTREVISION?=	3
+PORTREVISION?=	4
 DISTVERSIONPREFIX=	v4l-utils-
 CATEGORIES=	multimedia
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT?=	Video4Linux library
 WWW?=		https://linuxtv.org/wiki/index.php/V4l-utils
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 USES=		compiler:c11 tar:bzip2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hselasky
 GH_PROJECT=	v4l-utils
 
 GH_TUPLE=	hselasky:webcamd:v5.17.1.0:webcamd \
 		torvalds:linux:v5.17-rc1:linux
 
 WEBCAMDDIR=	${WRKDIR}/webcamd-5.17.1.0
 LINUXDIR=	${WRKDIR}/linux-*
 
 .if ${PORTNAME} == v4l-utils || ${PORTNAME} == libv4l
-LIB_DEPENDS+=	libargp.so:devel/argp-standalone \
-		libudev.so:devel/libudev-devd
+LIB_DEPENDS+=	libudev.so:devel/libudev-devd
 BUILD_DEPENDS+= gsed>0:textproc/gsed \
 		v4l_compat>=${PORTVERSION}:multimedia/v4l_compat
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES+=		autoreconf gettext-tools gmake iconv jpeg libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	\
 	--disable-qv4l2 \
 	--disable-qvidcap \
 	--disable-nls
 BINARY_ALIAS=	sed=gsed
 INSTALL_TARGET=	install-strip
 .endif
 
 .if ${PORTNAME} == v4l_compat
 RUN_DEPENDS+=	evdev-proto>=5.3:devel/evdev-proto
 .endif
 
 .if ${PORTNAME} == v4l-utils
 USES+=		perl5
 BUILD_DEPENDS+=	libv4l>=${PORTVERSION}:multimedia/libv4l
 LIB_DEPENDS+=	libepoll-shim-interpose.so:devel/libepoll-shim \
-		libv4l2.so:multimedia/libv4l
+		libv4l2.so:multimedia/libv4l \
+		libargp.so:devel/argp-standalone
 CPPFLAGS+=	`pkg-config --cflags epoll-shim-interpose`
 LDFLAGS+=	`pkg-config --libs epoll-shim-interpose`
 CONFIGURE_ARGS+= \
 	--enable-v4l-utils \
 	--without-v4l2-compliance
 .endif
 
 .if ${PORTNAME} == libv4l
 CONFIGURE_ENV+= \
-	libudev_CFLAGS=" "
+	libudev_CFLAGS=" " \
+	ac_cv_header_argp_h=yes \
+	ac_cv_search_argp_parse="none required"
 CONFIGURE_ARGS+= \
 	--disable-v4l-utils \
 	--enable-dyn-libv4l \
 	--enable-libdvbv5
 .endif
 
 post-patch:
 .if ${PORTNAME} == v4l-utils || ${PORTNAME} == libv4l
 # Create some files and folders needed by autoreconf
 	@${MKDIR} ${WRKSRC}/build-aux
 	@${TOUCH} ${WRKSRC}/build-aux/config.rpath \
 		  ${WRKSRC}/v4l-utils-po/Makefile.in.in \
 		  ${WRKSRC}/libdvbv5-po/Makefile.in.in
 # Don't build translation files for now
 	@${REINPLACE_CMD} -e 's|v4l-utils-po libdvbv5-po||g' ${WRKSRC}/Makefile.am
 .endif
 # Remove old FreeBSD include files (to be removed upstream)
 	@${RM} -r ${WRKSRC}/contrib/freebsd/include/*
 # Create symbolic link for Linux sources
 	@(${RM} -r ${WEBCAMDDIR}/media_tree && ${LN} -s ${LINUXDIR} ${WEBCAMDDIR}/media_tree)
 # Apply webcamd patches first
 	@(cd ${WEBCAMDDIR}/patches && ${SH} ./do_patch.sh)
 # Patch all source files
 	@${FIND} ${WRKSRC} ${LINUXDIR}/include/uapi \
 		-type f \( -iname "*.[ch]" -or -iname "*.cpp" -or -iname "cec-gen.pl" \) | \
 		${XARGS} -n 10 ${REINPLACE_CMD} \
 			-e 's|__inline__|inline|g' \
 			-e 's|__u8|uint8_t|g' \
 			-e 's|__s8|int8_t|g' \
 			-e 's|__le16|uint16_t|g' \
 			-e 's|__be16|uint16_t|g' \
 			-e 's|__u16|uint16_t|g' \
 			-e 's|__s16|int16_t|g' \
 			-e 's|__le32|uint32_t|g' \
 			-e 's|__be32|uint32_t|g' \
 			-e 's|__u32|uint32_t|g' \
 			-e 's|__s32|int32_t|g' \
 			-e 's|__le64|uint64_t|g' \
 			-e 's|__be64|uint64_t|g' \
 			-e 's|__u64|uint64_t|g' \
 			-e 's|__s64|int64_t|g' \
 			-e 's|uint16_t_to_cpu|letoh16|g' \
 			-e 's|uint32_t_to_cpu|letoh32|g' \
 			-e 's|uint64_t_to_cpu|letoh64|g' \
 			-e 's|error_t|int|g' \
 			-e 's|"gettext.h"|<stdio.h>|g' \
 			-e 's|MSG_MORE|0|g' \
 			-e 's|EBADR|EFAULT|g' \
 			-e 's|ENONET|EHOSTDOWN|g' \
 			-e 's|_IOC_READ|IOC_OUT|g' \
 			-e 's|_IOC_WRITE|IOC_IN|g' \
 			-e 's|_IOC_NONE|IOC_VOID|g' \
 			-e 's|<endian.h>|<sys/endian.h>|g' \
 			-e 's|<linux/compiler.h>|<sys/cdefs.h>|g' \
 			-e 's|<v4l-getsubopt.h>|<include/v4l-getsubopt.h>|g' \
 			-e 's|"compiler.h"|<sys/cdefs.h>|g' \
 			-e 's|fallthrough;|;|g' \
 			-e 's|<linux/errno.h>|<errno.h>|g' \
 			-e 's|<linux/ioctl.h>|<sys/ioctl.h>|g' \
 			-e '/^.*\<linux\/kernel.h\>.*/d' \
 			-e 's|<linux/string.h>|<string.h>|g' \
 			-e 's|<linux/sysmacros.h>|<sys/types.h>|g' \
 			-e 's|<malloc.h>|<stdlib.h>|g' \
 			-e 's|<sys/epoll.h>|<libepoll-shim/sys/epoll.h>|g' \
 			-e 's|<sys/sysmacros.h>|<sys/types.h>|g' \
 			-e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \
 			-e 's|__user||g'
 
 .include <bsd.port.mk>