diff --git a/games/oblige/Makefile b/games/oblige/Makefile
index d68a02bb80af..7d04609679d7 100644
--- a/games/oblige/Makefile
+++ b/games/oblige/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	oblige
 PORTVERSION=	7.70
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Oblige/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-source
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Random map generator for classic FPS games
 WWW=		https://oblige.sourceforge.net/
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glbsp.h:games/glbsp
 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libphysfs.so:devel/physfs \
 		libpng.so:graphics/png
 
-USES=		gmake jpeg xorg zip
+USES=		dos2unix gmake jpeg xorg zip
+DOS2UNIX_FILES=	ajpoly_src/pl_endian.h gui/sys_endian.h
 USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
 WRKSRC=		${WRKDIR}/Oblige-${PORTVERSION}-source
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt TODO.txt
 
 post-extract:
 	@cd ${WRKSRC} && ${RM} -r glbsp_src physfs_src
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Oblige ${STAGEDIR}${PREFIX}/bin/oblige
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "addons data engines games \
 		language modules scripts" ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/misc/oblige.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/misc/oblige.xpm \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps
 	${INSTALL_DATA} ${WRKSRC}/misc/icon_128x128.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/oblige.png
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} changelogs ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
 
 PATCH_ARGS+=	-l
diff --git a/games/oblige/files/patch-ajpoly__src_pl__endian.h b/games/oblige/files/patch-ajpoly__src_pl__endian.h
new file mode 100644
index 000000000000..c10fb7058fbc
--- /dev/null
+++ b/games/oblige/files/patch-ajpoly__src_pl__endian.h
@@ -0,0 +1,14 @@
+--- ajpoly_src/pl_endian.h.orig	2023-07-31 15:43:19 UTC
++++ ajpoly_src/pl_endian.h
+@@ -57,10 +57,7 @@ static inline u16_t UT_Swap16(u16_t x)
+ #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+ static inline u16_t UT_Swap16(u16_t x)
+ {
+-  u16_t result;
+-
+-  __asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
+-  return result;
++  return __builtin_bswap16(x);
+ }
+ #else
+ static inline u16_t UT_Swap16(u16_t x) {
diff --git a/games/oblige/files/patch-gui_sys__endian.h b/games/oblige/files/patch-gui_sys__endian.h
new file mode 100644
index 000000000000..a240f00393e3
--- /dev/null
+++ b/games/oblige/files/patch-gui_sys__endian.h
@@ -0,0 +1,14 @@
+--- gui/sys_endian.h.orig	2023-07-31 15:43:29 UTC
++++ gui/sys_endian.h
+@@ -61,10 +61,7 @@ static inline u16_t UT_Swap16(u16_t x)
+ #elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+ static inline u16_t UT_Swap16(u16_t x)
+ {
+-  u16_t result;
+-
+-  __asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
+-  return result;
++  return __builtin_bswap16(x);
+ }
+ #else
+ static inline u16_t UT_Swap16(u16_t x) {