Date: Sun, 23 Nov 2014 13:29:58 +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: r373148 - in head/games/pingus: . files Message-ID: <201411231329.sANDTwqv065212@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun Nov 23 13:29:57 2014 New Revision: 373148 URL: https://svnweb.freebsd.org/changeset/ports/373148 QAT: https://qat.redports.org/buildarchive/r373148/ Log: - Update to 0.7.6 - Take maintainership PR: 194341, 194711 Added: head/games/pingus/files/patch-SConscript (contents, props changed) head/games/pingus/files/patch-src__pingus__pingus_main.cpp (contents, props changed) head/games/pingus/files/patch-src__pingus__screens__pingus_menu.cpp (contents, props changed) head/games/pingus/files/patch-src__util__file_reader.hpp (contents, props changed) Deleted: head/games/pingus/files/patch-SConstruct head/games/pingus/files/patch-src-editor-editor__screen.hpp head/games/pingus/files/patch-src-screenshot.cpp head/games/pingus/files/patch-src-tinygettext_iconv.cpp Modified: head/games/pingus/Makefile head/games/pingus/distinfo Modified: head/games/pingus/Makefile ============================================================================== --- head/games/pingus/Makefile Sun Nov 23 13:22:05 2014 (r373147) +++ head/games/pingus/Makefile Sun Nov 23 13:29:57 2014 (r373148) @@ -2,48 +2,44 @@ # $FreeBSD$ PORTNAME= pingus -PORTVERSION= 0.7.2 -PORTREVISION= 13 +PORTVERSION= 0.7.6 CATEGORIES= games -MASTER_SITES= http://pingus.seul.org/files/ +MASTER_SITES= GOOGLE_CODE \ + http://mirror.amdmi3.ru/distfiles/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= amdmi3@FreeBSD.org COMMENT= Free Lemmings-like game LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ - libboost_regex.so:${PORTSDIR}/devel/boost-libs \ - libphysfs.so:${PORTSDIR}/devel/physfs + libboost_signals.so:${PORTSDIR}/devel/boost-libs -USES= iconv scons tar:bzip2 -MAKE_ARGS= with_linuxusbmouse=0 \ - with_linuxevdev=0 +USES= compiler:c++11-lib iconv scons tar:bzip2 +USE_GL= gl USE_SDL= sdl image mixer +LIBS+= ${ICONV_LIB} +MAKE_ARGS+= LIBS="${LIBS}" -DESKTOP_ENTRIES="Pingus" "${COMMENT}" \ - "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ - "pingus" "" "false" - -PLIST= ${WRKDIR}/pkg-plist +PLIST_FILES= bin/${PORTNAME} \ + share/pixmaps/${PORTNAME}.png +PORTDATA= * + +DESKTOP_ENTRIES="Pingus" \ + "" \ + "${PORTNAME}" \ + "${PORTNAME}" \ + "Game;LogicGame;" \ + false post-patch: - @${REINPLACE_CMD} -e 's|add_path("data")|add_path("${DATADIR}")|g' \ - ${WRKSRC}/src/pingus_main.cpp - -pre-install: - @${RM} -f ${PLIST} - @${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST} - @${ECHO_CMD} "share/pixmaps/${PORTNAME}.ico" >> ${PLIST} - @cd ${WRKSRC}/data && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ - ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST} - @${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST} + @${REINPLACE_CMD} -e '/g_path_manager.set_path("data")/ s|data|${DATADIR}|g' \ + ${WRKSRC}/src/pingus/pingus_main.cpp + @${REINPLACE_CMD} -e '/CheckLib.*iconv/ d' ${WRKSRC}/SConscript do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/data && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/src/win32/icon1.ico \ - ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico + ${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/data/images/icons/pingus-icon.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .include <bsd.port.mk> Modified: head/games/pingus/distinfo ============================================================================== --- head/games/pingus/distinfo Sun Nov 23 13:22:05 2014 (r373147) +++ head/games/pingus/distinfo Sun Nov 23 13:29:57 2014 (r373148) @@ -1,2 +1,2 @@ -SHA256 (pingus-0.7.2.tar.bz2) = 8d24fbab29ca9401ae1a6a34f7a52eda5de0a9320940e771c6f04f991f5d0052 -SIZE (pingus-0.7.2.tar.bz2) = 11055748 +SHA256 (pingus-0.7.6.tar.bz2) = 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460 +SIZE (pingus-0.7.6.tar.bz2) = 12622268 Added: head/games/pingus/files/patch-SConscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pingus/files/patch-SConscript Sun Nov 23 13:29:57 2014 (r373148) @@ -0,0 +1,13 @@ +Properly split multiple arguments passed via CXXFLAGS +--- SConscript.orig 2014-10-17 23:53:30.000000000 +0400 ++++ SConscript 2014-10-17 23:53:48.000000000 +0400 +@@ -119,6 +119,9 @@ + 'CheckSDLLib': CheckSDLLib, + 'CheckIconv': CheckIconv, + }) ++ ++ self.env["CXXFLAGS"] = sum(map (lambda x: x.split(" "), self.env["CXXFLAGS"]), []) ++ + self.fatal_error = "" + self.reports = "" + Added: head/games/pingus/files/patch-src__pingus__pingus_main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pingus/files/patch-src__pingus__pingus_main.cpp Sun Nov 23 13:29:57 2014 (r373148) @@ -0,0 +1,11 @@ +--- src/pingus/pingus_main.cpp.orig 2011-12-25 01:46:47.000000000 +0400 ++++ src/pingus/pingus_main.cpp 2014-10-17 23:57:58.000000000 +0400 +@@ -465,7 +465,7 @@ + void + PingusMain::print_greeting_message() + { +- std::string greeting = "Welcome to Pingus "VERSION; ++ std::string greeting = "Welcome to Pingus " VERSION; + greeting += "!"; + std::cout << greeting << std::endl; + for (unsigned int i = 0; i < greeting.length(); ++i) Added: head/games/pingus/files/patch-src__pingus__screens__pingus_menu.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pingus/files/patch-src__pingus__screens__pingus_menu.cpp Sun Nov 23 13:29:57 2014 (r373148) @@ -0,0 +1,11 @@ +--- src/pingus/screens/pingus_menu.cpp.orig 2011-12-25 01:46:47.000000000 +0400 ++++ src/pingus/screens/pingus_menu.cpp 2014-10-17 23:58:35.000000000 +0400 +@@ -153,7 +153,7 @@ + gc.get_height()/2 - 280)); + + gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140), +- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n" ++ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n" + "See the file AUTHORS for a complete list of contributors.\n" + "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n" + "welcome to redistribute it under certain conditions; see the file COPYING for details.\n"); Added: head/games/pingus/files/patch-src__util__file_reader.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pingus/files/patch-src__util__file_reader.hpp Sun Nov 23 13:29:57 2014 (r373148) @@ -0,0 +1,10 @@ +--- src/util/file_reader.hpp.orig 2011-12-25 01:46:47.000000000 +0400 ++++ src/util/file_reader.hpp 2014-10-17 23:56:43.000000000 +0400 +@@ -19,6 +19,7 @@ + + #include <memory> + #include <vector> ++#include <string> + + class Size; + class Color;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411231329.sANDTwqv065212>