[59767] trunk/dports/x11/pango

[jmr at macports.org]

Revision: 59767
          http://trac.macports.org/changeset/59767
Author:   jmr at macports.org
Date:     2009-10-21 12:26:07 -0700 (Wed, 21 Oct 2009)
Log Message:
-----------
pango: fix 64-bit build (#17049)

Modified Paths:
--------------
    trunk/dports/x11/pango/Portfile

Added Paths:
-----------
    trunk/dports/x11/pango/files/patch-configure.diff

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2009-10-21 18:53:57 UTC (rev 59766)
+++ trunk/dports/x11/pango/Portfile	2009-10-21 19:26:07 UTC (rev 59767)
@@ -40,7 +40,8 @@
 
 patchfiles \
     patch-which.diff \
-    patch-ltmain.sh.diff
+    patch-ltmain.sh.diff \
+    patch-configure.diff
 
 configure.ccache        no
 
@@ -106,8 +107,8 @@
     set merger_configure_env(i386)    "NM='/usr/bin/nm -p'"
     set merger_configure_env(x86_64)  "NM='/usr/bin/nm -p'"
 }
-lappend merger_configure_env(ppc64)   ac_cv_header_Carbon_Carbon_h=no
-lappend merger_configure_env(x86_64)  ac_cv_header_Carbon_Carbon_h=no
+lappend merger_configure_args(ppc64)   have_atsui=false
+lappend merger_configure_args(x86_64)  have_atsui=false
 
 configure.cppflags-append \
     -no-cpp-precomp
@@ -120,6 +121,10 @@
     --enable-static \
     --x-include=${prefix}/include --x-lib=${prefix}/lib
 
+if {![variant_isset universal] && $build_arch == "x86_64" || $build_arch == "ppc64"} {
+    configure.args-append have_atsui=false
+}
+
 variant no_x11 {
     depends_lib-delete \
         port:Xft2

Added: trunk/dports/x11/pango/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/pango/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/x11/pango/files/patch-configure.diff	2009-10-21 19:26:07 UTC (rev 59767)
@@ -0,0 +1,33 @@
+--- configure.orig	2009-07-21 06:59:52.000000000 +1000
++++ configure	2009-10-22 06:14:52.000000000 +1100
+@@ -19806,12 +19806,14 @@
+ $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
+ 
+ fi
+-if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
+-  have_atsui=true
+-else
+-  have_atsui=false
+-fi
+ 
++if test "x$have_atsui" = "x"; then
++  if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
++    have_atsui=true
++  else
++    have_atsui=false
++  fi
++fi
+ 
+ 
+ #
+@@ -23206,7 +23208,8 @@
+ if test -n "$CONFIG_FILES"; then
+ 
+ 
+-ac_cr='
+'
++ac_cr='
++'
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+   ac_cs_awk_cr='\\r'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091021/9bd8a53b/attachment.html>