9 files changed, 42 insertions, 43 deletions

diff --git a/games/megamario/Makefile b/games/megamario/Makefile
index 5370d708c7fb..7f61cfb60d4e 100644
--- a/games/megamario/Makefile
+++ b/games/megamario/Makefile
@@ -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.txt
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 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 <bsd.port.mk>
diff --git a/games/megamario/files/patch-Makefile b/games/megamario/files/patch-Makefile
index 5efd92922898..88855057ba64 100644
--- a/games/megamario/files/patch-Makefile
+++ b/games/megamario/files/patch-Makefile
@@ -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
diff --git a/games/megamario/files/patch-src-global.cpp b/games/megamario/files/patch-src-global.cpp
deleted file mode 100644
index 19786337b67e..000000000000
--- a/games/megamario/files/patch-src-global.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/global.cpp.orig	2012-05-06 00:44:34.000000000 +0200
-+++ src/global.cpp	2012-05-06 00:50:32.000000000 +0200
-@@ -9,6 +9,7 @@
- 
- #include "Global.h"
- #include "unixutils.h"
-+#include <limits.h>
- 
- 
- 
diff --git a/games/megamario/files/patch-src-levels.h b/games/megamario/files/patch-src-levels.h
deleted file mode 100644
index 25d7cb628697..000000000000
--- a/games/megamario/files/patch-src-levels.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/levels.h.orig	2012-05-06 00:44:34.000000000 +0200
-+++ src/levels.h	2012-05-06 00:52:50.000000000 +0200
-@@ -8,7 +8,7 @@
- 
- #ifndef __LEVELS_H__
- #define __LEVELS_H__
--
-+#include <limits.h>
- 
- class cScene
- {
diff --git a/games/megamario/files/patch-src-functions.cpp b/games/megamario/files/patch-src__functions.cpp
index 79ae6f034a1a..06fce13cbff2 100644
--- a/games/megamario/files/patch-src-functions.cpp
+++ b/games/megamario/files/patch-src__functions.cpp
@@ -1,5 +1,5 @@
---- src/functions.cpp.orig	2012-05-06 00:56:40.000000000 +0200
-+++ src/functions.cpp	2012-05-06 01:00:37.000000000 +0200
+--- ./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
diff --git a/games/megamario/files/patch-src__global.cpp b/games/megamario/files/patch-src__global.cpp
new file mode 100644
index 000000000000..d91aecfef3c2
--- /dev/null
+++ b/games/megamario/files/patch-src__global.cpp
@@ -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 <limits.h>
+ 
+ 
+ 
diff --git a/games/megamario/files/patch-src__levels.h b/games/megamario/files/patch-src__levels.h
new file mode 100644
index 000000000000..25624b54ab37
--- /dev/null
+++ b/games/megamario/files/patch-src__levels.h
@@ -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 <limits.h>
+ 
+ class cScene
+ {
diff --git a/games/megamario/files/patch-src-main.cpp b/games/megamario/files/patch-src__main.cpp
index 8e0cf6511557..8d960ba09c49 100644
--- a/games/megamario/files/patch-src-main.cpp
+++ b/games/megamario/files/patch-src__main.cpp
@@ -1,5 +1,5 @@
---- src/main.cpp.orig	2013-09-20 13:22:00.000000000 +0200
-+++ src/main.cpp	2013-09-20 13:23:53.000000000 +0200
+--- ./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__ */
diff --git a/games/megamario/files/patch-src-player.cpp b/games/megamario/files/patch-src__player.cpp
index ff30a2ccf040..0d116b346610 100644
--- a/games/megamario/files/patch-src-player.cpp
+++ b/games/megamario/files/patch-src__player.cpp
@@ -1,5 +1,5 @@
---- src/player.cpp.orig	2012-05-05 20:22:06.000000000 +0200
-+++ src/player.cpp	2012-05-05 21:08:10.000000000 +0200
+--- ./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"