diff --git a/emulators/mupen64plus-audio-sdl/Makefile b/emulators/mupen64plus-audio-sdl/Makefile
index f67537110ecf0..7a988a4c89354 100644
--- a/emulators/mupen64plus-audio-sdl/Makefile
+++ b/emulators/mupen64plus-audio-sdl/Makefile
@@ -3,10 +3,18 @@ PKGNAMESUFFIX=	-audio-sdl
 
 COMMENT=	Mupen64plus audio sdl plugin
 
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
+
+GH_TAGNAME=     cec70e42b4535ce5bd1be24e7d816c54b3e75673
+
 USE_SDL=	sdl2
 
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
+RELEASE_DATE=	20230611
+
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-audio-sdl/distinfo b/emulators/mupen64plus-audio-sdl/distinfo
new file mode 100644
index 0000000000000..4bd37a2b24b21
--- /dev/null
+++ b/emulators/mupen64plus-audio-sdl/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1704508930
+SHA256 (mupen64plus/mupen64plus-mupen64plus-audio-sdl-2.5.9.20230611-cec70e42b4535ce5bd1be24e7d816c54b3e75673_GH0.tar.gz) = 38361dcfd10e99ecc2ce99e4e33b1e27b686686d22723cee9ae727d1881438f8
+SIZE (mupen64plus/mupen64plus-mupen64plus-audio-sdl-2.5.9.20230611-cec70e42b4535ce5bd1be24e7d816c54b3e75673_GH0.tar.gz) = 32156
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index 66dd45f841b72..342a7c33b2300 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -1,10 +1,7 @@
 PORTNAME=	mupen64plus
-PORTVERSION?=	2.5
-PORTREVISION?=	2
+PORTVERSION?=	2.5.9.${RELEASE_DATE}
+PORTREVISION?=	0
 CATEGORIES=	emulators
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/releases/download/${PORTVERSION}/ \
-		LOCAL/acm/${PORTNAME} \
-		LOCAL/acm/${PORTNAME}/:plugin
 PKGNAMESUFFIX?=	-core
 DIST_SUBDIR=	${PORTNAME}
 
@@ -12,13 +9,19 @@ MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	Fork of Mupen64 Nintendo 64 emulator
 WWW=		https://www.mupen64plus.org/
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	${PORTNAME}
+GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
+GH_TAGNAME?=	f500eb58f76e636e231c3cc2b3d904210f0677c9
+
 USES+=		gl gmake pkgconfig sdl
-USE_GL?=	yes
+USE_GL?=	glu
 USE_SDL?=	sdl2
 USE_LDCONFIG?=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 LDFLAGS_i386=	-Wl,-znotext
 
+RELEASE_DATE?=	20231104
 OPTFLAGS=	#
 
 MAKE_ENV+=	OPTFLAGS="${OPTFLAGS}"
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index 2774ec31d6e33..6480dde90fbdb 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -1,15 +1,13 @@
 USES+=			dos2unix
 DOS2UNIX_GLOB=		*.c *.cpp *.h *.H *.ini *.conf
 
-DISTNAME=		${PORTNAME}-bundle-src-${PORTVERSION}
 PATCHDIR=		${.CURDIR}/files
-BUILD_WRKSRC?=		${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
-WRKSRC?=		${WRKDIR}/${DISTNAME}
-
-EXTRACT_AFTER_ARGS?=	"${DISTNAME}/source/${PORTNAME}-core/*" \
-				"${DISTNAME}/source/${PORTNAME}${PKGNAMESUFFIX}/*"
+BUILD_WRKSRC?=		${WRKSRC}/projects/unix
 
 .if ${PKGNAMESUFFIX} == "-core"
+BUILD_DEPENDS=		bash:shells/bash \
+			nasm:devel/nasm \
+			vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS+=		libfreetype.so:print/freetype2 \
 			libpng.so:graphics/png
 USES+=			minizip
@@ -31,14 +29,14 @@ post-patch:
 	@cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \
 		's|g++|${CXX}|g' -e 's|sdl-config|${SDL2_CONFIG}|g' Makefile
 .	if ${PKGNAMESUFFIX} == "-video-glide64mk2"
-		@cd ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src && \
+		@cd ${WRKSRC}/src && \
 			${REINPLACE_CMD} -e 's|#include <thread>||g' \
 				GlideHQ/TxQuantize.cpp GlideHQ/TxFilter.cpp && \
 			${REINPLACE_CMD} -e 's|(FxU32)NULL|(uintptr_t)NULL|g' \
 				Glide64/Main.cpp
 .	endif
 .	if ${PKGNAMESUFFIX} == "-video-glide64"
-		@cd ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/src && \
+		@cd ${WRKSRC}/src && \
 			${REINPLACE_CMD} -e 's|__builtin_ia32_loadups|_mm_loadu_ps|g' -e \
 				's|__builtin_ia32_storeups|_mm_storeu_ps|g' \
 					3dmath.cpp && \
@@ -88,36 +86,36 @@ do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmupen64plus.so.2.0.0 \
 		${STAGEDIR}${PREFIX}/lib/libmupen64plus.so.2.0.0
 
-	${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/* \
+	${INSTALL_DATA} ${WRKSRC}/data/* \
 		${STAGEDIR}${DATADIR}
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src/api/m64p_*.h \
+	${INSTALL_DATA} ${WRKSRC}/src/api/m64p_*.h \
 		${STAGEDIR}${PREFIX}/include/${PORTNAME}
 
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/RELEASE \
+	${INSTALL_DATA} ${WRKSRC}/RELEASE \
 		${STAGEDIR}${DOCSDIR}/RELEASE
 	${LN} -sf ${PREFIX}/lib/libmupen64plus.so.2.0.0 ${STAGEDIR}${PREFIX}/lib/libmupen64plus.so.2
 .else
 .	if ${PKGNAMESUFFIX} == "-ui-console"
-		${INSTALL_MAN} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/doc/mupen64plus.6 ${STAGEDIR}${PREFIX}/man/man6/
+		${INSTALL_MAN} ${WRKSRC}/doc/mupen64plus.6 ${STAGEDIR}${PREFIX}/man/man6/
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-video-rice"
-		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/RiceVideoLinux.ini ${STAGEDIR}${DATADIR}
+		${INSTALL_DATA} ${WRKSRC}/data/RiceVideoLinux.ini ${STAGEDIR}${DATADIR}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-video-glide64"
-		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64.ini ${STAGEDIR}${DATADIR}
+		${INSTALL_DATA} ${WRKSRC}/data/Glide64.ini ${STAGEDIR}${DATADIR}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-video-glide64mk2"
-		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64mk2.ini ${STAGEDIR}${DATADIR}
+		${INSTALL_DATA} ${WRKSRC}/data/Glide64mk2.ini ${STAGEDIR}${DATADIR}
 .	endif
 
 .	if ${PKGNAMESUFFIX} == "-input-sdl"
-		${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/InputAutoCfg.ini ${STAGEDIR}${DATADIR}
+		${INSTALL_DATA} ${WRKSRC}/data/InputAutoCfg.ini ${STAGEDIR}${DATADIR}
 .	endif
 
 .	if ${PKGNAMESUFFIX} != "-ui-console"
diff --git a/emulators/mupen64plus-core/distinfo b/emulators/mupen64plus-core/distinfo
index 2b6363b93c3ac..48e1b85492c85 100644
--- a/emulators/mupen64plus-core/distinfo
+++ b/emulators/mupen64plus-core/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mupen64plus/mupen64plus-bundle-src-2.5.tar.gz) = 9c75b9d826f2d24666175f723a97369b3a6ee159b307f7cc876bbb4facdbba66
-SIZE (mupen64plus/mupen64plus-bundle-src-2.5.tar.gz) = 2178979
+TIMESTAMP = 1704506387
+SHA256 (mupen64plus/mupen64plus-mupen64plus-core-2.5.9.20231104-f500eb58f76e636e231c3cc2b3d904210f0677c9_GH0.tar.gz) = 4a5445d5f2eb97db88e294e606904728caffb208e422c8cf3d6266fab7ab1da4
+SIZE (mupen64plus/mupen64plus-mupen64plus-core-2.5.9.20231104-f500eb58f76e636e231c3cc2b3d904210f0677c9_GH0.tar.gz) = 1731162
diff --git a/emulators/mupen64plus-core/files/patch-39975200.c b/emulators/mupen64plus-core/files/patch-39975200.c
deleted file mode 100644
index 488ecc153769f..0000000000000
--- a/emulators/mupen64plus-core/files/patch-39975200.c
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/main/workqueue.h b/src/main/workqueue.h
-index d5093a533..2af257a45 100644
---- source/mupen64plus-core/src/main/workqueue.h
-+++ source/mupen64plus-core/src/main/workqueue.h
-@@ -27,7 +27,6 @@
- 
- struct work_struct;
- 
--struct work_struct *work;
- typedef void (*work_func_t)(struct work_struct *work);
- struct work_struct {
-     work_func_t func;
diff --git a/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_savestates.c b/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_savestates.c
deleted file mode 100644
index e185edfd21064..0000000000000
--- a/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_savestates.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- source/mupen64plus-core/src/main/savestates.c	2015-06-12 17:56:37.000000000 -0500
-+++ source/mupen64plus-core/src/main/savestates.c	2015-06-12 17:56:55.000000000 -0500
-@@ -57,8 +57,8 @@
- #include "workqueue.h"
- 
- #ifdef LIBMINIZIP
--    #include <unzip.h>
--    #include <zip.h>
-+    #include <minizip/unzip.h>
-+    #include <minizip/zip.h>
- #else
-     #include "main/zip/unzip.h"
-     #include "main/zip/zip.h"
diff --git a/emulators/mupen64plus-input-sdl/Makefile b/emulators/mupen64plus-input-sdl/Makefile
index eabc572c97998..9b2c0633d54d3 100644
--- a/emulators/mupen64plus-input-sdl/Makefile
+++ b/emulators/mupen64plus-input-sdl/Makefile
@@ -3,6 +3,14 @@ PKGNAMESUFFIX=	-input-sdl
 
 COMMENT=	Input plugin for Mupen64plus
 
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
+
+GH_TAGNAME=	fd7ffe63606b6cc4de7dab4e684c5aee68210681
+
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
+RELEASE_DATE=	20231104
+
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-input-sdl/distinfo b/emulators/mupen64plus-input-sdl/distinfo
new file mode 100644
index 0000000000000..9e1e339cae763
--- /dev/null
+++ b/emulators/mupen64plus-input-sdl/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1704509047
+SHA256 (mupen64plus/mupen64plus-mupen64plus-input-sdl-2.5.9.20231104-fd7ffe63606b6cc4de7dab4e684c5aee68210681_GH0.tar.gz) = f5cd57bd7262c037d5b27d07f0fea348db4d4426c607d2942d5933982aa27fdb
+SIZE (mupen64plus/mupen64plus-mupen64plus-input-sdl-2.5.9.20231104-fd7ffe63606b6cc4de7dab4e684c5aee68210681_GH0.tar.gz) = 60676
diff --git a/emulators/mupen64plus-plugins/Makefile b/emulators/mupen64plus-plugins/Makefile
index 189da803f6009..d042114c24576 100644
--- a/emulators/mupen64plus-plugins/Makefile
+++ b/emulators/mupen64plus-plugins/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	mupen64plus
-PORTVERSION=	2.5
+PORTVERSION=	2.5.9
 PORTREVISION=	0
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-plugins
 
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT=	Third party plugins for Mupen64plus
-WWW=		https://code.google.com/p/mupen64plus/
+WWW=		https://github.com/mupen64plus
 
 USES=		metaport
 
diff --git a/emulators/mupen64plus-rsp-cxd4/Makefile b/emulators/mupen64plus-rsp-cxd4/Makefile
index 0917616d19871..a9c356c11b404 100644
--- a/emulators/mupen64plus-rsp-cxd4/Makefile
+++ b/emulators/mupen64plus-rsp-cxd4/Makefile
@@ -1,6 +1,5 @@
-PORTREVISION=	6
+PORTREVISION=	0
 PKGNAMESUFFIX=	-rsp-cxd4
-DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Low-level RSP processor plugin for the Mupen64Plus
 
@@ -9,6 +8,8 @@ LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 USE_GL=		#
 USE_SDL=	#
 
+GH_TAGNAME=	0a4e30f56033396e3ba47ec0fdd7acea3522362a
+
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
@@ -19,8 +20,7 @@ CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DISTINFO_FILE=		${.CURDIR}/distinfo
-EXTRACT_AFTER_ARGS=	#
-BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
-WRKSRC=			${WRKDIR}
+
+RELEASE_DATE=	20230611
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-rsp-cxd4/distinfo b/emulators/mupen64plus-rsp-cxd4/distinfo
index b59cf69be75ef..d76ad26237a0a 100644
--- a/emulators/mupen64plus-rsp-cxd4/distinfo
+++ b/emulators/mupen64plus-rsp-cxd4/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mupen64plus/mupen64plus-rsp-cxd4-src-2.5.tar.gz) = 978d3b3d752020ce2d4ad663f6712345764d4987861db16076dc5ca396ee5881
-SIZE (mupen64plus/mupen64plus-rsp-cxd4-src-2.5.tar.gz) = 56387
+TIMESTAMP = 1704509220
+SHA256 (mupen64plus/mupen64plus-mupen64plus-rsp-cxd4-2.5.9.20230611-0a4e30f56033396e3ba47ec0fdd7acea3522362a_GH0.tar.gz) = eac7675e9f80cf2fa6bae3b71bac5df578d4f8441a03f186f7d398316d30560e
+SIZE (mupen64plus/mupen64plus-mupen64plus-rsp-cxd4-2.5.9.20230611-0a4e30f56033396e3ba47ec0fdd7acea3522362a_GH0.tar.gz) = 74554
diff --git a/emulators/mupen64plus-rsp-hle/Makefile b/emulators/mupen64plus-rsp-hle/Makefile
index 0d0484bc7a43a..47228d12784fd 100644
--- a/emulators/mupen64plus-rsp-hle/Makefile
+++ b/emulators/mupen64plus-rsp-hle/Makefile
@@ -2,8 +2,16 @@ PKGNAMESUFFIX=	-rsp-hle
 
 COMMENT=	RSP plugin for Mupen64plus
 
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
+
+GH_TAGNAME=	f22dc143771f1a0784c7d62977722a68fa0bdf85
+
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
+RELEASE_DATE=	20230611
+
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-rsp-hle/distinfo b/emulators/mupen64plus-rsp-hle/distinfo
new file mode 100644
index 0000000000000..24371276e4ac8
--- /dev/null
+++ b/emulators/mupen64plus-rsp-hle/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1704509321
+SHA256 (mupen64plus/mupen64plus-mupen64plus-rsp-hle-2.5.9.20230611-f22dc143771f1a0784c7d62977722a68fa0bdf85_GH0.tar.gz) = c48b8e464cb2209598f629b9973011738808d559b827eb6b4b332770f2b95a6d
+SIZE (mupen64plus/mupen64plus-mupen64plus-rsp-hle-2.5.9.20230611-f22dc143771f1a0784c7d62977722a68fa0bdf85_GH0.tar.gz) = 59825
diff --git a/emulators/mupen64plus-rsp-z64/Makefile b/emulators/mupen64plus-rsp-z64/Makefile
index 9fbb40d451275..7fbfabcb1ec75 100644
--- a/emulators/mupen64plus-rsp-z64/Makefile
+++ b/emulators/mupen64plus-rsp-z64/Makefile
@@ -1,11 +1,12 @@
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-rsp-z64
-DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Low-level RSP processor plugin for the Mupen64Plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
+GH_TAGNAME=	ad877e263e6ee78839cbd12cdd150d17177079cf
+
 USE_GL=		#
 USE_SDL=	#
 
@@ -17,8 +18,6 @@ CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DISTINFO_FILE=		${.CURDIR}/distinfo
-EXTRACT_AFTER_ARGS=	#
-BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
-WRKSRC=			${WRKDIR}
+RELEASE_DATE=	20230611
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-rsp-z64/distinfo b/emulators/mupen64plus-rsp-z64/distinfo
index c860132f24fc0..ed1ffa6d03e47 100644
--- a/emulators/mupen64plus-rsp-z64/distinfo
+++ b/emulators/mupen64plus-rsp-z64/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mupen64plus/mupen64plus-rsp-z64-src-2.5.tar.gz) = e671c63556160f00554b608ab5f24cd7a1c15eef4c4de4c94c8bde4d2baa5763
-SIZE (mupen64plus/mupen64plus-rsp-z64-src-2.5.tar.gz) = 45594
+TIMESTAMP = 1704509416
+SHA256 (mupen64plus/mupen64plus-mupen64plus-rsp-z64-2.5.9.20230611-ad877e263e6ee78839cbd12cdd150d17177079cf_GH0.tar.gz) = 71a8d787f266760c4f109c38e83bd42fd086bf3b28854cba014aca0e4c9cb7c1
+SIZE (mupen64plus/mupen64plus-mupen64plus-rsp-z64-2.5.9.20230611-ad877e263e6ee78839cbd12cdd150d17177079cf_GH0.tar.gz) = 47727
diff --git a/emulators/mupen64plus-ui-console/Makefile b/emulators/mupen64plus-ui-console/Makefile
index eb48f94cc4000..062041379ecda 100644
--- a/emulators/mupen64plus-ui-console/Makefile
+++ b/emulators/mupen64plus-ui-console/Makefile
@@ -3,8 +3,16 @@ PKGNAMESUFFIX=	-ui-console
 
 COMMENT=	UI for Mupen64plus
 
+LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
+
+GH_TAGNAME=	335e826aead146bd6a47d557d78b746e77f337c8
+
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
+RELEASE_DATE=	20230611
+
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-ui-console/distinfo b/emulators/mupen64plus-ui-console/distinfo
new file mode 100644
index 0000000000000..6bd579571acb3
--- /dev/null
+++ b/emulators/mupen64plus-ui-console/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1704508976
+SHA256 (mupen64plus/mupen64plus-mupen64plus-ui-console-2.5.9.20230611-335e826aead146bd6a47d557d78b746e77f337c8_GH0.tar.gz) = 7cfb03b9ad59d2b794adcd3af73e53af24c729cd5c6ec7ac00432f8bec97de70
+SIZE (mupen64plus/mupen64plus-mupen64plus-ui-console-2.5.9.20230611-335e826aead146bd6a47d557d78b746e77f337c8_GH0.tar.gz) = 62362
diff --git a/emulators/mupen64plus-video-arachnoid/Makefile b/emulators/mupen64plus-video-arachnoid/Makefile
index 6c87ba3c74d70..c9ddc93d9bc4a 100644
--- a/emulators/mupen64plus-video-arachnoid/Makefile
+++ b/emulators/mupen64plus-video-arachnoid/Makefile
@@ -1,11 +1,12 @@
-PORTREVISION=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	-video-arachnoid
-DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	The arachnoid video plugin for Mupen64plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
+GH_TAGNAME=	8187d1135ced0102f99d8305b52e0e75b01ef917
+
 USES+=		gl
 USE_GL=		gl glu
 USE_SDL=	#
@@ -18,8 +19,6 @@ CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DISTINFO_FILE=		${.CURDIR}/distinfo
-EXTRACT_AFTER_ARGS=	#
-BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
-WRKSRC=			${WRKDIR}
+RELEASE_DATE=	20230611
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-video-arachnoid/distinfo b/emulators/mupen64plus-video-arachnoid/distinfo
index 47a3d4db0962b..3c46b92a618a7 100644
--- a/emulators/mupen64plus-video-arachnoid/distinfo
+++ b/emulators/mupen64plus-video-arachnoid/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mupen64plus/mupen64plus-video-arachnoid-src-2.5.tar.gz) = 9c1e9c6373d4a8f503fdf3a114f45c0c81f2da31955d90fe7bc1c2464fb92852
-SIZE (mupen64plus/mupen64plus-video-arachnoid-src-2.5.tar.gz) = 128880
+TIMESTAMP = 1704509486
+SHA256 (mupen64plus/mupen64plus-mupen64plus-video-arachnoid-2.5.9.20230611-8187d1135ced0102f99d8305b52e0e75b01ef917_GH0.tar.gz) = dd7a4f1a1e10d44dc68de5ce58b607375dd5f3378ac38e856919a8c0bd7ccf20
+SIZE (mupen64plus/mupen64plus-mupen64plus-video-arachnoid-2.5.9.20230611-8187d1135ced0102f99d8305b52e0e75b01ef917_GH0.tar.gz) = 131003
diff --git a/emulators/mupen64plus-video-glide64/Makefile b/emulators/mupen64plus-video-glide64/Makefile
index 62e87098597a0..a4452da09e46f 100644
--- a/emulators/mupen64plus-video-glide64/Makefile
+++ b/emulators/mupen64plus-video-glide64/Makefile
@@ -1,11 +1,12 @@
-PORTREVISION=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	-video-glide64
-DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Glide64 video plugin for Mupen64Plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
+GH_TAGNAME=	bdf9f5ca8e381e6c1c824aa70b26ad34f4eeb132
+
 USES+=		gl localbase:ldflags sdl
 USE_CXXSTD=	c++14
 USE_GL=		gl
@@ -14,13 +15,11 @@ USE_SDL=	sdl2
 CFLAGS+=	-I${LOCALBASE}/include/${PORTNAME}
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
-EXTRACT_AFTER_ARGS=	#
-
-BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
-WRKSRC=			${WRKDIR}
 
 DISTINFO_FILE=		${.CURDIR}/distinfo
 
 OPTIONS_DEFINE=	#
 
+RELEASE_DATE=	20230611
+
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-video-glide64/distinfo b/emulators/mupen64plus-video-glide64/distinfo
index 9ad59e222c014..aecef6eca47b7 100644
--- a/emulators/mupen64plus-video-glide64/distinfo
+++ b/emulators/mupen64plus-video-glide64/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mupen64plus/mupen64plus-video-glide64-src-2.5.tar.gz) = c5fc21df4d1bd9380e151bec694e649fcb0b0ef257c42da6a005d97d4b66a3de
-SIZE (mupen64plus/mupen64plus-video-glide64-src-2.5.tar.gz) = 334145
+TIMESTAMP = 1704509571
+SHA256 (mupen64plus/mupen64plus-mupen64plus-video-glide64-2.5.9.20230611-bdf9f5ca8e381e6c1c824aa70b26ad34f4eeb132_GH0.tar.gz) = 7c74e2e57cf231cdd0c15bc425db57179abb56c58d2d7462e7ab16da0917da80
+SIZE (mupen64plus/mupen64plus-mupen64plus-video-glide64-2.5.9.20230611-bdf9f5ca8e381e6c1c824aa70b26ad34f4eeb132_GH0.tar.gz) = 336890
diff --git a/emulators/mupen64plus-video-glide64/files/patch-src_Util.h b/emulators/mupen64plus-video-glide64/files/patch-src_Util.h
index 08be86b3433ea..af04707619154 100644
--- a/emulators/mupen64plus-video-glide64/files/patch-src_Util.h
+++ b/emulators/mupen64plus-video-glide64/files/patch-src_Util.h
@@ -1,5 +1,5 @@
---- mupen64plus-video-glide64/src/Util.h.orig	2015-06-19 14:41:15 UTC
-+++ mupen64plus-video-glide64/src/Util.h
+--- src/Util.h.orig	2015-06-19 14:41:15 UTC
++++ src/Util.h
 @@ -93,7 +93,9 @@ void fix_tex_coord (VERTEX **v);
              lx = lc; \
          }
diff --git a/emulators/mupen64plus-video-glide64mk2/Makefile b/emulators/mupen64plus-video-glide64mk2/Makefile
index d475f7778bcb8..a1c35aa934b90 100644
--- a/emulators/mupen64plus-video-glide64mk2/Makefile
+++ b/emulators/mupen64plus-video-glide64mk2/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	24
+PORTREVISION=	0
 PKGNAMESUFFIX=	-video-glide64mk2
 
 COMMENT=	Glide64mk2 video plugin for Mupen64Plus
@@ -6,6 +6,8 @@ COMMENT=	Glide64mk2 video plugin for Mupen64Plus
 LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core \
 		libboost_thread.so:devel/boost-libs
 
+GH_TAGNAME=	d900f2191575e01eb846a1009be71cbc1b413dba
+
 USES+=		gl localbase:ldflags sdl
 USE_CXXSTD=	c++14
 USE_GL=		gl
@@ -17,4 +19,8 @@ MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
+RELEASE_DATE=	20230611
+
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-video-glide64mk2/distinfo b/emulators/mupen64plus-video-glide64mk2/distinfo
new file mode 100644
index 0000000000000..f93eb93987fc1
--- /dev/null
+++ b/emulators/mupen64plus-video-glide64mk2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1704509844
+SHA256 (mupen64plus/mupen64plus-mupen64plus-video-glide64mk2-2.5.9.20230611-d900f2191575e01eb846a1009be71cbc1b413dba_GH0.tar.gz) = 4207ebee3c5ec2351f8738bf92fa4f0af2c39d063aff0edf959efd58c0a76d5d
+SIZE (mupen64plus/mupen64plus-mupen64plus-video-glide64mk2-2.5.9.20230611-d900f2191575e01eb846a1009be71cbc1b413dba_GH0.tar.gz) = 501063
diff --git a/emulators/mupen64plus-video-glide64mk2/files/patch-projects_unix_Makefile b/emulators/mupen64plus-video-glide64mk2/files/patch-projects_unix_Makefile
new file mode 100644
index 0000000000000..d280e14a556b9
--- /dev/null
+++ b/emulators/mupen64plus-video-glide64mk2/files/patch-projects_unix_Makefile
@@ -0,0 +1,39 @@
+--- projects/unix/Makefile.orig	2023-06-11 19:20:38 UTC
++++ projects/unix/Makefile
+@@ -154,7 +154,7 @@ OBJDIR = _obj$(POSTFIX)
+ OPTFLAGS ?= -O3 -flto
+ WARNFLAGS ?= -Wall -Wno-unused-function
+ CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I$(SRCDIR) -I$(SRCDIR)/Glitch64/inc -DGCC
+-CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++0x
++CXXFLAGS += -fvisibility-inlines-hidden
+ LDFLAGS += $(SHARED)
+ BOOST_SUFFIX ?=
+ 
+@@ -225,6 +225,7 @@ ifeq ($(OS), OSX)
+ endif
+ ifeq ($(OS), FREEBSD)
+   LDLIBS += -lc
++  CPPFLAGS += -DNO_FILTER_THREAD
+ endif
+ ifeq ($(OS), MINGW)
+   ifeq ($(origin GLEW_CFLAGS) $(origin GLEW_LDLIBS), undefined undefined)
+@@ -288,7 +289,7 @@ LDLIBS += $(GL_LDLIBS)
+ ifeq ($(origin SDL_CFLAGS) $(origin SDL_LDLIBS), undefined undefined)
+   SDL_CONFIG = $(CROSS_COMPILE)sdl2-config
+   ifeq ($(shell which $(SDL_CONFIG) 2>/dev/null),)
+-    SDL_CONFIG = $(CROSS_COMPILE)sdl-config
++    SDL_CONFIG = $(CROSS_COMPILE)/usr/local/bin/sdl2-config
+     ifeq ($(shell which $(SDL_CONFIG) 2>/dev/null),)
+       $(error No SDL development libraries found!)
+     else
+@@ -340,8 +341,8 @@ endif
+ endif
+ 
+ # set base program pointers and flags
+-CC        = $(CROSS_COMPILE)gcc
+-CXX       = $(CROSS_COMPILE)g++
++CC        ?= $(CROSS_COMPILE)cc
++CXX       ?= $(CROSS_COMPILE)c++
+ RM       ?= rm -f
+ INSTALL  ?= install
+ MKDIR ?= mkdir -p
diff --git a/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile b/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile
deleted file mode 100644
index 51b6739041b32..0000000000000
--- a/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2013-07-03 19:28:17.000000000 -0500
-+++ source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2013-10-04 04:17:19.000000000 -0500
-@@ -125,7 +125,7 @@
- OPTFLAGS ?= -O3 -flto
- WARNFLAGS ?= -Wall
- CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/Glitch64/inc -DGCC
--CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++0x
-+CXXFLAGS += -fvisibility-inlines-hidden
- LDFLAGS += $(SHARED)
- BOOST_SUFFIX ?=
- 
-@@ -186,6 +186,7 @@
- endif
- ifeq ($(OS), FREEBSD)
-   LDLIBS += -lc
-+  CPPFLAGS += -DNO_FILTER_THREAD
- endif
- 
- ifeq ($(origin PKG_CONFIG), undefined)
-@@ -292,8 +297,8 @@
- endif
- 
- # set base program pointers and flags
--CC        = $(CROSS_COMPILE)gcc
--CXX       = $(CROSS_COMPILE)g++
-+CC        ?= $(CROSS_COMPILE)gcc
-+CXX       ?= $(CROSS_COMPILE)g++
- RM       ?= rm -f
- INSTALL  ?= install
- MKDIR ?= mkdir -p
diff --git a/emulators/mupen64plus-video-glide64mk2/files/patch-source_mupen64plus-video-glide64mk2-src-Glide64_3dmath.cpp b/emulators/mupen64plus-video-glide64mk2/files/patch-source_mupen64plus-video-glide64mk2-src-Glide64_3dmath.cpp
deleted file mode 100644
index 4f5da06c08c28..0000000000000
--- a/emulators/mupen64plus-video-glide64mk2/files/patch-source_mupen64plus-video-glide64mk2-src-Glide64_3dmath.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/mupen64plus-video-glide64mk2/src/Glide64/3dmath.cpp.orig	2015-04-26 22:42:57 UTC
-+++ source/mupen64plus-video-glide64mk2/src/Glide64/3dmath.cpp
-@@ -271,7 +271,7 @@ void MulMatricesSSE(float m1[4][4],float
-     tmp = _mm_shuffle_ps (tmp, tmp, 3 + (3 << 2) + (3 << 4) + (3 << 6));
-     destrow += tmp * row3;
- 
--    __builtin_ia32_storeups(r[i], destrow);
-+    _mm_storeu_ps(r[i], destrow);
-   }
-  #elif !defined(NO_ASM) && !defined(NOSSE)
-   __asm
diff --git a/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h b/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h
similarity index 56%
rename from emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h
rename to emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h
index 15a7bd203b277..1b60d58f5f262 100644
--- a/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h
+++ b/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h
@@ -1,6 +1,6 @@
---- source/mupen64plus-video-glide64mk2/src/Glide64/Util.h	2015-06-12 20:48:15.000000000 -0500
-+++ source/mupen64plus-video-glide64mk2/src/Glide64/Util.h	2015-06-12 20:48:41.000000000 -0500
-@@ -94,6 +94,7 @@
+--- src/Glide64/Util.h.orig	2024-01-06 03:12:23 UTC
++++ src/Glide64/Util.h
+@@ -94,6 +94,7 @@ float ScaleZ(float z);
    #include <stdlib.h>
    #define bswap32(x) _byteswap_ulong(x)
  #else
@@ -8,11 +8,11 @@
  static inline uint32_t bswap32(uint32_t val)
  {
  	return (((val & 0xff000000) >> 24) |
-@@ -102,6 +103,7 @@
+@@ -101,6 +102,7 @@ static inline uint32_t bswap32(uint32_t val)
+ 		((val & 0x0000ff00) <<  8) |
  		((val & 0x000000ff) << 24));
  }
- #endif
 +#endif
+ #endif
  
  #define ALOWORD(x)   (*((uint16_t*)&(x)))   // low word
- 
diff --git a/emulators/mupen64plus-video-rice/Makefile b/emulators/mupen64plus-video-rice/Makefile
index 1573fbc4568d7..66257d801432e 100644
--- a/emulators/mupen64plus-video-rice/Makefile
+++ b/emulators/mupen64plus-video-rice/Makefile
@@ -1,13 +1,19 @@
-PORTREVISION=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	-video-rice
 
 COMMENT=	The rice graphics plugin for Mupen64plus
 
+GH_TAGNAME=	470865c6c64bdb44645faa88eae59cd87ce561b6
+
 USES=		gl
-USE_GL=		gl
+USE_GL=		glu
 
 MASTERDIR=	${.CURDIR}/../mupen64plus-core
 
 OPTIONS_DEFINE=	#
 
+DISTINFO_FILE=	${.CURDIR}/distinfo
+
+RELEASE_DATE=	20230611
+
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-video-rice/distinfo b/emulators/mupen64plus-video-rice/distinfo
new file mode 100644
index 0000000000000..f194efb168bf2
--- /dev/null
+++ b/emulators/mupen64plus-video-rice/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1704510874
+SHA256 (mupen64plus/mupen64plus-mupen64plus-video-rice-2.5.9.20230611-470865c6c64bdb44645faa88eae59cd87ce561b6_GH0.tar.gz) = baa1fc034cc27d6c178d014794f8171817b9c96db5317feaede0d0d22e898676
+SIZE (mupen64plus/mupen64plus-mupen64plus-video-rice-2.5.9.20230611-470865c6c64bdb44645faa88eae59cd87ce561b6_GH0.tar.gz) = 303926
diff --git a/emulators/mupen64plus-video-z64/Makefile b/emulators/mupen64plus-video-z64/Makefile
index 25a2da22a3106..4520f2336fa0a 100644
--- a/emulators/mupen64plus-video-z64/Makefile
+++ b/emulators/mupen64plus-video-z64/Makefile
@@ -1,11 +1,12 @@
-PORTREVISION=	3
+PORTREVISION=	0
 PKGNAMESUFFIX=	-video-z64
-DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
 COMMENT=	Low-level RDP plugin for the Mupen64Plus
 
 LIB_DEPENDS=	libmupen64plus.so.2:emulators/mupen64plus-core
 
+GH_TAGNAME=	e8023148574d44fbabd1bb9d0ded7192869ec2ce
+
 USES=		gl sdl
 USE_GL=		gl glu glew
 USE_SDL=	sdl2
@@ -18,8 +19,7 @@ CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/GL -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DISTINFO_FILE=		${.CURDIR}/distinfo
-EXTRACT_AFTER_ARGS=	#
-BUILD_WRKSRC=		${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
-WRKSRC=			${WRKDIR}
+
+RELEASE_DATE=	20230611
 
 .include "${MASTERDIR}/Makefile"
diff --git a/emulators/mupen64plus-video-z64/distinfo b/emulators/mupen64plus-video-z64/distinfo
index f0ce6b9cf322d..2b5086076eeda 100644
--- a/emulators/mupen64plus-video-z64/distinfo
+++ b/emulators/mupen64plus-video-z64/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mupen64plus/mupen64plus-video-z64-src-2.5.tar.gz) = c25fdfad9c4707373dd7f47c118b2b6bdc2872c73b679cc5aba3e6051e88e947
-SIZE (mupen64plus/mupen64plus-video-z64-src-2.5.tar.gz) = 66797
+TIMESTAMP = 1704510995
+SHA256 (mupen64plus/mupen64plus-mupen64plus-video-z64-2.5.9.20230611-e8023148574d44fbabd1bb9d0ded7192869ec2ce_GH0.tar.gz) = 787b28d592fbc0069bbce79afe29219b6c3d8c3c2deb0ade7139c7f26037b945
+SIZE (mupen64plus/mupen64plus-mupen64plus-video-z64-2.5.9.20230611-e8023148574d44fbabd1bb9d0ded7192869ec2ce_GH0.tar.gz) = 69463
diff --git a/emulators/mupen64plus/Makefile b/emulators/mupen64plus/Makefile
index 0348d222233ef..2e94226613d32 100644
--- a/emulators/mupen64plus/Makefile
+++ b/emulators/mupen64plus/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	mupen64plus
-PORTVERSION=	2.5
+PORTVERSION=	2.5.9
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT=	Fork of Mupen64 Nintendo 64 emulator with plugins (meta port)
-WWW=		https://code.google.com/p/mupen64plus/
+WWW=		https://github.com/mupen64plus
 
 # Mupen64 Emulator core and ui-console
 RUN_DEPENDS+=	${LOCALBASE}/lib/libmupen64plus.so.2:emulators/mupen64plus-core
diff --git a/emulators/mupen64plus/pkg-message b/emulators/mupen64plus/pkg-message
index 081af6b7e36e1..fd96d670b6e91 100644
--- a/emulators/mupen64plus/pkg-message
+++ b/emulators/mupen64plus/pkg-message
@@ -26,7 +26,8 @@ video) of Mupen64Plus and
 
 5) If you want to install a GUI frontend of mupen64plus, you can install
 
-   emulators/wxmupen64plus
+   emulators/mupen64plus-qt
+   emulators/py-m64py
 
 6) Enjoy it ;)
 EOM