[86470] trunk/dports/games/cannonsmash

[ryandesign at macports.org]

Revision: 86470
          http://trac.macports.org/changeset/86470
Author:   ryandesign at macports.org
Date:     2011-10-26 05:17:07 -0700 (Wed, 26 Oct 2011)
Log Message:
-----------
cannonsmash: fix build error with gcc 4.1+, and fix configure patching to actually build for the right architectures; this is also the first rebuild since MacPorts 1.9, so it ensures the architectures are correctly recorded in the registry

Modified Paths:
--------------
    trunk/dports/games/cannonsmash/Portfile

Added Paths:
-----------
    trunk/dports/games/cannonsmash/files/patch-BallView.h.diff
    trunk/dports/games/cannonsmash/files/patch-configure.in.diff

Removed Paths:
-------------
    trunk/dports/games/cannonsmash/files/patch-configure.diff

Modified: trunk/dports/games/cannonsmash/Portfile
===================================================================
--- trunk/dports/games/cannonsmash/Portfile	2011-10-26 11:56:10 UTC (rev 86469)
+++ trunk/dports/games/cannonsmash/Portfile	2011-10-26 12:17:07 UTC (rev 86470)
@@ -4,7 +4,7 @@
 
 name                cannonsmash
 version             0.6.6
-revision            3
+revision            4
 categories          games
 maintainers         nomaintainer
 description         3D tabletennis game
@@ -22,7 +22,8 @@
 depends_lib         port:libsdl_mixer port:libsdl_image \
                     port:gtk2 port:mesa port:xorg-libXmu
 
-patchfiles          patch-configure.diff \
+patchfiles          patch-BallView.h.diff \
+                    patch-configure.in.diff \
                     patch-loadparts.cpp.diff \
                     patch-matrix.diff
 

Added: trunk/dports/games/cannonsmash/files/patch-BallView.h.diff
===================================================================
--- trunk/dports/games/cannonsmash/files/patch-BallView.h.diff	                        (rev 0)
+++ trunk/dports/games/cannonsmash/files/patch-BallView.h.diff	2011-10-26 12:17:07 UTC (rev 86470)
@@ -0,0 +1,12 @@
+BallView.h:35: error: extra qualification ‘BallView::’ on member ‘DrawTargetCircle’
+--- BallView.h.orig	2003-07-13 10:26:24.000000000 -0500
++++ BallView.h	2011-10-26 07:05:16.000000000 -0500
+@@ -32,7 +32,7 @@
+ 
+   static GLuint m_number[10];
+ private:
+-  void BallView::DrawTargetCircle();
++  void DrawTargetCircle();
+   GLUquadricObj *m_quad;
+ 
+   void DrawBall();

Deleted: trunk/dports/games/cannonsmash/files/patch-configure.diff
===================================================================
--- trunk/dports/games/cannonsmash/files/patch-configure.diff	2011-10-26 11:56:10 UTC (rev 86469)
+++ trunk/dports/games/cannonsmash/files/patch-configure.diff	2011-10-26 12:17:07 UTC (rev 86470)
@@ -1,11 +0,0 @@
---- configure.orig	2003-08-15 23:54:31.000000000 -0600
-+++ configure	2006-01-30 20:52:52.000000000 -0700
-@@ -5516,7 +5516,7 @@
- 
- 
- CFLAGS="-I $x_includes"
--LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
-+LDFLAGS="$LDFLAGS -L$x_libraries -L$libdir"
- CXXFLAGS="$CFLAGS -Wall"
- 
- 

Copied: trunk/dports/games/cannonsmash/files/patch-configure.in.diff (from rev 86469, trunk/dports/games/cannonsmash/files/patch-configure.diff)
===================================================================
--- trunk/dports/games/cannonsmash/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/games/cannonsmash/files/patch-configure.in.diff	2011-10-26 12:17:07 UTC (rev 86470)
@@ -0,0 +1,13 @@
+--- configure.in.orig	2003-08-16 00:53:55.000000000 -0500
++++ configure.in	2011-10-26 07:05:16.000000000 -0500
+@@ -19,8 +19,8 @@
+ 
+ AC_PATH_X
+ 
+-CFLAGS="-I $x_includes"
+-LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
++CFLAGS="$CFLAGS -I $x_includes"
++LDFLAGS="$LDFLAGS -L$x_libraries -L$libdir"
+ CXXFLAGS="$CFLAGS -Wall"
+ 
+ dnl Checks for libraries.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111026/f3166645/attachment.html>