[92148] trunk/dports/graphics/povray

[jeremyhu at macports.org]

Revision: 92148
          https://trac.macports.org/changeset/92148
Author:   jeremyhu at macports.org
Date:     2012-04-20 01:15:38 -0700 (Fri, 20 Apr 2012)
Log Message:
-----------
povray: Fix universal build

Modified Paths:
--------------
    trunk/dports/graphics/povray/Portfile
    trunk/dports/graphics/povray/files/patch-configure

Modified: trunk/dports/graphics/povray/Portfile
===================================================================
--- trunk/dports/graphics/povray/Portfile	2012-04-20 07:07:58 UTC (rev 92147)
+++ trunk/dports/graphics/povray/Portfile	2012-04-20 08:15:38 UTC (rev 92148)
@@ -1,10 +1,11 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup  muniversal 1.0
 
 name			povray
 version			3.6.1
-revision                5
+revision                6
 maintainers		nomaintainer
 categories		graphics
 platforms		darwin
@@ -59,8 +60,23 @@
 test.target		check
 
 platform darwin {
-    if {![variant_isset universal]} {
-        configure.args-append --build=${build_arch}-apple-darwin${os.major}
+    if {[variant_isset universal]} {
+        set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+        set merger_host(i386) i686-apple-${os.platform}${os.major}
+        set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major}
+        set merger_host(ppc) powerpc-apple-${os.platform}${os.major}
+        set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major}"
+        set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}"
+        set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}"
+        set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}"
+    } elseif {${build_arch} == "i386"} {
+        configure.args-append \
+            --host=i686-apple-${os.platform}${os.major} \
+            --build=i686-apple-${os.platform}${os.major}
+    } else {
+        configure.args-append \
+            --host=${os.arch}-apple-${os.platform}${os.major} \
+            --build=${os.arch}-apple-${os.platform}${os.major}
     }
 }
 

Modified: trunk/dports/graphics/povray/files/patch-configure
===================================================================
--- trunk/dports/graphics/povray/files/patch-configure	2012-04-20 07:07:58 UTC (rev 92147)
+++ trunk/dports/graphics/povray/files/patch-configure	2012-04-20 08:15:38 UTC (rev 92148)
@@ -26,3 +26,12 @@
            *)              pov_arch="unknown";;
          esac
        fi
+@@ -15872,7 +15872,7 @@ echo "${ECHO_T}$pov_prog_cc_flags_value"
+       fi
+ 
+       # gcc says -malign-double makes no sense in the 64bit mode and reject it
+-      for pov_flags in "-malign-double" "-minline-all-stringops"; do
++      for pov_flags in "-minline-all-stringops"; do
+ 
+ 
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120420/b5598d78/attachment.html>