[84133] trunk/dports/games/54321

[ryandesign at macports.org]

Revision: 84133
          http://trac.macports.org/changeset/84133
Author:   ryandesign at macports.org
Date:     2011-09-19 03:59:16 -0700 (Mon, 19 Sep 2011)
Log Message:
-----------
54321: ensure we're UsingTheRightCompiler and build_arch; revise how universal variant is done

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

Added Paths:
-----------
    trunk/dports/games/54321/files/
    trunk/dports/games/54321/files/patch-archs-Darwin-variables.GNU.diff

Modified: trunk/dports/games/54321/Portfile
===================================================================
--- trunk/dports/games/54321/Portfile	2011-09-19 10:48:36 UTC (rev 84132)
+++ trunk/dports/games/54321/Portfile	2011-09-19 10:59:16 UTC (rev 84133)
@@ -33,24 +33,17 @@
                         sha1    9841276d6e1f00de4de22cc11d19e1f08a9a01cb \
                         rmd160  63381c6f9cbc2d785ebf76dddc54b178cd704078
 
-post-patch {
-    reinplace -E "/CXX/s/CC/g++/" ${worksrcpath}/archs/Darwin/variables.GNU
-    reinplace -E "s@/(usr/local|sw)@${prefix}@" ${worksrcpath}/archs/Darwin/variables.GNU
-}
+patchfiles              patch-archs-Darwin-variables.GNU.diff
 
 use_configure           no
 
+variant universal {}
+
 build.type              gnu
-build.env               CC=g++
+build.args              CC="${configure.cc} [get_canonical_archflags]" \
+                        CXX="${configure.cxx} [get_canonical_archflags]"
 
 destroot {
     xinstall -d ${destroot}${applications_dir}
     copy ${worksrcpath}/Release/bin/Darwin/${name}.app ${destroot}${applications_dir}
 }
-
-variant universal {
-    post-patch {
-        reinplace -E "/^CPPFLAGS/s|\\+=|+= ${configure.universal_cflags}|" ${worksrcpath}/archs/Darwin/variables.GNU
-        reinplace -E "/^LDFLAGS/s|\\+=|+= ${configure.universal_ldflags}|" ${worksrcpath}/archs/Darwin/variables.GNU
-    }
-}

Added: trunk/dports/games/54321/files/patch-archs-Darwin-variables.GNU.diff
===================================================================
--- trunk/dports/games/54321/files/patch-archs-Darwin-variables.GNU.diff	                        (rev 0)
+++ trunk/dports/games/54321/files/patch-archs-Darwin-variables.GNU.diff	2011-09-19 10:59:16 UTC (rev 84133)
@@ -0,0 +1,13 @@
+--- archs/Darwin/variables.GNU.orig	2001-11-08 16:53:03.000000000 -0600
++++ archs/Darwin/variables.GNU	2011-09-19 05:50:39.000000000 -0500
+@@ -16,8 +16,8 @@
+ 	$(BUILD)/Darwin-main.o \
+ 	$(BUILD)/Darwin-main-help.o
+ 
+-CPPFLAGS += $(shell sdl-config --cflags) -I/sw/include
+-LDFLAGS  += -L/usr/local/lib -lSDL_image $(shell sdl-config --libs) -lpng
++CPPFLAGS += $(shell sdl-config --cflags)
++LDFLAGS  += -lSDL_image $(shell sdl-config --libs) -lpng
+ 
+ $(CODE)/%.m:	$(NWS)
+ 	-@$(MKDIR_CMD)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110919/e57b9eb1/attachment.html>