Date: Wed, 6 Apr 2016 02:21:45 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412596 - in head/games/reminiscence: . files Message-ID: <201604060221.u362LjSr046569@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Apr 6 02:21:45 2016 New Revision: 412596 URL: https://svnweb.freebsd.org/changeset/ports/412596 Log: - Update to 0.3.0 - Switch to options helpers Modified: head/games/reminiscence/Makefile head/games/reminiscence/distinfo head/games/reminiscence/files/patch-Makefile head/games/reminiscence/files/patch-main.cpp Modified: head/games/reminiscence/Makefile ============================================================================== --- head/games/reminiscence/Makefile Wed Apr 6 01:58:01 2016 (r412595) +++ head/games/reminiscence/Makefile Wed Apr 6 02:21:45 2016 (r412596) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= REminiscence -PORTVERSION= 0.2.1 -PORTREVISION= 3 +PORTVERSION= 0.3.0 CATEGORIES= games MASTER_SITES= http://cyxdown.free.fr/reminiscence/ \ http://mirror.amdmi3.ru/distfiles/ @@ -11,7 +10,9 @@ MASTER_SITES= http://cyxdown.free.fr/rem MAINTAINER= amdmi3@FreeBSD.org COMMENT= Rewritten engine for Flashback -USES= tar:bzip2 gmake +LIB_DEPENDS= libvorbisidec.so:audio/libtremor + +USES= gmake pkgconfig tar:bzip2 USE_SDL= sdl ALL_TARGET= rs @@ -30,8 +31,10 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rs ${STAGEDIR}${PREFIX}/bin/remin - ${MKDIR} ${STAGEDIR}${DATADIR}/data - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DATADIR}/data + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .include <bsd.port.mk> Modified: head/games/reminiscence/distinfo ============================================================================== --- head/games/reminiscence/distinfo Wed Apr 6 01:58:01 2016 (r412595) +++ head/games/reminiscence/distinfo Wed Apr 6 02:21:45 2016 (r412596) @@ -1,2 +1,2 @@ -SHA256 (REminiscence-0.2.1.tar.bz2) = 3168ffb7cd29e72a150e22edc6f0891001288f4c89d7900cbac8864ce763c2bd -SIZE (REminiscence-0.2.1.tar.bz2) = 101621 +SHA256 (REminiscence-0.3.0.tar.bz2) = 9bb3693ad6c2f6e2ec6a5672d887866eb528c2c206a1bf8a046c39e496382f5a +SIZE (REminiscence-0.3.0.tar.bz2) = 109524 Modified: head/games/reminiscence/files/patch-Makefile ============================================================================== --- head/games/reminiscence/files/patch-Makefile Wed Apr 6 01:58:01 2016 (r412595) +++ head/games/reminiscence/files/patch-Makefile Wed Apr 6 02:21:45 2016 (r412596) @@ -1,18 +1,30 @@ ---- Makefile.orig 2011-03-10 20:47:57.000000000 +0300 -+++ Makefile 2011-05-05 11:43:09.000000000 +0400 -@@ -1,12 +1,11 @@ +--- Makefile.orig 2016-03-06 13:27:40 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` + ZLIB_LIBS = -lz --SDL_CFLAGS = `sdl-config --cflags` --SDL_LIBS = `sdl-config --libs` -+SDL_CFLAGS = `${SDL_CONFIG} --cflags` -+SDL_LIBS = `${SDL_CONFIG} --libs` +-CXX := clang++ +-CXXFLAGS := -Wall -MMD $(SDL_CFLAGS) -DUSE_ZLIB # -DUSE_MODPLUG ++CXX ?= clang++ ++CXXFLAGS += -Wall -MMD $(SDL_CFLAGS) $(VORBIS_CFLAGS) -DUSE_ZLIB # -DUSE_MODPLUG - DEFINES = -DBYPASS_PROTECTION - #DEFINES = -DBYPASS_PROTECTION -DENABLE_PASSWORD_MENU -DNDEBUG + 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) --CXX = g++ --CXXFLAGS := -g -O -Wall -Wuninitialized -Wshadow -Wimplicit -Wundef -Wreorder -Wnon-virtual-dtor -Wno-multichar -+CXXFLAGS += -Wall -Wuninitialized -Wshadow -Wimplicit -Wundef -Wreorder -Wnon-virtual-dtor -Wno-multichar - CXXFLAGS += -MMD $(SDL_CFLAGS) -DUSE_ZLIB $(DEFINES) +-LIBS = $(SDL_LIBS) $(VORBIS_LIBS) $(MODPLUG_LIBS) $(ZLIB_LIBS) ++LIBS = $(SDL_LIBS) $(VORBIS_LIBS) $(ZLIB_LIBS) - SRCS = collision.cpp cutscene.cpp file.cpp fs.cpp game.cpp graphics.cpp main.cpp menu.cpp \ + rs: $(OBJS) + $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) Modified: head/games/reminiscence/files/patch-main.cpp ============================================================================== --- head/games/reminiscence/files/patch-main.cpp Wed Apr 6 01:58:01 2016 (r412595) +++ head/games/reminiscence/files/patch-main.cpp Wed Apr 6 02:21:45 2016 (r412596) @@ -1,14 +1,6 @@ ---- main.cpp.orig 2011-03-10 23:37:01.000000000 +0300 -+++ main.cpp 2011-05-05 11:40:07.000000000 +0400 -@@ -19,6 +19,7 @@ - #include "fs.h" - #include "game.h" - #include "systemstub.h" -+#include <sys/stat.h> - - static const char *USAGE = - "REminiscence - Flashback Interpreter\n" -@@ -83,8 +84,15 @@ +--- 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[]) { @@ -22,12 +14,12 @@ const char *dataPath = "DATA"; - const char *savePath = "."; + const char *savePath = buf; - const char *levelNum = "0"; - for (int i = 1; i < argc; ++i) { - bool opt = false; -@@ -111,5 +119,6 @@ - g->run(); + 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604060221.u362LjSr046569>