diff --git a/games/sdlpop/Makefile b/games/sdlpop/Makefile
index 618c03814fe1..f38f88b5aca3 100644
--- a/games/sdlpop/Makefile
+++ b/games/sdlpop/Makefile
@@ -1,47 +1,49 @@
 PORTNAME=	sdlpop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Open-source port of Prince of Persia
 WWW=		https://github.com/NagyD/SDLPoP
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe
 NOT_FOR_ARCHS_REASON=	SDLPoP-1.18.1/src/types.h:54:2: This program is not (yet) prepared for big endian CPUs, please contact the author.
 
 USES=		cmake localbase:ldflags sdl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NagyD
 GH_PROJECT=	SDLPoP
 
 WRKSRC_SUBDIR=	src
 USE_SDL=	image2 sdl2
 PORTDOCS=	*
 
 CFLAGS+=	-I${LOCALBASE}/include/SDL2
 
 DESKTOP_ENTRIES=	"Prince" "Open-Source port of Prince of Persia" \
 		"${DATADIR}/icon.png" "prince"  "Game;" false
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/lighting.c
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/seg009.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../prince ${STAGEDIR}/${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/../data ; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} \
 		${WRKSRC}/../doc/ChangeLog.txt \
 		${WRKSRC}/../doc/mod.ini \
 		${WRKSRC}/../doc/Readme.txt \
 		${WRKSRC}/../SDLPoP.ini \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/sdlpop/files/patch-seg009.c b/games/sdlpop/files/patch-seg009.c
index 1c6c504014a8..460c6df3b634 100644
--- a/games/sdlpop/files/patch-seg009.c
+++ b/games/sdlpop/files/patch-seg009.c
@@ -1,47 +1,56 @@
---- seg009.c.orig	2021-07-06 13:10:16 UTC
+--- seg009.c.orig	2023-02-04 09:43:22 UTC
 +++ seg009.c
-@@ -343,7 +343,7 @@ static FILE* open_dat_from_root_or_data_dir(const char
+@@ -340,7 +340,7 @@ static FILE* open_dat_from_root_or_data_dir(const char
  	// if failed, try if the DAT file can be opened in the data/ directory, instead of the main folder
  	if (fp == NULL) {
  		char data_path[POP_MAX_PATH];
 -		snprintf_check(data_path, sizeof(data_path), "data/%s", filename);
 +		snprintf_check(data_path, sizeof(data_path), "%%DATADIR%%/%s", filename);
  
-         if (!file_exists(data_path)) {
-             find_exe_dir();
-@@ -2078,7 +2078,7 @@ const int sound_channel = 0;
+ 		if (!file_exists(data_path)) {
+ 			find_exe_dir();
+@@ -411,7 +411,7 @@ dat_type* open_dat(const char* filename, int optional)
+ 			filename_no_ext[len-4] = '\0'; // terminate, so ".DAT" is deleted from the filename
+ 		}
+ 		char foldername[POP_MAX_PATH];
+-		snprintf_check(foldername,sizeof(foldername),"data/%s",filename_no_ext);
++		snprintf_check(foldername,sizeof(foldername),"%%DATADIR%%/%s",filename_no_ext);
+ 		const char* data_path = locate_file(foldername);
+ 		struct stat path_stat;
+ 		int result = stat(data_path, &path_stat);
+@@ -2120,7 +2120,7 @@ void load_sound_names() {
  const int max_sound_id = 58;
  
  void load_sound_names() {
 -	const char* names_path = locate_file("data/music/names.txt");
 +	const char* names_path = locate_file("%%DATADIR%%/music/names.txt");
  	if (sound_names != NULL) return;
  	FILE* fp = fopen(names_path,"rt");
  	if (fp==NULL) return;
-@@ -2128,7 +2128,7 @@ sound_buffer_type* load_sound(int index) {
+@@ -2170,7 +2170,7 @@ sound_buffer_type* load_sound(int index) {
  					fp = fopen(filename, "rb");
  				}
  				if (fp == NULL && !skip_normal_data_files) {
 -					snprintf_check(filename, sizeof(filename), "data/music/%s.ogg", sound_name(index));
 +					snprintf_check(filename, sizeof(filename), "%%DATADIR%%/music/%s.ogg", sound_name(index));
  					fp = fopen(locate_file(filename), "rb");
  				}
  				if (fp == NULL) {
-@@ -2495,7 +2495,7 @@ void __pascal far set_gr_mode(byte grmode) {
+@@ -2546,7 +2546,7 @@ void set_gr_mode(byte grmode) {
  #endif
  	}
  
 -	SDL_Surface* icon = IMG_Load(locate_file("data/icon.png"));
 +	SDL_Surface* icon = IMG_Load(locate_file("%%DATADIR%%/icon.png"));
  	if (icon == NULL) {
  		sdlperror("set_gr_mode: Could not load icon");
  	} else {
-@@ -2754,7 +2754,7 @@ void load_from_opendats_metadata(int resource_id, cons
+@@ -2814,7 +2814,7 @@ void load_from_opendats_metadata(int resource_id, cons
  			if (len >= 5 && filename_no_ext[len-4] == '.') {
  				filename_no_ext[len-4] = '\0'; // terminate, so ".DAT" is deleted from the filename
  			}
 -			snprintf_check(image_filename,sizeof(image_filename),"data/%s/res%d.%s",filename_no_ext, resource_id, extension);
 +			snprintf_check(image_filename,sizeof(image_filename),"%%DATADIR%%/%s/res%d.%s",filename_no_ext, resource_id, extension);
  			if (!use_custom_levelset) {
  				//printf("loading (binary) %s",image_filename);
  				fp = fopen(locate_file(image_filename), "rb");