Index: head/games/frogatto/Makefile =================================================================== --- head/games/frogatto/Makefile (revision 472569) +++ head/games/frogatto/Makefile (revision 472570) @@ -1,63 +1,64 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= frogatto PORTVERSION= 1.3.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= games MAINTAINER= fiziologus@gmail.com COMMENT= Old-school 2D classic adventure platformer game LICENSE= FROGATTO GPLv3 LICENSE_COMB= multi LICENSE_NAME_FROGATTO= Frogatto license LICENSE_FILE_FROGATTO= ${WRKSRC}/LICENSE LICENSE_FILE_GPLv3= ${WRKSRC}/src/LICENSE LICENSE_PERMS_FROGATTO= dist-mirror pkg-mirror auto-accept LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libpng.so:graphics/png USE_GITHUB= yes GH_ACCOUNT= frogatto USES= gmake pkgconfig ALL_TARGET= game server USE_GL= glew glu USE_SDL= sdl image mixer ttf +USE_CXXSTD= c++11 PLIST_FILES= bin/${PORTNAME} bin/${PORTNAME}-server post-patch: @${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's,%lu,%u,' ${WRKSRC}/src/server.cpp @${REINPLACE_CMD} -e 's,__linux__,__${OPSYS}__,' \ ${WRKSRC}/src/clipboard.cpp # Point to the right location where to look for resources on FreeBSD @${REINPLACE_CMD} -e 's,HAVE_CONFIG_H,__FreeBSD__,' \ -e 's,DATADIR,"${DATADIR}",' ${WRKSRC}/src/filesystem.cpp @${REINPLACE_CMD} -e 's,itor->second,"${DATADIR}/" + &,' \ ${WRKSRC}/src/sound.cpp @${REINPLACE_CMD} -e '/\/locale\//s,\.,${PREFIX}/share,' \ ${WRKSRC}/src/i18n.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/game ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_PROGRAM} ${WRKSRC}/server \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-server cd ${WRKSRC}/modules/frogatto/locale && \ ${MV} hu_HU hu && ${MV} ms_MY ms cd ${WRKSRC}/modules/frogatto && ${COPYTREE_SHARE} \ locale ${STAGEDIR}${PREFIX}/share cd ${WRKSRC} && ${COPYTREE_SHARE} "data images music modules utils" \ ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${INSTALL_DATA} *.ttf *.cfg ${STAGEDIR}${DATADIR} # Dynamically generate part of the PLIST for NLS files and game resources # (really lots of them) @${FIND} ${STAGEDIR}${PREFIX}/share/locale -name ${PORTNAME}.mo | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' | ${SORT} >> ${TMPPLIST} @${FIND} ${STAGEDIR}${DATADIR} -not -type d | \ ${SED} 's,^${STAGEDIR}${PREFIX}/,,' | ${SORT} >> ${TMPPLIST} .include Index: head/games/frogatto/files/patch-Makefile =================================================================== --- head/games/frogatto/files/patch-Makefile (revision 472569) +++ head/games/frogatto/files/patch-Makefile (revision 472570) @@ -1,38 +1,38 @@ --- Makefile.orig 2012-12-08 22:36:13 UTC +++ Makefile @@ -22,7 +22,7 @@ # found in PATH), this option has no effect. # -OPTIMIZE=yes +OPTIMIZE=no CCACHE?=ccache USE_CCACHE?=$(shell which $(CCACHE) 2>&1 > /dev/null && echo yes) ifneq ($(USE_CCACHE),yes) @@ -34,7 +34,7 @@ BASE_CXXFLAGS += -O2 endif # Initial compiler options, used before CXXFLAGS and CPPFLAGS. -BASE_CXXFLAGS += -g -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wignored-qualifiers -Wformat -Wswitch -+BASE_CXXFLAGS += -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wformat -Wswitch ++BASE_CXXFLAGS += -fno-inline-functions -fthreadsafe-statics -Wnon-virtual-dtor -Werror -Wformat -Wswitch -Wno-narrowing # Compiler include options, used after CXXFLAGS and CPPFLAGS. INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib) @@ -60,7 +60,7 @@ game: $(objects) $(CCACHE) $(CXX) \ $(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INC) \ $(objects) -o game \ - $(LIBS) -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics + $(LIBS) -lboost_regex -lboost_system -lpthread -fthreadsafe-statics # pull in dependency info for *existing* .o files -include $(objects:.o=.d) @@ -69,7 +69,7 @@ server: $(server_objects) $(CCACHE) $(CXX) \ $(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) \ $(server_objects) -o server \ - $(LIBS) -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt + $(LIBS) -lboost_regex -lboost_system -lboost_thread -lboost_iostreams clean: rm -f *.o *.d game Index: head/games/frogatto/files/patch-src-code_editor_dialog.cpp =================================================================== --- head/games/frogatto/files/patch-src-code_editor_dialog.cpp (nonexistent) +++ head/games/frogatto/files/patch-src-code_editor_dialog.cpp (revision 472570) @@ -0,0 +1,11 @@ +--- src/code_editor_dialog.cpp.orig 2018-06-16 12:59:49.843741000 +0300 ++++ src/code_editor_dialog.cpp 2018-06-16 13:01:13.695918000 +0300 +@@ -55,7 +55,7 @@ + + //std::cerr << "CED: " << x() << "," << y() << "; " << width() << "," << height() << std::endl; + drag_widget* dragger = new drag_widget(x(), y(), width(), height(), +- drag_widget::DRAG_HORIZONTAL, NULL, ++ drag_widget::DRAG_HORIZONTAL, [](int, int){}, + boost::bind(&code_editor_dialog::on_drag_end, this, _1, _2), + boost::bind(&code_editor_dialog::on_drag, this, _1, _2)); + Property changes on: head/games/frogatto/files/patch-src-code_editor_dialog.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/frogatto/files/patch-src-surface_cache.cpp =================================================================== --- head/games/frogatto/files/patch-src-surface_cache.cpp (nonexistent) +++ head/games/frogatto/files/patch-src-surface_cache.cpp (revision 472570) @@ -0,0 +1,11 @@ +--- src/surface_cache.cpp.orig 2018-06-16 13:59:29.319430000 +0300 ++++ src/surface_cache.cpp 2018-06-16 14:00:09.140102000 +0300 +@@ -116,7 +116,7 @@ + } + #endif // ANDROID + //std::cerr << "loading image '" << fname << "'\n"; +- if(surf.get() == false || surf->w == 0) { ++ if(surf.get() == nullptr || surf->w == 0) { + if(key != "") { + std::cerr << "failed to load image '" << key << "'\n"; + } Property changes on: head/games/frogatto/files/patch-src-surface_cache.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/frogatto/files/patch-src-texture.hpp =================================================================== --- head/games/frogatto/files/patch-src-texture.hpp (nonexistent) +++ head/games/frogatto/files/patch-src-texture.hpp (revision 472570) @@ -0,0 +1,11 @@ +--- src/texture.hpp.orig 2018-06-16 11:06:31.462187000 +0300 ++++ src/texture.hpp 2018-06-16 11:11:11.775394000 +0300 +@@ -58,7 +58,7 @@ + unsigned int get_id() const; + static void set_current_texture(unsigned int id); + void set_as_current_texture() const; +- bool valid() const { return id_; } ++ bool valid() const { return static_cast(id_); } + + static texture get(const std::string& str, int options=0); + static texture get(const std::string& str, const std::string& algorithm); Property changes on: head/games/frogatto/files/patch-src-texture.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property