diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index 06c436a44bcd..11a0786d150d 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -1,150 +1,145 @@
 PORTNAME=	ptlib
 PORTVERSION=	2.10.11
 PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Cross platform C++ library, used by OPAL
 WWW=		http://www.opalvoip.org
 
 LICENSE=	MPL10
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		autoreconf:build bison:wrapper compiler:c11 gmake localbase:ldflags \
 		pathfix pkgconfig ssl tar:xz
 BROKEN_SSL=	openssl openssl31
 BROKEN_SSL_REASON=	Uses OpenSSL 3.0.0 deprecated BIO_s_file_internal
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=--disable-lua \
+CONFIGURE_ARGS=	--disable-bsdvideo \
+		--disable-lua \
 		--disable-sasl \
 		--enable-audio \
 		--enable-ipv6 \
 		--enable-exceptions \
 		--enable-oss \
 		--enable-plugins
 # --with-expat-dir="${LOCALBASE}"
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
 
 ALL_TARGET=	optshared
 
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
 CONFLICTS=	pwlib-1.*
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		PVERSION_MAJOR=${PVERSION_MAJOR} \
 		PVERSION_MINOR=${PVERSION_MINOR}
 
-OPTIONS_DEFINE=	DEBUG BSDVIDEO ODBC ALSA JABBER V4L SDL LDAP PULSEAUDIO
-OPTIONS_DEFAULT=BSDVIDEO SDL V4L JABBER
-OPTIONS_EXCLUDE_FreeBSD_13=	BSDVIDEO
-OPTIONS_EXCLUDE_FreeBSD_14=	BSDVIDEO
+OPTIONS_DEFINE=	DEBUG ODBC ALSA JABBER V4L SDL LDAP PULSEAUDIO
+OPTIONS_DEFAULT=SDL V4L JABBER
 OPTIONS_SUB=	yes
 
-BSDVIDEO_DESC=	BSD video support
-
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=alsa
-BSDVIDEO_CONFIGURE_ENABLE=bsdvideo
-BSDVIDEO_VARS=	PTLIB_VIDEO=1
 DEBUG_ALL_TARGET=	debugshared
 JABBER_CONFIGURE_ON=--enable-jabber
 JABBER_VARS=	PTLIB_VIDEO=1
 LDAP_USES=	ldap
 LDAP_CONFIGURE_ENABLE=openldap
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_ENABLE=	odbc
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=pulse
 SDL_USES=		sdl
 SDL_USE=	SDL=sdl
 SDL_CONFIGURE_ENABLE=sdl
 V4L_BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=	v4l v4l2
 V4L_VARS=	PTLIB_VIDEO=1
 
 PVERSION_MAJOR=	${PORTVERSION:C/.[0-9]+.[0-9]+.//}
 PVERSION_MINOR=	${PORTVERSION:C/.[0-9]+$//g}
 
 .include <bsd.port.options.mk>
 
 .if (${OPSYS} == FreeBSD && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_ptclib_pssl.cxx-openssl111
 .else
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_ptclib_pssl.cxx
 .endif
 
 .if defined(PTLIB_VIDEO)
 CONFIGURE_ARGS+=--enable-video --enable-vidfile
 PLIST_SUB+=	VIDEODIR=""
 .else
 CONFIGURE_ARGS+=--disable-video --disable-vidfile
 PLIST_SUB+=	VIDEODIR="@comment "
 .endif
 
 # ONLY FOR THE BRAVE!
 # If someone owns a firewire(4) video device and wants to use it for
 # video-conferencing purposes, please download the files:
 # libraw1394.shar.gz, libavc1394.shar.gz and libdc1394.shar.gz from
 # ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/ports/
 # Extract the files in ${PORTSDIR}/devel and uncomment the following lines.
 #
 ##enable libavc1394
 #.if defined(WITH_AVC1394)
 #LIB_DEPENDS+=	avc1394.2:devel/libavc1394 \
 #		dv.4:multimedia/libdv
 #CONFIGURE_ARGS+=	--enable-avc
 #PLIST_SUB+=	AVC1394=""
 #.else
 CONFIGURE_ARGS+=	--disable-avc
 PLIST_SUB+=	AVC1394="@comment "
 #.endif
 #
 ##enable libdc1394
 #.if defined(WITH_DC1394)
 #LIB_DEPENDS+=	dc1394.2[0-9]:multimedia/libdc1394
 #CONFIGURE_ARGS+=	--enable-dc
 #PLIST_SUB+=	DC1394=""
 #.else
 CONFIGURE_ARGS+=	--disable-dc
 #PLIST_SUB+=	DC1394="@comment "
 #.endif
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
 CPPFLAGS+=	-Dregister= -Wno-error=dynamic-exception-spec
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/RTF_WASCLONED/0x20000/' ${WRKSRC}/src/ptlib/unix/socket.cxx
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's|auto_ptr|unique_ptr|' \
 		${WRKSRC}/include/ptlib/psharedptr.h
 	@${REINPLACE_CMD} -e 's|public binary_function|public __binary_function|' \
 		${WRKSRC}/include/ptlib/pprocess.h
 .endif
 
 pre-configure:
 	(cd ${WRKSRC}/plugins/ && ${AUTORECONF} -fi)
 
 post-install:
 	${LN} -sf libpt.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libpt.so.${PVERSION_MAJOR}
 	${LN} -sf libpt.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libpt.so.${PVERSION_MINOR}
 	@${CHMOD} 0755 ${STAGEDIR}${PREFIX}/lib/libpt.so.${PORTVERSION} \
 		${STAGEDIR}${PREFIX}/lib/ptlib-${PORTVERSION}/devices/*/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpt.so.${PORTVERSION}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ptlib-${PORTVERSION}/devices/*/*.so
 
 post-install-DEBUG-on:
 	${LN} -sf libpt_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libpt_d.so.${PVERSION_MAJOR}
 	${LN} -sf libpt_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libpt_d.so.${PVERSION_MINOR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/ptlib/pkg-plist b/devel/ptlib/pkg-plist
index 3f66a2d9eedd..8a9dc8aa7260 100644
--- a/devel/ptlib/pkg-plist
+++ b/devel/ptlib/pkg-plist
@@ -1,185 +1,184 @@
 bin/ptlib-config
 include/ptbuildopts.h
 include/ptclib/asnber.h
 include/ptclib/asner.h
 include/ptclib/asnper.h
 include/ptclib/asnxer.h
 include/ptclib/cli.h
 include/ptclib/cypher.h
 include/ptclib/delaychan.h
 include/ptclib/dtmf.h
 include/ptclib/enum.h
 include/ptclib/ftp.h
 include/ptclib/guid.h
 include/ptclib/html.h
 include/ptclib/http.h
 include/ptclib/httpform.h
 include/ptclib/httpsvc.h
 include/ptclib/inetmail.h
 include/ptclib/inetprot.h
 include/ptclib/ipacl.h
 include/ptclib/lua.h
 include/ptclib/memfile.h
 include/ptclib/mime.h
 include/ptclib/modem.h
 include/ptclib/paec.h
 include/ptclib/pasn.h
 include/ptclib/pdns.h
 include/ptclib/pffvdev.h
 include/ptclib/pils.h
 include/ptclib/pldap.h
 include/ptclib/pnat.h
 include/ptclib/podbc.h
 include/ptclib/psasl.h
 include/ptclib/psnmp.h
 include/ptclib/psoap.h
 include/ptclib/psockbun.h
 include/ptclib/pssl.h
 include/ptclib/pstun.h
 include/ptclib/ptts.h
 include/ptclib/pvfiledev.h
 include/ptclib/pvidfile.h
 include/ptclib/pwavfile.h
 include/ptclib/pwavfiledev.h
 include/ptclib/pxml.h
 include/ptclib/pxmlrpc.h
 include/ptclib/pxmlrpcs.h
 include/ptclib/qchannel.h
 include/ptclib/random.h
 include/ptclib/rfc1155.h
 include/ptclib/shttpsvc.h
 include/ptclib/snmp.h
 include/ptclib/socks.h
 include/ptclib/telnet.h
 include/ptclib/threadpool.h
 include/ptclib/url.h
 include/ptclib/vcard.h
 include/ptclib/vsdl.h
 include/ptclib/vxml.h
 include/ptclib/xmpp.h
 include/ptclib/xmpp_c2s.h
 include/ptclib/xmpp_muc.h
 include/ptclib/xmpp_roster.h
 include/ptlib.h
 include/ptlib/MacMainIf.h
 include/ptlib/args.h
 include/ptlib/array.h
 include/ptlib/channel.h
 include/ptlib/conchan.h
 include/ptlib/config.h
 include/ptlib/contain.h
 include/ptlib/contain.inl
 include/ptlib/critsec.h
 include/ptlib/dict.h
 include/ptlib/dynalink.h
 include/ptlib/ethsock.h
 include/ptlib/file.h
 include/ptlib/filepath.h
 include/ptlib/icmpsock.h
 include/ptlib/indchan.h
 include/ptlib/int64.h
 include/ptlib/ipdsock.h
 include/ptlib/ipsock.h
 include/ptlib/lists.h
 include/ptlib/mail.h
 include/ptlib/mutex.h
 include/ptlib/notifier.h
 include/ptlib/notifier_ext.h
 include/ptlib/object.h
 include/ptlib/osutil.inl
 include/ptlib/pdirect.h
 include/ptlib/pfactory.h
 include/ptlib/pipechan.h
 include/ptlib/plugin.h
 include/ptlib/pluginmgr.h
 include/ptlib/pprocess.h
 include/ptlib/psharedptr.h
 include/ptlib/pstring.h
 include/ptlib/psync.h
 include/ptlib/ptime.h
 include/ptlib/qos.h
 include/ptlib/remconn.h
 include/ptlib/safecoll.h
 include/ptlib/semaphor.h
 include/ptlib/serchan.h
 include/ptlib/sfile.h
 include/ptlib/smartptr.h
 include/ptlib/socket.h
 include/ptlib/sockets.h
 include/ptlib/sound.h
 include/ptlib/svcproc.h
 include/ptlib/syncpoint.h
 include/ptlib/syncthrd.h
 include/ptlib/syslog.h
 include/ptlib/tcpsock.h
 include/ptlib/textfile.h
 include/ptlib/thread.h
 include/ptlib/timeint.h
 include/ptlib/timer.h
 include/ptlib/udpsock.h
 include/ptlib/unix/ptlib/beaudio.h
 include/ptlib/unix/ptlib/bevideo.h
 include/ptlib/unix/ptlib/channel.h
 include/ptlib/unix/ptlib/conchan.h
 include/ptlib/unix/ptlib/config.h
 include/ptlib/unix/ptlib/contain.h
 include/ptlib/unix/ptlib/critsec.h
 include/ptlib/unix/ptlib/dynalink.h
 include/ptlib/unix/ptlib/ethsock.h
 include/ptlib/unix/ptlib/file.h
 include/ptlib/unix/ptlib/filepath.h
 include/ptlib/unix/ptlib/icmpsock.h
 include/ptlib/unix/ptlib/ipdsock.h
 include/ptlib/unix/ptlib/ipsock.h
 include/ptlib/unix/ptlib/maccoreaudio.h
 include/ptlib/unix/ptlib/mail.h
 include/ptlib/unix/ptlib/mutex.h
 include/ptlib/unix/ptlib/pdirect.h
 include/ptlib/unix/ptlib/pipechan.h
 include/ptlib/unix/ptlib/pmachdep.h
 include/ptlib/unix/ptlib/pprocess.h
 include/ptlib/unix/ptlib/ptime.h
 include/ptlib/unix/ptlib/ptlib.inl
 include/ptlib/unix/ptlib/remconn.h
 include/ptlib/unix/ptlib/resampler.h
 include/ptlib/unix/ptlib/semaphor.h
 include/ptlib/unix/ptlib/serchan.h
 include/ptlib/unix/ptlib/sfile.h
 include/ptlib/unix/ptlib/shmvideo.h
 include/ptlib/unix/ptlib/socket.h
 include/ptlib/unix/ptlib/sound.h
 include/ptlib/unix/ptlib/svcproc.h
 include/ptlib/unix/ptlib/syncpoint.h
 include/ptlib/unix/ptlib/tcpsock.h
 include/ptlib/unix/ptlib/textfile.h
 include/ptlib/unix/ptlib/thread.h
 include/ptlib/unix/ptlib/timeint.h
 include/ptlib/unix/ptlib/timer.h
 include/ptlib/unix/ptlib/udpsock.h
 include/ptlib/unix/ptlib/video.h
 include/ptlib/vconvert.h
 include/ptlib/video.h
 include/ptlib/videoio.h
 include/ptlib/videoio1394dc.h
 include/ptlib/wxstring.h
 lib/libpt.so
 lib/libpt.so.%%PVERSION_MINOR%%
 lib/libpt.so.%%PVERSION_MAJOR%%
 lib/libpt.so.%%PORTVERSION%%
 %%DEBUG%%lib/libpt_d.so
 %%DEBUG%%lib/libpt_d.so.%%PVERSION_MINOR%%
 %%DEBUG%%lib/libpt_d.so.%%PVERSION_MAJOR%%
 %%DEBUG%%lib/libpt_d.so.%%PORTVERSION%%
 lib/ptlib-%%PORTVERSION%%/devices/sound/oss_pwplugin.so
 %%PULSEAUDIO%%lib/ptlib-%%PORTVERSION%%/devices/sound/pulse_pwplugin.so
-%%BSDVIDEO%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/bsdvideo_pwplugin.so
 %%V4L%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/v4l_pwplugin.so
 %%V4L%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/v4l2_pwplugin.so
 libdata/pkgconfig/ptlib.pc
 share/ptlib/make/common.mak
 share/ptlib/make/lib.mak
 share/ptlib/make/plugins.mak
 share/ptlib/make/ptbuildopts.mak
 share/ptlib/make/ptlib-config
 share/ptlib/make/ptlib.mak
 share/ptlib/make/unix.mak