[79553] trunk/dports/x11/pango-devel/Portfile

[ryandesign at macports.org]

Revision: 79553
          http://trac.macports.org/changeset/79553
Author:   ryandesign at macports.org
Date:     2011-06-17 19:50:29 -0700 (Fri, 17 Jun 2011)
Log Message:
-----------
pango-devel: merge r72474 from pango: don't use muniversal, disable introspection, allow quartz variant on Tiger; merge r78346 from pango: update minimum glib2 version

Revision Links:
--------------
    http://trac.macports.org/changeset/72474
    http://trac.macports.org/changeset/78346

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

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2011-06-18 02:40:27 UTC (rev 79552)
+++ trunk/dports/x11/pango-devel/Portfile	2011-06-18 02:50:29 UTC (rev 79553)
@@ -2,7 +2,6 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup               muniversal 1.0
 PortGroup               archcheck 1.0
 
 name                    pango-devel
@@ -47,29 +46,17 @@
 
 configure.ccache        no
 
-platform macosx {}
-if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
+platform macosx {
 variant quartz {
     # Although this variant does nothing, pango will automatically build
     # itself differently depending on whether or not cairo is installed with
     # the quartz variant. Therefore this variant is necessary to be able to
     # distinguish whether an installed pango has quartz support or not.
-    
-    # pango 1.25.1 and up uses Core Text which is only available on 10.5+.
-    pre-extract {
-        if {${os.major} < 9} {
-            ui_error "${name} ${version} +quartz requires Mac OS X 10.5 or greater."
-            ui_error "Either don't use the +quartz variant or upgrade your Mac OS X."
-            ui_error "Concerns about this should be addressed to the Pango mailing list:"
-            ui_error "http://mail.gnome.org/mailman/listinfo/gtk-i18n-list"
-            return -code error "incompatible Mac OS X version"
-        }
-    }
 }
 }
 
 pre-configure {
-    set glib_minimum_version 2.17.3
+    set glib_minimum_version 2.24.0
     set glib_installed_version [exec ${prefix}/bin/pkg-config glib-2.0 --modversion]
     if {[rpm-vercomp ${glib_installed_version} ${glib_minimum_version}] < 0} {
         ui_error "${name} ${version} requires glib2 ${glib_minimum_version} or later but you have glib2 ${glib_installed_version}."
@@ -110,18 +97,13 @@
     }
 }
 
-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
-
-configure.cppflags-append \
-    -no-cpp-precomp
-
 configure.ldflags-append \
     -no-undefined \
     -bind_at_load
 
 configure.args \
     --enable-static \
+    --disable-introspection \
     --without-x
 
 variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110617/8c0030e8/attachment.html>