diff --git a/devel/mcpp/Makefile b/devel/mcpp/Makefile
index 1c0643bd66f0..d448b23248e4 100644
--- a/devel/mcpp/Makefile
+++ b/devel/mcpp/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	mcpp
-PORTVERSION=	2.7.2
-PORTREVISION=	4
+DISTVERSION=	2.7.2.1
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/V.${PORTVERSION}
 
 MAINTAINER=	kmatsui@t3.rim.or.jp
 COMMENT=	Alternative C/C++ preprocessor
 WWW=		https://mcpp.sourceforge.net/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe libtool
+CPE_VENDOR=	mcpp_project
+USE_GITHUB=	yes
+GH_ACCOUNT=	museoa
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-mcpplib
-USE_LDCONFIG=	yes
-CPE_VENDOR=	mcpp_project
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/devel/mcpp/distinfo b/devel/mcpp/distinfo
index df4fd5418fd2..3482a738eb8e 100644
--- a/devel/mcpp/distinfo
+++ b/devel/mcpp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mcpp-2.7.2.tar.gz) = 3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864
-SIZE (mcpp-2.7.2.tar.gz) = 1533457
+TIMESTAMP = 1724203382
+SHA256 (museoa-mcpp-2.7.2.1_GH0.tar.gz) = ec6c2ead79b2334fccf56b8811256c4fccbbe2350e6a2e52dc83a1c7ad995af4
+SIZE (museoa-mcpp-2.7.2.1_GH0.tar.gz) = 1523105
diff --git a/devel/mcpp/files/patch-src__internal.H b/devel/mcpp/files/patch-src__internal.H
deleted file mode 100644
index c21a9a6f765e..000000000000
--- a/devel/mcpp/files/patch-src__internal.H
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./src/internal.H.orig	2008-08-27 15:01:16.000000000 +0200
-+++ ./src/internal.H	2011-03-30 19:57:37.000000000 +0200
-@@ -390,6 +390,8 @@
- extern char     identifier[];       /* Lastly scanned name          */
- extern IFINFO   ifstack[];          /* Information of #if nesting   */
- extern char     work_buf[];
-+extern FILEINFO * sh_file;
-+extern int      sh_line;
-         /* Temporary buffer for directive line and macro expansion  */
- 
- /* main.c   */
-@@ -557,6 +559,6 @@
- #endif
- #endif
- 
--#if HOST_HAVE_STPCPY
-+#if HOST_HAVE_STPCPY && !defined(stpcpy)
- extern char *   stpcpy( char * dest, const char * src);
- #endif
diff --git a/devel/mcpp/files/patch-src__main.c b/devel/mcpp/files/patch-src__main.c
deleted file mode 100644
index 2bfbd5c674bf..000000000000
--- a/devel/mcpp/files/patch-src__main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/main.c.orig	2008-11-05 09:34:46.000000000 +0100
-+++ ./src/main.c	2011-03-30 19:57:37.000000000 +0200
-@@ -326,6 +326,8 @@
-             = FALSE;
-     option_flags.trig = TRIGRAPHS_INIT;
-     option_flags.dig = DIGRAPHS_INIT;
-+    sh_file = NULL;
-+    sh_line = 0;
- }
- 
- int     mcpp_lib_main
diff --git a/devel/mcpp/files/patch-src__support.c b/devel/mcpp/files/patch-src__support.c
deleted file mode 100644
index 08de1ec8b695..000000000000
--- a/devel/mcpp/files/patch-src__support.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./src/support.c.orig	2008-06-10 10:32:33.000000000 +0200
-+++ ./src/support.c	2011-03-30 19:57:37.000000000 +0200
-@@ -188,7 +188,7 @@
-     size_t      length
- )
- {
--    if (mem_buf_p->bytes_avail < length) {  /* Need to allocate more memory */
-+    if (mem_buf_p->bytes_avail < length + 1) {  /* Need to allocate more memory */
-         size_t size = MAX( BUF_INCR_SIZE, length);
- 
-         if (mem_buf_p->buffer == NULL) {            /* 1st append   */
-@@ -1722,6 +1722,8 @@
-                     sp -= 2;
-                     while (*sp != '\n')     /* Until end of line    */
-                         mcpp_fputc( *sp++, OUT);
-+                    mcpp_fputc( '\n', OUT);
-+                    wrong_line = TRUE;
-                 }
-                 goto  end_line;
-             default:                        /* Not a comment        */
diff --git a/devel/mcpp/files/patch-src__system.c b/devel/mcpp/files/patch-src__system.c
deleted file mode 100644
index 5e80aabb2378..000000000000
--- a/devel/mcpp/files/patch-src__system.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./src/system.c.orig	2008-11-26 10:53:51.000000000 +0100
-+++ ./src/system.c	2011-03-30 19:57:37.000000000 +0200
-@@ -3858,6 +3858,9 @@
- }
- #endif
- 
-+FILEINFO*       sh_file;
-+int             sh_line;
-+
- void    sharp(
-     FILEINFO *  sharp_file,
-     int         flag        /* Flag to append to the line for GCC   */
-@@ -3868,8 +3871,6 @@
-  * else (i.e. 'sharp_file' is NULL) 'infile'.
-  */
- {
--    static FILEINFO *   sh_file;
--    static int  sh_line;
-     FILEINFO *  file;
-     int         line;
-