diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 1fd1fe8d0217..26d07411fe06 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -1,37 +1,27 @@
 PORTNAME=	xbubble
 PORTVERSION=	0.5.8
 PORTREVISION=	8
 CATEGORIES=	games
-MASTER_SITES=	GENTOO
+MASTER_SITES=	OPENBSD/distfiles LOCAL/danfe
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Puzzle Bobble clone for Unix/X11 platforms
 WWW=		https://www.nongnu.org/xbubble/
 
-DEPRECATED=	GENTOO Master Sites has rerolled and cleaned up all older distfiles
-EXPIRATION_DATE=2025-01-27
-
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake localbase:ldflags xorg
 USE_XORG=	x11 xmu
-
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_LIBS=	-lintl
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-
 .include <bsd.port.mk>
diff --git a/games/xbubble/files/patch-src__init.c b/games/xbubble/files/patch-src__init.c
deleted file mode 100644
index 718172d4731f..000000000000
--- a/games/xbubble/files/patch-src__init.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/init.c.old	Tue Feb  3 18:14:28 2004
-+++ src/init.c	Tue Feb  3 18:14:37 2004
-@@ -460,7 +460,7 @@
-   return return_val;
- }
- 
--int diren_select_bubbles (const struct dirent *d) {
-+int diren_select_bubbles (struct dirent *d) {
-   int color;
-   int state;
-