Index: head/games/reminiscence/Makefile =================================================================== --- head/games/reminiscence/Makefile (revision 443009) +++ head/games/reminiscence/Makefile (revision 443010) @@ -1,40 +1,41 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= REminiscence -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 CATEGORIES= games MASTER_SITES= http://cyxdown.free.fr/reminiscence/ \ http://mirror.amdmi3.ru/distfiles/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Rewritten engine for Flashback -LIB_DEPENDS= libmodplug.so:audio/libmodplug +LIB_DEPENDS= libmodplug.so:audio/libmodplug \ + libvorbisidec.so:audio/libtremor USES= gmake pkgconfig tar:bzip2 -USE_SDL= sdl +USE_SDL= sdl2 ALL_TARGET= rs SUB_FILES= pkg-message PORTDOCS= README.txt PLIST_FILES= bin/remin PLIST_DIRS= %%DATADIR%%/data OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|DATA|${DATADIR}/data|' ${WRKSRC}/main.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rs ${STAGEDIR}${PREFIX}/bin/remin @${MKDIR} ${STAGEDIR}${DATADIR}/data do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/ .include Index: head/games/reminiscence/distinfo =================================================================== --- head/games/reminiscence/distinfo (revision 443009) +++ head/games/reminiscence/distinfo (revision 443010) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475278699 -SHA256 (REminiscence-0.3.2.tar.bz2) = 063a1d9bb61a91ffe7de69516e48164a1d4d5d240747968bed4fd292d5df546f -SIZE (REminiscence-0.3.2.tar.bz2) = 112614 +TIMESTAMP = 1497005474 +SHA256 (REminiscence-0.3.3.tar.bz2) = dea16f19d35fc4a75d15b9e987b54d11eccb2f6c211950c939d05bc8d7c0d9e2 +SIZE (REminiscence-0.3.3.tar.bz2) = 113533 Index: head/games/reminiscence/files/patch-Makefile =================================================================== --- head/games/reminiscence/files/patch-Makefile (revision 443009) +++ head/games/reminiscence/files/patch-Makefile (revision 443010) @@ -1,19 +1,19 @@ ---- Makefile.orig 2016-05-15 22:24:33 UTC +--- Makefile.orig 2017-04-01 06:34:29 UTC +++ Makefile -@@ -1,12 +1,13 @@ +@@ -2,11 +2,13 @@ + SDL_CFLAGS := `sdl2-config --cflags` + SDL_LIBS := `sdl2-config --libs` - SDL_CFLAGS = `sdl-config --cflags` - SDL_LIBS = `sdl-config --libs` --MODPLUG_LIBS = -lmodplug -+MODPLUG_CFLAGS = `pkg-config --cflags libmodplug` -+MODPLUG_LIBS = `pkg-config --libs libmodplug` - # TREMOR_LIBS = -lvorbisidec -logg - ZLIB_LIBS = -lz +-MODPLUG_LIBS := -lmodplug +-TREMOR_LIBS := -lvorbisidec -logg ++MODPLUG_CFLAGS := `pkg-config --cflags libmodplug` ++MODPLUG_LIBS := `pkg-config --libs libmodplug` ++TREMOR_CFLAGS := `pkg-config --cflags vorbisidec` ++TREMOR_LIBS := `pkg-config --libs vorbisidec` + ZLIB_LIBS := -lz --CXX := clang++ --CXXFLAGS := -Wall -MMD $(SDL_CFLAGS) -DUSE_MODPLUG -DUSE_ZLIB # -DUSE_TREMOR -+CXX ?= clang++ -+CXXFLAGS += -Wall -MMD $(SDL_CFLAGS) $(MODPLUG_CFLAGS) -DUSE_MODPLUG -DUSE_ZLIB # -DUSE_TREMOR +-CXXFLAGS += -Wall -MMD $(SDL_CFLAGS) -DUSE_MODPLUG -DUSE_TREMOR -DUSE_ZLIB ++CXXFLAGS += -Wall -MMD $(SDL_CFLAGS) $(MODPLUG_CFLAGS) $(TREMOR_CFLAGS) -DUSE_MODPLUG -DUSE_TREMOR -DUSE_ZLIB SRCS = collision.cpp cutscene.cpp file.cpp fs.cpp game.cpp graphics.cpp main.cpp menu.cpp \ mixer.cpp mod_player.cpp ogg_player.cpp piege.cpp resource.cpp resource_aba.cpp \ Index: head/games/reminiscence/files/patch-main.cpp =================================================================== --- head/games/reminiscence/files/patch-main.cpp (revision 443009) +++ head/games/reminiscence/files/patch-main.cpp (revision 443010) @@ -1,26 +1,26 @@ --- main.cpp.orig 2016-03-02 09:36:17 UTC +++ main.cpp @@ -125,8 +125,15 @@ static const int DEFAULT_SCALER = SCALER #undef main int main(int argc, char *argv[]) { -+ char *homedir = getenv("HOME"); -+ char *dotdir = "/.REminiscence"; ++ const char *homedir = getenv("HOME"); ++ const char *dotdir = "/.REminiscence"; + char *buf = (char*)malloc(strlen(homedir) + strlen(dotdir) + 1); + strcpy(buf, homedir); + strcat(buf, dotdir); + mkdir(buf, 0755); + const char *dataPath = "DATA"; - const char *savePath = "."; + const char *savePath = buf; int levelNum = 0; int scaler = DEFAULT_SCALER; bool fullscreen = false; @@ -191,5 +198,6 @@ int main(int argc, char *argv[]) { delete g; stub->destroy(); delete stub; + free(buf); return 0; }