From owner-svn-ports-head@FreeBSD.ORG Tue Jul 15 17:18:19 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37AD43D8; Tue, 15 Jul 2014 17:18:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 23DC12E01; Tue, 15 Jul 2014 17:18:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FHIJtp091063; Tue, 15 Jul 2014 17:18:19 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FHIIvs091057; Tue, 15 Jul 2014 17:18:18 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201407151718.s6FHIIvs091057@svn.freebsd.org> From: Alexey Dokuchaev Date: Tue, 15 Jul 2014 17:18:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361983 - in head/games/frogatto: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2014 17:18:19 -0000 Author: danfe Date: Tue Jul 15 17:18:18 2014 New Revision: 361983 URL: http://svnweb.freebsd.org/changeset/ports/361983 QAT: https://qat.redports.org/buildarchive/r361983/ Log: Update to version 1.3.1 and stagify (slightly less intrusive patch committed compared to the one in the PR). PR: 190513 Added: head/games/frogatto/files/patch-Makefile (contents, props changed) Deleted: head/games/frogatto/files/patch-data-objects-enemies-milgramen-milgram_pod_launcher.cfg head/games/frogatto/files/patch-src-custom_object.cpp Modified: head/games/frogatto/Makefile head/games/frogatto/distinfo Modified: head/games/frogatto/Makefile ============================================================================== --- head/games/frogatto/Makefile Tue Jul 15 17:16:46 2014 (r361982) +++ head/games/frogatto/Makefile Tue Jul 15 17:18:18 2014 (r361983) @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= frogatto -PORTVERSION= 1.2 -PORTREVISION= 2 +PORTVERSION= 1.3.1 CATEGORIES= games -MASTER_SITES= GH MAINTAINER= fiziologus@gmail.com COMMENT= Old-school 2D classic adventure platformer game @@ -17,52 +15,48 @@ NO_PACKAGE= Package will be 144M, set FO USE_GITHUB= yes GH_ACCOUNT= frogatto -GH_PROGECT= frogatto GH_TAGNAME= ${PORTVERSION} -GH_COMMIT= 64c84bf +GH_COMMIT= 58bd7c6 -USES= gmake +USES= gmake pkgconfig ALL_TARGET= game server USE_GL= glew USE_SDL= image mixer ttf PLIST_FILES= bin/${PORTNAME} bin/${PORTNAME}-server -NO_STAGE= yes post-patch: -# Sanitize Makefile: honor CC/CXX and C[XX]FLAGS, trim `-mt' suffix from boost -# libraries, remove superfluous libraries when linking server executable (add -# missing -pthread instead), etc. - @${REINPLACE_CMD} -E -e 's,= (ccache )?gcc,:= $$(CC) $$(CFLAGS),' \ - -e 's,= (ccache )?g\+\+,:= $$(CXX) $$(CXXFLAGS),' \ - -e 's, -O2,, ; s, -g,, ; s, -L/usr/lib,, ; s, -L/sw/lib,,' \ - -e '/server/s,`.*mixer,-L${LOCALBASE}/lib ${PTHREAD_LIBS},' \ - -e 's,-mt,,g' -e 's,-lpng,-lpng15,g' ${WRKSRC}/Makefile + @${ECHO_CMD} >> ${WRKSRC}/src/difficulty.hpp + @${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,(music|sounds)/,${DATADIR}/&,' \ + @${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 ${PREFIX}/bin/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/server ${PREFIX}/bin/${PORTNAME}-server - cd ${WRKSRC} && ${COPYTREE_SHARE} "data images music sounds" \ - ${DATADIR} - cd ${WRKSRC}/locale && ${MV} hu_HU hu && ${MV} ms_MY ms - cd ${WRKSRC} && ${COPYTREE_SHARE} "locale" ${PREFIX}/share -# Fix permissions on DATADIR after COPYTREE_SHARE (cpio(1) defaults to 700 -# if target directory (${DATADIR}) does not exist) - @${CHMOD} 755 ${DATADIR} + ${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 -# (lots of them) - @${FIND} ${PREFIX}/share/locale -name ${PORTNAME}.mo | \ - ${SED} 's,^${PREFIX}/,,' | ${SORT} >> ${TMPPLIST} - @${FIND} ${DATADIR} -not -type d | \ - ${SED} 's,^${PREFIX}/,,' | ${SORT} >> ${TMPPLIST} - @${FIND} ${DATADIR} -type d | \ - ${SED} 's,^${PREFIX}/,@dirrm ,' | ${SORT} -r >> ${TMPPLIST} +# (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} + @${FIND} ${STAGEDIR}${DATADIR} -type d | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' | \ + ${SORT} -r >> ${TMPPLIST} .include Modified: head/games/frogatto/distinfo ============================================================================== --- head/games/frogatto/distinfo Tue Jul 15 17:16:46 2014 (r361982) +++ head/games/frogatto/distinfo Tue Jul 15 17:18:18 2014 (r361983) @@ -1,2 +1,2 @@ -SHA256 (frogatto-1.2.tar.gz) = b735bda8d409612eecc79e84d218b3bd460470f8bccca3472d08c893d91d1232 -SIZE (frogatto-1.2.tar.gz) = 261545835 +SHA256 (frogatto-1.3.1.tar.gz) = 071059b99ea9b947bed42f99d885770455b72e584da8516443ef316cf187256a +SIZE (frogatto-1.3.1.tar.gz) = 500362508 Added: head/games/frogatto/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/frogatto/files/patch-Makefile Tue Jul 15 17:18:18 2014 (r361983) @@ -0,0 +1,47 @@ +--- Makefile.orig ++++ 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,14 +34,14 @@ 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 + + # Compiler include options, used after CXXFLAGS and CPPFLAGS. +-INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib) ++INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng) + + # Linker library options. + LIBS := $(shell pkg-config --libs x11 ) -lSDLmain \ +- $(shell pkg-config --libs sdl glu glew SDL_image libpng zlib) -lSDL_ttf -lSDL_mixer ++ $(shell pkg-config --libs sdl glu glew SDL_image libpng) -lSDL_ttf -lSDL_mixer + + include Makefile.common + +@@ -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