[82174] trunk/dports/games/neverball

[jmr at macports.org]

Revision: 82174
          http://trac.macports.org/changeset/82174
Author:   jmr at macports.org
Date:     2011-08-09 15:25:59 -0700 (Tue, 09 Aug 2011)
Log Message:
-----------
neverball: don't link mapc tool against SDLmain

Modified Paths:
--------------
    trunk/dports/games/neverball/Portfile
    trunk/dports/games/neverball/files/patch-Makefile.diff

Added Paths:
-----------
    trunk/dports/games/neverball/files/patch-share-mapc.c

Modified: trunk/dports/games/neverball/Portfile
===================================================================
--- trunk/dports/games/neverball/Portfile	2011-08-09 21:21:01 UTC (rev 82173)
+++ trunk/dports/games/neverball/Portfile	2011-08-09 22:25:59 UTC (rev 82174)
@@ -17,7 +17,7 @@
 homepage	http://icculus.org/neverball/
 master_sites	${homepage}
 checksums	md5 a6cd860f1c2b7d8cecbcfc05ff228ef0
-patchfiles	patch-Makefile.diff patch-ball-main.c patch-putt-main.c
+patchfiles	patch-Makefile.diff patch-ball-main.c patch-putt-main.c patch-share-mapc.c
 
 depends_lib	path:lib/pkgconfig/sdl.pc:libsdl \
 		port:libsdl_image \

Modified: trunk/dports/games/neverball/files/patch-Makefile.diff
===================================================================
--- trunk/dports/games/neverball/files/patch-Makefile.diff	2011-08-09 21:21:01 UTC (rev 82173)
+++ trunk/dports/games/neverball/files/patch-Makefile.diff	2011-08-09 22:25:59 UTC (rev 82174)
@@ -1,5 +1,5 @@
---- Makefile~	2004-09-08 13:31:40.000000000 -0700
-+++ Makefile	2007-01-22 14:27:09.000000000 -0800
+--- Makefile.orig	2004-09-09 06:31:40.000000000 +1000
++++ Makefile	2011-08-10 08:22:24.000000000 +1000
 @@ -6,12 +6,12 @@
  #X11_PATH= -L/usr/X11/lib
  #X11_PATH= -L/usr/X11R6/lib
@@ -15,3 +15,12 @@
  #CFLAGS= -Wall -g -ansi $(shell sdl-config --cflags)
  #CFLAGS= -Wall -pg -ansi $(shell sdl-config --cflags)
  
+@@ -265,7 +265,7 @@
+ 	$(CC) $(CFLAGS) -o $(PUTT_TARG) $(PUTT_OBJS) $(LIBS)
+ 
+ $(MAPC_TARG) : $(MAPC_OBJS)
+-	$(CC) $(CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LIBS)
++	$(CC) $(CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) `echo $(LIBS) | sed 's|-lSDLmain||'`
+ 
+ clean-src :
+ 	rm -f $(BALL_TARG) $(BALL_OBJS) $(BALL_DEPS)

Added: trunk/dports/games/neverball/files/patch-share-mapc.c
===================================================================
--- trunk/dports/games/neverball/files/patch-share-mapc.c	                        (rev 0)
+++ trunk/dports/games/neverball/files/patch-share-mapc.c	2011-08-09 22:25:59 UTC (rev 82174)
@@ -0,0 +1,10 @@
+--- share/mapc.c.orig	2004-08-29 08:26:29.000000000 +1000
++++ share/mapc.c	2011-08-10 08:16:35.000000000 +1000
+@@ -26,6 +26,7 @@
+ /*---------------------------------------------------------------------------*/
+ 
+ #include <SDL.h>
++#undef main
+ #include <SDL_image.h>
+ #include <stdio.h>
+ #include <stdlib.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110809/dd43024b/attachment.html>