diff --git a/games/avp/Makefile b/games/avp/Makefile
index edbb51b267e3..dfd871f34e56 100644
--- a/games/avp/Makefile
+++ b/games/avp/Makefile
@@ -1,29 +1,27 @@
 PORTNAME=	avp
 DISTVERSION=	20170505
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://icculus.org/avp/files/
 EXTRACT_SUFX=	-a1.tar.gz
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Open source re-implementation of Alien versus Predator
 WWW=		https://icculus.org/avp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		Doesn't build with NDEBUG defined, error: invalid operands to binary expression ('int' and 'std::nullptr_t')
-
 USES=		cmake compiler:c++11-lang gl openal sdl
 USE_GL=		gl
 USE_SDL=	sdl
 
 LDFLAGS_i386=	-Wl,-znotext
 
 PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/games/avp/files/patch-src_win95_chunk.cpp b/games/avp/files/patch-src_win95_chunk.cpp
new file mode 100644
index 000000000000..c5d851961486
--- /dev/null
+++ b/games/avp/files/patch-src_win95_chunk.cpp
@@ -0,0 +1,11 @@
+--- src/win95/chunk.cpp.orig	2023-01-07 16:38:50 UTC
++++ src/win95/chunk.cpp
+@@ -437,7 +437,7 @@ Chunk* Chunk_With_Children::lookup_single_child (const
+ 
+ 	if (children)	
+ 		while	(child_ptr != NULL) {
+-			if (strncmp (class_ident, child_ptr->identifier, 8) == NULL)
++			if (strncmp (class_ident, child_ptr->identifier, 8) == 0)
+ 			{
+ 				assert (!child_ptr->r_u_miscellaneous());
+ 				return child_ptr;