- Update to 0.3.2

This commit is contained in:
Dmitry Marakasov 2017-03-23 13:22:42 +00:00
parent 317ce5aa12
commit 96b6c282f5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=436771
3 changed files with 14 additions and 24 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= REminiscence
PORTVERSION= 0.3.0
PORTVERSION= 0.3.2
CATEGORIES= games
MASTER_SITES= http://cyxdown.free.fr/reminiscence/ \
http://mirror.amdmi3.ru/distfiles/
@ -10,7 +10,7 @@ MASTER_SITES= http://cyxdown.free.fr/reminiscence/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Rewritten engine for Flashback
LIB_DEPENDS= libvorbisidec.so:audio/libtremor
LIB_DEPENDS= libmodplug.so:audio/libmodplug
USES= gmake pkgconfig tar:bzip2
USE_SDL= sdl
@ -19,7 +19,7 @@ ALL_TARGET= rs
SUB_FILES= pkg-message
PORTDOCS= README
PORTDOCS= README.txt
PLIST_FILES= bin/remin
PLIST_DIRS= %%DATADIR%%/data
@ -35,6 +35,6 @@ do-install:
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>

View File

@ -1,2 +1,3 @@
SHA256 (REminiscence-0.3.0.tar.bz2) = 9bb3693ad6c2f6e2ec6a5672d887866eb528c2c206a1bf8a046c39e496382f5a
SIZE (REminiscence-0.3.0.tar.bz2) = 109524
TIMESTAMP = 1475278699
SHA256 (REminiscence-0.3.2.tar.bz2) = 063a1d9bb61a91ffe7de69516e48164a1d4d5d240747968bed4fd292d5df546f
SIZE (REminiscence-0.3.2.tar.bz2) = 112614

View File

@ -1,30 +1,19 @@
--- Makefile.orig 2016-03-06 13:27:40 UTC
--- Makefile.orig 2016-05-15 22:24:33 UTC
+++ Makefile
@@ -1,12 +1,13 @@
-
SDL_CFLAGS = `sdl-config --cflags`
SDL_LIBS = `sdl-config --libs`
-VORBIS_LIBS = -lvorbisidec
-MODPLUG_LIBS = -lmodplug
+VORBIS_CFLAGS = `pkg-config --cflags vorbisidec`
+VORBIS_LIBS = `pkg-config --libs vorbisidec`
+#MODPLUG_CFLAGS = `pkg-config --cflags libmodplug`
+#MODPLUG_LIBS = `pkg-config --libs libmodplug`
+MODPLUG_CFLAGS = `pkg-config --cflags libmodplug`
+MODPLUG_LIBS = `pkg-config --libs libmodplug`
# TREMOR_LIBS = -lvorbisidec -logg
ZLIB_LIBS = -lz
-CXX := clang++
-CXXFLAGS := -Wall -MMD $(SDL_CFLAGS) -DUSE_ZLIB # -DUSE_MODPLUG
-CXXFLAGS := -Wall -MMD $(SDL_CFLAGS) -DUSE_MODPLUG -DUSE_ZLIB # -DUSE_TREMOR
+CXX ?= clang++
+CXXFLAGS += -Wall -MMD $(SDL_CFLAGS) $(VORBIS_CFLAGS) -DUSE_ZLIB # -DUSE_MODPLUG
+CXXFLAGS += -Wall -MMD $(SDL_CFLAGS) $(MODPLUG_CFLAGS) -DUSE_MODPLUG -DUSE_ZLIB # -DUSE_TREMOR
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 \
@@ -16,7 +17,7 @@ SRCS = collision.cpp cutscene.cpp file.c
OBJS = $(SRCS:.cpp=.o)
DEPS = $(SRCS:.cpp=.d)
-LIBS = $(SDL_LIBS) $(VORBIS_LIBS) $(MODPLUG_LIBS) $(ZLIB_LIBS)
+LIBS = $(SDL_LIBS) $(VORBIS_LIBS) $(ZLIB_LIBS)
rs: $(OBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)