kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 0.3.3

Browse source
This commit is contained in:
Dmitry Marakasov 2017-06-09 15:13:06 +00:00
parent 97a9c42eaf
commit 19283e241e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=443010
4 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
games/reminiscence/Makefile
View file

@ -2,7 +2,7 @@
# $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/
@ -10,10 +10,11 @@ MASTER_SITES= http://cyxdown.free.fr/reminiscence/ \
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

6
games/reminiscence/distinfo
View file

@ -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

26
games/reminiscence/files/patch-Makefile
View file

@ -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 \

4
games/reminiscence/files/patch-main.cpp
View file

@ -4,8 +4,8 @@
#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);