[81427] trunk/dports/games/blobwars

[jmr at macports.org]

Revision: 81427
          http://trac.macports.org/changeset/81427
Author:   jmr at macports.org
Date:     2011-07-30 05:53:14 -0700 (Sat, 30 Jul 2011)
Log Message:
-----------
blobwars: don't use sdlmain in the pak tool

Modified Paths:
--------------
    trunk/dports/games/blobwars/Portfile
    trunk/dports/games/blobwars/files/patch-makefile.diff

Added Paths:
-----------
    trunk/dports/games/blobwars/files/patch-src_pak.h.diff

Modified: trunk/dports/games/blobwars/Portfile
===================================================================
--- trunk/dports/games/blobwars/Portfile	2011-07-30 12:14:02 UTC (rev 81426)
+++ trunk/dports/games/blobwars/Portfile	2011-07-30 12:53:14 UTC (rev 81427)
@@ -34,7 +34,7 @@
                         port:libsdl_net \
                         port:zlib
 
-patchfiles              patch-makefile.diff
+patchfiles              patch-makefile.diff patch-src_pak.h.diff
 
 use_configure           no
 

Modified: trunk/dports/games/blobwars/files/patch-makefile.diff
===================================================================
--- trunk/dports/games/blobwars/files/patch-makefile.diff	2011-07-30 12:14:02 UTC (rev 81426)
+++ trunk/dports/games/blobwars/files/patch-makefile.diff	2011-07-30 12:53:14 UTC (rev 81427)
@@ -1,5 +1,5 @@
---- makefile.orig	2010-03-07 04:58:04.000000000 -0600
-+++ makefile	2010-03-30 04:08:11.000000000 -0500
+--- makefile.orig	2010-03-07 21:58:04.000000000 +1100
++++ makefile	2011-07-30 22:49:56.000000000 +1000
 @@ -8,7 +8,7 @@
  USEPAK = 1
  
@@ -18,6 +18,15 @@
  
  OBJS += CAudio.o
  OBJS += CBoss.o
+@@ -80,7 +80,7 @@
+ 	$(CXX) $(LIBS) $(GAMEOBJS) -o $(PROG)
+ 	
+ pak: $(PAKOBJS)
+-	$(CXX) $(LIBS) $(PAKOBJS) -o pak
++	$(CXX) -lz $(PAKOBJS) -o pak
+ 
+ %.mo: %.po
+ 	msgfmt -c -o $@ $<
 @@ -108,9 +108,9 @@
  	mkdir -p $(ICONDIR)64x64/apps
  	mkdir -p $(DESKTOPDIR)

Added: trunk/dports/games/blobwars/files/patch-src_pak.h.diff
===================================================================
--- trunk/dports/games/blobwars/files/patch-src_pak.h.diff	                        (rev 0)
+++ trunk/dports/games/blobwars/files/patch-src_pak.h.diff	2011-07-30 12:53:14 UTC (rev 81427)
@@ -0,0 +1,7 @@
+--- src/pak.h.orig	2009-02-01 22:34:45.000000000 +1100
++++ src/pak.h	2011-07-30 22:49:14.000000000 +1000
+@@ -21,3 +21,4 @@
+ #include <dirent.h>
+ 
+ #include "headers.h"
++#undef main
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110730/c1f9c913/attachment.html>