Date: Fri, 22 Aug 2014 16:45:38 +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: r365675 - in head/games/criticalmass: . files Message-ID: <201408221645.s7MGjcAJ039221@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Aug 22 16:45:38 2014 New Revision: 365675 URL: http://svnweb.freebsd.org/changeset/ports/365675 QAT: https://qat.redports.org/buildarchive/r365675/ Log: - Update to 1.0.2 - Add LICENSE - Stagify PR: 192795 Submitted by: tkato432@yahoo.com Added: head/games/criticalmass/files/patch-tinyxml__tinyxml.cpp (contents, props changed) head/games/criticalmass/files/patch-tinyxml__tinyxmlparser.cpp (contents, props changed) head/games/criticalmass/files/patch-utils__ResourceManager.cpp (contents, props changed) head/games/criticalmass/files/patch-utils__Value.hpp (contents, props changed) head/games/criticalmass/files/patch-utils__zStream.cpp (contents, props changed) head/games/criticalmass/files/patch-utils__zStreamBufferImplZLib.cpp (contents, props changed) Deleted: head/games/criticalmass/files/patch-utils_WalkDirectory.hpp head/games/criticalmass/files/patch-utilsgl_gl++.hpp Modified: head/games/criticalmass/Makefile head/games/criticalmass/distinfo head/games/criticalmass/files/patch-utilssdl_PNG.cpp head/games/criticalmass/pkg-descr Modified: head/games/criticalmass/Makefile ============================================================================== --- head/games/criticalmass/Makefile Fri Aug 22 16:36:53 2014 (r365674) +++ head/games/criticalmass/Makefile Fri Aug 22 16:45:38 2014 (r365675) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= criticalmass -PORTVERSION= 1.0.0 -PORTREVISION= 11 +PORTVERSION= 1.0.2 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Critical%20Mass/${PORTVERSION} @@ -12,36 +11,52 @@ DISTNAME= CriticalMass-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= SDL/OpenGL space shoot'em up game -LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +LICENSE= GPLv2 # (or later) +LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= shaaft-[0-9]* +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libpng15.so:${PORTSDIR}/graphics/png -USES= tar:bzip2 -USE_SDL= image mixer sdl -USE_GL= gl +USES= dos2unix tar:bzip2 +DOS2UNIX_FILES= tinyxml/*.cpp tinyxml/*.h USE_XORG= x11 +USE_GL= gl +USE_SDL= image mixer sdl +USE_GCC= any GNU_CONFIGURE= yes -CFLAGS= -I${LOCALBASE}/include/libpng15 CONFIGURE_ARGS= --disable-optimize -MAN6= critter.6 +CPPFLAGS+= $$(libpng-config --I_opts) $$(curl-config --cflags) \ + -I${LOCALBASE}/include +LDFLAGS+= $$(libpng-config --L_opts) $$(curl-config --libs) \ + -L${LOCALBASE}/lib + +CONFLICTS= shaaft-[0-9]* + PLIST_FILES= bin/Packer \ bin/critter \ + man/man6/critter.6.gz \ share/Critical_Mass/lg-criti.xm \ share/Critical_Mass/resource.dat PLIST_DIRS= share/Critical_Mass -NO_STAGE= yes -.include <bsd.port.pre.mk> +DESKTOP_ENTRIES="CriticallMass" "" "" "critter" "" "" post-patch: @${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|SDL/SDL|SDL|g' - @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG:T}|g ; \ - s|^CXXFLAGS|#CXXFLAGS|g ; \ - s|/usr/X11R6|${LOCALBASE}|g ; \ - s|-lSDL | |g ; \ - s|-lpng12|-lpng|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's| curl|| ; \ + s|^CXXFLAGS|#CXXFLAGS| ; \ + s|-lSDL | | ; \ + s|sdl-config|${SDL_CONFIG:T}| ; \ + s|-L/usr/local/lib -L/usr/X11R6/lib|| ; \ + s|-I/usr/X11R6/include|| ; \ + s|-lpng12|-lpng|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/^SUBDIRS/s| curl||' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's|../curl/lib/libcurl.a||' ${WRKSRC}/game/Makefile.in @${REINPLACE_CMD} -e 's|and def|\&\& def|g' ${WRKSRC}/utils/OSName.hpp -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/criticalmass/distinfo ============================================================================== --- head/games/criticalmass/distinfo Fri Aug 22 16:36:53 2014 (r365674) +++ head/games/criticalmass/distinfo Fri Aug 22 16:45:38 2014 (r365675) @@ -1,2 +1,2 @@ -SHA256 (CriticalMass-1.0.0.tar.bz2) = 94cedac39f9279faa63f6ce4098f2a778a8c8f9013ba8dd7d5b85766739e0858 -SIZE (CriticalMass-1.0.0.tar.bz2) = 5092549 +SHA256 (CriticalMass-1.0.2.tar.bz2) = 846db2d30d39e559612328594084a7aef980169948b2cfaee9fddec8ffdef724 +SIZE (CriticalMass-1.0.2.tar.bz2) = 5122126 Added: head/games/criticalmass/files/patch-tinyxml__tinyxml.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/criticalmass/files/patch-tinyxml__tinyxml.cpp Fri Aug 22 16:45:38 2014 (r365675) @@ -0,0 +1,21 @@ +--- tinyxml/tinyxml.cpp.orig ++++ tinyxml/tinyxml.cpp +@@ -22,6 +22,9 @@ + */ + + #include "tinyxml.h" ++#include <cstdlib> ++#include <cstring> ++#include <climits> + + + TiXmlNode::TiXmlNode( NodeType _type ) +@@ -377,7 +380,7 @@ + { + const std::string* s = Attribute( name ); + if ( s ) +- *i = atoi( s->c_str() ); ++ *i = ( int )strtol( s->c_str(), ( char ** )NULL, 10 ); + else + *i = 0; + return s; Added: head/games/criticalmass/files/patch-tinyxml__tinyxmlparser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/criticalmass/files/patch-tinyxml__tinyxmlparser.cpp Fri Aug 22 16:45:38 2014 (r365675) @@ -0,0 +1,12 @@ +--- tinyxml/tinyxmlparser.cpp.orig ++++ tinyxml/tinyxmlparser.cpp +@@ -23,7 +23,8 @@ + + + #include "tinyxml.h" +-#include <ctype.h> ++#include <cctype> ++#include <cstring> + + const char* TiXmlBase::SkipWhiteSpace( const char* p ) + { Added: head/games/criticalmass/files/patch-utils__ResourceManager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/criticalmass/files/patch-utils__ResourceManager.cpp Fri Aug 22 16:45:38 2014 (r365675) @@ -0,0 +1,10 @@ +--- utils/ResourceManager.cpp.orig ++++ utils/ResourceManager.cpp +@@ -12,6 +12,7 @@ + // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details + // ++#include <cstring> + #include <iomanip> + #include <sys/types.h> + #include <sys/stat.h> Added: head/games/criticalmass/files/patch-utils__Value.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/criticalmass/files/patch-utils__Value.hpp Fri Aug 22 16:45:38 2014 (r365675) @@ -0,0 +1,23 @@ +--- utils/Value.hpp.orig ++++ utils/Value.hpp +@@ -15,7 +15,8 @@ + #ifndef _Value_hpp_ + #define _Value_hpp_ + +-#include <stdio.h> ++#include <cstdio> ++#include <cstdlib> + #include <string> + + #include <Trace.hpp> +@@ -38,8 +39,8 @@ + Value( string s): + _valType(String), + _valString(s), +- _valInt( atoi(s.c_str())), +- _valFloat( (float)atof( s.c_str())), ++ _valInt( (int)strtol( s.c_str(), (char **)NULL, 10)), ++ _valFloat( (float)strtod( s.c_str(), (char **)NULL)), + _valBool( stringToBool(s)) + { + XTRACE(); Added: head/games/criticalmass/files/patch-utils__zStream.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/criticalmass/files/patch-utils__zStream.cpp Fri Aug 22 16:45:38 2014 (r365675) @@ -0,0 +1,11 @@ +--- utils/zStream.cpp.orig ++++ utils/zStream.cpp +@@ -12,6 +12,8 @@ + // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details + // ++#include <cstdlib> ++ + #include <Trace.hpp> + #include <Endian.hpp> + #include <zStream.hpp> Added: head/games/criticalmass/files/patch-utils__zStreamBufferImplZLib.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/criticalmass/files/patch-utils__zStreamBufferImplZLib.cpp Fri Aug 22 16:45:38 2014 (r365675) @@ -0,0 +1,11 @@ +--- utils/zStreamBufferImplZLib.cpp.orig ++++ utils/zStreamBufferImplZLib.cpp +@@ -12,6 +12,8 @@ + // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details + // ++#include <cstdlib> ++ + #include <Trace.hpp> + #include <zStreamBufferImplZLib.hpp> + Modified: head/games/criticalmass/files/patch-utilssdl_PNG.cpp ============================================================================== --- head/games/criticalmass/files/patch-utilssdl_PNG.cpp Fri Aug 22 16:36:53 2014 (r365674) +++ head/games/criticalmass/files/patch-utilssdl_PNG.cpp Fri Aug 22 16:45:38 2014 (r365675) @@ -1,19 +1,20 @@ --- utilssdl/PNG.cpp.orig 2004-12-18 03:41:42.000000000 +0100 +++ utilssdl/PNG.cpp 2012-05-08 07:00:15.000000000 +0200 -@@ -13,6 +13,7 @@ - // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details - // - #include <PNG.hpp> -+#include "pngpriv.h" +@@ -45,7 +45,7 @@ + { + png_size_t check; - //Save SDL surface as png - bool PNG::Save( SDL_Surface *img, const string &filename) -@@ -72,7 +73,7 @@ +- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); ++ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png))); + if( check != length) + { + png_error( png, "Write Error"); +@@ -72,7 +72,7 @@ return false; } - if( setjmp(_png->jmpbuf)) -+ if( setjmp(_png->longjmp_buffer)) ++ if( setjmp(png_jmpbuf(_png))) { fclose( fp); png_destroy_write_struct(&_png, (png_infopp)NULL); Modified: head/games/criticalmass/pkg-descr ============================================================================== --- head/games/criticalmass/pkg-descr Fri Aug 22 16:36:53 2014 (r365674) +++ head/games/criticalmass/pkg-descr Fri Aug 22 16:45:38 2014 (r365675) @@ -1,3 +1,3 @@ An SDL/OpenGL space shoot'em up game -WWW: http://criticalmass.sourceforge.net/ +WWW: http://criticalmass.sourceforge.net/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408221645.s7MGjcAJ039221>