Index: head/games/sdlpop/Makefile =================================================================== --- head/games/sdlpop/Makefile (revision 545584) +++ head/games/sdlpop/Makefile (revision 545585) @@ -1,48 +1,48 @@ # Created by: Piotr Kubaj # $FreeBSD$ PORTNAME= sdlpop DISTVERSIONPREFIX= v -DISTVERSION= 1.20 +DISTVERSION= 1.21 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org COMMENT= Open-source port of Prince of Persia LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/../doc/gpl-3.0.txt NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe sparc64 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= sdl2 image2 mixer2 PORTDOCS= * 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}/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/bugs.txt \ ${WRKSRC}/../doc/ChangeLog.txt \ ${WRKSRC}/../doc/mod.ini \ ${WRKSRC}/../doc/Readme.txt \ ${WRKSRC}/../SDLPoP.ini \ ${STAGEDIR}${DOCSDIR} .include Index: head/games/sdlpop/distinfo =================================================================== --- head/games/sdlpop/distinfo (revision 545584) +++ head/games/sdlpop/distinfo (revision 545585) @@ -1,3 +1,3 @@ -TIMESTAMP = 1571059593 -SHA256 (NagyD-SDLPoP-v1.20_GH0.tar.gz) = dbb75398dee2224bcee648602ad23e469b936a2b7ea962a8a01b091b989f25b6 -SIZE (NagyD-SDLPoP-v1.20_GH0.tar.gz) = 623338 +TIMESTAMP = 1598004600 +SHA256 (NagyD-SDLPoP-v1.21_GH0.tar.gz) = b252fbc931498057499787aa293917636c4f217d860b432df0f53cfa49b02b49 +SIZE (NagyD-SDLPoP-v1.21_GH0.tar.gz) = 627869 Index: head/games/sdlpop/files/patch-seg009.c =================================================================== --- head/games/sdlpop/files/patch-seg009.c (revision 545584) +++ head/games/sdlpop/files/patch-seg009.c (revision 545585) @@ -1,56 +1,56 @@ ---- seg009.c.orig 2018-03-17 16:33:14 UTC +--- seg009.c.orig 2020-08-20 18:22:40 UTC +++ seg009.c -@@ -192,7 +192,7 @@ static FILE* open_dat_from_root_or_data_ +@@ -327,7 +327,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(data_path, sizeof(data_path), "data/%s", filename); -+ snprintf(data_path, sizeof(data_path), "%%DATADIR%%/%s", filename); +- 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(); -@@ -1755,7 +1755,7 @@ const int max_sound_id = 58; - char** sound_names = NULL; +@@ -1949,7 +1949,7 @@ const int sound_channel = 0; + 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; -@@ -1805,7 +1805,7 @@ sound_buffer_type* load_sound(int index) +@@ -1999,7 +1999,7 @@ sound_buffer_type* load_sound(int index) { fp = fopen(filename, "rb"); } if (fp == NULL && !skip_normal_data_files) { -- snprintf(filename, sizeof(filename), "data/music/%s.ogg", sound_name(index)); -+ snprintf(filename, sizeof(filename), "%%DATADIR%%/music/%s.ogg", sound_name(index)); +- 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) { -@@ -2108,7 +2108,7 @@ void __pascal far set_gr_mode(byte grmod +@@ -2304,7 +2304,7 @@ void __pascal far set_gr_mode(byte grmode) { SDL_SetHint(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, "1"); #endif if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE | - SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC ) != 0) { + SDL_INIT_GAMECONTROLLER) != 0) { sdlperror("SDL_Init"); quit(1); } -@@ -2147,7 +2147,7 @@ void __pascal far set_gr_mode(byte grmod +@@ -2363,7 +2363,7 @@ void __pascal far 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("Could not load icon"); } else { -@@ -2364,7 +2364,7 @@ void load_from_opendats_metadata(int res +@@ -2580,7 +2580,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(image_filename,sizeof(image_filename),"data/%s/res%d.%s",filename_no_ext, resource_id, extension); -+ snprintf(image_filename,sizeof(image_filename),"%%DATADIR%%/%s/res%d.%s",filename_no_ext, resource_id, extension); +- 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");