From owner-svn-ports-all@FreeBSD.ORG Mon Jan 13 01:08:13 2014 Return-Path: Delivered-To: svn-ports-all@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 5C2C95C5; Mon, 13 Jan 2014 01:08:13 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 46BDA117F; Mon, 13 Jan 2014 01:08:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0D18DPi005898; Mon, 13 Jan 2014 01:08:13 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0D18BYx005885; Mon, 13 Jan 2014 01:08:11 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201401130108.s0D18BYx005885@svn.freebsd.org> From: Rusmir Dusko Date: Mon, 13 Jan 2014 01:08:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339563 - in head/games/megamario: . 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jan 2014 01:08:13 -0000 Author: nemysis Date: Mon Jan 13 01:08:11 2014 New Revision: 339563 URL: http://svnweb.freebsd.org/changeset/ports/339563 Log: - USES dos2unix and DOS2UNIX_FILES instead of USE_DOS2UNIX - Support STAGEDIR - Break lines around 80 characters - Disable all warnings with -w - Recreate patches with make makepatch Added: head/games/megamario/files/patch-src__functions.cpp (contents, props changed) head/games/megamario/files/patch-src__global.cpp (contents, props changed) head/games/megamario/files/patch-src__levels.h (contents, props changed) head/games/megamario/files/patch-src__main.cpp (contents, props changed) head/games/megamario/files/patch-src__player.cpp (contents, props changed) Deleted: head/games/megamario/files/patch-src-functions.cpp head/games/megamario/files/patch-src-global.cpp head/games/megamario/files/patch-src-levels.h head/games/megamario/files/patch-src-main.cpp head/games/megamario/files/patch-src-player.cpp Modified: head/games/megamario/Makefile head/games/megamario/files/patch-Makefile Modified: head/games/megamario/Makefile ============================================================================== --- head/games/megamario/Makefile Sun Jan 12 23:26:49 2014 (r339562) +++ head/games/megamario/Makefile Mon Jan 13 01:08:11 2014 (r339563) @@ -16,11 +16,12 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_ZIP= yes EXTRACT_AFTER_ARGS= -d ${WRKSRC} -USES= gmake +USES= dos2unix gmake +DOS2UNIX_FILES= src/*.cpp src/*.h *.ini Makefile* *.txt *.desktop USE_SDL= sdl image mixer ttf USE_GL= glu -USE_DOS2UNIX= *.cpp *.h *.ini Makefile* *.txt *.desktop ALL_TARGET= ${PORTNAME} +MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} pre-extract: ${MKDIR} ${WRKDIR}/${DISTNAME} @@ -29,9 +30,6 @@ PORTDOCS= CONTROLS.txt linux.txt readme. OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include - post-patch: @${REINPLACE_CMD} -e 's|/usr/share/pixmaps/megamario.png|${PORTNAME}|' \ -e 's|Name=megamario|Name=Mega Mario|' \ @@ -43,13 +41,14 @@ post-patch: ${MV} $$i `echo $$i | ${SED} -e 's/PNG/png/;s/JPG/jpg/'`; done post-install: - @(cd ${WRKSRC} && ${COPYTREE_SHARE} "help mp3music screens" ${DATADIR}) - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps/ - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications/ - -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif +.for d in help mp3music screens + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) +.endfor + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/games/megamario/files/patch-Makefile ============================================================================== --- head/games/megamario/files/patch-Makefile Sun Jan 12 23:26:49 2014 (r339562) +++ head/games/megamario/files/patch-Makefile Mon Jan 13 01:08:11 2014 (r339563) @@ -1,10 +1,10 @@ ---- Makefile.orig 2013-09-18 22:38:41.000000000 +0200 -+++ Makefile 2013-09-18 23:05:32.000000000 +0200 +--- ./Makefile.orig 2014-01-13 00:20:07.000000000 +0100 ++++ ./Makefile 2014-01-13 00:30:43.000000000 +0100 @@ -1,8 +1,7 @@ -PREFIX = /home/opt DATADIR = $(PREFIX)/share/$(TARGET) -CFLAGS = -g -Wall -O2 -+CFLAGS += $(shell sdl-config --cflags) ++CFLAGS += $(shell sdl-config --cflags) -w CXXFLAGS= $(CFLAGS) -LDFLAGS = -lSDL -lSDL_mixer -lSDL_ttf -lSDL_image -lGL +LDFLAGS += $(shell sdl-config --libs) -lSDL -lSDL_mixer -lSDL_ttf -lSDL_image -lGL -lm Added: head/games/megamario/files/patch-src__functions.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megamario/files/patch-src__functions.cpp Mon Jan 13 01:08:11 2014 (r339563) @@ -0,0 +1,11 @@ +--- ./src/functions.cpp.orig 2014-01-13 00:20:08.000000000 +0100 ++++ ./src/functions.cpp 2014-01-13 00:20:08.000000000 +0100 +@@ -447,7 +447,7 @@ + } + else + { +- sprintf(tmp, "mp3music/%s",filename); ++ sprintf(tmp, DATADIR "mp3music/%s",filename); + tmp[strlen(tmp)-3]='m'; + tmp[strlen(tmp)-2]='p'; + tmp[strlen(tmp)-1]='3'; Added: head/games/megamario/files/patch-src__global.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megamario/files/patch-src__global.cpp Mon Jan 13 01:08:11 2014 (r339563) @@ -0,0 +1,10 @@ +--- ./src/global.cpp.orig 2014-01-13 00:20:08.000000000 +0100 ++++ ./src/global.cpp 2014-01-13 00:20:08.000000000 +0100 +@@ -9,6 +9,7 @@ + + #include "Global.h" + #include "unixutils.h" ++#include + + + Added: head/games/megamario/files/patch-src__levels.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megamario/files/patch-src__levels.h Mon Jan 13 01:08:11 2014 (r339563) @@ -0,0 +1,11 @@ +--- ./src/levels.h.orig 2014-01-13 00:20:08.000000000 +0100 ++++ ./src/levels.h 2014-01-13 00:20:08.000000000 +0100 +@@ -8,7 +8,7 @@ + + #ifndef __LEVELS_H__ + #define __LEVELS_H__ +- ++#include + + class cScene + { Added: head/games/megamario/files/patch-src__main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megamario/files/patch-src__main.cpp Mon Jan 13 01:08:11 2014 (r339563) @@ -0,0 +1,29 @@ +--- ./src/main.cpp.orig 2014-01-13 00:20:08.000000000 +0100 ++++ ./src/main.cpp 2014-01-13 00:20:08.000000000 +0100 +@@ -61,7 +61,7 @@ + + #endif /* defined __unix__ */ + +- out_logfile.open ("log.txt"); ++ out_logfile.open ("%s/.megamario/log.txt"); + + dictionary * d = iniparser_new(szIniFile); + pixelation = iniparser_getboolean (d, "Mario:Pixelation", 1); +@@ -238,7 +238,7 @@ + + if(event.key.keysym.sym == SDLK_F12) + { +- char gammel[100]; ++ char *gammel = new char[100]; + sprintf(gammel,"screenshots/%d.bmp",rand()%10000); + SDL_SaveBMP(screen,gammel); + delete[] gammel; +@@ -413,7 +413,7 @@ + + + fstream fin; +-fin.open("mp3music/music_available.dat",ios::in); ++fin.open( DATADIR "mp3music/music_available.dat",ios::in); + if( fin.is_open() ) + { + HighQualityMusicFound=1; Added: head/games/megamario/files/patch-src__player.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/megamario/files/patch-src__player.cpp Mon Jan 13 01:08:11 2014 (r339563) @@ -0,0 +1,12 @@ +--- ./src/player.cpp.orig 2014-01-13 00:20:08.000000000 +0100 ++++ ./src/player.cpp 2014-01-13 00:20:08.000000000 +0100 +@@ -10,7 +10,9 @@ + #include "Global.h" + + //#include ++#ifndef M_PI + #define M_PI 3.141592654 ++#endif + + + #define JUMPS 12