diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 15aca8be4a8e..cf2fe139048a 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704536551
-SHA256 (mplayer-1.5.0.20240106.tar.xz) = c72f8c2e2a8829e49cadca8ed3f2454b70afd39b155bed734df603498b4ed5e5
-SIZE (mplayer-1.5.0.20240106.tar.xz) = 5191136
+TIMESTAMP = 1727620062
+SHA256 (mplayer-1.5.0.20240928.tar.xz) = b1fbf48ff04ab66a3e89f62a9f47b0fd25a328878cced767183a12c137cb9bcc
+SIZE (mplayer-1.5.0.20240928.tar.xz) = 5218072
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 9e740b4f05b0..737ad94c1077 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,98 +1,98 @@
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	High performance media player supporting many formats
 WWW=		http://www.mplayerhq.hu/
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common"
 
 OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
 		JPEG LADSPA LIBMNG LIRC LZO NAS NLS OPENAL OPENGL \
 		OPENJPEG OPUS PULSEAUDIO \
 		SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \
-		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
+		X11 X11DGA X11VM XINERAMA XVIDEO
 
 OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \
 		SKINS X11 X11DGA X11VM XINERAMA XVIDEO
 
 OPTIONS_DEFINE_i386=	RTCPU
 OPTIONS_DEFINE_amd64=	RTCPU
 OPTIONS_DEFINE_powerpc=	RTCPU
 
 OPTIONS_DEFAULT_i386=	RTCPU VDPAU
 OPTIONS_DEFAULT_amd64=	RTCPU VDPAU
 OPTIONS_DEFAULT_powerpc=RTCPU
 
 ASS_DESC?=	Subtitles rendering via libass
 BLURAY_DESC?=	BluRay support
 DVDNAV_DESC?=	DVD navigation features support
 ENCA_DESC?=	Charset conversion via enca
 LZO_DESC?=	External liblzo support
 RTCPU_DESC?=	Use runtime CPU detection
 SKINS_DESC?=	Install skins for GUI
 X11DGA_DESC?=	X11 DGA video driver support
 X11VM_DESC?=	X11 VidMode support
 
 SUB_FILES=	pkg-message
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
 USES+=		iconv pkgconfig
 
 OPTIONS_SUB=	yes
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-arts \
 			--disable-directfb \
 			--disable-faac \
 			--disable-libdca \
 			--disable-toolame \
 			--disable-twolame \
 			--disable-x264 \
 			--disable-xvid \
 			--disable-mencoder \
 			--disable-mpg123 \
 			--disable-musepack \
 			--disable-theora \
 			--disable-librtmp
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.options"
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${ECHO_MSG} "If you want to use the GUI, you can use the skins from"
 	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
 	@${ECHO_MSG} "or download them from"
 	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
 
 post-patch: common-post-patch
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc
 .for conf in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc
 .endfor
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${LN} -sf mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
 	@(cd ${STAGEDIR}${PREFIX}/share/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${CP} ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 1084afb5f4e9..556fdf51e5a1 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -1,80 +1,75 @@
 # Contains the build infrastructural definitions for both
 # mplayer and mencoder....the variables that we need to set
 # before we include bsd.port.pre.mk
 
 MPLAYER_PORT_VERSION=	1.5.0
-MPLAYER_SNAPSHOT_DATE=	2024-01-06
+MPLAYER_SNAPSHOT_DATE=	2024-09-28
 MASTER_SITES=	LOCAL/riggs/mplayer
 DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpng.so:graphics/png \
-		libavcodec.so.58:multimedia/ffmpeg4 \
+		libavcodec.so.60:multimedia/ffmpeg \
 		libfreetype.so:print/freetype2
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_i386=	as:devel/binutils
 
 USES=		compiler:c11 gmake iconv ncurses tar:xz
 NOPRECIOUSMAKEVARS=	yes # ARCH
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV+=	TMPDIR="${WRKSRC}" \
-		PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
+CONFIGURE_ENV+=	TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc="${CC}" \
 		--host-cc="${CC}" \
 		--as="${AS}" \
 		--mandir="${PREFIX}/share/man" \
 		--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
 		--extra-libs="-L${PREFIX}/lib" \
 		--disable-alsa \
 		--disable-ass-internal \
 		--disable-bitmap-font \
 		--disable-crystalhd \
 		--disable-esd \
 		--disable-faad \
 		--disable-ffmpeg_a \
 		--disable-ggi \
 		--disable-ggiwmh \
 		--disable-liba52 \
 		--disable-libbs2b \
 		--disable-libilbc \
 		--disable-libnut \
 		--disable-libvorbis \
 		--disable-live \
 		--disable-joystick \
 		--disable-mad \
 		--disable-libmpeg2 \
 		--disable-nemesi \
 		--disable-real \
 		--yasm=''
 
-MAKE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig"
-
-CFLAGS+=	-I${LOCALBASE}/ffmpeg4/include
-
 common-post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -E \
 		-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 		-e 's|[[:space:]]gcc| ${CC}|' \
 		-e 's|\$$\(CC\)|${CC}|' \
 		-e 's|/usr/X11R6|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
 		${CONFIGURE_WRKSRC}/Makefile
 	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 	@${RM} ${WRKSRC}/binary.ver
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index e9efe7dcbe94..a01297813a61 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -1,176 +1,173 @@
 # Handling of variables using helpers
 # Include before bsd.port.(pre|options).mk
 
 # OPTIONs
 AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
 AALIB_CONFIGURE_OFF=	--disable-aa
 
 AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:audio/opencore-amr
 AMR_NB_CONFIGURE_ENABLE=libopencore_amrnb
 
 AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:audio/opencore-amr
 AMR_WB_CONFIGURE_ENABLE=libopencore_amrwb
 
 ASS_LIB_DEPENDS=	libass.so:multimedia/libass \
 			libharfbuzz.so:print/harfbuzz
 ASS_CONFIGURE_OFF=	--disable-ass
 
 BLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 BLURAY_CONFIGURE_OFF=	--disable-bluray
 
 CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_OFF=	--disable-caca
 
 CDIO_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_OFF=	--disable-libcdio
 
 DV_LIB_DEPENDS=		libdv.so:multimedia/libdv
 DV_CONFIGURE_ENABLE=	libdv
 
 DVDNAV_LIB_DEPENDS=	libdvdnav.so:multimedia/libdvdnav \
 			libdvdread.so:multimedia/libdvdread
 DVDNAV_CONFIGURE_OFF=	--disable-dvdnav
 
 ENCA_LIB_DEPENDS=	libenca.so:converters/enca
 ENCA_CONFIGURE_OFF=	--disable-enca
 
 FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 FAAC_CONFIGURE_OFF=	--disable-faac
 
 FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_OFF=	--disable-fontconfig
 
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_OFF=	--disable-fribidi
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_OFF=	--disable-gif
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_OFF=	--disable-gnutls
 
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CONFIGURE_OFF=	--disable-libgsm
 
 GUI_CONFIGURE_ENABLE=	gui
 GUI_USE=		GNOME=cairo,gdkpixbuf2,gtk20
 GUI_USES=		gnome
 GUI_DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
 GUI_IMPLIES=		ASS JPEG X11
 
 IPV6_CONFIGURE_OFF=	--disable-inet6
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-jack
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_OFF=	--disable-jpeg
 
 LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
 LADSPA_CONFIGURE_OFF=	--disable-ladspa
 
 LIBMNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 LIBMNG_CONFIGURE_OFF=	--disable-mng
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_OFF=	--disable-lirc
 
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_OFF=	--disable-liblzo
 
 NAS_LIB_DEPENDS=	libaudio.so:audio/nas
 NAS_CONFIGURE_OFF=	--disable-nas
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 OPENAL_USES=		openal:soft
 OPENAL_CONFIGURE_OFF=	--disable-openal
 
 OPENGL_USE=		GL=gl
 OPENGL_USES=		gl
 OPENGL_CONFIGURE_OFF=	--disable-gl
 OPENGL_IMPLIES=		X11
 
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_OFF=	--disable-libopus
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
 RTCPU_CONFIGURE_ON=	--enable-runtime-cpudetection
 
 SDL_USE=		SDL=sdl
 SDL_USES=		sdl
 SDL_LIB_DEPENDS=	libaa.so:graphics/aalib
 SDL_CONFIGURE_OFF=	--disable-sdl
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_OFF=	--disable-sndio
 
 SKINS_RUN_DEPENDS=	mplayer-skins>=0:multimedia/mplayer-skins
 SKINS_IMPLIES=		GUI
 
 SMB_USES=		samba:lib
 SMB_CONFIGURE_ON=	--extra-ldflags="-L${SAMBALIBS}"
 SMB_CONFIGURE_OFF=	--disable-smb
 
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_OFF=	--disable-speex
 
 SVGALIB_LIB_DEPENDS=	libvga.so:graphics/svgalib
 SVGALIB_CONFIGURE_OFF=	--disable-svga
 
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora \
 			libogg.so:audio/libogg
 THEORA_CONFIGURE_OFF=	--disable-theora
 
 TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 TWOLAME_CONFIGURE_OFF=	--disable-twolame
 
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_OFF=	--disable-tv-v4l1 --disable-tv-v4l2
 V4L_CONFIGURE_ON=	--enable-tv-v4l1 --enable-tv-v4l2 --extra-libs="-lv4l1 -lv4l2"
 
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_OFF=	--disable-vdpau
 
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	libvpx-lavc
 
 X11_USES=		xorg
 X11_USE=		XORG=x11,xext,xorgproto,xscrnsaver
 X11_CONFIGURE_OFF=	--disable-x11
 
 X11DGA_USES=		xorg
 X11DGA_USE=		XORG=xxf86dga
 X11DGA_CONFIGURE_OFF=	--disable-dga1 --disable-dga2
 X11DGA_IMPLIES=		X11
 
 X11VM_USES=		xorg
 X11VM_USE=		XORG=xxf86vm
 X11VM_CONFIGURE_OFF=	--disable-vm
 X11VM_IMPLIES=		X11
 
 X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_OFF=	--disable-x264
 
 XINERAMA_USES=		xorg
 XINERAMA_USE=		XORG=xinerama,xorgproto
 XINERAMA_CONFIGURE_OFF=	--disable-xinerama
 XINERAMA_IMPLIES=	X11
 
 XVID_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_OFF=	--disable-xvid
 
 XVIDEO_USE=		XORG=xv
 XVIDEO_CONFIGURE_OFF=	--disable-xv
 XVIDEO_IMPLIES=		X11
 
-XVMC_USE=		XORG=xvmc
-XVMC_CONFIGURE_ON=	--enable-xvmc --with-xvmclib=XvMCW
-XVMC_IMPLIES=		X11
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 59fa23035457..18b4b07e90f0 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704534638
-SHA256 (mplayer-1.5.0.20240106.tar.xz) = c72f8c2e2a8829e49cadca8ed3f2454b70afd39b155bed734df603498b4ed5e5
-SIZE (mplayer-1.5.0.20240106.tar.xz) = 5191136
+TIMESTAMP = 1727559180
+SHA256 (mplayer-1.5.0.20240928.tar.xz) = b1fbf48ff04ab66a3e89f62a9f47b0fd25a328878cced767183a12c137cb9bcc
+SIZE (mplayer-1.5.0.20240928.tar.xz) = 5218072
diff --git a/multimedia/mplayer/files/patch-Makefile b/multimedia/mplayer/files/patch-Makefile
index 0321c42a4b80..2df5c391d3f2 100644
--- a/multimedia/mplayer/files/patch-Makefile
+++ b/multimedia/mplayer/files/patch-Makefile
@@ -1,45 +1,45 @@
---- Makefile.orig	2021-05-01 17:45:31 UTC
+--- Makefile.orig	2024-04-28 19:35:10 UTC
 +++ Makefile
-@@ -753,7 +753,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+@@ -752,7 +752,7 @@ codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html
  codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
  codec-cfg$(EXESUF) codecs2html$(EXESUF):  HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
  codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
 -	$(HOST_CC) $(HOSTCFLAGS) -o $@ $<
-+	$(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/ffmpeg4/include -o $@ $<
++	$(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/include -o $@ $<
  
  codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
  	./$^ > $@
-@@ -867,19 +867,16 @@ install: $(INSTALL_TARGETS-yes)
+@@ -866,19 +866,16 @@ install-dirs:
  install-dirs:
  	$(INSTALL) -d $(BINDIR) $(CONFDIR) $(LIBDIR)
  
 -install-%: %$(EXESUF) install-dirs
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
 +install-mplayer: mplayer$(EXESUF)
 +	@${BSD_INSTALL_PROGRAM} mplayer$(EXESUF) $(BINDIR)
  
 -install-gui: install-mplayer install-gui-icons install-gui-msg
 -	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
 -	$(INSTALL) -d $(DATADIR)/skins $(prefix)/share/applications
 -	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
 +install-gui: install-mplayer
  
  install-gui-icons:    $(foreach size,$(GUI_ICONSIZES),install-gui-icon-$(size))
  install-gui-man:      $(foreach lang,$(MAN_LANGS),install-gui-man-$(lang))
  install-gui-msg:      $(foreach lang,$(filter-out $(firstword $(MSG_LANGS)),$(MSG_LANGS)),install-gui-msg-$(lang))
  install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
 -install-mplayer-man:  $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
 +install-mplayer-man: install-mplayer-man-en
  
  install-gui-man-en: install-mplayer-man-en
  	cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
-@@ -888,8 +885,7 @@ install-mencoder-man-en: install-mplayer-man-en
+@@ -887,8 +884,7 @@ install-mplayer-man-en:
  	cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
  
  install-mplayer-man-en:
 -	$(INSTALL) -d $(MANDIR)/man1
 -	$(INSTALL) -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/
 +	@${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1
  
  define GUI_ICON_RULE
  install-gui-icon-$(size):
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index b84374f958d5..7dd394ab72c7 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,240 +1,230 @@
---- configure.orig	2024-05-16 21:54:48 UTC
+--- configure.orig	2024-09-21 09:30:02 UTC
 +++ configure
-@@ -666,7 +666,7 @@ _altivec=auto
+@@ -664,7 +664,7 @@ _altivec=auto
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
 -_install=install
 +_install=@${BSD_INSTALL_PROGRAM}
  _ranlib=ranlib
  _windres=windres
  _cc=cc
-@@ -1019,7 +1019,7 @@ for ac_option do
+@@ -1012,7 +1012,7 @@ for ac_option do
      ld_static=''
      ;;
    --enable-profile)
 -    _profile='-p'
 +    _profile='-pg'
      ;;
    --disable-profile)
      _profile=
-@@ -1491,7 +1491,6 @@ for ac_option do
+@@ -1482,7 +1482,6 @@ for ac_option do
  
    *)
      echo "Unknown parameter: $ac_option"
 -    exit 1
      ;;
  
    esac
-@@ -1529,40 +1528,6 @@ echo >> "$TMPLOG"
+@@ -1520,40 +1519,6 @@ echo >> "$TMPLOG"
  echo configuration: $configuration > "$TMPLOG"
  echo >> "$TMPLOG"
  
 -
 -# local FFmpeg checkout handling
 -if test -e ffmpeg/.svn ; then
 -    echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
 -    exit 1
 -fi
 -
 -FFBRANCH=master
 -test -e FFBRANCH && FFBRANCH=$(cat FFBRANCH)
 -
 -if test -e ffmpeg/mp_auto_pull ; then
 -    echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
 -    (cd ffmpeg && git checkout $FFBRANCH)
 -    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
 -        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
 -        exit 1
 -    fi
 -fi
 -
 -if test "$ffmpeg_a" != "no" && ! test -e ffmpeg ; then
 -    echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort"
 -    read tmp
 -    if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
 -        rm -rf ffmpeg
 -        echo "Failed to get a FFmpeg checkout"
 -        echo "Please try again or put FFmpeg source code copy into ffmpeg/ manually."
 -        echo "Nightly snapshot: http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2"
 -        echo "To use a github mirror via http (e.g. because a firewall blocks git):"
 -        echo "git clone --depth 1 https://github.com/FFmpeg/FFmpeg ffmpeg; touch ffmpeg/mp_auto_pull"
 -        exit 1
 -    fi
 -    touch ffmpeg/mp_auto_pull
 -fi
 -
  list_subparts() {
    test ! -e ffmpeg/libav${3} && return 1
    pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -1844,7 +1809,7 @@ if test -z "$_target" ; then
+@@ -1843,7 +1808,7 @@ if test -z "$_target" ; then
    case "$1" in
        x86_64|amd64|x64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
        ia64) host_arch=ia64 ;;
 -      macppc|ppc*|Power*) host_arch=ppc ;;
 +      macppc|powerpc|ppc*|Power*) host_arch=ppc ;;
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -1970,7 +1935,11 @@ echo "yes"
+@@ -1965,7 +1930,11 @@ echo "yes"
  cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
  echo "yes"
  
 -cflag_check "-lm" && libm="-lm"
 +if test -z "$_profile" ; then
 +  cflag_check "-lm" && libm="-lm"
 +else
 +  cflag_check "-lm_p" && libm="-lm_p"
 +fi
  
  if test -z "$_target" ; then
    cat > $TMPC << EOF
-@@ -3109,7 +3078,7 @@ if x86_32 ; then
+@@ -3104,7 +3073,7 @@ if x86_32 ; then
      _pref_as_version='2.16.92'
      echo 'pabsd %xmm0, %xmm1' >> $TMPS
    fi
 -  $_as -c $TMPS -o $TMPEXE > /dev/null 2>&1 || as_verc_fail=yes
 +  $_as $TMPS -o $TMPEXE > /dev/null 2>&1 || as_verc_fail=yes
  
    if test "$as_verc_fail" != yes ; then
      echores "ok"
-@@ -3269,8 +3238,8 @@ if ppc && ( test "$_altivec" = yes || test "$_runtime_
+@@ -3264,8 +3233,8 @@ if ppc && ( test "$_altivec" = yes || test "$_runtime_
  
      # check if AltiVec is supported by the compiler, and how to enable it
      echocheck "GCC AltiVec flags"
 -    if $(cflag_check -maltivec -mabi=altivec) ; then
 -    _altivec_gcc_flags="-maltivec -mabi=altivec"
 +    if $(cflag_check -maltivec) ; then
 +    _altivec_gcc_flags="-maltivec"
      # check if <altivec.h> should be included
          if $(header_check altivec.h $_altivec_gcc_flags) ; then
              def_altivec_h='#define HAVE_ALTIVEC_H 1'
-@@ -3376,6 +3345,13 @@ if arm ; then
+@@ -3371,6 +3340,13 @@ if arm ; then
    fi
    echores "$setend"
  
 +  echocheck "ARM setend"
 +  if test $setend = "auto" ; then
 +    setend=no
 +    inline_asm_check '"setend be"' && setend=yes
 +  fi
 +  echores "$setend"
 +
    echocheck "softfloat ABI"
    softfloat=yes
    cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
-@@ -4286,7 +4262,7 @@ elif freebsd || netbsd || openbsd || bsdos ; then
+@@ -4281,7 +4257,7 @@ elif freebsd || netbsd || openbsd || bsdos ; then
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
 -  THREAD_CFLAGS=-D_THREAD_SAFE
 +  THREAD_CFLAGS=
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -4296,7 +4272,7 @@ if ! hpux ; then
+@@ -4291,7 +4267,7 @@ if ! hpux ; then
  EOF
  _pthreads=no
  if ! hpux ; then
 -  for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
 +  for ld_tmp in "-lpthread" "-pthread" ; do
      # for crosscompilation, we cannot execute the program, be happy if we can link statically
      cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
    done
-@@ -4430,7 +4406,7 @@ int main(void) {
+@@ -4434,7 +4410,7 @@ EOF
  }
  EOF
    _iconv=no
 -  for ld_tmp in "" "-liconv" "-liconv $ld_dl" ; do
 +  for ld_tmp in "" "-L$_prefix/lib -liconv" "-L%%LOCALBASE%%/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
      cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
        ld_iconv="$ld_tmp" && _iconv=yes && break
    done
-@@ -4460,7 +4436,8 @@ if test "$_termcap" = auto ; then
-   _termcap=no
-   for ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do
-     statement_check term.h 'tgetent(0, 0)' $ld_tmp &&
--      extra_ldflags="$extra_ldflags $ld_tmp" &&
-+      # Nudge the linker into finding ffmpeg4 symbols first
-+      extra_ldflags="-L%%LOCALBASE%%/ffmpeg4/lib $extra_ldflags $ld_tmp" &&
-       ld_termcap="$ld_tmp" && _termcap=yes && break
-   done
- fi
-@@ -5876,15 +5853,6 @@ EOF
+@@ -5848,15 +5824,6 @@ EOF
        break
      fi
    done
 -  if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then
 -    _gl=yes
 -    _gl_egl_x11=yes
 -    libs_mplayer="$libs_mplayer -lEGL $ld_dl"
 -  elif cc_check -DGL_EGL_ANDROID -lEGL ; then
 -    _gl=yes
 -    _gl_egl_android=yes
 -    libs_mplayer="$libs_mplayer -lEGL $ld_dl"
 -  fi
    if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
      _gl=yes
      _gl_win32=yes
-@@ -6419,7 +6387,7 @@ elif darwin ; then
+@@ -6391,7 +6358,7 @@ elif freebsd ; then
  elif dragonfly ; then
    default_cdrom_device="/dev/cd0"
  elif freebsd ; then
 -  default_cdrom_device="/dev/acd0"
 +  default_cdrom_device="/dev/cdrom"
  elif openbsd ; then
    default_cdrom_device="/dev/rcd0c"
  elif sunos ; then
-@@ -6432,7 +6400,7 @@ else
+@@ -6404,7 +6371,7 @@ fi
    default_cdrom_device="/dev/cdrom"
  fi
  
 -if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
 +if win32 || os2 || dragonfly || openbsd || sunos || amigaos ; then
    default_dvd_device=$default_cdrom_device
  elif darwin ; then
    default_dvd_device="/dev/rdiskN"
-@@ -6959,7 +6927,7 @@ echores "$_speex"
+@@ -6931,7 +6898,7 @@ if test "$_libgsm" = auto ; then
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
 -  statement_check gsm/gsm.h 'gsm_create()' -lgsm && _libgsm=yes
 +  statement_check gsm.h 'gsm_create()' -lgsm && _libgsm=yes
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -7399,6 +7367,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
+@@ -7363,6 +7330,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
 +
 +  if $_pkg_config --exists librtmp; then
 +	_inc_tmp=$($_pkg_config --cflags librtmp)
 +	_ld_tmp=$($_pkg_config --libs librtmp)
 +  else
 +	_inc_tmp="-I${LOCALBASE}/include"
 +	_ld_tmp="-L${LOCALBASE}/lib -lrtmp -lz -lssl -lcrypto"
 +  fi
 +  extra_ldflags="$extra_ldflags $_ld_tmp"
 +  extra_cflags="$extra_cflags $_inc_tmp"
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7816,7 +7794,7 @@ if test "$_mencoder" = no ; then
+@@ -7780,7 +7757,7 @@ if test "$_mencoder" = no ; then
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
 -  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
 +  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
  fi
  echores "$_mencoder"
  
-@@ -8422,7 +8400,7 @@ libs_mplayer=$ld_tmp
+@@ -8384,7 +8361,7 @@ libs_mplayer=$ld_tmp
  
  #############################################################################
  
 -CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
 +CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
  
  CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=c++98"
  
diff --git a/multimedia/mplayer/files/patch-libmpcodecs_vd__ffmpeg.c b/multimedia/mplayer/files/patch-libmpcodecs_vd__ffmpeg.c
deleted file mode 100644
index 53df2ba61794..000000000000
--- a/multimedia/mplayer/files/patch-libmpcodecs_vd__ffmpeg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpcodecs/vd_ffmpeg.c.orig	2022-08-07 18:20:47 UTC
-+++ libmpcodecs/vd_ffmpeg.c
-@@ -739,7 +739,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *
-     if (ctx->use_vdpau) {
-         VdpVideoSurface surface = (VdpVideoSurface)mpi->priv;
-         avctx->draw_horiz_band= NULL;
--        mpi->planes[3] = surface;
-+        mpi->planes[3] = (unsigned char*)surface;
-     }
- #endif
- #if CONFIG_XVMC