Changeset 79553

Timestamp:

06/17/11 19:50:29 (4 years ago)

Author:

ryandesign@…

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

File:

• trunk/dports/x11/pango-devel/Portfile (modified) (5 diffs)

trunk/dports/x11/pango-devel/Portfile

@@ -3 +3 @@
 
 PortSystem              1.0
-PortGroup               muniversal 1.0
 PortGroup               archcheck 1.0
 
@@ -48 +47 @@
 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
@@ -55 +53 @@
     # 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} {
@@ -111 +98 @@
 }
 
-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 \
@@ -123 +104 @@
 configure.args \
     --enable-static \
+    --disable-introspection \
     --without-x